March 2020 - Wine-Devel - list.winehq.org

[PATCH 1/5] wined3d: Refactor wined3d_get_output_desc() to wined3d_output_get_desc().
by Zhiyi Zhang March 19, 2020

March 19, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 7 ++++++- dlls/d3d9/directx.c | 7 ++++++- dlls/ddraw/main.c | 7 ++++--- dlls/dxgi/output.c | 3 +-- dlls/wined3d/directx.c | 11 ++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 7 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 343073f351..509a76239d 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -398,12 +398,17 @@ static HMONITOR WINAPI d3d8_GetAdapterMonitor(IDirect3D8 *iface, UINT adapter) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); struct wined3d_output_desc desc; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u.\n", iface, adapter); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return NULL; + wined3d_mutex_lock(); - hr = wined3d_get_output_desc(d3d8->wined3d, adapter, &desc); + hr = wined3d_output_get_desc(d3d8->wined3d_outputs[output_idx], &desc); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index d79b32515f..9113ec1d5a 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -448,12 +448,17 @@ static HMONITOR WINAPI d3d9_GetAdapterMonitor(IDirect3D9Ex *iface, UINT adapter) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); struct wined3d_output_desc desc; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u.\n", iface, adapter); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return NULL; + wined3d_mutex_lock(); - hr = wined3d_get_output_desc(d3d9->wined3d, adapter, &desc); + hr = wined3d_output_get_desc(d3d9->wined3d_outputs[output_idx], &desc); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 20c0f3f953..b9fe6b1e4b 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -59,6 +59,7 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC struct wined3d_adapter_identifier adapter_id; struct wined3d_adapter *wined3d_adapter; struct wined3d_output_desc output_desc; + struct wined3d_output *wined3d_output; unsigned int interface_count = 0; unsigned int adapter_idx = 0; unsigned int output_idx; @@ -86,11 +87,11 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC } wined3d_mutex_unlock(); - for (output_idx = 0; cont_enum && wined3d_adapter_get_output(wined3d_adapter, output_idx); - ++output_idx) + for (output_idx = 0; cont_enum && (wined3d_output = wined3d_adapter_get_output( + wined3d_adapter, output_idx)); ++output_idx) { wined3d_mutex_lock(); - if (FAILED(hr = wined3d_get_output_desc(wined3d, output_idx, &output_desc))) + if (FAILED(hr = wined3d_output_get_desc(wined3d_output, &output_desc))) { WARN("Failed to get output description, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 8c94788fbf..85bfed0598 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -289,8 +289,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput4 *iface, DXGI_O return E_INVALIDARG; wined3d_mutex_lock(); - hr = wined3d_get_output_desc(output->adapter->factory->wined3d, - output->adapter->ordinal, &wined3d_desc); + hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8cf0d77e82..9b99428134 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -915,7 +915,7 @@ HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *in return WINED3D_OK; } -HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT CDECL wined3d_output_get_desc(const struct wined3d_output *output, struct wined3d_output_desc *desc) { enum wined3d_display_rotation rotation; @@ -924,16 +924,13 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in HMONITOR monitor; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, desc %p.\n", wined3d, adapter_idx, desc); + TRACE("output %p, desc %p.\n", output, desc); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = wined3d->adapters[adapter_idx]; + adapter = output->adapter; if (!(monitor = MonitorFromPoint(adapter->monitor_position, MONITOR_DEFAULTTOPRIMARY))) return WINED3DERR_INVALIDCALL; - if (FAILED(hr = wined3d_output_get_display_mode(&adapter->outputs[0], &mode, &rotation))) + if (FAILED(hr = wined3d_output_get_display_mode(output, &mode, &rotation))) return hr; memcpy(desc->device_name, adapter->device_name, sizeof(desc->device_name)); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c06cca22ee..22a9a9dd74 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -12,7 +12,6 @@ @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_device_caps(ptr long ptr) -@ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) @ cdecl wined3d_register_window(ptr ptr ptr long) @@ -158,6 +157,7 @@ @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) @ cdecl wined3d_output_get_adapter(ptr) +@ cdecl wined3d_output_get_desc(ptr ptr) @ cdecl wined3d_output_get_display_mode(ptr ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d192266583..2c3f085623 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2281,8 +2281,6 @@ struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, struct wined3d_caps *caps); -HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, - struct wined3d_output_desc *desc); ULONG __cdecl wined3d_incref(struct wined3d *wined3d); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function); BOOL __cdecl wined3d_register_window(struct wined3d *wined3d, HWND window, @@ -2509,6 +2507,8 @@ HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *devi HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode); struct wined3d_adapter * __cdecl wined3d_output_get_adapter(const struct wined3d_output *output); +HRESULT __cdecl wined3d_output_get_desc(const struct wined3d_output *output, + struct wined3d_output_desc *desc); HRESULT __cdecl wined3d_output_get_display_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, -- 2.20.1

2 1

[PATCH v2] user32/tests: Update 1 todo_wine message in msg.
by Serge Gautherie March 19, 2020

March 19, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- For the record, debian10 and debiant results: https://testbot.winehq.org/JobDetails.pl?Key=67492 --- dlls/user32/tests/msg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 303a026..adca844 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2396,9 +2396,8 @@ static void dump_sequence(const struct message *expected, const char *context, c } } -#define ok_sequence( exp, contx, todo) \ - ok_sequence_( (exp), (contx), (todo), __FILE__, __LINE__) - +#define ok_sequence(exp, contx, todo) \ + ok_sequence_(exp, contx, todo, __FILE__, __LINE__) static void ok_sequence_(const struct message *expected_list, const char *context, BOOL todo, const char *file, int line) @@ -2571,10 +2570,11 @@ static void ok_sequence_(const struct message *expected_list, const char *contex context, count, expected->message, actual->message); } } + if( todo && !failcount) /* succeeded yet marked todo */ todo_wine { if (!strcmp(winetest_platform, "wine")) dump++; - ok_( file, line)( TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + ok_(file, line)(TRUE, "%s, (line %d)\n", context, __LINE__); } done: @@ -5153,7 +5153,7 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped [Not fixed, though ok on TestBot]", TRUE); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) -- 2.10.0.windows.1

3 3

[PATCH 1/2] Revert "usp10: Build with msvcrt."
by Jeff Smith March 19, 2020

March 19, 2020

This reverts commit 8355a2018921bc9018a7c5622324ab0da083af14. Done in preparation for moving usp10 calls into gdi32. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/usp10/Makefile.in | 2 -- dlls/usp10/bidi.c | 4 +++- dlls/usp10/breaking.c | 2 +- dlls/usp10/indic.c | 2 +- dlls/usp10/opentype.c | 2 +- dlls/usp10/usp10.c | 15 ++++++++------- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 5b705e7fe4..68d85fb443 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -2,8 +2,6 @@ MODULE = usp10.dll IMPORTLIB = usp10 IMPORTS = advapi32 user32 gdi32 -EXTRADLLFLAGS = -mno-cygwin - C_SRCS = \ bidi.c \ bracket.c \ diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index e1d0a11697..a4ac22e491 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -41,6 +41,8 @@ * has been modified. */ +#include "config.h" + #include <stdarg.h> #include <stdlib.h> #include "windef.h" @@ -638,7 +640,7 @@ typedef struct tagBracketPair int end; } BracketPair; -static int __cdecl compr(const void *a, const void* b) +static int compr(const void *a, const void* b) { return ((BracketPair*)a)->start - ((BracketPair*)b)->start; } diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index 480d69234a..9b12d9e63d 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - +#include "config.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index b537eb232d..5a228e88de 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - +#include "config.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a6ce76072d..53632714a4 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -658,7 +658,7 @@ static VOID *load_CMAP_format12_table(HDC hdc, ScriptCache *psc) return NULL; } -static int __cdecl compare_group(const void *a, const void* b) +static int compare_group(const void *a, const void* b) { const DWORD *chr = a; const CMAP_SegmentedCoverage_group *group = b; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c9fe12a544..ea877bc19e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -40,6 +40,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); @@ -875,7 +876,7 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) return E_INVALIDARG; } /* Ensure canonical result by zeroing extra space in lfFaceName */ - size = lstrlenW(lf.lfFaceName); + size = strlenW(lf.lfFaceName); memset(lf.lfFaceName + size, 0, sizeof(lf.lfFaceName) - size * sizeof(WCHAR)); EnterCriticalSection(&cs_script_cache); @@ -952,7 +953,7 @@ static DWORD decode_surrogate_pair(const WCHAR *str, unsigned int index, unsigne return 0; } -static int __cdecl usp10_compare_script_range(const void *key, const void *value) +static int usp10_compare_script_range(const void *key, const void *value) { const struct usp10_script_range *range = value; const DWORD *ch = key; @@ -978,7 +979,7 @@ static enum usp10_script get_char_script(const WCHAR *str, unsigned int index, return Script_CR; /* These punctuation characters are separated out as Latin punctuation */ - if (wcschr(latin_punc,str[index])) + if (strchrW(latin_punc,str[index])) return Script_Punctuation2; /* These chars are itemized as Punctuation by Windows */ @@ -1023,7 +1024,7 @@ static enum usp10_script get_char_script(const WCHAR *str, unsigned int index, return range->script; } -static int __cdecl compare_FindGlyph(const void *a, const void* b) +static int compare_FindGlyph(const void *a, const void* b) { const FindGlyph_struct *find = (FindGlyph_struct*)a; const WORD *idx= (WORD*)b; @@ -1534,7 +1535,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, { if (i > 0 && i < cInChars-1 && script_is_numeric(scripts[i-1]) && - wcschr(math_punc, pwcInChars[i])) + strchrW(math_punc, pwcInChars[i])) { if (script_is_numeric(scripts[i+1])) { @@ -1543,7 +1544,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, strength[i] = strength[i-1]; i++; } - else if (wcschr(repeatable_math_punc, pwcInChars[i])) + else if (strchrW(repeatable_math_punc, pwcInChars[i])) { int j; for (j = i+1; j < cInChars; j++) @@ -1967,7 +1968,7 @@ static void find_fallback_font(enum usp10_script scriptid, WCHAR *FaceName) DWORD count = LF_FACESIZE * sizeof(WCHAR); DWORD type; - swprintf(value, ARRAY_SIZE(value), szFmt, scriptInformation[scriptid].scriptTag); + sprintfW(value, szFmt, scriptInformation[scriptid].scriptTag); if (RegQueryValueExW(hkey, value, 0, &type, (BYTE *)FaceName, &count)) lstrcpyW(FaceName,scriptInformation[scriptid].fallbackFont); RegCloseKey(hkey); -- 2.23.0

3 5

[PATCH] user32/tests: Remove 1 todo_wine in msg.
by Serge Gautherie March 19, 2020

March 19, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- debian10 and debiant results, with TRUE still: https://testbot.winehq.org/JobDetails.pl?Key=67492 --- dlls/user32/tests/msg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 303a026..b25d46c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2396,9 +2396,8 @@ static void dump_sequence(const struct message *expected, const char *context, c } } -#define ok_sequence( exp, contx, todo) \ - ok_sequence_( (exp), (contx), (todo), __FILE__, __LINE__) - +#define ok_sequence(exp, contx, todo) \ + ok_sequence_(exp, contx, todo, __FILE__, __LINE__) static void ok_sequence_(const struct message *expected_list, const char *context, BOOL todo, const char *file, int line) @@ -2571,10 +2570,11 @@ static void ok_sequence_(const struct message *expected_list, const char *contex context, count, expected->message, actual->message); } } + if( todo && !failcount) /* succeeded yet marked todo */ todo_wine { if (!strcmp(winetest_platform, "wine")) dump++; - ok_( file, line)( TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + ok_(file, line)(TRUE, "%s, (line %d)\n", context, __LINE__); } done: @@ -5153,7 +5153,7 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) -- 2.10.0.windows.1

4 5

[PATCH 1/4] vbscript: Retrieve the vbscode context from the named item directly.
by Gabriel Ivăncescu March 19, 2020

March 19, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/compile.c | 5 ----- dlls/vbscript/interp.c | 6 +++--- dlls/vbscript/vbscript.h | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index cc78daa..164c2d1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1867,8 +1867,6 @@ void release_vbscode(vbscode_t *code) for(i=0; i < code->bstr_cnt; i++) SysFreeString(code->bstr_pool[i]); - if(code->context) - IDispatch_Release(code->context); if(code->named_item) release_named_item(code->named_item); heap_pool_free(&code->heap); @@ -2016,9 +2014,6 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *item ctx.code = NULL; release_compiler(&ctx); - if(item && item->disp) - IDispatch_AddRef(code->context = item->disp); - list_add_tail(&script->code_list, &code->entry); *ret = code; return S_OK; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d2e1d2a..95614b1 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -181,11 +181,11 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(ctx->func->code_ctx->context) { - hres = disp_get_id(ctx->func->code_ctx->context, name, invoke_type, TRUE, &id); + if(ctx->func->code_ctx->named_item && ctx->func->code_ctx->named_item->disp) { + hres = disp_get_id(ctx->func->code_ctx->named_item->disp, name, invoke_type, TRUE, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP; - ref->u.d.disp = ctx->func->code_ctx->context; + ref->u.d.disp = ctx->func->code_ctx->named_item->disp; ref->u.d.id = id; return S_OK; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 27ddae3..aa75b1c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -348,7 +348,6 @@ struct _vbscode_t { BOOL pending_exec; BOOL is_persistent; function_t main_code; - IDispatch *context; named_item_t *named_item; BSTR *bstr_pool; -- 2.21.0

2 4

[PATCH 9/9] ucrtbase/tests: Use more ucrtbase functions directly in misc.c.
by Jacek Caban March 19, 2020

March 19, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 187 +++++++++++-------------------------- 1 file changed, 56 insertions(+), 131 deletions(-)

1 0

[PATCH 8/9] stdlib.h: Add _get_thread_local_invalid_parameter_handler and _set_thread_local_invalid_parameter_handler declarations.
by Jacek Caban March 19, 2020

March 19, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdlib.h | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH 7/9] process.h: Add quick_exit declaration.
by Jacek Caban March 19, 2020

March 19, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/process.h | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 6/9] locale.h: Add _Strftime declaration.
by Jacek Caban March 19, 2020

March 19, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcp90/locale.c | 2 -- include/msvcrt/locale.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 5/9] io.h: Add _sopen_dispatch and _sopen_s declarations.
by Jacek Caban March 19, 2020

March 19, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/io.h | 2 ++ 1 file changed, 2 insertions(+)

1 0