March 2014 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : netcfgx: Implement DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: d2733579ae1dada7b4e362f41ba92784baa26e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2733579ae1dada7b4e362f41… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 20 10:10:14 2014 +1100 netcfgx: Implement DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer. --- dlls/netcfgx/main.c | 28 ++++++++++++++++++++++++++++ dlls/netcfgx/netcfgx.spec | 8 ++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/netcfgx/main.c b/dlls/netcfgx/main.c index 6cd1894..dd3394c 100644 --- a/dlls/netcfgx/main.c +++ b/dlls/netcfgx/main.c @@ -21,14 +21,20 @@ #include "windef.h" #include "winbase.h" +#include "ole2.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(netcfgx); +static HINSTANCE NETCFGX_hInstance; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + NETCFGX_hInstance = hinstDLL; + switch (fdwReason) { case DLL_WINE_PREATTACH: @@ -42,3 +48,25 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) +{ + FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( NETCFGX_hInstance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( NETCFGX_hInstance ); +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} diff --git a/dlls/netcfgx/netcfgx.spec b/dlls/netcfgx/netcfgx.spec index 38ce927..cb48a6d 100644 --- a/dlls/netcfgx/netcfgx.spec +++ b/dlls/netcfgx/netcfgx.spec @@ -1,7 +1,7 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub HrDiAddComponentToINetCfg @ stub LanaCfgFromCommandArgs @ stub ModemClassCoInstaller

1 0

Alistair Leslie-Hughes : netcfgx: Register interfaces.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 06cbe44c45bd9c0fa4f1ad1713df478c828928f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06cbe44c45bd9c0fa4f1ad171… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 20 10:19:14 2014 +1100 netcfgx: Register interfaces. --- configure | 2 +- configure.ac | 2 +- dlls/netcfgx/Makefile.in | 2 ++ dlls/netcfgx/netcfgx_classes.idl | 21 +++++++++++++++++++++ include/netcfgx.idl | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 847dbee..0c83270 100755 --- a/configure +++ b/configure @@ -17023,7 +17023,7 @@ wine_fn_config_dll msxml6 enable_msxml6 clean wine_fn_config_dll nddeapi enable_nddeapi implib wine_fn_config_dll netapi32 enable_netapi32 implib wine_fn_config_test dlls/netapi32/tests netapi32_test -wine_fn_config_dll netcfgx enable_netcfgx +wine_fn_config_dll netcfgx enable_netcfgx clean wine_fn_config_dll newdev enable_newdev implib wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml diff --git a/configure.ac b/configure.ac index 4a7bca2..09c7e5a 100644 --- a/configure.ac +++ b/configure.ac @@ -3027,7 +3027,7 @@ WINE_CONFIG_DLL(msxml6,,[clean]) WINE_CONFIG_DLL(nddeapi,,[implib]) WINE_CONFIG_DLL(netapi32,,[implib]) WINE_CONFIG_TEST(dlls/netapi32/tests) -WINE_CONFIG_DLL(netcfgx) +WINE_CONFIG_DLL(netcfgx,,[clean]) WINE_CONFIG_DLL(newdev,,[implib]) WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in index 22b10ae..29277db 100644 --- a/dlls/netcfgx/Makefile.in +++ b/dlls/netcfgx/Makefile.in @@ -2,3 +2,5 @@ MODULE = netcfgx.dll C_SRCS = \ main.c + +IDL_SRCS = netcfgx_classes.idl diff --git a/dlls/netcfgx/netcfgx_classes.idl b/dlls/netcfgx/netcfgx_classes.idl new file mode 100644 index 0000000..3dd64bb --- /dev/null +++ b/dlls/netcfgx/netcfgx_classes.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2014 Alistair Leslie-Hughes + * + * 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 + */ + +#pragma makedep register + +#include "netcfgx.idl" diff --git a/include/netcfgx.idl b/include/netcfgx.idl index c465410..75c0a94 100644 --- a/include/netcfgx.idl +++ b/include/netcfgx.idl @@ -106,6 +106,7 @@ interface INetCfg : IUnknown }; [ + helpstring("Network Configuration Component Object"), threading(both), uuid(5b035261-40f9-11d1-aaec-00805fc1270e) ]

1 0

Eriks Dobelis : wintab32: Fix pkSerialNumber typo.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 819943063d0c48b610af8ced9e81dd8dd4867eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=819943063d0c48b610af8ced9… Author: Eriks Dobelis <eriks.dobelis(a)biti.lv> Date: Thu Mar 20 09:16:22 2014 +0200 wintab32: Fix pkSerialNumber typo. --- dlls/wintab32/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 7278373..9bc29a4 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -313,7 +313,7 @@ static LPVOID TABLET_CopyPacketData(LPOPENCONTEXT context, LPVOID lpPkt, if (context->context.lcPktData & PK_CHANGED) ptr+=CopyTabletData(ptr,&wtp->pkChanged,sizeof(WTPKT)); if (context->context.lcPktData & PK_SERIAL_NUMBER) - ptr+=CopyTabletData(ptr,&wtp->pkChanged,sizeof(UINT)); + ptr+=CopyTabletData(ptr,&wtp->pkSerialNumber,sizeof(UINT)); if (context->context.lcPktData & PK_CURSOR) ptr+=CopyTabletData(ptr,&wtp->pkCursor,sizeof(UINT)); if (context->context.lcPktData & PK_BUTTONS)

1 0

Akihiro Sagawa : gdi32/tests: GetGlyphOutlineA is broken for johab charset on windows.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: f548ce29ed55193d7589a4e1d6a0864e3320eb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f548ce29ed55193d7589a4e1d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 20 00:28:31 2014 +0900 gdi32/tests: GetGlyphOutlineA is broken for johab charset on windows. --- dlls/gdi32/tests/font.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 259f4a0..a205ac7 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4129,7 +4129,6 @@ static void test_GetGlyphOutline(void) {ANSI_CHARSET, 0x30, 0x30}, {SHIFTJIS_CHARSET, 0x82a0, 0x3042}, {HANGEUL_CHARSET, 0x8141, 0xac02}, - {JOHAB_CHARSET, 0x8446, 0x3135}, {GB2312_CHARSET, 0x8141, 0x4e04}, {CHINESEBIG5_CHARSET, 0xa142, 0x3001} };

1 0

Nikolay Sivov : kernel32: Added WerUnregisterMemoryBlock() stub.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 975abdea7f8d9193c49a7c44f4dffeb62c2bc5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975abdea7f8d9193c49a7c44f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 01:07:49 2014 +0400 kernel32: Added WerUnregisterMemoryBlock() stub. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/wer.c | 12 ++++++++++++ include/werapi.h | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f8d3a80..3126628 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1275,6 +1275,7 @@ @ stdcall WerRegisterMemoryBlock(ptr long) @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) @ stdcall WerSetFlags(long) +@ stdcall WerUnregisterMemoryBlock(ptr) @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) @ stdcall Wow64EnableWow64FsRedirection(long) diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c index aa1d530..3c517c4 100644 --- a/dlls/kernel32/wer.c +++ b/dlls/kernel32/wer.c @@ -64,8 +64,20 @@ HRESULT WINAPI WerSetFlags(DWORD flags) return E_NOTIMPL; } +/*********************************************************************** + * WerRegisterMemoryBlock (KERNEL32.@) + */ HRESULT WINAPI WerRegisterMemoryBlock(void *block, DWORD size) { FIXME("(%p %d) stub\n", block, size); return E_NOTIMPL; } + +/*********************************************************************** + * WerUnregisterMemoryBlock (KERNEL32.@) + */ +HRESULT WINAPI WerUnregisterMemoryBlock(void *block) +{ + FIXME("(%p) stub\n", block); + return E_NOTIMPL; +} diff --git a/include/werapi.h b/include/werapi.h index 6c3bb24..c66195f 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -175,6 +175,8 @@ typedef struct _WER_EXCEPTION_INFORMATION HRESULT WINAPI WerAddExcludedApplication(PCWSTR, BOOL); HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags); +HRESULT WINAPI WerRegisterMemoryBlock(void *block, DWORD size); +HRESULT WINAPI WerRegisterRuntimeExceptionModule(PCWSTR callbackdll, void *context); HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR, BOOL); HRESULT WINAPI WerReportAddFile(HREPORT, PCWSTR, WER_FILE_TYPE, DWORD); HRESULT WINAPI WerReportCloseHandle(HREPORT); @@ -182,6 +184,8 @@ HRESULT WINAPI WerReportCreate(PCWSTR, WER_REPORT_TYPE, PWER_REPORT_INFORMATION, HRESULT WINAPI WerReportSetParameter(HREPORT, DWORD, PCWSTR, PCWSTR); HRESULT WINAPI WerReportSetUIOption(HREPORT, WER_REPORT_UI, PCWSTR); HRESULT WINAPI WerReportSubmit(HREPORT, WER_CONSENT, DWORD, PWER_SUBMIT_RESULT); +HRESULT WINAPI WerSetFlags(DWORD flags); +HRESULT WINAPI WerUnregisterMemoryBlock(void *block); #ifdef __cplusplus }

1 0

Nikolay Sivov : scrrun/tests: Update idl file in tests.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 40e23cde9ec8a9c49e198301541abd6cfd8f510c URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e23cde9ec8a9c49e1983015… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 09:44:51 2014 +0400 scrrun/tests: Update idl file in tests. --- dlls/scrrun/tests/scrrun.idl | 430 +++++++++++++++++++++--------------------- 1 file changed, 210 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40e23cde9ec8a9c49e198…

1 0

Nikolay Sivov : wshom.ocx/tests: Update idl file in tests.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 87f7f88c4fcfd9fae11f39dacae17a742e91f975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f7f88c4fcfd9fae11f39dac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 09:45:11 2014 +0400 wshom.ocx/tests: Update idl file in tests. --- dlls/wshom.ocx/tests/wshom.idl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index a89b3fc..5c263d1 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -105,7 +105,7 @@ library IWshRuntimeLibrary HRESULT Write([in] BSTR Text); [id(0x2718)] - HRESULT WriteLine([in, optional, defaultvalue("")] BSTR Text); + HRESULT WriteLine([in, defaultvalue("")] BSTR Text); [id(0x2719)] HRESULT WriteBlankLines([in] long Lines); @@ -221,20 +221,20 @@ library IWshRuntimeLibrary HRESULT Type([out, retval] BSTR* Type); [id(0x04b0)] - HRESULT Delete([in, optional, defaultvalue(0)] VARIANT_BOOL Force); + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL Force); [id(0x04b2)] HRESULT Copy( [in] BSTR Destination, - [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); [id(0x04b4)] HRESULT Move([in] BSTR Destination); [id(0x044c)] HRESULT OpenAsTextStream( - [in, optional, defaultvalue(1)] IOMode IOMode, - [in, optional, defaultvalue(0)] Tristate Format, + [in, defaultvalue(1)] IOMode IOMode, + [in, defaultvalue(0)] Tristate Format, [out, retval] ITextStream** ppts); }; @@ -306,12 +306,12 @@ library IWshRuntimeLibrary HRESULT Type([out, retval] BSTR* type); [id(0x04b1)] - HRESULT Delete([in, optional, defaultvalue(0)] VARIANT_BOOL force); + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL force); [id(0x04b3)] HRESULT Copy( [in] BSTR Destination, - [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); [id(0x04b5)] HRESULT Move([in] BSTR Destination); @@ -331,8 +331,8 @@ library IWshRuntimeLibrary [id(0x044d)] HRESULT CreateTextFile( [in] BSTR FileName, - [in, optional, defaultvalue(-1)] VARIANT_BOOL Overwrite, - [in, optional, defaultvalue(0)] VARIANT_BOOL Unicode, + [in, defaultvalue(-1)] VARIANT_BOOL Overwrite, + [in, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts); }; @@ -573,7 +573,7 @@ library IWshRuntimeLibrary HRESULT LogEvent( [in] VARIANT* Type, [in] BSTR Message, - [in, optional, defaultvalue("")] BSTR Target, + [in, defaultvalue("")] BSTR Target, [out, retval] VARIANT_BOOL* out_Success); [id(0x0bc2)]

1 0

Henri Verbeet : d3d9/tests: Use a separate device for vface_register_test( ).
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: c11904b86d0009c84f9bbaf0100608e53742cbfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11904b86d0009c84f9bbaf01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 20 09:19:25 2014 +0100 d3d9/tests: Use a separate device for vface_register_test(). --- dlls/d3d9/tests/visual.c | 87 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 60 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 39b3449..b3abd87 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8337,10 +8337,20 @@ static void conditional_np2_repeat_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); } -static void vFace_register_test(IDirect3DDevice9 *device) +static void vface_register_test(void) { - HRESULT hr; + IDirect3DSurface9 *surface, *backbuffer; + IDirect3DVertexShader9 *vshader; + IDirect3DPixelShader9 *shader; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; + static const DWORD shader_code[] = { 0xffff0300, /* ps_3_0 */ @@ -8360,34 +8370,51 @@ static void vFace_register_test(IDirect3DDevice9 *device) 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ 0x0000ffff /* end */ }; - IDirect3DPixelShader9 *shader; - IDirect3DVertexShader9 *vshader; - IDirect3DTexture9 *texture; - IDirect3DSurface9 *surface, *backbuffer; - const float quad[] = { - -1.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - -1.0, 0.0, 0.1, + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, + 1.0f, -1.0f, 0.1f, + -1.0f, 0.0f, 0.1f, - 1.0, -1.0, 0.1, - 1.0, 0.0, 0.1, - -1.0, 0.0, 0.1, + 1.0f, -1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, + -1.0f, 0.0f, 0.1f, - -1.0, 0.0, 0.1, - -1.0, 1.0, 0.1, - 1.0, 0.0, 0.1, + -1.0f, 0.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, - 1.0, 0.0, 0.1, - -1.0, 1.0, 0.1, - 1.0, 1.0, 0.1, + 1.0f, 0.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 1.0f, 1.0f, 0.1f, }; - const float blit[] = { - 0.0, -1.0, 0.1, 0.0, 0.0, - 1.0, -1.0, 0.1, 1.0, 0.0, - 0.0, 1.0, 0.1, 0.0, 1.0, - 1.0, 1.0, 0.1, 1.0, 1.0, + static const float blit[] = + { + 0.0f, -1.0f, 0.1f, 0.0f, 0.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 0.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0) || caps.VertexShaderVersion < D3DVS_VERSION(3, 0)) + { + skip("No shader model 3 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vshader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); @@ -8396,6 +8423,8 @@ static void vFace_register_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed hr=%08x\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to set cull mode, hr %#x.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, shader); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed hr=%08x\n", hr); hr = IDirect3DDevice9_SetVertexShader(device, vshader); @@ -8405,7 +8434,7 @@ static void vFace_register_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(hr == D3D_OK, "IDirect3DDevice9_GetBackBuffer failed hr=%08x\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -8455,12 +8484,16 @@ static void vFace_register_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); - IDirect3DDevice9_SetTexture(device, 0, NULL); IDirect3DPixelShader9_Release(shader); IDirect3DVertexShader9_Release(vshader); IDirect3DSurface9_Release(surface); IDirect3DSurface9_Release(backbuffer); IDirect3DTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) @@ -15811,7 +15844,6 @@ START_TEST(visual) if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0) && caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { nested_loop_test(device_ptr); pretransformed_varying_test(device_ptr); - vFace_register_test(device_ptr); } else { skip("No ps_3_0 or vs_3_0 support\n"); } @@ -15825,6 +15857,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + vface_register_test(); vpos_register_test(); multiple_rendertargets_test(); texop_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for pretransformed_varying_test().
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: f1d4d8c49dddc4d47e879eba71986b974f3ff86d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d4d8c49dddc4d47e879eba7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 20 09:19:26 2014 +0100 d3d9/tests: Use a separate device for pretransformed_varying_test(). --- dlls/d3d9/tests/visual.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b3abd87..bd49c49 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6299,7 +6299,7 @@ static void nested_loop_test(IDirect3DDevice9 *device) IDirect3DVertexShader9_Release(vshader); } -static void pretransformed_varying_test(IDirect3DDevice9 *device) +static void pretransformed_varying_test(void) { /* dcl_position: fails to compile */ static const DWORD blendweight_code[] = @@ -6483,9 +6483,33 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) }, }; IDirect3DVertexDeclaration9 *decl; - HRESULT hr; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; unsigned int i; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0) || caps.VertexShaderVersion < D3DVS_VERSION(3, 0)) + { + skip("No shader model 3 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); @@ -6498,7 +6522,7 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) { IDirect3DPixelShader9 *shader; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, tests[i].shader_code, &shader); @@ -6540,6 +6564,11 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) } IDirect3DVertexDeclaration9_Release(decl); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void test_compare_instructions(IDirect3DDevice9 *device) @@ -15843,7 +15872,6 @@ START_TEST(visual) unbound_sampler_test(device_ptr); if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0) && caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { nested_loop_test(device_ptr); - pretransformed_varying_test(device_ptr); } else { skip("No ps_3_0 or vs_3_0 support\n"); } @@ -15857,6 +15885,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + pretransformed_varying_test(); vface_register_test(); vpos_register_test(); multiple_rendertargets_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for nested_loop_test().
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 07c42c9edaa5f52367aa88016c3650412cd53a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c42c9edaa5f52367aa88016… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 20 09:19:27 2014 +0100 d3d9/tests: Use a separate device for nested_loop_test(). --- dlls/d3d9/tests/visual.c | 63 +++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bd49c49..98c6252 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6225,8 +6225,18 @@ static void cnd_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(shader_11); } -static void nested_loop_test(IDirect3DDevice9 *device) +static void nested_loop_test(void) { + IDirect3DVertexShader9 *vshader; + IDirect3DPixelShader9 *shader; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + DWORD color; + HWND window; + HRESULT hr; + static const DWORD shader_code[] = { 0xffff0300, /* ps_3_0 */ @@ -6250,17 +6260,33 @@ static void nested_loop_test(IDirect3DDevice9 *device) 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ 0x0000ffff /* end */ }; - IDirect3DPixelShader9 *shader; - IDirect3DVertexShader9 *vshader; - HRESULT hr; - DWORD color; - const float quad[] = { - -1.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - -1.0, 1.0, 0.1, - 1.0, 1.0, 0.1 + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 1.0f, -1.0f, 0.1f, + 1.0f, 1.0f, 0.1f, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0) || caps.VertexShaderVersion < D3DVS_VERSION(3, 0)) + { + skip("No shader model 3 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed with %08x\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, shader); @@ -6271,7 +6297,7 @@ static void nested_loop_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x0000ff00, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x0000ff00, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -6291,12 +6317,13 @@ static void nested_loop_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed with %08x\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); IDirect3DPixelShader9_Release(shader); IDirect3DVertexShader9_Release(vshader); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void pretransformed_varying_test(void) @@ -15870,11 +15897,6 @@ START_TEST(visual) if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) { dp2add_ps_test(device_ptr); unbound_sampler_test(device_ptr); - if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0) && caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { - nested_loop_test(device_ptr); - } else { - skip("No ps_3_0 or vs_3_0 support\n"); - } } else { skip("No ps_2_0 support\n"); } @@ -15885,6 +15907,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + nested_loop_test(); pretransformed_varying_test(); vface_register_test(); vpos_register_test();

1 0