Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[royce] 19602: automatically detect msys without generating ugly error message on non-msys system

by royce＠svn.reactos.com

automatically detect msys without generating ugly error message on non-msys system Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-11-26 02:36:01 UTC (rev 19601) +++ trunk/reactos/Makefile 2005-11-26 03:01:18 UTC (rev 19602) @@ -115,7 +115,8 @@ ifeq ($(HOST),) ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) -ifeq ($(OSTYPE),msys) +ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) +export OSTYPE = msys HOST=mingw32-linux else HOST=mingw32-windows

19 years, 1 month

[royce] 19601: revert 19600 until I can figure out how to correct keep it silent on non-msys systems

by royce＠svn.reactos.com

revert 19600 until I can figure out how to correct keep it silent on non-msys systems Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-11-26 02:23:07 UTC (rev 19600) +++ trunk/reactos/Makefile 2005-11-26 02:36:01 UTC (rev 19601) @@ -115,8 +115,7 @@ ifeq ($(HOST),) ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) -ifeq ($(findstring msys,$(-shell sh --version)),msys) -export OSTYPE = msys +ifeq ($(OSTYPE),msys) HOST=mingw32-linux else HOST=mingw32-windows @@ -215,7 +214,7 @@ export EXEPREFIX = ./ ifeq ($(OSTYPE),msys) export EXEPOSTFIX = .exe -else +else export EXEPOSTFIX = endif export SEP = /

19 years, 1 month

[royce] 19600: auto-detect msys instead of requiring users to tell our build system about it

by royce＠svn.reactos.com

auto-detect msys instead of requiring users to tell our build system about it Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-11-26 02:12:58 UTC (rev 19599) +++ trunk/reactos/Makefile 2005-11-26 02:23:07 UTC (rev 19600) @@ -115,7 +115,8 @@ ifeq ($(HOST),) ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) -ifeq ($(OSTYPE),msys) +ifeq ($(findstring msys,$(-shell sh --version)),msys) +export OSTYPE = msys HOST=mingw32-linux else HOST=mingw32-windows

19 years, 1 month

[weiden] 19599: display the advanced device properties

by weiden＠svn.reactos.com

display the advanced device properties Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/stubs.c _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 01:56:07 UTC (rev 19598) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 02:12:58 UTC (rev 19599) @@ -126,6 +126,70 @@ } +static BOOL +DisplaySelectedDeviceProperties(IN PHARDWARE_PAGE_DATA hpd) +{ + PHWDEVINFO HwDevInfo; + BOOL Ret = FALSE; + + 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("SetupDiGetDeviceInterfaceDetail 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); + } + } + + return Ret; +} + + static VOID UpdateControlStates(IN PHARDWARE_PAGE_DATA hpd) { @@ -158,6 +222,10 @@ RegDataType != REG_SZ) { szBuffer[0] = L'\0'; + LoadString(hDllInstance, + IDS_UNKNOWN, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0])); } /* FIXME - check string for NULL termination! */ if (LoadAndFormatString(hDllInstance, @@ -183,15 +251,10 @@ RegDataType != REG_SZ) { szBuffer[0] = L'\0'; - - if (cRet == CR_NO_SUCH_REGISTRY_KEY || - cRet == CR_NO_SUCH_VALUE) - { - LoadString(hDllInstance, - IDS_UNKNOWN, - szBuffer, - sizeof(szBuffer) / sizeof(szBuffer[0])); - } + LoadString(hDllInstance, + IDS_UNKNOWN, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0])); } /* FIXME - check string for NULL termination! */ @@ -756,8 +819,7 @@ case IDC_PROPERTIES: { - /* FIXME - display the properties dialog for the currently - selected device */ + DisplaySelectedDeviceProperties(hpd); break; } } _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-11-26 01:56:07 UTC (rev 19598) +++ trunk/reactos/lib/devmgr/precomp.h 2005-11-26 02:12:58 UTC (rev 19599) @@ -145,19 +145,41 @@ int WINAPI DevicePropertiesExA(HWND hWndParent, - HINSTANCE hInst, LPCSTR lpMachineName, LPCSTR lpDeviceID, + HINSTANCE hInst, DWORD Unknown); int WINAPI DevicePropertiesExW(HWND hWndParent, - HINSTANCE hInst, LPCWSTR lpMachineName, LPCWSTR lpDeviceID, + HINSTANCE hInst, DWORD Unknown); +#ifdef UNICODE +#define DeviceManager_Execute DeviceManager_ExecuteW +#define DeviceProperties_RunDLL DeviceProperties_RunDLLW +#define DeviceProperties DevicePropertiesW +#define DeviceProblemText DeviceProblemTextW +#define DeviceProblemWizard DeviceProblemWizardW +#define DeviceProblemWizard_RunDLL DeviceProblemWizard_RunDLLW +#define DeviceManagerPrint DeviceManagerPrintW +#define DeviceAdvancedProperties DeviceAdvancedPropertiesW +#define DevicePropertiesEx DevicePropertiesExW +#else +#define DeviceManager_Execute DeviceManager_ExecuteA +#define DeviceProperties_RunDLL DeviceProperties_RunDLLA +#define DeviceProperties DevicePropertiesA +#define DeviceProblemText DeviceProblemTextA +#define DeviceProblemWizard DeviceProblemWizardA +#define DeviceProblemWizard_RunDLL DeviceProblemWizard_RunDLLA +#define DeviceManagerPrint DeviceManagerPrintA +#define DeviceAdvancedProperties DeviceAdvancedPropertiesA +#define DevicePropertiesEx DevicePropertiesExA +#endif + /* MISC.C */ DWORD _____ Modified: trunk/reactos/lib/devmgr/stubs.c --- trunk/reactos/lib/devmgr/stubs.c 2005-11-26 01:56:07 UTC (rev 19598) +++ trunk/reactos/lib/devmgr/stubs.c 2005-11-26 02:12:58 UTC (rev 19599) @@ -640,9 +640,9 @@ int WINAPI DevicePropertiesExA(HWND hWndParent, - HINSTANCE hInst, LPCSTR lpMachineName, LPCSTR lpDeviceID, + HINSTANCE hInst, DWORD Unknown) { UNIMPLEMENTED; @@ -678,9 +678,9 @@ int WINAPI DevicePropertiesExW(HWND hWndParent, - HINSTANCE hInst, LPCWSTR lpMachineName, LPCWSTR lpDeviceID, + HINSTANCE hInst, DWORD Unknown) { UNIMPLEMENTED;

19 years, 1 month

[weiden] 19598: added stubs for SetupDiGetDeviceInstanceIdA/W

by weiden＠svn.reactos.com

added stubs for SetupDiGetDeviceInstanceIdA/W Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-11-26 01:44:36 UTC (rev 19597) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-11-26 01:56:07 UTC (rev 19598) @@ -323,8 +323,8 @@ @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) @ stdcall SetupDiGetDeviceInstallParamsA(ptr ptr ptr) @ stdcall SetupDiGetDeviceInstallParamsW(ptr ptr ptr) -@ stub SetupDiGetDeviceInstanceIdA -@ stub SetupDiGetDeviceInstanceIdW +@ stdcall SetupDiGetDeviceInstanceIdA(ptr ptr str long ptr) +@ stdcall SetupDiGetDeviceInstanceIdW(ptr ptr wstr long ptr) @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr) @ stdcall SetupDiGetDeviceRegistryPropertyW(long ptr long ptr ptr long ptr) @ stdcall SetupDiGetDriverInfoDetailA(ptr ptr ptr ptr long ptr) _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-11-26 01:44:36 UTC (rev 19597) +++ trunk/reactos/lib/setupapi/stubs.c 2005-11-26 01:56:07 UTC (rev 19598) @@ -221,5 +221,32 @@ BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData) { FIXME ("Stub %p\n", ClassImageListData); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return TRUE; } + +/********************************************************************** * + * SetupDiGetDeviceInstanceIdA(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstanceIdA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + PSTR DeviceInstanceId, DWORD DeviceInstanceIdSize, + PDWORD RequiredSize) +{ + FIXME ("Stub %p %p %p %d %p\n", + DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * + * SetupDiGetDeviceInstanceIdW(SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + PWSTR DeviceInstanceId, DWORD DeviceInstanceIdSize, + PDWORD RequiredSize) +{ + FIXME ("Stub %p %p %p %d %p\n", + DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

19 years, 1 month

[greatlrd] 19597: adding dplayx.dll to bootcd

by greatlrd＠svn.reactos.com

adding dplayx.dll to bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-26 01:41:16 UTC (rev 19596) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-26 01:44:36 UTC (rev 19597) @@ -89,6 +89,7 @@ lib\dinput8\dinput8.dll 1 lib\dnsapi\dnsapi.dll 1 lib\dplay\dplay.dll 1 +lib\dplayx\dplayx.dll 1 lib\dsound\dsound.dll 1 lib\dxdiagn\dxdiagn.dll 1 lib\fmifs\fmifs.dll 1

19 years, 1 month

[greatlrd] 19596: adding d3d8thk.dll and dplay.dll to bootcd

by greatlrd＠svn.reactos.com

adding d3d8thk.dll and dplay.dll to bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-26 01:08:19 UTC (rev 19595) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-26 01:41:16 UTC (rev 19596) @@ -79,6 +79,7 @@ lib\comdlg32\comdlg32.dll 1 lib\crtdll\crtdll.dll 1 lib\crypt32\crypt32.dll 1 +lib\d3d8thk\d3d8thk.dll 1 lib\dbghelp\dbghelp.dll 1 lib\ddraw\ddraw.dll 1 lib\devenum\devenum.dll 1 @@ -87,6 +88,7 @@ lib\dinput\dinput.dll 1 lib\dinput8\dinput8.dll 1 lib\dnsapi\dnsapi.dll 1 +lib\dplay\dplay.dll 1 lib\dsound\dsound.dll 1 lib\dxdiagn\dxdiagn.dll 1 lib\fmifs\fmifs.dll 1

19 years, 1 month

[weiden] 19595: minor fixes and documentation updates

by weiden＠svn.reactos.com

minor fixes and documentation updates Modified: trunk/reactos/lib/devmgr/hwpage.c _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 00:25:25 UTC (rev 19594) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 01:08:19 UTC (rev 19595) @@ -199,9 +199,9 @@ { /* convert the string to an integer value and create a formatted string */ - unsigned long ulLocation = wcstoul(szBuffer, - NULL, - 10); + ULONG ulLocation = (ULONG)wcstoul(szBuffer, + NULL, + 10); if (LoadAndFormatString(hDllInstance, IDS_LOCATIONSTR, &szFormatted, @@ -227,7 +227,22 @@ LocalFree((HLOCAL)szFormatted); } - /* FIXME - Display the device status */ + /* FIXME - get the device status text */ + LoadString(hDllInstance, + IDS_UNKNOWN, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0])); + + if (LoadAndFormatString(hDllInstance, + IDS_STATUS, + &szFormatted, + szBuffer) != 0) + { + SetDlgItemText(hpd->hWnd, + IDC_STATUS, + szFormatted); + LocalFree((HLOCAL)szFormatted); + } } else { @@ -249,6 +264,7 @@ HwDevInfo != NULL); } + static VOID FreeDevicesList(IN PHARDWARE_PAGE_DATA hpd) { @@ -257,14 +273,15 @@ ClassDevInfo = hpd->ClassDevInfo; LastClassDevInfo = ClassDevInfo + hpd->NumberOfGuids; - /* free the device info set handles */ + /* free the device info set handles and structures */ while (ClassDevInfo != LastClassDevInfo) { if (ClassDevInfo->hDevInfo != INVALID_HANDLE_VALUE) { SetupDiDestroyDeviceInfoList(ClassDevInfo->hDevInfo); + ClassDevInfo->hDevInfo = INVALID_HANDLE_VALUE; } - ClassDevInfo->hDevInfo = NULL; + ClassDevInfo->ItemCount = 0; ClassDevInfo->ImageIndex = 0; @@ -295,6 +312,8 @@ while (ClassDevInfo != LastClassDevInfo) { ClassDevInfo->ImageIndex = -1; + + /* open a class device handle for the GUID we're processing */ ClassDevInfo->hDevInfo = SetupDiGetClassDevs(&ClassDevInfo->Guid, NULL, hpd->hWnd, @@ -307,6 +326,7 @@ &ClassDevInfo->Guid, &ClassDevInfo->ImageIndex); + /* enumerate all devices in the class */ while (SetupDiEnumDeviceInfo(ClassDevInfo->hDevInfo, MemberIndex++, &DevInfoData)) @@ -341,6 +361,7 @@ } } + /* save all information for the current device */ ClassDevInfo->HwDevInfo[ClassDevInfo->ItemCount].ClassDevInfo = ClassDevInfo; ClassDevInfo->HwDevInfo[ClassDevInfo->ItemCount++].DevInfoData = DevInfoData; } @@ -352,7 +373,7 @@ static VOID -FillDevicesList(IN PHARDWARE_PAGE_DATA hpd) +FillDevicesListViewControl(IN PHARDWARE_PAGE_DATA hpd) { PHWCLASSDEVINFO ClassDevInfo, LastClassDevInfo; PHWDEVINFO HwDevInfo, LastHwDevInfo; @@ -377,6 +398,7 @@ INT iItem; LVITEM li; + /* get the device name */ if ((SetupDiGetDeviceRegistryProperty(ClassDevInfo->hDevInfo, &HwDevInfo->DevInfoData, SPDRP_FRIENDLYNAME, @@ -410,6 +432,7 @@ { ItemCount++; + /* get the device type for the second column */ if (SetupDiGetClassDescription(&ClassDevInfo->Guid, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), @@ -721,6 +744,26 @@ break; } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_TROUBLESHOOT: + { + /* FIXME - start the help using the command in the window text */ + break; + } + + case IDC_PROPERTIES: + { + /* FIXME - display the properties dialog for the currently + selected device */ + break; + } + } + break; + } + case WM_SIZE: HardwareDlgResize(hpd, (INT)LOWORD(lParam), @@ -804,7 +847,7 @@ InitializeDevicesList(hpd); /* fill the devices list view control */ - FillDevicesList(hpd); + FillDevicesListViewControl(hpd); /* decide whether to show or hide the troubleshoot button */ EnableTroubleShoot(hpd, @@ -859,20 +902,11 @@ * hWndParent: Handle to the parent window * lpGuids: An array of guids of devices that are to be listed * uNumberOfGuids: Numbers of guids in the Guids array - * Unknown: Unknown parameter, see NOTEs + * DisplayMode: Sets the size of the device list view control * * RETURN VALUE * Returns the handle of the hardware page window that has been created or * NULL if it failed. - * - * REVISIONS - * 13-05-2005 first working version (Sebastian Gasiorek <zebasoftis(a)gmail.com>) - * - * TODO - * missing: device icon in list view, Troubleshoot button, device properties, - * status description, - * devices should be visible afer PSN_SETACTIVE message - * */ HWND WINAPI @@ -905,6 +939,7 @@ i < uNumberOfGuids; i++) { + hpd->ClassDevInfo[i].hDevInfo = INVALID_HANDLE_VALUE; hpd->ClassDevInfo[i].Guid = lpGuids[i]; }

19 years, 1 month

[weiden] 19594: display the device location

by weiden＠svn.reactos.com

display the device location Modified: trunk/reactos/lib/devmgr/En.rc Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/resource.h _____ Modified: trunk/reactos/lib/devmgr/En.rc --- trunk/reactos/lib/devmgr/En.rc 2005-11-25 23:49:10 UTC (rev 19593) +++ trunk/reactos/lib/devmgr/En.rc 2005-11-26 00:25:25 UTC (rev 19594) @@ -9,6 +9,8 @@ IDS_MANUFACTURER "Manufacturer: %1" IDS_LOCATION "Location: %1" IDS_STATUS "Device Status: %1" + IDS_UNKNOWN "Unknown" + IDS_LOCATIONSTR "Location %1!u! (%2)" END IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400 _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-11-25 23:49:10 UTC (rev 19593) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 00:25:25 UTC (rev 19594) @@ -131,7 +131,6 @@ { PHWDEVINFO HwDevInfo; HWND hBtnTroubleShoot, hBtnProperties; - DWORD RegDataType; hBtnTroubleShoot = GetDlgItem(hpd->hWnd, IDC_TROUBLESHOOT); @@ -142,9 +141,13 @@ if (HwDevInfo != NULL) { /* update static controls */ + CONFIGRET cRet; + DWORD RegDataType; + ULONG DataSize; WCHAR szBuffer[256]; LPWSTR szFormatted = NULL; + /* get the manufacturer string */ if (!SetupDiGetDeviceRegistryProperty(HwDevInfo->ClassDevInfo->hDevInfo, &HwDevInfo->DevInfoData, SPDRP_MFG, @@ -154,9 +157,9 @@ NULL) || RegDataType != REG_SZ) { - /* FIXME - check string for NULL termination! */ szBuffer[0] = L'\0'; } + /* FIXME - check string for NULL termination! */ if (LoadAndFormatString(hDllInstance, IDS_MANUFACTURER, &szFormatted, @@ -168,7 +171,63 @@ LocalFree((HLOCAL)szFormatted); } - /* FIXME - Display location and status */ + /* get the location string */ + DataSize = sizeof(szBuffer); + cRet = CM_Get_DevNode_Registry_Property(HwDevInfo->DevInfoData.DevInst, + CM_DRP_LOCATION_INFORMATION, + &RegDataType, + szBuffer, + &DataSize, + 0); + if (cRet != CR_SUCCESS || + RegDataType != REG_SZ) + { + szBuffer[0] = L'\0'; + + if (cRet == CR_NO_SUCH_REGISTRY_KEY || + cRet == CR_NO_SUCH_VALUE) + { + LoadString(hDllInstance, + IDS_UNKNOWN, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0])); + } + } + /* FIXME - check string for NULL termination! */ + + if (szBuffer[0] >= L'0' && szBuffer[0] <= L'9') + { + /* convert the string to an integer value and create a + formatted string */ + unsigned long ulLocation = wcstoul(szBuffer, + NULL, + 10); + if (LoadAndFormatString(hDllInstance, + IDS_LOCATIONSTR, + &szFormatted, + ulLocation, + szBuffer) != 0) + { + wcsncpy(szBuffer, + szFormatted, + (sizeof(szBuffer) / sizeof(szBuffer[0])) - 1); + szBuffer[(sizeof(szBuffer) / sizeof(szBuffer[0])) - 1] = L'\0'; + LocalFree((HLOCAL)szFormatted); + } + } + + if (LoadAndFormatString(hDllInstance, + IDS_LOCATION, + &szFormatted, + szBuffer) != 0) + { + SetDlgItemText(hpd->hWnd, + IDC_LOCATION, + szFormatted); + LocalFree((HLOCAL)szFormatted); + } + + /* FIXME - Display the device status */ } else { @@ -186,8 +245,8 @@ EnableWindow(hBtnTroubleShoot, HwDevInfo != NULL); - EnableWindow(hBtnTroubleShoot, - hBtnProperties != NULL); + EnableWindow(hBtnProperties, + HwDevInfo != NULL); } static VOID _____ Modified: trunk/reactos/lib/devmgr/resource.h --- trunk/reactos/lib/devmgr/resource.h 2005-11-25 23:49:10 UTC (rev 19593) +++ trunk/reactos/lib/devmgr/resource.h 2005-11-26 00:25:25 UTC (rev 19594) @@ -21,8 +21,9 @@ #define IDS_MANUFACTURER 0x102 #define IDS_LOCATION 0x103 #define IDS_STATUS 0x104 +#define IDS_UNKNOWN 0x105 +#define IDS_LOCATIONSTR 0x106 - #endif /* __DEVMGR_RESOURCE_H */ /* EOF */

19 years, 1 month

[gvg] 19593: Sync to Wine-0_9_2:

by gvg＠svn.reactos.com

Sync to Wine-0_9_2: Francois Gouget <fgouget(a)free.fr> - Remove spaces before '\n' in traces. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Unconditionally fall back to ANSI DDE APIs in ShellExecute if current emulated Windows version is Win9x, Excel refuses to communicate with a unicode client in win9x mode. Martin Fuchs <martin-fuchs(a)gmx.net> - SHGetFileInfoW(): handle SHGFI_LINKOVERLAY and SHGFI_OVERLAYINDEX. - SHMapPIDLToSystemImageListIndex(): determine overlay flag for PidlToSicIndex() and return -1 in error cases. - Read shell overlay icon settings from registry to allow icon overrides. Markus Amsler <markus.amsler(a)oribi.org> - Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Changes: - add missing description - add missing returns section - complete missing A/W pairs - reformate comments, to match c2man requirements Ge van Geldorp <gvg(a)reactos.org> - Hack around missing icons Modified: trunk/reactos/lib/shell32/brsfolder.c Modified: trunk/reactos/lib/shell32/iconcache.c Modified: trunk/reactos/lib/shell32/shell32_main.c Modified: trunk/reactos/lib/shell32/shell32_main.h Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shfldr_desktop.c Modified: trunk/reactos/lib/shell32/shfldr_mycomp.c _____ Modified: trunk/reactos/lib/shell32/brsfolder.c --- trunk/reactos/lib/shell32/brsfolder.c 2005-11-25 23:36:32 UTC (rev 19592) +++ trunk/reactos/lib/shell32/brsfolder.c 2005-11-25 23:49:10 UTC (rev 19593) @@ -679,11 +679,11 @@ info.lpBrowseInfo = lpbi; info.hwndTreeView = NULL; - hr = CoInitialize(NULL); + hr = OleInitialize(NULL); r = DialogBoxParamW( shell32_hInstance, swBrowseTemplateName, lpbi->hwndOwner, BrsFolderDlgProc, (LPARAM)&info ); if (SUCCEEDED(hr)) - CoUninitialize(); + OleUninitialize(); if (!r) return NULL; _____ Modified: trunk/reactos/lib/shell32/iconcache.c --- trunk/reactos/lib/shell32/iconcache.c 2005-11-25 23:36:32 UTC (rev 19592) +++ trunk/reactos/lib/shell32/iconcache.c 2005-11-25 23:49:10 UTC (rev 19593) @@ -96,6 +96,9 @@ return 0; } +/* declare SIC_LoadOverlayIcon() */ +static int SIC_LoadOverlayIcon(int idx); + /*********************************************************************** ****** * SIC_OverlayShortcutImage [internal] * @@ -103,7 +106,7 @@ * Creates a new icon as a copy of the passed-in icon, overlayed with a * shortcut image. */ -static HICON SIC_OverlayShortcutImage(HICON SourceIcon) +static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large) { ICONINFO SourceIconInfo, ShortcutIconInfo, TargetIconInfo; HICON ShortcutIcon, TargetIcon; BITMAP SourceBitmapInfo, ShortcutBitmapInfo; @@ -115,15 +118,28 @@ OldShortcutBitmap = NULL, OldTargetBitmap = NULL; + static int s_imgListIdx = -1; + /* Get information about the source icon and shortcut overlay */ if (! GetIconInfo(SourceIcon, &SourceIconInfo) || 0 == GetObjectW(SourceIconInfo.hbmColor, sizeof(BITMAP), &SourceBitmapInfo)) { return NULL; } - ShortcutIcon = LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_SHORTCUT), - IMAGE_ICON, SourceBitmapInfo.bmWidth, SourceBitmapInfo.bmWidth, - LR_SHARED); + + /* search for the shortcut icon only once */ + if (s_imgListIdx == -1) + s_imgListIdx = SIC_LoadOverlayIcon(-IDI_SHELL_SHORTCUT); + + if (s_imgListIdx != -1) + { + if (large) + ShortcutIcon = ImageList_GetIcon(ShellBigIconList, s_imgListIdx, ILD_TRANSPARENT); + else + ShortcutIcon = ImageList_GetIcon(ShellSmallIconList, s_imgListIdx, ILD_TRANSPARENT); + } else + ShortcutIcon = NULL; + if (NULL == ShortcutIcon || ! GetIconInfo(ShortcutIcon, &ShortcutIconInfo) || 0 == GetObjectW(ShortcutIconInfo.hbmColor, sizeof(BITMAP), &ShortcutBitmapInfo)) @@ -313,8 +329,8 @@ if (0 != (dwFlags & GIL_FORSHORTCUT)) { - hiconLargeShortcut = SIC_OverlayShortcutImage(hiconLarge); - hiconSmallShortcut = SIC_OverlayShortcutImage(hiconSmall); + hiconLargeShortcut = SIC_OverlayShortcutImage(hiconLarge, TRUE); + hiconSmallShortcut = SIC_OverlayShortcutImage(hiconSmall, FALSE); if (NULL != hiconLargeShortcut && NULL != hiconSmallShortcut) { hiconLarge = hiconLargeShortcut; @@ -456,6 +472,52 @@ LeaveCriticalSection(&SHELL32_SicCS); } +/********************************************************************** ******* + * SIC_LoadOverlayIcon [internal] + * + * Load a shell overlay icon and return its icon cache index. + */ +static int SIC_LoadOverlayIcon(int idx) +{ + WCHAR buffer[1024], wszIdx[8]; + HKEY hKeyShellIcons; + LPCWSTR iconPath; + int iconIdx; + + static const WCHAR wszShellIcons[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t' ,'\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r' ,'s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','I','c','o','n','s',0 + }; + static const WCHAR wszNumFmt[] = {'%','d',0}; + + iconPath = swShell32Name; /* default: load icon from shell32.dll */ + iconIdx = idx; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszShellIcons, 0, KEY_READ, &hKeyShellIcons) == ERROR_SUCCESS) + { + DWORD count = sizeof(buffer); + + sprintfW(wszIdx, wszNumFmt, idx); + + /* read icon path and index */ + if (RegQueryValueExW(hKeyShellIcons, wszIdx, NULL, NULL, (LPBYTE)buffer, &count) == ERROR_SUCCESS) + { + LPWSTR p = strchrW(buffer, ','); + + if (p) + *p++ = 0; + + iconPath = buffer; + iconIdx = atoiW(p); + } + + RegCloseKey(hKeyShellIcons); + } + + return SIC_LoadIcon(iconPath, iconIdx, 0); +} + /*********************************************************************** ** * Shell_GetImageList [SHELL32.71] * @@ -494,29 +556,15 @@ { IExtractIconW *ei; WCHAR szIconFile[MAX_PATH]; /* file containing the icon */ - char szTemp[MAX_PATH]; INT iSourceIndex; /* index or resID(negated) in this file */ BOOL ret = FALSE; UINT dwFlags = 0; - HKEY keyCls; int iShortcutDefaultIndex = INVALID_INDEX; TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small"); if (SUCCEEDED (IShellFolder_GetUIObjectOf(sh, 0, 1, &pidl, &IID_IExtractIconW, 0, (void **)&ei))) { - if (_ILGetExtension(pidl, szTemp, MAX_PATH) && - HCR_MapTypeToValueA(szTemp, szTemp, MAX_PATH, TRUE)) - { - if (ERROR_SUCCESS == RegOpenKeyExA(HKEY_CLASSES_ROOT, szTemp, 0, KEY_QUERY_VALUE, &keyCls)) - { - if (ERROR_SUCCESS == RegQueryValueExA(keyCls, "IsShortcut", NULL, NULL, NULL, NULL)) - { - uFlags |= GIL_FORSHORTCUT; - } - RegCloseKey(keyCls); - } - } if (SUCCEEDED(IExtractIconW_GetIconLocation(ei, uFlags, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags))) { *pIndex = SIC_GetIconIndex(szIconFile, iSourceIndex, uFlags); @@ -560,15 +608,19 @@ int *pIndex) { int Index; + UINT uGilFlags = 0; TRACE("(SF=%p,pidl=%p,%p)\n",sh,pidl,pIndex); pdump(pidl); + if (SHELL_IsShortcut(pidl)) + uGilFlags |= GIL_FORSHORTCUT; + if (pIndex) - if (!PidlToSicIndex ( sh, pidl, 1, 0, pIndex)) - *pIndex = -1; + if (!PidlToSicIndex ( sh, pidl, 1, uGilFlags, pIndex)) + *pIndex = -1; - if (!PidlToSicIndex ( sh, pidl, 0, 0, &Index)) + if (!PidlToSicIndex ( sh, pidl, 0, uGilFlags, &Index)) return -1; return Index; _____ Modified: trunk/reactos/lib/shell32/shell32_main.c --- trunk/reactos/lib/shell32/shell32_main.c 2005-11-25 23:36:32 UTC (rev 19592) +++ trunk/reactos/lib/shell32/shell32_main.c 2005-11-25 23:49:10 UTC (rev 19593) @@ -297,6 +297,32 @@ return 0; } +/********************************************************************** *** + * SHELL_IsShortcut [internal] + * + * Decide if an item id list points to a shell shortcut + */ +BOOL SHELL_IsShortcut(LPCITEMIDLIST pidlLast) +{ + char szTemp[MAX_PATH]; + HKEY keyCls; + BOOL ret = FALSE; + + if (_ILGetExtension(pidlLast, szTemp, MAX_PATH) && + HCR_MapTypeToValueA(szTemp, szTemp, MAX_PATH, TRUE)) + { + if (ERROR_SUCCESS == RegOpenKeyExA(HKEY_CLASSES_ROOT, szTemp, 0, KEY_QUERY_VALUE, &keyCls)) + { + if (ERROR_SUCCESS == RegQueryValueExA(keyCls, "IsShortcut", NULL, NULL, NULL, NULL)) + ret = TRUE; + + RegCloseKey(keyCls); + } + } + + return ret; +} + #define SHGFI_KNOWN_FLAGS \ (SHGFI_SMALLICON | SHGFI_OPENICON | SHGFI_SHELLICONSIZE | SHGFI_PIDL | \ SHGFI_USEFILEATTRIBUTES | SHGFI_ADDOVERLAYS | SHGFI_OVERLAYINDEX | \ @@ -320,6 +346,7 @@ LPITEMIDLIST pidlLast = NULL, pidl = NULL; HRESULT hr = S_OK; BOOL IconNotYetLoaded=TRUE; + UINT uGilFlags = 0; TRACE("%s fattr=0x%lx sfi=%p(attr=0x%08lx) size=0x%x flags=0x%x\n", (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, @@ -458,15 +485,21 @@ } /* ### icons ###*/ - if (flags & SHGFI_ADDOVERLAYS) - FIXME("SHGFI_ADDOVERLAYS unhandled\n"); + if (flags & SHGFI_OPENICON) + uGilFlags |= GIL_OPENICON; + if (flags & SHGFI_LINKOVERLAY) + uGilFlags |= GIL_FORSHORTCUT; + else if ((flags&SHGFI_ADDOVERLAYS) || + (flags&(SHGFI_ICON|SHGFI_SMALLICON))==SHGFI_ICON) + { + if (SHELL_IsShortcut(pidlLast)) + uGilFlags |= GIL_FORSHORTCUT; + } + if (flags & SHGFI_OVERLAYINDEX) FIXME("SHGFI_OVERLAYINDEX unhandled\n"); - if (flags & SHGFI_LINKOVERLAY) - FIXME("set icon to link, stub\n"); - if (flags & SHGFI_SELECTED) FIXME("set icon to selected, stub\n"); @@ -483,12 +516,11 @@ &uDummy, (LPVOID*)&pei); if (SUCCEEDED(hr)) { - hr = IExtractIconW_GetIconLocation(pei, - (flags & SHGFI_OPENICON)? GIL_OPENICON : 0, + hr = IExtractIconW_GetIconLocation(pei, uGilFlags, szLocation, MAX_PATH, &iIndex, &uFlags); psfi->iIcon = iIndex; - if (uFlags != GIL_NOTFILENAME) + if (!(uFlags & GIL_NOTFILENAME)) lstrcpyW (psfi->szDisplayName, szLocation); else ret = FALSE; @@ -550,7 +582,7 @@ else { if (!(PidlToSicIndex(psfParent, pidlLast, !(flags & SHGFI_SMALLICON), - (flags & SHGFI_OPENICON)? GIL_OPENICON : 0, &(psfi->iIcon)))) + uGilFlags, &(psfi->iIcon)))) { ret = FALSE; } _____ Modified: trunk/reactos/lib/shell32/shell32_main.h --- trunk/reactos/lib/shell32/shell32_main.h 2005-11-25 23:36:32 UTC (rev 19592) +++ trunk/reactos/lib/shell32/shell32_main.h 2005-11-25 23:49:10 UTC (rev 19593) @@ -227,4 +227,7 @@ /* Default shell folder value registration */ HRESULT SHELL_RegisterShellFolders(void); +/* Detect Shell Links */ +BOOL SHELL_IsShortcut(LPCITEMIDLIST); + #endif _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-11-25 23:36:32 UTC (rev 19592) +++ trunk/reactos/lib/shell32/shellpath.c 2005-11-25 23:49:10 UTC (rev 19593) @@ -1586,7 +1586,7 @@ */ HRESULT WINAPI SHGetFolderPathW( HWND hwndOwner, /* [I] owner window */ - int nFolder, /* [I] CSIDL identifing the folder */ + int nFolder, /* [I] CSIDL identifying the folder */ HANDLE hToken, /* [I] access token */ DWORD dwFlags, /* [I] which path to return */ LPWSTR pszPath) /* [O] converted path */ _____ Modified: trunk/reactos/lib/shell32/shfldr_desktop.c --- trunk/reactos/lib/shell32/shfldr_desktop.c 2005-11-25 23:36:32 UTC (rev 19592) +++ trunk/reactos/lib/shell32/shfldr_desktop.c 2005-11-25 23:49:10 UTC (rev 19593) @@ -271,36 +271,37 @@ if (dwFlags & SHCONTF_FOLDERS) { HKEY hkey; - LONG r; + UINT i; /* create the pidl for This item */ ret = AddToEnumList(list, _ILCreateMyComputer()); - r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, Desktop_NameSpaceW, - 0, KEY_READ, &hkey); - if (ret && ERROR_SUCCESS == r) - { - WCHAR iid[50]; - int i=0; - BOOL moreKeys = TRUE; - - while (ret && moreKeys) + for (i=0; i<2; i++) { + if (ret && !RegOpenKeyExW(i == 0 ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, + Desktop_NameSpaceW, 0, KEY_READ, &hkey)) { - DWORD size; + WCHAR iid[50]; + int i=0; - size = sizeof (iid); - r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL); - if (ERROR_SUCCESS == r) + while (ret) { - ret = AddToEnumList(list, _ILCreateGuidFromStrW(iid)); - i++; + DWORD size; + LONG r; + + size = sizeof (iid); + r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL); + if (ERROR_SUCCESS == r) + { + ret = AddToEnumList(list, _ILCreateGuidFromStrW(iid)); + i++; + } + else if (ERROR_NO_MORE_ITEMS == r) + break; + else + ret = FALSE; } - else if (ERROR_NO_MORE_ITEMS == r) - moreKeys = FALSE; - else - ret = FALSE; + RegCloseKey(hkey); } - RegCloseKey(hkey); } } _____ Modified: trunk/reactos/lib/shell32/shfldr_mycomp.c --- trunk/reactos/lib/shell32/shfldr_mycomp.c 2005-11-25 23:36:32 UTC (rev 19592) +++ trunk/reactos/lib/shell32/shfldr_mycomp.c 2005-11-25 23:49:10 UTC (rev 19593) @@ -274,6 +274,7 @@ WCHAR wszDriveName[] = {'A', ':', '\\', '\0'}; DWORD dwDrivemap = GetLogicalDrives(); HKEY hkey; + UINT i; while (ret && wszDriveName[0]<='Z') { @@ -284,32 +285,34 @@ } TRACE("-- (%p)-> enumerate (mycomputer shell extensions)\n",list); - if (ret && !RegOpenKeyExW(HKEY_LOCAL_MACHINE, MyComputer_NameSpaceW, - 0, KEY_READ, &hkey)) - { - WCHAR iid[50]; - int i=0; - - while (ret) + for (i=0; i<2; i++) { + if (ret && !RegOpenKeyExW(i == 0 ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, + MyComputer_NameSpaceW, 0, KEY_READ, &hkey)) { - DWORD size; - LONG r; + WCHAR iid[50]; + int i=0; - size = sizeof(iid) / sizeof(iid[0]); - r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL); - if (ERROR_SUCCESS == r) + while (ret) { - /* FIXME: shell extensions, shouldn't the type be - * PT_SHELLEXT? */ - ret = AddToEnumList(list, _ILCreateGuidFromStrW(iid)); - i++; + DWORD size; + LONG r; + + size = sizeof(iid) / sizeof(iid[0]); + r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL); + if (ERROR_SUCCESS == r) + { + /* FIXME: shell extensions, shouldn't the type be + * PT_SHELLEXT? */ + ret = AddToEnumList(list, _ILCreateGuidFromStrW(iid)); + i++; + } + else if (ERROR_NO_MORE_ITEMS == r) + break; + else + ret = FALSE; } - else if (ERROR_NO_MORE_ITEMS == r) - break; - else - ret = FALSE; + RegCloseKey(hkey); } - RegCloseKey(hkey); } } return ret;

19 years, 1 month

← Newer
1
...
17
18
19
20
21
22
23
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005