wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Jacek Caban : server: Set file user pointer in get_next_device_request handler.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: 31f6f0eec2a23f9e6efe656d4d4037ab42800d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f6f0eec2a23f9e6efe656d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 25 14:54:47 2019 +0200 server: Set file user pointer in get_next_device_request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/server/device.c b/server/device.c index c798694..0bb2757 100644 --- a/server/device.c +++ b/server/device.c @@ -503,7 +503,6 @@ static int device_file_close_handle( struct object *obj, struct process *process memset( &params, 0, sizeof(params) ); params.close.major = IRP_MJ_CLOSE; - params.close.file = file->user_ptr; if ((irp = create_irp( file, &params, NULL ))) { @@ -529,26 +528,27 @@ static void device_file_destroy( struct object *obj ) release_object( file->device ); } -static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) +static void fill_irp_params( struct irp_call *irp, irp_params_t *params ) { - struct irp_call *irp; - - if (file->user_ptr == ptr) return; /* nothing to do */ - - file->user_ptr = ptr; + *params = irp->params; - /* update already queued irps */ - - LIST_FOR_EACH_ENTRY( irp, &file->requests, struct irp_call, dev_entry ) + switch (params->major) { - switch (irp->params.major) - { - case IRP_MJ_CLOSE: irp->params.close.file = ptr; break; - case IRP_MJ_READ: irp->params.read.file = ptr; break; - case IRP_MJ_WRITE: irp->params.write.file = ptr; break; - case IRP_MJ_FLUSH_BUFFERS: irp->params.flush.file = ptr; break; - case IRP_MJ_DEVICE_CONTROL: irp->params.ioctl.file = ptr; break; - } + case IRP_MJ_CLOSE: + params->close.file = irp->file->user_ptr; + break; + case IRP_MJ_READ: + params->read.file = irp->file->user_ptr; + break; + case IRP_MJ_WRITE: + params->write.file = irp->file->user_ptr; + break; + case IRP_MJ_FLUSH_BUFFERS: + params->flush.file = irp->file->user_ptr; + break; + case IRP_MJ_DEVICE_CONTROL: + params->ioctl.file = irp->file->user_ptr; + break; } } @@ -580,7 +580,6 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos params.read.major = IRP_MJ_READ; params.read.key = 0; params.read.pos = pos; - params.read.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -593,7 +592,6 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos params.write.major = IRP_MJ_WRITE; params.write.key = 0; params.write.pos = pos; - params.write.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -604,7 +602,6 @@ static int device_file_flush( struct fd *fd, struct async *async ) memset( &params, 0, sizeof(params) ); params.flush.major = IRP_MJ_FLUSH_BUFFERS; - params.flush.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -616,7 +613,6 @@ static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *as memset( &params, 0, sizeof(params) ); params.ioctl.major = IRP_MJ_DEVICE_CONTROL; params.ioctl.code = code; - params.ioctl.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -752,7 +748,6 @@ void free_kernel_objects( struct object *obj ) /* abuse IRP_MJ_CLEANUP to request client to free no longer valid kernel object */ memset( &params, 0, sizeof(params) ); params.cleanup.major = IRP_MJ_CLEANUP; - params.cleanup.obj = kernel_object->user_ptr; if ((irp = create_irp( NULL, &params, NULL ))) { @@ -869,13 +864,13 @@ DECL_HANDLER(get_next_device_request) reply->client_thread = get_kernel_object_ptr( manager, &irp->thread->obj ); reply->client_tid = get_thread_id( irp->thread ); } - reply->params = irp->params; iosb = irp->iosb; reply->in_size = iosb->in_size; reply->out_size = iosb->out_size; if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); else if (!irp->file || (reply->next = alloc_handle( current->process, irp, 0, 0 ))) { + fill_irp_params( irp, &reply->params ); set_reply_data_ptr( iosb->in_data, iosb->in_size ); iosb->in_data = NULL; iosb->in_size = 0; @@ -897,7 +892,7 @@ DECL_HANDLER(set_irp_result) if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { - if (irp->file) set_file_user_ptr( irp->file, req->file_ptr ); + if (irp->file) irp->file->user_ptr = req->file_ptr; set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp );

1 0

Akihiro Sagawa : user32: Make the second parameter of get_font_margins const.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: e78d7b08fe4bffe1b70c92bd0c076d4cec92cb72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e78d7b08fe4bffe1b70c92bd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 25 20:24:51 2019 +0900 user32: Make the second parameter of get_font_margins const. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 24af8ef..3c5331f 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3812,7 +3812,7 @@ static void EDIT_WM_SetFocus(EDITSTATE *es) EDIT_NOTIFY_PARENT(es, EN_SETFOCUS); } -static DWORD get_font_margins(HDC hdc, TEXTMETRICW *tm, BOOL unicode) +static DWORD get_font_margins(HDC hdc, const TEXTMETRICW *tm, BOOL unicode) { ABC abc[256]; SHORT left, right;

1 0

Akihiro Sagawa : comctl32/edit: Implement WM_SETFONT margins in the CJK case.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: 7f5f590d271862ac5cf2036245e5987c840a478c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f5f590d271862ac5cf20362… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 25 20:24:49 2019 +0900 comctl32/edit: Implement WM_SETFONT margins in the CJK case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 30 ++++++++++++++++++++++++++++-- dlls/comctl32/tests/edit.c | 2 -- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index fc3742d..54a5d2b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3708,6 +3708,29 @@ static void EDIT_WM_SetFocus(HTHEME theme, EDITSTATE *es) } +static DWORD get_font_margins(HDC hdc, const TEXTMETRICW *tm) +{ + ABC abc[256]; + SHORT left, right; + UINT i; + + if (!(tm->tmPitchAndFamily & (TMPF_VECTOR | TMPF_TRUETYPE))) + return MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO); + + if (!is_cjk(hdc)) + return MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO); + + if (!GetCharABCWidthsW(hdc, 0, 255, abc)) + return 0; + + left = right = 0; + for (i = 0; i < ARRAY_SIZE(abc); i++) { + if (-abc[i].abcA > right) right = -abc[i].abcA; + if (-abc[i].abcC > left ) left = -abc[i].abcC; + } + return MAKELONG(left, right); +} + /********************************************************************* * * WM_SETFONT @@ -3723,6 +3746,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) HDC dc; HFONT old_font = 0; RECT clientRect; + DWORD margins; es->font = font; EDIT_InvalidateUniscribeData(es); @@ -3732,6 +3756,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) GetTextMetricsW(dc, &tm); es->line_height = tm.tmHeight; es->char_width = tm.tmAveCharWidth; + margins = get_font_margins(dc, &tm); if (font) SelectObject(dc, old_font); ReleaseDC(es->hwndSelf, dc); @@ -3739,8 +3764,9 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) /* Reset the format rect and the margins */ GetClientRect(es->hwndSelf, &clientRect); EDIT_SetRectNP(es, &clientRect); - EDIT_EM_SetMargins(es, EC_LEFTMARGIN | EC_RIGHTMARGIN, - EC_USEFONTINFO, EC_USEFONTINFO, FALSE); + if (margins) + EDIT_EM_SetMargins(es, EC_LEFTMARGIN | EC_RIGHTMARGIN, + LOWORD(margins), HIWORD(margins), FALSE); if (es->style & ES_MULTILINE) EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index c7ca000..f454434 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1703,7 +1703,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk) ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); @@ -1722,7 +1721,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk) ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO));

1 0

Akihiro Sagawa : comctl32/tests: Use calculated WM_SETFONT margins in the CJK case.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: 640c92b807ef7aa3d7d72d12dddc5b33be2f4f89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=640c92b807ef7aa3d7d72d12… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 25 20:24:47 2019 +0900 comctl32/tests: Use calculated WM_SETFONT margins in the CJK case. In comctl32, ANSI version control also uses GetCharABCWidthsW(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index fa273a4..c7ca000 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1613,6 +1613,23 @@ static INT get_cjk_fontinfo_margin(INT width, INT side_bearing) return margin; } +static DWORD get_cjk_font_margins(HDC hdc) +{ + ABC abc[256]; + SHORT left, right; + UINT i; + + if (!GetCharABCWidthsW(hdc, 0, 255, abc)) + return 0; + + left = right = 0; + for (i = 0; i < ARRAY_SIZE(abc); i++) { + if (-abc[i].abcA > right) right = -abc[i].abcA; + if (-abc[i].abcC > left) left = -abc[i].abcC; + } + return MAKELONG(left, right); +} + static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; @@ -1623,7 +1640,7 @@ static void test_margins_default(const char* facename, UINT charset) LOGFONTA lf; HFONT hfont; RECT rect; - INT margins, expect; + INT margins, expect, font_expect; const UINT small_margins = MAKELONG(1, 5); const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; struct char_width_info { @@ -1669,9 +1686,14 @@ static void test_margins_default(const char* facename, UINT charset) left = get_cjk_fontinfo_margin(size.cx, info.lsb); right = get_cjk_fontinfo_margin(size.cx, info.rsb); expect = MAKELONG(left, right); + + font_expect = get_cjk_font_margins(hdc); + if (!font_expect) + /* In this case, margins aren't updated */ + font_expect = small_margins; } else - expect = MAKELONG(size.cx / 2, size.cx / 2); + font_expect = expect = MAKELONG(size.cx / 2, size.cx / 2); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); @@ -1681,8 +1703,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); + todo_wine_if(cjk) + ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); @@ -1700,8 +1722,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); + todo_wine_if(cjk) + ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);

1 0

Nikolay Sivov : kernel32/tests: Add a test for critical section DebugInfo initial value.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: bf174815ba8529bfbbda8697503d3c2539f82359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf174815ba8529bfbbda8697… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 25 12:31:55 2019 +0300 kernel32/tests: Add a test for critical section DebugInfo initial value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index f7be51e..8dea3b3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2636,6 +2636,26 @@ static void test_apc_deadlock(void) CloseHandle(pi.hProcess); } +static void test_crit_section(void) +{ + CRITICAL_SECTION cs; + BOOL ret; + + /* Win8+ does not initialize debug info, one has to use RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO + to override that. */ + memset(&cs, 0, sizeof(cs)); + InitializeCriticalSection(&cs); + ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + + memset(&cs, 0, sizeof(cs)); + ret = InitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); + ok(ret, "Failed to initialize critical section.\n"); +todo_wine + ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); +} + START_TEST(sync) { char **argv; @@ -2694,4 +2714,5 @@ START_TEST(sync) test_srwlock_example(); test_alertable_wait(); test_apc_deadlock(); + test_crit_section(); }

1 0

Francois Gouget : d3d11/tests: Limit the flood of failures in test_depth_bias().
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: 4385a3ecb6b6cbfa137b77bd5bb57c5d3ee1abe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4385a3ecb6b6cbfa137b77bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 25 09:53:36 2019 +0200 d3d11/tests: Limit the flood of failures in test_depth_bias(). Only report the first failed row for each bias clamp test. Signed-off-by: Francois Gouget <fgouget(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 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3d6cbf5..2850d59 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25681,6 +25681,7 @@ static void test_depth_bias(void) for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { + BOOL all_match = TRUE; rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); @@ -25691,21 +25692,23 @@ static void test_depth_bias(void) m = quad_slopes[i] / texture_desc.Height; bias = clamp_depth_bias(rasterizer_desc.SlopeScaledDepthBias * m, rasterizer_desc.DepthBiasClamp); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + for (y = 0; y < texture_desc.Height && all_match; ++y) { depth = min(max(0.0f, depth_values[y] + bias), 1.0f); switch (format) { case DXGI_FORMAT_D32_FLOAT: data = get_readback_float(&rb, 0, y); - ok(compare_float(data, depth, 64), + all_match = compare_float(data, depth, 64); + ok(all_match, "Got depth %.8e, expected %.8e.\n", data, depth); break; case DXGI_FORMAT_D24_UNORM_S8_UINT: u32 = get_readback_data(&rb, 0, y, 0, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - ok(abs(u32_value - expected_value) <= 3, + all_match = abs(u32_value - expected_value) <= 3; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, expected_value, expected_value / 16777215.0f); @@ -25713,7 +25716,8 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, 0, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - ok(abs(*u16 - expected_value) <= 1, + all_match = abs(*u16 - expected_value) <= 1; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); break;

1 0

Francois Gouget : d3d10core/tests: Limit the flood of failures in test_depth_bias().
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: d9150a66b36192b1fe301dfd577a26d83e5c5b7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9150a66b36192b1fe301dfd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 25 09:53:36 2019 +0200 d3d10core/tests: Limit the flood of failures in test_depth_bias(). Only report the first failed row for each bias clamp test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index f799922..b0ff09d 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -15765,6 +15765,7 @@ static void test_depth_bias(void) for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { + BOOL all_match = TRUE; rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); @@ -15775,21 +15776,23 @@ static void test_depth_bias(void) m = quad_slopes[i] / texture_desc.Height; bias = clamp_depth_bias(rasterizer_desc.SlopeScaledDepthBias * m, rasterizer_desc.DepthBiasClamp); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + for (y = 0; y < texture_desc.Height && all_match; ++y) { depth = min(max(0.0f, depth_values[y] + bias), 1.0f); switch (format) { case DXGI_FORMAT_D32_FLOAT: data = get_readback_float(&rb, 0, y); - ok(compare_float(data, depth, 64), + all_match = compare_float(data, depth, 64); + ok(all_match, "Got depth %.8e, expected %.8e.\n", data, depth); break; case DXGI_FORMAT_D24_UNORM_S8_UINT: u32 = get_readback_data(&rb, 0, y, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - ok(abs(u32_value - expected_value) <= 3, + all_match = abs(u32_value - expected_value) <= 3; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, expected_value, expected_value / 16777215.0f); @@ -15797,7 +15800,8 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - ok(abs(*u16 - expected_value) <= 1, + all_match = abs(*u16 - expected_value) <= 1; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); break;

1 0

Alexandre Julliard : msvcrt: Don't export the __p__* functions on 64-bit.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: wine Branch: master Commit: 52bff1fdfe3e041313654765a3b08891de6e9f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52bff1fdfe3e041313654765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:49:01 2019 +0200 msvcrt: Don't export the __p__* functions on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.spec | 56 ++++++++++++++++++++++----------------------- dlls/msvcrt20/msvcrt20.spec | 48 +++++++++++++++++++------------------- dlls/msvcrt40/msvcrt40.spec | 50 ++++++++++++++++++++-------------------- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5be4b4c..7958a7a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -245,35 +245,35 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv -@ cdecl __p___initenv() -@ cdecl __p___mb_cur_max() -@ cdecl __p___wargv() MSVCRT___p___wargv -@ cdecl __p___winitenv() -@ cdecl __p__acmdln() MSVCRT___p__acmdln -@ cdecl __p__amblksiz() -@ cdecl __p__commode() -@ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() MSVCRT___p__dstbias -@ cdecl __p__environ() MSVCRT___p__environ -@ stub __p__fileinfo() -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl -arch=win32 __p___argc() MSVCRT___p___argc +@ cdecl -arch=win32 __p___argv() MSVCRT___p___argv +@ cdecl -arch=win32 __p___initenv() +@ cdecl -arch=win32 __p___mb_cur_max() +@ cdecl -arch=win32 __p___wargv() MSVCRT___p___wargv +@ cdecl -arch=win32 __p___winitenv() +@ cdecl -arch=win32 __p__acmdln() MSVCRT___p__acmdln +@ cdecl -arch=win32 __p__amblksiz() +@ cdecl -arch=win32 __p__commode() +@ cdecl -arch=win32 __p__daylight() MSVCRT___p__daylight +@ cdecl -arch=win32 __p__dstbias() MSVCRT___p__dstbias +@ cdecl -arch=win32 __p__environ() MSVCRT___p__environ +@ stub -arch=win32 __p__fileinfo() +@ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode @ cdecl __p__iob() -@ stub __p__mbcasemap() -@ cdecl __p__mbctype() -@ cdecl __p__osver() -@ cdecl __p__pctype() MSVCRT___p__pctype -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr -@ stub __p__pwctype() -@ cdecl __p__timezone() MSVCRT___p__timezone -@ cdecl __p__tzname() -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron -@ cdecl __p__winmajor() -@ cdecl __p__winminor() -@ cdecl __p__winver() -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ stub -arch=win32 __p__mbcasemap() +@ cdecl -arch=win32 __p__mbctype() +@ cdecl -arch=win32 __p__osver() +@ cdecl -arch=win32 __p__pctype() MSVCRT___p__pctype +@ cdecl -arch=win32 __p__pgmptr() MSVCRT___p__pgmptr +@ stub -arch=win32 __p__pwctype() +@ cdecl -arch=win32 __p__timezone() MSVCRT___p__timezone +@ cdecl -arch=win32 __p__tzname() +@ cdecl -arch=win32 __p__wcmdln() MSVCRT___p__wcmdln +@ cdecl -arch=win32 __p__wenviron() MSVCRT___p__wenviron +@ cdecl -arch=win32 __p__winmajor() +@ cdecl -arch=win32 __p__winminor() +@ cdecl -arch=win32 __p__winver() +@ cdecl -arch=win32 __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func @ extern __pioinfo MSVCRT___pioinfo # stub __pwctype_func() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 84a1014..f9d36a9 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -808,32 +808,32 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ cdecl __lconv_init() msvcrt.__lconv_init @ extern __mb_cur_max msvcrt.__mb_cur_max -@ cdecl __p___argc() msvcrt.__p___argc -@ cdecl __p___argv() msvcrt.__p___argv -@ cdecl __p___initenv() msvcrt.__p___initenv -@ cdecl __p___mb_cur_max() msvcrt.__p___mb_cur_max -@ cdecl __p___wargv() msvcrt.__p___wargv -@ cdecl __p___winitenv() msvcrt.__p___winitenv -@ cdecl __p__acmdln() msvcrt.__p__acmdln -@ cdecl __p__amblksiz() msvcrt.__p__amblksiz -@ cdecl __p__commode() msvcrt.__p__commode -@ cdecl __p__daylight() msvcrt.__p__daylight -@ cdecl __p__environ() msvcrt.__p__environ -@ cdecl __p__fmode() msvcrt.__p__fmode +@ cdecl -arch=win32 __p___argc() msvcrt.__p___argc +@ cdecl -arch=win32 __p___argv() msvcrt.__p___argv +@ cdecl -arch=win32 __p___initenv() msvcrt.__p___initenv +@ cdecl -arch=win32 __p___mb_cur_max() msvcrt.__p___mb_cur_max +@ cdecl -arch=win32 __p___wargv() msvcrt.__p___wargv +@ cdecl -arch=win32 __p___winitenv() msvcrt.__p___winitenv +@ cdecl -arch=win32 __p__acmdln() msvcrt.__p__acmdln +@ cdecl -arch=win32 __p__amblksiz() msvcrt.__p__amblksiz +@ cdecl -arch=win32 __p__commode() msvcrt.__p__commode +@ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight +@ cdecl -arch=win32 __p__environ() msvcrt.__p__environ +@ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode @ cdecl __p__iob() msvcrt.__p__iob -@ cdecl __p__mbctype() msvcrt.__p__mbctype -@ cdecl __p__osver() msvcrt.__p__osver -@ cdecl __p__pctype() msvcrt.__p__pctype -@ cdecl __p__pgmptr() msvcrt.__p__pgmptr +@ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype +@ cdecl -arch=win32 __p__osver() msvcrt.__p__osver +@ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype +@ cdecl -arch=win32 __p__pgmptr() msvcrt.__p__pgmptr @ cdecl __p__pwctype() msvcrt.__p__pwctype -@ cdecl __p__timezone() msvcrt.__p__timezone -@ cdecl __p__tzname() msvcrt.__p__tzname -@ cdecl __p__wcmdln() msvcrt.__p__wcmdln -@ cdecl __p__wenviron() msvcrt.__p__wenviron -@ cdecl __p__winmajor() msvcrt.__p__winmajor -@ cdecl __p__winminor() msvcrt.__p__winminor -@ cdecl __p__winver() msvcrt.__p__winver -@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr +@ cdecl -arch=win32 __p__timezone() msvcrt.__p__timezone +@ cdecl -arch=win32 __p__tzname() msvcrt.__p__tzname +@ cdecl -arch=win32 __p__wcmdln() msvcrt.__p__wcmdln +@ cdecl -arch=win32 __p__wenviron() msvcrt.__p__wenviron +@ cdecl -arch=win32 __p__winmajor() msvcrt.__p__winmajor +@ cdecl -arch=win32 __p__winminor() msvcrt.__p__winminor +@ cdecl -arch=win32 __p__winver() msvcrt.__p__winver +@ cdecl -arch=win32 __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ cdecl __threadhandle() msvcrt.__threadhandle @ cdecl __threadid() msvcrt.__threadid diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index e4ef8d7..f0269e7 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -886,33 +886,33 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ cdecl __lconv_init() msvcrt.__lconv_init @ extern __mb_cur_max msvcrt.__mb_cur_max -@ cdecl __p___argc() msvcrt.__p___argc -@ cdecl __p___argv() msvcrt.__p___argv -@ cdecl __p___initenv() msvcrt.__p___initenv -@ cdecl __p___mb_cur_max() msvcrt.__p___mb_cur_max -@ cdecl __p___wargv() msvcrt.__p___wargv -@ cdecl __p___winitenv() msvcrt.__p___winitenv -@ cdecl __p__acmdln() msvcrt.__p__acmdln -@ cdecl __p__amblksiz() msvcrt.__p__amblksiz -@ cdecl __p__commode() msvcrt.__p__commode -@ cdecl __p__daylight() msvcrt.__p__daylight -@ cdecl __p__dstbias() msvcrt.__p__dstbias -@ cdecl __p__environ() msvcrt.__p__environ -@ cdecl __p__fmode() msvcrt.__p__fmode +@ cdecl -arch=win32 __p___argc() msvcrt.__p___argc +@ cdecl -arch=win32 __p___argv() msvcrt.__p___argv +@ cdecl -arch=win32 __p___initenv() msvcrt.__p___initenv +@ cdecl -arch=win32 __p___mb_cur_max() msvcrt.__p___mb_cur_max +@ cdecl -arch=win32 __p___wargv() msvcrt.__p___wargv +@ cdecl -arch=win32 __p___winitenv() msvcrt.__p___winitenv +@ cdecl -arch=win32 __p__acmdln() msvcrt.__p__acmdln +@ cdecl -arch=win32 __p__amblksiz() msvcrt.__p__amblksiz +@ cdecl -arch=win32 __p__commode() msvcrt.__p__commode +@ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight +@ cdecl -arch=win32 __p__dstbias() msvcrt.__p__dstbias +@ cdecl -arch=win32 __p__environ() msvcrt.__p__environ +@ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode @ cdecl __p__iob() msvcrt.__p__iob -@ cdecl __p__mbctype() msvcrt.__p__mbctype -@ cdecl __p__osver() msvcrt.__p__osver -@ cdecl __p__pctype() msvcrt.__p__pctype -@ cdecl __p__pgmptr() msvcrt.__p__pgmptr +@ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype +@ cdecl -arch=win32 __p__osver() msvcrt.__p__osver +@ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype +@ cdecl -arch=win32 __p__pgmptr() msvcrt.__p__pgmptr @ cdecl __p__pwctype() msvcrt.__p__pwctype -@ cdecl __p__timezone() msvcrt.__p__timezone -@ cdecl __p__tzname() msvcrt.__p__tzname -@ cdecl __p__wcmdln() msvcrt.__p__wcmdln -@ cdecl __p__wenviron() msvcrt.__p__wenviron -@ cdecl __p__winmajor() msvcrt.__p__winmajor -@ cdecl __p__winminor() msvcrt.__p__winminor -@ cdecl __p__winver() msvcrt.__p__winver -@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr +@ cdecl -arch=win32 __p__timezone() msvcrt.__p__timezone +@ cdecl -arch=win32 __p__tzname() msvcrt.__p__tzname +@ cdecl -arch=win32 __p__wcmdln() msvcrt.__p__wcmdln +@ cdecl -arch=win32 __p__wenviron() msvcrt.__p__wenviron +@ cdecl -arch=win32 __p__winmajor() msvcrt.__p__winmajor +@ cdecl -arch=win32 __p__winminor() msvcrt.__p__winminor +@ cdecl -arch=win32 __p__winver() msvcrt.__p__winver +@ cdecl -arch=win32 __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ cdecl __set_app_type(long) msvcrt.__set_app_type @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr

1 0

Józef Kucia : vkd3d-shader: Do not export vkd3d_shader_free_root_signature_v_1_0().
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: vkd3d Branch: master Commit: d5d1ee4031e1edbc7085d1d5604c906d4b5ef38a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d5d1ee4031e1edbc7085d1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:48 2019 +0200 vkd3d-shader: Do not export vkd3d_shader_free_root_signature_v_1_0(). 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> --- include/vkd3d_shader.h | 2 -- libs/vkd3d-shader/vkd3d_shader.map | 1 - libs/vkd3d-shader/vkd3d_shader_main.c | 41 ++++++++++++++++++----------------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 57761af..cfb0263 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -569,7 +569,6 @@ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc *root_signature); -void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature); /* FIXME: Add support for returning error messages (ID3DBlob). */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_versioned_root_signature_desc *root_signature, @@ -602,7 +601,6 @@ typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_versioned_root_signature_desc *root_signature); -typedef void (*PFN_vkd3d_shader_free_root_signature_v_1_0)(struct vkd3d_root_signature_desc *root_signature); typedef int (*PFN_vkd3d_shader_serialize_root_signature)( const struct vkd3d_versioned_root_signature_desc *root_signature, struct vkd3d_shader_code *dxbc); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index c2cfcbd..74c38e1 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -5,7 +5,6 @@ global: vkd3d_shader_convert_root_signature; vkd3d_shader_find_signature_element; vkd3d_shader_free_root_signature; - vkd3d_shader_free_root_signature_v_1_0; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; vkd3d_shader_parse_input_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ef491f7..9848202 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -327,7 +327,7 @@ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) vkd3d_free((void *)shader_code->code); } -void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature) +static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature) { unsigned int i; @@ -344,28 +344,10 @@ void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *ro memset(root_signature, 0, sizeof(*root_signature)); } -void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc *desc) +static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_root_signature_desc1 *root_signature) { - struct vkd3d_root_signature_desc1 *root_signature; unsigned int i; - if (!desc->version) - return; - - if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) - { - vkd3d_shader_free_root_signature_v_1_0(&desc->u.v_1_0); - return; - } - - if (desc->version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) - { - FIXME("Unknown version %#x.\n", desc->version); - return; - } - - root_signature = &desc->u.v_1_1; - for (i = 0; i < root_signature->parameter_count; ++i) { const struct vkd3d_root_parameter1 *parameter = &root_signature->parameters[i]; @@ -379,6 +361,25 @@ void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc memset(root_signature, 0, sizeof(*root_signature)); } +void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc *desc) +{ + if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + vkd3d_shader_free_root_signature_v_1_0(&desc->u.v_1_0); + } + else if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + vkd3d_shader_free_root_signature_v_1_1(&desc->u.v_1_1); + } + else if (desc->version) + { + FIXME("Unknown version %#x.\n", desc->version); + return; + } + + desc->version = 0; +} + int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature) {

1 0

Józef Kucia : vkd3d: Prefer versioned root signature structures.
by Alexandre Julliard 25 Apr '19

25 Apr '19

Module: vkd3d Branch: master Commit: aa2d00929e8df59c456081403133a6fbf7ba32fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aa2d00929e8df59c4560814… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:47 2019 +0200 vkd3d: Prefer versioned root signature structures. 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> --- libs/vkd3d/state.c | 10 +++++----- libs/vkd3d/vkd3d_main.c | 15 ++++++++------- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index df96ae4..980d9ed 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -999,8 +999,8 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const struct vkd3d_shader_code dxbc = {bytecode, bytecode_length}; union { - D3D12_ROOT_SIGNATURE_DESC d3d12; - struct vkd3d_root_signature_desc vkd3d; + D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12; + struct vkd3d_versioned_root_signature_desc vkd3d; } root_signature_desc; struct d3d12_root_signature *object; HRESULT hr; @@ -1014,12 +1014,12 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, if (!(object = vkd3d_malloc(sizeof(*object)))) { - vkd3d_shader_free_root_signature_v_1_0(&root_signature_desc.vkd3d); + vkd3d_shader_free_root_signature(&root_signature_desc.vkd3d); return E_OUTOFMEMORY; } - hr = d3d12_root_signature_init(object, device, &root_signature_desc.d3d12); - vkd3d_shader_free_root_signature_v_1_0(&root_signature_desc.vkd3d); + hr = d3d12_root_signature_init(object, device, &root_signature_desc.d3d12.u.Desc_1_0); + vkd3d_shader_free_root_signature(&root_signature_desc.vkd3d); if (FAILED(hr)) { vkd3d_free(object); diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index e095fdf..7775077 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -87,8 +87,8 @@ struct d3d12_root_signature_deserializer union { - D3D12_ROOT_SIGNATURE_DESC d3d12; - struct vkd3d_root_signature_desc vkd3d; + D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12; + struct vkd3d_versioned_root_signature_desc vkd3d; } desc; }; @@ -140,7 +140,7 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_Release(ID3D12R if (!refcount) { - vkd3d_shader_free_root_signature_v_1_0(&deserializer->desc.vkd3d); + vkd3d_shader_free_root_signature(&deserializer->desc.vkd3d); vkd3d_free(deserializer); } @@ -154,7 +154,8 @@ static const D3D12_ROOT_SIGNATURE_DESC * STDMETHODCALLTYPE d3d12_root_signature_ TRACE("iface %p.\n", iface); - return &deserializer->desc.d3d12; + assert(deserializer->desc.d3d12.Version == D3D_ROOT_SIGNATURE_VERSION_1_0); + return &deserializer->desc.d3d12.u.Desc_1_0; } static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_deserializer_vtbl = @@ -168,7 +169,7 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des }; int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *out_desc) + struct vkd3d_versioned_root_signature_desc *out_desc) { struct vkd3d_versioned_root_signature_desc desc, converted_desc; int ret; @@ -181,7 +182,7 @@ int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, if (desc.version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) { - *out_desc = desc.u.v_1_0; + *out_desc = desc; } else { @@ -195,7 +196,7 @@ int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, return ret; } - *out_desc = converted_desc.u.v_1_0; + *out_desc = converted_desc; } return ret; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c680a04..ba586b4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -620,7 +620,7 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *byt struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN; int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *desc) DECLSPEC_HIDDEN; + struct vkd3d_versioned_root_signature_desc *desc) DECLSPEC_HIDDEN; struct d3d12_graphics_pipeline_state {

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
81
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 April 2019