January 2013 - Wine-commits

Jacek Caban : atl100: Added AtlGetPerUserRegistration stub implementation.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 0333b758b2a16ed7091da6c51f0e3ad41ee1aa99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0333b758b2a16ed7091da6c51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 13:12:02 2013 +0100 atl100: Added AtlGetPerUserRegistration stub implementation. --- dlls/atl100/atl.c | 12 ++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl100/tests/atl.c | 6 ++++++ include/atlbase.h | 1 + 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index c4867aa..ce35b38 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl100); +typedef unsigned char cpp_bool; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); @@ -709,6 +711,16 @@ HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown *unk, GUID *libid, IID *iid, } /*********************************************************************** + * AtlGetPerUserRegistration [atl100.68] + */ +HRESULT WINAPI AtlGetPerUserRegistration(cpp_bool *pbEnabled) +{ + FIXME("stub: returning false\n"); + *pbEnabled = 0; + return S_OK; +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 1732052..c959a29 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -49,4 +49,4 @@ 65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm 67 stub AtlSetPerUserRegistration -68 stub AtlGetPerUserRegistration +68 stdcall AtlGetPerUserRegistration(ptr) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 8aea90a..e7c3703 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -150,6 +150,7 @@ static void _test_key_not_exists(unsigned line, HKEY root, const char *key_name) static void test_regcat(void) { + unsigned char b; HRESULT hres; const struct _ATL_CATMAP_ENTRY catmap[] = { @@ -178,6 +179,11 @@ static void test_regcat(void) ok(hres == S_OK, "AtlRegisterClassCategoriesHelper failed: %08x\n", hres); test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); + + b = 10; + hres = AtlGetPerUserRegistration(&b); + ok(hres == S_OK, "AtlGetPerUserRegistration failed: %08x\n", hres); + ok(!b, "AtlGetPerUserRegistration returned %x\n", b); } static void test_typelib(void) diff --git a/include/atlbase.h b/include/atlbase.h index 8bacb97..7d18d81 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -258,5 +258,6 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void* HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*); +HRESULT WINAPI AtlGetPerUserRegistration(unsigned char /*bool*/ *); #endif /* __WINE_ATLBASE_H__ */

1 0

Piotr Caban : jscript: Fixed a leak in regexp_match function.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: c45c7bf94cb41f30149f2e81d72bbe3f4e6096c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c45c7bf94cb41f30149f2e81d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 16:48:07 2013 +0100 jscript: Fixed a leak in regexp_match function. --- dlls/jscript/regexp.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index a06550d..65ddc24 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3464,10 +3464,15 @@ static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *str, B break; if(ret_size == i) { - if(ret) - ret = heap_realloc(ret, (ret_size <<= 1) * sizeof(match_result_t)); - else + if(ret) { + match_result_t *old_ret = ret; + + ret = heap_realloc(old_ret, (ret_size <<= 1) * sizeof(match_result_t)); + if(!ret) + heap_free(old_ret); + }else { ret = heap_alloc((ret_size=4) * sizeof(match_result_t)); + } if(!ret) { hres = E_OUTOFMEMORY; break;

1 0

Hans Leidekker : wbemprox: Check the result count instead of the result pointer in get_propval.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: d74cf43fbec6359c0d04493838791d763da92b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74cf43fbec6359c0d0449383… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 17:33:24 2013 +0100 wbemprox: Check the result count instead of the result pointer in get_propval. --- dlls/wbemprox/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 1123159..2d416ef 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -650,7 +650,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR LONGLONG val; if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type, flavor ); - if (!view->result || !is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; + if (!view->count || !is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; hr = get_column_index( view->table, name, &column ); if (hr != S_OK || is_method( view->table, column )) return WBEM_E_NOT_FOUND;

1 0

Hans Leidekker : wbemprox: Implement IWbemQualifierSet::Get.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 236b4dae4ace5fe5c994646dafa8d15ff5c940e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=236b4dae4ace5fe5c994646da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 17:34:00 2013 +0100 wbemprox: Implement IWbemQualifierSet::Get. --- dlls/wbemprox/builtin.c | 53 +++++++++++++++++++-- dlls/wbemprox/class.c | 7 ++- dlls/wbemprox/qualifier.c | 99 +++++++++++++++++++++++++++++++++++++- dlls/wbemprox/tests/query.c | 43 ++++++++++++++++- dlls/wbemprox/wbemprox_private.h | 2 +- 5 files changed, 194 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=236b4dae4ace5fe5c9946…

1 0

Stefan Dösinger : wined3d: Remove draw_primitive_strided.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 1a3f741643c5d3b88e951a09bd9f19850acf466a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3f741643c5d3b88e951a09b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 24 00:39:13 2013 +0100 wined3d: Remove draw_primitive_strided. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 135 +--------------------------------------- dlls/wined3d/drawprim.c | 15 ++--- dlls/wined3d/wined3d.spec | 2 - dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 5 -- 6 files changed, 9 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a3f741643c5d3b88e951…

1 0

Stefan Dösinger : d3d8/tests: Add simple DrawRectPatch tests.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 0badb01ce150064fa06507860fa506093d74ff06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0badb01ce150064fa06507860… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 22 23:01:31 2013 +0100 d3d8/tests: Add simple DrawRectPatch tests. --- dlls/d3d8/tests/device.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 115 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ca34b81..fbc2d19 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4624,6 +4624,120 @@ static void test_swvp_buffer(void) DestroyWindow(window); } +static void test_rtpatch(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + UINT refcount; + HWND window; + HRESULT hr; + IDirect3DVertexBuffer8 *buffer; + DWORD shader; + static const unsigned int bufsize = 16; + struct + { + float x, y, z; + } *data; + D3DRECTPATCH_INFO patch; + static const float num_segs[] = {1.0f, 1.0f, 1.0f, 1.0f}; + UINT handle = 0x1234; + D3DCAPS8 caps; + + /* Position input, this generates tesselated positions, but do not generate normals + * or texture coordinates. The d3d documentation isn't clear on how to do this */ + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), /* D3DVSDE_POSITION, Register v0 */ + D3DVSD_END() + }; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create d3d8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if (caps.DevCaps & D3DDEVCAPS_RTPATCHES) + { + /* The draw methods return the same values, but the patch handle support + * is different on the refrast, which is the only d3d implementation + * known to support tri/rect patches */ + skip("Device supports patches, skipping unsupported patch test\n"); + IDirect3DDevice8_Release(device); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexShader(device, decl, NULL, &shader, 0); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateVertexBuffer(device, bufsize * sizeof(*data), D3DUSAGE_RTPATCHES, 0, + D3DPOOL_MANAGED, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, (BYTE **)&data, 0); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + memset(data, 0, bufsize * sizeof(*data)); + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*data)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + patch.StartVertexOffsetWidth = 0; + patch.StartVertexOffsetHeight = 0; + patch.Width = 4; + patch.Height = 4; + patch.Stride = 4; + patch.Basis = D3DBASIS_BEZIER; + patch.Order = D3DORDER_CUBIC; + hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, &patch); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawRectPatch(device, 0, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawRectPatch(device, 0, num_segs, &patch); + ok(SUCCEEDED(hr), "Failed to draw rect patch outside scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DeletePatch(device, handle); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + hr = IDirect3DDevice8_DeletePatch(device, 0); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + hr = IDirect3DDevice8_DeletePatch(device, 0x1235); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + + IDirect3DDevice8_DeleteVertexShader(device, shader); + IDirect3DVertexBuffer8_Release(buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -4699,6 +4813,7 @@ START_TEST(device) test_surface_lockrect_blocks(); test_set_palette(); test_swvp_buffer(); + test_rtpatch(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d9/tests: Add simple DrawRectPatch tests.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: ddc868c4a01624a601244a8d1c42989db3bae936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc868c4a01624a601244a8d1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 22 23:01:31 2013 +0100 d3d9/tests: Add simple DrawRectPatch tests. --- dlls/d3d9/tests/device.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cabdec5..ba8a3ef 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6122,6 +6122,118 @@ static void test_swvp_buffer(void) DestroyWindow(window); } +static void test_rtpatch(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + UINT refcount; + HWND window; + HRESULT hr; + IDirect3DVertexBuffer9 *buffer; + IDirect3DVertexDeclaration9 *decl; + static const unsigned int bufsize = 16; + struct + { + float x, y, z; + } *data; + D3DRECTPATCH_INFO patch; + static const float num_segs[] = {1.0f, 1.0f, 1.0f, 1.0f}; + UINT handle = 0x1234; + D3DCAPS9 caps; + + /* Position input, this generates tesselated positions, but do not generate normals + * or texture coordinates. The d3d documentation isn't clear on how to do this */ + static const D3DVERTEXELEMENT9 decl_elements[] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END() + }; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if (caps.DevCaps & D3DDEVCAPS_RTPATCHES) + { + /* The draw methods return the same values, but the patch handle support + * is different on the refrast, which is the only d3d implementation + * known to support tri/rect patches */ + skip("Device supports patches, skipping unsupported patch test\n"); + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); + ok(SUCCEEDED(hr), "Failed to create vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, bufsize * sizeof(*data), D3DUSAGE_RTPATCHES, 0, + D3DPOOL_MANAGED, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, (void **)&data, 0); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + memset(data, 0, bufsize * sizeof(*data)); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*data)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + patch.StartVertexOffsetWidth = 0; + patch.StartVertexOffsetHeight = 0; + patch.Width = 4; + patch.Height = 4; + patch.Stride = 4; + patch.Basis = D3DBASIS_BEZIER; + patch.Degree = D3DDEGREE_CUBIC; + hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, &patch); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawRectPatch(device, 0, num_segs, NULL); + ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawRectPatch(device, 0, num_segs, &patch); + ok(SUCCEEDED(hr), "Failed to draw rect patch outside scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DeletePatch(device, handle); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + hr = IDirect3DDevice9_DeletePatch(device, 0); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + hr = IDirect3DDevice9_DeletePatch(device, 0x1235); + ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); + + IDirect3DVertexDeclaration9_Release(decl); + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -6209,6 +6321,7 @@ START_TEST(device) test_surface_lockrect_blocks(); test_set_palette(); test_swvp_buffer(); + test_rtpatch(); } out:

1 0

Jacek Caban : d3dcompiler.h: Added D3DCOMPILER_DLL macro.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: e3c13943d49a1edfe16bdf1dcea7b86ddea6e311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c13943d49a1edfe16bdf1dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 11:25:03 2013 +0100 d3dcompiler.h: Added D3DCOMPILER_DLL macro. --- include/d3dcompiler.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 047c1ea..7ce83be 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -25,6 +25,17 @@ extern "C" { #endif +#if defined(__GNUC__) +#define D3DCOMPILER_DLL_W (const WCHAR[]){'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0}; +#elif defined(_MSV_VER) +#define D3DCOMPILER_DLL_W L"d3dcompiler_43.dll" +#else +static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0}; +#endif + +#define D3DCOMPILER_DLL_A "d3dcompiler_43.dll" +#define D3DCOMPILER_DLL WINELIB_NAME_AW(D3DCOMPILER_DLL_) + #define D3DCOMPILE_DEBUG 0x00000001 #define D3DCOMPILE_SKIP_VALIDATION 0x00000002 #define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004

1 0

Henri Verbeet : wined3d: Support all fixups in shader_none_color_fixup_supported().
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 6f04922de00228f209646f74016dfaa136d49714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f04922de00228f209646f740… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 25 10:57:18 2013 +0100 wined3d: Support all fixups in shader_none_color_fixup_supported(). --- dlls/wined3d/shader.c | 19 +++---------------- 1 files changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2bb5f21..44f67cc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -32,7 +32,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -WINE_DECLARE_DEBUG_CHANNEL(d3d); static const char * const shader_opcode_names[] = { @@ -1554,21 +1553,9 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) { - if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) - { - TRACE("Checking support for fixup:\n"); - dump_color_fixup_desc(fixup); - } - - /* Faked to make some apps happy. */ - if (!is_complex_fixup(fixup)) - { - TRACE("[OK]\n"); - return TRUE; - } - - TRACE("[FAILED]\n"); - return FALSE; + /* We "support" every possible fixup, since we don't support any shader + * model, and will never have to actually sample a texture. */ + return TRUE; } static BOOL shader_none_has_ffp_proj_control(void *shader_priv)

1 0

Henri Verbeet : wined3d: Replace "VertexShaderMode" and "PixelShaderMode" with shader model limits.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: dc214603974132969c9f1bd13b8fe533bbb413dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc214603974132969c9f1bd13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 25 10:57:19 2013 +0100 wined3d: Replace "VertexShaderMode" and "PixelShaderMode" with shader model limits. --- dlls/wined3d/arb_program_shader.c | 16 +++++++++----- dlls/wined3d/directx.c | 2 - dlls/wined3d/glsl_shader.c | 6 ++-- dlls/wined3d/wined3d_main.c | 38 ++++++++---------------------------- dlls/wined3d/wined3d_private.h | 18 ++-------------- 5 files changed, 25 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2df18cd..31ee94a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4989,6 +4989,7 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh if (gl_info->supported[ARB_VERTEX_PROGRAM]) { DWORD vs_consts; + UINT vs_version; /* 96 is the minimum allowed value of MAX_PROGRAM_ENV_PARAMETERS_ARB * for vertex programs. If the native limit is less than that it's @@ -5001,20 +5002,21 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh if (gl_info->supported[NV_VERTEX_PROGRAM3]) { - caps->vs_version = 3; + vs_version = 3; TRACE("Hardware vertex shader version 3.0 enabled (NV_VERTEX_PROGRAM3)\n"); } else if (vs_consts >= 256) { /* Shader Model 2.0 requires at least 256 vertex shader constants */ - caps->vs_version = 2; + vs_version = 2; TRACE("Hardware vertex shader version 2.0 enabled (ARB_PROGRAM)\n"); } else { - caps->vs_version = 1; + vs_version = 1; TRACE("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); } + caps->vs_version = min(wined3d_settings.max_sm_vs, vs_version); caps->vs_uniform_count = vs_consts; } else @@ -5028,6 +5030,7 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { DWORD ps_consts; + UINT ps_version; /* Similar as above for vertex programs, but the minimum for fragment * programs is 24. */ @@ -5038,20 +5041,21 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh if (gl_info->supported[NV_FRAGMENT_PROGRAM2]) { - caps->ps_version = 3; + ps_version = 3; TRACE("Hardware pixel shader version 3.0 enabled (NV_FRAGMENT_PROGRAM2)\n"); } else if (ps_consts >= 32) { /* Shader Model 2.0 requires at least 32 pixel shader constants */ - caps->ps_version = 2; + ps_version = 2; TRACE("Hardware pixel shader version 2.0 enabled (ARB_PROGRAM)\n"); } else { - caps->ps_version = 1; + ps_version = 1; TRACE("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); } + caps->ps_version = min(wined3d_settings.max_sm_ps, ps_version); caps->ps_uniform_count = ps_consts; caps->ps_1x_max_value = 8.0f; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d5d1025..b70a44f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2267,8 +2267,6 @@ static const struct wined3d_shader_backend_ops *select_shader_backend(const stru { BOOL glsl = wined3d_settings.glslRequested && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); - if (wined3d_settings.vs_mode == VS_NONE && wined3d_settings.ps_mode == PS_NONE) - return &none_shader_backend; if (glsl && gl_info->supported[ARB_FRAGMENT_SHADER]) return &glsl_shader_backend; if (glsl && gl_info->supported[ARB_VERTEX_SHADER]) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9b000b6..16b8a83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6184,9 +6184,9 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s shader_model = 2; TRACE("Shader model %u.\n", shader_model); - caps->vs_version = shader_model; - caps->gs_version = shader_model; - caps->ps_version = shader_model; + caps->vs_version = min(wined3d_settings.max_sm_vs, shader_model); + caps->gs_version = min(wined3d_settings.max_sm_gs, shader_model); + caps->ps_version = min(wined3d_settings.max_sm_ps, shader_model); caps->vs_uniform_count = gl_info->limits.glsl_vs_float_constants; caps->ps_uniform_count = gl_info->limits.glsl_ps_float_constants; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2247e9c..f49e5bc 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -72,8 +72,6 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, * where appropriate. */ struct wined3d_settings wined3d_settings = { - VS_HW, /* Hardware by default */ - PS_HW, /* Hardware by default */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ RTL_READTEX, /* Default render target locking method */ @@ -84,6 +82,9 @@ struct wined3d_settings wined3d_settings = TRUE, /* Multisampling enabled by default. */ FALSE, /* No strict draw ordering. */ TRUE, /* Don't try to render onscreen by default. */ + ~0U, /* No VS shader model limit by default. */ + ~0U, /* No GS shader model limit by default. */ + ~0U, /* No PS shader model limit by default. */ }; /* Do not call while under the GL lock. */ @@ -196,27 +197,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (hkey || appkey) { - if ( !get_config_key( hkey, appkey, "VertexShaderMode", buffer, size) ) - { - if (!strcmp(buffer,"none")) - { - TRACE("Disable vertex shaders\n"); - wined3d_settings.vs_mode = VS_NONE; - } - } - if ( !get_config_key( hkey, appkey, "PixelShaderMode", buffer, size) ) - { - if (!strcmp(buffer,"enabled")) - { - TRACE("Allow pixel shaders\n"); - wined3d_settings.ps_mode = PS_HW; - } - if (!strcmp(buffer,"disabled")) - { - TRACE("Disable pixel shaders\n"); - wined3d_settings.ps_mode = PS_NONE; - } - } if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) { if (!strcmp(buffer,"disabled")) @@ -323,13 +303,13 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Not always rendering backbuffers offscreen.\n"); wined3d_settings.always_offscreen = FALSE; } + if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) + TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); + if (!get_config_key_dword(hkey, appkey, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) + TRACE("Limiting GS shader model to %u.\n", wined3d_settings.max_sm_gs); + if (!get_config_key_dword(hkey, appkey, "MaxShaderModelPS", &wined3d_settings.max_sm_ps)) + TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); } - if (wined3d_settings.vs_mode == VS_HW) - TRACE("Allow HW vertex shaders\n"); - if (wined3d_settings.ps_mode == PS_NONE) - TRACE("Disable pixel shaders\n"); - if (wined3d_settings.glslRequested) - TRACE("If supported by your system, GL Shading Language will be used\n"); if (appkey) RegCloseKey( appkey ); if (hkey) RegCloseKey( hkey ); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index af24e69..819cb82 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -237,18 +237,6 @@ static inline float float_24_to_32(DWORD in) } } -/** - * Settings - */ -#define VS_NONE 0 -#define VS_HW 1 - -#define PS_NONE 0 -#define PS_HW 1 - -#define VBO_NONE 0 -#define VBO_HW 1 - #define ORM_BACKBUFFER 0 #define ORM_FBO 1 @@ -262,9 +250,6 @@ static inline float float_24_to_32(DWORD in) * values in wined3d_main.c as well. */ struct wined3d_settings { - /* vertex and pixel shader modes */ - int vs_mode; - int ps_mode; /* Ideally, we don't want the user to have to request GLSL. If the * hardware supports GLSL, we should use it. However, until it's fully * implemented, we'll leave it as a registry setting for developers. */ @@ -279,6 +264,9 @@ struct wined3d_settings int allow_multisampling; BOOL strict_draw_ordering; BOOL always_offscreen; + unsigned int max_sm_vs; + unsigned int max_sm_gs; + unsigned int max_sm_ps; }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN;

1 0