February 2016 - Wine-commits

Austin English : rasapi32: Add RasGetLinkStatistics stub.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: b0e122f41179363dfaca4b437fb2b2ff3844233d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e122f41179363dfaca4b437… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 18 12:01:40 2016 +0100 rasapi32: Add RasGetLinkStatistics stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/rasapi.c | 6 ++++++ dlls/rasapi32/rasapi32.spec | 1 + include/ras.h | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 15061c5..fcd0cb8 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -539,3 +539,9 @@ DWORD WINAPI RasSetSubEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, dwcbDeviceConfig); return 0; } + +DWORD WINAPI RasGetLinkStatistics(HRASCONN connection, DWORD entry, RAS_STATS *statistics) +{ + FIXME("(%p,%u,%p), stub!\n", connection, entry, statistics); + return 0; +} diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index f2ce65e..66b21a6 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -45,6 +45,7 @@ @ stdcall RasGetErrorStringW(long ptr long) @ stub RasGetErrorStringWow @ stub RasGetHport +@ stdcall RasGetLinkStatistics(ptr long ptr) @ stdcall RasGetProjectionInfoA(ptr ptr ptr ptr) @ stdcall RasGetProjectionInfoW(ptr ptr ptr ptr) @ stub RasGetSubEntryHandleA diff --git a/include/ras.h b/include/ras.h index 9e5d564..a8c04da 100644 --- a/include/ras.h +++ b/include/ras.h @@ -426,6 +426,24 @@ typedef struct tagRASAUTODIALENTRYW WCHAR szEntry[ RAS_MaxEntryName + 1 ]; } RASAUTODIALENTRYW, *LPRASAUTODIALENTRYW; +typedef struct _RAS_STATS +{ + DWORD dwSize; + DWORD dwBytesXmited; + DWORD dwBytesRcved; + DWORD dwFramesXmited; + DWORD dwFramesRcved; + DWORD dwCrcErr; + DWORD dwTimeoutErr; + DWORD dwAlignmentErr; + DWORD dwHardwareOverrunErr; + DWORD dwFramingErr; + DWORD dwBufferOverrunErr; + DWORD dwCompressionRatioIn; + DWORD dwCompressionRatioOut; + DWORD dwBps; + DWORD dwConnectDuration; +} RAS_STATS, *PRAS_STATS; DWORD WINAPI RasConnectionNotificationA(HRASCONN,HANDLE,DWORD); DWORD WINAPI RasConnectionNotificationW(HRASCONN,HANDLE,DWORD);

1 0

Sebastian Lackner : ntdll: Mimic Windows behaviour when calling debug service.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: 218bc84e03eaa807caca58027334e9b173dcfa7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=218bc84e03eaa807caca58027… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 18 09:58:13 2016 +0100 ntdll: Mimic Windows behaviour when calling debug service. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 10235fe..5708aae 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1940,6 +1940,21 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context goto done; } break; + case EXCEPTION_BREAKPOINT: + if (!is_wow64) + { + /* On Wow64, the upper DWORD of Rax contains garbage, and the debug + * service is usually not recognized when called from usermode. */ + switch (rec->ExceptionInformation[0]) + { + case 1: /* BREAKPOINT_PRINT */ + case 3: /* BREAKPOINT_LOAD_SYMBOLS */ + case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ + case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ + goto done; + } + } + break; } status = NtRaiseException( rec, context, TRUE ); raise_status( status, rec );

1 0

Sebastian Lackner : ntdll: Implement handling of int $0x2d for x86_64.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: e1d68b2e169580be8dc6f8927e01a19c60f79d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d68b2e169580be8dc6f8927… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 18 09:58:36 2016 +0100 ntdll: Implement handling of int $0x2d for x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 53 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0c64541..be5a342 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2170,6 +2170,17 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun } +/*********************************************************************** + * get_exception_context + * + * Get a pointer to the context built by setup_exception. + */ +static inline CONTEXT *get_exception_context( EXCEPTION_RECORD *rec ) +{ + return (CONTEXT *)rec - 1; /* cf. stack_layout structure */ +} + + /********************************************************************** * find_function_info */ @@ -2513,9 +2524,20 @@ static void raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) set_cpu_context( context ); } break; + case EXCEPTION_BREAKPOINT: + switch (rec->ExceptionInformation[0]) + { + case 1: /* BREAKPOINT_PRINT */ + case 3: /* BREAKPOINT_LOAD_SYMBOLS */ + case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ + case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ + goto done; + } + break; } status = raise_exception( rec, context, TRUE ); if (status) raise_status( status, rec ); +done: set_cpu_context( context ); } @@ -2533,6 +2555,28 @@ static void raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } +/*********************************************************************** + * handle_interrupt + * + * Handle an interrupt. + */ +static inline BOOL handle_interrupt( unsigned int interrupt, EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + switch(interrupt) + { + case 0x2d: + context->Rip += 3; + rec->ExceptionCode = EXCEPTION_BREAKPOINT; + rec->ExceptionAddress = (void *)context->Rip; + rec->NumberParameters = 1; + rec->ExceptionInformation[0] = context->Rax; + return TRUE; + default: + return FALSE; + } +} + + /********************************************************************** * segv_handler * @@ -2560,8 +2604,13 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case TRAP_x86_SEGNPFLT: /* Segment not present exception */ case TRAP_x86_PROTFLT: /* General protection fault */ case TRAP_x86_UNKNOWN: /* Unknown fault code */ - rec->ExceptionCode = ERROR_sig(ucontext) ? EXCEPTION_ACCESS_VIOLATION : EXCEPTION_PRIV_INSTRUCTION; - rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + { + CONTEXT *win_context = get_exception_context( rec ); + WORD err = ERROR_sig(ucontext); + 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; case TRAP_x86_PAGEFLT: /* Page fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION;

1 0

Sebastian Lackner : ntdll/tests: Add more tests for calling int $0x2d on x86 and x86_64.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: d0b88e7454b72afa5c8317b46ea0d924edff9411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b88e7454b72afa5c8317b46… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 18 10:34:01 2016 +0100 ntdll/tests: Add more tests for calling int $0x2d on x86 and x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 190 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8ec7408..94ccd7a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -945,6 +945,13 @@ static void test_debugger(void) /* here we handle exception */ } } + else if (stage == 7 || stage == 8) + { + ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, + "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode); + + if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -1339,6 +1346,8 @@ static void test_dpe_exceptions(void) #elif defined(__x86_64__) +#define is_wow64 0 + #define UNW_FLAG_NHANDLER 0 #define UNW_FLAG_EHANDLER 1 #define UNW_FLAG_UHANDLER 2 @@ -1865,6 +1874,181 @@ static void test_ripevent(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD debug_service_exceptions; + +static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + EXCEPTION_RECORD *rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, EXCEPTION_BREAKPOINT); + +#ifdef __i386__ + ok(rec->NumberParameters == (is_wow64 ? 1 : 3), + "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); + ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Eax, + "expected ExceptionInformation[0] = %x, got %lx\n", + ExceptionInfo->ContextRecord->Eax, rec->ExceptionInformation[0]); + if (!is_wow64) + { + ok(rec->ExceptionInformation[1] == 0x11111111, + "got ExceptionInformation[1] = %lx\n", rec->ExceptionInformation[1]); + ok(rec->ExceptionInformation[2] == 0x22222222, + "got ExceptionInformation[2] = %lx\n", rec->ExceptionInformation[2]); + } +#else + ok(rec->NumberParameters == 1, + "ExceptionParameters is %d instead of 1\n", rec->NumberParameters); + ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Rax, + "expected ExceptionInformation[0] = %lx, got %lx\n", + ExceptionInfo->ContextRecord->Rax, rec->ExceptionInformation[0]); +#endif + + debug_service_exceptions++; + return (rec->ExceptionCode == EXCEPTION_BREAKPOINT) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +#ifdef __i386__ + +static const BYTE call_debug_service_code[] = { + 0x53, /* pushl %ebx */ + 0x57, /* pushl %edi */ + 0x8b, 0x44, 0x24, 0x0c, /* movl 12(%esp),%eax */ + 0xb9, 0x11, 0x11, 0x11, 0x11, /* movl $0x11111111,%ecx */ + 0xba, 0x22, 0x22, 0x22, 0x22, /* movl $0x22222222,%edx */ + 0xbb, 0x33, 0x33, 0x33, 0x33, /* movl $0x33333333,%ebx */ + 0xbf, 0x44, 0x44, 0x44, 0x44, /* movl $0x44444444,%edi */ + 0xcd, 0x2d, /* int $0x2d */ + 0xeb, /* jmp $+17 */ + 0x0f, 0x1f, 0x00, /* nop */ + 0x31, 0xc0, /* xorl %eax,%eax */ + 0xeb, 0x0c, /* jmp $+14 */ + 0x90, 0x90, 0x90, 0x90, /* nop */ + 0x90, 0x90, 0x90, 0x90, + 0x90, + 0x31, 0xc0, /* xorl %eax,%eax */ + 0x40, /* incl %eax */ + 0x5f, /* popl %edi */ + 0x5b, /* popl %ebx */ + 0xc3, /* ret */ +}; + +#else + +static const BYTE call_debug_service_code[] = { + 0x53, /* push %rbx */ + 0x57, /* push %rdi */ + 0x48, 0x89, 0xc8, /* movl %rcx,%rax */ + 0x48, 0xb9, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, /* movabs $0x1111111111111111,%rcx */ + 0x48, 0xba, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, /* movabs $0x2222222222222222,%rdx */ + 0x48, 0xbb, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, /* movabs $0x3333333333333333,%rbx */ + 0x48, 0xbf, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, /* movabs $0x4444444444444444,%rdi */ + 0xcd, 0x2d, /* int $0x2d */ + 0xeb, /* jmp $+17 */ + 0x0f, 0x1f, 0x00, /* nop */ + 0x48, 0x31, 0xc0, /* xor %rax,%rax */ + 0xeb, 0x0e, /* jmp $+16 */ + 0x90, 0x90, 0x90, 0x90, /* nop */ + 0x90, 0x90, 0x90, 0x90, + 0x48, 0x31, 0xc0, /* xor %rax,%rax */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x5f, /* pop %rdi */ + 0x5b, /* pop %rbx */ + 0xc3, /* ret */ +}; + +#endif + +static void test_debug_service(DWORD numexc) +{ + const BOOL is_win64 = (sizeof(void *) > sizeof(int)); + DWORD (CDECL *func)(DWORD_PTR) = code_mem; + DWORD expected_exc, expected_ret; + void *vectored_handler; + DWORD ret; + + /* code will return 0 if execution resumes immediately after "int $0x2d", otherwise 1 */ + memcpy(code_mem, call_debug_service_code, sizeof(call_debug_service_code)); + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &debug_service_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + expected_exc = numexc; + expected_ret = (numexc != 0); + + /* BREAKPOINT_BREAK */ + debug_service_exceptions = 0; + ret = func(0); + ok(debug_service_exceptions == expected_exc, + "BREAKPOINT_BREAK generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + todo_wine_if(is_win64) + ok(ret == expected_ret, + "BREAKPOINT_BREAK returned %u, expected %u\n", ret, expected_ret); + + /* BREAKPOINT_PROMPT */ + debug_service_exceptions = 0; + ret = func(2); + ok(debug_service_exceptions == expected_exc, + "BREAKPOINT_PROMPT generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + todo_wine_if(is_win64) + ok(ret == expected_ret, + "BREAKPOINT_PROMPT returned %u, expected %u\n", ret, expected_ret); + + /* invalid debug service */ + debug_service_exceptions = 0; + ret = func(6); + ok(debug_service_exceptions == expected_exc, + "invalid debug service generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + todo_wine_if(is_win64) + ok(ret == expected_ret, + "invalid debug service returned %u, expected %u\n", ret, expected_ret); + + expected_exc = (is_wow64 ? numexc : 0); + expected_ret = (is_wow64 && numexc); + + /* BREAKPOINT_PRINT */ + debug_service_exceptions = 0; + ret = func(1); + ok(debug_service_exceptions == expected_exc, + "BREAKPOINT_PRINT generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + ok(ret == expected_ret, + "BREAKPOINT_PRINT returned %u, expected %u\n", ret, expected_ret); + + /* BREAKPOINT_LOAD_SYMBOLS */ + debug_service_exceptions = 0; + ret = func(3); + ok(debug_service_exceptions == expected_exc, + "BREAKPOINT_LOAD_SYMBOLS generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + ok(ret == expected_ret, + "BREAKPOINT_LOAD_SYMBOLS returned %u, expected %u\n", ret, expected_ret); + + /* BREAKPOINT_UNLOAD_SYMBOLS */ + debug_service_exceptions = 0; + ret = func(4); + ok(debug_service_exceptions == expected_exc, + "BREAKPOINT_UNLOAD_SYMBOLS generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + ok(ret == expected_ret, + "BREAKPOINT_UNLOAD_SYMBOLS returned %u, expected %u\n", ret, expected_ret); + + /* BREAKPOINT_COMMAND_STRING */ + debug_service_exceptions = 0; + ret = func(5); + ok(debug_service_exceptions == expected_exc || broken(debug_service_exceptions == numexc), + "BREAKPOINT_COMMAND_STRING generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + ok(ret == expected_ret || broken(ret == (numexc != 0)), + "BREAKPOINT_COMMAND_STRING returned %u, expected %u\n", ret, expected_ret); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + static void test_vectored_continue_handler(void) { PVOID handler1, handler2; @@ -1984,6 +2168,10 @@ START_TEST(exception) test_ripevent(0); test_stage = 6; test_ripevent(1); + test_stage = 7; + test_debug_service(0); + test_stage = 8; + test_debug_service(1); } else skip( "RtlRaiseException not found\n" ); @@ -1998,6 +2186,7 @@ START_TEST(exception) test_debug_registers(); test_outputdebugstring(1, FALSE); test_ripevent(1); + test_debug_service(1); test_vectored_continue_handler(); test_debugger(); test_simd_exceptions(); @@ -2018,6 +2207,7 @@ START_TEST(exception) test_debug_registers(); test_outputdebugstring(1, FALSE); test_ripevent(1); + test_debug_service(1); test_vectored_continue_handler(); test_virtual_unwind();

1 0

Charles Davis : mscoree: Implement ICorRuntimeHost::CreateDomain{, Ex}().
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: fdeaf812e2d0d5bd26146325272892f1b3d8d1ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdeaf812e2d0d5bd261463252… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Feb 16 18:14:19 2016 -0700 mscoree: Implement ICorRuntimeHost::CreateDomain{, Ex}(). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 238 +++++++++++++++++++++++++++++++++++++---- dlls/mscoree/metahost.c | 4 + dlls/mscoree/mscoree_private.h | 2 + dlls/mscoree/tests/mscoree.c | 98 ++++++++++++++++- 4 files changed, 317 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdeaf812e2d0d5bd26146…

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in device_parent_create_swapchain_texture().
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: bdc31c99c48a7cef587895488a2e855338b53f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc31c99c48a7cef587895488… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:30 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in device_parent_create_swapchain_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5bc39a6..13de8ec 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3042,7 +3042,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic return hr; } - d3d_surface = wined3d_resource_get_parent(wined3d_texture_get_sub_resource(*texture, 0)); + d3d_surface = wined3d_texture_get_sub_resource_parent(*texture, 0); d3d_surface->parent_device = &device->IDirect3DDevice8_iface; return hr;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_swapchain_GetBackBuffer().
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: 1e6951cbfc029ce01068ed20bfda3955dcb65ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6951cbfc029ce01068ed20b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:31 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_swapchain_GetBackBuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/swapchain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 8efdd0a..70abae9 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -112,7 +112,6 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface8 **backbuffer) { struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); - struct wined3d_resource *wined3d_resource; struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; HRESULT hr = D3D_OK; @@ -131,8 +130,7 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, wined3d_mutex_lock(); if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx))) { - wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); - surface_impl = wined3d_resource_get_parent(wined3d_resource); + surface_impl = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); *backbuffer = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*backbuffer); }

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_LockRect().
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: 5c1a6e358d20c5818d6575aaabc08f0f68a897d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1a6e358d20c5818d6575aaa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:32 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_LockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f64604b..f3fcd4e 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -298,7 +298,6 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; HRESULT hr; @@ -306,13 +305,10 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le iface, level, locked_rect, rect, flags); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface8_LockRect(&surface_impl->IDirect3DSurface8_iface, locked_rect, rect, flags); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_UnlockRect().
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: 4394c3b8033ed0a28188ca0cd68d6a52c210d4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4394c3b8033ed0a28188ca0cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:33 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_UnlockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f3fcd4e..c4b986d 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -317,20 +317,16 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le static HRESULT WINAPI d3d8_texture_2d_UnlockRect(IDirect3DTexture8 *iface, UINT level) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface8_UnlockRect(&surface_impl->IDirect3DSurface8_iface); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_GetSurfaceLevel().
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: b162e29c07f492f80c6ea8d07a8666ff00545173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b162e29c07f492f80c6ea8d07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:34 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_GetSurfaceLevel(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c4b986d..1636536 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -274,19 +274,17 @@ static HRESULT WINAPI d3d8_texture_2d_GetSurfaceLevel(IDirect3DTexture8 *iface, UINT level, IDirect3DSurface8 **surface) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; TRACE("iface %p, level %u, surface %p.\n", iface, level, surface); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - surface_impl = wined3d_resource_get_parent(sub_resource); *surface = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*surface); wined3d_mutex_unlock();

1 0