May 2012 - Wine-commits - list.winehq.org

Henri Verbeet : ddraw/tests: Move test_redundant_mode_set() to ddraw7.c.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 5582e1c9fed839f614bf3ad79b2b077a9894b7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5582e1c9fed839f614bf3ad79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 30 16:14:57 2012 +0200 ddraw/tests: Move test_redundant_mode_set() to ddraw7.c. --- dlls/ddraw/tests/d3d.c | 61 --------------------------------------------- dlls/ddraw/tests/ddraw7.c | 54 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 61 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 0daad33..a51fbd5 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3527,66 +3527,6 @@ static void BackBuffer3DAttachmentTest(void) DestroyWindow(window); } -static void test_redundant_mode_set(void) -{ - DDSURFACEDESC2 surface_desc = {0}; - IDirectDraw7 *ddraw7; - HWND window; - HRESULT hr; - RECT r, s; - ULONG ref; - - hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); - if (FAILED(hr)) - { - skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); - return; - } - - window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, - 0, 0, 100, 100, 0, 0, 0, 0); - - hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); - if (FAILED(hr)) - { - IDirectDraw7_Release(ddraw7); - DestroyWindow(window); - return; - } - - surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDraw7_GetDisplayMode(ddraw7, &surface_desc); - ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); - - hr = IDirectDraw7_SetDisplayMode(ddraw7, surface_desc.dwWidth, surface_desc.dwHeight, - U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); - ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); - - GetWindowRect(window, &r); - r.right /= 2; - r.bottom /= 2; - SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); - GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", - r.left, r.top, r.right, r.bottom, - s.left, s.top, s.right, s.bottom); - - hr = IDirectDraw7_SetDisplayMode(ddraw7, surface_desc.dwWidth, surface_desc.dwHeight, - U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); - ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); - - GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", - r.left, r.top, r.right, r.bottom, - s.left, s.top, s.right, s.bottom); - - ref = IDirectDraw7_Release(ddraw7); - ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); - - DestroyWindow(window); -} - static SIZE screen_size; static LRESULT CALLBACK mode_set_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) @@ -4690,7 +4630,6 @@ START_TEST(d3d) D3D1_releaseObjects(); } - test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); test_coop_level_surf_create(); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3d151e1..2b08ecc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1947,6 +1947,59 @@ static void test_window_style(void) DestroyWindow(window); } +static void test_redundant_mode_set(void) +{ + DDSURFACEDESC2 surface_desc = {0}; + IDirectDraw7 *ddraw; + HWND window; + HRESULT hr; + RECT r, s; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); + + hr = IDirectDraw7_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + r.right /= 2; + r.bottom /= 2; + SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + hr = IDirectDraw7_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + ref = IDirectDraw7_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -1972,4 +2025,5 @@ START_TEST(ddraw7) test_device_qi(); test_wndproc(); test_window_style(); + test_redundant_mode_set(); }

1 0

Henri Verbeet : ddraw/tests: Add test_redundant_mode_set() for older ddraw versions.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 643a68f6929096ca9a41645be47e5805d12a85ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=643a68f6929096ca9a41645be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 30 16:14:58 2012 +0200 ddraw/tests: Add test_redundant_mode_set() for older ddraw versions. --- dlls/ddraw/tests/ddraw1.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e53a1cd..f27fb8a 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1877,6 +1877,59 @@ static void test_window_style(void) DestroyWindow(window); } +static void test_redundant_mode_set(void) +{ + DDSURFACEDESC surface_desc = {0}; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + RECT r, s; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); + + hr = IDirectDraw_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + r.right /= 2; + r.bottom /= 2; + SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + hr = IDirectDraw_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + ref = IDirectDraw_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw1) { test_coop_level_create_device_window(); @@ -1892,4 +1945,5 @@ START_TEST(ddraw1) test_device_qi(); test_wndproc(); test_window_style(); + test_redundant_mode_set(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7f1ae88..1f690aa 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2014,6 +2014,59 @@ static void test_window_style(void) DestroyWindow(window); } +static void test_redundant_mode_set(void) +{ + DDSURFACEDESC surface_desc = {0}; + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + RECT r, s; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); + + hr = IDirectDraw2_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + r.right /= 2; + r.bottom /= 2; + SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + hr = IDirectDraw2_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + ref = IDirectDraw2_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -2031,4 +2084,5 @@ START_TEST(ddraw2) test_device_qi(); test_wndproc(); test_window_style(); + test_redundant_mode_set(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6f00b41..9d9a1bf 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2138,6 +2138,59 @@ static void test_window_style(void) DestroyWindow(window); } +static void test_redundant_mode_set(void) +{ + DDSURFACEDESC2 surface_desc = {0}; + IDirectDraw4 *ddraw; + HWND window; + HRESULT hr; + RECT r, s; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); + + hr = IDirectDraw4_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + r.right /= 2; + r.bottom /= 2; + SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + hr = IDirectDraw4_SetDisplayMode(ddraw, surface_desc.dwWidth, surface_desc.dwHeight, + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + ref = IDirectDraw4_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -2156,4 +2209,5 @@ START_TEST(ddraw4) test_device_qi(); test_wndproc(); test_window_style(); + test_redundant_mode_set(); }

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DSwapChain9Impl.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: d4c5c03cbb744cfa0c5f7a529471dff0da5f6b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c5c03cbb744cfa0c5f7a529… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 30 16:14:59 2012 +0200 d3d9: Get rid of IDirect3DSwapChain9Impl. --- dlls/d3d9/d3d9_private.h | 18 ++---- dlls/d3d9/device.c | 6 +- dlls/d3d9/swapchain.c | 157 +++++++++++++++++++++++----------------------- 3 files changed, 86 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4c5c03cbb744cfa0c5f7…

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DSurface9Impl.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: cb9cc2ccee7f49e5359309f6b8a5ed183125cb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9cc2ccee7f49e5359309f6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 30 16:15:00 2012 +0200 d3d9: Get rid of IDirect3DSurface9Impl. --- dlls/d3d9/d3d9_private.h | 30 ++---- dlls/d3d9/device.c | 49 +++++----- dlls/d3d9/surface.c | 251 ++++++++++++++++++++++----------------------- dlls/d3d9/swapchain.c | 4 +- dlls/d3d9/texture.c | 12 +- 5 files changed, 164 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb9cc2ccee7f49e535930…

1 0

Piotr Caban : msvcrt: Fixed typo in DEFINE_EXCEPTION_TYPE_INFO macro.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 482159a2349706ed07f5bc84b21f328d44fe4a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=482159a2349706ed07f5bc84b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 30 09:41:28 2012 +0200 msvcrt: Fixed typo in DEFINE_EXCEPTION_TYPE_INFO macro. --- dlls/msvcrt/cpp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 9564ff3..baf20b2 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -761,8 +761,8 @@ static const cxx_type_info_table name ## _type_info_table = \ base_classes+1, \ { \ &name ## _cxx_type_info, \ - cl2, \ - cl1 \ + cl1, \ + cl2 \ } \ }; \ \

1 0

Jacek Caban : jscript: Added missing port.h include to lex.c.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: de5495ba86e0a99ed94b2894298ea6708dbbbe83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5495ba86e0a99ed94b28942… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 10:17:18 2012 +0200 jscript: Added missing port.h include to lex.c. --- dlls/jscript/lex.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 022c06e..06d0b89 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <math.h> +#include "config.h" +#include "wine/port.h" + #include <limits.h> #include "jscript.h"

1 0

Michael Geddes : kernel32: Add timed wait capability flag to COMM Port properties.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: d7dc0e6066de8a1cfe721e85bd187774709dcd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7dc0e6066de8a1cfe721e85b… Author: Michael Geddes <michael(a)frog.wheelycreek.net> Date: Wed May 2 19:36:51 2012 +0800 kernel32: Add timed wait capability flag to COMM Port properties. --- dlls/kernel32/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 096bc42..30fd44f 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -1154,7 +1154,7 @@ BOOL WINAPI GetCommProperties( lpCommProp->dwMaxRxQueue = 4096; lpCommProp->dwMaxBaud = BAUD_115200; lpCommProp->dwProvSubType = PST_RS232; - lpCommProp->dwProvCapabilities = PCF_DTRDSR | PCF_PARITY_CHECK | PCF_RTSCTS | PCF_TOTALTIMEOUTS; + lpCommProp->dwProvCapabilities = PCF_DTRDSR | PCF_PARITY_CHECK | PCF_RTSCTS | PCF_TOTALTIMEOUTS | PCF_INTTIMEOUTS; lpCommProp->dwSettableParams = SP_BAUD | SP_DATABITS | SP_HANDSHAKING | SP_PARITY | SP_PARITY_CHECK | SP_STOPBITS ; lpCommProp->dwSettableBaud = BAUD_075 | BAUD_110 | BAUD_134_5 | BAUD_150 |

1 0

Austin English : wine.inf: Add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WinSock2\Parameters\Protocol_Catalog9\Catalog_Entries registry entry .
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 29cac72d1ad794034bbf424b0e1f30ec634b2976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cac72d1ad794034bbf424b0… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 29 11:39:46 2012 -0700 wine.inf: Add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WinSock2\Parameters\Protocol_Catalog9\Catalog_Entries registry entry. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index abd5307..b182953 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3047,7 +3047,7 @@ HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 -HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16 [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1"

1 0

Lucas Zawacki : dinput: Implement GetProperty for JOYSTICKID (Linux driver) .
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: fbfdc6db650b6d1038dd193375b1880a95c0d535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbfdc6db650b6d1038dd19337… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue May 29 13:42:26 2012 -0300 dinput: Implement GetProperty for JOYSTICKID (Linux driver). --- dlls/dinput/joystick_linux.c | 40 ++++++++++++++++++++++++++++++++++++++-- include/dinput.h | 1 + 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index d951e76..5afd07c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -542,6 +542,42 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) } /****************************************************************************** + * GetProperty : get input device properties + */ +static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + + TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + _dump_DIPROPHEADER(pdiph); + + if (!IS_DIPROP(rguid)) return DI_OK; + + switch (LOWORD(rguid)) { + + case (DWORD_PTR) DIPROP_JOYSTICKID: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + pd->dwData = get_joystick_index(&This->generic.base.guid); + TRACE("DIPROP_JOYSTICKID(%d)\n", pd->dwData); + break; + } + + default: + return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); + } + + return DI_OK; +} + +static HRESULT WINAPI JoystickLinuxAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + return JoystickLinuxWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); +} + +/****************************************************************************** * Unacquire : frees the joystick */ static HRESULT WINAPI JoystickLinuxWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) @@ -655,7 +691,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_Release, JoystickAGenericImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, - JoystickAGenericImpl_GetProperty, + JoystickLinuxAImpl_GetProperty, JoystickAGenericImpl_SetProperty, JoystickLinuxAImpl_Acquire, JoystickLinuxAImpl_Unacquire, @@ -691,7 +727,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_Release, JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, - JoystickWGenericImpl_GetProperty, + JoystickLinuxWImpl_GetProperty, JoystickWGenericImpl_SetProperty, JoystickLinuxWImpl_Acquire, JoystickLinuxWImpl_Unacquire, diff --git a/include/dinput.h b/include/dinput.h index a6cf7e2..3125800 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -905,6 +905,7 @@ typedef const DIPROPSTRING *LPCDIPROPSTRING; #define DIPROP_CALIBRATION MAKEDIPROP(11) #define DIPROP_GUIDANDPATH MAKEDIPROP(12) +#define DIPROP_JOYSTICKID MAKEDIPROP(15) #define DIPROP_KEYNAME MAKEDIPROP(20) #define DIPROP_VIDPID MAKEDIPROP(24)

1 0

Lucas Zawacki : dinput: Implement GetProperty for JOYSTICKID ( LinuxInput driver).
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 2cd3b908ad97696ff4abdbb39636c992f8f04554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd3b908ad97696ff4abdbb39… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue May 29 13:42:27 2012 -0300 dinput: Implement GetProperty for JOYSTICKID (LinuxInput driver). --- dlls/dinput/joystick_linuxinput.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2902f9f..3cab015 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -965,6 +965,15 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF break; } + case (DWORD_PTR) DIPROP_JOYSTICKID: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + pd->dwData = get_joystick_index(&This->generic.base.guid); + TRACE("DIPROP_JOYSTICKID(%d)\n", pd->dwData); + break; + } + default: return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); }

1 0