November 2018 - Wine-Commits

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 6d9268a68db647a73fa5edc53b11f299682e68cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d9268a68db647a73fa5edc5… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Nov 5 10:53:28 2018 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 134 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 65 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d9268a68db647a73fa5…

1 0

Dmitry Timoshkov : crypt32: Directly call I_CryptGetDefaultCryptProv to make hooking from a 3rd party CSP work.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 41e0a38f7cdb9460930e63cad0cb402a20e196f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e0a38f7cdb9460930e63ca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 2 17:06:57 2018 +0300 crypt32: Directly call I_CryptGetDefaultCryptProv to make hooking from a 3rd party CSP work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 10 +++++----- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/main.c | 2 +- dlls/crypt32/msg.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index a7a2605..c44e4bc 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2169,7 +2169,7 @@ BOOL WINAPI CryptHashCertificate(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, pbEncoded, cbEncoded, pbComputedHash, pcbComputedHash); if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); if (!Algid) Algid = CALG_SHA1; if (ret) @@ -2198,7 +2198,7 @@ BOOL WINAPI CryptHashPublicKeyInfo(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, dwCertEncodingType, pInfo, pbComputedHash, pcbComputedHash); if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); if (!Algid) Algid = CALG_MD5; if ((dwCertEncodingType & CERT_ENCODING_TYPE_MASK) != X509_ASN_ENCODING) @@ -2250,7 +2250,7 @@ BOOL WINAPI CryptHashToBeSigned(HCRYPTPROV_LEGACY hCryptProv, HCRYPTHASH hHash; if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); oidInfo = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, info->SignatureAlgorithm.pszObjId, 0); if (!oidInfo) @@ -2299,7 +2299,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, if (info->dwGroupId == CRYPT_HASH_ALG_OID_GROUP_ID) { if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); ret = CryptCreateHash(hCryptProv, info->u.Algid, 0, 0, &hHash); if (ret) { @@ -2423,7 +2423,7 @@ static BOOL CRYPT_VerifySignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEnco pubKeyID = hashID; /* Load the default provider if necessary */ if (!hCryptProv) - hCryptProv = CRYPT_GetDefaultProvider(); + hCryptProv = I_CryptGetDefaultCryptProv(0); ret = CryptImportPublicKeyInfoEx(hCryptProv, dwCertEncodingType, pubKeyInfo, pubKeyID, 0, NULL, &key); if (ret) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index e58db98..c6e2012 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -149,7 +149,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, /* Returns a handle to the default crypto provider; loads it if necessary. * Returns NULL on failure. */ -HCRYPTPROV CRYPT_GetDefaultProvider(void) DECLSPEC_HIDDEN; +HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(DWORD); HINSTANCE hInstance DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index d93fb91..d37bf4a 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -56,7 +56,7 @@ BOOL WINAPI DllMain(HINSTANCE hInst, DWORD fdwReason, PVOID pvReserved) return TRUE; } -HCRYPTPROV CRYPT_GetDefaultProvider(void) +static HCRYPTPROV CRYPT_GetDefaultProvider(void) { if (!hDefProv) { diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 005fbf2..f37c462 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -567,7 +567,7 @@ static HCRYPTMSG CHashEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, prov = info->hCryptProv; else { - prov = CRYPT_GetDefaultProvider(); + prov = I_CryptGetDefaultCryptProv(0); dwFlags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } msg = CryptMemAlloc(sizeof(CHashEncodeMsg)); @@ -1956,7 +1956,7 @@ static HCRYPTMSG CEnvelopedEncodeMsg_Open(DWORD dwFlags, prov = info->hCryptProv; else { - prov = CRYPT_GetDefaultProvider(); + prov = I_CryptGetDefaultCryptProv(0); dwFlags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } msg = CryptMemAlloc(sizeof(CEnvelopedEncodeMsg)); @@ -3545,7 +3545,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, msg->crypt_prov = hCryptProv; else { - msg->crypt_prov = CRYPT_GetDefaultProvider(); + msg->crypt_prov = I_CryptGetDefaultCryptProv(0); msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } memset(&msg->u, 0, sizeof(msg->u));

1 0

Fabian Maurer : msi: In dialogs show titlebar buttons.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 84e6b331918d57f39e20a3063b67eb7fc0876288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84e6b331918d57f39e20a306… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 3 18:05:28 2018 +0100 msi: In dialogs show titlebar buttons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46080 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6184da8..a3797c2 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3858,6 +3858,10 @@ static LRESULT WINAPI MSIDialog_WndProc( HWND hwnd, UINT msg, case WM_COMMAND: return msi_dialog_oncommand( dialog, wParam, (HWND)lParam ); + case WM_CLOSE: + /* Simulate escape press */ + return msi_dialog_oncommand(dialog, 2, NULL); + case WM_ACTIVATE: if( LOWORD(wParam) == WA_INACTIVE ) dialog->hWndFocus = GetFocus(); @@ -3903,10 +3907,13 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); /* create the dialog window, don't show it yet */ - style = WS_OVERLAPPED; + style = WS_OVERLAPPED | WS_SYSMENU; if( dialog->attributes & msidbDialogAttributesVisible ) style |= WS_VISIBLE; + if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) + style |= WS_MINIMIZEBOX; + hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, dialog );

1 0

Dmitry Timoshkov : crypt32: Add support for 3rd party CSPs to CertGetPublicKeyLength.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 99a2514fdaa335271cf806c355e2ca41031f5f11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99a2514fdaa335271cf806c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 2 17:07:03 2018 +0300 crypt32: Add support for 3rd party CSPs to CertGetPublicKeyLength. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c44e4bc..faf70de 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1317,9 +1317,30 @@ DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, } else { + PCCRYPT_OID_INFO info; DWORD size; PBYTE buf; - BOOL ret = CryptDecodeObjectEx(dwCertEncodingType, + BOOL ret; + + info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, pPublicKey->Algorithm.pszObjId, 0); + if (info) + { + HCRYPTKEY key; + + TRACE("public key algid %#x (%s)\n", info->u.Algid, debugstr_a(pPublicKey->Algorithm.pszObjId)); + + ret = CryptImportPublicKeyInfo(I_CryptGetDefaultCryptProv(0), dwCertEncodingType, pPublicKey, &key); + if (ret) + { + size = sizeof(len); + ret = CryptGetKeyParam(key, KP_KEYLEN, (BYTE *)&len, &size, 0); + CryptDestroyKey(key); + return len; + } + /* fallback to RSA */ + } + + ret = CryptDecodeObjectEx(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, pPublicKey->PublicKey.pbData, pPublicKey->PublicKey.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Implement a cache and sort the enumerated strings for proper behavior.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: e1a7d6eeb1b7b9029ebb90b5d1e23369c441419f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1a7d6eeb1b7b9029ebb90b5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 2 16:50:38 2018 +0200 shell32/autocomplete: Implement a cache and sort the enumerated strings for proper behavior. Windows doesn't reset and re-enumerate it everytime autocompletion happens, and it also sorts the strings. This matches it more closely and makes it more useable on large lists as well. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 206 +++++++++++++++++++++++++++++++------------- 1 file changed, 146 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e1a7d6eeb1b7b9029ebb…

1 0

Henri Verbeet : d3d8: Prefer bind flags over usage flags in d3d8_device_CopyRects().
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 5731069addd04d2526b5dd458bd549e8d70b7904 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5731069addd04d2526b5dd45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:54 2018 +0330 d3d8: Prefer bind flags over usage flags in d3d8_device_CopyRects(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 27b32fa..b05df7e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1267,7 +1267,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &wined3d_desc); - if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (wined3d_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { WARN("Source %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", src_surface); wined3d_mutex_unlock(); @@ -1278,7 +1278,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, src_h = wined3d_desc.height; wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &wined3d_desc); - if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (wined3d_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { WARN("Destination %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", dst_surface); wined3d_mutex_unlock();

1 0

Dmitry Timoshkov : kernel32/tests: Add more directory change notification tests.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: c055a274e998e1a8e844a646d44bc6302f85ca4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c055a274e998e1a8e844a646… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 5 13:47:12 2018 +0300 kernel32/tests: Add more directory change notification tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/change.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index f4abad4..3c8084d 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -254,11 +254,12 @@ static void test_FindFirstChangeNotification(void) static void test_ffcn(void) { DWORD filter; - HANDLE handle; + HANDLE handle, file; LONG r; - WCHAR path[MAX_PATH], subdir[MAX_PATH]; + WCHAR path[MAX_PATH], subdir[MAX_PATH], filename[MAX_PATH]; static const WCHAR szBoo[] = { '\\','b','o','o',0 }; static const WCHAR szHoo[] = { '\\','h','o','o',0 }; + static const WCHAR szZoo[] = { '\\','z','o','o',0 }; SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); @@ -275,6 +276,9 @@ static void test_ffcn(void) lstrcpyW( subdir, path ); lstrcatW( subdir, szHoo ); + lstrcpyW( filename, path ); + lstrcatW( filename, szZoo ); + RemoveDirectoryW( subdir ); RemoveDirectoryW( path ); @@ -290,6 +294,38 @@ static void test_ffcn(void) r = WaitForSingleObject( handle, 0 ); ok( r == STATUS_TIMEOUT, "should time out\n"); + file = CreateFileW( filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0 ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + CloseHandle(file); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = FindNextChangeNotification(handle); + ok( r == TRUE, "find next failed\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == STATUS_TIMEOUT, "should time out\n"); + + r = DeleteFileW( filename ); + ok( r == TRUE, "failed to remove file\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = FindNextChangeNotification(handle); + ok( r == TRUE, "find next failed\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == STATUS_TIMEOUT, "should time out\n"); + r = CreateDirectoryW( subdir, NULL ); ok( r == TRUE, "failed to create subdir\n");

1 0

Pierre Schweitzer : msi: Don' t consider read-only drives when enumerating volumes.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 0dd0d879a1c487dcefedd44762d4ea0fcebd98fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dd0d879a1c487dcefedd447… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sat Nov 3 18:33:16 2018 +0100 msi: Don't consider read-only drives when enumerating volumes. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a3797c2..b6de1f5 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3289,7 +3289,7 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control WCHAR cost_text[MAX_PATH]; LPWSTR drives, ptr; LVITEMW lvitem; - DWORD size; + DWORD size, flags; int i = 0; cost = msi_vcl_get_cost(dialog); @@ -3306,6 +3306,13 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ptr = drives; while (*ptr) { + if (GetVolumeInformationW(ptr, NULL, 0, NULL, 0, &flags, NULL, 0) && + flags & FILE_READ_ONLY_VOLUME) + { + ptr += lstrlenW(ptr) + 1; + continue; + } + lvitem.mask = LVIF_TEXT; lvitem.iItem = i; lvitem.iSubItem = 0;

1 0

Henri Verbeet : d3d9: Prefer bind flags over usage flags in d3d9_device_ColorFill().
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: cc0c7d727b62f6d9ee2cfda60b5bbcc7279281ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc0c7d727b62f6d9ee2cfda6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:56 2018 +0330 d3d9: Prefer bind flags over usage flags in d3d9_device_ColorFill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e513549..1e7c0ea 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1750,13 +1750,13 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, WARN("Colour fills are not allowed on surfaces with resource access %#x.\n", desc.access); return D3DERR_INVALIDCALL; } - if ((desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_TEXTURE)) == WINED3DUSAGE_TEXTURE) + if ((desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_SHADER_RESOURCE)) == WINED3D_BIND_SHADER_RESOURCE) { wined3d_mutex_unlock(); WARN("Colorfill is not allowed on non-RT textures, returning D3DERR_INVALIDCALL.\n"); return D3DERR_INVALIDCALL; } - if (desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { wined3d_mutex_unlock(); WARN("Colorfill is not allowed on depth stencil surfaces, returning D3DERR_INVALIDCALL.\n");

1 0

Henri Verbeet : d3d9: Prefer bind flags over usage flags in d3d9_device_StretchRect().
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 86a0f486c6b891853a6a09aebb46615e140716bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=86a0f486c6b891853a6a09ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:55 2018 +0330 d3d9: Prefer bind flags over usage flags in d3d9_device_StretchRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d4f5a43..e513549 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1668,13 +1668,13 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect goto done; } - if (dst->texture && !(dst_desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + if (dst->texture && !(dst_desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL))) { WARN("Destination is a regular texture.\n"); goto done; } - if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (src_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { if (device->in_scene) {

1 0