wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Andrey Gusev : ext-ms-win-dwmapi-ext-l1-1-0: Add dll.
by Alexandre Julliard 13 Mar '18

13 Mar '18

Module: wine Branch: master Commit: 294560c1a3fbac9eb68a500effda2470af34bb40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=294560c1a3fbac9eb68a500e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Mar 13 15:44:31 2018 +0200 ext-ms-win-dwmapi-ext-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-dwmapi-ext-l1-1-0/Makefile.in | 1 + dlls/ext-ms-win-dwmapi-ext-l1-1-0/ext-ms-win-dwmapi-ext-l1-1-0.spec | 4 ++++ tools/make_specfiles | 4 ++++ 5 files changed, 12 insertions(+) diff --git a/configure b/configure index d3293c4..1606c2f 100755 --- a/configure +++ b/configure @@ -1242,6 +1242,7 @@ enable_evr enable_explorerframe enable_ext_ms_win_authz_context_l1_1_0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 +enable_ext_ms_win_dwmapi_ext_l1_1_0 enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 @@ -18604,6 +18605,7 @@ wine_fn_config_makefile dlls/explorerframe enable_explorerframe wine_fn_config_makefile dlls/explorerframe/tests enable_tests wine_fn_config_makefile dlls/ext-ms-win-authz-context-l1-1-0 enable_ext_ms_win_authz_context_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-domainjoin-netjoin-l1-1-0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-dwmapi-ext-l1-1-0 enable_ext_ms_win_dwmapi_ext_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 diff --git a/configure.ac b/configure.ac index fb0014b..88e62b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3239,6 +3239,7 @@ WINE_CONFIG_MAKEFILE(dlls/explorerframe) WINE_CONFIG_MAKEFILE(dlls/explorerframe/tests) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-authz-context-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-domainjoin-netjoin-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-dwmapi-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-devcaps-l1-1-0) diff --git a/dlls/ext-ms-win-dwmapi-ext-l1-1-0/Makefile.in b/dlls/ext-ms-win-dwmapi-ext-l1-1-0/Makefile.in new file mode 100644 index 0000000..de0b93d --- /dev/null +++ b/dlls/ext-ms-win-dwmapi-ext-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-dwmapi-ext-l1-1-0.dll diff --git a/dlls/ext-ms-win-dwmapi-ext-l1-1-0/ext-ms-win-dwmapi-ext-l1-1-0.spec b/dlls/ext-ms-win-dwmapi-ext-l1-1-0/ext-ms-win-dwmapi-ext-l1-1-0.spec new file mode 100644 index 0000000..179578c --- /dev/null +++ b/dlls/ext-ms-win-dwmapi-ext-l1-1-0/ext-ms-win-dwmapi-ext-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall DwmIsCompositionEnabled(ptr) dwmapi.DwmIsCompositionEnabled +@ stub DwmpRenderFlick +@ stub DwmRenderGesture +@ stub DwmShowContact diff --git a/tools/make_specfiles b/tools/make_specfiles index cf685b6..e02d888 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -161,6 +161,10 @@ my @dll_groups = "ext-ms-win-security-cryptui-l1-1-0", ], [ + "dwmapi", + "ext-ms-win-dwmapi-ext-l1-1-0", + ], + [ "netapi32", "ext-ms-win-domainjoin-netjoin-l1-1-0", ],

1 0

Sergio Gómez Del Real : kernel32: Implement FindNLSStringEx.
by Alexandre Julliard 13 Mar '18

13 Mar '18

Module: wine Branch: master Commit: 2d74a4ff43284c35447ed2a915b0b5b3e40748f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d74a4ff43284c35447ed2a9… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Tue Mar 13 09:09:45 2018 -0500 kernel32: Implement FindNLSStringEx. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-l1-1-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 51 +++++++++ dlls/kernel32/tests/locale.c | 115 +++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnls.h | 5 + 8 files changed, 176 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d74a4ff43284c35447e…

1 0

Michael Stefaniuc : dmime: Use ParseDescriptor() instead of reimplementing it.
by Alexandre Julliard 13 Mar '18

13 Mar '18

Module: wine Branch: master Commit: da4318b291cf5d534696c8719ae8cec240cfadd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da4318b291cf5d534696c871… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 13 00:23:26 2018 +0100 dmime: Use ParseDescriptor() instead of reimplementing it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/audiopath.c | 153 +++---------------------------------------------- dlls/dmime/graph.c | 152 +++--------------------------------------------- 2 files changed, 14 insertions(+), 291 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da4318b291cf5d534696…

1 0

Zebediah Figura : ntdll: Fix exception parameters on x86-64.
by Alexandre Julliard 13 Mar '18

13 Mar '18

Module: wine Branch: master Commit: a462735270caf1503735a20b86e97ccead428cca URL: https://source.winehq.org/git/wine.git/?a=commit;h=a462735270caf1503735a20b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 12 23:03:08 2018 -0500 ntdll: Fix exception parameters on x86-64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 +++ dlls/ntdll/tests/exception.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ee3d1f9..efbcc6e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2876,6 +2876,9 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if (!err && (rec->ExceptionCode = is_privileged_instr( win_context ))) break; if ((err & 7) == 2 && handle_interrupt( err >> 3, rec, win_context )) break; rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + rec->NumberParameters = 2; + rec->ExceptionInformation[0] = 0; + rec->ExceptionInformation[1] = 0xffffffffffffffff; } break; case TRAP_x86_PAGEFLT: /* Page fault */ diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 320aa77..46e2a30 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2370,7 +2370,6 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, else parameter_count = except->alt_nb_params; -todo_wine_if( rec->NumberParameters != parameter_count ) ok( rec->NumberParameters == parameter_count, "%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count );

1 0

Andrew Wesie : ntdll: Handle icebp on x86-64.
by Alexandre Julliard 13 Mar '18

13 Mar '18

Module: wine Branch: master Commit: 5644022c264ce50fe71b7b439c64b020aea61a95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5644022c264ce50fe71b7b43… Author: Andrew Wesie <awesie(a)gmail.com> Date: Mon Mar 12 23:03:07 2018 -0500 ntdll: Handle icebp on x86-64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 6 ++++++ dlls/ntdll/tests/exception.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 05b0906..ee3d1f9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2917,6 +2917,12 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionCode = EXCEPTION_SINGLE_STEP; break; case TRAP_BRKPT: /* Breakpoint exception */ + /* Check if this is actuallly icebp instruction */ + if (((unsigned char *)rec->ExceptionAddress)[-1] == 0xF1) + { + rec->ExceptionCode = EXCEPTION_SINGLE_STEP; + break; + } rec->ExceptionAddress = (char *)rec->ExceptionAddress - 1; /* back up over the int3 instruction */ /* fall through */ default: diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7615b5a..320aa77 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2292,10 +2292,8 @@ static const struct exception /* 35 */ { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffffffffffff; ret */ 0, 9, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffffffffffff } }, -#if 0 { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ 1, 1, STATUS_SINGLE_STEP, 0 }, -#endif { { 0xcd, 0x2c, 0xc3 }, 0, 2, STATUS_ASSERTION_FAILURE, 0 }, };

1 0

Andrew Wesie : ntdll: Handle interrupt 0x2c on x86-64.
by Alexandre Julliard 13 Mar '18

13 Mar '18

Module: wine Branch: master Commit: bd63cce8f5bb9b55df559c3bdd49ab07fc569e74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd63cce8f5bb9b55df559c3b… Author: Andrew Wesie <awesie(a)gmail.com> Date: Mon Mar 12 23:03:06 2018 -0500 ntdll: Handle interrupt 0x2c on x86-64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 +++ dlls/ntdll/tests/exception.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7b82083..05b0906 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2809,6 +2809,9 @@ static inline BOOL handle_interrupt( unsigned int interrupt, EXCEPTION_RECORD *r { switch(interrupt) { + case 0x2c: + rec->ExceptionCode = STATUS_ASSERTION_FAILURE; + return TRUE; case 0x2d: context->Rip += 3; rec->ExceptionCode = EXCEPTION_BREAKPOINT; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a76fce6..7615b5a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2354,8 +2354,6 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, trace( "exception %u: %x flags:%x addr:%p\n", entry, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); -todo_wine_if( rec->ExceptionCode != except->status && - rec->ExceptionCode != except->alt_status ) ok( rec->ExceptionCode == except->status || (except->alt_status != 0 && rec->ExceptionCode == except->alt_status), "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status );

1 0

Sebastian Lackner : ntdll: Correctly handle privileged instructions on x86-64.
by Alexandre Julliard 13 Mar '18

13 Mar '18

Module: wine Branch: master Commit: 2f870c1801c8d455faadd6c301aad318f287713b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f870c1801c8d455faadd6c3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 12 23:03:05 2018 -0500 ntdll: Correctly handle privileged instructions on x86-64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 82 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 169793b..7b82083 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2721,6 +2721,86 @@ static void raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) /*********************************************************************** + * is_privileged_instr + * + * Check if the fault location is a privileged instruction. + */ +static inline DWORD is_privileged_instr( CONTEXT *context ) +{ + const BYTE *instr = (BYTE *)context->Rip; + unsigned int prefix_count = 0; + + for (;;) switch(*instr) + { + /* instruction prefixes */ + case 0x2e: /* %cs: */ + case 0x36: /* %ss: */ + case 0x3e: /* %ds: */ + case 0x26: /* %es: */ + case 0x40: /* rex */ + case 0x41: /* rex */ + case 0x42: /* rex */ + case 0x43: /* rex */ + case 0x44: /* rex */ + case 0x45: /* rex */ + case 0x46: /* rex */ + case 0x47: /* rex */ + case 0x48: /* rex */ + case 0x49: /* rex */ + case 0x4a: /* rex */ + case 0x4b: /* rex */ + case 0x4c: /* rex */ + case 0x4d: /* rex */ + case 0x4e: /* rex */ + case 0x4f: /* rex */ + case 0x64: /* %fs: */ + case 0x65: /* %gs: */ + case 0x66: /* opcode size */ + case 0x67: /* addr size */ + case 0xf0: /* lock */ + case 0xf2: /* repne */ + case 0xf3: /* repe */ + if (++prefix_count >= 15) return EXCEPTION_ILLEGAL_INSTRUCTION; + instr++; + continue; + + case 0x0f: /* extended instruction */ + switch(instr[1]) + { + case 0x06: /* clts */ + case 0x08: /* invd */ + case 0x09: /* wbinvd */ + case 0x20: /* mov crX, reg */ + case 0x21: /* mov drX, reg */ + case 0x22: /* mov reg, crX */ + case 0x23: /* mov reg drX */ + return EXCEPTION_PRIV_INSTRUCTION; + } + return 0; + case 0x6c: /* insb (%dx) */ + case 0x6d: /* insl (%dx) */ + case 0x6e: /* outsb (%dx) */ + case 0x6f: /* outsl (%dx) */ + case 0xcd: /* int $xx */ + case 0xe4: /* inb al,XX */ + case 0xe5: /* in (e)ax,XX */ + case 0xe6: /* outb XX,al */ + case 0xe7: /* out XX,(e)ax */ + case 0xec: /* inb (%dx),%al */ + case 0xed: /* inl (%dx),%eax */ + case 0xee: /* outb %al,(%dx) */ + case 0xef: /* outl %eax,(%dx) */ + case 0xf4: /* hlt */ + case 0xfa: /* cli */ + case 0xfb: /* sti */ + return EXCEPTION_PRIV_INSTRUCTION; + default: + return 0; + } +} + + +/*********************************************************************** * handle_interrupt * * Handle an interrupt. @@ -2790,8 +2870,8 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { CONTEXT *win_context = get_exception_context( rec ); WORD err = ERROR_sig(ucontext); + if (!err && (rec->ExceptionCode = is_privileged_instr( win_context ))) break; if ((err & 7) == 2 && handle_interrupt( err >> 3, rec, win_context )) break; - rec->ExceptionCode = err ? EXCEPTION_ACCESS_VIOLATION : EXCEPTION_PRIV_INSTRUCTION; rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; } break;

1 0

Andrew Wesie : ntdll/tests: Test exception codes on x86-64.
by Alexandre Julliard 13 Mar '18

13 Mar '18

Module: wine Branch: master Commit: 453c670ab8f46082056f6c3b7aa65d846961c5a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=453c670ab8f46082056f6c3b… Author: Andrew Wesie <awesie(a)gmail.com> Date: Mon Mar 12 23:03:04 2018 -0500 ntdll/tests: Test exception codes on x86-64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 282 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 282 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=453c670ab8f46082056f…

1 0

Matteo Bruni : wined3d: Do not apply fixed-function state in context_apply_blit_state().
by Alexandre Julliard 13 Mar '18

13 Mar '18

Module: wine Branch: master Commit: c0e49b0e2c620ea540cce05da46e8aa77b9bce1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0e49b0e2c620ea540cce05d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 13 14:11:06 2018 +0330 wined3d: Do not apply fixed-function state in context_apply_blit_state(). 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/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 415 +++++++++++++++++--------------------- dlls/wined3d/surface.c | 6 +- dlls/wined3d/wined3d_private.h | 6 +- 4 files changed, 197 insertions(+), 232 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0e49b0e2c620ea540cc…

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to texture2d_destroy_dc().
by Alexandre Julliard 13 Mar '18

13 Mar '18

Module: wine Branch: master Commit: 56464f5e074897a607b7b3f98c591537adca55cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=56464f5e074897a607b7b3f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 14:11:04 2018 +0330 wined3d: Pass a texture and sub-resource index to texture2d_destroy_dc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 28 +++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 8 -------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 07c08d8..6abc7e7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1406,18 +1406,20 @@ static void texture2d_create_dc(void *object) static void texture2d_destroy_dc(void *object) { - struct wined3d_surface *surface = object; + const struct wined3d_texture_idx *idx = object; D3DKMT_DESTROYDCFROMMEMORY destroy_desc; struct wined3d_context *context = NULL; struct wined3d_texture *texture; + struct wined3d_surface *surface; struct wined3d_bo_address data; unsigned int sub_resource_idx; struct wined3d_device *device; NTSTATUS status; - texture = surface->container; - sub_resource_idx = surface_get_sub_resource_idx(surface); + texture = idx->texture; + sub_resource_idx = idx->sub_resource_idx; device = texture->resource.device; + surface = texture->sub_resources[sub_resource_idx].u.surface; if (!surface->dc) { @@ -1453,7 +1455,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_format *format = wined3d_get_format(gl_info, format_id, texture->resource.usage); UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_surface *surface; DWORD valid_location = 0; BOOL create_dib = FALSE; @@ -1500,10 +1501,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_resource_wait_idle(&texture->resource); sub_resource = &texture->sub_resources[0]; - surface = sub_resource->u.surface; - if (surface->dc) + if (sub_resource->u.surface->dc) { - wined3d_cs_destroy_object(device->cs, texture2d_destroy_dc, surface); + struct wined3d_texture_idx texture_idx = {texture, 0}; + + wined3d_cs_destroy_object(device->cs, texture2d_destroy_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); create_dib = TRUE; } @@ -1889,7 +1891,11 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) TRACE("surface %p.\n", surface); if (surface->dc) - texture2d_destroy_dc(surface); + { + struct wined3d_texture_idx texture_idx = {texture, i}; + + texture2d_destroy_dc(&texture_idx); + } } if (context) context_release(context); @@ -2360,8 +2366,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 surface = &surfaces[idx]; surface->container = texture; - surface->texture_level = i; - surface->texture_layer = j; sub_resource = &texture->sub_resources[idx]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; @@ -3224,7 +3228,9 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign if (!(texture->resource.usage & WINED3DUSAGE_OWNDC) && !(device->wined3d->flags & WINED3D_NO3D)) { - wined3d_cs_destroy_object(device->cs, texture2d_destroy_dc, surface); + struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; + + wined3d_cs_destroy_object(device->cs, texture2d_destroy_dc, &texture_idx); device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 247e712..9dc193a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3335,19 +3335,11 @@ struct wined3d_surface { struct wined3d_texture *container; - unsigned int texture_level; - unsigned int texture_layer; - /* For GetDC */ HBITMAP bitmap; HDC dc; }; -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; -} - void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb,

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
79
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 2018