June 2011 - Wine-commits - list.winehq.org

Vincent Povirk : user32/tests: Ignore paint messages in hotkey tests.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 03fbf37fe82a3283d100957918b5162e74fd84a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fbf37fe82a3283d10095791… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 6 11:02:41 2011 -0500 user32/tests: Ignore paint messages in hotkey tests. --- dlls/user32/tests/msg.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 303c629..da7e3d9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13024,7 +13024,6 @@ static const struct message WmHotkeyPressLWIN[] = { { WM_KEYDOWN, kbd_hook|wparam|lparam, VK_LWIN, LLKHF_INJECTED }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_LWIN, 1 }, { WM_KEYDOWN, sent|wparam|lparam, VK_LWIN, 1 }, - { WM_PAINT, sent|optional }, { 0 } }; static const struct message WmHotkeyPress[] = { @@ -13159,12 +13158,14 @@ static void test_hotkey(void) /* Inject the appropriate key sequence */ keybd_event(VK_LWIN, 0, 0, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmHotkeyPressLWIN, "window hotkey press LWIN", FALSE); keybd_event(hotkey_letter, 0, 0, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) { if (msg.message == WM_HOTKEY) { @@ -13176,12 +13177,14 @@ static void test_hotkey(void) ok_sequence(WmHotkeyPress, "window hotkey press", FALSE); keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmHotkeyRelease, "window hotkey release", FALSE); keybd_event(VK_LWIN, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmHotkeyReleaseLWIN, "window hotkey release LWIN", FALSE); @@ -13205,7 +13208,8 @@ static void test_hotkey(void) /* Inject the appropriate key sequence */ keybd_event(VK_LWIN, 0, 0, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) { ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); DispatchMessage(&msg); @@ -13213,7 +13217,8 @@ static void test_hotkey(void) ok_sequence(WmHotkeyPressLWIN, "thread hotkey press LWIN", FALSE); keybd_event(hotkey_letter, 0, 0, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) { if (msg.message == WM_HOTKEY) { @@ -13234,7 +13239,8 @@ static void test_hotkey(void) ok_sequence(WmHotkeyPress, "thread hotkey press", FALSE); keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) { ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); DispatchMessage(&msg); @@ -13242,7 +13248,8 @@ static void test_hotkey(void) ok_sequence(WmHotkeyRelease, "thread hotkey release", FALSE); keybd_event(VK_LWIN, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) { ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); DispatchMessage(&msg);

1 0

Vincent Povirk : user32/tests: Add test showing hotkeys change the async key state.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 58ae3a7fcc62b962576701d79433cc502ddedb03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ae3a7fcc62b962576701d79… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 26 13:06:43 2011 -0500 user32/tests: Add test showing hotkeys change the async key state. --- dlls/user32/tests/msg.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index da7e3d9..12e606e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13076,6 +13076,7 @@ static void test_hotkey(void) HWND test_window, taskbar_window; BOOL ret; MSG msg; + SHORT key_state; SetLastError(0xdeadbeef); ret = UnregisterHotKey(NULL, 0); @@ -13176,6 +13177,9 @@ static void test_hotkey(void) } ok_sequence(WmHotkeyPress, "window hotkey press", FALSE); + key_state = GetAsyncKeyState(hotkey_letter); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE))

1 0

Vincent Povirk : user32/tests: Test registering the same hotkey hwnd/ id pair twice.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: a5719990b5c168fbc82e77a062ce95be6e0fcae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5719990b5c168fbc82e77a06… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 26 13:56:47 2011 -0500 user32/tests: Test registering the same hotkey hwnd/id pair twice. --- dlls/user32/tests/msg.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 12e606e..841af25 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13192,6 +13192,10 @@ static void test_hotkey(void) DispatchMessage(&msg); ok_sequence(WmHotkeyReleaseLWIN, "window hotkey release LWIN", FALSE); + /* Register same hwnd/id with different key combination */ + ret = RegisterHotKey(test_window, 5, 0, hotkey_letter); + ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); + /* Unregister hotkey properly */ SetLastError(0xdeadbeef); ret = UnregisterHotKey(test_window, 5);

1 0

Vincent Povirk : user32/tests: Do not check the last error on succeeding hotkey calls.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: b0beeaffc6a45dbd9ea46fd980df1c6b81cc809e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0beeaffc6a45dbd9ea46fd98… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 7 11:37:25 2011 -0500 user32/tests: Do not check the last error on succeeding hotkey calls. --- dlls/user32/tests/msg.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 841af25..62acf8a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13107,7 +13107,6 @@ static void test_hotkey(void) if (ret == TRUE) { - ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); break; } else @@ -13197,10 +13196,8 @@ static void test_hotkey(void) ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); /* Unregister hotkey properly */ - SetLastError(0xdeadbeef); ret = UnregisterHotKey(test_window, 5); - ok(ret == TRUE, "expected TRUE, got %i\n", ret); - ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); /* Unregister hotkey again */ SetLastError(0xdeadbeef); @@ -13209,10 +13206,8 @@ static void test_hotkey(void) ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED, "unexpected error %d\n", GetLastError()); /* Register thread hotkey */ - SetLastError(0xdeadbeef); ret = RegisterHotKey(NULL, 5, MOD_WIN, hotkey_letter); - ok(ret == TRUE, "expected TRUE, got %i\n", ret); - ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); /* Inject the appropriate key sequence */ keybd_event(VK_LWIN, 0, 0, 0); @@ -13265,10 +13260,8 @@ static void test_hotkey(void) ok_sequence(WmHotkeyReleaseLWIN, "thread hotkey release LWIN", FALSE); /* Unregister thread hotkey */ - SetLastError(0xdeadbeef); ret = UnregisterHotKey(NULL, 5); - ok(ret == TRUE, "expected TRUE, got %i\n", ret); - ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); UnhookWindowsHookEx(hKBD_hook); hKBD_hook = NULL;

1 0

Piotr Caban : msvcrt: Fix broken exports in spec file.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 34ed6b0dbcb525446758b3e85db7031d2dc42827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ed6b0dbcb525446758b3e85… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 7 21:18:28 2011 +0200 msvcrt: Fix broken exports in spec file. --- dlls/msvcrt/msvcrt.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 73dd809..0308067 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -334,7 +334,7 @@ # stub _chvalidator_l(ptr long long) @ cdecl _clearfp() @ cdecl _close(long) MSVCRT__close -@ cdecl MSVCRT__commit(long) +@ cdecl _commit(long) MSVCRT__commit @ extern _commode MSVCRT__commode @ cdecl _control87(long long) @ cdecl _controlfp(long long) @@ -1167,7 +1167,7 @@ @ cdecl _wrmdir(wstr) MSVCRT__wrmdir @ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l @ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l -@ cdecl MSVCRT__wsearchenv(wstr wstr ptr) +@ cdecl _wsearchenv(wstr wstr ptr) MSVCRT__wsearchenv @ cdecl _wsearchenv_s(wstr wstr ptr long) @ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale @ varargs _wsopen(wstr long long) MSVCRT__wsopen @@ -1177,7 +1177,7 @@ @ varargs _wspawnlp(long wstr wstr) @ varargs _wspawnlpe(long wstr wstr) @ cdecl _wspawnv(long wstr ptr) -@ cdecl MSVCRT__wspawnve(long wstr ptr ptr) +@ cdecl _wspawnve(long wstr ptr ptr) MSVCRT__wspawnve @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) MSVCRT__wspawnvpe @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)

1 0

André Hentschel : include: Fix IOCTL_STORAGE_SET_HOTPLUG_INFO.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: f4f89bf39a0247ed676ffddeb05c23cfb952771c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f89bf39a0247ed676ffddeb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 7 22:15:11 2011 +0200 include: Fix IOCTL_STORAGE_SET_HOTPLUG_INFO. --- include/winioctl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winioctl.h b/include/winioctl.h index 7f04d59..3a56d17 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -222,7 +222,7 @@ #define IOCTL_STORAGE_GET_MEDIA_TYPES_EX CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0304, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_GET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_SET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_SET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_STORAGE_RESET_BUS CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS)

1 0

André Hentschel : include: Add more storage ioctls.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: fa9cacdb581271696b715bc73cff905fb88a10de URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9cacdb581271696b715bc73… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 7 22:17:35 2011 +0200 include: Add more storage ioctls. --- include/ntddstor.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/ntddstor.h b/include/ntddstor.h index cf54be6..e06e99a 100644 --- a/include/ntddstor.h +++ b/include/ntddstor.h @@ -28,17 +28,26 @@ extern "C" { #define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE #define IOCTL_STORAGE_CHECK_VERIFY CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_CHECK_VERIFY2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_MEDIA_REMOVAL CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_EJECT_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_LOAD_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_LOAD_MEDIA2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_RESERVE CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_RELEASE CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_FIND_NEW_DEVICES CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_EJECTION_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_MCN_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_GET_MEDIA_TYPES CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_GET_MEDIA_TYPES_EX CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0304, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_SET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_STORAGE_RESET_BUS CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_BREAK_RESERVATION CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_GET_DEVICE_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_PREDICT_FAILURE CTL_CODE(IOCTL_STORAGE_BASE, 0x0440, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_QUERY_PROPERTY CTL_CODE(IOCTL_STORAGE_BASE, 0x0500, METHOD_BUFFERED, FILE_ANY_ACCESS) DEFINE_GUID(DiskClassGuid,

1 0

Alexandre Julliard : widl: In 64-bit mode, pass all arguments to NdrClientCall instead of a pointer to the first one.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: d9cd0d8cac36c1cc9748a91518185c39af3697c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9cd0d8cac36c1cc9748a9151… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 11:34:46 2011 +0200 widl: In 64-bit mode, pass all arguments to NdrClientCall instead of a pointer to the first one. --- tools/widl/client.c | 20 +++++++++++++++----- tools/widl/proxy.c | 13 +++++++++++-- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index ea0c2cc..27093a5 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -107,15 +107,25 @@ static void write_function_stub( const type_t *iface, const var_t *func, fprintf(client, "{\n"); indent++; if (has_ret) print_client( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_client( "%s%s( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", + print_client( "%s%s( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u]", has_ret ? "_RetVal = " : "", stub_mode == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", iface->name, proc_offset ); if (args) - fprintf( client, "(unsigned char *)&%s );\n", - LIST_ENTRY( list_head(args), const var_t, entry )->name ); - else - fprintf( client, "(unsigned char *)0 );\n" ); + { + const var_t *arg; + if (pointer_size == 8) + { + LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) + fprintf( client, ",\n%*s%s", 4 * indent + 16, "", arg->name ); + } + else + { + arg = LIST_ENTRY( list_head(args), const var_t, entry ); + fprintf( client, ", &%s", arg->name ); + } + } + fprintf( client, " );\n" ); if (has_ret) { print_client( "return (" ); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index e889423..7d4ebe8 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -280,11 +280,20 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, print_proxy( "{\n"); indent++; if (has_ret) print_proxy( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_proxy( "%s%s( &Object_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", + print_proxy( "%s%s( &Object_StubDesc, &__MIDL_ProcFormatString.Format[%u],", has_ret ? "_RetVal = " : "", stub_mode == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", proc_offset ); - fprintf( proxy, "(unsigned char *)&This );\n" ); + if (pointer_size == 8) + { + const var_t *arg; + fprintf( proxy, "\n%*sThis", 4 * indent + 16, "" ); + if (args) + LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) + fprintf( proxy, ",\n%*s%s", 4 * indent + 16, "", arg->name ); + } + else fprintf( proxy, " &This" ); + fprintf( proxy, " );\n" ); if (has_ret) { print_proxy( "return (" );

1 0

Alexandre Julliard : widl: Set a correct fpu parameter mask on 64-bit.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: e4a0483529d0dae4480b888ce025001dcb7dd6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0483529d0dae4480b888ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 11:51:14 2011 +0200 widl: Set a correct fpu parameter mask on 64-bit. --- tools/widl/typegen.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7620653..b41abd0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1353,7 +1353,24 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, *offset += 14; if (pointer_size == 8) { - print_file( file, indent, "NdrFcShort(0x0),\n" ); /* floating point mask */ + unsigned short pos = 0, fpu_mask = 0; + + if (is_object( iface )) pos += 2; + if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) + { + if (type_get_type( var->type ) == TYPE_BASIC) + { + switch (type_basic_get_type( var->type )) + { + case TYPE_BASIC_FLOAT: fpu_mask |= 1 << pos; break; + case TYPE_BASIC_DOUBLE: fpu_mask |= 2 << pos; break; + default: break; + } + } + pos += 2; + if (pos >= 16) break; + } + print_file( file, indent, "NdrFcShort(0x%x),\n", fpu_mask ); /* floating point mask */ *offset += 2; } }

1 0

Alexandre Julliard : widl: Don' t generate old-style interpreted stubs on 64-bit.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 36ee028f497c82eaab7531258baa4f21bbd5ff43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ee028f497c82eaab7531258… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 12:14:47 2011 +0200 widl: Don't generate old-style interpreted stubs on 64-bit. --- tools/widl/client.c | 9 +++------ tools/widl/proxy.c | 40 +++++++++++++++++++++------------------- tools/widl/server.c | 4 ++-- tools/widl/typegen.c | 10 +++++----- tools/widl/widl.c | 9 ++++++++- tools/widl/widl.h | 2 +- 6 files changed, 40 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36ee028f497c82eaab753…

1 0