October 2007 - Wine-commits

Juan Lang : iphlpapi: Improve GetPerAdapterInfo stub.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: b0efe7f8b883a95e85eb247f22b8de4ba926014b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0efe7f8b883a95e85eb247f2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 12 16:16:35 2007 -0700 iphlpapi: Improve GetPerAdapterInfo stub. --- dlls/iphlpapi/iphlpapi_main.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2aac18d..eaccf83 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1450,13 +1450,33 @@ DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf) * Failure: error code from winerror.h * * FIXME - * Stub, returns ERROR_NOT_SUPPORTED. + * Stub, returns empty IP_PER_ADAPTER_INFO in every case. */ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen) { + ULONG bytesNeeded = sizeof(IP_PER_ADAPTER_INFO); + DWORD ret; + TRACE("(IfIndex %d, pPerAdapterInfo %p, pOutBufLen %p)\n", IfIndex, pPerAdapterInfo, pOutBufLen); - return ERROR_NOT_SUPPORTED; + if (!pOutBufLen) + ret = ERROR_INVALID_PARAMETER; + else if (!pPerAdapterInfo) + { + *pOutBufLen = bytesNeeded; + ret = NO_ERROR; + } + else if (*pOutBufLen < bytesNeeded) + { + *pOutBufLen = bytesNeeded; + ret = ERROR_BUFFER_OVERFLOW; + } + else + { + memset(pPerAdapterInfo, 0, bytesNeeded); + ret = NO_ERROR; + } + return ret; }

1 0

Juan Lang : setupapi: Make error checking in SetupDiCreateDevRegKeyW more like that in SetupDiOpenDevRegKey .
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 36229a74d1c1fcab58c56ff9bf23326707d5832c URL: http://source.winehq.org/git/wine.git/?a=commit;h=36229a74d1c1fcab58c56ff9b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 12 08:25:51 2007 -0700 setupapi: Make error checking in SetupDiCreateDevRegKeyW more like that in SetupDiOpenDevRegKey. --- dlls/setupapi/devinst.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9ac5008..0a6bed8 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1264,6 +1264,16 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } + if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) + { + SetLastError(ERROR_INVALID_FLAGS); + return INVALID_HANDLE_VALUE; + } + if (KeyType != DIREG_DEV && KeyType != DIREG_DRV) + { + SetLastError(ERROR_INVALID_FLAGS); + return INVALID_HANDLE_VALUE; + } if (devInfo->phantom) { SetLastError(ERROR_DEVINFO_NOT_REGISTERED);

1 0

Juan Lang : setupapi: Implement SetupDiDeleteDevRegKey.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 8b5faacfb400279641b3c88801fed9775aafc700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b5faacfb400279641b3c8880… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 12 08:26:31 2007 -0700 setupapi: Implement SetupDiDeleteDevRegKey. --- dlls/setupapi/devinst.c | 125 ++++++++++++++++++++++++++++++++++++++++++- dlls/setupapi/setupapi.spec | 2 +- include/setupapi.h | 2 +- 3 files changed, 125 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0a6bed8..4087710 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -439,8 +439,8 @@ static HKEY SETUPDI_CreateDrvKey(struct DeviceInfo *devInfo) KEY_ALL_ACCESS, NULL, &classKey, NULL); if (!l) { - static const WCHAR fmt[] = { '%','0','4','d',0 }; - WCHAR devId[5]; + static const WCHAR fmt[] = { '%','0','4','u',0 }; + WCHAR devId[10]; sprintfW(devId, fmt, devInfo->devId); RegCreateKeyExW(classKey, devId, 0, NULL, 0, KEY_READ | KEY_WRITE, @@ -3678,3 +3678,124 @@ HKEY WINAPI SetupDiOpenDevRegKey( } return key; } + +static BOOL SETUPDI_DeleteDevKey(struct DeviceInfo *devInfo) +{ + HKEY enumKey; + BOOL ret = FALSE; + LONG l; + + l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, + NULL, &enumKey, NULL); + if (!l) + { + ret = RegDeleteTreeW(enumKey, devInfo->instanceId); + RegCloseKey(enumKey); + } + else + SetLastError(l); + return ret; +} + +static BOOL SETUPDI_DeleteDrvKey(struct DeviceInfo *devInfo) +{ + static const WCHAR slash[] = { '\\',0 }; + WCHAR classKeyPath[MAX_PATH]; + HKEY classKey; + LONG l; + BOOL ret = FALSE; + + lstrcpyW(classKeyPath, ControlClass); + lstrcatW(classKeyPath, slash); + SETUPDI_GuidToString(&devInfo->set->ClassGuid, + classKeyPath + lstrlenW(classKeyPath)); + l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, classKeyPath, 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &classKey, NULL); + if (!l) + { + static const WCHAR fmt[] = { '%','0','4','u',0 }; + WCHAR devId[10]; + + sprintfW(devId, fmt, devInfo->devId); + ret = RegDeleteTreeW(classKey, devId); + RegCloseKey(classKey); + } + else + SetLastError(l); + return ret; +} + +/*********************************************************************** + * SetupDiOpenDevRegKey (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDevRegKey( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Scope, + DWORD HwProfile, + DWORD KeyType) +{ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + BOOL ret = FALSE; + + TRACE("%p %p %d %d %d\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, + KeyType); + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)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; + } + if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + if (KeyType != DIREG_DEV && KeyType != DIREG_DRV) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (devInfo->set != set) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (devInfo->phantom) + { + SetLastError(ERROR_DEVINFO_NOT_REGISTERED); + return FALSE; + } + if (Scope != DICS_FLAG_GLOBAL) + FIXME("unimplemented for scope %d\n", Scope); + switch (KeyType) + { + case DIREG_DEV: + ret = SETUPDI_DeleteDevKey(devInfo); + break; + case DIREG_DRV: + ret = SETUPDI_DeleteDrvKey(devInfo); + break; + case DIREG_BOTH: + ret = SETUPDI_DeleteDevKey(devInfo); + if (ret) + ret = SETUPDI_DeleteDrvKey(devInfo); + break; + default: + WARN("unknown KeyType %d\n", KeyType); + } + return ret; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index f6ed8ed..8f5d78c 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -292,7 +292,7 @@ @ stdcall SetupDiCreateDeviceInterfaceW(ptr ptr ptr wstr long ptr) @ stdcall SetupDiCreateDeviceInterfaceRegKeyA(ptr ptr long long ptr ptr) @ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr ptr) -@ stub SetupDiDeleteDevRegKey +@ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stub SetupDiDeleteDeviceInfo @ stub SetupDiDeleteDeviceInterfaceData @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) diff --git a/include/setupapi.h b/include/setupapi.h index 9379725..8e14f91 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1469,7 +1469,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO, PSP_DEVICE_INTERFACE_DATA); BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD); -BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, DWORD, DWORD); +BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD); BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA); BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO); BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO, PSP_DEVINFO_DATA, DWORD);

1 0

Juan Lang : setupapi: Don't abort key enumeration early.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 162911baef8f5488a4bc1fbfdec70f621c51a381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=162911baef8f5488a4bc1fbfd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 12 08:26:56 2007 -0700 setupapi: Don't abort key enumeration early. --- dlls/setupapi/devinst.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 4087710..8abd2e7 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1998,6 +1998,8 @@ static void SETUPDI_AddDeviceInterfaces(SP_DEVINFO_DATA *dev, HKEY key, SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink); RegCloseKey(subKey); } + /* Allow enumeration to continue */ + l = ERROR_SUCCESS; } } /* FIXME: find and add all the device's interfaces to the device */ @@ -2071,6 +2073,8 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet, } RegCloseKey(subKey); } + /* Allow enumeration to continue */ + l = ERROR_SUCCESS; } } if (enumKey != INVALID_HANDLE_VALUE) @@ -2190,6 +2194,8 @@ static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet, } RegCloseKey(subKey); } + /* Allow enumeration to continue */ + l = ERROR_SUCCESS; } } } @@ -2241,6 +2247,8 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, subKeyName, subKey, class, flags); RegCloseKey(subKey); } + /* Allow enumeration to continue */ + l = ERROR_SUCCESS; } } }

1 0

Gerald Pfeifer : widl: Fix build failure in parser.y.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: a7c6a27696353f20aac9015ac1a7d54ea63d07ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c6a27696353f20aac9015ac… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Oct 12 12:27:41 2007 +0200 widl: Fix build failure in parser.y. --- tools/widl/parser.y | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 06f1f77..afab0d2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -514,6 +514,7 @@ uuid_string: | aSTRING { if (!is_valid_uuid($1)) yyerror("invalid UUID: %s", $1); $$ = parse_uuid($1); } + ; callconv: | tSTDCALL

1 0

Juan Lang : setupapi: Remove bogus part of test.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: f2c85adbc3043e10a0382b9065a388eb2ea6b424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c85adbc3043e10a0382b906… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 12 08:23:43 2007 -0700 setupapi: Remove bogus part of test. --- dlls/setupapi/tests/devinst.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a27fa5b..f1f44af 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -190,7 +190,7 @@ static void testInstallClass(void) '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', '1','1','d','b','-','b','7','0','4','-', '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; - char tmpfile[MAX_PATH], dstfile[MAX_PATH * 2]; + char tmpfile[MAX_PATH]; BOOL ret; if (!pSetupDiInstallClassA) @@ -219,10 +219,6 @@ static void testInstallClass(void) ret = pSetupDiInstallClassA(NULL, tmpfile, 0, NULL); ok(ret, "SetupDiInstallClassA failed: %08x\n", GetLastError()); RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey); - GetWindowsDirectoryA(dstfile, MAX_PATH); - lstrcatA(dstfile, "inf\\"); - lstrcatA(dstfile, tmpfile + 2); - DeleteFile(dstfile); DeleteFile(tmpfile); }

1 0

Juan Lang : setupapi: Improve parameter checking in SetupDiInstallClass.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 8cacf12fe5dff8a35ed6555e3ca29fb9489a33d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cacf12fe5dff8a35ed6555e3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 12 08:24:04 2007 -0700 setupapi: Improve parameter checking in SetupDiInstallClass. --- dlls/setupapi/devinst.c | 10 ++++++++++ dlls/setupapi/tests/devinst.c | 1 - 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9ad0c03..645211a 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3181,6 +3181,11 @@ BOOL WINAPI SetupDiInstallClassA( UNICODE_STRING FileNameW; BOOL Result; + if (!InfFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (!RtlCreateUnicodeStringFromAsciiz(&FileNameW, InfFileName)) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -3283,6 +3288,11 @@ BOOL WINAPI SetupDiInstallClassW( FIXME("\n"); + if (!InfFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if ((Flags & DI_NOVCP) && (FileQueue == NULL || FileQueue == INVALID_HANDLE_VALUE)) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f1f44af..009b94a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -204,7 +204,6 @@ static void testInstallClass(void) create_inf_file(tmpfile + 2); ret = pSetupDiInstallClassA(NULL, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); ret = pSetupDiInstallClassA(NULL, NULL, DI_NOVCP, NULL);

1 0

Juan Lang : setupapi: Test SetupDiOpenDevRegKey.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 559f89afd293547d842f7644f785521cd23f32ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=559f89afd293547d842f7644f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 12 08:24:27 2007 -0700 setupapi: Test SetupDiOpenDevRegKey. --- dlls/setupapi/tests/devinst.c | 118 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 009b94a..eeec247 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -36,11 +36,14 @@ static HMODULE hSetupAPI; static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoList)(GUID*,HWND); static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCreateDeviceInterfaceA)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); +static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); static BOOL (WINAPI *pSetupDiEnumDeviceInfo)(HDEVINFO, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiEnumDeviceInterfaces)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, DWORD, PSP_DEVICE_INTERFACE_DATA); static BOOL (WINAPI *pSetupDiInstallClassA)(HWND, PCSTR, DWORD, HSPFILEQ); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); +static HKEY (WINAPI *pSetupDiOpenDevRegKey)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); +static HKEY (WINAPI *pSetupDiCreateDevRegKeyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCWSTR); static BOOL (WINAPI *pSetupDiCreateDeviceInfoA)(HDEVINFO, PCSTR, GUID *, PCSTR, HWND, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DATA, PSTR, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); @@ -55,12 +58,15 @@ static void init_function_pointers(void) pSetupDiCreateDeviceInfoListExW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoListExW"); pSetupDiCreateDeviceInterfaceA = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInterfaceA"); pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); + pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiEnumDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInfo"); pSetupDiEnumDeviceInterfaces = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInterfaces"); pSetupDiGetDeviceInstanceIdA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInstanceIdA"); pSetupDiGetDeviceInterfaceDetailA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInterfaceDetailA"); pSetupDiInstallClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiInstallClassA"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); + pSetupDiOpenDevRegKey = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenDevRegKey"); + pSetupDiCreateDevRegKeyW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDevRegKeyW"); pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); } @@ -579,6 +585,117 @@ static void testGetDeviceInterfaceDetail(void) } } +static void testDevRegKey(void) +{ + static const WCHAR classKey[] = {'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','\\','C','l','a','s','s','\\', + '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', + '1','1','d','b','-','b','7','0','4','-', + '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; + BOOL ret; + GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, + 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; + HDEVINFO set; + + if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || + !pSetupDiCreateDeviceInfoA || !pSetupDiOpenDevRegKey || + !pSetupDiRegisterDeviceInfo || !pSetupDiCreateDevRegKeyW || + !pSetupDiCallClassInstaller) + { + skip("No SetupDiOpenDevRegKey\n"); + return; + } + set = pSetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %d\n", GetLastError()); + if (set) + { + SP_DEVINFO_DATA devInfo = { sizeof(devInfo), { 0 } }; + HKEY key = INVALID_HANDLE_VALUE; + + ret = pSetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, + NULL, NULL, 0, &devInfo); + ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + key = pSetupDiOpenDevRegKey(NULL, NULL, 0, 0, 0, 0); + todo_wine + ok(key == INVALID_HANDLE_VALUE && + GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + key = pSetupDiOpenDevRegKey(set, NULL, 0, 0, 0, 0); + todo_wine + ok(key == INVALID_HANDLE_VALUE && + GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + key = pSetupDiOpenDevRegKey(set, &devInfo, 0, 0, 0, 0); + todo_wine + ok(key == INVALID_HANDLE_VALUE && + GetLastError() == ERROR_INVALID_FLAGS, + "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, 0, 0); + todo_wine + ok(key == INVALID_HANDLE_VALUE && + GetLastError() == ERROR_INVALID_FLAGS, + "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, + DIREG_BOTH, 0); + todo_wine + ok(key == INVALID_HANDLE_VALUE && + GetLastError() == ERROR_INVALID_FLAGS, + "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, + DIREG_DRV, 0); + todo_wine + ok(key == INVALID_HANDLE_VALUE && + GetLastError() == ERROR_DEVINFO_NOT_REGISTERED, + "Expected ERROR_DEVINFO_NOT_REGISTERED, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); + ok(ret, "SetupDiRegisterDeviceInfo failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, + DIREG_DRV, 0); + /* The software key isn't created by default */ + todo_wine + ok(key == INVALID_HANDLE_VALUE && + GetLastError() == ERROR_KEY_DOES_NOT_EXIST, + "Expected ERROR_KEY_DOES_NOT_EXIST_EXIST, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, + DIREG_DEV, 0); + todo_wine + ok(key == INVALID_HANDLE_VALUE && + GetLastError() == ERROR_KEY_DOES_NOT_EXIST, + "Expected ERROR_KEY_DOES_NOT_EXIST_EXIST, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + key = pSetupDiCreateDevRegKeyW(set, &devInfo, DICS_FLAG_GLOBAL, 0, + DIREG_DRV, NULL, NULL); + ok(key != INVALID_HANDLE_VALUE, "SetupDiCreateDevRegKey failed: %08x\n", + GetLastError()); + RegCloseKey(key); + SetLastError(0xdeadbeef); + key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, + DIREG_DRV, 0); + todo_wine + ok(key == INVALID_HANDLE_VALUE && + GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, + DIREG_DRV, KEY_READ); + todo_wine + ok(key != INVALID_HANDLE_VALUE, "SetupDiOpenDevRegKey failed: %08x\n", + GetLastError()); + ret = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); + pSetupDiDestroyDeviceInfoList(set); + } + RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); +} + START_TEST(devinst) { init_function_pointers(); @@ -598,4 +715,5 @@ START_TEST(devinst) testRegisterDeviceInfo(); testCreateDeviceInterface(); testGetDeviceInterfaceDetail(); + testDevRegKey(); }

1 0

Juan Lang : setupapi: Implement SetupDiOpenDevRegKey.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 629123bae4ef4a8eb7e0dd390936b34ed0613ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629123bae4ef4a8eb7e0dd390… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 12 08:25:24 2007 -0700 setupapi: Implement SetupDiOpenDevRegKey. --- dlls/setupapi/devinst.c | 99 ++++++++++++++++++++++++++++++++++++++++- dlls/setupapi/tests/devinst.c | 7 --- 2 files changed, 97 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 645211a..9ac5008 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3558,6 +3558,46 @@ BOOL WINAPI SetupDiGetDeviceInstallParamsA( return FALSE; } +static HKEY SETUPDI_OpenDevKey(struct DeviceInfo *devInfo, REGSAM samDesired) +{ + HKEY enumKey, key = INVALID_HANDLE_VALUE; + LONG l; + + l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, + NULL, &enumKey, NULL); + if (!l) + { + RegOpenKeyExW(enumKey, devInfo->instanceId, 0, samDesired, &key); + RegCloseKey(enumKey); + } + return key; +} + +static HKEY SETUPDI_OpenDrvKey(struct DeviceInfo *devInfo, REGSAM samDesired) +{ + static const WCHAR slash[] = { '\\',0 }; + WCHAR classKeyPath[MAX_PATH]; + HKEY classKey, key = INVALID_HANDLE_VALUE; + LONG l; + + lstrcpyW(classKeyPath, ControlClass); + lstrcatW(classKeyPath, slash); + SETUPDI_GuidToString(&devInfo->set->ClassGuid, + classKeyPath + lstrlenW(classKeyPath)); + l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, classKeyPath, 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &classKey, NULL); + if (!l) + { + static const WCHAR fmt[] = { '%','0','4','u',0 }; + WCHAR devId[10]; + + sprintfW(devId, fmt, devInfo->devId); + RegOpenKeyExW(classKey, devId, 0, samDesired, &key); + RegCloseKey(classKey); + } + return key; +} + /*********************************************************************** * SetupDiOpenDevRegKey (SETUPAPI.@) */ @@ -3569,7 +3609,62 @@ HKEY WINAPI SetupDiOpenDevRegKey( DWORD KeyType, REGSAM samDesired) { - FIXME("%p %p %d %d %d %x\n", DeviceInfoSet, DeviceInfoData, + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + HKEY key = INVALID_HANDLE_VALUE; + + TRACE("%p %p %d %d %d %x\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, samDesired); - return INVALID_HANDLE_VALUE; + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return INVALID_HANDLE_VALUE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return INVALID_HANDLE_VALUE; + } + if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) + || !DeviceInfoData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) + { + SetLastError(ERROR_INVALID_FLAGS); + return INVALID_HANDLE_VALUE; + } + if (KeyType != DIREG_DEV && KeyType != DIREG_DRV) + { + SetLastError(ERROR_INVALID_FLAGS); + return INVALID_HANDLE_VALUE; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (devInfo->set != set) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + if (devInfo->phantom) + { + SetLastError(ERROR_DEVINFO_NOT_REGISTERED); + return INVALID_HANDLE_VALUE; + } + if (Scope != DICS_FLAG_GLOBAL) + FIXME("unimplemented for scope %d\n", Scope); + switch (KeyType) + { + case DIREG_DEV: + key = SETUPDI_OpenDevKey(devInfo, samDesired); + break; + case DIREG_DRV: + key = SETUPDI_OpenDrvKey(devInfo, samDesired); + break; + default: + WARN("unknown KeyType %d\n", KeyType); + } + return key; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index eeec247..115da83 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -618,39 +618,33 @@ static void testDevRegKey(void) ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); key = pSetupDiOpenDevRegKey(NULL, NULL, 0, 0, 0, 0); - todo_wine ok(key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); SetLastError(0xdeadbeef); key = pSetupDiOpenDevRegKey(set, NULL, 0, 0, 0, 0); - todo_wine ok(key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); key = pSetupDiOpenDevRegKey(set, &devInfo, 0, 0, 0, 0); - todo_wine ok(key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); SetLastError(0xdeadbeef); key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, 0, 0); - todo_wine ok(key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); SetLastError(0xdeadbeef); key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, DIREG_BOTH, 0); - todo_wine ok(key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); SetLastError(0xdeadbeef); key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); - todo_wine ok(key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_DEVINFO_NOT_REGISTERED, "Expected ERROR_DEVINFO_NOT_REGISTERED, got %08x\n", GetLastError()); @@ -687,7 +681,6 @@ static void testDevRegKey(void) "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ); - todo_wine ok(key != INVALID_HANDLE_VALUE, "SetupDiOpenDevRegKey failed: %08x\n", GetLastError()); ret = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo);

1 0

Huw Davies : gdi32: Factor out the code to call FT_Load_Sfnt_Table.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 6ee7182ebbe36ea68f9d6f4cdc5f9785498e8cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee7182ebbe36ea68f9d6f4cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 12 14:06:24 2007 +0100 gdi32: Factor out the code to call FT_Load_Sfnt_Table. --- dlls/gdi32/freetype.c | 103 ++++++++++++++++++++++++++++-------------------- 1 files changed, 60 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 495db78..b9bc82a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -944,6 +944,58 @@ static WCHAR *get_familyname(FT_Face ft_face) } +/***************************************************************** + * load_sfnt_table + * + * Wrapper around FT_Load_Sfnt_Table to cope with older versions + * of FreeType that don't export this function. + * + */ +static FT_Error load_sfnt_table(FT_Face ft_face, FT_ULong table, FT_Long offset, FT_Byte *buf, FT_ULong *len) +{ + + FT_Error err; + + /* If the FT_Load_Sfnt_Table function is there we'll use it */ + if(pFT_Load_Sfnt_Table) + { + err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, len); + } +#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H + else /* Do it the hard way */ + { + TT_Face tt_face = (TT_Face) ft_face; + SFNT_Interface *sfnt; + if (FT_Version.major==2 && FT_Version.minor==0) + { + /* 2.0.x */ + sfnt = *(SFNT_Interface**)((char*)tt_face + 528); + } + else + { + /* A field was added in the middle of the structure in 2.1.x */ + sfnt = *(SFNT_Interface**)((char*)tt_face + 532); + } + err = sfnt->load_any(tt_face, table, offset, buf, len); + } +#else + else + { + static int msg; + if(!msg) + { + MESSAGE("This version of Wine was compiled with freetype headers later than 2.2.0\n" + "but is being run with a freetype library without the FT_Load_Sfnt_Table function.\n" + "Please upgrade your freetype library.\n"); + msg++; + } + err = FT_Err_Unimplemented_Feature; + } +#endif + return err; +} + + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_size, char *fake_family, const WCHAR *target_family, DWORD flags) @@ -4564,50 +4616,15 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, (table >> 8 & 0xff00) | (table << 8 & 0xff0000); } - /* If the FT_Load_Sfnt_Table function is there we'll use it */ - if(pFT_Load_Sfnt_Table) { - /* make sure value of len is the value freetype says it needs */ - if( buf && len) { - FT_ULong needed = 0; - err = pFT_Load_Sfnt_Table(ft_face, table, offset, NULL, &needed); - if( !err && needed < len) len = needed; - } - err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); - } -#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H - else { /* Do it the hard way */ - TT_Face tt_face = (TT_Face) ft_face; - SFNT_Interface *sfnt; - if (FT_Version.major==2 && FT_Version.minor==0) - { - /* 2.0.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 528); - } - else - { - /* A field was added in the middle of the structure in 2.1.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 532); - } - /* make sure value of len is the value freetype says it needs */ - if( buf && len) { - FT_ULong needed = 0; - err = sfnt->load_any(tt_face, table, offset, NULL, &needed); - if( !err && needed < len) len = needed; - } - err = sfnt->load_any(tt_face, table, offset, buf, &len); - } -#else - else { - static int msg; - if(!msg) { - MESSAGE("This version of Wine was compiled with freetype headers later than 2.2.0\n" - "but is being run with a freetype library without the FT_Load_Sfnt_Table function.\n" - "Please upgrade your freetype library.\n"); - msg++; - } - err = FT_Err_Unimplemented_Feature; + /* make sure value of len is the value freetype says it needs */ + if(buf && len) + { + FT_ULong needed = 0; + err = load_sfnt_table(ft_face, table, offset, NULL, &needed); + if( !err && needed < len) len = needed; } -#endif + err = load_sfnt_table(ft_face, table, offset, buf, &len); + if(err) { TRACE("Can't find table %c%c%c%c\n", /* bytes were reversed */

1 0