September 2007 - Wine-commits

Juan Lang : setupapi: Implement SetupDiGetDeviceInstanceIdW.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: f94f6367f2f4ada5bfb1fe973c6836b2b2e71dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94f6367f2f4ada5bfb1fe973… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:09:43 2007 -0700 setupapi: Implement SetupDiGetDeviceInstanceIdW. --- dlls/setupapi/devinst.c | 56 +++++++++++++++++++++++++++++++++++----- dlls/setupapi/tests/devinst.c | 11 -------- 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9c844ba..95221de 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -97,7 +97,10 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(LPCWSTR instanceId) devInfo->instanceId = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(instanceId) + 1) * sizeof(WCHAR)); if (devInfo->instanceId) + { lstrcpyW(devInfo->instanceId, instanceId); + struprW(devInfo->instanceId); + } else { HeapFree(GetProcessHeap(), 0, devInfo); @@ -886,7 +889,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( SetLastError(ERROR_INVALID_DEVINST_NAME); else { - static const WCHAR newDeviceFmt[] = {'R','o','o','t','\\','%','s', + static const WCHAR newDeviceFmt[] = {'R','O','O','T','\\','%','s', '\\','%','0','4','d',0}; DWORD devId; @@ -938,7 +941,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( struct DeviceInfo *devInfo = (struct DeviceInfo *)set->devices[i].Reserved; - if (!lstrcmpW(DeviceName, devInfo->instanceId)) + if (!lstrcmpiW(DeviceName, devInfo->instanceId)) { SetLastError(ERROR_DEVINST_ALREADY_EXISTS); ret = FALSE; @@ -1050,8 +1053,16 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdA( if (!len) ret = FALSE; - else if (RequiredSize) - *RequiredSize = len; + else + { + if (len > DeviceInstanceIdSize) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + if (RequiredSize) + *RequiredSize = len; + } } HeapFree(GetProcessHeap(), 0, instanceId); } @@ -1068,10 +1079,41 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW( DWORD DeviceInstanceIdSize, PDWORD RequiredSize) { - FIXME("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + + TRACE("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) + || !DeviceInfoData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + TRACE("instance ID: %s\n", debugstr_w(devInfo->instanceId)); + if (DeviceInstanceIdSize < lstrlenW(devInfo->instanceId) + 1) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + if (RequiredSize) + *RequiredSize = lstrlenW(devInfo->instanceId) + 1; + return FALSE; + } + lstrcpyW(DeviceInstanceId, devInfo->instanceId); + if (RequiredSize) + *RequiredSize = lstrlenW(devInfo->instanceId) + 1; + return TRUE; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 28e2624..c88ad24 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -217,12 +217,10 @@ static void testGetDeviceInstanceId(void) } SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInstanceIdA(NULL, NULL, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLEHANDLE, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInstanceIdA(NULL, &devInfo, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLEHANDLE, got %08x\n", GetLastError()); set = pSetupDiCreateDeviceInfoList(&guid, NULL); @@ -235,23 +233,19 @@ static void testGetDeviceInstanceId(void) SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInstanceIdA(set, NULL, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); devInfo.cbSize = sizeof(devInfo); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, @@ -259,14 +253,11 @@ static void testGetDeviceInstanceId(void) ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %08x\n", GetLastError()); ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, instanceID, sizeof(instanceID), NULL); - todo_wine ok(ret, "SetupDiGetDeviceInstanceIdA failed: %08x\n", GetLastError()); - todo_wine ok(!lstrcmpA(instanceID, "ROOT\\LEGACY_BOGUS\\0000"), "Unexpected instance ID %s\n", instanceID); ret = pSetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, @@ -274,9 +265,7 @@ static void testGetDeviceInstanceId(void) ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, instanceID, sizeof(instanceID), NULL); - todo_wine ok(ret, "SetupDiGetDeviceInstanceIdA failed: %08x\n", GetLastError()); - todo_wine ok(!lstrcmpA(instanceID, "ROOT\\LEGACY_BOGUS\\0001"), "Unexpected instance ID %s\n", instanceID); pSetupDiDestroyDeviceInfoList(set);

1 0

Juan Lang : setupapi: Implement SetupDiGetDeviceRegistryPropertyA/W.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: bc924f5b3a02316f71b70653da4c953ba00f557e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc924f5b3a02316f71b70653d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:10:10 2007 -0700 setupapi: Implement SetupDiGetDeviceRegistryPropertyA/W. --- dlls/setupapi/devinst.c | 156 ++++++++++++++++++++++++++++++++++++++++++- dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 154 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 95221de..40b6a7e 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -67,6 +67,22 @@ static const WCHAR DeviceClasses[] = {'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', 'D','e','v','i','c','e','C','l','a','s','s','e','s',0}; +static const WCHAR Enum[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'E','n','u','m',0}; +static const WCHAR DeviceDesc[] = {'D','e','v','i','c','e','D','e','s','c',0}; +static const WCHAR HardwareId[] = {'H','a','r','d','w','a','r','e','I','D',0}; +static const WCHAR CompatibleIDs[] = {'C','o','m','p','a','t','i','b','l','e','I','d','s',0}; +static const WCHAR Service[] = {'S','e','r','v','i','c','e',0}; +static const WCHAR Driver[] = {'D','r','i','v','e','r',0}; +static const WCHAR ConfigFlags[] = {'C','o','n','f','i','g','F','l','a','g','s',0}; +static const WCHAR Mfg[] = {'M','f','g',0}; +static const WCHAR FriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; +static const WCHAR LocationInformation[] = {'L','o','c','a','t','i','o','n','I','n','f','o','r','m','a','t','i','o','n',0}; +static const WCHAR Capabilities[] = {'C','a','p','a','b','i','l','i','t','i','e','s',0}; +static const WCHAR UINumber[] = {'U','I','N','u','m','b','e','r',0}; +static const WCHAR UpperFilters[] = {'U','p','p','e','r','F','i','l','t','e','r','s',0}; +static const WCHAR LowerFilters[] = {'L','o','w','e','r','F','i','l','t','e','r','s',0}; /* is used to identify if a DeviceInfoSet pointer is valid or not */ @@ -84,6 +100,7 @@ struct DeviceInfoSet /* Pointed to by SP_DEVINFO_DATA's Reserved member */ struct DeviceInfo { + HKEY key; LPWSTR instanceId; }; @@ -98,8 +115,20 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(LPCWSTR instanceId) (lstrlenW(instanceId) + 1) * sizeof(WCHAR)); if (devInfo->instanceId) { + HKEY enumKey; + LONG l; + + devInfo->key = INVALID_HANDLE_VALUE; lstrcpyW(devInfo->instanceId, instanceId); struprW(devInfo->instanceId); + l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &enumKey, NULL); + if (!l) + { + RegCreateKeyExW(enumKey, devInfo->instanceId, 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &devInfo->key, NULL); + RegCloseKey(enumKey); + } } else { @@ -112,6 +141,8 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(LPCWSTR instanceId) static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo) { + if (devInfo->key != INVALID_HANDLE_VALUE) + RegCloseKey(devInfo->key); HeapFree(GetProcessHeap(), 0, devInfo->instanceId); HeapFree(GetProcessHeap(), 0, devInfo); } @@ -1478,11 +1509,40 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( return FALSE; } +struct PropertyMapEntry +{ + DWORD regType; + LPCSTR nameA; + LPCWSTR nameW; +}; + +static struct PropertyMapEntry PropertyMap[] = { + { REG_SZ, "DeviceDesc", DeviceDesc }, + { REG_MULTI_SZ, "HardwareId", HardwareId }, + { REG_MULTI_SZ, "CompatibleIDs", CompatibleIDs }, + { 0, NULL, NULL }, /* SPDRP_UNUSED0 */ + { REG_SZ, "Service", Service }, + { 0, NULL, NULL }, /* SPDRP_UNUSED1 */ + { 0, NULL, NULL }, /* SPDRP_UNUSED2 */ + { REG_SZ, "Class", Class }, + { REG_SZ, "ClassGUID", ClassGUID }, + { REG_SZ, "Driver", Driver }, + { REG_DWORD, "ConfigFlags", ConfigFlags }, + { REG_SZ, "Mfg", Mfg }, + { REG_SZ, "FriendlyName", FriendlyName }, + { REG_SZ, "LocationInformation", LocationInformation }, + { 0, NULL, NULL }, /* SPDRP_PHYSICAL_DEVICE_OBJECT_NAME */ + { REG_DWORD, "Capabilities", Capabilities }, + { REG_DWORD, "UINumber", UINumber }, + { REG_MULTI_SZ, "UpperFilters", UpperFilters }, + { REG_MULTI_SZ, "LowerFilters", LowerFilters }, +}; + /*********************************************************************** * SetupDiGetDeviceRegistryPropertyA (SETUPAPI.@) */ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( - HDEVINFO devinfo, + HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Property, PDWORD PropertyRegDataType, @@ -1490,10 +1550,100 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( DWORD PropertyBufferSize, PDWORD RequiredSize) { - FIXME("%04x %p %d %p %p %d %p\n", (DWORD)devinfo, DeviceInfoData, + BOOL ret = FALSE; + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + + TRACE("%04x %p %d %p %p %d %p\n", (DWORD)DeviceInfoSet, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); - return FALSE; + + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) + || !DeviceInfoData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) + && PropertyMap[Property].nameA) + { + DWORD size = PropertyBufferSize; + LONG l = RegQueryValueExA(devInfo->key, PropertyMap[Property].nameA, + NULL, PropertyRegDataType, PropertyBuffer, &size); + + if (RequiredSize) + *RequiredSize = size; + if (!l) + ret = TRUE; + else + SetLastError(l); + } + return ret; +} + +/*********************************************************************** + * SetupDiGetDeviceRegistryPropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Property, + PDWORD PropertyRegDataType, + PBYTE PropertyBuffer, + DWORD PropertyBufferSize, + PDWORD RequiredSize) +{ + BOOL ret = FALSE; + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + + TRACE("%04x %p %d %p %p %d %p\n", (DWORD)DeviceInfoSet, DeviceInfoData, + Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, + RequiredSize); + + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) + || !DeviceInfoData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) + && PropertyMap[Property].nameW) + { + DWORD size = PropertyBufferSize; + LONG l = RegQueryValueExW(devInfo->key, PropertyMap[Property].nameW, + NULL, PropertyRegDataType, PropertyBuffer, &size); + + if (RequiredSize) + *RequiredSize = size; + if (!l) + ret = TRUE; + else + SetLastError(l); + } + return ret; } /*********************************************************************** diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 1ca28af..870a1f9 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -330,7 +330,7 @@ @ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr) @ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr) @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr) -@ stub SetupDiGetDeviceRegistryPropertyW +@ stdcall SetupDiGetDeviceRegistryPropertyW(long ptr long ptr ptr long ptr) @ stub SetupDiGetDriverInfoDetailA @ stub SetupDiGetDriverInfoDetailW @ stub SetupDiGetDriverInstallParamsA

1 0

Juan Lang : setupapi: Implement SetupDiSetDeviceRegistryPropertyA/W.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 60fefd72e8330e2942235309e3cd3ea2604c7a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fefd72e8330e2942235309e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:10:32 2007 -0700 setupapi: Implement SetupDiSetDeviceRegistryPropertyA/W. --- dlls/setupapi/devinst.c | 96 +++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 +- 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 40b6a7e..d92754b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1647,6 +1647,102 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( } /*********************************************************************** + * SetupDiSetDeviceRegistryPropertyA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Property, + const BYTE *PropertyBuffer, + DWORD PropertyBufferSize) +{ + BOOL ret = FALSE; + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + + TRACE("%p %p %d %p %d\n", DeviceInfoSet, DeviceInfoData, Property, + PropertyBuffer, PropertyBufferSize); + + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) + || !DeviceInfoData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) + && PropertyMap[Property].nameA) + { + LONG l = RegSetValueExA(devInfo->key, PropertyMap[Property].nameA, 0, + PropertyMap[Property].regType, PropertyBuffer, + PropertyBufferSize); + if (!l) + ret = TRUE; + else + SetLastError(l); + } + return ret; +} + +/*********************************************************************** + * SetupDiSetDeviceRegistryPropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Property, + const BYTE *PropertyBuffer, + DWORD PropertyBufferSize) +{ + BOOL ret = FALSE; + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + + TRACE("%p %p %d %p %d\n", DeviceInfoSet, DeviceInfoData, Property, + PropertyBuffer, PropertyBufferSize); + + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) + || !DeviceInfoData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) + && PropertyMap[Property].nameW) + { + LONG l = RegSetValueExW(devInfo->key, PropertyMap[Property].nameW, 0, + PropertyMap[Property].regType, PropertyBuffer, + PropertyBufferSize); + if (!l) + ret = TRUE; + else + SetLastError(l); + } + return ret; +} + +/*********************************************************************** * SetupDiInstallClassA (SETUPAPI.@) */ BOOL WINAPI SetupDiInstallClassA( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 870a1f9..6b93af3 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -374,8 +374,8 @@ @ stub SetupDiSetClassInstallParamsW @ stub SetupDiSetDeviceInstallParamsA @ stub SetupDiSetDeviceInstallParamsW -@ stub SetupDiSetDeviceRegistryPropertyA -@ stub SetupDiSetDeviceRegistryPropertyW +@ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr ptr) +@ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr ptr) @ stub SetupDiSetDriverInstallParamsA @ stub SetupDiSetDriverInstallParamsW @ stub SetupDiSetSelectedDevice

1 0

Juan Lang : setupapi: Make a helper to convert a GUID to a string.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: e1449796973d67a204e72f6b43124c9f5f2609f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1449796973d67a204e72f6b4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:11:53 2007 -0700 setupapi: Make a helper to convert a GUID to a string. --- dlls/setupapi/devinst.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index d92754b..3a4c130 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -147,6 +147,18 @@ static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo) HeapFree(GetProcessHeap(), 0, devInfo); } +static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) +{ + static const WCHAR fmt[] = {'{','%','0','8','X','-','%','0','4','X','-', + '%','0','4','X','-','%','0','2','X','%','0','2','X','-','%','0','2', + 'X','%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%', + '0','2','X','}',0}; + + sprintfW(guidStr, fmt, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); +} + /* Adds a device with GUID guid and identifer devInst to set. Allocates a * struct DeviceInfo, and points the returned device info's Reserved member * to it. @@ -1984,7 +1996,6 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( PCWSTR MachineName, PVOID Reserved) { - LPWSTR lpGuidString; WCHAR bracedGuidString[39]; HKEY hClassesKey; HKEY hClassKey; @@ -2023,16 +2034,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( if (ClassGuid == NULL) return hClassesKey; - if (UuidToStringW((UUID*)ClassGuid, &lpGuidString) != RPC_S_OK) - { - RegCloseKey(hClassesKey); - return INVALID_HANDLE_VALUE; - } - bracedGuidString[0] = '{'; - memcpy(&bracedGuidString[1], lpGuidString, 36*sizeof(WCHAR)); - bracedGuidString[37] = '}'; - bracedGuidString[38] = 0; - RpcStringFreeW(&lpGuidString); + SETUPDI_GuidToString(ClassGuid, bracedGuidString); if (RegOpenKeyExW(hClassesKey, bracedGuidString,

1 0

Clinton Stimpson : riched20: Only WM_CHAR respects text limit.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: f34cb461e7381cf1e871649c750e22fb5ac7452f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34cb461e7381cf1e871649c7… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Thu Sep 20 15:58:02 2007 -0600 riched20: Only WM_CHAR respects text limit. --- dlls/riched20/caret.c | 10 +++++++--- dlls/riched20/editor.c | 16 +++++++++++----- dlls/riched20/tests/editor.c | 12 ------------ 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index f5fbf00..47e816c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -441,7 +441,7 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, { const WCHAR *pos; ME_Cursor *p = NULL; - int freeSpace; + int oldLen; /* FIXME really HERE ? */ if (ME_IsSelection(editor)) @@ -449,7 +449,7 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, /* FIXME: is this too slow? */ /* Didn't affect performance for WM_SETTEXT (around 50sec/30K) */ - freeSpace = editor->nTextLimit - ME_GetTextLength(editor); + oldLen = ME_GetTextLength(editor); /* text operations set modified state */ editor->nModifyStep = 1; @@ -459,7 +459,11 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, assert(nCursor>=0 && nCursor<editor->nCursors); if (len == -1) len = lstrlenW(str); - len = min(len, freeSpace); + + /* grow the text limit to fit our text */ + if(editor->nTextLimit < oldLen +len) + editor->nTextLimit = oldLen + len; + while (len) { pos = str; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3e1cdf2..dff0b5f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2413,11 +2413,17 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, } if (((unsigned)wstr)>=' ' || wstr=='\r' || wstr=='\t') { /* FIXME maybe it would make sense to call EM_REPLACESEL instead ? */ - ME_Style *style = ME_GetInsertStyle(editor, 0); - ME_SaveTempStyle(editor); - ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); - ME_ReleaseStyle(style); - ME_CommitUndo(editor); + /* WM_CHAR is restricted to nTextLimit */ + int from, to; + ME_GetSelection(editor, &from, &to); + if(editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) + { + ME_Style *style = ME_GetInsertStyle(editor, 0); + ME_SaveTempStyle(editor); + ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); + ME_ReleaseStyle(style); + ME_CommitUndo(editor); + } ME_UpdateRepaint(editor); } return 0; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 98b355e..5c00586 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1116,26 +1116,18 @@ static void test_EM_EXLIMITTEXT(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); i = strlen(buffer); -todo_wine { ok(10 == i, "expected 10 chars\n"); -} i = SendMessage(hwndRichEdit, EM_GETLIMITTEXT, 0, 0); -todo_wine { ok(10 == i, "EM_EXLIMITTEXT: expected: %d, actual: %d\n", 10, i); -} /* try inserting more text at end */ i = SendMessage(hwndRichEdit, WM_CHAR, 'A', 0); ok(0 == i, "WM_CHAR wasn't processed"); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); i = strlen(buffer); -todo_wine { ok(10 == i, "expected 10 chars, got %i\n", i); -} i = SendMessage(hwndRichEdit, EM_GETLIMITTEXT, 0, 0); -todo_wine { ok(10 == i, "EM_EXLIMITTEXT: expected: %d, actual: %d\n", 10, i); -} /* try inserting text at beginning */ SendMessage(hwndRichEdit, EM_SETSEL, 0, 0); @@ -1143,13 +1135,9 @@ todo_wine { ok(0 == i, "WM_CHAR wasn't processed"); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); i = strlen(buffer); -todo_wine { ok(10 == i, "expected 10 chars, got %i\n", i); -} i = SendMessage(hwndRichEdit, EM_GETLIMITTEXT, 0, 0); -todo_wine { ok(10 == i, "EM_EXLIMITTEXT: expected: %d, actual: %d\n", 10, i); -} /* WM_CHAR is limited */ textlimit = 1;

1 0

Michael Stefaniuc : kernel32: Fix a memory leak. Found by cross referencing Andrew Talbot' s list of potential memory leaks with Smatch's view of the same problem.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: ebd1ba807e8c76b3139901d58d70a2f64d6f5648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd1ba807e8c76b3139901d58… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 20 23:49:29 2007 +0200 kernel32: Fix a memory leak. Found by cross referencing Andrew Talbot's list of potential memory leaks with Smatch's view of the same problem. --- dlls/kernel32/resource.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index d66f4ae..ff2ec95 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -1150,6 +1150,7 @@ static struct mapping_info *create_mapping( LPCWSTR name, BOOL rw ) } unmap_file_from_memory( mi ); + HeapFree( GetProcessHeap(), 0, mi ); return NULL; }

1 0

Rob Shearman : userenv: Add a stub for UnloadUserProfile.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: ac7e221c20ba46e08f3b0cd58a6f7b123e212ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7e221c20ba46e08f3b0cd58… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Sep 20 22:58:59 2007 +0100 userenv: Add a stub for UnloadUserProfile. --- dlls/userenv/userenv.spec | 2 +- dlls/userenv/userenv_main.c | 6 ++++++ include/userenv.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index 57726ba..cecde03 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -10,5 +10,5 @@ @ stdcall LoadUserProfileA(ptr ptr) @ stub LoadUserProfileW @ stdcall RegisterGPNotification(long long) -@ stub UnloadUserProfile +@ stdcall UnloadUserProfile(ptr ptr) @ stdcall UnregisterGPNotification(long) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 75fd651..0efea5c 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -128,3 +128,9 @@ BOOL WINAPI UnregisterGPNotification( HANDLE event ) FIXME("%p\n", event ); return TRUE; } + +BOOL WINAPI UnloadUserProfile( HANDLE hToken, HANDLE hProfile ) +{ + FIXME("(%p, %p): stub\n", hToken, hProfile); + return FALSE; +} diff --git a/include/userenv.h b/include/userenv.h index f2f2176..20d7fa1 100644 --- a/include/userenv.h +++ b/include/userenv.h @@ -45,6 +45,7 @@ BOOL WINAPI LoadUserProfileA(HANDLE,LPPROFILEINFOA); BOOL WINAPI LoadUserProfileW(HANDLE,LPPROFILEINFOW); #define LoadUserProfile WINELIB_NAME_AW(LoadUserProfile) BOOL WINAPI RegisterGPNotification(HANDLE,BOOL); +BOOL WINAPI UnloadUserProfile(HANDLE,HANDLE); BOOL WINAPI UnregisterGPNotification(HANDLE); #ifdef __cplusplus

1 0

Juan Lang : setupapi: Implement SetupDiCreateDeviceInfoW.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 83f05e79bb77785a101c458100dc227738abda6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f05e79bb77785a101c45810… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:09:18 2007 -0700 setupapi: Implement SetupDiCreateDeviceInfoW. --- dlls/setupapi/devinst.c | 203 ++++++++++++++++++++++++++++++++++++++--- dlls/setupapi/tests/devinst.c | 7 -- 2 files changed, 189 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83f05e79bb77785a101c4…

1 0

Andrew Talbot : dmscript: Indirection level fix.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 5d0f2bb6a651b39ce44b5ab0c45c6de8e6fe4833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0f2bb6a651b39ce44b5ab0c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 21 00:02:21 2007 +0100 dmscript: Indirection level fix. --- dlls/dmscript/dmscript_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index d88ea20..383bf90 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -828,7 +828,7 @@ const char *debugstr_dmguid (const GUID *id) { if (!id) return "(null)"; for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { - if (IsEqualGUID(id, &guids[i].guid)) + if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } /* if we didn't find it, act like standard debugstr_guid */

1 0

Andrew Talbot : dmsynth: Indirection level fix.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 7bea8dd9b62412858ac05daf093127150e8d179b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bea8dd9b62412858ac05daf0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 21 00:02:30 2007 +0100 dmsynth: Indirection level fix. --- dlls/dmsynth/dmsynth_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 5c2fae6..f144119 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -376,7 +376,7 @@ const char *debugstr_dmguid (const GUID *id) { if (!id) return "(null)"; for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { - if (IsEqualGUID(id, &guids[i].guid)) + if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } /* if we didn't find it, act like standard debugstr_guid */

1 0