September 2007 - Wine-commits

Mikolaj Zalewski : wintab32: Store the context internally as Unicode, implement WTOpenW and WTGetW.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: bc7c5218c7e8fbebfe19ae28b79ca724050fbd9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc7c5218c7e8fbebfe19ae28b… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Sep 20 13:02:10 2007 -0700 wintab32: Store the context internally as Unicode, implement WTOpenW and WTGetW. --- dlls/wintab32/context.c | 44 +++++++++++++++++++++++++------------- dlls/wintab32/wintab_internal.h | 2 +- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 4c08083..cb85e08 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -46,6 +46,14 @@ static BOOL gLoaded; static LPOPENCONTEXT gOpenContexts; static HCTX gTopContext = (HCTX)0xc00; +static void LOGCONTEXTAtoW(const LOGCONTEXTA *in, LOGCONTEXTW *out) +{ + MultiByteToWideChar(CP_ACP, 0, in->lcName, -1, out->lcName, LCNAMELEN); + out->lcName[LCNAMELEN - 1] = 0; + /* we use the fact that the fields after lcName are the same in LOGCONTEXTA and W */ + memcpy(&out->lcOptions, &in->lcOptions, sizeof(LOGCONTEXTA) - FIELD_OFFSET(LOGCONTEXTA, lcOptions)); +} + static void LOGCONTEXTWtoA(const LOGCONTEXTW *in, LOGCONTEXTA *out) { WideCharToMultiByte(CP_ACP, 0, in->lcName, LCNAMELEN, out->lcName, LCNAMELEN, NULL, NULL); @@ -114,7 +122,7 @@ static inline void DUMPPACKET(WTPACKET packet) packet.pkRotation.roRoll, packet.pkRotation.roYaw); } -static inline void DUMPCONTEXT(LOGCONTEXTA lc) +static inline void DUMPCONTEXT(LOGCONTEXTW lc) { CHAR mmsg[4000]; CHAR bits[100]; @@ -122,7 +130,7 @@ static inline void DUMPCONTEXT(LOGCONTEXTA lc) CHAR bits2[100]; sprintf(mmsg,"%s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %i ,%i, %i, %i, %i, %i,%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i %i %i", - debugstr_a(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, + wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice, lc.lcPktRate, (UINT)lc.lcPktData, DUMPBITS(lc.lcPktData,bits), (UINT)lc.lcPktMode, DUMPBITS(lc.lcPktMode,bits1), (UINT)lc.lcMoveMask, DUMPBITS(lc.lcMoveMask,bits2), (INT)lc.lcBtnDnMask, (INT)lc.lcBtnUpMask, @@ -452,9 +460,9 @@ UINT WINAPI WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) } /*********************************************************************** - * WTOpenA (WINTAB32.21) + * WTOpenW (WINTAB32.2021) */ -HCTX WINAPI WTOpenA(HWND hWnd, LPLOGCONTEXTA lpLogCtx, BOOL fEnable) +HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) { LPOPENCONTEXT newcontext; @@ -462,7 +470,7 @@ HCTX WINAPI WTOpenA(HWND hWnd, LPLOGCONTEXTA lpLogCtx, BOOL fEnable) DUMPCONTEXT(*lpLogCtx); newcontext = HeapAlloc(GetProcessHeap(), 0 , sizeof(OPENCONTEXT)); - memcpy(&(newcontext->context),lpLogCtx,sizeof(LOGCONTEXTA)); + memcpy(&(newcontext->context),lpLogCtx,sizeof(LOGCONTEXTW)); newcontext->hwndOwner = hWnd; newcontext->enabled = fEnable; newcontext->ActiveCursor = -1; @@ -491,15 +499,14 @@ HCTX WINAPI WTOpenA(HWND hWnd, LPLOGCONTEXTA lpLogCtx, BOOL fEnable) } /*********************************************************************** - * WTOpenW (WINTAB32.1021) + * WTOpenA (WINTAB32.21) */ -HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) +HCTX WINAPI WTOpenA(HWND hWnd, LPLOGCONTEXTA lpLogCtx, BOOL fEnable) { - FIXME("(%p, %p, %u): stub\n", hWnd, lpLogCtx, fEnable); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + LOGCONTEXTW logCtxW; - return NULL; + LOGCONTEXTAtoW(lpLogCtx, &logCtxW); + return WTOpenW(hWnd, &logCtxW, fEnable); } /*********************************************************************** @@ -686,7 +693,7 @@ BOOL WINAPI WTGetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); - memmove(lpLogCtx,&context->context,sizeof(LOGCONTEXTA)); + LOGCONTEXTWtoA(&context->context, lpLogCtx); LeaveCriticalSection(&csTablet); return TRUE; @@ -697,11 +704,18 @@ BOOL WINAPI WTGetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) */ BOOL WINAPI WTGetW(HCTX hCtx, LPLOGCONTEXTW lpLogCtx) { - FIXME("(%p, %p): stub\n", hCtx, lpLogCtx); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("(%p, %p)\n", hCtx, lpLogCtx); - return FALSE; + if (!hCtx) return 0; + + EnterCriticalSection(&csTablet); + context = TABLET_FindOpenContext(hCtx); + memmove(lpLogCtx,&context->context,sizeof(LOGCONTEXTW)); + LeaveCriticalSection(&csTablet); + + return TRUE; } /*********************************************************************** diff --git a/dlls/wintab32/wintab_internal.h b/dlls/wintab32/wintab_internal.h index 71a68ab..1c8636d 100644 --- a/dlls/wintab32/wintab_internal.h +++ b/dlls/wintab32/wintab_internal.h @@ -136,7 +136,7 @@ typedef struct tagWTPACKET { typedef struct tagOPENCONTEXT { HCTX handle; - LOGCONTEXTA context; + LOGCONTEXTW context; HWND hwndOwner; BOOL enabled; INT ActiveCursor;

1 0

Alexandre Julliard : setupapi: Simplify the SetupDiGetClassDescriptionExA/ W implementation.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 5d0dc4819336dd99537206a151e3f79285136b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0dc4819336dd99537206a15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 12:21:17 2007 +0200 setupapi: Simplify the SetupDiGetClassDescriptionExA/W implementation. --- dlls/setupapi/devinst.c | 70 +++++++---------------------------------------- 1 files changed, 10 insertions(+), 60 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index dc92431..bc51c2a 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1373,6 +1373,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExA( { HKEY hKey; DWORD dwLength; + BOOL ret; hKey = SetupDiOpenClassRegKeyExA(ClassGuid, KEY_ALL_ACCESS, @@ -1385,38 +1386,12 @@ BOOL WINAPI SetupDiGetClassDescriptionExA( return FALSE; } - if (RequiredSize != NULL) - { - dwLength = 0; - if (RegQueryValueExA(hKey, - NULL, - NULL, - NULL, - NULL, - &dwLength)) - { - RegCloseKey(hKey); - return FALSE; - } - - *RequiredSize = dwLength; - } - dwLength = ClassDescriptionSize; - if (RegQueryValueExA(hKey, - NULL, - NULL, - NULL, - (LPBYTE)ClassDescription, - &dwLength)) - { - RegCloseKey(hKey); - return FALSE; - } - + ret = !RegQueryValueExA( hKey, NULL, NULL, NULL, + (LPBYTE)ClassDescription, &dwLength ); + if (RequiredSize) *RequiredSize = dwLength; RegCloseKey(hKey); - - return TRUE; + return ret; } /*********************************************************************** @@ -1432,6 +1407,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( { HKEY hKey; DWORD dwLength; + BOOL ret; hKey = SetupDiOpenClassRegKeyExW(ClassGuid, KEY_ALL_ACCESS, @@ -1444,38 +1420,12 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( return FALSE; } - if (RequiredSize != NULL) - { - dwLength = 0; - if (RegQueryValueExW(hKey, - NULL, - NULL, - NULL, - NULL, - &dwLength)) - { - RegCloseKey(hKey); - return FALSE; - } - - *RequiredSize = dwLength / sizeof(WCHAR); - } - dwLength = ClassDescriptionSize * sizeof(WCHAR); - if (RegQueryValueExW(hKey, - NULL, - NULL, - NULL, - (LPBYTE)ClassDescription, - &dwLength)) - { - RegCloseKey(hKey); - return FALSE; - } - + ret = !RegQueryValueExW( hKey, NULL, NULL, NULL, + (LPBYTE)ClassDescription, &dwLength ); + if (RequiredSize) *RequiredSize = dwLength / sizeof(WCHAR); RegCloseKey(hKey); - - return TRUE; + return ret; } /***********************************************************************

1 0

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

21 Sep '07

Module: wine Branch: master Commit: f4b9bc2454b6c996ea601a2ae3d3ce80b8225273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b9bc2454b6c996ea601a2ae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:16:25 2007 -0700 setupapi: Implement SetupDiRegisterDeviceInfo. --- dlls/setupapi/devinst.c | 28 ++++++++++++++++++++++++++-- dlls/setupapi/tests/devinst.c | 5 ----- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 4d06c5c..e070c6b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1060,11 +1060,35 @@ BOOL WINAPI SetupDiRegisterDeviceInfo( PVOID CompareContext, PSP_DEVINFO_DATA DupDeviceInfoData) { + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + TRACE("%p %p %08x %p %p %p\n", DeviceInfoSet, DeviceInfoData, Flags, CompareProc, CompareContext, DupDeviceInfoData); - FIXME("\n"); - return FALSE; + 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; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (devInfo->phantom) + { + devInfo->phantom = FALSE; + RegDeleteValueW(devInfo->key, Phantom); + } + return TRUE; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a18f91a..0ef9047 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -289,7 +289,6 @@ static void testRegisterDeviceInfo(void) } SetLastError(0xdeadbeef); ret = pSetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ret = pSetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); @@ -301,18 +300,15 @@ static void testRegisterDeviceInfo(void) SetLastError(0xdeadbeef); ret = pSetupDiRegisterDeviceInfo(set, NULL, 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); devInfo.cbSize = sizeof(devInfo); SetLastError(0xdeadbeef); ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ret = pSetupDiCreateDeviceInfoA(set, "USB\\BOGUS\\0000", &guid, @@ -324,7 +320,6 @@ static void testRegisterDeviceInfo(void) /* If it already existed, registering it again will fail */ ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); - todo_wine ok(ret, "SetupDiCreateDeviceInfoA failed: %d\n", GetLastError()); } /* FIXME: On Win2K+ systems, this is now persisted to registry in

1 0

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

21 Sep '07

Module: wine Branch: master Commit: f841667cac1558d2131543c5dc9baba1c6418b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f841667cac1558d2131543c5d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:16:45 2007 -0700 setupapi: Implement SetupDiGetClassDevsW. --- dlls/setupapi/devinst.c | 274 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 272 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f841667cac1558d213154…

1 0

Juan Lang : setupapi: Devices created by SetupDiCreateDeviceInfo are " phantoms", and are deleted from the registry when the set that contains them is closed .
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 80be1fe74007ff207480036ee8596809eb3dae5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=80be1fe74007ff207480036ee… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:14:53 2007 -0700 setupapi: Devices created by SetupDiCreateDeviceInfo are "phantoms", and are deleted from the registry when the set that contains them is closed. --- dlls/setupapi/devinst.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 3c8715c..9476ee2 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -83,6 +83,7 @@ static const WCHAR Capabilities[] = {'C','a','p','a','b','i','l','i','t','i','e' 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}; +static const WCHAR Phantom[] = {'P','h','a','n','t','o','m',0}; /* is used to identify if a DeviceInfoSet pointer is valid or not */ @@ -101,10 +102,12 @@ struct DeviceInfoSet struct DeviceInfo { HKEY key; + BOOL phantom; LPWSTR instanceId; }; -static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(LPCWSTR instanceId) +static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(LPCWSTR instanceId, + BOOL phantom) { struct DeviceInfo *devInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInfo)); @@ -119,6 +122,7 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(LPCWSTR instanceId) LONG l; devInfo->key = INVALID_HANDLE_VALUE; + devInfo->phantom = phantom; lstrcpyW(devInfo->instanceId, instanceId); struprW(devInfo->instanceId); l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, @@ -127,6 +131,9 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(LPCWSTR instanceId) { RegCreateKeyExW(enumKey, devInfo->instanceId, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &devInfo->key, NULL); + if (phantom) + RegSetValueExW(devInfo->key, Phantom, 0, REG_DWORD, + (LPBYTE)&phantom, sizeof(phantom)); RegCloseKey(enumKey); } } @@ -143,6 +150,19 @@ static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo) { if (devInfo->key != INVALID_HANDLE_VALUE) RegCloseKey(devInfo->key); + if (devInfo->phantom) + { + HKEY enumKey; + LONG l; + + l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &enumKey, NULL); + if (!l) + { + RegDeleteTreeW(enumKey, devInfo->instanceId); + RegCloseKey(enumKey); + } + } HeapFree(GetProcessHeap(), 0, devInfo->instanceId); HeapFree(GetProcessHeap(), 0, devInfo); } @@ -161,17 +181,19 @@ static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) /* 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. + * to it. "Phantom" devices are deleted from the registry when closed. * Returns a pointer to the newly allocated device info. */ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, const GUID *guid, DWORD devInst, LPCWSTR instanceId, + BOOL phantom, SP_DEVINFO_DATA **dev) { BOOL ret = FALSE; - struct DeviceInfo *devInfo = SETUPDI_AllocateDeviceInfo(instanceId); + struct DeviceInfo *devInfo = SETUPDI_AllocateDeviceInfo(instanceId, + phantom); if (devInfo) { @@ -1002,7 +1024,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( SP_DEVINFO_DATA *dev = NULL; ret = SETUPDI_AddDeviceToSet(set, ClassGuid, 0 /* FIXME: DevInst */, - instanceId, &dev); + instanceId, TRUE, &dev); if (ret) { if (DeviceDescription)

1 0

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

21 Sep '07

Module: wine Branch: master Commit: 6b50538f123d0b62e773f749dd32a18bd8e3157f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b50538f123d0b62e773f749d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:15:16 2007 -0700 setupapi: Implement SetupDiGetClassDescriptionExA. --- dlls/setupapi/devinst.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9476ee2..10bf481 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1325,8 +1325,52 @@ BOOL WINAPI SetupDiGetClassDescriptionExA( PCSTR MachineName, PVOID Reserved) { - FIXME("\n"); - return FALSE; + HKEY hKey; + DWORD dwLength; + + hKey = SetupDiOpenClassRegKeyExA(ClassGuid, + KEY_ALL_ACCESS, + DIOCR_INSTALLER, + MachineName, + Reserved); + if (hKey == INVALID_HANDLE_VALUE) + { + WARN("SetupDiOpenClassRegKeyExA() failed (Error %u)\n", GetLastError()); + return FALSE; + } + + if (RequiredSize != NULL) + { + dwLength = 0; + if (RegQueryValueExA(hKey, + NULL, + NULL, + NULL, + NULL, + &dwLength)) + { + RegCloseKey(hKey); + return FALSE; + } + + *RequiredSize = dwLength; + } + + dwLength = ClassDescriptionSize; + if (RegQueryValueExA(hKey, + NULL, + NULL, + NULL, + (LPBYTE)ClassDescription, + &dwLength)) + { + RegCloseKey(hKey); + return FALSE; + } + + RegCloseKey(hKey); + + return TRUE; } /***********************************************************************

1 0

Juan Lang : setupapi: Add stub for SetupDiRegisterDeviceInfo.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 3a2a99474e23c40a0fb302382cec744ecaef7ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2a99474e23c40a0fb302382… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:15:32 2007 -0700 setupapi: Add stub for SetupDiRegisterDeviceInfo. --- dlls/setupapi/devinst.c | 18 ++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 10bf481..4d06c5c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1050,6 +1050,24 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( } /*********************************************************************** + * SetupDiRegisterDeviceInfo (SETUPAPI.@) + */ +BOOL WINAPI SetupDiRegisterDeviceInfo( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Flags, + PSP_DETSIG_CMPPROC CompareProc, + PVOID CompareContext, + PSP_DEVINFO_DATA DupDeviceInfoData) +{ + TRACE("%p %p %08x %p %p %p\n", DeviceInfoSet, DeviceInfoData, Flags, + CompareProc, CompareContext, DupDeviceInfoData); + + FIXME("\n"); + return FALSE; +} + +/*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInfo( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 6b93af3..7f8b3dd 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -365,7 +365,7 @@ @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) @ stub SetupDiOpenDeviceInterfaceRegKey @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) -@ stub SetupDiRegisterDeviceInfo +@ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stub SetupDiRemoveDevice @ stub SetupDiRemoveDeviceInterface @ stub SetupDiSelectDevice

1 0

Juan Lang : setupapi: Add tests for SetupDiRegisterDeviceInfo.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: a57a17d3fc012dd97b9931de68bc0a118a0bb868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57a17d3fc012dd97b9931de6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:16:01 2007 -0700 setupapi: Add tests for SetupDiRegisterDeviceInfo. --- dlls/setupapi/tests/devinst.c | 65 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c88ad24..a18f91a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -40,6 +40,7 @@ static BOOL (WINAPI *pSetupDiEnumDeviceInfo)(HDEVINFO, DWORD, PSP_DEVINFO_DA static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); 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 *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); static void init_function_pointers(void) { @@ -52,6 +53,7 @@ static void init_function_pointers(void) pSetupDiEnumDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInfo"); pSetupDiGetDeviceInstanceIdA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInstanceIdA"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); + pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); } static void test_SetupDiCreateDeviceInfoListEx(void) @@ -272,6 +274,68 @@ static void testGetDeviceInstanceId(void) } } +static void testRegisterDeviceInfo(void) +{ + BOOL ret; + GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, + 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; + HDEVINFO set; + + if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || + !pSetupDiRegisterDeviceInfo) + { + skip("No SetupDiRegisterDeviceInfo\n"); + return; + } + SetLastError(0xdeadbeef); + ret = pSetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ret = pSetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); + set = pSetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %d\n", GetLastError()); + if (set) + { + SP_DEVINFO_DATA devInfo = { 0 }; + + SetLastError(0xdeadbeef); + ret = pSetupDiRegisterDeviceInfo(set, NULL, 0, NULL, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + devInfo.cbSize = sizeof(devInfo); + SetLastError(0xdeadbeef); + ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ret = pSetupDiCreateDeviceInfoA(set, "USB\\BOGUS\\0000", &guid, + NULL, NULL, 0, &devInfo); + ok(ret || GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, + "SetupDiCreateDeviceInfoA failed: %d\n", GetLastError()); + if (ret) + { + /* If it already existed, registering it again will fail */ + ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, + NULL); + todo_wine + ok(ret, "SetupDiCreateDeviceInfoA failed: %d\n", GetLastError()); + } + /* FIXME: On Win2K+ systems, this is now persisted to registry in + * HKLM\System\CCS\Enum\USB\Bogus\0000. I don't check because the + * Win9x location is different. + * FIXME: the key also becomes undeletable. How to get rid of it? + */ + pSetupDiDestroyDeviceInfoList(set); + } +} + START_TEST(devinst) { init_function_pointers(); @@ -287,4 +351,5 @@ START_TEST(devinst) skip("SetupDiOpenClassRegKeyExA is not available\n"); testCreateDeviceInfo(); testGetDeviceInstanceId(); + testRegisterDeviceInfo(); }

1 0

Juan Lang : setupapi: Save device description to registry when creating a device.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 8985a62a340a7f1fdd44c91c878d0c94a0af5474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8985a62a340a7f1fdd44c91c8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:13:00 2007 -0700 setupapi: Save device description to registry when creating a device. --- dlls/setupapi/devinst.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 3a4c130..0a3e599 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -997,15 +997,22 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( ret = SETUPDI_AddDeviceToSet(set, ClassGuid, 0 /* FIXME: DevInst */, instanceId, &dev); - if (ret && DeviceInfoData) + if (ret) { - if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + if (DeviceDescription) + SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, + dev, SPDRP_DEVICEDESC, (const BYTE *)DeviceDescription, + lstrlenW(DeviceDescription) * sizeof(WCHAR)); + if (DeviceInfoData) { - SetLastError(ERROR_INVALID_USER_BUFFER); - ret = FALSE; + if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + ret = FALSE; + } + else + memcpy(DeviceInfoData, dev, sizeof(SP_DEVINFO_DATA)); } - else - memcpy(DeviceInfoData, dev, sizeof(SP_DEVINFO_DATA)); } } if (allocatedInstanceId)

1 0

Juan Lang : setupapi: Save class GUID to registry when creating a device.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 00ef2e3269a51e5817121ee47b3e18d9e58e77d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ef2e3269a51e5817121ee47… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 20 09:14:27 2007 -0700 setupapi: Save class GUID to registry when creating a device. --- dlls/setupapi/devinst.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0a3e599..3c8715c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -183,11 +183,17 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, sizeof(SP_DEVINFO_DATA)); if (set->devices) { + WCHAR classGuidStr[39]; + *dev = &set->devices[set->cDevices++]; (*dev)->cbSize = sizeof(SP_DEVINFO_DATA); memcpy(&(*dev)->ClassGuid, guid, sizeof(GUID)); (*dev)->DevInst = devInst; (*dev)->Reserved = (ULONG_PTR)devInfo; + SETUPDI_GuidToString(guid, classGuidStr); + SetupDiSetDeviceRegistryPropertyW((HDEVINFO)set, + *dev, SPDRP_CLASSGUID, (const BYTE *)classGuidStr, + lstrlenW(classGuidStr) * sizeof(WCHAR)); ret = TRUE; } else

1 0