- .def -> .spec
authorDmitry Chapyshev <dmitry@reactos.org>
Sun, 25 Jan 2009 18:02:24 +0000 (18:02 +0000)
committerDmitry Chapyshev <dmitry@reactos.org>
Sun, 25 Jan 2009 18:02:24 +0000 (18:02 +0000)
- Fix telephon.cpl
- Small fix hdwwiz
- Delete unneeded files in appwiz

svn path=/trunk/; revision=39099

14 files changed:
reactos/dll/cpl/appwiz-new/appwiz.def [deleted file]
reactos/dll/cpl/appwiz-new/appwiz.rbuild
reactos/dll/cpl/appwiz-new/appwiz.spec [new file with mode: 0644]
reactos/dll/cpl/appwiz-new/createlink.c
reactos/dll/cpl/appwiz/appwiz.def [deleted file]
reactos/dll/cpl/appwiz/appwiz.dsp [deleted file]
reactos/dll/cpl/appwiz/appwiz.dsw [deleted file]
reactos/dll/cpl/appwiz/appwiz.rbuild
reactos/dll/cpl/appwiz/appwiz.spec [new file with mode: 0644]
reactos/dll/cpl/desk/desk.def [deleted file]
reactos/dll/cpl/desk/desk.rbuild
reactos/dll/cpl/desk/desk.spec [new file with mode: 0644]
reactos/dll/cpl/hdwwiz/hdwwiz.c
reactos/dll/cpl/telephon/telephon.c

diff --git a/reactos/dll/cpl/appwiz-new/appwiz.def b/reactos/dll/cpl/appwiz-new/appwiz.def
deleted file mode 100644 (file)
index d8f3e2e..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-LIBRARY appwiz.cpl
-
-EXPORTS
-CPlApplet@16
-;NewLinkHere@16
-;NewLinkHereA@16
-;NewLinkHereW@16
-
-; EOF
index 7838669..a41a1f5 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="appwiz-new" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz-new.cpl" unicode="yes">
-       <importlibrary definition="appwiz.def" />
+       <importlibrary definition="appwiz.spec" />
        <include base="appwiz-new">.</include>
        <library>kernel32</library>
        <library>advapi32</library>
diff --git a/reactos/dll/cpl/appwiz-new/appwiz.spec b/reactos/dll/cpl/appwiz-new/appwiz.spec
new file mode 100644 (file)
index 0000000..cc66da3
--- /dev/null
@@ -0,0 +1,4 @@
+@ stdcall CPlApplet(ptr long ptr ptr)
+@ stdcall NewLinkHere(ptr long ptr ptr)
+@ stdcall NewLinkHereA(ptr long ptr ptr)
+@ stdcall NewLinkHereW(ptr long ptr ptr)
\ No newline at end of file
index 6ee822a..9e5f5ee 100644 (file)
  */
 
 #include "appwiz.h"
+
+LONG
+CALLBACK
+NewLinkHere(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
+{
+    return -1;
+}
+
+LONG
+CALLBACK
+NewLinkHereA(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
+{
+    return -1;
+}
+
+LONG
+CALLBACK
+NewLinkHereW(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
+{
+    return -1;
+}
diff --git a/reactos/dll/cpl/appwiz/appwiz.def b/reactos/dll/cpl/appwiz/appwiz.def
deleted file mode 100644 (file)
index 5cebd58..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-LIBRARY appwiz.cpl
-
-EXPORTS
-CPlApplet@16
-NewLinkHere@16
-NewLinkHereA@16
-NewLinkHereW@16
-
-; EOF
diff --git a/reactos/dll/cpl/appwiz/appwiz.dsp b/reactos/dll/cpl/appwiz/appwiz.dsp
deleted file mode 100644 (file)
index 3dbdc67..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-# Microsoft Developer Studio Project File - Name="appwiz" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=appwiz - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "appwiz.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "appwiz.mak" CFG="appwiz - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "appwiz - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "appwiz - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "appwiz - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 1\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APPWIZ_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APPWIZ_EXPORTS" /D "_UNICODE" /D "UNICODE" /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x407 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_MSC_VER"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /machine:I386 /out:"Release/appwiz.cpl"\r
-\r
-!ELSEIF  "$(CFG)" == "appwiz - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 1\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APPWIZ_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APPWIZ_EXPORTS" /D "_UNICODE" /D "UNICODE" /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x407 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_MSC_VER"\r
-# SUBTRACT RSC /x\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"Debug/appwiz.cpl" /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "appwiz - Win32 Release"\r
-# Name "appwiz - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\appwiz.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\appwiz.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\resource.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\appwiz.def\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\appwiz.rc\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# End Target\r
-# End Project\r
diff --git a/reactos/dll/cpl/appwiz/appwiz.dsw b/reactos/dll/cpl/appwiz/appwiz.dsw
deleted file mode 100644 (file)
index cbac9b7..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00\r
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
-\r
-###############################################################################\r
-\r
-Project: "appwiz"=.\appwiz.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Global:\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<3>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
index 8d0a839..92d8679 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}"  installbase="system32" installname="appwiz.cpl" unicode="yes">
-       <importlibrary definition="appwiz.def" />
+       <importlibrary definition="appwiz.spec" />
        <include base="appwiz">.</include>
        <library>kernel32</library>
        <library>advapi32</library>
diff --git a/reactos/dll/cpl/appwiz/appwiz.spec b/reactos/dll/cpl/appwiz/appwiz.spec
new file mode 100644 (file)
index 0000000..cc66da3
--- /dev/null
@@ -0,0 +1,4 @@
+@ stdcall CPlApplet(ptr long ptr ptr)
+@ stdcall NewLinkHere(ptr long ptr ptr)
+@ stdcall NewLinkHereA(ptr long ptr ptr)
+@ stdcall NewLinkHereW(ptr long ptr ptr)
\ No newline at end of file
diff --git a/reactos/dll/cpl/desk/desk.def b/reactos/dll/cpl/desk/desk.def
deleted file mode 100644 (file)
index 768565e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-LIBRARY desk.cpl
-
-EXPORTS
-CPlApplet@16
-DisplayClassInstaller@12
-DisplaySaveSettings@8
-
-; EOF
index 131e0da..301884c 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes" crt="msvcrt">
-       <importlibrary definition="desk.def" />
+       <importlibrary definition="desk.spec" />
        <include base="desk">.</include>
        <define name="_WIN32" />
        <library>kernel32</library>
diff --git a/reactos/dll/cpl/desk/desk.spec b/reactos/dll/cpl/desk/desk.spec
new file mode 100644 (file)
index 0000000..d870fd0
--- /dev/null
@@ -0,0 +1,3 @@
+@ stdcall CPlApplet(ptr long ptr ptr)
+@ stdcall DisplayClassInstaller(long ptr ptr)
+@ stdcall DisplaySaveSettings(ptr ptr)
\ No newline at end of file
index 4adf579..de87d5e 100644 (file)
@@ -55,7 +55,7 @@ CreateTitleFont(VOID)
 
     LogFont = ncm.lfMessageFont;
     LogFont.lfWeight = FW_BOLD;
-    _tcscpy(LogFont.lfFaceName, _T("MS Shell Dlg"));
+    wcscpy(LogFont.lfFaceName, L"MS Shell Dlg");
 
     hdc = GetDC(NULL);
     FontSize = 12;
index 74d573c..d19c8dd 100644 (file)
@@ -13,7 +13,7 @@
 
 #include "resource.h"
 
-typedef UINT (CALLBACK* LPINTERNALCONFIG)(HWND, UINT, LPARAM, LPARAM);
+typedef LONG (CALLBACK* LPINTERNALCONFIG)(HWND, UINT, LPARAM, LPARAM);
 
 /* Control Panel Callback */
 LONG CALLBACK
@@ -45,7 +45,11 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
             if (!hTapi32) return FALSE;
 
             lpInternalConfig = (LPINTERNALCONFIG) GetProcAddress(hTapi32, "internalConfig");
-            if (!lpInternalConfig) return FALSE;
+            if (!lpInternalConfig)
+            {
+                FreeLibrary(hTapi32);
+                return FALSE;
+            }
 
             lpInternalConfig(hwndCPl, 0, 0, 0);
             FreeLibrary(hTapi32);