January 2017 - Wine-Commits

Henri Verbeet : wined3d: Do not evict the system memory copy in buffer_create_buffer_object().
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 451e137c1b491da467cfaa34b55d0d301a3002f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451e137c1b491da467cfaa34b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:37 2017 +0100 wined3d: Do not evict the system memory copy in buffer_create_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b31394b..f0029b0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -267,8 +267,6 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi else wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); - wined3d_buffer_evict_sysmem(buffer); - return TRUE; fail: @@ -911,7 +909,14 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * return; } - wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER); + if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER)) + { + ERR("Failed to prepare buffer location.\n"); + return; + } + + if (buffer->resource.heap_memory) + wined3d_buffer_evict_sysmem(buffer); /* Reading the declaration makes only sense if we have valid state information * (i.e., if this function is called during draws). */

1 0

André Hentschel : winemapi: Fix some spec file entries.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: dc37226566dce37947922f33f9a33e838f8488da URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc37226566dce37947922f33f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:58:58 2017 +0100 winemapi: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemapi/winemapi.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winemapi/winemapi.spec b/dlls/winemapi/winemapi.spec index 83de280..40a1244 100644 --- a/dlls/winemapi/winemapi.spec +++ b/dlls/winemapi/winemapi.spec @@ -1,11 +1,11 @@ -@ stdcall MAPIAddress(ptr ptr str long str long ptr long long ptr ptr) -@ stdcall MAPIDeleteMail(ptr ptr str long long) -@ stdcall MAPIDetails(ptr ptr ptr long long) -@ stdcall MAPIFindNext(ptr ptr str str long long ptr) -@ stdcall MAPILogon(ptr str str long long ptr) -@ stdcall MAPILogoff(ptr ptr long long) -@ stdcall MAPIReadMail(ptr ptr str long long ptr) -@ stdcall MAPIResolveName(ptr ptr str long long ptr) -@ stdcall MAPISaveMail(ptr ptr ptr long long str) -@ stdcall MAPISendDocuments(ptr str str str long) -@ stdcall MAPISendMail(ptr ptr ptr long long) +@ stdcall MAPIAddress(ptr long str long str long ptr long long ptr ptr) +@ stdcall MAPIDeleteMail(ptr long str long long) +@ stdcall MAPIDetails(ptr long ptr long long) +@ stdcall MAPIFindNext(ptr long str str long long ptr) +@ stdcall MAPILogon(long str str long long ptr) +@ stdcall MAPILogoff(ptr long long long) +@ stdcall MAPIReadMail(ptr long str long long ptr) +@ stdcall MAPIResolveName(ptr long str long long ptr) +@ stdcall MAPISaveMail(ptr long ptr long long str) +@ stdcall MAPISendDocuments(long str str str long) +@ stdcall MAPISendMail(ptr long ptr long long)

1 0

André Hentschel : advapi32: Fix some more spec file entries.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 24815bff492d45d69c153d7a1f0dddef70a01fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24815bff492d45d69c153d7a1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:58:38 2017 +0100 advapi32: Fix some more spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 6 +++--- .../api-ms-win-security-lsalookup-l2-1-1.spec | 2 +- .../api-ms-win-service-core-l1-1-0.spec | 2 +- .../api-ms-win-service-core-l1-1-1.spec | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 3bd6382..6c57c88 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -411,8 +411,8 @@ @ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) -@ stdcall LookupPrivilegeNameA(str ptr ptr long) -@ stdcall LookupPrivilegeNameW(wstr ptr ptr long) +@ stdcall LookupPrivilegeNameA(str ptr ptr ptr) +@ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) @ stdcall LookupPrivilegeValueA(ptr ptr ptr) @ stdcall LookupPrivilegeValueW(ptr ptr ptr) # @ stub LookupSecurityDescriptorPartsA @@ -716,7 +716,7 @@ # @ stub SetSecurityInfoExW @ stdcall SetServiceBits(long long long long) @ stdcall SetServiceObjectSecurity(long long ptr) -@ stdcall SetServiceStatus(long long) +@ stdcall SetServiceStatus(long ptr) @ stdcall SetThreadToken (ptr ptr) @ stdcall SetTokenInformation (long long ptr long) # @ stub SetTraceCallback diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec index 2e5185c..1a0ed04 100644 --- a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec +++ b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec @@ -1,7 +1,7 @@ @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW @ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW -@ stdcall LookupPrivilegeNameW(wstr ptr ptr long) advapi32.LookupPrivilegeNameW +@ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW @ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains @ stub LsaManageSidNameMapping diff --git a/dlls/api-ms-win-service-core-l1-1-0/api-ms-win-service-core-l1-1-0.spec b/dlls/api-ms-win-service-core-l1-1-0/api-ms-win-service-core-l1-1-0.spec index bfe75c9..ad9d0fe 100644 --- a/dlls/api-ms-win-service-core-l1-1-0/api-ms-win-service-core-l1-1-0.spec +++ b/dlls/api-ms-win-service-core-l1-1-0/api-ms-win-service-core-l1-1-0.spec @@ -1,3 +1,3 @@ @ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) advapi32.RegisterServiceCtrlHandlerExW -@ stdcall SetServiceStatus(long long) advapi32.SetServiceStatus +@ stdcall SetServiceStatus(long ptr) advapi32.SetServiceStatus @ stdcall StartServiceCtrlDispatcherW(ptr) advapi32.StartServiceCtrlDispatcherW diff --git a/dlls/api-ms-win-service-core-l1-1-1/api-ms-win-service-core-l1-1-1.spec b/dlls/api-ms-win-service-core-l1-1-1/api-ms-win-service-core-l1-1-1.spec index b47d284..5d60795 100644 --- a/dlls/api-ms-win-service-core-l1-1-1/api-ms-win-service-core-l1-1-1.spec +++ b/dlls/api-ms-win-service-core-l1-1-1/api-ms-win-service-core-l1-1-1.spec @@ -2,5 +2,5 @@ @ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) advapi32.EnumServicesStatusExW @ stub QueryServiceDynamicInformation @ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) advapi32.RegisterServiceCtrlHandlerExW -@ stdcall SetServiceStatus(long long) advapi32.SetServiceStatus +@ stdcall SetServiceStatus(long ptr) advapi32.SetServiceStatus @ stdcall StartServiceCtrlDispatcherW(ptr) advapi32.StartServiceCtrlDispatcherW

1 0

Józef Kucia : d3d11/tests: Add basic test for SM5 f16tof32 and f32tof16 instructions.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 375d40e97b871eee372b51c688a5bb8540042dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=375d40e97b871eee372b51c68… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:03 2017 +0100 d3d11/tests: Add basic test for SM5 f16tof32 and f32tof16 instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 71 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 59 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 99270d2..b8580e6 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10665,6 +10665,41 @@ static void test_uint_shader_instructions(void) 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; + static const DWORD ps_f16tof32_code[] = + { +#if 0 + uint4 hf; + + uint4 main() : SV_Target + { + return f16tof32(hf); + } +#endif + 0x43425844, 0xc1816e6e, 0x27562d96, 0x56980fa2, 0x421e6640, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000060, 0x00000050, 0x00000018, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x06000083, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, + 0x0500001c, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, + }; + static const DWORD ps_f32tof16_code[] = + { +#if 0 + float4 f; + + uint4 main() : SV_Target + { + return f32tof16(f); + } +#endif + 0x43425844, 0x523a765c, 0x1a5be3a9, 0xaed69c80, 0xd26fe296, 0x00000001, 0x000000bc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x06000082, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; static const DWORD ps_not_code[] = { #if 0 @@ -10689,6 +10724,8 @@ static void test_uint_shader_instructions(void) static const struct shader ps_bfi = {ps_bfi_code, sizeof(ps_bfi_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_bfrev = {ps_bfrev_code, sizeof(ps_bfrev_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_ftou = {ps_ftou_code, sizeof(ps_ftou_code), D3D_FEATURE_LEVEL_10_0}; + static const struct shader ps_f16tof32 = {ps_f16tof32_code, sizeof(ps_f16tof32_code), D3D_FEATURE_LEVEL_11_0}; + static const struct shader ps_f32tof16 = {ps_f32tof16_code, sizeof(ps_f32tof16_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_not = {ps_not_code, sizeof(ps_not_code), D3D_FEATURE_LEVEL_10_0}; static const struct { @@ -10699,21 +10736,31 @@ static void test_uint_shader_instructions(void) } tests[] = { - {&ps_bfi, { 0, 0, 0, 0}, {1, 2, 3, 0}, TRUE}, - {&ps_bfi, { 1, 1, 1, 1}, {5, 6, 7, 4}, TRUE}, - {&ps_bfi, { 2, 3, 4, 5}, {9, 14, 19, 20}, TRUE}, - {&ps_bfi, {~0u, ~0u, ~0u, ~0u}, {0xfffffffd, 0xfffffffe, 0xffffffff, 0xfffffffc}, TRUE}, + {&ps_bfi, { 0, 0, 0, 0}, {1, 2, 3, 0}, TRUE}, + {&ps_bfi, { 1, 1, 1, 1}, {5, 6, 7, 4}, TRUE}, + {&ps_bfi, { 2, 3, 4, 5}, {9, 14, 19, 20}, TRUE}, + {&ps_bfi, {~0u, ~0u, ~0u, ~0u}, {0xfffffffd, 0xfffffffe, 0xffffffff, 0xfffffffc}, TRUE}, + {&ps_bfrev, {0x12345678}, {0x1e6a2c48, 0x12345678, 0x1e6a0000, 0x2c480000}, TRUE}, {&ps_bfrev, {0xffff0000}, {0x0000ffff, 0xffff0000, 0x00000000, 0xffff0000}, TRUE}, {&ps_bfrev, {0xffffffff}, {0xffffffff, 0xffffffff, 0xffff0000, 0xffff0000}, TRUE}, - {&ps_ftou, {BITS_NNAN}, { 0, 0}}, - {&ps_ftou, {BITS_NAN}, { 0, 0}}, - {&ps_ftou, {BITS_NINF}, { 0, ~0u}}, - {&ps_ftou, {BITS_INF}, {~0u, 0}}, - {&ps_ftou, {BITS_N1_0}, { 0, 1}}, - {&ps_ftou, {BITS_1_0}, { 1, 0}}, - {&ps_not, {0x00000000, 0xffffffff}, {0xffffffff, 0x00000000, 0x00000000, 0xffffffff}}, - {&ps_not, {0xf0f0f0f0, 0x0f0f0f0f}, {0x0f0f0f0f, 0xf0f0f0f0, 0xf0f0f0f0, 0x0f0f0f0f}}, + + {&ps_ftou, {BITS_NNAN}, { 0, 0}}, + {&ps_ftou, {BITS_NAN}, { 0, 0}}, + {&ps_ftou, {BITS_NINF}, { 0, ~0u}}, + {&ps_ftou, {BITS_INF}, {~0u, 0}}, + {&ps_ftou, {BITS_N1_0}, { 0, 1}}, + {&ps_ftou, {BITS_1_0}, { 1, 0}}, + + {&ps_f16tof32, {0x00000000, 0x00003c00, 0x00005640, 0x00005bd0}, {0, 1, 100, 250}}, + {&ps_f16tof32, {0x00010000, 0x00013c00, 0x00015640, 0x00015bd0}, {0, 1, 100, 250}}, + {&ps_f16tof32, {0x000f0000, 0x000f3c00, 0x000f5640, 0x000f5bd0}, {0, 1, 100, 250}}, + {&ps_f16tof32, {0xffff0000, 0xffff3c00, 0xffff5640, 0xffff5bd0}, {0, 1, 100, 250}}, + + {&ps_f32tof16, {0, BITS_1_0, BITS_N1_0, 0x44268000}, {0, 0x3c00, 0xbc00, 0x6134}}, + + {&ps_not, {0x00000000, 0xffffffff}, {0xffffffff, 0x00000000, 0x00000000, 0xffffffff}}, + {&ps_not, {0xf0f0f0f0, 0x0f0f0f0f}, {0x0f0f0f0f, 0xf0f0f0f0, 0xf0f0f0f0, 0x0f0f0f0f}}, }; if (!init_test_context(&test_context, NULL))

1 0

Józef Kucia : wined3d: Implement SM5 f32tof16 instruction.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 00ccd6fd99a9ad38e8c4ed5fc67e3c5b8d4b003f URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ccd6fd99a9ad38e8c4ed5fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:02 2017 +0100 wined3d: Implement SM5 f32tof16 instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 11 ++++++++--- dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 97c545f..db76d37 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5106,6 +5106,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_EXP */ shader_hw_scalar_op, /* WINED3DSIH_EXPP */ shader_hw_scalar_op, /* WINED3DSIH_F16TOF32 */ NULL, + /* WINED3DSIH_F32TOF16 */ NULL, /* WINED3DSIH_FCALL */ NULL, /* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_FTOI */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dd1a610..93af07a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3764,13 +3764,17 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "));\n"); } -static void shader_glsl_f16tof32(const struct wined3d_shader_instruction *ins) +static void shader_glsl_float16(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_dst_param dst; struct glsl_src_param src; DWORD write_mask; + const char *fmt; unsigned int i; + fmt = ins->handler_idx == WINED3DSIH_F16TOF32 + ? "unpackHalf2x16(%s).x);\n" : "packHalf2x16(vec2(%s, 0.0)));\n"; + dst = ins->dst[0]; for (i = 0; i < 4; ++i) { @@ -3782,7 +3786,7 @@ static void shader_glsl_f16tof32(const struct wined3d_shader_instruction *ins) continue; shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src); - shader_addline(ins->ctx->buffer, "unpackHalf2x16(%s).x);\n", src.param_str); + shader_addline(ins->ctx->buffer, fmt, src.param_str); } } @@ -8913,7 +8917,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_EQ */ shader_glsl_relop, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, - /* WINED3DSIH_F16TOF32 */ shader_glsl_f16tof32, + /* WINED3DSIH_F16TOF32 */ shader_glsl_float16, + /* WINED3DSIH_F32TOF16 */ shader_glsl_float16, /* WINED3DSIH_FCALL */ NULL, /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 19fbbd1..32a000e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -131,6 +131,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXPP */ "expp", /* WINED3DSIH_F16TOF32 */ "f16tof32", + /* WINED3DSIH_F32TOF16 */ "f32tof16", /* WINED3DSIH_FCALL */ "fcall", /* WINED3DSIH_FRC */ "frc", /* WINED3DSIH_FTOI */ "ftoi", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9dce166..4b2c012 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -231,6 +231,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_RCP = 0x81, + WINED3D_SM5_OP_F32TOF16 = 0x82, WINED3D_SM5_OP_F16TOF32 = 0x83, WINED3D_SM5_OP_UBFE = 0x8a, WINED3D_SM5_OP_BFI = 0x8c, @@ -923,6 +924,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_RCP, WINED3DSIH_RCP, "f", "f"}, + {WINED3D_SM5_OP_F32TOF16, WINED3DSIH_F32TOF16, "u", "f"}, {WINED3D_SM5_OP_F16TOF32, WINED3DSIH_F16TOF32, "f", "u"}, {WINED3D_SM5_OP_UBFE, WINED3DSIH_UBFE, "u", "iiu"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "iiuu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 10b3f8c..7e1282a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -661,6 +661,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_EXP, WINED3DSIH_EXPP, WINED3DSIH_F16TOF32, + WINED3DSIH_F32TOF16, WINED3DSIH_FCALL, WINED3DSIH_FRC, WINED3DSIH_FTOI,

1 0

Józef Kucia : wined3d: Implement SM5 f16tof32 instruction.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: b8fb6177120b11d294dc5bc8a7d45ae4c620ddc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fb6177120b11d294dc5bc8a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:01 2017 +0100 wined3d: Implement SM5 f16tof32 instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 23 +++++++++++++++++++++++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 28 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f2a5b38..97c545f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5105,6 +5105,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_EQ */ NULL, /* WINED3DSIH_EXP */ shader_hw_scalar_op, /* WINED3DSIH_EXPP */ shader_hw_scalar_op, + /* WINED3DSIH_F16TOF32 */ NULL, /* WINED3DSIH_FCALL */ NULL, /* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_FTOI */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c955ec4..dd1a610 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3764,6 +3764,28 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "));\n"); } +static void shader_glsl_f16tof32(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_dst_param dst; + struct glsl_src_param src; + DWORD write_mask; + unsigned int i; + + dst = ins->dst[0]; + for (i = 0; i < 4; ++i) + { + write_mask = WINED3DSP_WRITEMASK_0 << i; + dst.write_mask = ins->dst[0].write_mask & write_mask; + + if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, + &dst, dst.reg.data_type))) + continue; + + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src); + shader_addline(ins->ctx->buffer, "unpackHalf2x16(%s).x);\n", src.param_str); + } +} + static void shader_glsl_nop(const struct wined3d_shader_instruction *ins) {} static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) @@ -8891,6 +8913,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_EQ */ shader_glsl_relop, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, + /* WINED3DSIH_F16TOF32 */ shader_glsl_f16tof32, /* WINED3DSIH_FCALL */ NULL, /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4ca82c2..19fbbd1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -130,6 +130,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_EQ */ "eq", /* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXPP */ "expp", + /* WINED3DSIH_F16TOF32 */ "f16tof32", /* WINED3DSIH_FCALL */ "fcall", /* WINED3DSIH_FRC */ "frc", /* WINED3DSIH_FTOI */ "ftoi", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 66c33b3..9dce166 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -231,6 +231,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_RCP = 0x81, + WINED3D_SM5_OP_F16TOF32 = 0x83, WINED3D_SM5_OP_UBFE = 0x8a, WINED3D_SM5_OP_BFI = 0x8c, WINED3D_SM5_OP_BFREV = 0x8d, @@ -922,6 +923,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_RCP, WINED3DSIH_RCP, "f", "f"}, + {WINED3D_SM5_OP_F16TOF32, WINED3DSIH_F16TOF32, "f", "u"}, {WINED3D_SM5_OP_UBFE, WINED3DSIH_UBFE, "u", "iiu"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "iiuu"}, {WINED3D_SM5_OP_BFREV, WINED3DSIH_BFREV, "u", "u"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eaf54b1..10b3f8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -660,6 +660,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_EQ, WINED3DSIH_EXP, WINED3DSIH_EXPP, + WINED3DSIH_F16TOF32, WINED3DSIH_FCALL, WINED3DSIH_FRC, WINED3DSIH_FTOI,

1 0

Matteo Bruni : wined3d: If the format is not FBO attachable disable sRGB writes only.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 69006a7cc6c43256501f3d6c0a370ced2b2c53fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=69006a7cc6c43256501f3d6c0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 27 19:52:55 2017 +0100 wined3d: If the format is not FBO attachable disable sRGB writes only. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 31 ++++++++++++++++++------------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b4267ed..63577d7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -572,7 +572,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); - if (!needs_separate_srgb_gl_texture(context)) + if (!needs_separate_srgb_gl_texture(context, texture)) srgb = FALSE; /* sRGB mode cache for preload() calls outside drawprim. */ @@ -912,7 +912,7 @@ void wined3d_texture_load(struct wined3d_texture *texture, TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); - if (!needs_separate_srgb_gl_texture(context)) + if (!needs_separate_srgb_gl_texture(context, texture)) srgb = FALSE; if (srgb) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1976bc6..4f063b4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2389,7 +2389,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for { WARN("Format %s's sRGB format is not FBO attachable, type %u.\n", debug_d3dformat(format->id), type); - format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + format_clear_flag(format, WINED3DFMT_FLAG_SRGB_WRITE); } } else if (status == GL_FRAMEBUFFER_COMPLETE) @@ -2533,7 +2533,7 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) { WARN("Format %s's sRGB format is not FBO attachable, resource type %u.\n", debug_d3dformat(format->id), type); - format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + format_clear_flag(format, WINED3DFMT_FLAG_SRGB_WRITE); } } else if (format->flags[type] & WINED3DFMT_FLAG_FBO_ATTACHABLE) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 051836c..eaf54b1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2949,12 +2949,6 @@ struct wined3d_surface struct list overlay_entry; }; -static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context) -{ - return !context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; -} - static inline unsigned int surface_get_sub_resource_idx(const struct wined3d_surface *surface) { return surface->texture_layer * surface->container->level_count + surface->texture_level; @@ -2965,13 +2959,6 @@ static inline struct wined3d_texture_sub_resource *surface_get_sub_resource(stru return &surface->container->sub_resources[surface_get_sub_resource_idx(surface)]; } -static inline GLuint surface_get_texture_name(const struct wined3d_surface *surface, - const struct wined3d_context *context, BOOL srgb) -{ - return srgb && needs_separate_srgb_gl_texture(context) - ? surface->container->texture_srgb.name : surface->container->texture_rgb.name; -} - HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; @@ -3842,6 +3829,17 @@ static inline void context_apply_state(struct wined3d_context *context, state_table[rep].apply(context, state, rep); } +static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context, + const struct wined3d_texture *texture) +{ + unsigned int flags = texture->resource.format_flags; + + return (!context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] + || (flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE)) + != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE)) + && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; +} + static inline BOOL needs_srgb_write(const struct wined3d_context *context, const struct wined3d_state *state, const struct wined3d_fb_state *fb) { @@ -3850,6 +3848,13 @@ static inline BOOL needs_srgb_write(const struct wined3d_context *context, && fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; } +static inline GLuint surface_get_texture_name(const struct wined3d_surface *surface, + const struct wined3d_context *context, BOOL srgb) +{ + return srgb && needs_separate_srgb_gl_texture(context, surface->container) + ? surface->container->texture_srgb.name : surface->container->texture_rgb.name; +} + static inline BOOL can_use_texture_swizzle(const struct wined3d_gl_info *gl_info, const struct wined3d_format *format) { return gl_info->supported[ARB_TEXTURE_SWIZZLE] && !is_complex_fixup(format->color_fixup)

1 0

Matteo Bruni : wined3d: Correctly handle GL implementations not supporting sRGB FBO attachments.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 9fc3444d6ed8ad0e124a77d2faf1e2cc6639f40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc3444d6ed8ad0e124a77d2f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 27 19:52:54 2017 +0100 wined3d: Correctly handle GL implementations not supporting sRGB FBO attachments. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/utils.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 944a4a3..d456772 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3893,6 +3893,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD /* Current wined3d sRGB infrastructure requires EXT_texture_sRGB_decode * for GL_ARB_framebuffer_sRGB support (without EXT_texture_sRGB_decode * we never render to sRGB surfaces). */ + TRACE("EXT_texture_sRGB_decode is not supported, disabling ARB_framebuffer_sRGB.\n"); gl_info->supported[ARB_FRAMEBUFFER_SRGB] = FALSE; } if (gl_info->supported[ARB_OCCLUSION_QUERY]) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d7f2182..1976bc6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1220,7 +1220,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_RENDERTARGET, EXT_PACKED_FLOAT}, /* Palettized formats */ - {WINED3DFMT_P8_UINT, GL_R8, GL_R8, 0, + {WINED3DFMT_P8_UINT, GL_R8, GL_R8, 0, GL_RED, GL_UNSIGNED_BYTE, 0, 0, ARB_TEXTURE_RG, NULL}, @@ -2382,11 +2382,14 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for TRACE("Format %s's sRGB format is FBO attachable, type %u.\n", debug_d3dformat(format->id), type); format->flags[type] |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + format->glInternal = format->glGammaInternal; } else { WARN("Format %s's sRGB format is not FBO attachable, type %u.\n", debug_d3dformat(format->id), type); + format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } } else if (status == GL_FRAMEBUFFER_COMPLETE) @@ -2523,11 +2526,14 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) TRACE("Format %s's sRGB format is FBO attachable, resource type %u.\n", debug_d3dformat(format->id), type); format->flags[type] |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + format->glInternal = format->glGammaInternal; } else { WARN("Format %s's sRGB format is not FBO attachable, resource type %u.\n", debug_d3dformat(format->id), type); + format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } } else if (format->flags[type] & WINED3DFMT_FLAG_FBO_ATTACHABLE) @@ -2739,7 +2745,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, if (!(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) format->glGammaInternal = format->glInternal; - else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) format->glInternal = format->glGammaInternal; } } @@ -2761,7 +2768,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, format->glGammaInternal = format->glInternal; format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } - else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { format->glInternal = format->glGammaInternal; }

1 0

Alex Henrie : ddraw: Don' t crash if writing out a new ddraw7 surface segfaults.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: c9e29bff7bbded119e9052b6740545e70cafdcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e29bff7bbded119e9052b67… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:06 2017 -0700 ddraw: Don't crash if writing out a new ddraw7 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 +++++++++++++++------- dlls/ddraw/tests/ddraw7.c | 2 ++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ebb2706..f015b01d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2814,15 +2814,23 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface7_iface; + IDirectDraw7_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; } - - *surface = &impl->IDirectDrawSurface7_iface; - IDirectDraw7_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d802a59..44695cb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1994,6 +1994,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface7 **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0

Alex Henrie : ddraw: Don' t crash if writing out a new ddraw2 surface segfaults.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: f6997e8fe0563da811d1627034dd95ab3a8e10af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6997e8fe0563da811d162703… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:04 2017 -0700 ddraw: Don't crash if writing out a new ddraw2 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 20 ++++++++++++++------ dlls/ddraw/tests/ddraw2.c | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b8e2f57..1e69df4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2924,14 +2924,22 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 2); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; } - - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ce3f6de..26c2c33 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2119,6 +2119,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0