September 2007 - Wine-commits

Juan Lang : setupapi: Implement SetupDiGetDeviceInstanceIdA on top of SetupDiGetDeviceInstanceIdW .
by Alexandre Julliard 20 Sep '07

20 Sep '07

Module: wine Branch: master Commit: c1ccd65792cc003bcac08d5ceeaac17b80447919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ccd65792cc003bcac08d5ce… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 19 17:47:52 2007 -0700 setupapi: Implement SetupDiGetDeviceInstanceIdA on top of SetupDiGetDeviceInstanceIdW. --- dlls/setupapi/devinst.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index d1e9642..e567670 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -813,9 +813,42 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdA( DWORD DeviceInstanceIdSize, PDWORD RequiredSize) { - FIXME("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, + BOOL ret = FALSE; + DWORD size; + PWSTR instanceId; + + TRACE("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); - return FALSE; + + SetupDiGetDeviceInstanceIdW(DeviceInfoSet, + DeviceInfoData, + NULL, + 0, + &size); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return FALSE; + instanceId = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (instanceId) + { + ret = SetupDiGetDeviceInstanceIdW(DeviceInfoSet, + DeviceInfoData, + instanceId, + size, + &size); + if (ret) + { + int len = WideCharToMultiByte(CP_ACP, 0, instanceId, -1, + DeviceInstanceId, + DeviceInstanceIdSize, NULL, NULL); + + if (!len) + ret = FALSE; + else if (RequiredSize) + *RequiredSize = len; + } + HeapFree(GetProcessHeap(), 0, instanceId); + } + return ret; } /*********************************************************************** @@ -830,6 +863,7 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW( { FIXME("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }

1 0

Alexandre Julliard : msvcrt: Added implementation of a few more __crt functions.
by Alexandre Julliard 20 Sep '07

20 Sep '07

Module: wine Branch: master Commit: fcae6777a4f4703c3eeb7c3bc546024a5ea8aad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcae6777a4f4703c3eeb7c3bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 17:53:06 2007 +0200 msvcrt: Added implementation of a few more __crt functions. --- dlls/msvcrt/locale.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 5 +++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 15eef0a..e679a28 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -543,6 +543,40 @@ int CDECL __crtLCMapStringA( } /********************************************************************* + * __crtCompareStringA (MSVCRT.@) + */ +int CDECL __crtCompareStringA( LCID lcid, DWORD flags, const char *src1, int len1, + const char *src2, int len2 ) +{ + FIXME("(lcid %x, flags %x, %s(%d), %s(%d), partial stub\n", + lcid, flags, debugstr_a(src1), len1, debugstr_a(src2), len2 ); + /* FIXME: probably not entirely right */ + return CompareStringA( lcid, flags, src1, len1, src2, len2 ); +} + +/********************************************************************* + * __crtCompareStringW (MSVCRT.@) + */ +int CDECL __crtCompareStringW( LCID lcid, DWORD flags, const MSVCRT_wchar_t *src1, int len1, + const MSVCRT_wchar_t *src2, int len2 ) +{ + FIXME("(lcid %x, flags %x, %s(%d), %s(%d), partial stub\n", + lcid, flags, debugstr_w(src1), len1, debugstr_w(src2), len2 ); + /* FIXME: probably not entirely right */ + return CompareStringW( lcid, flags, src1, len1, src2, len2 ); +} + +/********************************************************************* + * __crtGetLocaleInfoW (MSVCRT.@) + */ +int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, int len ) +{ + FIXME("(lcid %x, type %x, %p(%d), partial stub\n", lcid, type, buffer, len ); + /* FIXME: probably not entirely right */ + return GetLocaleInfoW( lcid, type, buffer, len ); +} + +/********************************************************************* * localeconv (MSVCRT.@) */ struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) { diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e92b074..10a8686 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -84,8 +84,9 @@ @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo -@ stub __crtCompareStringA -@ stub __crtGetLocaleInfoW +@ cdecl __crtCompareStringA(long long str long str long) +@ cdecl __crtCompareStringW(long long wstr long wstr long) +@ cdecl __crtGetLocaleInfoW(long long ptr long) @ cdecl __crtLCMapStringA(long long str long ptr long long long) @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno

1 0

Alexandre Julliard : winex11.drv: If a window is not resizable through the window manager fall back to non-managed resizing .
by Alexandre Julliard 20 Sep '07

20 Sep '07

Module: wine Branch: master Commit: 7d21e6b37517d77cfc051005ebb3efaf479f9bc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d21e6b37517d77cfc051005e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 17:54:33 2007 +0200 winex11.drv: If a window is not resizable through the window manager fall back to non-managed resizing. --- dlls/winex11.drv/winpos.c | 58 +++++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 085396c..ac7a651 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -1164,11 +1164,38 @@ static void set_movesize_capture( HWND hwnd ) * http://freedesktop.org/Standards/wm-spec/1.3/ar01s04.html * or search for "_NET_WM_MOVERESIZE" */ -static void X11DRV_WMMoveResizeWindow( HWND hwnd, int x, int y, int dir ) +static BOOL X11DRV_WMMoveResizeWindow( HWND hwnd, int x, int y, WPARAM wparam ) { + WPARAM syscommand = wparam & 0xfff0; + WPARAM hittest = wparam & 0x0f; + int dir; XEvent xev; Display *display = thread_display(); + if (syscommand == SC_MOVE) + { + if (!hittest) dir = _NET_WM_MOVERESIZE_MOVE_KEYBOARD; + else dir = _NET_WM_MOVERESIZE_MOVE; + } + else + { + /* windows without WS_THICKFRAME are not resizable through the window manager */ + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_THICKFRAME)) return FALSE; + + switch (hittest) + { + case WMSZ_LEFT: dir = _NET_WM_MOVERESIZE_SIZE_LEFT; break; + case WMSZ_RIGHT: dir = _NET_WM_MOVERESIZE_SIZE_RIGHT; break; + case WMSZ_TOP: dir = _NET_WM_MOVERESIZE_SIZE_TOP; break; + case WMSZ_TOPLEFT: dir = _NET_WM_MOVERESIZE_SIZE_TOPLEFT; break; + case WMSZ_TOPRIGHT: dir = _NET_WM_MOVERESIZE_SIZE_TOPRIGHT; break; + case WMSZ_BOTTOM: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOM; break; + case WMSZ_BOTTOMLEFT: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT; break; + case WMSZ_BOTTOMRIGHT: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT; break; + default: dir = _NET_WM_MOVERESIZE_SIZE_KEYBOARD; break; + } + } + TRACE("hwnd %p, x %d, y %d, dir %d\n", hwnd, x, y, dir); xev.xclient.type = ClientMessage; @@ -1190,6 +1217,7 @@ static void X11DRV_WMMoveResizeWindow( HWND hwnd, int x, int y, int dir ) XUngrabPointer( display, CurrentTime ); XSendEvent(display, root_window, False, SubstructureNotifyMask, &xev); wine_tsx11_unlock(); + return TRUE; } /*********************************************************************** @@ -1232,33 +1260,7 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) hwnd, data->managed ? "" : "NOT ", syscommand, hittest, pt.x, pt.y); /* if we are managed then we let the WM do all the work */ - if (data->managed) - { - int dir; - if (syscommand == SC_MOVE) - { - if (!hittest) dir = _NET_WM_MOVERESIZE_MOVE_KEYBOARD; - else dir = _NET_WM_MOVERESIZE_MOVE; - } - else if (!hittest) dir = _NET_WM_MOVERESIZE_SIZE_KEYBOARD; - else - switch (hittest) - { - case WMSZ_LEFT: dir = _NET_WM_MOVERESIZE_SIZE_LEFT; break; - case WMSZ_RIGHT: dir = _NET_WM_MOVERESIZE_SIZE_RIGHT; break; - case WMSZ_TOP: dir = _NET_WM_MOVERESIZE_SIZE_TOP; break; - case WMSZ_TOPLEFT: dir = _NET_WM_MOVERESIZE_SIZE_TOPLEFT; break; - case WMSZ_TOPRIGHT: dir = _NET_WM_MOVERESIZE_SIZE_TOPRIGHT; break; - case WMSZ_BOTTOM: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOM; break; - case WMSZ_BOTTOMLEFT: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT; break; - case WMSZ_BOTTOMRIGHT: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT; break; - default: - ERR("Invalid hittest value: %d\n", hittest); - dir = _NET_WM_MOVERESIZE_SIZE_KEYBOARD; - } - X11DRV_WMMoveResizeWindow( hwnd, pt.x, pt.y, dir ); - return; - } + if (data->managed && X11DRV_WMMoveResizeWindow( hwnd, pt.x, pt.y, wParam )) return; SystemParametersInfoA(SPI_GETDRAGFULLWINDOWS, 0, &DragFullWindows, 0);

1 0

Alexandre Julliard : winex11.drv: Update the wm hints when the window frame is changed.
by Alexandre Julliard 20 Sep '07

20 Sep '07

Module: wine Branch: master Commit: 8be5b58ba7ff060111b44c0b4c1562ad6a8d1b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be5b58ba7ff060111b44c0b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 17:55:22 2007 +0200 winex11.drv: Update the wm hints when the window frame is changed. --- dlls/winex11.drv/winpos.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index ac7a651..330a31e 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -403,10 +403,13 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, TRACE( "mapping non zero size or off-screen win %p\n", hwnd ); mapped = TRUE; } + + if (mapped || (swp_flags & SWP_FRAMECHANGED)) + X11DRV_set_wm_hints( display, data ); + if (mapped) { X11DRV_sync_window_style( display, data ); - X11DRV_set_wm_hints( display, data ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); XFlush( display );

1 0

Andrew Talbot : dmcompos: Indirection level fix.
by Alexandre Julliard 20 Sep '07

20 Sep '07

Module: wine Branch: master Commit: 05cb03bc104a5e6344814943b81762af31906523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05cb03bc104a5e6344814943b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Sep 19 21:03:23 2007 +0100 dmcompos: Indirection level fix. --- dlls/dmcompos/dmcompos_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index c90c745..5d21544 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -544,7 +544,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

Clinton Stimpson : riched20: Add tests for text limit behavior.
by Alexandre Julliard 20 Sep '07

20 Sep '07

Module: wine Branch: master Commit: b095ade9087fbdfb58506279eee61951c3f0174b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b095ade9087fbdfb58506279e… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Wed Sep 19 18:34:26 2007 -0600 riched20: Add tests for text limit behavior. --- dlls/riched20/tests/editor.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e67c028..c929077 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1108,6 +1108,61 @@ static void test_EM_EXLIMITTEXT(void) result = strcmp(buffer, "A"); ok(0 == result, "got string = \"%s\"\n", buffer); + /* WM_SETTEXT not limited */ + textlimit = 10; + memset(text, 'W', textlimit); + text[textlimit] = 0; + SendMessage(hwndRichEdit, EM_EXLIMITTEXT, 0, textlimit-5); + 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); + 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); +} + + /* WM_CHAR is limited */ + textlimit = 1; + SendMessage(hwndRichEdit, EM_EXLIMITTEXT, 0, textlimit); + SendMessage(hwndRichEdit, EM_SETSEL, 0, -1); /* select everything */ + i = SendMessage(hwndRichEdit, WM_CHAR, 'A', 0); + ok(0 == i, "WM_CHAR wasn't processed"); + 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); + ok(1 == i, "expected 1 chars, got %i instead\n", i); + DestroyWindow(hwndRichEdit); }

1 0

James Hawkins : kernel32: Don' t crash accessing an invalid handle in GlobalSize.
by Alexandre Julliard 20 Sep '07

20 Sep '07

Module: wine Branch: master Commit: 8e90c6099eb2db2f7fc2aded317d76888cf1f4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e90c6099eb2db2f7fc2aded3… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Sep 20 01:49:26 2007 -0500 kernel32: Don't crash accessing an invalid handle in GlobalSize. --- dlls/kernel32/heap.c | 6 +++++- dlls/kernel32/tests/heap.c | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index b526af0..9375a2e 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -807,7 +807,11 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) DWORD retval; PGLOBAL32_INTERN pintern; - if (!hmem) return 0; + if (!((ULONG_PTR)hmem >> 16)) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } if(ISPOINTER(hmem)) { diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 34393e8..2939862 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -197,6 +197,13 @@ START_TEST(heap) res = GlobalUnlock(gbl); ok(res == 1, "Expected 1, got %d\n", res); + /* GlobalSize on an invalid handle */ + SetLastError(MAGIC_DEAD); + size = GlobalSize((HGLOBAL)0xc042); + ok(size == 0, "Expected 0, got %ld\n", size); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + /* ####################################### */ /* Local*() functions */ gbl = LocalAlloc(LMEM_MOVEABLE, 0);

1 0

James Hawkins : user32: Add a test that shows ddeml string handles use local atoms.
by Alexandre Julliard 20 Sep '07

20 Sep '07

Module: wine Branch: master Commit: c8fb8c020163d144bdde20b9cf6f49ff3ce99272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8fb8c020163d144bdde20b9c… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 19 23:37:49 2007 -0500 user32: Add a test that shows ddeml string handles use local atoms. --- dlls/user32/tests/dde.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index b12eb15..811fa28 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -302,6 +302,7 @@ static void test_DdeCreateStringHandleW(DWORD dde_inst, int codepage) HSZ str_handle; WCHAR bufW[256]; char buf[256]; + ATOM atom; int ret; str_handle = DdeCreateStringHandleW(dde_inst, dde_string, codepage); @@ -350,6 +351,29 @@ static void test_DdeCreateStringHandleW(DWORD dde_inst, int codepage) ok(!lstrcmpW(dde_string, (LPCWSTR)buf), "DdeQueryStringW returned wrong string\n"); } + if (codepage == CP_WINANSI) + { + atom = FindAtomA((LPSTR)dde_string); + ok(atom != 0, "Expected a valid atom\n"); + + SetLastError(0xdeadbeef); + atom = GlobalFindAtomA((LPSTR)dde_string); + ok(atom == 0, "Expected 0, got %d\n", atom); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + } + else + { + atom = FindAtomW(dde_string); + ok(atom != 0, "Expected a valid atom\n"); + + SetLastError(0xdeadbeef); + atom = GlobalFindAtomW(dde_string); + ok(atom == 0, "Expected 0, got %d\n", atom); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + } + ok(DdeFreeStringHandle(dde_inst, str_handle), "DdeFreeStringHandle failed\n"); }

1 0

Juan Lang : setupapi: Add tests for SetupDiCreateDeviceInfo.
by Alexandre Julliard 20 Sep '07

20 Sep '07

Module: wine Branch: master Commit: 362e8e1f62657e4de041f2f8e0c9c9e34703dcab URL: http://source.winehq.org/git/wine.git/?a=commit;h=362e8e1f62657e4de041f2f8e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 19 17:45:12 2007 -0700 setupapi: Add tests for SetupDiCreateDeviceInfo. --- dlls/setupapi/tests/devinst.c | 85 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 409e6e3..b922f4a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -33,16 +33,22 @@ /* function pointers */ static HMODULE hSetupAPI; +static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoList)(GUID*,HWND); static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); +static BOOL (WINAPI *pSetupDiEnumDeviceInfo)(HDEVINFO, DWORD, PSP_DEVINFO_DATA); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); +static BOOL (WINAPI *pSetupDiCreateDeviceInfoA)(HDEVINFO, PCSTR, GUID *, PCSTR, HWND, DWORD, PSP_DEVINFO_DATA); static void init_function_pointers(void) { hSetupAPI = GetModuleHandleA("setupapi.dll"); + pSetupDiCreateDeviceInfoA = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoA"); + pSetupDiCreateDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoList"); pSetupDiCreateDeviceInfoListExW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoListExW"); pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); + pSetupDiEnumDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInfo"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); } @@ -123,6 +129,84 @@ static void test_SetupDiOpenClassRegKeyExA(void) trace("failed to open classes key\n"); } +static void testCreateDeviceInfo(void) +{ + BOOL ret; + HDEVINFO set; + GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, + 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; + + if (!pSetupDiCreateDeviceInfoList || !pSetupDiEnumDeviceInfo || + !pSetupDiDestroyDeviceInfoList || !pSetupDiCreateDeviceInfoA) + { + skip("No SetupDiCreateDeviceInfoA\n"); + return; + } + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_DEVINST_NAME, + "Expected ERROR_INVALID_DEVINST_NAME, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInfoA(NULL, "Root\\LEGACY_BOGUS\\0000", NULL, + NULL, NULL, 0, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLEHANDLE, got %08x\n", GetLastError()); + set = pSetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %08x\n", + GetLastError()); + if (set) + { + SP_DEVINFO_DATA devInfo = { 0 }; + DWORD i; + + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL, + NULL, NULL, 0, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + /* Finally, with all three required parameters, this succeeds: */ + ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, + NULL, NULL, 0, NULL); + todo_wine + ok(ret, "pSetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + /* This fails because the device ID already exists.. */ + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, + NULL, NULL, 0, &devInfo); + todo_wine + ok(!ret && GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, + "Expected ERROR_DEVINST_ALREADY_EXISTS, got %08x\n", GetLastError()); + /* whereas this "fails" because cbSize is wrong.. */ + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, + DICD_GENERATE_ID, &devInfo); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, + "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); + devInfo.cbSize = sizeof(devInfo); + ret = pSetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, + DICD_GENERATE_ID, &devInfo); + /* and this finally succeeds. */ + todo_wine + ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + /* There were three devices added, however - the second failure just + * resulted in the SP_DEVINFO_DATA not getting copied. + */ + SetLastError(0xdeadbeef); + i = 0; + while (pSetupDiEnumDeviceInfo(set, i, &devInfo)) + i++; + todo_wine + ok(i == 3, "Expected 3 devices, got %d\n", i); + ok(GetLastError() == ERROR_NO_MORE_ITEMS, + "SetupDiEnumDeviceInfo failed: %08x\n", GetLastError()); + pSetupDiDestroyDeviceInfoList(set); + } +} + START_TEST(devinst) { init_function_pointers(); @@ -136,4 +220,5 @@ START_TEST(devinst) test_SetupDiOpenClassRegKeyExA(); else skip("SetupDiOpenClassRegKeyExA is not available\n"); + testCreateDeviceInfo(); }

1 0

Alexandre Julliard : msvcrt: Added implementation for __STRINGTOLD.
by Alexandre Julliard 20 Sep '07

20 Sep '07

Module: wine Branch: master Commit: 35602d41062400066eb3525cf31a4e8c5acb6926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35602d41062400066eb3525cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 17:52:40 2007 +0200 msvcrt: Added implementation for __STRINGTOLD. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 559124f..e92b074 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -80,7 +80,7 @@ @ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid -@ stub __STRINGTOLD #(ptr ptr str long) +@ cdecl __STRINGTOLD(ptr ptr str long) @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index ffacc35..5fc7146 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -174,7 +174,7 @@ int CDECL MSVCRT__stricoll( const char* str1, const char* str2 ) /******************************************************************** * _atoldbl (MSVCRT.@) */ -int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE * value, char * str) +int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE *value, const char *str) { /* FIXME needs error checking for huge/small values */ #ifdef HAVE_STRTOLD @@ -185,3 +185,17 @@ int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE * value, char * str) #endif return 0; } + +/******************************************************************** + * __STRINGTOLD (MSVCRT.@) + */ +int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, int flags ) +{ +#ifdef HAVE_STRTOLD + FIXME("%p %p %s %x partial stub\n", value, endptr, str, flags ); + value->x = strtold(str,endptr); +#else + FIXME("%p %p %s %x stub\n", value, endptr, str, flags ); +#endif + return 0; +}

1 0