April 2016 - Wine-commits - list.winehq.org

Austin English : wine.inf: Create Microsoft Shared/TextConv directory.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 09cc2b93217b00ce4b53d79ff12409c3e4c8c9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=09cc2b93217b00ce4b53d79ff… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 25 01:18:31 2016 -0500 wine.inf: Create Microsoft Shared/TextConv directory. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d22b29b..589a1ff 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2584,6 +2584,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Internet Explorer,iexplore.exe 16422,Windows Media Player,wmplayer.exe 16422,Windows NT\Accessories,wordpad.exe +16427,Microsoft Shared\TextConv, 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 11,,*

1 0

Nikolay Sivov : d3d10_1/tests: Add a IDXGISurface1 GetDC() test.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: a566f6742a95186099accbc3833aa3a2253ca8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a566f6742a95186099accbc38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 11:44:01 2016 +0200 d3d10_1/tests: Add a IDXGISurface1 GetDC() test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 115 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 105 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index f7d188d..f5b1454 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -37,18 +37,32 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } -static ID3D10Device1 *create_device(D3D10_FEATURE_LEVEL1 feature_level) +struct device_desc { + D3D10_FEATURE_LEVEL1 feature_level; + UINT flags; +}; + +static ID3D10Device1 *create_device(const struct device_desc *desc) +{ + D3D10_FEATURE_LEVEL1 feature_level = D3D10_FEATURE_LEVEL_10_1; ID3D10Device1 *device; + UINT flags = 0; - if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, D3D10_1_SDK_VERSION, - &device))) + if (desc) + { + feature_level = desc->feature_level; + flags = desc->flags; + } + + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, + NULL, flags, feature_level, D3D10_1_SDK_VERSION, &device))) return device; - if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, feature_level, D3D10_1_SDK_VERSION, - &device))) + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_WARP, + NULL, flags, feature_level, D3D10_1_SDK_VERSION, &device))) return device; - if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, D3D10_1_SDK_VERSION, - &device))) + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_REFERENCE, + NULL, flags, feature_level, D3D10_1_SDK_VERSION, &device))) return device; return NULL; @@ -240,7 +254,12 @@ static void test_device_interfaces(void) for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) { - if (!(device = create_device(d3d10_feature_levels[i]))) + struct device_desc device_desc; + + device_desc.feature_level = d3d10_feature_levels[i]; + device_desc.flags = 0; + + if (!(device = create_device(&device_desc))) { skip("Failed to create device for feature level %#x.\n", d3d10_feature_levels[i]); continue; @@ -306,7 +325,7 @@ static void test_create_shader_resource_view(void) IUnknown *iface; HRESULT hr; - if (!(device = create_device(D3D10_FEATURE_LEVEL_10_1))) + if (!(device = create_device(NULL))) { skip("Failed to create device.\n"); return; @@ -494,7 +513,7 @@ static void test_create_blend_state(void) IUnknown *iface; HRESULT hr; - if (!(device = create_device(D3D10_FEATURE_LEVEL_10_1))) + if (!(device = create_device(NULL))) { skip("Failed to create device.\n"); return; @@ -624,10 +643,86 @@ static void test_create_blend_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_getdc(void) +{ + struct device_desc device_desc; + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + IDXGISurface1 *surface1; + ID3D10Device1 *device; + ULONG refcount; + HRESULT hr; + HDC dc; + + device_desc.feature_level = D3D10_FEATURE_LEVEL_10_1; + device_desc.flags = D3D10_CREATE_DEVICE_BGRA_SUPPORT; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device.\n"); + return; + } + + /* Without D3D10_RESOURCE_MISC_GDI_COMPATIBLE. */ + desc.Width = 512; + desc.Height = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + hr = ID3D10Device1_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void**)&surface1); + ok(SUCCEEDED(hr), "Failed to get IDXGISurface1 interface, hr %#x.\n", hr); + + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + IDXGISurface1_Release(surface1); + ID3D10Texture2D_Release(texture); + + desc.MiscFlags = D3D10_RESOURCE_MISC_GDI_COMPATIBLE; + hr = ID3D10Device1_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void**)&surface1); + ok(SUCCEEDED(hr), "Failed to get IDXGISurface1 interface, hr %#x.\n", hr); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + + /* One more time. */ + dc = (HDC)0xdeadbeef; + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(dc == (HDC)0xdeadbeef, "Got unexpected dc %p.\n", dc); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + IDXGISurface1_Release(surface1); + ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device1_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d10_1) { test_create_device(); test_device_interfaces(); test_create_shader_resource_view(); test_create_blend_state(); + test_getdc(); }

1 0

Austin English : kernel32: Add GetConsoleFontInfo stub.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 77733651ad3b45a4eb0dbbeca4318714fa041116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77733651ad3b45a4eb0dbbeca… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 18 20:20:50 2016 -0500 kernel32: Add GetConsoleFontInfo stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 +++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 60e38bc..cc2936d 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3347,6 +3347,13 @@ COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) } #endif /* !defined(__i386__) */ +BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, CONSOLE_FONT_INFO *info) +{ + FIXME("(%p %d %u %p): stub!\n", hConsole, maximize, numfonts, info); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + BOOL WINAPI GetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_INFOEX *csbix) { FIXME("(%p %p): stub!\n", hConsole, csbix); diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 73f2e88..71dbe4d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -599,7 +599,7 @@ @ stdcall GetConsoleCursorInfo(long ptr) @ stub GetConsoleCursorMode @ stdcall GetConsoleDisplayMode(ptr) -@ stub GetConsoleFontInfo +@ stdcall GetConsoleFontInfo(ptr long long ptr) @ stdcall GetConsoleFontSize(long long) @ stub GetConsoleHardwareState # @ stub GetConsoleHistoryInfo

1 0

Hugh McMaster : reg: Support recursion when querying a registry key.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: c81b0494ba71acfedaa9d8dffd6959592bb6ebf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81b0494ba71acfedaa9d8dff… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 25 11:26:38 2016 +0000 reg: Support recursion when querying a registry key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 32e75a0..4ccc7dc 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -640,18 +640,34 @@ static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD output_string(newlineW); } -static int query_all(HKEY key, WCHAR *path) +static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) +{ + WCHAR *subkey_path; + WCHAR fmt[] = {'%','s','\\','%','s',0}; + + subkey_path = HeapAlloc(GetProcessHeap(), 0, (path_len + subkey_len + 2) * sizeof(WCHAR)); + if (!subkey_path) + { + ERR("Failed to allocate memory for subkey_path\n"); + return NULL; + } + sprintfW(subkey_path, fmt, path, subkey_name); + return subkey_path; +} + +static int query_all(HKEY key, WCHAR *path, BOOL recurse) { LONG rc; DWORD num_subkeys, max_subkey_len, subkey_len; DWORD num_values, max_value_len, value_len; DWORD max_data_bytes, data_size; - DWORD i, type; + DWORD i, type, path_len; WCHAR fmt[] = {'%','1','\n',0}; WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; - WCHAR *value_name, *subkey_name; + WCHAR *value_name, *subkey_name, *subkey_path; WCHAR newlineW[] = {'\n',0}; BYTE *data; + HKEY subkey; rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, NULL, &num_values, &max_value_len, &max_data_bytes, NULL, NULL); @@ -691,7 +707,7 @@ static int query_all(HKEY key, WCHAR *path) HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, value_name); - if (num_values) + if (num_values || recurse) output_string(newlineW); max_subkey_len++; @@ -702,17 +718,31 @@ static int query_all(HKEY key, WCHAR *path) return 1; } + path_len = strlenW(path); + for (i = 0; i < num_subkeys; i++) { subkey_len = max_subkey_len; rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) - output_string(fmt_path, path, subkey_name); + { + if (recurse) + { + subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); + if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) + { + query_all(subkey, subkey_path, recurse); + RegCloseKey(subkey); + } + HeapFree(GetProcessHeap(), 0, subkey_path); + } + else output_string(fmt_path, path, subkey_name); + } } HeapFree(GetProcessHeap(), 0, subkey_name); - if (num_subkeys) + if (num_subkeys && !recurse) output_string(newlineW); return 0; @@ -751,13 +781,13 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL return 1; } - if (value_name || value_empty || recurse) + if (value_name || value_empty) { output_string(stubW, key_name, value_name, value_empty, recurse); return 1; } - ret = query_all(key, key_name); + ret = query_all(key, key_name, recurse); RegCloseKey(key);

1 0

Hugh McMaster : reg: Add /v and /ve support to reg query.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 0c0d839aaaa9a48474a66dc04f4feb6cbcf2e0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0d839aaaa9a48474a66dc04… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 25 11:26:49 2016 +0000 reg: Add /v and /ve support to reg query. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 4ccc7dc..26a1288 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -655,6 +655,49 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, return subkey_path; } +static int query_value(HKEY key, WCHAR *value_name, WCHAR *path) +{ + LONG rc; + DWORD max_data_bytes, data_size; + DWORD type; + BYTE *data; + WCHAR fmt[] = {'%','1','\n',0}; + WCHAR newlineW[] = {'\n',0}; + + rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, &max_data_bytes, NULL, NULL); + if (rc) + { + ERR("RegQueryInfoKey failed: %d\n", rc); + return 1; + } + + data = HeapAlloc(GetProcessHeap(), 0, max_data_bytes); + if (!data) + { + ERR("Failed to allocate memory for data\n"); + return 1; + } + + data_size = max_data_bytes; + rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); + if (rc == ERROR_SUCCESS) + { + output_string(fmt, path); + output_value(value_name, type, data, data_size); + output_string(newlineW); + } + + HeapFree(GetProcessHeap(), 0, data); + + if (rc == ERROR_FILE_NOT_FOUND) + { + output_message(STRING_CANNOT_FIND); + return 1; + } + return 0; +} + static int query_all(HKEY key, WCHAR *path, BOOL recurse) { LONG rc; @@ -783,11 +826,16 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL if (value_name || value_empty) { - output_string(stubW, key_name, value_name, value_empty, recurse); - return 1; + if (recurse) + { + RegCloseKey(key); + output_string(stubW, key_name, value_name, value_empty, recurse); + return 1; + } + ret = query_value(key, value_name, key_name); } - - ret = query_all(key, key_name, recurse); + else + ret = query_all(key, key_name, recurse); RegCloseKey(key);

1 0

Alex Henrie : include: Add AMTimeline class and its dependencies.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 9c2f28cf7f3f3782f60865d0e3814c1bd73d9cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2f28cf7f3f3782f60865d0e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 24 21:40:26 2016 -0600 include: Add AMTimeline class and its dependencies. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/qedit.idl | 639 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 639 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c2f28cf7f3f3782f6086…

1 0

Alex Henrie : qedit: Stub out AMTimeline.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 69eafe63ad7e3525f3498ab6af9f4c149753407f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69eafe63ad7e3525f3498ab6a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 24 21:40:27 2016 -0600 qedit: Stub out AMTimeline. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/Makefile.in | 3 +- dlls/qedit/main.c | 1 + dlls/qedit/qedit_classes.idl | 6 + dlls/qedit/qedit_private.h | 1 + dlls/qedit/timeline.c | 397 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 407 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69eafe63ad7e3525f3498…

1 0

Sebastian Lackner : reg: Fix a heap corruption when printing specific REG_MULTI_SZ values.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 7c774e98494d7392bc78bd3a8b2a2afd5ea0afe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c774e98494d7392bc78bd3a8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 22 19:35:01 2016 +0200 reg: Fix a heap corruption when printing specific REG_MULTI_SZ values. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6480f2c..32e75a0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -587,7 +587,7 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) } tmp_size = size_bytes - two_wchars; /* exclude both null terminators */ - buffer = HeapAlloc(GetProcessHeap(), 0, tmp_size * 2); + buffer = HeapAlloc(GetProcessHeap(), 0, tmp_size * 2 + sizeof(WCHAR)); len = tmp_size / sizeof(WCHAR); for (i = 0, destindex = 0; i < len; i++, destindex++)

1 0

Henri Verbeet : ddraw/tests: Add some tests for draw parameter validation.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: c12dc091bd595ccd0371676e7bbe925070e845fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12dc091bd595ccd0371676e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 22 17:11:47 2016 +0200 ddraw/tests: Add some tests for draw parameter validation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 62 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 275 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c12dc091bd595ccd03716…

1 0

Henri Verbeet : ddraw: Return early in d3d_device7_DrawIndexedPrimitiveStrided() with a 0 vertex or index count.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 41975efef665a919066378a07a90b7a8275a26d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41975efef665a919066378a07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 22 17:11:48 2016 +0200 ddraw: Return early in d3d_device7_DrawIndexedPrimitiveStrided() with a 0 vertex or index count. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 36 +++++++++++++++++++++--------------- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6166648..f5197d6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4107,21 +4107,27 @@ static HRESULT WINAPI d3d_device3_DrawPrimitiveStrided(IDirect3DDevice3 *iface, * *****************************************************************************/ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, - D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType, - D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount, - WORD *Indices, DWORD IndexCount, DWORD Flags) + D3DPRIMITIVETYPE primitive_type, DWORD fvf, D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, + DWORD vertex_count, WORD *indices, DWORD index_count, DWORD flags) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr; - UINT vtx_dst_stride = get_flexible_vertex_size(VertexType); - UINT vtx_dst_size = VertexCount * vtx_dst_stride; + UINT vtx_dst_stride = get_flexible_vertex_size(fvf); + UINT vtx_dst_size = vertex_count * vtx_dst_stride; + UINT idx_size = index_count * sizeof(WORD); UINT vb_pos, align; - UINT idx_size = IndexCount * sizeof(WORD); - UINT ib_pos; BYTE *dst_data; + UINT ib_pos; + HRESULT hr; - TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n", - iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); + TRACE("iface %p, primitive_type %#x, fvf %#x, strided_data %p, " + "vertex_count %u, indices %p, index_count %u, flags %#x.\n", + iface, primitive_type, fvf, strided_data, vertex_count, indices, index_count, flags); + + if (!vertex_count || !index_count) + { + WARN("0 vertex or index count.\n"); + return D3D_OK; + } wined3d_mutex_lock(); @@ -4141,7 +4147,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) goto done; - pack_strided_data(dst_data, VertexCount, D3DDrawPrimStrideData, VertexType); + pack_strided_data(dst_data, vertex_count, strided_data, fvf); wined3d_buffer_unmap(device->vertex_buffer); device->vertex_buffer_pos = vb_pos + vtx_dst_size; @@ -4156,7 +4162,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) goto done; - memcpy(dst_data, Indices, idx_size); + memcpy(dst_data, indices, idx_size); wined3d_buffer_unmap(device->index_buffer); device->index_buffer_pos = ib_pos + idx_size; @@ -4166,9 +4172,9 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT); wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vtx_dst_stride); - wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, VertexType)); - wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), IndexCount); + wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf)); + wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); + hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); done: wined3d_mutex_unlock(); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0608cf5..08ab9bd 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11423,7 +11423,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, NULL, 0, 0); todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, NULL, 0, 0); @@ -11437,7 +11437,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, indices, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 104346b..3efcf5b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11688,7 +11688,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, NULL, 0, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, NULL, 0, 0); todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, NULL, 0, 0); @@ -11704,7 +11704,7 @@ static void test_draw_primitive(void) todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveStrided(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, &strided, 0, indices, 4, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 0, indices, 4, 0); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);

1 0