July 2015 - Wine-commits - list.winehq.org

Matteo Bruni : wined3d: Use a core-compatible GL format for ATI2N.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 04a195a9808e829dbf174e3e2f3f2a917f5be0ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a195a9808e829dbf174e3e2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 6 22:20:12 2015 +0200 wined3d: Use a core-compatible GL format for ATI2N. --- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/utils.c | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e392e50..059332d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3465,11 +3465,21 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) TRACE(" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).\n"); gl_info->supported[ARB_VERTEX_ARRAY_BGRA] = TRUE; } + if (!gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC] && gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) + { + TRACE(" IMPLIED: EXT_texture_compression_rgtc support (by ARB_texture_compression_rgtc).\n"); + gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC] = TRUE; + } if (!gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] && gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { TRACE(" IMPLIED: ARB_texture_compression_rgtc support (by EXT_texture_compression_rgtc).\n"); gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] = TRUE; } + if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] && !gl_info->supported[ARB_TEXTURE_RG]) + { + TRACE("ARB_texture_rg not supported, disabling ARB_texture_compression_rgtc.\n"); + gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] = FALSE; + } if (gl_info->supported[NV_TEXTURE_SHADER2]) { if (gl_info->supported[NV_REGISTER_COMBINERS]) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6c003c7..48f6671 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1269,6 +1269,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, + EXT_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_ATI2N, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, + GL_RG, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_INTZ, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0, @@ -2381,7 +2386,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); } - if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) + if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { idx = getFmtIdx(WINED3DFMT_ATI1N); gl_info->formats[idx].color_fixup = create_color_fixup_desc(

1 0

Aric Stewart : wine.inf: Add Dev Class for HID devices.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: c77c68599fa4d3a76f3f978da001255856bdbdde URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77c68599fa4d3a76f3f978da… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 6 13:07:17 2015 -0500 wine.inf: Add Dev Class for HID devices. --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fcd2e49..b647c3b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -445,6 +445,8 @@ HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be1031 HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" +HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices" +HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},"Class",,"HIDClass" [CurrentVersion] HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%"

1 0

Iván Matellanes : msvcirt: Add stub of class ios.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: e2119fb8542aa1fe6032f70293853f2a586d08eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2119fb8542aa1fe6032f7029… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sat Jul 4 16:24:37 2015 +0200 msvcirt: Add stub of class ios. --- dlls/msvcirt/msvcirt.c | 472 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcirt/msvcirt.h | 25 +++ dlls/msvcirt/msvcirt.spec | 184 ++++++++--------- dlls/msvcrt20/msvcrt20.spec | 180 ++++++++--------- dlls/msvcrt40/msvcrt40.spec | 180 ++++++++--------- 5 files changed, 748 insertions(+), 293 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2119fb8542aa1fe6032f…

1 0

Iván Matellanes : msvcirt/tests: Add initial tests for ios.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 0dcb382a4e3c30c520296d9a580a1391fbc81bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dcb382a4e3c30c520296d9a5… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sat Jul 4 16:24:45 2015 +0200 msvcirt/tests: Add initial tests for ios. --- dlls/msvcirt/tests/msvcirt.c | 185 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dcb382a4e3c30c520296…

1 0

Iván Matellanes : msvcirt: Implement ios constructors and assignment.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: bc01af8f8e68e7cc97a75e2201ab606116228fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc01af8f8e68e7cc97a75e220… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sat Jul 4 16:24:53 2015 +0200 msvcirt: Implement ios constructors and assignment. --- dlls/msvcirt/msvcirt.c | 67 ++++++++++++++++++++++++++++++++++---------- dlls/msvcirt/tests/msvcirt.c | 16 ++--------- 2 files changed, 54 insertions(+), 29 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 36d0215..04c195d 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -71,6 +71,8 @@ typedef struct { CRITICAL_SECTION lock; } ios; +ios* __thiscall ios_assign(ios*, const ios*); + /* class ostream */ typedef struct _ostream { const vtable_ptr *vtable; @@ -707,17 +709,12 @@ void __thiscall streambuf_dbp(streambuf *this) DEFINE_THISCALL_WRAPPER(ios_copy_ctor, 8) ios* __thiscall ios_copy_ctor(ios *this, const ios *copy) { - FIXME("(%p %p) stub\n", this, copy); - return this; -} - -/* ??0ios@@IAE(a)XZ */ -/* ??0ios@@IEAA(a)XZ */ -DEFINE_THISCALL_WRAPPER(ios_ctor, 4) -ios* __thiscall ios_ctor(ios *this) -{ - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p %p)\n", this, copy); + this->vtable = &MSVCP_ios_vtable; + this->sb = NULL; + this->delbuf = 0; + InitializeCriticalSection(&this->lock); + return ios_assign(this, copy); } /* ??0ios@@QAE(a)PAVstreambuf@@@Z */ @@ -725,16 +722,41 @@ ios* __thiscall ios_ctor(ios *this) DEFINE_THISCALL_WRAPPER(ios_sb_ctor, 8) ios* __thiscall ios_sb_ctor(ios *this, streambuf *sb) { - FIXME("(%p %p) stub\n", this, sb); + TRACE("(%p %p)\n", this, sb); + this->vtable = &MSVCP_ios_vtable; + this->sb = sb; + this->state = sb ? IOSTATE_goodbit : IOSTATE_badbit; + this->special[0] = this->special[1] = 0; + this->delbuf = 0; + this->tie = NULL; + this->flags = 0; + this->precision = 6; + this->fill = ' '; + this->width = 0; + this->do_lock = -1; + InitializeCriticalSection(&this->lock); return this; } +/* ??0ios@@IAE(a)XZ */ +/* ??0ios@@IEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(ios_ctor, 4) +ios* __thiscall ios_ctor(ios *this) +{ + return ios_sb_ctor(this, NULL); +} + /* ??1ios@@UAE(a)XZ */ /* ??1ios@@UEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(ios_dtor, 4) void __thiscall ios_dtor(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + if (this->delbuf && this->sb) + MSVCRT_operator_delete(this->sb); + this->sb = NULL; + this->state = IOSTATE_badbit; + DeleteCriticalSection(&this->lock); } /* ??4ios@@IAEAAV0(a)ABV0@@Z */ @@ -742,7 +764,15 @@ void __thiscall ios_dtor(ios *this) DEFINE_THISCALL_WRAPPER(ios_assign, 8) ios* __thiscall ios_assign(ios *this, const ios *rhs) { - FIXME("(%p %p) stub\n", this, rhs); + TRACE("(%p %p)\n", this, rhs); + this->state = rhs->state; + if (!this->sb) + this->state |= IOSTATE_badbit; + this->tie = rhs->tie; + this->flags = rhs->flags; + this->precision = (char) rhs->precision; + this->fill = rhs->fill; + this->width = (char) rhs->width; return this; } @@ -926,7 +956,14 @@ ios* __cdecl ios_hex(ios *this) DEFINE_THISCALL_WRAPPER(ios_init, 8) void __thiscall ios_init(ios *this, streambuf *sb) { - FIXME("(%p %p) stub\n", this, sb); + TRACE("(%p %p)\n", this, sb); + if (this->delbuf && this->sb) + MSVCRT_operator_delete(this->sb); + this->sb = sb; + if (sb == NULL) + this->state |= IOSTATE_badbit; + else + this->state &= ~IOSTATE_badbit; } /* ?iword(a)ios@@QBEAAJH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index e68b3c6..aded18f 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -818,7 +818,6 @@ static void test_ios(void) /* constructor/destructor */ call_func2(p_ios_sb_ctor, &ios_obj, NULL); -todo_wine { ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); ok(ios_obj.special[0] == 0, "expected 0 got %d\n", ios_obj.special[0]); @@ -848,7 +847,6 @@ todo_wine { call_func1(p_ios_ctor, &ios_obj); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); -} /* init */ ios_obj.state |= 0x8; @@ -856,10 +854,8 @@ todo_wine { ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); ok(ios_obj.state == 0x8, "expected %x got %x\n", 0x8, ios_obj.state); call_func2(p_ios_init, &ios_obj, NULL); -todo_wine { ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == (0x8|IOSTATE_badbit), "expected %x got %x\n", (0x8|IOSTATE_badbit), ios_obj.state); -} ios_obj.sb = psb; ios_obj.delbuf = 1; call_func2(p_ios_init, &ios_obj, psb); @@ -868,19 +864,15 @@ todo_wine { /* copy constructor */ call_func2(p_ios_copy_ctor, &ios_obj, &ios_obj2); -todo_wine { ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == (ios_obj2.state|IOSTATE_badbit), "expected %x got %x\n", (ios_obj2.state|IOSTATE_badbit), ios_obj.state); ok(ios_obj.delbuf == 0, "expected 0 got %d\n", ios_obj.delbuf); -} ok(ios_obj.tie == ios_obj2.tie, "expected %p got %p\n", ios_obj2.tie, ios_obj.tie); ok(ios_obj.flags == ios_obj2.flags, "expected %x got %x\n", ios_obj2.flags, ios_obj.flags); - todo_wine ok(ios_obj.precision == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.precision); + ok(ios_obj.precision == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.precision); ok(ios_obj.fill == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.fill); -todo_wine { ok(ios_obj.width == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.width); ok(ios_obj.do_lock == -1, "expected -1 got %d\n", ios_obj.do_lock); -} /* assignment */ ios_obj.state = 0x8; @@ -892,22 +884,18 @@ todo_wine { ios_obj.width = 0; ios_obj.do_lock = 2; call_func2(p_ios_assign, &ios_obj, &ios_obj2); -todo_wine { ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == (ios_obj2.state|IOSTATE_badbit), "expected %x got %x\n", (ios_obj2.state|IOSTATE_badbit), ios_obj.state); -} ok(ios_obj.delbuf == 2, "expected 2 got %d\n", ios_obj.delbuf); -todo_wine { ok(ios_obj.tie == ios_obj2.tie, "expected %p got %p\n", ios_obj2.tie, ios_obj.tie); ok(ios_obj.flags == ios_obj2.flags, "expected %x got %x\n", ios_obj2.flags, ios_obj.flags); ok(ios_obj.precision == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.precision); ok(ios_obj.fill == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.fill); ok(ios_obj.width == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.width); -} ok(ios_obj.do_lock == 2, "expected 2 got %d\n", ios_obj.do_lock); ios_obj.delbuf = 0; call_func1(p_ios_dtor, &ios_obj); - todo_wine ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); + ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); } START_TEST(msvcirt)

1 0

Huw Davies : shell32/tests: Win XP splits the args if there are spaces in the path.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: c5053f57124d76d5397e92e78eafb4e1607d6ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5053f57124d76d5397e92e78… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 6 15:02:57 2015 +0100 shell32/tests: Win XP splits the args if there are spaces in the path. This isn't seen on winetest runs, but is when jobs are submitted to the testbot. Presumably the path of the executable is different in the two cases. --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index f81794e..0d2773d 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1219,7 +1219,7 @@ static void test_commandline2argv(void) *strW = 0; args = CommandLineToArgvW(strW, &numargs); - ok(numargs == 1, "expected 1 args, got %d\n", numargs); + ok(numargs == 1 || broken(numargs > 1), "expected 1 args, got %d\n", numargs); ok(!args || (!args[numargs] || broken(args[numargs] != NULL) /* before Vista */), "expected NULL-terminated list of commandline arguments\n"); if (numargs == 1)

1 0

Olivier F. R. Dierick : psapi/tests: Add test for EnumProcessModules with NULL pointer.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 9effcc98f9c3259b615685088588b04d14589fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9effcc98f9c3259b615685088… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Thu Jul 2 04:41:05 2015 +0200 psapi/tests: Add test for EnumProcessModules with NULL pointer. --- dlls/psapi/tests/psapi_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 890b4ac..cebfc5f 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -136,6 +136,11 @@ static void test_EnumProcessModules(void) ok(ret == 1, "failed with %d\n", GetLastError()); SetLastError(0xdeadbeef); + ret = pEnumProcessModules(hpQV, NULL, sizeof(HMODULE), &cbNeeded); + ok(!ret, "succeeded\n"); + ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); if(ret != 1) return;

1 0

Thomas Faber : shell32/tests: Fix an ok() print.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 71f1c90628376dc135d388103434c5d3cff5ea60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f1c90628376dc135d388103… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Jul 2 06:25:25 2015 -0400 shell32/tests: Fix an ok() print. --- dlls/shell32/tests/shlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index eafaec5..1cfffaa 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -667,7 +667,7 @@ if (0) hwnd2 = (HWND)0xdeadbeef; hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd2); ok(hr == E_UNEXPECTED, "got (0x%08x)\n", hr); - ok(hwnd2 == NULL, "got %p\n", hwnd_view); + ok(hwnd2 == NULL, "got %p\n", hwnd2); /* ::DragLeave without drag operation */ hr = IShellView_QueryInterface(view, &IID_IDropTarget, (void**)&dt);

1 0

Thomas Faber : shell32/tests: Destroy shell view windows.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: eff884f19b2ace1d475bdaa5fcc519f68d3b7c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff884f19b2ace1d475bdaa5f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Jul 2 06:25:46 2015 -0400 shell32/tests: Destroy shell view windows. --- dlls/shell32/tests/shlview.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 1cfffaa..2134a49 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -676,6 +676,10 @@ if (0) ok(hr == S_OK, "got (0x%08x)\n", hr); IDropTarget_Release(dt); + hr = IShellView_DestroyViewWindow(view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(!IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + IShellView_Release(view); IShellFolder_Release(desktop); } @@ -835,6 +839,10 @@ if (0) win_skip("IFolderView2 is not supported.\n"); if (fv2) IFolderView2_Release(fv2); + hr = IShellView_DestroyViewWindow(view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(!IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + IShellBrowser_Release(browser); IFolderView_Release(fv); IShellView_Release(view);

1 0

Aaryaman Vasishta : d3drm/tests: Add test for IDirect3DRM*:: CreateDeviceFromSurface.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 65b07a65509701cfb5d6f2e521075e9f0761393c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b07a65509701cfb5d6f2e52… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Jul 3 23:44:34 2015 +0530 d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromSurface. --- dlls/d3drm/tests/d3drm.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5783e61..9eec182 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2148,6 +2148,196 @@ cleanup: DestroyWindow(window); } +static void test_create_device_from_surface(void) +{ + DDSCAPS caps = { DDSCAPS_ZBUFFER }; + DDSURFACEDESC desc; + IDirectDraw *ddraw = NULL; + IDirect3DRM *d3drm1 = NULL; + IDirect3DRM2 *d3drm2 = NULL; + IDirect3DRMDevice2 *device2 = NULL; + IDirect3DDevice2 *d3ddevice2 = NULL; + IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_surface = NULL, *d3drm_ds = NULL; + DWORD expected_flags; + HWND window; + GUID driver = IID_IDirect3DRGBDevice; + ULONG ref1, ref2, ref3, surface_ref1, surface_ref2; + RECT rc; + BOOL use_sysmem_zbuffer = FALSE; + HRESULT hr; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); + + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + GetClientRect(window, &rc); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = Direct3DRMCreate(&d3drm1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); + ref2 = get_refcount((IUnknown *)d3drm2); + + /* Create a surface and use it to create the retained mode device. */ + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + desc.dwWidth = rc.right; + desc.dwHeight = rc.bottom; + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2); + todo_wine ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr); + IDirectDrawSurface_Release(surface); + + desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + surface_ref1 = get_refcount((IUnknown *)surface); + hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2); + ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); + ref3 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); + surface_ref2 = get_refcount((IUnknown *)surface); + todo_wine ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", + surface_ref1, surface_ref2); + + /* Check if CreateDeviceFromSurface creates a primary surface */ + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, + NULL, &d3drm_surface, surface_callback); + ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr); + ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface); + + hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); + todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); + if (FAILED(hr)) + goto cleanup; + + hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface); + ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); + ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface); + + /* Check properties of attached depth surface */ + hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds); + ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); + ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); + + use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY; + ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", + rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); + ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); + expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; + ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags); + + IDirectDrawSurface_Release(ds); + IDirect3DDevice2_Release(d3ddevice2); + IDirectDrawSurface_Release(d3drm_surface); + if (device2) + { + IDirect3DRMDevice2_Release(device2); + ref3 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); + surface_ref2 = get_refcount((IUnknown *)surface); + ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", + surface_ref1, surface_ref2); + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds); + ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr); + + /*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/ + ref1 = IDirectDrawSurface_Release(ds); + ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1); + } + ref1 = IDirectDrawSurface_Release(surface); + ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + desc.dwWidth = rc.right; + desc.dwHeight = rc.bottom; + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; + desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | (use_sysmem_zbuffer ? DDSCAPS_SYSTEMMEMORY : 0); + desc.dwZBufferBitDepth = 16; + desc.dwWidth = rc.right; + desc.dwHeight = rc.bottom; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL); + ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface, ds); + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); + + hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2); + ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); + + hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); + todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); + if (FAILED(hr)) + goto cleanup; + + hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface); + ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); + ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface); + + /* Check if depth surface matches the one we created */ + hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds); + ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr); + ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds); + + IDirectDrawSurface_Release(d3drm_ds); + IDirectDrawSurface_Release(d3drm_surface); + IDirectDrawSurface_Release(ds); + +cleanup: + if (d3ddevice2) + IDirect3DDevice2_Release(d3ddevice2); + if (device2) + { + IDirect3DRMDevice2_Release(device2); + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds); + todo_wine ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr); + if (SUCCEEDED(hr)) + { + /*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/ + ref1 = IDirectDrawSurface_Release(ds); + ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1); + } + } + if (surface) + { + ref1 = IDirectDrawSurface_Release(surface); + ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1); + } + if (d3drm2) + IDirect3DRM2_Release(d3drm2); + if (d3drm1) + IDirect3DRM_Release(d3drm1); + if (ddraw) + IDirectDraw_Release(ddraw); + DestroyWindow(window); +} + START_TEST(d3drm) { test_MeshBuilder(); @@ -2166,4 +2356,5 @@ START_TEST(d3drm) test_d3drm_qi(); test_frame_qi(); test_create_device_from_clipper(); + test_create_device_from_surface(); }

1 0