Author: sserapion Date: Wed Sep 24 05:41:39 2008 New Revision: 36466
URL: http://svn.reactos.org/svn/reactos?rev=36466&view=rev Log: Convert to spec. Minor 64bit fixes.
Added: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.spec (contents, props changed) - copied, changed from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.def Removed: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.def Modified: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/hardware.c branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.rbuild
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/hardware.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/hardware.c [iso-8859-1] Wed Sep 24 05:41:39 2008 @@ -17,7 +17,7 @@ { /* hack for ROS to start our devmgmt until we have mmc */ #ifdef __REACTOS__ - return ((INT)ShellExecuteW(NULL, L"open", L"devmgmt.exe", NULL, NULL, SW_SHOWNORMAL) > 32); + return ((INT_PTR)ShellExecuteW(NULL, L"open", L"devmgmt.exe", NULL, NULL, SW_SHOWNORMAL) > 32); #else HMODULE hDll; PDEVMGREXEC DevMgrExec;
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Wed Sep 24 05:41:39 2008 @@ -437,7 +437,7 @@ for (index = 0; index <lIndex; index++) { pRecord = (PBOOTRECORD) SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)index, (LPARAM)0); - if ((INT)pRecord != CB_ERR) + if ((INT_PTR)pRecord != CB_ERR) { HeapFree(GetProcessHeap(), 0, pRecord); } @@ -570,7 +570,7 @@ RegSetValueEx(hKey, _T("MinidumpDir"), 0, REG_EXPAND_SZ, (LPBYTE)pStartInfo->szDumpFile, (_tcslen(pStartInfo->szDumpFile) + 1) * sizeof(TCHAR)); }
- RegSetValueEx(hKey, _T("CrashDumpEnabled"), 0, REG_DWORD, (LPBYTE)pStartInfo->dwCrashDumpEnabled, sizeof(pStartInfo->dwCrashDumpEnabled)); + RegSetValueEx(hKey, _T("CrashDumpEnabled"), 0, REG_DWORD, (LPBYTE)(DWORD_PTR)pStartInfo->dwCrashDumpEnabled, sizeof(pStartInfo->dwCrashDumpEnabled)); RegCloseKey(hKey); }
@@ -741,7 +741,7 @@
pRecord = (PBOOTRECORD) SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)lResult, (LPARAM)0);
- if ((INT)pRecord != CB_ERR) + if ((INT_PTR)pRecord != CB_ERR) { if (pStartInfo->iFreeLdrIni == 1) // FreeLdrIni style {
Removed: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.def (removed) @@ -1,6 +1,0 @@ -LIBRARY sysdm.cpl - -EXPORTS -CPlApplet@16 - -; EOF
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.rbuild [iso-8859-1] Wed Sep 24 05:41:39 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" unicode="yes"> - <importlibrary definition="sysdm.def" /> + <importlibrary definition="sysdm.spec.def" /> <include base="sysdm">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> @@ -29,5 +29,6 @@ <file>userprofile.c</file> <file>virtmem.c</file> <file>sysdm.rc</file> + <file>sysdm.spec</file> <pch>precomp.h</pch> </module>
Copied: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.spec (from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.spec [iso-8859-1] Wed Sep 24 05:41:39 2008 @@ -1,6 +1,1 @@ -LIBRARY sysdm.cpl - -EXPORTS -CPlApplet@16 - -; EOF +@ stdcall CPlApplet(ptr long ptr ptr)
Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.spec ------------------------------------------------------------------------------ svn:eol-style = native
Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision
Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/sysdm.spec ------------------------------------------------------------------------------ svn:mergeinfo =