[ros-diffs] [dchapyshev] 39099: - .def -> .spec - Fix telephon.cpl - Small fix hdwwiz - Delete unneeded files in appwiz

Author: dchapyshev
Date: Sun Jan 25 12:02:24 2009
New Revision: 39099

URL: http://svn.reactos.org/svn/reactos?rev=39099&view=rev
Log:
- .def -> .spec
- Fix telephon.cpl
- Small fix hdwwiz
- Delete unneeded files in appwiz

Added:
    trunk/reactos/dll/cpl/appwiz-new/appwiz.spec   (with props)
    trunk/reactos/dll/cpl/appwiz/appwiz.spec   (with props)
    trunk/reactos/dll/cpl/desk/desk.spec   (with props)
Removed:
    trunk/reactos/dll/cpl/appwiz-new/appwiz.def
    trunk/reactos/dll/cpl/appwiz/appwiz.def
    trunk/reactos/dll/cpl/appwiz/appwiz.dsp
    trunk/reactos/dll/cpl/appwiz/appwiz.dsw
    trunk/reactos/dll/cpl/desk/desk.def
Modified:
    trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild
    trunk/reactos/dll/cpl/appwiz-new/createlink.c
    trunk/reactos/dll/cpl/appwiz/appwiz.rbuild
    trunk/reactos/dll/cpl/desk/desk.rbuild
    trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c
    trunk/reactos/dll/cpl/telephon/telephon.c

Removed: trunk/reactos/dll/cpl/appwiz-new/appwiz.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz-new/appwiz.def [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz-new/appwiz.def (removed)
@@ -1,9 +1,0 @@
-LIBRARY appwiz.cpl
-
-EXPORTS
-CPlApplet@16
-;NewLinkHere@16
-;NewLinkHereA@16
-;NewLinkHereW@16
-
-; EOF

Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild [iso-8859-1] Sun Jan 25 12:02:24 2009
@@ -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>

Added: trunk/reactos/dll/cpl/appwiz-new/appwiz.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz-new/appwiz.spec (added)
+++ trunk/reactos/dll/cpl/appwiz-new/appwiz.spec [iso-8859-1] Sun Jan 25 12:02:24 2009
@@ -1,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)

Propchange: trunk/reactos/dll/cpl/appwiz-new/appwiz.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/cpl/appwiz-new/createlink.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/createl…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz-new/createlink.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz-new/createlink.c [iso-8859-1] Sun Jan 25 12:02:24 2009
@@ -11,3 +11,24 @@
  */
 
 #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;
+}

Removed: trunk/reactos/dll/cpl/appwiz/appwiz.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.def?…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.def [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.def (removed)
@@ -1,9 +1,0 @@
-LIBRARY appwiz.cpl
-
-EXPORTS
-CPlApplet@16
-NewLinkHere@16
-NewLinkHereA@16
-NewLinkHereW@16
-
-; EOF

Removed: trunk/reactos/dll/cpl/appwiz/appwiz.dsp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.dsp?…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.dsp [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.dsp (removed)
@@ -1,124 +1,0 @@
-# Microsoft Developer Studio Project File - Name="appwiz" - Package
Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=appwiz - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "appwiz.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "appwiz.mak" CFG="appwiz - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "appwiz - Win32 Release" (based on "Win32 (x86) Dynamic-Link
Library")
-!MESSAGE "appwiz - Win32 Debug" (based on "Win32 (x86) Dynamic-Link
Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "appwiz - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D
"APPWIZ_EXPORTS" /YX /FD /c
-# 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
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_MSC_VER"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# 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
-# 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"
-
-!ELSEIF  "$(CFG)" == "appwiz - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# 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
-# 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
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_MSC_VER"
-# SUBTRACT RSC /x
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# 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
-# 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
-
-!ENDIF 
-
-# Begin Target
-
-# Name "appwiz - Win32 Release"
-# Name "appwiz - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\appwiz.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\appwiz.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\appwiz.def
-# End Source File
-# Begin Source File
-
-SOURCE=.\appwiz.rc
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

Removed: trunk/reactos/dll/cpl/appwiz/appwiz.dsw
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.dsw?…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.dsw [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.dsw (removed)
@@ -1,29 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "appwiz"=.\appwiz.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rbui…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.rbuild [iso-8859-1] Sun Jan 25 12:02:24 2009
@@ -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>

Added: trunk/reactos/dll/cpl/appwiz/appwiz.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.spec…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.spec (added)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.spec [iso-8859-1] Sun Jan 25 12:02:24 2009
@@ -1,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)

Propchange: trunk/reactos/dll/cpl/appwiz/appwiz.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Removed: trunk/reactos/dll/cpl/desk/desk.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.def?rev=…
==============================================================================
--- trunk/reactos/dll/cpl/desk/desk.def [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/desk.def (removed)
@@ -1,8 +1,0 @@
-LIBRARY desk.cpl
-
-EXPORTS
-CPlApplet@16
-DisplayClassInstaller@12
-DisplaySaveSettings@8
-
-; EOF

Modified: trunk/reactos/dll/cpl/desk/desk.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r…
==============================================================================
--- trunk/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] Sun Jan 25 12:02:24 2009
@@ -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>

Added: trunk/reactos/dll/cpl/desk/desk.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.spec?rev…
==============================================================================
--- trunk/reactos/dll/cpl/desk/desk.spec (added)
+++ trunk/reactos/dll/cpl/desk/desk.spec [iso-8859-1] Sun Jan 25 12:02:24 2009
@@ -1,0 +1,3 @@
+@ stdcall CPlApplet(ptr long ptr ptr)
+@ stdcall DisplayClassInstaller(long ptr ptr)
+@ stdcall DisplaySaveSettings(ptr ptr)

Propchange: trunk/reactos/dll/cpl/desk/desk.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re…
==============================================================================
--- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Sun Jan 25 12:02:24 2009
@@ -55,7 +55,7 @@
 
     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;

Modified: trunk/reactos/dll/cpl/telephon/telephon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.…
==============================================================================
--- trunk/reactos/dll/cpl/telephon/telephon.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/telephon.c [iso-8859-1] Sun Jan 25 12:02:24 2009
@@ -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 @@
             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);