wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Akihiro Sagawa : winmm/tests: Add notify flag tests for MPEGVideo driver.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: e252489a982ad6c7cd2058283bae0e128db3dc5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e252489a982ad6c7cd2058283… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 18 00:04:57 2015 +0900 winmm/tests: Add notify flag tests for MPEGVideo driver. --- dlls/winmm/tests/mci.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index ab0c611..423fceb 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1347,6 +1347,54 @@ static void test_playWaveTypeMpegvideo(void) ok(!err,"mci close returned %s\n", dbg_mcierr(err)); } +static void test_asyncWaveTypeMpegvideo(HWND hwnd) +{ + MCIDEVICEID wDeviceID; + int err; + char buf[1024]; + memset(buf, 0, sizeof(buf)); + + err = mciSendStringA("open tempfile.wav alias mysound notify type mpegvideo", buf, sizeof(buf), hwnd); + ok(err==ok_saved,"mci open tempfile.wav returned %s\n", dbg_mcierr(err)); + if(err) { + skip("Cannot open tempfile.wav for playing (%s), skipping\n", dbg_mcierr(err)); + return; + } + ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); + wDeviceID = atoi(buf); + ok(wDeviceID,"mci open DeviceID: %d\n", wDeviceID); + test_notification(hwnd,"open alias notify",MCI_NOTIFY_SUCCESSFUL); + + err = mciSendStringA("play mysound notify", NULL, 0, hwnd); + ok(!err,"mci play returned %s\n", dbg_mcierr(err)); + + Sleep(500); /* milliseconds */ + + err = mciSendStringA("pause mysound wait", NULL, 0, hwnd); + ok(!err,"mci pause wait returned %s\n", dbg_mcierr(err)); + + err = mciSendStringA("status mysound mode notify", buf, sizeof(buf), hwnd); + ok(!err,"mci status mode returned %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf,"paused"), "mci status mode: %s\n", buf); + todo_wine test_notification(hwnd,"play (superseded)",MCI_NOTIFY_SUPERSEDED); + test_notification(hwnd,"status",MCI_NOTIFY_SUCCESSFUL); + + err = mciSendStringA("seek mysound to start wait", NULL, 0, NULL); + ok(!err,"mci seek to start wait returned %s\n", dbg_mcierr(err)); + + err = mciSendStringA("set mysound time format milliseconds", NULL, 0, NULL); + ok(!err,"mci time format milliseconds returned %s\n", dbg_mcierr(err)); + + err = mciSendStringA("play mysound to 1500 notify", NULL, 0, hwnd); + ok(!err,"mci play returned %s\n", dbg_mcierr(err)); + Sleep(200); + todo_wine test_notification(hwnd,"play",0); + + err = mciSendStringA("close mysound wait", NULL, 0, NULL); + ok(!err,"mci close wait returned %s\n", dbg_mcierr(err)); + todo_wine test_notification(hwnd,"play (aborted by close)",MCI_NOTIFY_ABORTED); +} + START_TEST(mci) { char curdir[MAX_PATH], tmpdir[MAX_PATH]; @@ -1367,6 +1415,7 @@ START_TEST(mci) test_asyncWAVE(hwnd); test_AutoOpenWAVE(hwnd); test_playWaveTypeMpegvideo(); + test_asyncWaveTypeMpegvideo(hwnd); }else skip("No output devices available, skipping all output tests\n"); /* Win9X hangs when exiting with something still open. */

1 0

Andrew Eikum : shell32: Install knownfolders to registry during DLL registration.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 12d057c8e72281917f263135266eec1f330519f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d057c8e72281917f2631352… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 17 10:03:23 2015 -0500 shell32: Install knownfolders to registry during DLL registration. --- dlls/shell32/shellpath.c | 258 ++++++++++++++++++++++++++++++++++------- dlls/shell32/tests/shellpath.c | 210 +++++++++++++++++---------------- 2 files changed, 322 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12d057c8e72281917f263…

1 0

Andrew Eikum : shell32: Also register knownfolder attributes.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: efbea96142d51130b54483ead7ce73ae5bc319ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbea96142d51130b54483ead… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 17 10:03:20 2015 -0500 shell32: Also register knownfolder attributes. --- dlls/shell32/shellpath.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index b9d9421..f43b0ed 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3934,6 +3934,9 @@ static HRESULT WINAPI foldermanager_RegisterFolder( if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szCategory, 0, REG_DWORD, (LPBYTE)&pKFD->category, sizeof(pKFD->category))); + if(SUCCEEDED(hr) && pKFD->dwAttributes != 0) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szAttributes, 0, REG_DWORD, (LPBYTE)&pKFD->dwAttributes, sizeof(pKFD->dwAttributes))); + if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szName, 0, REG_SZ, (LPBYTE)pKFD->pszName, (lstrlenW(pKFD->pszName)+1)*sizeof(WCHAR) ));

1 0

Andrew Eikum : shell32: Allow registering knownfolders without relative paths.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: cdf6aecc22312ae1e750f1618d293c6e18256da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf6aecc22312ae1e750f1618… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 17 10:03:17 2015 -0500 shell32: Allow registering knownfolders without relative paths. --- dlls/shell32/shellpath.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 56ead5f..b9d9421 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3946,11 +3946,8 @@ static HRESULT WINAPI foldermanager_RegisterFolder( hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szParentFolder, 0, REG_SZ, (LPBYTE)sParentGuid, sizeof(sParentGuid))); } - if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL) + if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL && pKFD->pszRelativePath) { - if(!pKFD->pszRelativePath) - hr = E_INVALIDARG; - if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) )); }

1 0

Andrew Eikum : shell32: Allow updating knownfolder definitions.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 7c9151c1e630b3f6fdec00a41ba67c9546b5119c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9151c1e630b3f6fdec00a41… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 17 10:03:13 2015 -0500 shell32: Allow updating knownfolder definitions. --- dlls/shell32/shellpath.c | 3 --- dlls/shell32/tests/shellpath.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 84e663b..56ead5f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3931,9 +3931,6 @@ static HRESULT WINAPI foldermanager_RegisterFolder( if(SUCCEEDED(hr)) { - if(dwDisp == REG_OPENED_EXISTING_KEY) - hr = E_FAIL; - if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szCategory, 0, REG_DWORD, (LPBYTE)&pKFD->category, sizeof(pKFD->category))); diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 3b18760..7b04238 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2458,6 +2458,26 @@ static void test_knownFolders(void) hr = IKnownFolder_Release(folder); ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); + + /* update the folder */ + CoTaskMemFree(kfDefinition.pszName); + kfDefinition.pszName = CoTaskMemAlloc(sizeof(sExample2)); + lstrcpyW(kfDefinition.pszName, sExample2); + hr = IKnownFolderManager_RegisterFolder(mgr, &newFolderId, &kfDefinition); + ok(hr == S_OK, "failed to re-register known folder: 0x%08x\n", hr); + + hr = IKnownFolderManager_GetFolder(mgr, &newFolderId, &folder); + ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); + + hr = IKnownFolder_GetFolderDefinition(folder, &kfSubDefinition); + ok(hr == S_OK, "failed to get folder definition: 0x%08x\n", hr); + ok(!memcmp(kfDefinition.pszName, kfSubDefinition.pszName, sizeof(sExample2)), + "Got wrong updated name: %s\n", wine_dbgstr_w(kfSubDefinition.pszName)); + + FreeKnownFolderDefinitionFields(&kfSubDefinition); + + hr = IKnownFolder_Release(folder); + ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); } hr = IKnownFolderManager_UnregisterFolder(mgr, &newFolderId);

1 0

Huw Davies : riched20: Don' t resend a partial chunk to the edit stream callback.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 2a5886974d80d2c64f12d8b7816d23a6f0a702e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5886974d80d2c64f12d8b78… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 17 09:39:38 2015 +0000 riched20: Don't resend a partial chunk to the edit stream callback. It's basically used as a boolean to terminate the writing process if it's set to zero. --- dlls/riched20/tests/editor.c | 31 +++++++++++++++++++++++++++++++ dlls/riched20/writer.c | 23 ++++++----------------- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 101aec0..b15f16f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3404,6 +3404,24 @@ static void test_WM_SETTEXT(void) #undef TEST_SETTEXTW } +/* Set *pcb to one to show that the remaining cb-1 bytes are not + resent to the callkack. */ +static DWORD CALLBACK test_esCallback_written_1(DWORD_PTR dwCookie, + LPBYTE pbBuff, + LONG cb, + LONG *pcb) +{ + char** str = (char**)dwCookie; + ok(cb == *pcb, "cb %d, *pcb %d\n", cb, *pcb); + *pcb = 0; + if (cb > 0) { + memcpy(*str, pbBuff, cb); + *str += cb; + *pcb = 1; + } + return 0; +} + static void test_EM_STREAMOUT(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -3452,6 +3470,19 @@ static void test_EM_STREAMOUT(void) ok(strcmp(buf, TestItem3) == 0, "streamed text different, got %s\n", buf); + /* Use a callback that sets *pcb to one */ + p = buf; + es.dwCookie = (DWORD_PTR)&p; + es.dwError = 0; + es.pfnCallback = test_esCallback_written_1; + memset(buf, 0, sizeof(buf)); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + r = strlen(buf); + ok(r == 14, "streamed text length is %d, expecting 14\n", r); + ok(strcmp(buf, TestItem3) == 0, + "streamed text different, got %s\n", buf); + + DestroyWindow(hwndRichEdit); } diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index ea797fd..26a64a7 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -49,29 +49,18 @@ ME_StreamOutInit(ME_TextEditor *editor, EDITSTREAM *stream) static BOOL ME_StreamOutFlush(ME_OutStream *pStream) { - LONG nStart = 0; LONG nWritten = 0; - LONG nRemaining = 0; EDITSTREAM *stream = pStream->stream; - while (nStart < pStream->pos) { - TRACE("sending %u bytes\n", pStream->pos - nStart); - /* Some apps seem not to set *pcb unless a problem arises, relying - on initial random nWritten value, which is usually >STREAMOUT_BUFFER_SIZE */ - nRemaining = pStream->pos - nStart; - nWritten = 0xDEADBEEF; - stream->dwError = stream->pfnCallback(stream->dwCookie, (LPBYTE)pStream->buffer + nStart, - pStream->pos - nStart, &nWritten); + if (pStream->pos) { + TRACE("sending %u bytes\n", pStream->pos); + nWritten = pStream->pos; + stream->dwError = stream->pfnCallback(stream->dwCookie, (LPBYTE)pStream->buffer, + pStream->pos, &nWritten); TRACE("error=%u written=%u\n", stream->dwError, nWritten); - if (nWritten > (pStream->pos - nStart) || nWritten<0) { - FIXME("Invalid returned written size *pcb: 0x%x (%d) instead of %d\n", - (unsigned)nWritten, nWritten, nRemaining); - nWritten = nRemaining; - } if (nWritten == 0 || stream->dwError) return FALSE; - pStream->written += nWritten; - nStart += nWritten; + /* Don't resend partial chunks if nWritten < pStream->pos */ } pStream->pos = 0; return TRUE;

1 0

Aaryaman Vasishta : d3drm/tests: Add tests for querying between IDirect3DRM interfaces.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: cb1e856612381ed86d819ac91cd3001d1697b85b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1e856612381ed86d819ac91… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Mar 15 17:51:51 2015 +0530 d3drm/tests: Add tests for querying between IDirect3DRM interfaces. --- dlls/d3drm/tests/Makefile.in | 2 +- dlls/d3drm/tests/d3drm.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in index 7035bc6..dc6e8d1 100644 --- a/dlls/d3drm/tests/Makefile.in +++ b/dlls/d3drm/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3drm.dll -IMPORTS = dxguid ddraw user32 +IMPORTS = dxguid ddraw user32 uuid C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index ee01b91..f9925ae 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1,6 +1,7 @@ /* * Copyright 2010, 2012 Christian Costa * Copyright 2012 André Hentschel + * Copyright 2011-2014 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1726,6 +1727,83 @@ static void test_frame_mesh_materials(void) IDirect3DRM_Release(d3drm); } +struct qi_test +{ + REFIID iid; + REFIID refcount_iid; + HRESULT hr; + BOOL refcount_todo; +}; + +static void test_qi(const char *test_name, IUnknown *base_iface, + REFIID refcount_iid, const struct qi_test *tests, UINT entry_count) +{ + ULONG refcount, expected_refcount; + IUnknown *iface1, *iface2; + HRESULT hr; + UINT i, j; + + for (i = 0; i < entry_count; ++i) + { + hr = IUnknown_QueryInterface(base_iface, tests[i].iid, (void **)&iface1); + ok(hr == tests[i].hr, "Got hr %#x for test \"%s\" %u.\n", hr, test_name, i); + if (SUCCEEDED(hr)) + { + for (j = 0; j < entry_count; ++j) + { + hr = IUnknown_QueryInterface(iface1, tests[j].iid, (void **)&iface2); + ok(hr == tests[j].hr, "Got hr %#x for test \"%s\" %u, %u.\n", hr, test_name, i, j); + if (SUCCEEDED(hr)) + { + expected_refcount = 0; + if (IsEqualGUID(refcount_iid, tests[j].refcount_iid)) + ++expected_refcount; + if (IsEqualGUID(tests[i].refcount_iid, tests[j].refcount_iid)) + ++expected_refcount; + refcount = IUnknown_Release(iface2); + if (tests[i].refcount_todo || tests[j].refcount_todo) + todo_wine ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, %u, expected %u.\n", + refcount, test_name, i, j, expected_refcount); + else + ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, %u, expected %u.\n", + refcount, test_name, i, j, expected_refcount); + } + } + + expected_refcount = 0; + if (IsEqualGUID(refcount_iid, tests[i].refcount_iid)) + ++expected_refcount; + refcount = IUnknown_Release(iface1); + if (tests[i].refcount_todo) + todo_wine ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, expected %u.\n", + refcount, test_name, i, expected_refcount); + else + ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, expected %u.\n", + refcount, test_name, i, expected_refcount); + } + } +} + +static void test_d3drm_qi(void) +{ + static const struct qi_test tests[] = + { + { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, TRUE }, + { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, TRUE }, + { &IID_IDirect3DRM, &IID_IDirect3DRM, S_OK, FALSE }, + { &IID_IUnknown, &IID_IDirect3DRM, S_OK, FALSE }, + }; + HRESULT hr; + IDirect3DRM *d3drm; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, sizeof(tests) / sizeof(*tests)); + + IDirect3DRM_Release(d3drm); +} + START_TEST(d3drm) { if (!InitFunctionPtrs()) @@ -1744,6 +1822,7 @@ START_TEST(d3drm) test_frame_transform(); test_d3drm_load(); test_frame_mesh_materials(); + test_d3drm_qi(); FreeLibrary(d3drm_handle); }

1 0

Stefan Dösinger : ddraw: Add validation and tests for DDBLT_ROP.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 948202c47f1f11d558611620e3f7775331eb43a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=948202c47f1f11d558611620e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 23:06:57 2015 +0100 ddraw: Add validation and tests for DDBLT_ROP. --- dlls/ddraw/surface.c | 16 ++++++++ dlls/ddraw/tests/ddraw7.c | 98 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 98 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=948202c47f1f11d558611…

1 0

Stefan Dösinger : ddraw/tests: Add tests for DDBLT_DEPTHFILL.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: e0edd55a2e45129c0f775f5aba230e00a819917e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0edd55a2e45129c0f775f5ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 14:48:55 2015 +0100 ddraw/tests: Add tests for DDBLT_DEPTHFILL. --- dlls/ddraw/tests/ddraw7.c | 122 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 98 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0edd55a2e45129c0f775…

1 0

Stefan Dösinger : ddraw: Add DDBLT_DEPTHFILL validation.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: a84980168ce948069565a65cf5d98b778c471fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84980168ce948069565a65cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 14:48:54 2015 +0100 ddraw: Add DDBLT_DEPTHFILL validation. --- dlls/ddraw/surface.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8b25cb9..034e3aa 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1537,26 +1537,36 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR wined3d_mutex_lock(); - if (Flags & DDBLT_COLORFILL) + if (Flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) { if (src_surface) { wined3d_mutex_unlock(); - WARN("DDBLT_COLORFILL is not compatible with source surfaces, returning DDERR_INVALIDPARAMS\n"); + WARN("Depth or colorfill is not compatible with source surfaces, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; } if (!DDBltFx) { wined3d_mutex_unlock(); - WARN("DDBLT_COLORFILL used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n"); + WARN("Depth or colorfill used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n"); return DDERR_INVALIDPARAMS; } - if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + + if ((Flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) == (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) + Flags &= ~DDBLT_DEPTHFILL; + + if ((dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) && (Flags & DDBLT_COLORFILL)) { wined3d_mutex_unlock(); WARN("DDBLT_COLORFILL used on a depth buffer, returning DDERR_INVALIDPARAMS.\n"); return DDERR_INVALIDPARAMS; } + if (!(dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) && (Flags & DDBLT_DEPTHFILL)) + { + wined3d_mutex_unlock(); + WARN("DDBLT_DEPTHFILL used on a color buffer, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } } if (Flags & DDBLT_KEYSRC && (!src_surface || !(src_surface->surface_desc.dwFlags & DDSD_CKSRCBLT)))

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015