August 2016 - Wine-commits - list.winehq.org

Nikolay Sivov : dwrite/tests: Remove unnecessary font face creation.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: badccd8c7c637a75b2c7d0fd974c8ea7761a79c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=badccd8c7c637a75b2c7d0fd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 26 13:47:18 2016 +0300 dwrite/tests: Remove unnecessary font face creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3067ea2..7f9be00 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6303,7 +6303,6 @@ static void test_GetFontSignature(void) for (i = 0; i < count; i++) { FONTSIGNATURE expected_signature; IDWriteLocalizedStrings *names; - IDWriteFontFace *fontface; IDWriteFontFamily *family; IDWriteFont *font; WCHAR nameW[256]; @@ -6315,9 +6314,6 @@ static void test_GetFontSignature(void) DWRITE_FONT_STYLE_NORMAL, &font); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFont_CreateFontFace(font, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFamily_GetFamilyNames(family, &names); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -6345,7 +6341,6 @@ static void test_GetFontSignature(void) fontsig.fsCsb[1], expected_signature.fsCsb[1]); IDWriteFont_Release(font); - IDWriteFontFace_Release(fontface); IDWriteFontFamily_Release(family); }

1 0

Nikolay Sivov : shell32: Use interface pointer instead of implementation one.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 91947b35ad503e2fbf2f4e886ddcc220d927e43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91947b35ad503e2fbf2f4e886… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 23:30:16 2016 +0300 shell32: Use interface pointer instead of implementation one. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/recyclebin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 0b5638b..80e5aad 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -486,7 +486,7 @@ static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwn ZeroMemory(&sfv, sizeof(sfv)); sfv.cbSize = sizeof(sfv); - sfv.pshf = (IShellFolder *)This; + sfv.pshf = (IShellFolder *)&This->IShellFolder2_iface; TRACE("Calling SHCreateShellFolderViewEx\n"); ret = SHCreateShellFolderViewEx(&sfv, &tmp);

1 0

Daniel Lehman : ntdll: Set Rip in for longjmp in RtlRestoreContext.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 594ddb614018c5908a1cfa99d3746e9a2cc855c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=594ddb614018c5908a1cfa99d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 1 14:52:32 2016 -0700 ntdll: Set Rip in for longjmp in RtlRestoreContext. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 1 + dlls/ntdll/tests/exception.c | 172 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 92d7b38..6d3aedb 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3571,6 +3571,7 @@ void WINAPI RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) context->R13 = jmp->R13; context->R14 = jmp->R14; context->R15 = jmp->R15; + context->Rip = jmp->Rip; context->u.s.Xmm6 = jmp->Xmm6; context->u.s.Xmm7 = jmp->Xmm7; context->u.s.Xmm8 = jmp->Xmm8; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f1bfee6..0040fdb 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -79,11 +79,46 @@ typedef struct ULONG ScopeIndex; } DISPATCHER_CONTEXT; +typedef struct _SETJMP_FLOAT128 +{ + unsigned __int64 DECLSPEC_ALIGN(16) Part[2]; +} SETJMP_FLOAT128; + +typedef struct _JUMP_BUFFER +{ + unsigned __int64 Frame; + unsigned __int64 Rbx; + unsigned __int64 Rsp; + unsigned __int64 Rbp; + unsigned __int64 Rsi; + unsigned __int64 Rdi; + unsigned __int64 R12; + unsigned __int64 R13; + unsigned __int64 R14; + unsigned __int64 R15; + unsigned __int64 Rip; + unsigned __int64 Spare; + SETJMP_FLOAT128 Xmm6; + SETJMP_FLOAT128 Xmm7; + SETJMP_FLOAT128 Xmm8; + SETJMP_FLOAT128 Xmm9; + SETJMP_FLOAT128 Xmm10; + SETJMP_FLOAT128 Xmm11; + SETJMP_FLOAT128 Xmm12; + SETJMP_FLOAT128 Xmm13; + SETJMP_FLOAT128 Xmm14; + SETJMP_FLOAT128 Xmm15; +} _JUMP_BUFFER; + static BOOLEAN (CDECL *pRtlAddFunctionTable)(RUNTIME_FUNCTION*, DWORD, DWORD64); static BOOLEAN (CDECL *pRtlDeleteFunctionTable)(RUNTIME_FUNCTION*); static BOOLEAN (CDECL *pRtlInstallFunctionTableCallback)(DWORD64, DWORD64, DWORD, PGET_RUNTIME_FUNCTION_CALLBACK, PVOID, PCWSTR); static PRUNTIME_FUNCTION (WINAPI *pRtlLookupFunctionEntry)(ULONG64, ULONG64*, UNWIND_HISTORY_TABLE*); static EXCEPTION_DISPOSITION (WINAPI *p__C_specific_handler)(EXCEPTION_RECORD*, ULONG64, CONTEXT*, DISPATCHER_CONTEXT*); +static VOID (WINAPI *pRtlCaptureContext)(CONTEXT*); +static VOID (CDECL *pRtlRestoreContext)(CONTEXT*, EXCEPTION_RECORD*); +static VOID (CDECL *pRtlUnwindEx)(VOID*, VOID*, EXCEPTION_RECORD*, VOID*, CONTEXT*, UNWIND_HISTORY_TABLE*); +static int (CDECL *p_setjmp)(_JUMP_BUFFER*); #endif #ifdef __i386__ @@ -1658,6 +1693,131 @@ static void test_virtual_unwind(void) call_virtual_unwind( i, &tests[i] ); } +static int consolidate_dummy_called; +static PVOID CALLBACK test_consolidate_dummy(EXCEPTION_RECORD *rec) +{ + CONTEXT *ctx = (CONTEXT *)rec->ExceptionInformation[1]; + consolidate_dummy_called = 1; + ok(ctx->Rip == 0xdeadbeef, "test_consolidate_dummy failed for Rip, expected: 0xdeadbeef, got: %lx\n", ctx->Rip); + return (PVOID)rec->ExceptionInformation[2]; +} + +static void test_restore_context(void) +{ + SETJMP_FLOAT128 *fltsave; + EXCEPTION_RECORD rec; + _JUMP_BUFFER buf; + CONTEXT ctx; + int i, pass; + + if (!pRtlUnwindEx || !pRtlRestoreContext || !pRtlCaptureContext || !p_setjmp) + { + skip("RtlUnwindEx/RtlCaptureContext/RtlRestoreContext/_setjmp not found\n"); + return; + } + + /* RtlRestoreContext(NULL, NULL); crashes on Windows */ + + /* test simple case of capture and restore context */ + pass = 0; + InterlockedIncrement(&pass); /* interlocked to prevent compiler from moving after capture */ + pRtlCaptureContext(&ctx); + if (InterlockedIncrement(&pass) == 2) /* interlocked to prevent compiler from moving before capture */ + { + pRtlRestoreContext(&ctx, NULL); + ok(0, "shouldn't be reached\n"); + } + else + ok(pass < 4, "unexpected pass %d\n", pass); + + /* test with jmp using RltRestoreContext */ + pass = 0; + InterlockedIncrement(&pass); + RtlCaptureContext(&ctx); + InterlockedIncrement(&pass); /* only called once */ + p_setjmp(&buf); + InterlockedIncrement(&pass); + if (pass == 3) + { + rec.ExceptionCode = STATUS_LONGJUMP; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD64)&buf; + + /* uses buf.Rip instead of ctx.Rip */ + pRtlRestoreContext(&ctx, &rec); + ok(0, "shouldn't be reached\n"); + } + else if (pass == 4) + { + ok(buf.Rbx == ctx.Rbx, "longjmp failed for Rbx, expected: %lx, got: %lx\n", buf.Rbx, ctx.Rbx); + ok(buf.Rsp == ctx.Rsp, "longjmp failed for Rsp, expected: %lx, got: %lx\n", buf.Rsp, ctx.Rsp); + ok(buf.Rbp == ctx.Rbp, "longjmp failed for Rbp, expected: %lx, got: %lx\n", buf.Rbp, ctx.Rbp); + ok(buf.Rsi == ctx.Rsi, "longjmp failed for Rsi, expected: %lx, got: %lx\n", buf.Rsi, ctx.Rsi); + ok(buf.Rdi == ctx.Rdi, "longjmp failed for Rdi, expected: %lx, got: %lx\n", buf.Rdi, ctx.Rdi); + ok(buf.R12 == ctx.R12, "longjmp failed for R12, expected: %lx, got: %lx\n", buf.R12, ctx.R12); + ok(buf.R13 == ctx.R13, "longjmp failed for R13, expected: %lx, got: %lx\n", buf.R13, ctx.R13); + ok(buf.R14 == ctx.R14, "longjmp failed for R14, expected: %lx, got: %lx\n", buf.R14, ctx.R14); + ok(buf.R15 == ctx.R15, "longjmp failed for R15, expected: %lx, got: %lx\n", buf.R15, ctx.R15); + + fltsave = &buf.Xmm6; + for (i = 0; i < 10; i++) + { + ok(fltsave[i].Part[0] == ctx.u.FltSave.XmmRegisters[i + 6].Low, + "longjmp failed for Xmm%d, expected %lx, got %lx\n", i + 6, + fltsave[i].Part[0], ctx.u.FltSave.XmmRegisters[i + 6].Low); + + ok(fltsave[i].Part[1] == ctx.u.FltSave.XmmRegisters[i + 6].High, + "longjmp failed for Xmm%d, expected %lx, got %lx\n", i + 6, + fltsave[i].Part[1], ctx.u.FltSave.XmmRegisters[i + 6].High); + } + } + else + ok(0, "unexpected pass %d\n", pass); + + /* test with jmp through RtlUnwindEx */ + pass = 0; + InterlockedIncrement(&pass); + pRtlCaptureContext(&ctx); + InterlockedIncrement(&pass); /* only called once */ + p_setjmp(&buf); + InterlockedIncrement(&pass); + if (pass == 3) + { + rec.ExceptionCode = STATUS_LONGJUMP; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD64)&buf; + + /* uses buf.Rip instead of bogus 0xdeadbeef */ + pRtlUnwindEx((void*)buf.Rsp, (void*)0xdeadbeef, &rec, NULL, &ctx, NULL); + ok(0, "shouldn't be reached\n"); + } + else + ok(pass == 4, "unexpected pass %d\n", pass); + + + /* test with consolidate */ + pass = 0; + InterlockedIncrement(&pass); + RtlCaptureContext(&ctx); + InterlockedIncrement(&pass); + if (pass == 2) + { + rec.ExceptionCode = STATUS_UNWIND_CONSOLIDATE; + rec.NumberParameters = 3; + rec.ExceptionInformation[0] = (DWORD64)test_consolidate_dummy; + rec.ExceptionInformation[1] = (DWORD64)&ctx; + rec.ExceptionInformation[2] = ctx.Rip; + ctx.Rip = 0xdeadbeef; + + pRtlRestoreContext(&ctx, &rec); + ok(0, "shouldn't be reached\n"); + } + else if (pass == 3) + ok(consolidate_dummy_called, "test_consolidate_dummy not called\n"); + else + ok(0, "unexpected pass %d\n", pass); +} + static RUNTIME_FUNCTION* CALLBACK dynamic_unwind_callback( DWORD64 pc, PVOID context ) { static const int code_offset = 1024; @@ -2235,6 +2395,9 @@ static void test_vectored_continue_handler(void) START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); +#if defined(__x86_64__) + HMODULE hmsvcrt = LoadLibraryA("msvcrt.dll"); +#endif code_mem = VirtualAlloc(NULL, 65536, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); if(!code_mem) { @@ -2349,6 +2512,14 @@ START_TEST(exception) "RtlLookupFunctionEntry" ); p__C_specific_handler = (void *)GetProcAddress( hntdll, "__C_specific_handler" ); + pRtlCaptureContext = (void *)GetProcAddress( hntdll, + "RtlCaptureContext" ); + pRtlRestoreContext = (void *)GetProcAddress( hntdll, + "RtlRestoreContext" ); + pRtlUnwindEx = (void *)GetProcAddress( hntdll, + "RtlUnwindEx" ); + p_setjmp = (void *)GetProcAddress( hmsvcrt, + "_setjmp" ); test_debug_registers(); test_outputdebugstring(1, FALSE); @@ -2358,6 +2529,7 @@ START_TEST(exception) test_vectored_continue_handler(); test_virtual_unwind(); test___C_specific_handler(); + test_restore_context(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind();

1 0

Piotr Caban : ntdll: Don' t incorrectly overwrite orig_context in call_stack_handlers.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 67f2a1eaf94435735cbfc7ab31656d5c7c96a93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67f2a1eaf94435735cbfc7ab3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 26 11:24:09 2016 +0200 ntdll: Don't incorrectly overwrite orig_context in call_stack_handlers. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6d3aedb..f33fe4c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2400,7 +2400,6 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex { case ExceptionContinueExecution: if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; - *orig_context = *dispatch.ContextRecord; return STATUS_SUCCESS; case ExceptionContinueSearch: break; @@ -2431,7 +2430,6 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex { case ExceptionContinueExecution: if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; - *orig_context = *dispatch.ContextRecord; return STATUS_SUCCESS; case ExceptionContinueSearch: break;

1 0

Huw Davies : oleaut32/tests: Don't draw on the desktop window.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: ce50839f15994d0330e5484d9de562c6c973943d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce50839f15994d0330e5484d9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 26 11:11:04 2016 +0100 oleaut32/tests: Don't draw on the desktop window. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 0903298..f00730a 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -169,6 +169,25 @@ static const unsigned char enhmetafile[] = { 0x14, 0x00, 0x00, 0x00 }; +static HBITMAP stock_bm; + +static HDC create_render_dc( void ) +{ + HDC dc = CreateCompatibleDC( NULL ); + BITMAPINFO info = {{sizeof(info.bmiHeader), 100, 100, 1, 32, BI_RGB }}; + void *bits; + HBITMAP dib = CreateDIBSection( NULL, &info, DIB_RGB_COLORS, &bits, NULL, 0 ); + + stock_bm = SelectObject( dc, dib ); + return dc; +} + +static void delete_render_dc( HDC dc ) +{ + HBITMAP dib = SelectObject( dc, stock_bm ); + DeleteObject( dib ); + DeleteDC( dc ); +} typedef struct NoStatStreamImpl { @@ -480,7 +499,7 @@ static void test_Invoke(void) ok(hr == DISP_E_BADPARAMCOUNT, "IPictureDisp_Invoke should have returned DISP_E_BADPARAMCOUNT instead of 0x%08x\n", hr); /* DISPID_PICT_RENDER */ - hdc = GetDC(0); + hdc = create_render_dc(); for (i = 0; i < sizeof(args)/sizeof(args[0]); i++) V_VT(&args[i]) = VT_I4; @@ -516,7 +535,7 @@ static void test_Invoke(void) hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_RENDER, &GUID_NULL, 0, DISPATCH_METHOD, &dispparams, &varresult, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); - ReleaseDC(NULL, hdc); + delete_render_dc(hdc); IPictureDisp_Release(picdisp); } @@ -700,7 +719,7 @@ static void test_Render(void) OLE_XSIZE_HIMETRIC pWidth; OLE_YSIZE_HIMETRIC pHeight; COLORREF result, expected; - HDC hdc = GetDC(0); + HDC hdc = create_render_dc(); /* test IPicture::Render return code on uninitialized picture */ OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); @@ -732,7 +751,7 @@ static void test_Render(void) desc.u.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); if(!desc.u.icon.hicon){ win_skip("LoadIcon failed. Skipping...\n"); - ReleaseDC(NULL, hdc); + delete_render_dc(hdc); return; } @@ -765,11 +784,7 @@ static void test_Render(void) hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, 0, pWidth, -pHeight, NULL); ole_expect(hres, S_OK); - if(hres != S_OK) { - IPicture_Release(pic); - ReleaseDC(NULL, hdc); - return; - } + if(hres != S_OK) goto done; /* Evaluate the rendered Icon */ result = GetPixel(hdc, 0, 0); @@ -784,8 +799,9 @@ static void test_Render(void) ok(result == expected, "Color at 10,10 should be unchanged 0x%06X, but was 0x%06X\n", expected, result); +done: IPicture_Release(pic); - ReleaseDC(NULL, hdc); + delete_render_dc(hdc); } static void test_get_Attributes(void)

1 0

Huw Davies : oleaut32/tests: Remove test for broken NT 4.0 behaviour.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 94070761a9a7f6dbc1c0337cf7001b4b8e9db02e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94070761a9a7f6dbc1c0337cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 26 11:11:05 2016 +0100 oleaut32/tests: Remove test for broken NT 4.0 behaviour. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index f00730a..b716f25 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -791,9 +791,7 @@ static void test_Render(void) ok(result == expected, "Color at 0,0 should be unchanged 0x%06X, but was 0x%06X\n", expected, result); result = GetPixel(hdc, 5, 5); - ok(result != expected || - broken(result == expected), /* WinNT 4.0 and older may claim they drew */ - /* the icon, even if they didn't. */ + ok(result != expected, "Color at 5,5 should have changed, but still was 0x%06X\n", expected); result = GetPixel(hdc, 10, 10); ok(result == expected,

1 0

Henri Verbeet : wined3d: Send resource preloads through the command stream.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: b2666a6316c68abc183eb7a351c6caaab797f608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2666a6316c68abc183eb7a35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 26 13:51:18 2016 +0200 wined3d: Send resource preloads through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 30 ++++++++++++++++++++++++++++++ dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c9d728c..05487e4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -55,6 +55,7 @@ enum wined3d_cs_op WINED3D_CS_OP_RESET_STATE, WINED3D_CS_OP_DESTROY_OBJECT, WINED3D_CS_OP_QUERY_ISSUE, + WINED3D_CS_OP_PRELOAD_RESOURCE, WINED3D_CS_OP_UNLOAD_RESOURCE, }; @@ -276,6 +277,12 @@ struct wined3d_cs_query_issue DWORD flags; }; +struct wined3d_cs_preload_resource +{ + enum wined3d_cs_op opcode; + struct wined3d_resource *resource; +}; + struct wined3d_cs_unload_resource { enum wined3d_cs_op opcode; @@ -1250,6 +1257,28 @@ void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *qu cs->ops->submit(cs); } +static void wined3d_cs_exec_preload_resource(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_preload_resource *op = data; + struct wined3d_resource *resource = op->resource; + + resource->resource_ops->resource_preload(resource); + wined3d_resource_release(resource); +} + +void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) +{ + struct wined3d_cs_preload_resource *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_PRELOAD_RESOURCE; + op->resource = resource; + + wined3d_resource_acquire(resource); + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_unload_resource(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_unload_resource *op = data; @@ -1303,6 +1332,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, /* WINED3D_CS_OP_DESTROY_OBJECT */ wined3d_cs_exec_destroy_object, /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, + /* WINED3D_CS_OP_PRELOAD_RESOURCE */ wined3d_cs_exec_preload_resource, /* WINED3D_CS_OP_UNLOAD_RESOURCE */ wined3d_cs_exec_unload_resource, }; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index f0695ef..70474c6 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -329,7 +329,7 @@ HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned void CDECL wined3d_resource_preload(struct wined3d_resource *resource) { - resource->resource_ops->resource_preload(resource); + wined3d_cs_emit_preload_resource(resource->device->cs, resource); } BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fc8c397..e329962 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3048,6 +3048,7 @@ void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; +void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use wined3d_format_calculate_pitch() in wined3d_surface_upload_data().
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 09b09b307a0c909bbc185dcb9348603d84a3b479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b09b307a0c909bbc185dcb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 26 13:51:19 2016 +0200 wined3d: Use wined3d_format_calculate_pitch() in wined3d_surface_upload_data(). Mostly because wined3d_format_calculate_size() will need to handle WINED3DFMT_FLAG_BROKEN_PITCH, but it also makes more sense conceptually. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index efdea87..522874b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -973,8 +973,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { - UINT row_length = wined3d_format_calculate_size(format, 1, update_w, 1, 1); - UINT row_count = (update_h + format->block_height - 1) / format->block_height; + unsigned int dst_row_pitch, dst_slice_pitch; const BYTE *addr = data->addr; GLenum internal; @@ -989,28 +988,31 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w else internal = format->glInternal; + wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); + TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, image_size %#x, addr %p.\n", surface->texture_target, surface->texture_level, surface->texture_layer, - dst_point->x, dst_point->y, update_w, update_h, internal, row_count * row_length, addr); + dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr); - if (row_length == src_pitch) + if (dst_row_pitch == src_pitch) { if (surface->texture_target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, surface->texture_layer, update_w, update_h, 1, - internal, row_count * row_length, addr)); + internal, dst_slice_pitch, addr)); } else { GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, - internal, row_count * row_length, addr)); + internal, dst_slice_pitch, addr)); } } else { + UINT row_count = (update_h + format->block_height - 1) / format->block_height; UINT row, y; /* glCompressedTexSubImage2D() ignores pixel store state, so we @@ -1021,12 +1023,12 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w { GL_EXTCALL(glCompressedTexSubImage3D(surface->texture_target, surface->texture_level, dst_point->x, y, surface->texture_layer, update_w, format->block_height, 1, - internal, row_length, addr)); + internal, dst_row_pitch, addr)); } else { GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, - dst_point->x, y, update_w, format->block_height, internal, row_length, addr)); + dst_point->x, y, update_w, format->block_height, internal, dst_row_pitch, addr)); } y += format->block_height;

1 0

Patrick Rudolph : wined3d: Handle WINED3DFMT_FLAG_BROKEN_PITCH in wined3d_format_calculate_size().
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 3f7e5d647e40ce09292e7164eb5cc49ac77914cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7e5d647e40ce09292e7164e… Author: Patrick Rudolph <siro(a)das-labor.org> Date: Fri Aug 26 13:51:20 2016 +0200 wined3d: Handle WINED3DFMT_FLAG_BROKEN_PITCH in wined3d_format_calculate_size(). The broken pitch calculation also affects the resource memory layout, as evidenced by the mip-tree layout tests. Found using apitrace, which crashes on Wine when playing back traces containing ATI1 textures. Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 8 +++++--- dlls/d3d9/tests/device.c | 8 +++++--- dlls/wined3d/utils.c | 3 +++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 530ef00..95567ca 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7924,9 +7924,11 @@ static void test_miptree_layout(void) } formats[] = { - {D3DFMT_A8R8G8B8, "D3DFMT_A8R8G8B8"}, - {D3DFMT_A8, "D3DFMT_A8"}, - {D3DFMT_L8, "D3DFMT_L8"}, + {D3DFMT_A8R8G8B8, "D3DFMT_A8R8G8B8"}, + {D3DFMT_A8, "D3DFMT_A8"}, + {D3DFMT_L8, "D3DFMT_L8"}, + {MAKEFOURCC('A','T','I','1'), "D3DFMT_ATI1"}, + {MAKEFOURCC('A','T','I','2'), "D3DFMT_ATI2"}, }; static const struct { diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fbafa14..9f1d39b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11046,9 +11046,11 @@ static void test_miptree_layout(void) } formats[] = { - {D3DFMT_A8R8G8B8, "D3DFMT_A8R8G8B8"}, - {D3DFMT_A8, "D3DFMT_A8"}, - {D3DFMT_L8, "D3DFMT_L8"}, + {D3DFMT_A8R8G8B8, "D3DFMT_A8R8G8B8"}, + {D3DFMT_A8, "D3DFMT_A8"}, + {D3DFMT_L8, "D3DFMT_L8"}, + {MAKEFOURCC('A','T','I','1'), "D3DFMT_ATI1"}, + {MAKEFOURCC('A','T','I','2'), "D3DFMT_ATI2"}, }; static const struct { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8989833..ee3af83 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3577,6 +3577,9 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali if (format->id == WINED3DFMT_UNKNOWN) return 0; + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_BROKEN_PITCH) + return width * height * depth * format->byte_count; + wined3d_format_calculate_pitch(format, alignment, width, height, &row_pitch, &slice_pitch); return slice_pitch * depth;

1 0

Henri Verbeet : ddraw: Rename "wineD3DPalette" to "wined3d_palette".
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: db42c500e2ced9e90ec28efe8cd4c9f71f7661b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db42c500e2ced9e90ec28efe8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 26 13:51:21 2016 +0200 ddraw: Rename "wineD3DPalette" to "wined3d_palette". For consistency with other D3D libraries. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/palette.c | 24 ++++++++++++------------ dlls/ddraw/surface.c | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 667dcd0..f7b8cd0 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -396,7 +396,7 @@ struct ddraw_palette IDirectDrawPalette IDirectDrawPalette_iface; LONG ref; - struct wined3d_palette *wineD3DPalette; + struct wined3d_palette *wined3d_palette; struct ddraw *ddraw; IUnknown *ifaceToRelease; DWORD flags; diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index e62f737..3424723 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -85,22 +85,22 @@ static ULONG WINAPI ddraw_palette_AddRef(IDirectDrawPalette *iface) *****************************************************************************/ static ULONG WINAPI ddraw_palette_Release(IDirectDrawPalette *iface) { - struct ddraw_palette *This = impl_from_IDirectDrawPalette(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_palette *palette = impl_from_IDirectDrawPalette(iface); + ULONG ref = InterlockedDecrement(&palette->ref); - TRACE("%p decreasing refcount to %u.\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", palette, ref); if (ref == 0) { wined3d_mutex_lock(); - wined3d_palette_decref(This->wineD3DPalette); - if ((This->flags & DDPCAPS_PRIMARYSURFACE) && This->ddraw->primary) - This->ddraw->primary->palette = NULL; - if (This->ifaceToRelease) - IUnknown_Release(This->ifaceToRelease); + wined3d_palette_decref(palette->wined3d_palette); + if ((palette->flags & DDPCAPS_PRIMARYSURFACE) && palette->ddraw->primary) + palette->ddraw->primary->palette = NULL; + if (palette->ifaceToRelease) + IUnknown_Release(palette->ifaceToRelease); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, This); + HeapFree(GetProcessHeap(), 0, palette); } return ref; @@ -174,7 +174,7 @@ static HRESULT WINAPI ddraw_palette_SetEntries(IDirectDrawPalette *iface, return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - hr = wined3d_palette_set_entries(palette->wineD3DPalette, flags, start, count, entries); + hr = wined3d_palette_set_entries(palette->wined3d_palette, flags, start, count, entries); if (SUCCEEDED(hr) && palette->flags & DDPCAPS_PRIMARYSURFACE) ddraw_surface_update_frontbuffer(palette->ddraw->primary, NULL, FALSE); @@ -214,7 +214,7 @@ static HRESULT WINAPI ddraw_palette_GetEntries(IDirectDrawPalette *iface, return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - hr = wined3d_palette_get_entries(palette->wineD3DPalette, flags, start, count, entries); + hr = wined3d_palette_get_entries(palette->wined3d_palette, flags, start, count, entries); wined3d_mutex_unlock(); return hr; @@ -282,7 +282,7 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette, palette->flags = flags; if (FAILED(hr = wined3d_palette_create(ddraw->wined3d_device, - wined3d_flags, entry_count, entries, &palette->wineD3DPalette))) + wined3d_flags, entry_count, entries, &palette->wined3d_palette))) { WARN("Failed to create wined3d palette, hr %#x.\n", hr); return hr; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index db03303..2989988 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -79,7 +79,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE return hr; } if (surface->palette) - wined3d_palette_apply_to_dc(surface->palette->wineD3DPalette, surface_dc); + wined3d_palette_apply_to_dc(surface->palette->wined3d_palette, surface_dc); if (!(screen_dc = GetDC(NULL))) { @@ -472,7 +472,7 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD if (palette_impl) palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; wined3d_swapchain_set_palette(surface->ddraw->wined3d_swapchain, - palette_impl ? palette_impl->wineD3DPalette : NULL); + palette_impl ? palette_impl->wined3d_palette : NULL); ddraw_surface_update_frontbuffer(surface, NULL, FALSE); } if (palette_impl) @@ -2162,7 +2162,7 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *dc) palette = NULL; if (palette) - wined3d_palette_apply_to_dc(palette->wineD3DPalette, *dc); + wined3d_palette_apply_to_dc(palette->wined3d_palette, *dc); } }

1 0