August 2012 - Wine-Commits - list.winehq.org

Francois Gouget : dssenh/tests: add a trailing '\n' to a couple of ok() calls.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: b37c3d840d138cc741d7fb81caaae1b2641c2175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37c3d840d138cc741d7fb81c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 21 13:32:14 2012 +0200 dssenh/tests: add a trailing '\n' to a couple of ok() calls. --- dlls/dssenh/tests/dssenh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 6576f4d..a0ba903 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -861,7 +861,7 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(result, "Failed to return hash value.\n"); /* Compare hashes to ensure they are the same */ - ok(hashLen1 == hashLen2, "Hash lengths were not the same."); + ok(hashLen1 == hashLen2, "Hash lengths were not the same.\n"); ok(!memcmp(hashValue1, hashValue2, hashLen2), "Hashes were not identical.\n"); /* Sign hash 1 */ @@ -883,7 +883,7 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Compare signatures to ensure they are both different, because every DSS signature should be different even if the input hash data is identical */ ok(memcmp(signValue1, signValue2, signLen2), "Expected two different signatures from " - "the same hash input."); + "the same hash input.\n"); result = CryptExportKey(privKey, 0, PUBLICKEYBLOB, 0, NULL, &pubKeyLen); ok(result, "Failed to acquire public key length, got %x\n", GetLastError());

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetMatrixPointerArray.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: 9fec159abc3f3011a9d473a31ea1bc1ebb62da66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fec159abc3f3011a9d473a31… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 21 14:52:19 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetMatrixPointerArray. --- dlls/d3dx9_36/shader.c | 98 +++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/shader.c | 52 ++++++++++++++++++++++ 2 files changed, 148 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 01b2e7c..621eb88 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1079,6 +1079,100 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev return D3D_OK; } +static HRESULT set_matrix_pointer_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, + const D3DXMATRIX **data, UINT count, D3DXPARAMETER_CLASS class) +{ + struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT registers_per_matrix; + UINT i, desc_count = 1; + UINT num_rows, num_columns; + UINT row_offset, column_offset; + FLOAT matrix[16] = {0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f}; + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); + return D3DERR_INVALIDCALL; + } + + if (desc.Class == D3DXPC_MATRIX_ROWS || desc.Class == D3DXPC_MATRIX_COLUMNS) + { + if (desc.Class == class) + { + column_offset = 1; + row_offset = 4; + } + else + { + column_offset = 4; + row_offset = 1; + } + + if (class == D3DXPC_MATRIX_ROWS) + { + num_rows = desc.Rows; + num_columns = desc.Columns; + } + else + { + num_rows = desc.Columns; + num_columns = desc.Rows; + } + + registers_per_matrix = (desc.Class == D3DXPC_MATRIX_ROWS) ? desc.Rows : desc.Columns; + } + else if (desc.Class == D3DXPC_SCALAR) + { + registers_per_matrix = 1; + column_offset = 1; + row_offset = 1; + num_rows = desc.Rows; + num_columns = desc.Columns; + } + else if (desc.Class == D3DXPC_VECTOR) + { + registers_per_matrix = 1; + column_offset = 1; + row_offset = 4; + num_rows = desc.Rows; + num_columns = desc.Columns; + } + else + { + FIXME("Unhandled variable class %#x\n", desc.Class); + return D3D_OK; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + for (i = 0; i < count; i++) + { + if (registers_per_matrix * (i + 1) > desc.RegisterCount) + break; + + hr = set_float_matrix(matrix, &desc, row_offset, column_offset, num_rows, num_columns, *data, D3DXPT_FLOAT, 4); + if (FAILED(hr)) return hr; + + set_float_shader_constant(This, device, desc.RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix); + + data++; + } + break; + default: + FIXME("Unhandled register set %#x\n", desc.RegisterSet); + return E_NOTIMPL; + } + + return D3D_OK; +} + static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); @@ -1242,9 +1336,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(ID3DXConstant { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, matrix, count); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count); - return E_NOTIMPL; + return set_matrix_pointer_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_ROWS); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTranspose(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index caa0f0b..5a58370 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -569,6 +569,7 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) static const D3DXVECTOR4 f4 = {0.350f, 0.526f, 0.925f, 0.021f}; static const float f = 0.12543f; static const int i = 321; + static const D3DXMATRIX *matrix_pointer[] = {&mvp}; ID3DXConstantTable *ctable; @@ -712,6 +713,27 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) out[0], out[1], out[2], out[3], S(U(mvp))._11, S(U(mvp))._21, S(U(mvp))._31, S(U(mvp))._41); + memset(out, 0, sizeof(out)); + IDirect3DDevice9_SetVertexShaderConstantF(device, 6, out, 1); + res = ID3DXConstantTable_SetMatrixPointerArray(ctable, device, "f", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable f: got %#x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); + ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + "The variable f was not set correctly by ID3DXConstantTable_SetMatrixPointerArray, " + "got %f, should be %f\n", + out[0], U(S(mvp))._11); + + res = ID3DXConstantTable_SetMatrixPointerArray(ctable, device, "f4", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable f4: got %#x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); + ok(out[0] == U(S(mvp))._11 && out[1] == U(S(mvp))._12 && out[2] == U(S(mvp))._13 && out[3] == U(S(mvp))._14, + "The variable f4 was not set correctly by ID3DXConstantTable_SetMatrixPointerArray, " + "got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], + U(S(mvp))._11, U(S(mvp))._12, U(S(mvp))._13, U(S(mvp))._14); + refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt); } @@ -723,6 +745,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) 5.005f, 3.006f, 3.007f, 6.008f, 9.009f, 5.010f, 7.011f, 1.012f, 5.013f, 5.014f, 5.015f, 9.016f}}}; + static const D3DXMATRIX *matrix_pointer[] = {&fmatrix}; ID3DXConstantTable *ctable; @@ -875,6 +898,35 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) S(U(fmatrix))._11, S(U(fmatrix))._21, S(U(fmatrix))._31, 0.0f, S(U(fmatrix))._12, S(U(fmatrix))._22, S(U(fmatrix))._32, 0.0f); + /* SetMatrixPointerArray */ + res = ID3DXConstantTable_SetMatrixPointerArray(ctable, device, "c2x3", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable c2x3: got %#x\n", res); + + res = ID3DXConstantTable_SetMatrixPointerArray(ctable, device, "r2x3", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable r2x3: got %#x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 3); + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == 0.0f && out[3] == 0.0f + && out[4] == S(U(fmatrix))._12 && out[5] == S(U(fmatrix))._22 && out[6] == 0.0f && out[7] == 0.0f + && out[8] == S(U(fmatrix))._13 && out[9] == S(U(fmatrix))._23 && out[10] == 0.0f && out[11] == 0.0f, + "The variable c2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}, " + "should be {%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], + out[4], out[5], out[6], out[7], + out[8], out[9], out[10], out[11], + S(U(fmatrix))._11, S(U(fmatrix))._21, 0.0f, 0.0f, + S(U(fmatrix))._12, S(U(fmatrix))._22, 0.0f, 0.0f, + S(U(fmatrix))._13, S(U(fmatrix))._23, 0.0f, 0.0f); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 15, out, 2); + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == S(U(fmatrix))._13 && out[3] == 0.0f + && out[4] == S(U(fmatrix))._21 && out[5] == S(U(fmatrix))._22 && out[6] == S(U(fmatrix))._23 && out[7] == 0.0f, + "The variable r2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f}, " + "should be {%f, %f, %f, %f; %f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7], + S(U(fmatrix))._11, S(U(fmatrix))._12, S(U(fmatrix))._13, 0.0f, + S(U(fmatrix))._21, S(U(fmatrix))._22, S(U(fmatrix))._23, 0.0f); + ID3DXConstantTable_Release(ctable); }

1 0

Francois Gouget : dsound: Make dumpCooperativeLevel() static.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: e2c50d762c74593bdfe4ca1affd869340a64ef9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c50d762c74593bdfe4ca1af… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 21 13:31:39 2012 +0200 dsound: Make dumpCooperativeLevel() static. --- dlls/dsound/dsound.c | 2 +- dlls/dsound/dsound_private.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 3847a18..f704693 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -50,7 +50,7 @@ typedef struct IDirectSoundImpl { BOOL has_ds8; } IDirectSoundImpl; -const char * dumpCooperativeLevel(DWORD level) +static const char * dumpCooperativeLevel(DWORD level) { #define LE(x) case x: return #x switch (level) { diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 8419a7f..f8e5ca6 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -320,7 +320,6 @@ extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN; extern WCHAR wine_vxd_drv[] DECLSPEC_HIDDEN; void setup_dsound_options(void) DECLSPEC_HIDDEN; -const char * dumpCooperativeLevel(DWORD level) DECLSPEC_HIDDEN; HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) DECLSPEC_HIDDEN;

1 0

Józef Kucia : d3dx9: ID3DXConstantTable:: SetMatrix should set scalar constants.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: 978971e1ac364ba3734eb7290ae3747dc0cadf17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978971e1ac364ba3734eb7290… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 21 14:52:14 2012 +0200 d3dx9: ID3DXConstantTable::SetMatrix should set scalar constants. --- dlls/d3dx9_36/shader.c | 6 ++++++ dlls/d3dx9_36/tests/shader.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 9482518..faab0a4 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -988,6 +988,12 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev row_offset = 4; registers_per_matrix = desc.Rows; } + else if (desc.Class == D3DXPC_SCALAR) + { + column_offset = 1; + row_offset = 1; + registers_per_matrix = 1; + } else { FIXME("Unhandled variable class %#x\n", desc.Class); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 8bfea43..916136e 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -636,6 +636,16 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) "The variable f was not set correctly by ID3DXConstantTable_SetVector, got %f, should be %f\n", out[0], f4.x); + memset(out, 0, sizeof(out)); + IDirect3DDevice9_SetVertexShaderConstantF(device, 6, out, 1); + res = ID3DXConstantTable_SetMatrix(ctable, device, "f", &mvp); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable f: 0x%08x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); + ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + "The variable f was not set correctly by ID3DXConstantTable_SetMatrix, got %f, should be %f\n", + out[0], U(S(mvp))._11); + refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt); }

1 0

André Hentschel : ntdll: Add support for Windows 8 version.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: 8b774cb7a8c1120c405374220a81b6800e01be10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b774cb7a8c1120c405374220… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 20 20:37:53 2012 +0200 ntdll: Add support for Windows 8 version. --- dlls/ntdll/version.c | 8 ++++++++ programs/winecfg/appdefaults.c | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 745ee5d..86637fc 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -55,6 +55,7 @@ typedef enum WIN2K8, /* Windows 2008 */ WIN2K8R2,/* Windows 2008 R2 */ WIN7, /* Windows 7 */ + WIN8, /* Windows 8 */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -163,6 +164,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 }, + /* WIN8 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 0x23F0, VER_PLATFORM_WIN32_NT, + {' ',0}, + 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, }; @@ -183,6 +190,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "win2008,win2k8", /* WIN2K8 */ "win2008r2,win2k8r2", /* WIN2K8R2 */ "win7", /* WIN7 */ + "win8", /* WIN8 */ }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 80df90c..c8940a6 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -49,6 +49,7 @@ static const struct const char *szProductType; } win_versions[] = { + { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, { "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"},

1 0

Dan Kegel : advapi32: RegSetValueExW should not crash when passed 1 instead of L"1".
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: 2cd062831dd4c1b8d59fd0f8be505b1348c1cbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd062831dd4c1b8d59fd0f8b… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Aug 20 09:12:18 2012 -0700 advapi32: RegSetValueExW should not crash when passed 1 instead of L"1". --- dlls/advapi32/registry.c | 3 +++ dlls/advapi32/tests/registry.c | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index bf2e98a..d3b8edf 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1177,6 +1177,9 @@ LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, UNICODE_STRING nameW; /* no need for version check, not implemented on win9x anyway */ + + if (data && ((ULONG_PTR)data >> 16) == 0) return ERROR_NOACCESS; + if (count && is_string(type)) { LPCWSTR str = (LPCWSTR)data; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c0a7ebf..870275e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -346,6 +346,9 @@ static void test_set_value(void) /* Crashes on NT4, Windows 2000 and XP SP1 */ ret = RegSetValueW(hkey_main, NULL, REG_SZ, NULL, 0); ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + + RegSetValueExA(hkey_main, name2A, 0, REG_SZ, (const BYTE *)1, 1); + RegSetValueExA(hkey_main, name2A, 0, REG_DWORD, (const BYTE *)1, 1); } ret = RegSetValueW(hkey_main, NULL, REG_SZ, string1W, sizeof(string1W)); @@ -395,6 +398,12 @@ static void test_set_value(void) ok(ret == ERROR_SUCCESS, "RegSetValueExW failed: %d, GLE=%d\n", ret, GetLastError()); test_hkey_main_Value_A(name2A, string2A, sizeof(string2A)); test_hkey_main_Value_W(name2W, string2W, sizeof(string2W)); + + /* test RegSetValueExW with data = 1 */ + ret = RegSetValueExW(hkey_main, name2W, 0, REG_SZ, (const BYTE *)1, 1); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + ret = RegSetValueExW(hkey_main, name2W, 0, REG_DWORD, (const BYTE *)1, 1); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); } static void create_test_entries(void)

1 0

Alexandre Julliard : gdi32: Allow removing a driver from the stack based on its function table.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: bf528c5e9cba7ee95427c924b7d1ae7af50d0a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf528c5e9cba7ee95427c924b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 21 12:59:18 2012 +0200 gdi32: Allow removing a driver from the stack based on its function table. --- dlls/gdi32/gdi_private.h | 7 ++++--- dlls/gdi32/path.c | 46 ++++++++++++++++------------------------------ 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 78ff1a7..bb1a5d1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -170,11 +170,12 @@ static inline INT GDI_ROUND(double val) #define GET_DC_PHYSDEV(dc,func) \ get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(struct gdi_dc_funcs,func)) -static inline PHYSDEV pop_dc_driver( DC *dc, PHYSDEV dev ) +static inline PHYSDEV pop_dc_driver( DC *dc, const struct gdi_dc_funcs *funcs ) { - PHYSDEV *pdev = &dc->physDev; - while (*pdev && *pdev != dev) pdev = &(*pdev)->next; + PHYSDEV dev, *pdev = &dc->physDev; + while (*pdev && (*pdev)->funcs != funcs) pdev = &(*pdev)->next; if (!*pdev) return NULL; + dev = *pdev; *pdev = dev->next; return dev; } diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index a58f4e6..11e5e07 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -101,21 +101,6 @@ static inline struct path_physdev *get_path_physdev( PHYSDEV dev ) return (struct path_physdev *)dev; } -static inline void pop_path_driver( DC *dc, struct path_physdev *physdev ) -{ - pop_dc_driver( dc, &physdev->dev ); - HeapFree( GetProcessHeap(), 0, physdev ); -} - -static inline struct path_physdev *find_path_physdev( DC *dc ) -{ - PHYSDEV dev; - - for (dev = dc->physDev; dev->funcs != &null_driver; dev = dev->next) - if (dev->funcs == &path_driver) return get_path_physdev( dev ); - return NULL; -} - void free_gdi_path( struct gdi_path *path ) { HeapFree( GetProcessHeap(), 0, path->points ); @@ -805,7 +790,8 @@ static BOOL pathdrv_AbortPath( PHYSDEV dev ) if (!dc) return FALSE; free_gdi_path( physdev->path ); - pop_path_driver( dc, physdev ); + pop_dc_driver( dc, &path_driver ); + HeapFree( GetProcessHeap(), 0, physdev ); release_dc_ptr( dc ); return TRUE; } @@ -821,7 +807,8 @@ static BOOL pathdrv_EndPath( PHYSDEV dev ) if (!dc) return FALSE; dc->path = physdev->path; - pop_path_driver( dc, physdev ); + pop_dc_driver( dc, &path_driver ); + HeapFree( GetProcessHeap(), 0, physdev ); release_dc_ptr( dc ); return TRUE; } @@ -874,26 +861,25 @@ BOOL PATH_SavePath( DC *dst, DC *src ) BOOL PATH_RestorePath( DC *dst, DC *src ) { - struct path_physdev *physdev = find_path_physdev( dst ); + PHYSDEV dev; + struct path_physdev *physdev; - if (src->path && src->path_open) + if ((dev = pop_dc_driver( dst, &path_driver ))) { - if (!physdev) - { - if (!path_driver.pCreateDC( &dst->physDev, NULL, NULL, NULL, NULL )) return FALSE; - physdev = get_path_physdev( find_dc_driver( dst, &path_driver )); - } - else free_gdi_path( physdev->path ); + physdev = get_path_physdev( dev ); + free_gdi_path( physdev->path ); + HeapFree( GetProcessHeap(), 0, physdev ); + } + if (src->path && src->path_open) + { + if (!path_driver.pCreateDC( &dst->physDev, NULL, NULL, NULL, NULL )) return FALSE; + physdev = get_path_physdev( find_dc_driver( dst, &path_driver )); physdev->path = src->path; src->path_open = FALSE; src->path = NULL; } - else if (physdev) - { - free_gdi_path( physdev->path ); - pop_path_driver( dst, physdev ); - } + if (dst->path) free_gdi_path( dst->path ); dst->path = src->path; src->path = NULL;

1 0

Rico Schüller : d3dx9: Identify D3DTSS_CONSTANT and FVF states.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: 892308fdb68ed9a511c049065904babd276ac0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=892308fdb68ed9a511c049065… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 21 12:26:33 2012 +0200 d3dx9: Identify D3DTSS_CONSTANT and FVF states. --- dlls/d3dx9_36/effect.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d385015..72d44e7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -324,12 +324,11 @@ state_table[] = {SC_TEXTURESTAGE, D3DTSS_BUMPENVLSCALE, "D3DTSS_BUMPENVLSCALE"}, {SC_TEXTURESTAGE, D3DTSS_BUMPENVLOFFSET, "D3DTSS_BUMPENVLOFFSET"}, {SC_TEXTURESTAGE, D3DTSS_TEXTURETRANSFORMFLAGS, "D3DTSS_TEXTURETRANSFORMFLAGS"}, - /* */ - {SC_UNKNOWN, 0, "UNKNOWN"}, + {SC_TEXTURESTAGE, D3DTSS_CONSTANT, "D3DTSS_CONSTANT"}, /* NPatchMode */ {SC_NPATCHMODE, 0, "NPatchMode"}, - /* */ - {SC_UNKNOWN, 0, "UNKNOWN"}, + /* FVF */ + {SC_FVF, 0, "FVF"}, /* Transform */ {SC_TRANSFORM, D3DTS_PROJECTION, "D3DTS_PROJECTION"}, {SC_TRANSFORM, D3DTS_VIEW, "D3DTS_VIEW"},

1 0

Dmitry Timoshkov : gdiplus: Use set_rect_empty() helper to make the code slightly more compact and readable.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: acc4623fd07e2f9e2a72184b62f9b59b3b2734a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc4623fd07e2f9e2a72184b6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 21 11:02:13 2012 +0900 gdiplus: Use set_rect_empty() helper to make the code slightly more compact and readable. --- dlls/gdiplus/tests/graphics.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 8c55abe..b007ddf 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3445,7 +3445,7 @@ static void test_GdipMeasureString(void) GpFontFamily *family; GpFont *font; GpStringFormat *format; - RectF bounds, rc, empty_rc = { 0.0, 0.0, 0.0, 0.0 }; + RectF bounds, rc; REAL base_cx = 0, base_cy = 0, height; INT chars, lines; LOGFONTW lf; @@ -3492,8 +3492,8 @@ static void test_GdipMeasureString(void) height = font_size * font_to_pixel_scale; - rc = empty_rc; - bounds = empty_rc; + set_rect_empty(&rc); + set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rc, format, &bounds, &chars, &lines); expect(Ok, status); @@ -3516,7 +3516,7 @@ static void test_GdipMeasureString(void) rc = bounds; rc.X = 50.0; rc.Y = 50.0; - bounds = empty_rc; + set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rc, format, &bounds, &chars, &lines); expect(Ok, status); expectf(50.0, bounds.X); @@ -3574,8 +3574,8 @@ static void test_GdipMeasureString(void) height /= td[i].page_scale; /*trace("%u: %.1f font units = %f units with %.1f dpi, page_scale %.1f\n", i, font_size, height, td[i].res_y, td[i].page_scale);*/ - rc = empty_rc; - bounds = empty_rc; + set_rect_empty(&rc); + set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rc, format, &bounds, &chars, &lines); expect(Ok, status); @@ -3598,7 +3598,7 @@ static void test_GdipMeasureString(void) rc = bounds; rc.X = 50.0; rc.Y = 50.0; - bounds = empty_rc; + set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rc, format, &bounds, &chars, &lines); expect(Ok, status); expectf(50.0, bounds.X); @@ -3749,14 +3749,8 @@ static void test_font_height_scaling(void) status = GdipSetPageUnit(graphics, gfx_unit); expect(Ok, status); - rect.X = 0.0; - rect.Y = 0.0; - rect.Width = 0; - rect.Height = 0; - bounds.X = 0.0; - bounds.Y = 0.0; - bounds.Width = 0; - bounds.Height = 0; + set_rect_empty(&rect); + set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); expect(Ok, status);

1 0

Rico Schüller : d3dx9: Don' t double check the technique.
by Alexandre Julliard Aug. 21, 2012

Aug. 21, 2012

Module: wine Branch: master Commit: f9a4a9db1b3ca802cfe2dbd75a8e8257750324a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a4a9db1b3ca802cfe2dbd75… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 21 12:26:22 2012 +0200 d3dx9: Don't double check the technique. --- dlls/d3dx9_36/effect.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ef8fb86..d385015 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3527,19 +3527,9 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDL if (tech) { - UINT i; - - for (i = 0; i < base->technique_count; ++i) - { - struct d3dx_technique *t = get_technique_struct(base->technique_handles[i]); - - if (tech == t) - { - This->active_technique = get_technique_handle(t); - TRACE("Technique %u (%p)\n", i, tech); - return D3D_OK; - } - } + This->active_technique = get_technique_handle(tech); + TRACE("Technique %p\n", tech); + return D3D_OK; } WARN("Invalid argument supplied.\n");

1 0