February 2016 - Wine-Commits

Nikolay Sivov : dwrite: Recognize Type1 .pfb files in Analyze().
by Alexandre Julliard Feb. 5, 2016

Feb. 5, 2016

Module: wine Branch: master Commit: 032e088c7dab624966cd6473481d97d65043e9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=032e088c7dab624966cd64734… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 5 03:09:44 2016 +0300 dwrite: Recognize Type1 .pfb files in Analyze(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a7c0aee..99d24ea 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -785,12 +785,42 @@ static HRESULT opentype_otf_analyzer(IDWriteFontFileStream *stream, UINT32 *font return *file_type != DWRITE_FONT_FILE_TYPE_UNKNOWN ? S_OK : S_FALSE; } +static HRESULT opentype_type1_analyzer(IDWriteFontFileStream *stream, UINT32 *font_count, DWRITE_FONT_FILE_TYPE *file_type, + DWRITE_FONT_FACE_TYPE *face_type) +{ + struct type1_header { + WORD tag; + char data[14]; + }; + const struct type1_header *header; + void *context; + HRESULT hr; + + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&header, 0, sizeof(*header), &context); + if (FAILED(hr)) + return hr; + + /* tag is followed by plain text section */ + if (header->tag == 0x8001 && + (!memcmp(header->data, "%!PS-AdobeFont", 14) || + !memcmp(header->data, "%!FontType", 10))) { + *font_count = 1; + *file_type = DWRITE_FONT_FILE_TYPE_TYPE1_PFB; + *face_type = DWRITE_FONT_FACE_TYPE_TYPE1; + } + + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + + return *file_type != DWRITE_FONT_FILE_TYPE_UNKNOWN ? S_OK : S_FALSE; +} + HRESULT opentype_analyze_font(IDWriteFontFileStream *stream, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) { static dwrite_fontfile_analyzer fontfile_analyzers[] = { opentype_ttf_analyzer, opentype_otf_analyzer, opentype_ttc_analyzer, + opentype_type1_analyzer, NULL }; dwrite_fontfile_analyzer *analyzer = fontfile_analyzers;

1 0

Ken Thomases : winemac: Don' t process QUERY_IME_CHAR_RECT while waiting in OnMainThread().
by Alexandre Julliard Feb. 5, 2016

Feb. 5, 2016

Module: wine Branch: master Commit: 33610da6b4f5d9ad052173f005fdb735dc471445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33610da6b4f5d9ad052173f00… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 4 17:18:27 2016 -0600 winemac: Don't process QUERY_IME_CHAR_RECT while waiting in OnMainThread(). Most queries are handled even by threads which are otherwise blocked in OnMainThread(). There's a problem with QUERY_IME_CHAR_RECT, though, in that it can be handled before a previously-queued IM_SET_TEXT event, in which case its character range may be out of bounds. Some apps (e.g. Excel 2007) hang due to the bad range. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_event.h | 1 + dlls/winemac.drv/cocoa_event.m | 5 ++++- dlls/winemac.drv/cocoa_window.m | 2 +- dlls/winemac.drv/event.c | 6 +++++- dlls/winemac.drv/macdrv_cocoa.h | 1 + 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_event.h b/dlls/winemac.drv/cocoa_event.h index 472c667..4d814a2 100644 --- a/dlls/winemac.drv/cocoa_event.h +++ b/dlls/winemac.drv/cocoa_event.h @@ -24,6 +24,7 @@ enum { WineQueryProcessEvents = 1 << 0, + WineQueryNoPreemptWait = 1 << 1, }; diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 1a360a1..9ce43fb 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -296,11 +296,13 @@ static const OSType WineHotKeySignature = 'Wine'; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout flags:(NSUInteger)flags { + int type; macdrv_event* event; NSDate* timeoutDate = [NSDate dateWithTimeIntervalSinceNow:timeout]; BOOL timedout; - event = macdrv_create_event(QUERY_EVENT, (WineWindow*)query->window); + type = (flags & WineQueryNoPreemptWait) ? QUERY_EVENT_NO_PREEMPT_WAIT : QUERY_EVENT; + event = macdrv_create_event(type, (WineWindow*)query->window); event->query_event.query = macdrv_retain_query(query); query->done = FALSE; @@ -654,6 +656,7 @@ void macdrv_release_event(macdrv_event *event) CFRelease(event->keyboard_changed.input_source); break; case QUERY_EVENT: + case QUERY_EVENT_NO_PREEMPT_WAIT: macdrv_release_query(event->query_event.query); break; case WINDOW_GOT_FOCUS: diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 3e2dae8..3012118 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -649,7 +649,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi query->ime_char_rect.data = [window imeData]; query->ime_char_rect.range = CFRangeMake(aRange.location, aRange.length); - if ([window.queue query:query timeout:1]) + if ([window.queue query:query timeout:0.3 flags:WineQueryNoPreemptWait]) { aRange = NSMakeRange(query->ime_char_rect.range.location, query->ime_char_rect.range.length); ret = NSRectFromCGRect(query->ime_char_rect.rect); diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index be3159b..2b3d6ce 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -45,6 +45,7 @@ static const char *dbgstr_event(int type) "MOUSE_MOVED_ABSOLUTE", "MOUSE_SCROLL", "QUERY_EVENT", + "QUERY_EVENT_NO_PREEMPT_WAIT", "REASSERT_WINDOW_POSITION", "RELEASE_CAPTURE", "SENT_TEXT_INPUT", @@ -117,6 +118,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) if (mask & QS_SENDMESSAGE) { event_mask |= event_mask_for_type(QUERY_EVENT); + event_mask |= event_mask_for_type(QUERY_EVENT_NO_PREEMPT_WAIT); event_mask |= event_mask_for_type(REASSERT_WINDOW_POSITION); event_mask |= event_mask_for_type(RELEASE_CAPTURE); event_mask |= event_mask_for_type(SENT_TEXT_INPUT); @@ -137,7 +139,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) /*********************************************************************** * macdrv_query_event * - * Handler for QUERY_EVENT queries. + * Handler for QUERY_EVENT and QUERY_EVENT_NO_PREEMPT_WAIT queries. */ static void macdrv_query_event(HWND hwnd, const macdrv_event *event) { @@ -239,6 +241,7 @@ void macdrv_handle_event(const macdrv_event *event) macdrv_mouse_scroll(hwnd, event); break; case QUERY_EVENT: + case QUERY_EVENT_NO_PREEMPT_WAIT: macdrv_query_event(hwnd, event); break; case REASSERT_WINDOW_POSITION: @@ -341,6 +344,7 @@ DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handle } if (data->current_event && data->current_event->type != QUERY_EVENT && + data->current_event->type != QUERY_EVENT_NO_PREEMPT_WAIT && data->current_event->type != APP_QUIT_REQUESTED && data->current_event->type != WINDOW_DRAG_BEGIN) event_mask = 0; /* don't process nested events */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 647ef08..5dc84e2 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -199,6 +199,7 @@ enum { MOUSE_MOVED_ABSOLUTE, MOUSE_SCROLL, QUERY_EVENT, + QUERY_EVENT_NO_PREEMPT_WAIT, REASSERT_WINDOW_POSITION, RELEASE_CAPTURE, SENT_TEXT_INPUT,

1 0

Ken Thomases : winemac: Make macdrv_process_text_input() asynchronous and process internal events while awaiting its result.
by Alexandre Julliard Feb. 5, 2016

Feb. 5, 2016

Module: wine Branch: master Commit: 3482c47469c735f05fabbfec4307dc4047bc7219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3482c47469c735f05fabbfec4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 4 17:18:25 2016 -0600 winemac: Make macdrv_process_text_input() asynchronous and process internal events while awaiting its result. It had been using the synchronous OnMainThread() to submit its work to the Cocoa thread, but only queries are processed while OnMainThread() waits for the work to complete. This led to QUERY_IME_CHAR_RECT queries being processed out of order relative to IM_SET_TEXT events, making the character range out of bounds with respect to the composition string. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 16 ++++++++++------ dlls/winemac.drv/event.c | 5 +++++ dlls/winemac.drv/ime.c | 18 +++++++++++++++--- dlls/winemac.drv/keyboard.c | 11 +++-------- dlls/winemac.drv/macdrv.h | 5 +++-- dlls/winemac.drv/macdrv_cocoa.h | 9 +++++++-- 6 files changed, 43 insertions(+), 21 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bcc1cf5..e9c2cc7 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3230,11 +3230,11 @@ uint32_t macdrv_window_background_color(void) /*********************************************************************** * macdrv_send_text_input_event */ -int macdrv_send_text_input_event(int pressed, unsigned int flags, int repeat, int keyc, void* data) +void macdrv_send_text_input_event(int pressed, unsigned int flags, int repeat, int keyc, void* data, int* done) { - __block BOOL ret; - - OnMainThread(^{ + OnMainThreadAsync(^{ + BOOL ret; + macdrv_event* event; WineWindow* window = (WineWindow*)[NSApp keyWindow]; if (![window isKindOfClass:[WineWindow class]]) { @@ -3266,7 +3266,11 @@ int macdrv_send_text_input_event(int pressed, unsigned int flags, int repeat, in } else ret = FALSE; - }); - return ret; + event = macdrv_create_event(SENT_TEXT_INPUT, window); + event->sent_text_input.handled = ret; + event->sent_text_input.done = done; + [[window queue] postEvent:event]; + macdrv_release_event(event); + }); } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 785bc0a..be3159b 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -47,6 +47,7 @@ static const char *dbgstr_event(int type) "QUERY_EVENT", "REASSERT_WINDOW_POSITION", "RELEASE_CAPTURE", + "SENT_TEXT_INPUT", "STATUS_ITEM_MOUSE_BUTTON", "STATUS_ITEM_MOUSE_MOVE", "WINDOW_BROUGHT_FORWARD", @@ -118,6 +119,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(QUERY_EVENT); event_mask |= event_mask_for_type(REASSERT_WINDOW_POSITION); event_mask |= event_mask_for_type(RELEASE_CAPTURE); + event_mask |= event_mask_for_type(SENT_TEXT_INPUT); event_mask |= event_mask_for_type(WINDOW_BROUGHT_FORWARD); event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_DRAG_BEGIN); @@ -245,6 +247,9 @@ void macdrv_handle_event(const macdrv_event *event) case RELEASE_CAPTURE: macdrv_release_capture(hwnd, event); break; + case SENT_TEXT_INPUT: + macdrv_sent_text_input(event); + break; case STATUS_ITEM_MOUSE_BUTTON: macdrv_status_item_mouse_button(event); break; diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 7f98914..295c6cc 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -690,7 +690,7 @@ UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, LPIMEPRIVATE myPrivate; HWND hwndDefault; UINT repeat; - INT rc; + int done = 0; TRACE("uVKey 0x%04x uScanCode 0x%04x fuState %u hIMC %p\n", uVKey, uScanCode, fuState, hIMC); @@ -717,9 +717,12 @@ UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, UnlockRealIMC(hIMC); TRACE("Processing Mac 0x%04x\n", vkey); - rc = macdrv_process_text_input(uVKey, uScanCode, repeat, lpbKeyState, hIMC); + macdrv_process_text_input(uVKey, uScanCode, repeat, lpbKeyState, hIMC, &done); - if (!rc) + while (!done) + MsgWaitForMultipleObjectsEx(0, NULL, INFINITE, QS_POSTMESSAGE | QS_SENDMESSAGE, 0); + + if (done < 0) { UINT msgs = 0; UINT msg = (uScanCode & 0x8000) ? WM_KEYUP : WM_KEYDOWN; @@ -1482,6 +1485,15 @@ void macdrv_im_set_text(const macdrv_event *event) IME_NotifyComplete(himc); } +/*********************************************************************** + * macdrv_sent_text_input + */ +void macdrv_sent_text_input(const macdrv_event *event) +{ + TRACE("handled: %s\n", event->sent_text_input.handled ? "TRUE" : "FALSE"); + *event->sent_text_input.done = event->sent_text_input.handled ? 1 : -1; +} + /************************************************************************** * query_ime_char_rect diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 9c0c3a6..6f38885 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1117,12 +1117,11 @@ void macdrv_hotkey_press(const macdrv_event *event) /*********************************************************************** * macdrv_process_text_input */ -BOOL macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *key_state, void *himc) +void macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *key_state, void *himc, int* done) { struct macdrv_thread_data *thread_data = macdrv_thread_data(); unsigned int flags; int keyc; - BOOL ret = FALSE; TRACE("vkey 0x%04x scan 0x%04x repeat %u himc %p\n", vkey, scan, repeat, himc); @@ -1149,15 +1148,11 @@ BOOL macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *ke if (thread_data->keyc2vkey[keyc] == vkey) break; if (keyc >= sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0])) - goto done; + return; TRACE("flags 0x%08x keyc 0x%04x\n", flags, keyc); - ret = macdrv_send_text_input_event(((scan & 0x8000) == 0), flags, repeat, keyc, himc); - -done: - TRACE(" -> %s\n", ret ? "TRUE" : "FALSE"); - return ret; + macdrv_send_text_input_event(((scan & 0x8000) == 0), flags, repeat, keyc, himc, done); } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 44b79ac..f3b5e65 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -224,10 +224,11 @@ extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HI * Mac IME driver */ -extern BOOL macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *key_state, - void *himc) DECLSPEC_HIDDEN; +extern void macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *key_state, + void *himc, int* done) DECLSPEC_HIDDEN; extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_sent_text_input(const macdrv_event *event) DECLSPEC_HIDDEN; extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN; #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 5d607fc..647ef08 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -201,6 +201,7 @@ enum { QUERY_EVENT, REASSERT_WINDOW_POSITION, RELEASE_CAPTURE, + SENT_TEXT_INPUT, STATUS_ITEM_MOUSE_BUTTON, STATUS_ITEM_MOUSE_MOVE, WINDOW_BROUGHT_FORWARD, @@ -286,6 +287,10 @@ typedef struct macdrv_event { struct macdrv_query *query; } query_event; struct { + int handled; + int *done; + } sent_text_input; + struct { macdrv_status_item item; int button; int down; @@ -438,8 +443,8 @@ extern void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGR extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern uint32_t macdrv_window_background_color(void) DECLSPEC_HIDDEN; -extern int macdrv_send_text_input_event(int pressed, unsigned int flags, int repeat, int keyc, - void* data) DECLSPEC_HIDDEN; +extern void macdrv_send_text_input_event(int pressed, unsigned int flags, int repeat, int keyc, + void* data, int* done) DECLSPEC_HIDDEN; /* keyboard */

1 0

Henri Verbeet : wined3d: Make the "icb" field in struct wined3d_shader_instruction const.
by Alexandre Julliard Feb. 5, 2016

Feb. 5, 2016

Module: wine Branch: master Commit: 48d755f61d4ee5982b729fa0522a5fd3af391888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d755f61d4ee5982b729fa05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 21:56:36 2016 +0100 wined3d: Make the "icb" field in struct wined3d_shader_instruction const. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 2de7fc4..45bd9f0 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -917,9 +917,9 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi return; } + priv->icb.element_count = len; + memcpy(priv->icb.data, p, sizeof(*p) * icb_size); ins->declaration.icb = &priv->icb; - ins->declaration.icb->element_count = len; - memcpy(ins->declaration.icb->data, p, sizeof(*p) * icb_size); } else if (opcode == WINED3D_SM4_OP_DCL_RESOURCE) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8c939f8..ccd0c60 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -819,7 +819,7 @@ struct wined3d_shader_instruction struct wined3d_shader_dst_param dst; struct wined3d_shader_src_param src; UINT count; - struct wined3d_shader_immediate_constant_buffer *icb; + const struct wined3d_shader_immediate_constant_buffer *icb; } declaration; };

1 0

Matteo Bruni : d3d10core/tests: Add a test for CheckMultisampleQualityLevels().
by Alexandre Julliard Feb. 5, 2016

Feb. 5, 2016

Module: wine Branch: master Commit: be669c32fe17e6a89b2863af598d1d91a14f8d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be669c32fe17e6a89b2863af5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 4 20:10:47 2016 +0100 d3d10core/tests: Add a test for CheckMultisampleQualityLevels(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 76 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a0e4d9b..633fc08 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5105,6 +5105,81 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_check_multisample_quality_levels(void) +{ + ID3D10Device *device; + UINT quality_levels; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + if (!quality_levels) + { + skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping test.\n"); + goto done; + } + + quality_levels = 0xdeadbeef; + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_UNKNOWN, 2, &quality_levels); + todo_wine ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); + quality_levels = 0xdeadbeef; + hr = ID3D10Device_CheckMultisampleQualityLevels(device, 65536, 2, &quality_levels); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo_wine ok(quality_levels == 0xdeadbeef, "Got unexpected quality_levels %u.\n", quality_levels); + + quality_levels = 0xdeadbeef; + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &quality_levels); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); + + quality_levels = 0xdeadbeef; + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, &quality_levels); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(quality_levels == 1, "Got unexpected quality_levels %u.\n", quality_levels); + + quality_levels = 0xdeadbeef; + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); + + /* We assume 15 samples multisampling is never supported in practice. */ + quality_levels = 0xdeadbeef; + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 15, &quality_levels); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 32, &quality_levels); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + quality_levels = 0xdeadbeef; + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 33, &quality_levels); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); + quality_levels = 0xdeadbeef; + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 64, &quality_levels); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); + + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_BC3_UNORM, 2, &quality_levels); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); + +done: + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -5134,4 +5209,5 @@ START_TEST(device) test_update_subresource(); test_copy_subresource_region(); test_multisample_init(); + test_check_multisample_quality_levels(); }

1 0

Matteo Bruni : d3d11: Implement d3d10_device_CheckMultisampleQualityLevels ().
by Alexandre Julliard Feb. 5, 2016

Feb. 5, 2016

Module: wine Branch: master Commit: 3d95b4c79d6314352f00ef79c2e0e33f0e05dcdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d95b4c79d6314352f00ef79c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 4 20:10:44 2016 +0100 d3d11: Implement d3d10_device_CheckMultisampleQualityLevels(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 5 ++--- dlls/d3d11/device.c | 7 +++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b08041e..a0e4d9b 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5044,7 +5044,7 @@ static void test_multisample_init(void) } hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); - todo_wine ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); if (!count) { skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); @@ -5074,7 +5074,6 @@ static void test_multisample_init(void) hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &multi); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)backbuffer, 0, (ID3D10Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); @@ -5094,7 +5093,7 @@ static void test_multisample_init(void) break; } release_texture_readback(&rb); - ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + todo_wine ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); ID3D10RenderTargetView_Release(rtview); ID3D10Texture2D_Release(backbuffer); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c4180d6..b3e8775 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4503,10 +4503,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CheckFormatSupport(ID3D10Device1 * static HRESULT STDMETHODCALLTYPE d3d10_device_CheckMultisampleQualityLevels(ID3D10Device1 *iface, DXGI_FORMAT format, UINT sample_count, UINT *quality_level_count) { - FIXME("iface %p, format %s, sample_count %u, quality_level_count %p stub!\n", + struct d3d_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, format %s, sample_count %u, quality_level_count %p.\n", iface, debug_dxgi_format(format), sample_count, quality_level_count); - return E_NOTIMPL; + return d3d11_device_CheckMultisampleQualityLevels(&device->ID3D11Device_iface, format, + sample_count, quality_level_count); } static void STDMETHODCALLTYPE d3d10_device_CheckCounterInfo(ID3D10Device1 *iface, D3D10_COUNTER_INFO *counter_info)

1 0

Nikolay Sivov : dwrite/tests: Remove failing test line, we have skips for this now.
by Alexandre Julliard Feb. 5, 2016

Feb. 5, 2016

Module: wine Branch: master Commit: c506a52fac695f820791cbcf21eff65804b82cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c506a52fac695f820791cbcf2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 5 08:33:13 2016 +0300 dwrite/tests: Remove failing test line, we have skips for this now. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index aed5e02..04e3ee0 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3215,7 +3215,6 @@ static BOOL get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT3 hr = IDWriteLocalizedStrings_FindLocaleName(strings, enusW, &index, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(exists, "got %d\n", exists); if (exists) { hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size);

1 0

Henri Verbeet : wined3d: Make the "icb" field in struct wined3d_shader_reg_maps const.
by Alexandre Julliard Feb. 5, 2016

Feb. 5, 2016

Module: wine Branch: master Commit: fabd40013c441ca7498a12167deb6cb7e909a1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabd40013c441ca7498a12167… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 21:56:35 2016 +0100 wined3d: Make the "icb" field in struct wined3d_shader_reg_maps const. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f4dc36..8c939f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -688,7 +688,7 @@ struct wined3d_shader_reg_maps WORD labels; /* MAX_LABELS, 16 */ DWORD temporary; /* MAX_REG_TEMP, 32 */ DWORD *constf; /* pixel, vertex */ - struct wined3d_shader_immediate_constant_buffer *icb; + const struct wined3d_shader_immediate_constant_buffer *icb; union { DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */

1 0

Henri Verbeet : ddraw: Move the mip-level dimensions fix-up from ddraw_surface_init() to ddraw_surface_create().
by Alexandre Julliard Feb. 5, 2016

Feb. 5, 2016

Module: wine Branch: master Commit: 7d45318aeac41e2efabb9ddfbf95ecbea103e67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d45318aeac41e2efabb9ddfb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 21:56:32 2016 +0100 ddraw: Move the mip-level dimensions fix-up from ddraw_surface_init() to ddraw_surface_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 923a935..a6fbceb 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5643,8 +5643,8 @@ static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) { + struct wined3d_resource_desc wined3d_desc, wined3d_mip_desc; struct ddraw_surface *root, *mip, **attach; - struct wined3d_resource_desc wined3d_desc; struct wined3d_texture *wined3d_texture; struct wined3d_resource *resource; struct wined3d_display_mode mode; @@ -6103,9 +6103,17 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ mip_desc = &mip->surface_desc; if (j) + { + wined3d_resource_get_desc(resource, &wined3d_mip_desc); + mip_desc->dwWidth = wined3d_mip_desc.width; + mip_desc->dwHeight = wined3d_mip_desc.height; + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; + } else + { mip_desc->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; + } if (mip_desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) { @@ -6233,7 +6241,6 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, { struct ddraw_texture *texture = wined3d_texture_get_parent(wined3d_texture); DDSURFACEDESC2 *desc = &surface->surface_desc; - struct wined3d_resource_desc wined3d_desc; unsigned int version = texture->version; surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl; @@ -6265,9 +6272,6 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, } *desc = texture->surface_desc; - wined3d_resource_get_desc(wined3d_surface_get_resource(wined3d_surface), &wined3d_desc); - desc->dwWidth = wined3d_desc.width; - desc->dwHeight = wined3d_desc.height; surface->first_attached = surface; if (format_is_compressed(&desc->u4.ddpfPixelFormat))

1 0

Henri Verbeet : wined3d: Make the "texture" parameter to wined3d_texture_get_sub_resource() const.
by Alexandre Julliard Feb. 5, 2016

Feb. 5, 2016

Module: wine Branch: master Commit: 24b95aaff414eef55d97537ae328a4e59129d7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b95aaff414eef55d97537ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 21:56:34 2016 +0100 wined3d: Make the "texture" parameter to wined3d_texture_get_sub_resource() const. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 88507fa..de1d945 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -691,7 +691,7 @@ void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) FIXME("texture %p stub!\n", texture); } -struct wined3d_resource * CDECL wined3d_texture_get_sub_resource(struct wined3d_texture *texture, +struct wined3d_resource * CDECL wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx) { UINT sub_count = texture->level_count * texture->layer_count; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9d7ecb7..ebb1338 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2527,7 +2527,7 @@ DWORD __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *text DWORD __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture); void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture); struct wined3d_resource * __cdecl wined3d_texture_get_resource(struct wined3d_texture *texture); -struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(struct wined3d_texture *texture, +struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx); ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); void __cdecl wined3d_texture_preload(struct wined3d_texture *texture);

1 0