July 2011 - Wine-Commits - list.winehq.org

Andrew Nguyen : dinput8: Improve the behavior of DirectInput8Create.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: cf073c8ad43f1f918726062b1e17edd0fe7efe60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf073c8ad43f1f918726062b1… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 5 07:19:26 2011 -0500 dinput8: Improve the behavior of DirectInput8Create. --- dlls/dinput/dinput_main.c | 27 ++++++--- dlls/dinput8/dinput8_main.c | 60 +++++++++++++----- dlls/dinput8/tests/Makefile.in | 5 +- dlls/dinput8/tests/device.c | 1 - dlls/dinput8/tests/dinput.c | 128 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 192 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf073c8ad43f1f9187260…

1 0

Andrew Nguyen : dinput: Improve the behavior of DirectInputCreateEx.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 10e28144c04847c82ae88cd9b3feeed111486bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e28144c04847c82ae88cd9b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 5 07:19:21 2011 -0500 dinput: Improve the behavior of DirectInputCreateEx. --- dlls/dinput/dinput_main.c | 9 +-- dlls/dinput/tests/dinput.c | 119 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 9b981a4..5e7ec6d 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -154,22 +154,19 @@ HRESULT WINAPI DirectInputCreateEx( TRACE("(%p,%04x,%s,%p,%p)\n", hinst, dwVersion, debugstr_guid(riid), ppDI, punkOuter); - if (IsEqualGUID( &IID_IUnknown, riid ) || - IsEqualGUID( &IID_IDirectInputA, riid ) || + if (IsEqualGUID( &IID_IDirectInputA, riid ) || IsEqualGUID( &IID_IDirectInput2A, riid ) || IsEqualGUID( &IID_IDirectInput7A, riid ) || IsEqualGUID( &IID_IDirectInputW, riid ) || IsEqualGUID( &IID_IDirectInput2W, riid ) || - IsEqualGUID( &IID_IDirectInput7W, riid ) || - IsEqualGUID( &IID_IDirectInput8A, riid ) || - IsEqualGUID( &IID_IDirectInput8W, riid )) + IsEqualGUID( &IID_IDirectInput7W, riid )) { hr = create_directinput_instance(riid, ppDI, &This); if (FAILED(hr)) return hr; } else - return DIERR_OLDDIRECTINPUTVERSION; + return DIERR_NOINTERFACE; hr = IDirectInput_Initialize( &This->IDirectInput7A_iface, hinst, dwVersion ); if (FAILED(hr)) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 24f392a..34f5a91 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -49,6 +49,8 @@ static const DWORD directinput_version_list[] = DIRECTINPUT_VERSION_700, }; +static HRESULT WINAPI (*pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN); + static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context) { ok(0, "Callback was invoked with parameters (%p, %p)\n", instance, context); @@ -154,6 +156,118 @@ static void test_preinitialization(void) IDirectInput_Release(pDI); } +static void test_DirectInputCreateEx(void) +{ + static const struct + { + BOOL hinst; + DWORD dwVersion; + REFIID riid; + BOOL ppdi; + HRESULT expected_hr; + IUnknown *expected_ppdi; + } invalid_param_list[] = + { + {FALSE, 0, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {FALSE, 0, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {FALSE, 0, &IID_IDirectInputA, FALSE, E_POINTER}, + {FALSE, 0, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, + {FALSE, DIRECTINPUT_VERSION, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {FALSE, DIRECTINPUT_VERSION, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER}, + {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, + {FALSE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {FALSE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER}, + {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, + {FALSE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {FALSE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER}, + {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, + {TRUE, 0, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {TRUE, 0, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {TRUE, 0, &IID_IDirectInputA, FALSE, E_POINTER}, + {TRUE, 0, &IID_IDirectInputA, TRUE, DIERR_NOTINITIALIZED, NULL}, + {TRUE, DIRECTINPUT_VERSION, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {TRUE, DIRECTINPUT_VERSION, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {TRUE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER}, + {TRUE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {TRUE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER}, + {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_BETADIRECTINPUTVERSION, NULL}, + {TRUE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, + {TRUE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, + {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER}, + {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_OLDDIRECTINPUTVERSION, NULL}, + }; + + static const REFIID no_interface_list[] = {&IID_IUnknown, &IID_IDirectInput8A, + &IID_IDirectInput8W, &IID_IDirectInputDeviceA, + &IID_IDirectInputDeviceW, &IID_IDirectInputDevice2A, + &IID_IDirectInputDevice2W, &IID_IDirectInputDevice7A, + &IID_IDirectInputDevice7W, &IID_IDirectInputDevice8A, + &IID_IDirectInputDevice8W, &IID_IDirectInputEffect}; + + static const REFIID iid_list[] = {&IID_IDirectInputA, &IID_IDirectInputW, + &IID_IDirectInput2A, &IID_IDirectInput2W, + &IID_IDirectInput7A, &IID_IDirectInput7W}; + + int i, j; + IUnknown *pUnk; + HRESULT hr; + + if (!pDirectInputCreateEx) + { + win_skip("DirectInputCreateEx is not available\n"); + return; + } + + for (i = 0; i < sizeof(invalid_param_list)/sizeof(invalid_param_list[0]); i++) + { + if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef; + hr = pDirectInputCreateEx(invalid_param_list[i].hinst ? hInstance : NULL, + invalid_param_list[i].dwVersion, + invalid_param_list[i].riid, + invalid_param_list[i].ppdi ? (void **)&pUnk : NULL, + NULL); + ok(hr == invalid_param_list[i].expected_hr, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr); + if (invalid_param_list[i].ppdi) + ok(pUnk == invalid_param_list[i].expected_ppdi, "[%d] Output interface pointer is %p\n", i, pUnk); + } + + for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + { + pUnk = (void *)0xdeadbeef; + hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL); + ok(hr == DIERR_NOINTERFACE, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr); + ok(pUnk == (void *)0xdeadbeef, "[%d] Output interface pointer is %p\n", i, pUnk); + } + + for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + { + pUnk = NULL; + hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL); + ok(hr == DI_OK, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr); + ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i); + if (pUnk) + IUnknown_Release(pUnk); + } + + /* Examine combinations of requested interfaces and version numbers. */ + for (i = 0; i < sizeof(directinput_version_list)/sizeof(directinput_version_list[0]); i++) + { + for (j = 0; j < sizeof(iid_list)/sizeof(iid_list[0]); j++) + { + pUnk = NULL; + hr = pDirectInputCreateEx(hInstance, directinput_version_list[i], iid_list[j], (void **)&pUnk, NULL); + ok(hr == DI_OK, "[%d/%d] DirectInputCreateEx returned 0x%08x\n", i, j, hr); + ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i); + if (pUnk) + IUnknown_Release(pUnk); + } + } +} + static void test_QueryInterface(void) { static const REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInputA, &IID_IDirectInputW, @@ -454,10 +568,15 @@ static void test_RunControlPanel(void) START_TEST(dinput) { + HMODULE dinput_mod = GetModuleHandleA("dinput.dll"); + hInstance = GetModuleHandleA(NULL); + pDirectInputCreateEx = (void *)GetProcAddress(dinput_mod, "DirectInputCreateEx"); + CoInitialize(NULL); test_preinitialization(); + test_DirectInputCreateEx(); test_QueryInterface(); test_CreateDevice(); test_EnumDevices();

1 0

Andrew Nguyen : dinput: Extract the DirectInput instance creation and initialization in DirectInputCreateEx to separate functions .
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: c126b21a34be008534e4fbd2a0f8bb8ea08c6c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c126b21a34be008534e4fbd2a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 5 07:19:17 2011 -0500 dinput: Extract the DirectInput instance creation and initialization in DirectInputCreateEx to separate functions. --- dlls/dinput/dinput_main.c | 152 ++++++++++++++++++++++++++++++------------ dlls/dinput/dinput_private.h | 1 + dlls/dinput/tests/dinput.c | 106 +++++++++++++++++++++++++++++ dlls/dinput8/dinput8_main.c | 12 +++- 4 files changed, 228 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c126b21a34be008534e4f…

1 0

Henri Verbeet : wined3d: Make context_create() work if the window is already destroyed.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 590505c0a472badcecc1767d3be11eededa3651c URL: http://source.winehq.org/git/wine.git/?a=commit;h=590505c0a472badcecc1767d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 5 22:30:53 2011 +0200 wined3d: Make context_create() work if the window is already destroyed. --- dlls/wined3d/context.c | 61 ++++++++++++++------------------------- dlls/wined3d/swapchain.c | 25 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 48 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7895156..9329977 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -713,58 +713,36 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) if (!pwglMakeCurrent(ctx->hdc, ctx->glCtx)) { + HDC dc; + WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", ctx->glCtx, ctx->hdc, GetLastError()); ctx->valid = 0; WARN("Trying fallback to the backup window.\n"); - if (!swapchain->backup_dc) + if (!(dc = swapchain_get_backup_dc(swapchain))) { - TRACE("Creating the backup window for swapchain %p.\n", swapchain); - swapchain->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", - WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); - if (!swapchain->backup_wnd) - { - ERR("Failed to create a window.\n"); - goto fail; - } - swapchain->backup_dc = GetDC(swapchain->backup_wnd); - if (!swapchain->backup_dc) - { - ERR("Failed to get a DC.\n"); - goto fail; - } - if (!context_set_pixel_format(ctx->gl_info, swapchain->backup_dc, ctx->pixel_format)) - { - ERR("Failed to set pixel format %d on device context %p.\n", - ctx->pixel_format, swapchain->backup_dc); - goto fail; - } + context_set_current(NULL); + return FALSE; + } + + if (!context_set_pixel_format(ctx->gl_info, dc, ctx->pixel_format)) + { + ERR("Failed to set pixel format %d on device context %p.\n", + ctx->pixel_format, dc); + context_set_current(NULL); + return FALSE; } - if (!pwglMakeCurrent(swapchain->backup_dc, ctx->glCtx)) + if (!pwglMakeCurrent(dc, ctx->glCtx)) { ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", - swapchain->backup_dc, GetLastError()); + dc, GetLastError()); context_set_current(NULL); return FALSE; } } return TRUE; - -fail: - if (swapchain->backup_dc) - { - ReleaseDC(swapchain->backup_wnd, swapchain->backup_dc); - swapchain->backup_dc = NULL; - } - if (swapchain->backup_wnd) - { - DestroyWindow(swapchain->backup_wnd); - swapchain->backup_wnd = NULL; - } - context_set_current(NULL); - return FALSE; } static void context_restore_gl_context(HDC dc, HGLRC gl_ctx) @@ -1272,8 +1250,13 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (!(hdc = GetDC(swapchain->win_handle))) { - ERR("Failed to retrieve a device context.\n"); - goto out; + WARN("Failed to retireve device context, trying swapchain backup.\n"); + + if (!(hdc = swapchain_get_backup_dc(swapchain))) + { + ERR("Failed to retrieve a device context.\n"); + goto out; + } } color_format = target->resource.format; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dc1800a..5848f37 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1197,3 +1197,28 @@ void get_drawable_size_swapchain(struct wined3d_context *context, UINT *width, U *width = context->current_rt->resource.width; *height = context->current_rt->resource.height; } + +HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) +{ + if (!swapchain->backup_dc) + { + TRACE("Creating the backup window for swapchain %p.\n", swapchain); + + if (!(swapchain->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL))) + { + ERR("Failed to create a window.\n"); + return NULL; + } + + if (!(swapchain->backup_dc = GetDC(swapchain->backup_wnd))) + { + ERR("Failed to get a DC.\n"); + DestroyWindow(swapchain->backup_wnd); + swapchain->backup_wnd = NULL; + return NULL; + } + } + + return swapchain->backup_dc; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1fedc9c..7025faa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2455,6 +2455,7 @@ void x11_copy_to_screen(struct wined3d_swapchain *swapchain, const RECT *rect) D struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; #define DEFAULT_REFRESH_RATE 0

1 0

Andrew Nguyen : dinput: Add tests for IDirectInput:: EnumDevices and add a parameter check.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 9b1060d0902960ad2a353f8f58094c7562b855b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b1060d0902960ad2a353f8f5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 5 07:19:06 2011 -0500 dinput: Add tests for IDirectInput::EnumDevices and add a parameter check. --- dlls/dinput/dinput_main.c | 6 +++ dlls/dinput/tests/dinput.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index bbaefec..1ab6899 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -325,6 +325,9 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( lpCallback, pvRef, dwFlags); _dump_EnumDevices_dwFlags(dwFlags); + if (!lpCallback) + return DIERR_INVALIDPARAM; + for (i = 0; i < NB_DINPUT_DEVICES; i++) { if (!dinput_devices[i]->enum_deviceA) continue; for (j = 0, r = -1; r != 0; j++) { @@ -356,6 +359,9 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( lpCallback, pvRef, dwFlags); _dump_EnumDevices_dwFlags(dwFlags); + if (!lpCallback) + return DIERR_INVALIDPARAM; + for (i = 0; i < NB_DINPUT_DEVICES; i++) { if (!dinput_devices[i]->enum_deviceW) continue; for (j = 0, r = -1; r != 0; j++) { diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 19b1819..676e5f8 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -168,6 +168,83 @@ static void test_CreateDevice(void) IDirectInput_Release(pDI); } +struct enum_devices_test +{ + unsigned int device_count; + BOOL return_value; +}; + +static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, void *context) +{ + struct enum_devices_test *enum_test = context; + + enum_test->device_count++; + return enum_test->return_value; +} + +static void test_EnumDevices(void) +{ + IDirectInputA *pDI; + HRESULT hr; + struct enum_devices_test enum_test, enum_test_return; + + hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + hr = IDirectInput_EnumDevices(pDI, 0, NULL, NULL, 0); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + hr = IDirectInput_EnumDevices(pDI, 0, NULL, NULL, ~0u); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + /* Test crashes on Wine. */ + if (0) + { + hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, NULL, ~0u); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + } + + hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, 0); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, ~0u); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, 0); + todo_wine + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, ~0u); + todo_wine + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + + enum_test.device_count = 0; + enum_test.return_value = DIENUM_CONTINUE; + hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0); + ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + ok(enum_test.device_count != 0, "Device count is %u\n", enum_test.device_count); + + /* Enumeration only stops with an explicit DIENUM_STOP. */ + enum_test_return.device_count = 0; + enum_test_return.return_value = 42; + hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test_return, 0); + ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + ok(enum_test_return.device_count == enum_test.device_count, + "Device count is %u vs. %u\n", enum_test_return.device_count, enum_test.device_count); + + enum_test.device_count = 0; + enum_test.return_value = DIENUM_STOP; + hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0); + ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + ok(enum_test.device_count == 1, "Device count is %u\n", enum_test.device_count); + + IDirectInput_Release(pDI); +} + static void test_Initialize(void) { IDirectInputA *pDI; @@ -251,6 +328,7 @@ START_TEST(dinput) CoInitialize(NULL); test_QueryInterface(); test_CreateDevice(); + test_EnumDevices(); test_Initialize(); test_RunControlPanel(); CoUninitialize();

1 0

Andrew Nguyen : dinput: Improve the behavior of IDirectInput::CreateDevice.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 324c76f3867cb4fb9e0f38af46d89af346011f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=324c76f3867cb4fb9e0f38af4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 5 07:19:01 2011 -0500 dinput: Improve the behavior of IDirectInput::CreateDevice. --- dlls/dinput/dinput_main.c | 67 +++++++++++++++++-------------------------- dlls/dinput/tests/dinput.c | 40 ++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 40 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 583e143..bbaefec 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -581,61 +581,48 @@ static HRESULT WINAPI IDirectInput2WImpl_FindDevice(LPDIRECTINPUT7W iface, REFGU return DI_OK; } -static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, REFGUID rguid, - REFIID riid, LPVOID* pvOut, LPUNKNOWN lpUnknownOuter) +static HRESULT create_device(IDirectInputImpl *This, REFGUID rguid, REFIID riid, LPVOID *pvOut, BOOL unicode) { - IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); - HRESULT ret_value = DIERR_DEVICENOTREG; - unsigned int i; - - TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter); + unsigned int i; - if (!rguid || !pvOut) return E_POINTER; + if (pvOut) + *pvOut = NULL; - /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) { - HRESULT ret; + if (!rguid || !pvOut) + return E_POINTER; - if (!dinput_devices[i]->create_device) continue; - if ((ret = dinput_devices[i]->create_device(This, rguid, riid, pvOut, 0)) == DI_OK) - return DI_OK; + /* Loop on all the devices to see if anyone matches the given GUID */ + for (i = 0; i < NB_DINPUT_DEVICES; i++) + { + HRESULT ret; - if (ret == DIERR_NOINTERFACE) - ret_value = DIERR_NOINTERFACE; - } + if (!dinput_devices[i]->create_device) continue; + if ((ret = dinput_devices[i]->create_device(This, rguid, riid, pvOut, unicode)) == DI_OK) + return DI_OK; + } - if (ret_value == DIERR_NOINTERFACE) - { WARN("invalid device GUID %s\n", debugstr_guid(rguid)); - } - - return ret_value; + return DIERR_DEVICENOTREG; } -static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx(LPDIRECTINPUT7W iface, REFGUID rguid, - REFIID riid, LPVOID* pvOut, LPUNKNOWN lpUnknownOuter) +static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, REFGUID rguid, + REFIID riid, LPVOID* pvOut, LPUNKNOWN lpUnknownOuter) { - IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); - HRESULT ret_value = DIERR_DEVICENOTREG; - unsigned int i; - - TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter); + IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); - if (!rguid || !pvOut) return E_POINTER; + TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter); - /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) { - HRESULT ret; + return create_device(This, rguid, riid, pvOut, FALSE); +} - if (!dinput_devices[i]->create_device) continue; - if ((ret = dinput_devices[i]->create_device(This, rguid, riid, pvOut, 1)) == DI_OK) - return DI_OK; +static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx(LPDIRECTINPUT7W iface, REFGUID rguid, + REFIID riid, LPVOID* pvOut, LPUNKNOWN lpUnknownOuter) +{ + IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); - if (ret == DIERR_NOINTERFACE) - ret_value = DIERR_NOINTERFACE; - } + TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter); - return ret_value; + return create_device(This, rguid, riid, pvOut, TRUE); } static HRESULT WINAPI IDirectInputAImpl_CreateDevice(LPDIRECTINPUT7A iface, REFGUID rguid, diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index c1bbd85..19b1819 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -129,6 +129,45 @@ static void test_QueryInterface(void) IDirectInput_Release(pDI); } +static void test_CreateDevice(void) +{ + IDirectInputA *pDI; + HRESULT hr; + IDirectInputDeviceA *pDID; + + hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + hr = IDirectInput_CreateDevice(pDI, NULL, NULL, NULL); + ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + + pDID = (void *)0xdeadbeef; + hr = IDirectInput_CreateDevice(pDI, NULL, &pDID, NULL); + ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + ok(pDID == NULL, "Output interface pointer is %p\n", pDID); + + hr = IDirectInput_CreateDevice(pDI, &GUID_Unknown, NULL, NULL); + ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + + pDID = (void *)0xdeadbeef; + hr = IDirectInput_CreateDevice(pDI, &GUID_Unknown, &pDID, NULL); + ok(hr == DIERR_DEVICENOTREG, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + ok(pDID == NULL, "Output interface pointer is %p\n", pDID); + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, NULL, NULL); + ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pDID, NULL); + ok(hr == DI_OK, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + + IDirectInputDevice_Release(pDID); + IDirectInput_Release(pDI); +} + static void test_Initialize(void) { IDirectInputA *pDI; @@ -211,6 +250,7 @@ START_TEST(dinput) CoInitialize(NULL); test_QueryInterface(); + test_CreateDevice(); test_Initialize(); test_RunControlPanel(); CoUninitialize();

1 0

Andrew Nguyen : dinput: Improve the behavior of IDirectInput::Initialize.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 26932c84b0e4e4028acc19af1ef14f09f584dc7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=26932c84b0e4e4028acc19af1… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 5 07:18:57 2011 -0500 dinput: Improve the behavior of IDirectInput::Initialize. --- dlls/dinput/dinput_main.c | 37 +++++++++++++++++++----- dlls/dinput/tests/dinput.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 865da02..583e143 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -472,14 +472,35 @@ static HRESULT WINAPI IDirectInputWImpl_QueryInterface(LPDIRECTINPUT7W iface, RE return IDirectInputAImpl_QueryInterface( &This->IDirectInput7A_iface, riid, ppobj ); } -static HRESULT WINAPI IDirectInputAImpl_Initialize(LPDIRECTINPUT7A iface, HINSTANCE hinst, DWORD x) { - TRACE("(this=%p,%p,%x)\n",iface, hinst, x); - - /* Initialize can return: DIERR_BETADIRECTINPUTVERSION, DIERR_OLDDIRECTINPUTVERSION and DI_OK. - * Since we already initialized the device, return DI_OK. In the past we returned DIERR_ALREADYINITIALIZED - * which broke applications like Tomb Raider Legend because it isn't a legal return value. - */ - return DI_OK; +enum directinput_versions +{ + DIRECTINPUT_VERSION_300 = 0x0300, + DIRECTINPUT_VERSION_500 = 0x0500, + DIRECTINPUT_VERSION_50A = 0x050A, + DIRECTINPUT_VERSION_5B2 = 0x05B2, + DIRECTINPUT_VERSION_602 = 0x0602, + DIRECTINPUT_VERSION_61A = 0x061A, + DIRECTINPUT_VERSION_700 = 0x0700, +}; + +static HRESULT WINAPI IDirectInputAImpl_Initialize(LPDIRECTINPUT7A iface, HINSTANCE hinst, DWORD version) +{ + TRACE("(%p)->(%p, 0x%04x)\n", iface, hinst, version); + + if (!hinst) + return DIERR_INVALIDPARAM; + else if (version == 0) + return DIERR_NOTINITIALIZED; + /* We need to accept version 8, even though native rejects it. */ + else if (version > DIRECTINPUT_VERSION_700 && version != DIRECTINPUT_VERSION) + return DIERR_OLDDIRECTINPUTVERSION; + else if (version != DIRECTINPUT_VERSION_300 && version != DIRECTINPUT_VERSION_500 && + version != DIRECTINPUT_VERSION_50A && version != DIRECTINPUT_VERSION_5B2 && + version != DIRECTINPUT_VERSION_602 && version != DIRECTINPUT_VERSION_61A && + version != DIRECTINPUT_VERSION_700 && version != DIRECTINPUT_VERSION) + return DIERR_BETADIRECTINPUTVERSION; + + return DI_OK; } static HRESULT WINAPI IDirectInputWImpl_Initialize(LPDIRECTINPUT7W iface, HINSTANCE hinst, DWORD x) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 7b25b8a..c1bbd85 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -27,6 +27,28 @@ HINSTANCE hInstance; +enum directinput_versions +{ + DIRECTINPUT_VERSION_300 = 0x0300, + DIRECTINPUT_VERSION_500 = 0x0500, + DIRECTINPUT_VERSION_50A = 0x050A, + DIRECTINPUT_VERSION_5B2 = 0x05B2, + DIRECTINPUT_VERSION_602 = 0x0602, + DIRECTINPUT_VERSION_61A = 0x061A, + DIRECTINPUT_VERSION_700 = 0x0700, +}; + +static const DWORD directinput_version_list[] = +{ + DIRECTINPUT_VERSION_300, + DIRECTINPUT_VERSION_500, + DIRECTINPUT_VERSION_50A, + DIRECTINPUT_VERSION_5B2, + DIRECTINPUT_VERSION_602, + DIRECTINPUT_VERSION_61A, + DIRECTINPUT_VERSION_700, +}; + static void test_QueryInterface(void) { static const REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInputA, &IID_IDirectInputW, @@ -107,6 +129,49 @@ static void test_QueryInterface(void) IDirectInput_Release(pDI); } +static void test_Initialize(void) +{ + IDirectInputA *pDI; + HRESULT hr; + int i; + + hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + hr = IDirectInput_Initialize(pDI, NULL, 0); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_Initialize returned 0x%08x\n", hr); + + hr = IDirectInput_Initialize(pDI, NULL, DIRECTINPUT_VERSION); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_Initialize returned 0x%08x\n", hr); + + hr = IDirectInput_Initialize(pDI, hInstance, 0); + ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_Initialize returned 0x%08x\n", hr); + + /* Invalid DirectInput versions less than 0x0700 yield DIERR_BETADIRECTINPUTVERSION. */ + hr = IDirectInput_Initialize(pDI, hInstance, 0x0123); + ok(hr == DIERR_BETADIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr); + + /* Invalid DirectInput versions greater than 0x0700 yield DIERR_BETADIRECTINPUTVERSION. */ + hr = IDirectInput_Initialize(pDI, hInstance, 0xcafe); + ok(hr == DIERR_OLDDIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr); + + for (i = 0; i < sizeof(directinput_version_list)/sizeof(directinput_version_list[0]); i++) + { + hr = IDirectInput_Initialize(pDI, hInstance, directinput_version_list[i]); + ok(hr == DI_OK, "IDirectInput_Initialize returned 0x%08x\n", hr); + } + + /* Parameters are still validated after successful initialization. */ + hr = IDirectInput_Initialize(pDI, hInstance, 0); + ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_Initialize returned 0x%08x\n", hr); + + IDirectInput_Release(pDI); +} + static void test_RunControlPanel(void) { IDirectInputA *pDI; @@ -146,6 +211,7 @@ START_TEST(dinput) CoInitialize(NULL); test_QueryInterface(); + test_Initialize(); test_RunControlPanel(); CoUninitialize(); }

1 0

Andrew Nguyen : dinput: Implement IDirectInput::RunControlPanel.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: 90e9e3103af0f383a6d321dd6f4c288e387dfdc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e9e3103af0f383a6d321dd6… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 5 07:18:40 2011 -0500 dinput: Implement IDirectInput::RunControlPanel. --- dlls/dinput/dinput_main.c | 15 ++++++++- dlls/dinput/tests/Makefile.in | 1 + dlls/dinput/tests/dinput.c | 69 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 1329ec6..3493bdd 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -510,9 +510,22 @@ static HRESULT WINAPI IDirectInputAImpl_RunControlPanel(LPDIRECTINPUT7A iface, HWND hwndOwner, DWORD dwFlags) { + WCHAR control_exeW[] = {'c','o','n','t','r','o','l','.','e','x','e',0}; + STARTUPINFOW si = {0}; + PROCESS_INFORMATION pi; + IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); - FIXME( "(%p)->(%p,%08x): stub\n", This, hwndOwner, dwFlags ); + TRACE( "(%p)->(%p, %08x)\n", This, hwndOwner, dwFlags ); + + if (hwndOwner && !IsWindow(hwndOwner)) + return E_HANDLE; + + if (dwFlags) + return DIERR_INVALIDPARAM; + + if (!CreateProcessW(NULL, control_exeW, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + return HRESULT_FROM_WIN32(GetLastError()); return DI_OK; } diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 6fb3180..9b04eb1 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = dinput ole32 version user32 C_SRCS = \ device.c \ + dinput.c \ joystick.c \ keyboard.c \ mouse.c diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c new file mode 100644 index 0000000..71ed4f6 --- /dev/null +++ b/dlls/dinput/tests/dinput.c @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2011 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define DIRECTINPUT_VERSION 0x0700 + +#define COBJMACROS +#include <windows.h> +#include <dinput.h> + +#include "wine/test.h" + +HINSTANCE hInstance; + +static void test_RunControlPanel(void) +{ + IDirectInputA *pDI; + HRESULT hr; + + hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + if (winetest_interactive) + { + hr = IDirectInput_RunControlPanel(pDI, NULL, 0); + ok(hr == S_OK, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + hr = IDirectInput_RunControlPanel(pDI, GetDesktopWindow(), 0); + ok(hr == S_OK, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + } + + hr = IDirectInput_RunControlPanel(pDI, NULL, ~0u); + ok(hr == DIERR_INVALIDPARAM, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, 0); + ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u); + ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + + IDirectInput_Release(pDI); +} + +START_TEST(dinput) +{ + hInstance = GetModuleHandleA(NULL); + + CoInitialize(NULL); + test_RunControlPanel(); + CoUninitialize(); +}

1 0

Andrew Nguyen : dinput: Fix some return values of IDirectInput:: QueryInterface.
by Alexandre Julliard July 6, 2011

July 6, 2011

Module: wine Branch: master Commit: c28512a5a64b249ff7e7a02ff0c986dd3707276d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28512a5a64b249ff7e7a02ff… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jul 5 07:18:52 2011 -0500 dinput: Fix some return values of IDirectInput::QueryInterface. --- dlls/dinput/dinput_main.c | 6 +++- dlls/dinput/tests/device.c | 1 - dlls/dinput/tests/dinput.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 3493bdd..865da02 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -421,6 +421,9 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE TRACE( "(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppobj ); + if (!riid || !ppobj) + return E_POINTER; + if (IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectInputA, riid ) || IsEqualGUID( &IID_IDirectInput2A, riid ) || @@ -459,7 +462,8 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE } FIXME( "Unsupported interface: %s\n", debugstr_guid(riid)); - return E_FAIL; + *ppobj = NULL; + return E_NOINTERFACE; } static HRESULT WINAPI IDirectInputWImpl_QueryInterface(LPDIRECTINPUT7W iface, REFIID riid, LPVOID *ppobj) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index a8ff19b..ea25482 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -23,7 +23,6 @@ #include "wine/test.h" #include "windef.h" -#include "initguid.h" #include "dinput.h" static const DIOBJECTDATAFORMAT obj_data_format[] = { diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 71ed4f6..7b25b8a 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -19,6 +19,7 @@ #define DIRECTINPUT_VERSION 0x0700 #define COBJMACROS +#include <initguid.h> #include <windows.h> #include <dinput.h> @@ -26,6 +27,86 @@ HINSTANCE hInstance; +static void test_QueryInterface(void) +{ + static const REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInputA, &IID_IDirectInputW, + &IID_IDirectInput2A, &IID_IDirectInput2W, + &IID_IDirectInput7A, &IID_IDirectInput7W}; + + static const struct + { + REFIID riid; + int test_todo; + } no_interface_list[] = + { + {&IID_IDirectInput8A, 1}, + {&IID_IDirectInput8W, 1}, + {&IID_IDirectInputDeviceA}, + {&IID_IDirectInputDeviceW}, + {&IID_IDirectInputDevice2A}, + {&IID_IDirectInputDevice2W}, + {&IID_IDirectInputDevice7A}, + {&IID_IDirectInputDevice7W}, + {&IID_IDirectInputDevice8A}, + {&IID_IDirectInputDevice8W}, + {&IID_IDirectInputEffect}, + }; + + IDirectInputA *pDI; + HRESULT hr; + IUnknown *pUnk; + int i; + + hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + hr = IDirectInput_QueryInterface(pDI, NULL, NULL); + ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr); + + pUnk = (void *)0xdeadbeef; + hr = IDirectInput_QueryInterface(pDI, NULL, (void **)&pUnk); + ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr); + ok(pUnk == (void *)0xdeadbeef, "Output interface pointer is %p\n", pUnk); + + hr = IDirectInput_QueryInterface(pDI, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr); + + for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + { + pUnk = NULL; + hr = IDirectInput_QueryInterface(pDI, iid_list[i], (void **)&pUnk); + ok(hr == S_OK, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); + ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i); + if (pUnk) IUnknown_Release(pUnk); + } + + for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + { + pUnk = (void *)0xdeadbeef; + hr = IDirectInput_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); + if (no_interface_list[i].test_todo) + { + todo_wine + ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); + todo_wine + ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); + + if (pUnk) IUnknown_Release(pUnk); + } + else + { + ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); + ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); + } + } + + IDirectInput_Release(pDI); +} + static void test_RunControlPanel(void) { IDirectInputA *pDI; @@ -64,6 +145,7 @@ START_TEST(dinput) hInstance = GetModuleHandleA(NULL); CoInitialize(NULL); + test_QueryInterface(); test_RunControlPanel(); CoUninitialize(); }

1 0

Stefan Dösinger : wined3d: Pass a struct wined3d_fb_state * to context_apply_clear_state.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: 718c6149377d1ecdec054a8a64685b2f6abf653e URL: http://source.winehq.org/git/wine.git/?a=commit;h=718c6149377d1ecdec054a8a6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 2 11:29:28 2011 +0200 wined3d: Pass a struct wined3d_fb_state * to context_apply_clear_state. --- dlls/wined3d/context.c | 11 ++++++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 14 +++++++------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 94ed896..7895156 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2083,19 +2083,20 @@ static BOOL context_validate_rt_config(UINT rt_count, /* Context activation is done by the caller. */ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_device *device, - UINT rt_count, struct wined3d_surface **rts, struct wined3d_surface *depth_stencil) + UINT rt_count, const struct wined3d_fb_state *fb) { const struct StateEntry *state_table = device->StateTable; DWORD rt_mask = 0; UINT i; + struct wined3d_surface **rts = fb->render_targets; - if (!context_validate_rt_config(rt_count, rts, depth_stencil)) + if (!context_validate_rt_config(rt_count, rts, fb->depth_stencil)) return FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - context_validate_onscreen_formats(device, context, depth_stencil); + context_validate_onscreen_formats(device, context, fb->depth_stencil); ENTER_GL(); @@ -2112,7 +2113,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d context->blit_targets[i] = NULL; ++i; } - context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, depth_stencil, SFLAG_INTEXTURE); + context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, fb->depth_stencil, SFLAG_INTEXTURE); glReadBuffer(GL_NONE); checkGLcall("glReadBuffer"); } @@ -2124,7 +2125,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d LEAVE_GL(); - /* TODO: This is not necessary if the rts are the device's current targets */ + /* TODO: This is not necessary if the framebuffer is the device's current framebuffer */ context_invalidate_state(context, STATE_FRAMEBUFFER, device->StateTable); } else diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 14e6613..a479119 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -685,7 +685,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count return WINED3D_OK; } - if (!context_apply_clear_state(context, device, rt_count, fb->render_targets, fb->depth_stencil)) + if (!context_apply_clear_state(context, device, rt_count, fb)) { context_release(context); WARN("Failed to apply clear state, skipping clear.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b040ff..1fedc9c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1130,6 +1130,12 @@ struct wined3d_context GLuint dummy_arbfp_prog; }; +struct wined3d_fb_state +{ + struct wined3d_surface **render_targets; + struct wined3d_surface *depth_stencil; +}; + typedef void (*APPLYSTATEFUNC)(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *ctx); struct StateEntry @@ -1223,7 +1229,7 @@ void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_device *device, - UINT rt_count, struct wined3d_surface **rts, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; + UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN; @@ -1613,12 +1619,6 @@ void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; /* Multithreaded flag. Removed from the public header to signal that IWineD3D::CreateDevice ignores it */ #define WINED3DCREATE_MULTITHREADED 0x00000004 -struct wined3d_fb_state -{ - struct wined3d_surface **render_targets; - struct wined3d_surface *depth_stencil; -}; - struct wined3d_device { LONG ref;

1 0