August 2016 - Wine-Commits - list.winehq.org

Hugh McMaster : kernel32/tests: Add tests for GetConsoleScreenBufferInfoEx.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 95f8270bc2a9b73ee90a4abcbf4b0dd7ce1187c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f8270bc2a9b73ee90a4abcb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 17 01:35:39 2016 +0000 kernel32/tests: Add tests for GetConsoleScreenBufferInfoEx. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5b66d9f..826ed43 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2938,6 +2938,55 @@ static void test_SetConsoleFont(HANDLE std_output) todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); } +static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) +{ + HANDLE hmod; + BOOL (WINAPI *pGetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + CONSOLE_SCREEN_BUFFER_INFOEX csbix; + BOOL ret; + HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + + hmod = GetModuleHandleA("kernel32.dll"); + pGetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "GetConsoleScreenBufferInfoEx"); + if (!pGetConsoleScreenBufferInfoEx) + { + win_skip("GetConsoleScreenBufferInfoEx is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(NULL, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_input, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_output, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + csbix.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(NULL, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_input, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_output, &csbix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -3086,4 +3135,5 @@ START_TEST(console) test_GetLargestConsoleWindowSize(hConOut); test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); + test_GetConsoleScreenBufferInfoEx(hConOut); }

1 0

Nils Kuhnhenn : winex11.drv: Return default locale in LoadKeyboardLayout stub instead of 0.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 1def1e2f7f5352d8af0faedc8c09a8cb84e5562f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1def1e2f7f5352d8af0faedc8… Author: Nils Kuhnhenn <kuhnhenn.nils(a)gmail.com> Date: Thu Aug 11 17:28:17 2016 +0200 winex11.drv: Return default locale in LoadKeyboardLayout stub instead of 0. Signed-off-by: Nils Kuhnhenn <kuhnhenn.nils(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 47a9872..adb028a 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1947,9 +1947,8 @@ HKL CDECL X11DRV_GetKeyboardLayout(DWORD dwThreadid) */ HKL CDECL X11DRV_LoadKeyboardLayout(LPCWSTR name, UINT flags) { - FIXME("%s, %04x: stub!\n", debugstr_w(name), flags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + FIXME("%s, %04x: semi-stub! Returning default layout.\n", debugstr_w(name), flags); + return get_locale_kbd_layout(); }

1 0

André Hentschel : hal: Add WRITE_PORT_UCHAR stub.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 9087404a13d92dc6cd559a2cedaba853ed651a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9087404a13d92dc6cd559a2ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 16 22:30:20 2016 +0200 hal: Add WRITE_PORT_UCHAR stub. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 5 +++++ dlls/hal/hal.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 0b2e422..9cae67e 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -168,6 +168,11 @@ ULONG WINAPI READ_PORT_ULONG(ULONG *port) return 0; } +void WINAPI WRITE_PORT_UCHAR(UCHAR *port, UCHAR value) +{ + FIXME("(%p %d) stub!\n", port, value); +} + void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { FIXME("(%p %d) stub!\n", port, value); diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index c21806c..bd6bc35 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -87,6 +87,6 @@ @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG @ stub WRITE_PORT_BUFFER_USHORT -@ stub WRITE_PORT_UCHAR +@ stdcall WRITE_PORT_UCHAR(ptr long) @ stdcall WRITE_PORT_ULONG(ptr long) @ stub WRITE_PORT_USHORT

1 0

Bruno Jesus : dinput: Properly fill the HID information for the controller in the js driver.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 738e17b2d7caeacb614d93ea63ff6207174b4cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=738e17b2d7caeacb614d93ea6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 16 22:24:14 2016 -0300 dinput: Properly fill the HID information for the controller in the js driver. Even the Xbox 360 controller which does not use HID has the same flags and usage page set on Windows. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 15 ++++++++++++++- dlls/dinput/tests/joystick.c | 6 ++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index b08d4c9..c0a885d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -83,7 +83,7 @@ struct JoyDev BYTE button_count; int *dev_axes_map; - WORD vendor_id, product_id; + WORD vendor_id, product_id, bus_type; }; typedef struct JoystickImpl JoystickImpl; @@ -250,6 +250,7 @@ static INT find_joystick_devices(void) read_sys_id_variable(i, "vendor", &joydev.vendor_id); read_sys_id_variable(i, "product", &joydev.product_id); + read_sys_id_variable(i, "bustype", &joydev.bus_type); if (joydev.vendor_id == 0 || joydev.product_id == 0) { @@ -299,6 +300,18 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver else lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ + if (joystick_devices[id].bus_type == BUS_USB && + joystick_devices[id].vendor_id && joystick_devices[id].product_id) + { + lpddi->dwDevType |= DIDEVTYPE_HID; + lpddi->wUsagePage = 0x01; /* Desktop */ + if (lpddi->dwDevType == DI8DEVTYPE_JOYSTICK || lpddi->dwDevType == DIDEVTYPE_JOYSTICK) + lpddi->wUsage = 0x04; /* Joystick */ + else + lpddi->wUsage = 0x05; /* Game Pad */ + } + MultiByteToWideChar(CP_ACP, 0, joystick_devices[id].name, -1, lpddi->tszInstanceName, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, joystick_devices[id].name, -1, lpddi->tszProductName, MAX_PATH); lpddi->guidFFDriver = GUID_NULL; diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 35ec2d9..00d3b60 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -223,6 +223,12 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) lpddi->wUsagePage, lpddi->wUsage); + /* Check if this is a HID device */ + if (lpddi->dwDevType & DIDEVTYPE_HID) + ok(lpddi->wUsagePage == 0x01 && (lpddi->wUsage == 0x04 || lpddi->wUsage == 0x05), + "Expected a game controller HID UsagePage and Usage, got page 0x%x usage 0x%x\n", + lpddi->wUsagePage, lpddi->wUsage); + /* Test for joystick ID property */ ZeroMemory(&dipw, sizeof(dipw)); dipw.diph.dwSize = sizeof(DIPROPDWORD);

1 0

Bruno Jesus : dinput: Use a helper to read information files for the js device.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 7439f7948c417905028aa82685b1613b77f5cf59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7439f7948c417905028aa8268… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 16 22:23:45 2016 -0300 dinput: Use a helper to read information files for the js device. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 20e2573..f7061d5 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -142,6 +142,30 @@ static struct JoyDev *joystick_devices; static void joy_polldev(LPDIRECTINPUTDEVICE8A iface); +#define SYS_PATH_FORMAT "/sys/class/input/js%d/device/id/%s" +static BOOL read_sys_id_variable(int index, const char *property, WORD *value) +{ + char sys_path[sizeof(SYS_PATH_FORMAT) + 16], id_str[5]; + int sys_fd; + BOOL ret = FALSE; + + sprintf(sys_path, SYS_PATH_FORMAT, index, property); + sys_fd = open(sys_path, O_RDONLY); + if (sys_fd > 0) + { + if (read(sys_fd, id_str, 4) == 4) + { + id_str[4] = '\0'; + *value = strtol(id_str, NULL, 16); + ret = TRUE; + } + + close(sys_fd); + } + return ret; +} +#undef SYS_PATH_FORMAT + static INT find_joystick_devices(void) { INT i; @@ -151,10 +175,9 @@ static INT find_joystick_devices(void) joystick_devices_count = 0; for (i = 0; i < MAX_JOYSTICKS; i++) { - int fd, sys_fd; + int fd; struct JoyDev joydev, *new_joydevs; BYTE axes_map[ABS_MAX + 1]; - char sys_path[sizeof("/sys/class/input/js/device/id/product") + 10], id_str[5]; snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); if ((fd = open(joydev.device, O_RDONLY)) < 0) @@ -225,31 +248,8 @@ static INT find_joystick_devices(void) joydev.vendor_id = 0; joydev.product_id = 0; - sprintf(sys_path, "/sys/class/input/js%d/device/id/vendor", i); - sys_fd = open(sys_path, O_RDONLY); - if (sys_fd > 0) - { - if (read(sys_fd, id_str, 4) == 4) - { - id_str[4] = '\0'; - joydev.vendor_id = strtol(id_str, NULL, 16); - } - - close(sys_fd); - } - - sprintf(sys_path, "/sys/class/input/js%d/device/id/product", i); - sys_fd = open(sys_path, O_RDONLY); - if (sys_fd > 0) - { - if (read(sys_fd, id_str, 4) == 4) - { - id_str[4] = '\0'; - joydev.product_id = strtol(id_str, NULL, 16); - } - - close(sys_fd); - } + read_sys_id_variable(i, "vendor", &joydev.vendor_id); + read_sys_id_variable(i, "product", &joydev.product_id); if (joydev.vendor_id == 0 || joydev.product_id == 0) {

1 0

Iván Matellanes : msvcirt: Implement Iostream_init constructor.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 1978c7d7169559f3ce48f9fe29867eb3c8707143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1978c7d7169559f3ce48f9fe2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 17 11:57:37 2016 +0100 msvcirt: Implement Iostream_init constructor. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 8 +++- dlls/msvcirt/tests/msvcirt.c | 109 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6cc8f1c..4597060 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4037,7 +4037,13 @@ iostream* __thiscall iostream_scalar_dtor(ios *base, unsigned int flags) DEFINE_THISCALL_WRAPPER(Iostream_init_ios_ctor, 12) void* __thiscall Iostream_init_ios_ctor(void *this, ios *obj, int n) { - FIXME("(%p %p %d) stub\n", this, obj, n); + TRACE("(%p %p %d)\n", this, obj, n); + obj->delbuf = 1; + if (n >= 0) { + obj->tie = NULL; /* FIXME: tie to cout */ + if (n > 0) + ios_setf(obj, FLAGS_unitbuf); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 9750d88..dcab485 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -383,6 +383,12 @@ static void (*__thiscall p_iostream_vbase_dtor)(iostream*); static iostream* (*__thiscall p_iostream_assign_sb)(iostream*, streambuf*); static iostream* (*__thiscall p_iostream_assign)(iostream*, const iostream*); +/* Iostream_init */ +static void* (*__thiscall p_Iostream_init_ios_ctor)(void*, ios*, int); + +/* Predefined streams */ +static ostream *p_cout; + /* Emulate a __thiscall */ #ifdef __i386__ @@ -635,6 +641,8 @@ static BOOL init(void) SET(p_iostream_vbase_dtor, "??_Diostream@@QEAAXXZ"); SET(p_iostream_assign_sb, "??4iostream@@IEAAAEAV0(a)PEAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IEAAAEAV0(a)AEAV0@@Z"); + + SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -810,6 +818,8 @@ static BOOL init(void) SET(p_iostream_vbase_dtor, "??_Diostream@@QAEXXZ"); SET(p_iostream_assign_sb, "??4iostream@@IAEAAV0(a)PAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IAEAAV0(a)AAV0@@Z"); + + SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QAE(a)AAVios@@H(a)Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -820,6 +830,7 @@ static BOOL init(void) SET(p_ios_statebuf, "?x_statebuf(a)ios@@0PAJA"); SET(p_ios_xalloc, "?xalloc(a)ios@@SAHXZ"); SET(p_ios_fLockcInit, "?fLockcInit(a)ios@@0HA"); + SET(p_cout, "?cout@@3Vostream_withassign@@A"); init_thiscall_thunk(); return TRUE; @@ -6032,6 +6043,103 @@ static void test_iostream(void) ok(ios2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.do_lock); } +static void test_Iostream_init(void) +{ + ios ios_obj; + ostream *pos; + streambuf *psb; + void *pinit; + + memset(&ios_obj, 0xab, sizeof(ios)); + psb = ios_obj.sb; + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, &ios_obj, 0); + ok(pinit == NULL, "wrong return, expected %p got %p\n", NULL, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); +todo_wine + ok(ios_obj.tie == p_cout, "expected %p got %p\n", p_cout, ios_obj.tie); + ok(ios_obj.flags == 0xabababab, "expected %d got %x\n", 0xabababab, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.do_lock); + + memset(&ios_obj, 0xab, sizeof(ios)); + pos = ios_obj.tie; + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, &ios_obj, -1); + ok(pinit == NULL, "wrong return, expected %p got %p\n", NULL, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); + ok(ios_obj.tie == pos, "expected %p got %p\n", pos, ios_obj.tie); + ok(ios_obj.flags == 0xabababab, "expected %d got %x\n", 0xabababab, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.do_lock); + + memset(&ios_obj, 0xab, sizeof(ios)); + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, &ios_obj, -100); + ok(pinit == NULL, "wrong return, expected %p got %p\n", NULL, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); + ok(ios_obj.tie == pos, "expected %p got %p\n", pos, ios_obj.tie); + ok(ios_obj.flags == 0xabababab, "expected %d got %x\n", 0xabababab, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.do_lock); + + if (0) /* crashes on native */ + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, NULL, -1); + + memset(&ios_obj, 0xab, sizeof(ios)); + ios_obj.flags = 0xcdcdcdcd; + ios_obj.do_lock = 0x34343434; + pinit = call_func3(p_Iostream_init_ios_ctor, (void*) 0xdeadbeef, &ios_obj, 1); + ok(pinit == (void*) 0xdeadbeef, "wrong return, expected %p got %p\n", (void*) 0xdeadbeef, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); +todo_wine + ok(ios_obj.tie == p_cout, "expected %p got %p\n", p_cout, ios_obj.tie); + ok(ios_obj.flags == (0xcdcdcdcd|FLAGS_unitbuf), "expected %d got %x\n", + 0xcdcdcdcd|FLAGS_unitbuf, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0x34343434, "expected %d got %d\n", 0x34343434, ios_obj.do_lock); + + memset(&ios_obj, 0xab, sizeof(ios)); + ios_obj.flags = 0xcdcdcdcd; + ios_obj.do_lock = 0x34343434; + pinit = call_func3(p_Iostream_init_ios_ctor, (void*) 0xabababab, &ios_obj, 5); + ok(pinit == (void*) 0xabababab, "wrong return, expected %p got %p\n", (void*) 0xabababab, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); +todo_wine + ok(ios_obj.tie == p_cout, "expected %p got %p\n", p_cout, ios_obj.tie); + ok(ios_obj.flags == (0xcdcdcdcd|FLAGS_unitbuf), "expected %d got %x\n", + 0xcdcdcdcd|FLAGS_unitbuf, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0x34343434, "expected %d got %d\n", 0x34343434, ios_obj.do_lock); +} + START_TEST(msvcirt) { if(!init()) @@ -6051,6 +6159,7 @@ START_TEST(msvcirt) test_istream_read(); test_istream_withassign(); test_iostream(); + test_Iostream_init(); FreeLibrary(msvcrt); FreeLibrary(msvcirt);

1 0

Iván Matellanes : msvcirt: Add a partial implementation of class Iostream_init.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 5981a3279ba5c03ad86b159d9ee4135ecdae871e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5981a3279ba5c03ad86b159d9… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 17 11:57:36 2016 +0100 msvcirt: Add a partial implementation of class Iostream_init. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 35 +++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 16 ++++++++-------- dlls/msvcrt20/msvcrt20.spec | 16 ++++++++-------- dlls/msvcrt40/msvcrt40.spec | 16 ++++++++-------- 4 files changed, 59 insertions(+), 24 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index fd721b5..6cc8f1c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4032,6 +4032,41 @@ iostream* __thiscall iostream_scalar_dtor(ios *base, unsigned int flags) return this; } +/* ??0Iostream_init@@QAE(a)AAVios@@H(a)Z */ +/* ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z */ +DEFINE_THISCALL_WRAPPER(Iostream_init_ios_ctor, 12) +void* __thiscall Iostream_init_ios_ctor(void *this, ios *obj, int n) +{ + FIXME("(%p %p %d) stub\n", this, obj, n); + return this; +} + +/* ??0Iostream_init@@QAE(a)XZ */ +/* ??0Iostream_init@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(Iostream_init_ctor, 4) +void* __thiscall Iostream_init_ctor(void *this) +{ + TRACE("(%p)\n", this); + return this; +} + +/* ??1Iostream_init@@QAE(a)XZ */ +/* ??1Iostream_init@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(Iostream_init_dtor, 4) +void __thiscall Iostream_init_dtor(void *this) +{ + TRACE("(%p)\n", this); +} + +/* ??4Iostream_init@@QAEAAV0(a)ABV0@@Z */ +/* ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z */ +DEFINE_THISCALL_WRAPPER(Iostream_init_assign, 8) +void* __thiscall Iostream_init_assign(void *this, const void *rhs) +{ + TRACE("(%p %p)\n", this, rhs); + return this; +} + /****************************************************************** * ??0ostrstream@@QAE(a)XZ (MSVCRTI.@) */ diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 8361896..7b67bc7 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -1,7 +1,7 @@ -@ stub -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z # __thiscall Iostream_init::Iostream_init(class ios &,int) -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z -@ stub -arch=win32 ??0Iostream_init@@QAE(a)XZ # __thiscall Iostream_init::Iostream_init(void) -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z(ptr ptr long) Iostream_init_ios_ctor +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z(ptr ptr long) Iostream_init_ios_ctor +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)XZ(ptr) Iostream_init_ctor +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)XZ(ptr) Iostream_init_ctor @ thiscall -arch=i386 ??0exception@@QAE(a)ABQBD@Z(ptr ptr) MSVCP_exception_ctor @ cdecl -arch=win64 ??0exception@@QEAA(a)AEBQEBD@Z(ptr ptr) MSVCP_exception_ctor @ thiscall -arch=i386 ??0exception@@QAE(a)ABV0@@Z(ptr ptr) MSVCP_exception_copy_ctor @@ -130,8 +130,8 @@ @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)PEAEH0@Z(ptr ptr long ptr) strstreambuf_ubuffer_ctor @ thiscall -arch=win32 ??0strstreambuf@@QAE(a)XZ(ptr) strstreambuf_ctor @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)XZ(ptr) strstreambuf_ctor -@ stub -arch=win32 ??1Iostream_init@@QAE(a)XZ # __thiscall Iostream_init::~Iostream_init(void) -@ stub -arch=win64 ??1Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??1Iostream_init@@QAE(a)XZ(ptr) Iostream_init_dtor +@ cdecl -arch=win64 ??1Iostream_init@@QEAA(a)XZ(ptr) Iostream_init_dtor @ thiscall -arch=i386 ??1exception@@UAE(a)XZ(ptr) MSVCP_exception_dtor @ cdecl -arch=win64 ??1exception@@UEAA(a)XZ(ptr) MSVCP_exception_dtor @ thiscall -arch=win32 ??1filebuf@@UAE(a)XZ(ptr) filebuf_dtor @@ -170,8 +170,8 @@ @ stub -arch=win64 ??1strstream@@UEAA(a)XZ @ thiscall -arch=win32 ??1strstreambuf@@UAE(a)XZ(ptr) strstreambuf_dtor @ cdecl -arch=win64 ??1strstreambuf@@UEAA(a)XZ(ptr) strstreambuf_dtor -@ stub -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z # class Iostream_init & __thiscall Iostream_init::operator=(class Iostream_init const &) -@ stub -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z +@ thiscall -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z(ptr ptr) Iostream_init_assign +@ cdecl -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) Iostream_init_assign @ thiscall -arch=i386 ??4exception@@QAEAAV0(a)ABV0@@Z(ptr ptr) MSVCP_exception_assign @ cdecl -arch=win64 ??4exception@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) MSVCP_exception_assign @ thiscall -arch=win32 ??4filebuf@@QAEAAV0(a)ABV0@@Z(ptr ptr) filebuf_assign diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 86d1120..fad156b 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1,7 +1,7 @@ -@ stub -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z -@ stub -arch=win32 ??0Iostream_init@@QAE(a)XZ -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z(ptr ptr long) msvcirt.??0Iostream_init@@QAE(a)AAVios@@H(a)Z +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z(ptr ptr long) msvcirt.??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)XZ(ptr) msvcirt.??0Iostream_init@@QAE(a)XZ +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)XZ(ptr) msvcirt.??0Iostream_init@@QEAA(a)XZ @ thiscall -arch=win32 ??0filebuf@@QAE(a)ABV0@@Z(ptr ptr) msvcirt.??0filebuf@@QAE(a)ABV0@@Z @ cdecl -arch=win64 ??0filebuf@@QEAA(a)AEBV0@@Z(ptr ptr) msvcirt.??0filebuf@@QEAA(a)AEBV0@@Z @ thiscall -arch=win32 ??0filebuf@@QAE(a)H@Z(ptr long) msvcirt.??0filebuf@@QAE(a)H@Z @@ -118,8 +118,8 @@ @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)PEADH0@Z(ptr ptr long ptr) msvcirt.??0strstreambuf@@QEAA(a)PEADH0@Z @ thiscall -arch=win32 ??0strstreambuf@@QAE(a)XZ(ptr) msvcirt.??0strstreambuf@@QAE(a)XZ @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)XZ(ptr) msvcirt.??0strstreambuf@@QEAA(a)XZ -@ stub -arch=win32 ??1Iostream_init@@QAE(a)XZ -@ stub -arch=win64 ??1Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??1Iostream_init@@QAE(a)XZ(ptr) msvcirt.??1Iostream_init@@QAE(a)XZ +@ cdecl -arch=win64 ??1Iostream_init@@QEAA(a)XZ(ptr) msvcirt.??1Iostream_init@@QEAA(a)XZ @ thiscall -arch=win32 ??1filebuf@@UAE(a)XZ(ptr) msvcirt.??1filebuf@@UAE(a)XZ @ cdecl -arch=win64 ??1filebuf@@UEAA(a)XZ(ptr) msvcirt.??1filebuf@@UEAA(a)XZ @ stub -arch=win32 ??1fstream@@UAE(a)XZ @@ -158,8 +158,8 @@ @ cdecl -arch=win64 ??2(a)YAPEAX_K@Z(long) msvcrt.??2(a)YAPEAX_K@Z @ cdecl -arch=win32 ??3(a)YAXPAX@Z(ptr) msvcrt.??3(a)YAXPAX@Z @ cdecl -arch=win64 ??3(a)YAXPEAX@Z(ptr) msvcrt.??3(a)YAXPEAX@Z -@ stub -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z -@ stub -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z +@ thiscall -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QAEAAV0(a)ABV0@@Z +@ cdecl -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z @ thiscall -arch=win32 ??4filebuf@@QAEAAV0(a)ABV0@@Z(ptr ptr) msvcirt.??4filebuf@@QAEAAV0(a)ABV0@@Z @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0(a)AEBV0@@Z @ stub -arch=win32 ??4fstream@@QAEAAV0(a)AAV0@@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index e78f085..4ac328a 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1,7 +1,7 @@ -@ stub -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z -@ stub -arch=win32 ??0Iostream_init@@QAE(a)XZ -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z(ptr ptr long) msvcirt.??0Iostream_init@@QAE(a)AAVios@@H(a)Z +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z(ptr ptr long) msvcirt.??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)XZ(ptr) msvcirt.??0Iostream_init@@QAE(a)XZ +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)XZ(ptr) msvcirt.??0Iostream_init@@QEAA(a)XZ @ thiscall -arch=i386 ??0__non_rtti_object@@QAE(a)ABV0@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE(a)ABV0@@Z @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA(a)AEBV0@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QEAA(a)AEBV0@@Z @ thiscall -arch=i386 ??0__non_rtti_object@@QAE(a)PBD@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE(a)PBD@Z @@ -140,8 +140,8 @@ @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)PEADH0@Z(ptr ptr long ptr) msvcirt.??0strstreambuf@@QEAA(a)PEADH0@Z @ thiscall -arch=win32 ??0strstreambuf@@QAE(a)XZ(ptr) msvcirt.??0strstreambuf@@QAE(a)XZ @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)XZ(ptr) msvcirt.??0strstreambuf@@QEAA(a)XZ -@ stub -arch=win32 ??1Iostream_init@@QAE(a)XZ -@ stub -arch=win64 ??1Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??1Iostream_init@@QAE(a)XZ(ptr) msvcirt.??1Iostream_init@@QAE(a)XZ +@ cdecl -arch=win64 ??1Iostream_init@@QEAA(a)XZ(ptr) msvcirt.??1Iostream_init@@QEAA(a)XZ @ thiscall -arch=i386 ??1__non_rtti_object@@UAE(a)XZ(ptr) msvcrt.??1__non_rtti_object@@UAE(a)XZ @ cdecl -arch=win64 ??1__non_rtti_object@@UEAA(a)XZ(ptr) msvcrt.??1__non_rtti_object@@UEAA(a)XZ @ thiscall -arch=i386 ??1bad_cast@@UAE(a)XZ(ptr) msvcrt.??1bad_cast@@UAE(a)XZ @@ -192,8 +192,8 @@ @ cdecl -arch=win64 ??2(a)YAPEAX_K@Z(long) msvcrt.??2(a)YAPEAX_K@Z @ cdecl -arch=win32 ??3(a)YAXPAX@Z(ptr) msvcrt.??3(a)YAXPAX@Z @ cdecl -arch=win64 ??3(a)YAXPEAX@Z(ptr) msvcrt.??3(a)YAXPEAX@Z -@ stub -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z -@ stub -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z +@ thiscall -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QAEAAV0(a)ABV0@@Z +@ cdecl -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z @ thiscall -arch=i386 ??4__non_rtti_object@@QAEAAV0(a)ABV0@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QAEAAV0(a)ABV0@@Z @ cdecl -arch=win64 ??4__non_rtti_object@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QEAAAEAV0(a)AEBV0@@Z @ thiscall -arch=i386 ??4bad_cast@@QAEAAV0(a)ABV0@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0(a)ABV0@@Z

1 0

Sebastian Lackner : advapi32: Simplify RegisterServiceCtrlHandlerExW.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: f4590e91ebd1530dd04e81a9d724ce06cd1df2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4590e91ebd1530dd04e81a9d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:35:30 2016 +0200 advapi32: Simplify RegisterServiceCtrlHandlerExW. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 86bd713..ccca721 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2360,7 +2360,6 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceNam { service_data *service; SC_HANDLE hService = 0; - BOOL found = FALSE; TRACE("%s %p %p\n", debugstr_w(lpServiceName), lpHandlerProc, lpContext); @@ -2370,12 +2369,10 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceNam service->handler = lpHandlerProc; service->context = lpContext; hService = service->handle; - found = TRUE; } LeaveCriticalSection( &service_cs ); - if (!found) SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - + if (!hService) SetLastError( ERROR_SERVICE_DOES_NOT_EXIST ); return (SERVICE_STATUS_HANDLE)hService; }

1 0

Alexandre Julliard : user32/tests: Add some cross-process clipboard tests.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 2e6fc893956c820a005b910665c5b22f0a90f1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6fc893956c820a005b91066… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 19:01:25 2016 +0900 user32/tests: Add some cross-process clipboard tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 138 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 625d550..d218941 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include "wine/test.h" #include "winbase.h" #include "winerror.h" @@ -28,6 +29,7 @@ static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); static int thread_from_line; +static char *argv0; static DWORD WINAPI open_clipboard_thread(LPVOID arg) { @@ -80,6 +82,32 @@ static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) return 0; } +static void set_clipboard_data_process( int arg ) +{ + HANDLE ret; + + SetLastError( 0xdeadbeef ); + if (arg) + { + todo_wine_if( arg == 1 || arg == 3 ) + ok( IsClipboardFormatAvailable( CF_WAVE ), "process %u: CF_WAVE not available\n", arg ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + todo_wine_if( arg == 2 || arg == 4 ) + ok( ret != 0, "process %u: SetClipboardData failed err %u\n", arg, GetLastError() ); + } + else + { + SetClipboardData( CF_WAVE, 0 ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", + arg, GetLastError()); + todo_wine ok( !IsClipboardFormatAvailable( CF_WAVE ), "process %u: SetClipboardData succeeded\n", arg ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + ok( !ret, "process %u: SetClipboardData succeeded\n", arg ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", + arg, GetLastError()); + } +} + static void run_thread( LPTHREAD_START_ROUTINE func, void *arg, int line ) { DWORD ret; @@ -102,6 +130,23 @@ static void run_thread( LPTHREAD_START_ROUTINE func, void *arg, int line ) CloseHandle(thread); } +static void run_process( const char *args ) +{ + char cmd[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + + sprintf( cmd, "%s clipboard %s", argv0, args ); + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + ok( CreateProcessA( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ), + "CreateProcess %s failed\n", cmd ); + + winetest_wait_child_process( info.hProcess ); + CloseHandle( info.hProcess ); + CloseHandle( info.hThread ); +} + static void test_ClipboardOwner(void) { HWND hWnd1, hWnd2; @@ -137,6 +182,7 @@ static void test_ClipboardOwner(void) run_thread( open_clipboard_thread, hWnd1, __LINE__ ); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + run_process( "set_clipboard_data 0" ); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); @@ -152,6 +198,7 @@ static void test_ClipboardOwner(void) ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner()); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + run_process( "set_clipboard_data 1" ); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); @@ -170,6 +217,7 @@ static void test_ClipboardOwner(void) ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner %p/%p\n", GetClipboardOwner(), GetDesktopWindow() ); run_thread( set_clipboard_data_thread, GetDesktopWindow(), __LINE__ ); + run_process( "set_clipboard_data 2" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -191,6 +239,7 @@ static void test_ClipboardOwner(void) ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + run_process( "set_clipboard_data 3" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -199,6 +248,7 @@ static void test_ClipboardOwner(void) ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + run_process( "set_clipboard_data 4" ); ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); ret = CloseClipboard(); @@ -795,8 +845,56 @@ static DWORD WINAPI test_handles_thread( void *arg ) return 0; } +static DWORD WINAPI test_handles_thread2( void *arg ) +{ + BOOL r; + HANDLE h; + char *ptr; + + r = OpenClipboard( 0 ); + ok( r, "gle %d\n", GetLastError() ); + h = GetClipboardData( CF_TEXT ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) ok( !strcmp( "test", ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + h = GetClipboardData( format_id ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) ok( !strcmp( "test", ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + return 0; +} + +static void test_handles_process( const char *str ) +{ + BOOL r; + HANDLE h; + char *ptr; + + format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); + r = OpenClipboard( 0 ); + ok( r, "gle %d\n", GetLastError() ); + h = GetClipboardData( CF_TEXT ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) todo_wine ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + h = GetClipboardData( format_id ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); +} + static void test_data_handles(void) { + BOOL r; + HANDLE h; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); @@ -805,16 +903,56 @@ static void test_data_handles(void) test_handles( GetDesktopWindow() ); test_handles( hwnd ); run_thread( test_handles_thread, hwnd, __LINE__ ); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + h = SetClipboardData( CF_TEXT, create_text() ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + h = SetClipboardData( format_id, create_text() ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + run_thread( test_handles_thread2, 0, __LINE__ ); + run_process( "handles test" ); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + h = GetClipboardData( CF_TEXT ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + h = GetClipboardData( format_id ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + DestroyWindow( hwnd ); } START_TEST(clipboard) { + char **argv; + int argc = winetest_get_mainargs( &argv ); HMODULE mod = GetModuleHandleA( "user32" ); + argv0 = argv[0]; pAddClipboardFormatListener = (void *)GetProcAddress( mod, "AddClipboardFormatListener" ); pGetClipboardSequenceNumber = (void *)GetProcAddress( mod, "GetClipboardSequenceNumber" ); + if (argc == 4 && !strcmp( argv[2], "set_clipboard_data" )) + { + set_clipboard_data_process( atoi( argv[3] )); + return; + } + if (argc == 4 && !strcmp( argv[2], "handles" )) + { + test_handles_process( argv[3] ); + return; + } + test_RegisterClipboardFormatA(); test_ClipboardOwner(); test_synthesized();

1 0

Alexandre Julliard : user32/tests: Add tests for clipboard global memory handles.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 0a1f9bec6d2d7e895bbc68bb7327f776df53afc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a1f9bec6d2d7e895bbc68bb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 16:55:16 2016 +0900 user32/tests: Add tests for clipboard global memory handles. The GMEM_FIXED tests are based on a patch by Rafał Harabień. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 127 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index be6c9bf..625d550 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -682,6 +682,132 @@ static void test_messages(void) DeleteCriticalSection(&clipboard_cs); } +static BOOL is_moveable( HANDLE handle ) +{ + void *ptr = GlobalLock( handle ); + if (ptr) GlobalUnlock( handle ); + return ptr && ptr != handle; +} + +static BOOL is_fixed( HANDLE handle ) +{ + void *ptr = GlobalLock( handle ); + if (ptr) GlobalUnlock( handle ); + return ptr && ptr == handle; +} + +static BOOL is_freed( HANDLE handle ) +{ + void *ptr = GlobalLock( handle ); + if (ptr) GlobalUnlock( handle ); + return !ptr; +} + +static UINT format_id; + +static void test_handles( HWND hwnd ) +{ + HGLOBAL h, htext, htext2; + BOOL r; + HANDLE data; + DWORD process; + BOOL is_owner = (GetWindowThreadProcessId( hwnd, &process ) && process == GetCurrentProcessId()); + + trace( "hwnd %p\n", hwnd ); + htext = create_text(); + htext2 = create_text(); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + h = SetClipboardData( CF_TEXT, htext ); + ok( h == htext, "got %p\n", h ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + h = SetClipboardData( format_id, htext2 ); + ok( h == htext2, "got %p\n", h ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + + data = GetClipboardData( CF_TEXT ); + ok( data == htext, "wrong data %p\n", data ); + ok( is_moveable( data ), "expected moveable mem %p\n", data ); + + data = GetClipboardData( format_id ); + ok( data == htext2, "wrong data %p, cf %08x\n", data, format_id ); + ok( is_moveable( data ), "expected moveable mem %p\n", data ); + + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + /* data handles are still valid */ + ok( is_moveable( htext ), "expected moveable mem %p\n", htext ); + ok( is_moveable( htext2 ), "expected moveable mem %p\n", htext ); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + + /* and now they are freed, unless we are the owner */ + if (!is_owner) + { + todo_wine ok( is_freed( htext ), "expected freed mem %p\n", htext ); + todo_wine ok( is_freed( htext2 ), "expected freed mem %p\n", htext ); + + data = GetClipboardData( CF_TEXT ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + + data = GetClipboardData( CF_OEMTEXT ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + + data = GetClipboardData( CF_UNICODETEXT ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + + data = GetClipboardData( format_id ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + } + else + { + ok( is_moveable( htext ), "expected moveable mem %p\n", htext ); + ok( is_moveable( htext2 ), "expected moveable mem %p\n", htext ); + + data = GetClipboardData( CF_TEXT ); + ok( data == htext, "wrong data %p\n", data ); + + data = GetClipboardData( format_id ); + ok( data == htext2, "wrong data %p, cf %08x\n", data, format_id ); + } + + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + /* w2003, w2008 don't seem to free the data here */ + ok( is_freed( htext ) || broken( !is_freed( htext )), "expected freed mem %p\n", htext ); + ok( is_freed( htext2 ) || broken( !is_freed( htext2 )), "expected freed mem %p\n", htext ); + + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); +} + +static DWORD WINAPI test_handles_thread( void *arg ) +{ + trace( "running from different thread\n" ); + test_handles( (HWND)arg ); + return 0; +} + +static void test_data_handles(void) +{ + HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); + + format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); + ok( hwnd != 0, "window creation failed\n" ); + test_handles( 0 ); + test_handles( GetDesktopWindow() ); + test_handles( hwnd ); + run_thread( test_handles_thread, hwnd, __LINE__ ); + DestroyWindow( hwnd ); +} + START_TEST(clipboard) { HMODULE mod = GetModuleHandleA( "user32" ); @@ -693,4 +819,5 @@ START_TEST(clipboard) test_ClipboardOwner(); test_synthesized(); test_messages(); + test_data_handles(); }

1 0