wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Michael Stefaniuc : appwiz.cpl: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 73035e13be1b7638508bf6ca8282fa4efe123bb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73035e13be1b7638508bf6ca… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jan 29 22:50:40 2018 +0100 appwiz.cpl: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index 1e60daf..2165ce1 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/heap.h" #include "wine/unicode.h" typedef enum { @@ -27,21 +28,6 @@ BOOL install_addon(addon_t) DECLSPEC_HIDDEN; extern HINSTANCE hInst DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupW(const WCHAR *str) { WCHAR *ret;

1 0

Michael Stefaniuc : advpack: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: df2141a4c6961119181af1241c2ae26db245e4fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=df2141a4c6961119181af124… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jan 29 22:50:39 2018 +0100 advpack: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack_private.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 252974f..fc3b26f 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -21,22 +21,14 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H +#include "wine/heap.h" + HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline char *heap_strdupWtoA(const WCHAR *str) { char *ret = NULL;

1 0

Michael Stefaniuc : advapi32: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 56d0cfbabdf7d06a152ad29501a202f8bed9c68d URL: https://source.winehq.org/git/wine.git/?a=commit;h=56d0cfbabdf7d06a152ad295… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jan 29 22:50:38 2018 +0100 advapi32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 7fc02a4..4ced1e8 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -23,6 +23,7 @@ #include "ntsecapi.h" #include "winsvc.h" #include "winnls.h" +#include "wine/heap.h" const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; @@ -38,26 +39,6 @@ const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* memory allocation functions */ -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *strdupAW( const char *src ) { WCHAR *dst = NULL;

1 0

Nikolay Sivov : user32/tests: Add more A/W message data conversion tests.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 6ca3ec5be8e55eeea62330170189ac30677bd560 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ca3ec5be8e55eeea6233017… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 29 23:42:26 2018 +0300 user32/tests: Add more A/W message data conversion tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 63 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index cbe4b2b..19f220d 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1237,8 +1237,17 @@ static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg, } static const WCHAR testtextW[] = {'W','n','d','T','e','x','t',0}; + +enum defdlgproc_text +{ + DLGPROCTEXT_CONTEXT = 0, + DLGPROCTEXT_A, + DLGPROCTEXT_W, +}; + static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + int mode = (int)GetPropA(hdlg, "test_mode"); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1251,12 +1260,28 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: - if (IsWindowUnicode(hdlg)) - todo_wine - ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - else - todo_wine + switch (mode) + { + case DLGPROCTEXT_A: + todo_wine_if(!IsWindowUnicode(hdlg)) ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + break; + case DLGPROCTEXT_W: + if (msg == WM_SETTEXT && !IsWindowUnicode(hdlg)) + todo_wine + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + else + todo_wine_if(IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + break; + default: + if (IsWindowUnicode(hdlg)) + todo_wine + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + else + todo_wine + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } break; }; @@ -1265,6 +1290,7 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + int mode = (int)GetPropA(hdlg, "test_mode"); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1277,10 +1303,22 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: - if (IsWindowUnicode(hdlg)) - ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - else + switch (mode) + { + case DLGPROCTEXT_A: + todo_wine_if(IsWindowUnicode(hdlg)) ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + break; + case DLGPROCTEXT_W: + todo_wine_if(!IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + break; + default: + if (IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + else + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } break; } @@ -1291,11 +1329,20 @@ static void dlg_test_aw_message(HWND hdlg, UINT msg) { LRESULT ret; + SetPropA(hdlg, "test_mode", DLGPROCTEXT_CONTEXT); ret = SendMessageA(hdlg, msg, 0, (LPARAM)"WndText"); ok(ret == 0, "Unexpected retval %ld.\n", ret); ret = SendMessageW(hdlg, msg, 0, (LPARAM)testtextW); ok(ret == 0, "Unexpected retval %ld.\n", ret); + + SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_A); + ret = DefDlgProcA(hdlg, msg, 0, (LPARAM)"WndText"); + ok(ret == 0, "Unexpected retval %ld.\n", ret); + + SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_W); + ret = DefDlgProcW(hdlg, msg, 0, (LPARAM)testtextW); + ok(ret == 0, "Unexpected retval %ld.\n", ret); } static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)

1 0

Jacek Caban : crypt32: Added support for szOID_NIST_sha* OIDs.
by Alexandre Julliard 30 Jan '18

30 Jan '18

Module: wine Branch: master Commit: 86c998e551f25cbd0c04379ce17d4f3ec1161fac URL: https://source.winehq.org/git/wine.git/?a=commit;h=86c998e551f25cbd0c04379c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 29 19:51:21 2018 +0100 crypt32: Added support for szOID_NIST_sha* OIDs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/oid.c | 7 +++++++ dlls/crypt32/tests/oid.c | 25 ++++++++++++++++++++----- include/wincrypt.h | 3 +++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index d5c2953..5a447d0 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -1053,6 +1053,9 @@ static const WCHAR rc2[] = { 'r','c','2',0 }; static const WCHAR rc4[] = { 'r','c','4',0 }; static const WCHAR sha[] = { 's','h','a',0 }; static const WCHAR sha1[] = { 's','h','a','1',0 }; +static const WCHAR sha256[] = { 's','h','a','2','5','6',0 }; +static const WCHAR sha384[] = { 's','h','a','3','8','4',0 }; +static const WCHAR sha512[] = { 's','h','a','5','1','2',0 }; static const WCHAR RSA[] = { 'R','S','A',0 }; static const WCHAR RSA_KEYX[] = { 'R','S','A','_','K','E','Y','X',0 }; static const WCHAR RSA_SIGN[] = { 'R','S','A','_','S','I','G','N',0 }; @@ -1157,6 +1160,10 @@ static const struct OIDInfoConstructor { { 1, szOID_RSA_MD5, CALG_MD5, md5, NULL }, { 1, szOID_RSA_MD4, CALG_MD4, md4, NULL }, { 1, szOID_RSA_MD2, CALG_MD2, md2, NULL }, + /* NOTE: Windows Vista+ uses -1 instead of CALG_SHA_* following SHA entries. */ + { 1, szOID_NIST_sha256, CALG_SHA_256, sha256, NULL }, + { 1, szOID_NIST_sha384, CALG_SHA_384, sha384, NULL }, + { 1, szOID_NIST_sha512, CALG_SHA_512, sha512, NULL }, { 2, szOID_OIWSEC_desCBC, CALG_DES, des, NULL }, { 2, szOID_RSA_DES_EDE3_CBC, CALG_3DES, tripledes, NULL }, diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index b661407..8fc67b3 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -36,6 +36,7 @@ struct OIDToAlgID LPCSTR oid; LPCSTR altOid; DWORD algID; + DWORD altAlgID; }; static const struct OIDToAlgID oidToAlgID[] = { @@ -72,6 +73,9 @@ static const struct OIDToAlgID oidToAlgID[] = { { szOID_OIWDIR_md2RSA, NULL, CALG_MD2 }, { szOID_INFOSEC_mosaicUpdatedSig, NULL, CALG_SHA }, { szOID_INFOSEC_mosaicKMandUpdSig, NULL, CALG_DSS_SIGN }, + { szOID_NIST_sha256, NULL, CALG_SHA_256, -1 }, + { szOID_NIST_sha384, NULL, CALG_SHA_384, -1 }, + { szOID_NIST_sha512, NULL, CALG_SHA_512, -1 } }; static const struct OIDToAlgID algIDToOID[] = { @@ -104,10 +108,7 @@ static void testOIDToAlgID(void) for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++) { alg = CertOIDToAlgId(oidToAlgID[i].oid); - /* Not all Windows installations support all these, so make sure it's - * at least not the wrong one. - */ - ok(alg == 0 || alg == oidToAlgID[i].algID, + ok(alg == oidToAlgID[i].algID || (oidToAlgID[i].altAlgID && alg == oidToAlgID[i].altAlgID), "Expected %d, got %d\n", oidToAlgID[i].algID, alg); } } @@ -126,6 +127,7 @@ static void testAlgIDToOID(void) { oid = CertAlgIdToOID(algIDToOID[i].algID); /* Allow failure, not every version of Windows supports every algo */ + ok(oid != NULL || broken(!oid), "CertAlgIdToOID failed, expected %s\n", algIDToOID[i].oid); if (oid) { if (strcmp(oid, algIDToOID[i].oid)) @@ -542,11 +544,13 @@ static void test_enumOIDInfo(void) static void test_findOIDInfo(void) { static WCHAR sha1[] = { 's','h','a','1',0 }; - static CHAR oid_rsa_md5[] = szOID_RSA_MD5; + static CHAR oid_rsa_md5[] = szOID_RSA_MD5, oid_sha256[] = szOID_NIST_sha256; ALG_ID alg = CALG_SHA1; ALG_ID algs[2] = { CALG_MD5, CALG_RSA_SIGN }; PCCRYPT_OID_INFO info; + static const WCHAR sha256W[] = {'s','h','a','2','5','6',0}; + info = CryptFindOIDInfo(0, NULL, 0); ok(info == NULL, "Expected NULL\n"); info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, oid_rsa_md5, 0); @@ -585,6 +589,17 @@ static void test_findOIDInfo(void) ok(U(*info).Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", U(*info).Algid); } + + info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, oid_sha256, 0); + ok(info != NULL, "Expected to find szOID_RSA_MD5\n"); + if (info) + { + ok(!strcmp(info->pszOID, szOID_NIST_sha256), "Expected %s, got %s\n", + szOID_NIST_sha256, info->pszOID); + ok(!lstrcmpW(info->pwszName, sha256W), "pwszName = %s\n", wine_dbgstr_w(info->pwszName)); + ok(U(*info).Algid == CALG_SHA_256 || U(*info).Algid == -1, + "Expected CALG_MD5 or -1, got %d\n", U(*info).Algid); + } } START_TEST(oid) diff --git a/include/wincrypt.h b/include/wincrypt.h index 6986bd8..d688567 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2941,6 +2941,9 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_INFOSEC_mosaicUpdatedSig "2.16.840.1.101.2.1.1.19" #define szOID_INFOSEC_mosaicKMandUpdSig "2.16.840.1.101.2.1.1.20" #define szOID_INFOSEC_mosaicUpdateInteg "2.16.840.1.101.2.1.1.21" +#define szOID_NIST_sha256 "2.16.840.1.101.3.4.2.1" +#define szOID_NIST_sha384 "2.16.840.1.101.3.4.2.2" +#define szOID_NIST_sha512 "2.16.840.1.101.3.4.2.3" #define szOID_COMMON_NAME "2.5.4.3" #define szOID_SUR_NAME "2.5.4.4" #define szOID_DEVICE_SERIAL_NUMBER "2.5.4.5"

1 0

Zebediah Figura : hlink: Directly check for S_OK from IHlinkBrowseContext_GetObject().
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 13e06719591bad61d23d496f87f4b82122bd6529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e06719591bad61d23d496f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 27 15:30:32 2018 -0600 hlink: Directly check for S_OK from IHlinkBrowseContext_GetObject(). Fixes a regression introduced by 00aca1476efd573cbf9d31a45c3d484f6fa6055b Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/link.c | 2 +- dlls/hlink/tests/hlink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 983765c..25ee45d 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -493,7 +493,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, if (phbc) { r = IHlinkBrowseContext_GetObject(phbc, mon, TRUE, &unk); - if (r == S_FALSE) + if (r != S_OK) { CreateBindCtx(0, &bcxt); RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index e40807c..3525c44 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -891,7 +891,7 @@ static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, ok(fBindIfRootRegistered == 1, "fBindIfRootRegistered = %x\n", fBindIfRootRegistered); *ppiunk = HBC_object; - return HBC_object ? S_OK : S_FALSE; + return HBC_object ? S_OK : 0xdeadbeef; } static HRESULT WINAPI HlinkBrowseContext_Revoke(IHlinkBrowseContext *iface, DWORD dwRegister)

1 0

Henri Verbeet : wined3d: Use the resource access flags in ffp_blit_supported().
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: b7496ebacc300bed45d8449bab3815617bb1d383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7496ebacc300bed45d8449b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:26 2018 +0330 wined3d: Use the resource access flags in ffp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fb28117..520f88c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2664,18 +2664,19 @@ static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ HeapFree(GetProcessHeap(), 0, blitter); } -static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, - DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3d_context *context, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; BOOL decompress; decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); - if (!decompress && (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM)) + if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) { - TRACE("Source or destination is in system memory.\n"); + TRACE("Source or destination resource is not GPU accessible.\n"); return FALSE; } @@ -2690,14 +2691,14 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: - if (d3d_info->shader_color_key) + if (context->d3d_info->shader_color_key) { TRACE("Color keying requires converted textures.\n"); return FALSE; } case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!context->gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) return FALSE; if (TRACE_ON(d3d)) @@ -2722,7 +2723,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } } - if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) + if (!(dst_resource->usage & WINED3DUSAGE_RENDERTARGET)) { TRACE("Can only blit to render targets.\n"); return FALSE; @@ -2821,9 +2822,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit dst_resource = &dst_texture->resource; device = dst_resource->device; - if (!ffp_blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, op, - src_resource->usage, src_resource->pool, src_resource->format, src_location, - dst_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) + if (!ffp_blit_supported(op, context, src_resource, src_location, dst_resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location,

1 0

Henri Verbeet : wined3d: Use the resource access flags in fbo_blitter_supported().
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 36f20ec5d13b8f379886e2e66c4cb8aa9be1826f URL: https://source.winehq.org/git/wine.git/?a=commit;h=36f20ec5d13b8f379886e2e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:25 2018 +0330 wined3d: Use the resource access flags in fbo_blitter_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4e5940a..fb28117 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -484,25 +484,28 @@ static void surface_blt_fbo(const struct wined3d_device *device, context_restore(context, restore_rt); } -static BOOL fbo_blitter_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, - DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl_info *gl_info, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; + if ((wined3d_settings.offscreen_rendering_mode != ORM_FBO) || !gl_info->fbo_ops.glBlitFramebuffer) return FALSE; /* Source and/or destination need to be on the GL side */ - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + if (!(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT: if (!((src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (src_usage & WINED3DUSAGE_RENDERTARGET))) + || (src_resource->usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if (!((dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (dst_usage & WINED3DUSAGE_RENDERTARGET))) + || (dst_resource->usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if ((src_format->id != dst_format->id || dst_location == WINED3D_LOCATION_DRAWABLE) && (!is_identity_fixup(src_format->color_fixup) || !is_identity_fixup(dst_format->color_fixup))) @@ -2229,11 +2232,9 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) - && fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, - texture->resource.format, WINED3D_LOCATION_TEXTURE_RGB, - texture->resource.usage, texture->resource.pool, - texture->resource.format, WINED3D_LOCATION_TEXTURE_SRGB)) + && fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture->resource, WINED3D_LOCATION_TEXTURE_RGB, + &texture->resource, WINED3D_LOCATION_TEXTURE_SRGB)) { if (srgb) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, @@ -2252,9 +2253,8 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - if (fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, texture->resource.format, src_location, - texture->resource.usage, texture->resource.pool, texture->resource.format, dst_location)) + if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture->resource, src_location, &texture->resource, dst_location)) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, &src_rect, surface, dst_location, &src_rect); @@ -2470,9 +2470,8 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } - if (!fbo_blitter_supported(&device->adapter->gl_info, blit_op, - src_resource->usage, src_resource->pool, src_resource->format, src_location, - src_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) + if (!fbo_blitter_supported(blit_op, context->gl_info, + src_resource, src_location, dst_resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location,

1 0

Henri Verbeet : wined3d: Use the resource access flags in arbfp_blit_supported().
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: a3b6f8ceb9a225966ae1b7685fc6beab4da22c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b6f8ceb9a225966ae1b768… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:24 2018 +0330 wined3d: Use the resource access flags in arbfp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 11141b6..a8c4abb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7695,15 +7695,16 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } -static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, - enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3d_context *context, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; enum complex_fixup src_fixup; BOOL decompress; - if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (!context->gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) @@ -7717,7 +7718,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: - if (!d3d_info->shader_color_key) + if (!context->d3d_info->shader_color_key) { /* The conversion modifies the alpha channel so the color key might no longer match. */ TRACE("Color keying not supported with converted textures.\n"); @@ -7734,7 +7735,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); - if (!decompress && (dst_pool == WINED3D_POOL_SYSTEM_MEM || src_pool == WINED3D_POOL_SYSTEM_MEM)) + if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; src_fixup = get_complex_fixup(src_format->color_fixup); @@ -7800,9 +7801,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl struct wined3d_blitter *next; RECT s, d; - if (!arbfp_blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, op, - src_texture->resource.pool, src_texture->resource.format, src_location, - dst_texture->resource.pool, dst_texture->resource.format, dst_location)) + if (!arbfp_blit_supported(op, context, &src_texture->resource, src_location, + &dst_texture->resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location,

1 0

Henri Verbeet : wined3d: Get rid of WINED3D_POOL_SCRATCH.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 2abf1dd3238de2be3405472d40169603a3776b15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2abf1dd3238de2be3405472d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:23 2018 +0330 wined3d: Get rid of WINED3D_POOL_SCRATCH. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 38 +++++++++++++++++++++++++++++--------- dlls/d3d8/d3d8_private.h | 12 ++++++++++++ dlls/d3d8/device.c | 6 ++++++ dlls/d3d8/surface.c | 4 ++-- dlls/d3d8/texture.c | 30 ++++++++++++++++++++++++------ dlls/d3d8/volume.c | 4 ++-- dlls/d3d9/buffer.c | 40 ++++++++++++++++++++++++++++++---------- dlls/d3d9/d3d9_private.h | 12 ++++++++++++ dlls/d3d9/device.c | 6 ++++++ dlls/d3d9/surface.c | 4 ++-- dlls/d3d9/texture.c | 30 ++++++++++++++++++++++++------ dlls/d3d9/volume.c | 4 ++-- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/resource.c | 10 ++++++++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 2 +- 19 files changed, 169 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2abf1dd3238de2be3405…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
64
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 January 2018