Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 19636: Don't make cells smaller than they are.
by navaraf＠svn.reactos.com 26 Nov '05

26 Nov '05

Don't make cells smaller than they are. Modified: trunk/reactos/ntoskrnl/cm/regfile.c _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-11-26 13:26:48 UTC (rev 19635) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-11-26 15:21:44 UTC (rev 19636) @@ -3431,7 +3431,7 @@ RtlZeroMemory(*Cell, CellSize); - ((PCELL_HEADER) (*Cell))->CellSize = -CellSize; + ((PCELL_HEADER) (*Cell))->CellSize *= -1; } return STATUS_SUCCESS;

1 0

[hbirr] 19635: Define the DPRINT and CHECKPOINT macro depend from NDEBUG for each include of debug.h.
by hbirr＠svn.reactos.com 26 Nov '05

26 Nov '05

Define the DPRINT and CHECKPOINT macro depend from NDEBUG for each include of debug.h. Modified: trunk/reactos/ntoskrnl/include/internal/debug.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/debug.h --- trunk/reactos/ntoskrnl/include/internal/debug.h 2005-11-26 12:37:49 UTC (rev 19634) +++ trunk/reactos/ntoskrnl/include/internal/debug.h 2005-11-26 13:26:48 UTC (rev 19635) @@ -15,6 +15,30 @@ * Define NASSERT before including this header to disable assertions */ +#ifdef CHECKPOINT +#undef CHECKPOINT +#endif + +#ifdef DPRINT +#undef DPRINT +#endif + +#ifndef NDEBUG +#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ +#define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) +#else +#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint +#endif +#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) +#else /* NDEBUG */ +#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ +#define DPRINT(args...) +#else +#define DPRINT +#endif +#define CHECKPOINT +#endif /* NDEBUG */ + #ifndef __INTERNAL_DEBUG #define __INTERNAL_DEBUG @@ -94,23 +118,6 @@ #define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) -#ifndef NDEBUG -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) -#else -#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint -#endif -#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) -#else /* NDEBUG */ -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define DPRINT(args...) -#else -#define DPRINT -#endif -#define CHECKPOINT -#endif /* NDEBUG */ - - /* * FUNCTION: Assert a maximum value for the current irql * ARGUMENTS:

1 0

[hpoussin] 19634: Remove useless property pages
by hpoussin＠svn.reactos.com 26 Nov '05

26 Nov '05

Remove useless property pages Modified: trunk/reactos/lib/cpl/main/De.rc Modified: trunk/reactos/lib/cpl/main/En.rc Modified: trunk/reactos/lib/cpl/main/Ja.rc Modified: trunk/reactos/lib/cpl/main/Nl.rc Modified: trunk/reactos/lib/cpl/main/mouse.c Modified: trunk/reactos/lib/cpl/main/resource.h _____ Modified: trunk/reactos/lib/cpl/main/De.rc --- trunk/reactos/lib/cpl/main/De.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/De.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - STRINGTABLE BEGIN IDS_CPLNAME_1 "Maus" _____ Modified: trunk/reactos/lib/cpl/main/En.rc --- trunk/reactos/lib/cpl/main/En.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/En.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Speed" _____ Modified: trunk/reactos/lib/cpl/main/Ja.rc --- trunk/reactos/lib/cpl/main/Ja.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/Ja.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - STRINGTABLE BEGIN IDS_CPLNAME_1 "â}âEâX" _____ Modified: trunk/reactos/lib/cpl/main/Nl.rc --- trunk/reactos/lib/cpl/main/Nl.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/Nl.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie -IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - STRINGTABLE BEGIN IDS_CPLNAME_1 "Muis" _____ Modified: trunk/reactos/lib/cpl/main/mouse.c --- trunk/reactos/lib/cpl/main/mouse.c 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/mouse.c 2005-11-26 12:37:49 UTC (rev 19634) @@ -33,61 +33,8 @@ #include "resource.h" - /* Property page dialog callback */ static INT_PTR CALLBACK -Page1Proc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - -/* Property page dialog callback */ -static INT_PTR CALLBACK -Page2Proc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - -/* Property page dialog callback */ -static INT_PTR CALLBACK -Page3Proc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - - -/* Property page dialog callback */ -static INT_PTR CALLBACK MouseHardwareProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, @@ -117,7 +64,7 @@ LONG APIENTRY MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2) { - PROPSHEETPAGE psp[4]; + PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh; TCHAR Caption[256]; @@ -134,10 +81,7 @@ psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_PROPPAGE1, Page1Proc); - InitPropSheetPage(&psp[1], IDD_PROPPAGE2, Page2Proc); - InitPropSheetPage(&psp[2], IDD_PROPPAGE3, Page3Proc); - InitPropSheetPage(&psp[3], IDD_HARDWARE, MouseHardwareProc); + InitPropSheetPage(&psp[0], IDD_HARDWARE, MouseHardwareProc); return (LONG)(PropertySheet(&psh) != -1); } _____ Modified: trunk/reactos/lib/cpl/main/resource.h --- trunk/reactos/lib/cpl/main/resource.h 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/resource.h 2005-11-26 12:37:49 UTC (rev 19634) @@ -5,9 +5,6 @@ #define IDC_CPLICON_1 1 #define IDC_CPLICON_2 2 -#define IDD_PROPPAGE1 100 -#define IDD_PROPPAGE2 101 -#define IDD_PROPPAGE3 102 #define IDD_KEYBSPEED 103 #define IDD_HARDWARE 104

1 0

[gedmurphy] 19633: silence debug messages
by gedmurphy＠svn.reactos.com 26 Nov '05

26 Nov '05

silence debug messages Modified: trunk/reactos/apps/utils/net/ping/ping.c _____ Modified: trunk/reactos/apps/utils/net/ping/ping.c --- trunk/reactos/apps/utils/net/ping/ping.c 2005-11-26 11:44:06 UTC (rev 19632) +++ trunk/reactos/apps/utils/net/ping/ping.c 2005-11-26 12:14:28 UTC (rev 19633) @@ -16,7 +16,9 @@ #include <stdio.h> #ifndef _MSC_VER -//#define DBG +#ifdef DBG +#undef DBG +#endif /* FIXME: Where should this be? */ #ifdef CopyMemory

1 0

[ekohl] 19632: Allocate another 4 bytes for unique pointers to simple types.
by ekohl＠svn.reactos.com 26 Nov '05

26 Nov '05

Allocate another 4 bytes for unique pointers to simple types. This fixes bug #1048. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-11-26 11:43:31 UTC (rev 19631) +++ trunk/reactos/tools/widl/ChangeLog 2005-11-26 11:44:06 UTC (rev 19632) @@ -1,5 +1,12 @@ ChangeLog +2005-11-26 ekohl + + tools/widl/client.c + tools/widl/server.c + +- Allocate another 4 bytes for unique pointers to simple types. + 2005-10-16 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-11-26 11:43:31 UTC (rev 19631) +++ trunk/reactos/tools/widl/client.c 2005-11-26 11:44:06 UTC (rev 19632) @@ -731,6 +731,9 @@ __FUNCTION__,__LINE__, var->type->type); return; } + + if (unique_attr) + size += 4; } else { _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-11-26 11:43:31 UTC (rev 19631) +++ trunk/reactos/tools/widl/server.c 2005-11-26 11:44:06 UTC (rev 19632) @@ -649,6 +649,7 @@ out_attr = is_attr(var->attrs, ATTR_OUT); string_attr = is_attr(var->attrs, ATTR_STRING); sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); if (out_attr) { @@ -708,6 +709,11 @@ __FUNCTION__,__LINE__, var->type->type); return; } + + if (unique_attr) + { + size += 4; + } } } else if (var->type->type == RPC_FC_RP)

1 0

[weiden] 19631: simplify displaying the advanced device properties
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

simplify displaying the advanced device properties Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/precomp.h _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-11-26 11:26:01 UTC (rev 19630) +++ trunk/reactos/lib/devmgr/advprop.c 2005-11-26 11:43:31 UTC (rev 19631) @@ -32,6 +32,99 @@ typedef INT_PTR (WINAPI *PPROPERTYSHEETW)(LPCPROPSHEETHEADERW); +INT_PTR +DisplayDeviceAdvancedProperties(IN HWND hWndParent, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + IN HINSTANCE hComCtl32) +{ + WCHAR szDevName[255]; + DWORD RegDataType; + PROPSHEETHEADER psh = {0}; + DWORD nPropSheets = 0; + PPROPERTYSHEETW pPropertySheetW; + INT_PTR Ret = -1; + + pPropertySheetW = (PPROPERTYSHEETW)GetProcAddress(hComCtl32, + "PropertySheetW"); + if (pPropertySheetW == NULL) + { + return -1; + } + + /* get the device name */ + if ((SetupDiGetDeviceRegistryProperty(DeviceInfoSet, + DeviceInfoData, + SPDRP_FRIENDLYNAME, + &RegDataType, + (PBYTE)szDevName, + sizeof(szDevName), + NULL) || + SetupDiGetDeviceRegistryProperty(DeviceInfoSet, + DeviceInfoData, + SPDRP_DEVICEDESC, + &RegDataType, + (PBYTE)szDevName, + sizeof(szDevName), + NULL)) && + RegDataType == REG_SZ) + { + /* FIXME - check string for NULL termination! */ + + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPTITLE; + psh.hwndParent = hWndParent; + psh.pszCaption = szDevName; + + /* find out how many property sheets we need */ + if (SetupDiGetClassDevPropertySheets(DeviceInfoSet, + DeviceInfoData, + &psh, + 0, + &nPropSheets, + DIGCDP_FLAG_ADVANCED) && + nPropSheets != 0) + { + DPRINT1("SetupDiGetClassDevPropertySheets unexpectedly returned TRUE!\n"); + goto Cleanup; + } + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + goto Cleanup; + } + + psh.phpage = HeapAlloc(GetProcessHeap(), + 0, + nPropSheets * sizeof(HPROPSHEETPAGE)); + if (psh.phpage == NULL) + { + goto Cleanup; + } + + /* FIXME - add the "General" and "Driver" pages */ + + if (!SetupDiGetClassDevPropertySheets(DeviceInfoSet, + DeviceInfoData, + &psh, + nPropSheets, + NULL, + DIGCDP_FLAG_ADVANCED)) + { + goto Cleanup; + } + + Ret = pPropertySheetW(&psh); + +Cleanup: + HeapFree(GetProcessHeap(), + 0, + psh.phpage); + } + + return Ret; +} + /*********************************************************************** **** * NAME EXPORTED * DeviceAdvancedPropertiesW @@ -54,7 +147,7 @@ * * @implemented */ -int +INT_PTR WINAPI DeviceAdvancedPropertiesW(HWND hWndParent, LPCWSTR lpMachineName, @@ -63,8 +156,7 @@ HDEVINFO hDevInfo; SP_DEVINFO_DATA DevInfoData; HINSTANCE hComCtl32; - PPROPERTYSHEETW pPropertySheetW; - int Ret = -1; + INT_PTR Ret = -1; /* FIXME - handle remote device properties */ @@ -72,106 +164,30 @@ /* dynamically load comctl32 */ hComCtl32 = LoadAndInitComctl32(); - if (hComCtl32 == NULL || - !(pPropertySheetW = (PPROPERTYSHEETW)GetProcAddress(hComCtl32, - "PropertySheetW"))) + if (hComCtl32 != NULL) { - return -1; - } - - hDevInfo = SetupDiCreateDeviceInfoList(NULL, - hWndParent); - if (hDevInfo == INVALID_HANDLE_VALUE) - { - goto Cleanup; - } - - DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); - if (SetupDiOpenDeviceInfo(hDevInfo, - lpDeviceID, - hWndParent, - 0, - &DevInfoData)) - { - WCHAR szDevName[255]; - DWORD RegDataType; - PROPSHEETHEADER psh = {0}; - DWORD nPropSheets = 0; - - /* get the device name */ - if ((SetupDiGetDeviceRegistryProperty(hDevInfo, - &DevInfoData, - SPDRP_FRIENDLYNAME, - &RegDataType, - (PBYTE)szDevName, - sizeof(szDevName), - NULL) || - SetupDiGetDeviceRegistryProperty(hDevInfo, - &DevInfoData, - SPDRP_DEVICEDESC, - &RegDataType, - (PBYTE)szDevName, - sizeof(szDevName), - NULL)) && - RegDataType == REG_SZ) + hDevInfo = SetupDiCreateDeviceInfoList(NULL, + hWndParent); + if (hDevInfo != INVALID_HANDLE_VALUE) { - /* FIXME - check string for NULL termination! */ - - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPTITLE; - psh.hwndParent = hWndParent; - psh.pszCaption = szDevName; - - /* find out how many property sheets we need */ - if (SetupDiGetClassDevPropertySheets(hDevInfo, - &DevInfoData, - &psh, - 0, - &nPropSheets, - DIGCDP_FLAG_ADVANCED) && - nPropSheets != 0) + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + if (SetupDiOpenDeviceInfo(hDevInfo, + lpDeviceID, + hWndParent, + 0, + &DevInfoData)) { - DPRINT1("SetupDiGetClassDevPropertySheets unexpectedly returned TRUE!\n"); - goto Cleanup; + Ret = DisplayDeviceAdvancedProperties(hWndParent, + hDevInfo, + &DevInfoData, + hComCtl32); } - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - goto Cleanup; - } - - psh.phpage = HeapAlloc(GetProcessHeap(), - 0, - nPropSheets * sizeof(HPROPSHEETPAGE)); - if (psh.phpage == NULL) - { - goto Cleanup; - } - - /* FIXME - add the "General" and "Driver" pages */ - - if (!SetupDiGetClassDevPropertySheets(hDevInfo, - &DevInfoData, - &psh, - nPropSheets, - NULL, - DIGCDP_FLAG_ADVANCED)) - { - goto Cleanup; - } - - Ret = pPropertySheetW(&psh); + SetupDiDestroyDeviceInfoList(hDevInfo); } - -Cleanup: - HeapFree(GetProcessHeap(), - 0, - psh.phpage); + FreeLibrary(hComCtl32); } - SetupDiDestroyDeviceInfoList(hDevInfo); - FreeLibrary(hComCtl32); - return Ret; } @@ -197,7 +213,7 @@ * * @implemented */ -int +INT_PTR WINAPI DeviceAdvancedPropertiesA(HWND hWndParent, LPCSTR lpMachineName, @@ -205,7 +221,7 @@ { LPWSTR lpMachineNameW = NULL; LPWSTR lpDeviceIDW = NULL; - int Ret = -1; + INT_PTR Ret = -1; if (lpMachineName != NULL) { _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 11:26:01 UTC (rev 19630) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 11:43:31 UTC (rev 19631) @@ -133,55 +133,10 @@ HwDevInfo = (PHWDEVINFO)ListViewGetSelectedItemData(hpd->hWndDevList); if (HwDevInfo != NULL) { - PWSTR szDeviceInstanceId = NULL; - DWORD DeviceInstanceIdLen = 0; - - /* find out how much size is needed for the buffer */ - if (SetupDiGetDeviceInstanceId(HwDevInfo->ClassDevInfo->hDevInfo, - &HwDevInfo->DevInfoData, - NULL, - 0, - &DeviceInstanceIdLen)) - { - DPRINT1("SetupDiGetDeviceInstanceId unexpectedly returned TRUE!\n"); - goto Cleanup; - } - - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - goto Cleanup; - } - - szDeviceInstanceId = HeapAlloc(GetProcessHeap(), - 0, - DeviceInstanceIdLen * sizeof(WCHAR)); - if (szDeviceInstanceId == NULL) - { - goto Cleanup; - } - - /* read the device instance id */ - if (!SetupDiGetDeviceInstanceId(HwDevInfo->ClassDevInfo->hDevInfo, - &HwDevInfo->DevInfoData, - szDeviceInstanceId, - DeviceInstanceIdLen, - &DeviceInstanceIdLen)) - { - goto Cleanup; - } - - /* display the properties dialog */ - Ret = DeviceAdvancedProperties(hpd->hWnd, - NULL, - szDeviceInstanceId) >= 0; - -Cleanup: - if (szDeviceInstanceId != NULL) - { - HeapFree(GetProcessHeap(), - 0, - szDeviceInstanceId); - } + Ret = DisplayDeviceAdvancedProperties(hpd->hWnd, + HwDevInfo->ClassDevInfo->hDevInfo, + &HwDevInfo->DevInfoData, + hpd->hComCtl32) != -1; } return Ret; _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-11-26 11:26:01 UTC (rev 19630) +++ trunk/reactos/lib/devmgr/precomp.h 2005-11-26 11:43:31 UTC (rev 19631) @@ -118,13 +118,13 @@ UINT uNumberOfGuids, LPGUID lpGuids); -int +INT_PTR WINAPI DeviceAdvancedPropertiesA(HWND hWndParent, LPCSTR lpMachineName, LPCSTR lpDeviceID); -int +INT_PTR WINAPI DeviceAdvancedPropertiesW(HWND hWndParent, LPCWSTR lpMachineName, @@ -180,6 +180,14 @@ #define DevicePropertiesEx DevicePropertiesExA #endif +/* ADVPROP.C */ + +INT_PTR +DisplayDeviceAdvancedProperties(IN HWND hWndParent, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + IN HINSTANCE hComCtl32); + /* MISC.C */ DWORD

1 0

[weiden] 19630: allow warnings so it builds with g++ 4.0
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

allow warnings so it builds with g++ 4.0 Modified: trunk/rosapps/packmgr/lib/package.xml _____ Modified: trunk/rosapps/packmgr/lib/package.xml --- trunk/rosapps/packmgr/lib/package.xml 2005-11-26 11:02:13 UTC (rev 19629) +++ trunk/rosapps/packmgr/lib/package.xml 2005-11-26 11:26:01 UTC (rev 19630) @@ -1,4 +1,4 @@ -<module name="package" type="win32dll" installbase="system32" installname="package.dll"> +<module name="package" type="win32dll" installbase="system32" installname="package.dll" allowwarnings="true"> <importlibrary definition="package.def" /> <include base="package">.</include>

1 0

[gvg] 19629: Silence debug messages
by gvg＠svn.reactos.com 26 Nov '05

26 Nov '05

Silence debug messages Modified: trunk/reactos/ntoskrnl/cc/cacheman.c Modified: trunk/reactos/ntoskrnl/io/adapter.c _____ Modified: trunk/reactos/ntoskrnl/cc/cacheman.c --- trunk/reactos/ntoskrnl/cc/cacheman.c 2005-11-26 10:53:01 UTC (rev 19628) +++ trunk/reactos/ntoskrnl/cc/cacheman.c 2005-11-26 11:02:13 UTC (rev 19629) @@ -11,6 +11,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> +#define NDEBUG #include <internal/debug.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/io/adapter.c --- trunk/reactos/ntoskrnl/io/adapter.c 2005-11-26 10:53:01 UTC (rev 19628) +++ trunk/reactos/ntoskrnl/io/adapter.c 2005-11-26 11:02:13 UTC (rev 19629) @@ -11,6 +11,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> +#define NDEBUG #include <internal/debug.h> /* DATA **********************************************************************/

1 0

[weiden] 19628: Document the -ud flag for ROS_RBUILDFLAGS
by weiden＠svn.reactos.com 26 Nov '05

26 Nov '05

Document the -ud flag for ROS_RBUILDFLAGS Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-11-26 10:40:21 UTC (rev 19627) +++ trunk/reactos/Makefile 2005-11-26 10:53:01 UTC (rev 19628) @@ -105,6 +105,7 @@ # -dm{module} Check only automatic dependencies for this module. # -mi Let make handle creation of install directories. Rbuild will not generate the directories. # -ps Generate proxy makefiles in source tree instead of the output tree. +# -ud Disable compilation units. # check for versions of make that don't have features we need... # the function "eval" is only available in 3.80+, which happens to be the minimum

1 0

[sgasiorek] 19627: removed not needed typecasts. thanks Thomas
by sgasiorek＠svn.reactos.com 26 Nov '05

26 Nov '05

removed not needed typecasts. thanks Thomas Modified: trunk/rosapps/packmgr/cmd-line/main.c Modified: trunk/rosapps/packmgr/gui/main.c _____ Modified: trunk/rosapps/packmgr/cmd-line/main.c --- trunk/rosapps/packmgr/cmd-line/main.c 2005-11-26 10:38:42 UTC (rev 19626) +++ trunk/rosapps/packmgr/cmd-line/main.c 2005-11-26 10:40:21 UTC (rev 19627) @@ -121,7 +121,7 @@ // If the Status is 1000 things are done if(status1==1000) { - wprintf(L"%s\n", PML_TransError(status2, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR))); + wprintf(L"%s\n", PML_TransError(status2, errbuf, sizeof(errbuf)/sizeof(WCHAR))); done = TRUE; } @@ -139,7 +139,7 @@ if(error) { - wprintf(PML_TransError(error, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR))); + wprintf(PML_TransError(error, errbuf, sizeof(errbuf)/sizeof(WCHAR))); return 0; } @@ -163,7 +163,7 @@ if(error) { - wprintf(PML_TransError(error, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR))); + wprintf(PML_TransError(error, errbuf, sizeof(errbuf)/sizeof(WCHAR))); PML_CloseTree (tree); return 0; } @@ -188,7 +188,7 @@ error = PML_LoadTree (&tree, "tree.xml", NULL); if(error) { - wprintf(PML_TransError(error, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR))); + wprintf(PML_TransError(error, errbuf, sizeof(errbuf)/sizeof(WCHAR))); return 0; } _____ Modified: trunk/rosapps/packmgr/gui/main.c --- trunk/rosapps/packmgr/gui/main.c 2005-11-26 10:38:42 UTC (rev 19626) +++ trunk/rosapps/packmgr/gui/main.c 2005-11-26 10:40:21 UTC (rev 19627) @@ -79,7 +79,7 @@ if(error) { - MessageBox(0,PML_TransError(error, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR)),0,0); + MessageBox(0,PML_TransError(error, errbuf, sizeof(errbuf)/sizeof(WCHAR)),0,0); return 0; } @@ -161,7 +161,7 @@ hTree = CreateWindowEx(0, WC_TREEVIEW, L"TreeView", WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTON S, 0, 0, 0, 0, hwnd, NULL, hinst, NULL); - hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, L"edit", PML_TransError(IDS_LOAD, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR)), WS_CHILD|WS_VISIBLE|ES_MULTILINE, + hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, L"edit", PML_TransError(IDS_LOAD, errbuf, sizeof(errbuf)/sizeof(WCHAR)), WS_CHILD|WS_VISIBLE|ES_MULTILINE, 0, 0, 100, 100, hwnd, NULL, hinst, NULL); hPopup = LoadMenu(hinst, MAKEINTRESOURCE(IDR_POPUP)); @@ -410,7 +410,7 @@ if(status1==1000) { EndDialog(hStatus, TRUE); - MessageBox(0,PML_TransError(status2, (WCHAR*)errbuf, sizeof(errbuf)/sizeof(WCHAR)),0,0); + MessageBox(0,PML_TransError(status2, errbuf, sizeof(errbuf)/sizeof(WCHAR)),0,0); } return 0;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs