November 2019 - wine-commits

Rémi Bernon : user32/tests: Flush remaining events before starting a new sequence.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 766ee1692e93f94d0ab6320b3450e8cdeca41ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=766ee1692e93f94d0ab6320b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 20:44:52 2019 +0100 user32/tests: Flush remaining events before starting a new sequence. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3f11995e33..193a20fd95 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14375,6 +14375,7 @@ static void test_dbcs_wm_char(void) WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); ok (hwnd != 0, "Failed to create overlapped window\n"); ok (hwnd2 != 0, "Failed to create overlapped window\n"); + flush_events(); flush_sequence(); memset( wmCharSeq, 0, sizeof(wmCharSeq) );

1 0

Rémi Bernon : user32/tests: Add optional flags for alternative sequence on w1064v1809.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: ad5ca21de664d384f18f84d861c824e3a6ecc0f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5ca21de664d384f18f84d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 20:44:51 2019 +0100 user32/tests: Add optional flags for alternative sequence on w1064v1809. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d8add4e0e..3f11995e33 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9054,11 +9054,13 @@ static const struct message WmShiftMouseButton[] = { { WM_MOUSEMOVE, sent|wparam|optional, 0, 0 }, { WM_LBUTTONDOWN, wparam, MK_LBUTTON|MK_SHIFT, 0 }, { WM_LBUTTONDOWN, sent|wparam, MK_LBUTTON|MK_SHIFT, 0 }, - { WM_LBUTTONUP, wparam, MK_SHIFT, 0 }, - { WM_LBUTTONUP, sent|wparam, MK_SHIFT, 0 }, + { WM_LBUTTONUP, wparam|optional, MK_SHIFT, 0 }, /* < w1064v1809 */ + { WM_LBUTTONUP, sent|wparam|optional, MK_SHIFT, 0 }, /* < w1064v1809 */ { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xc0000001 }, /* XP */ { WM_KEYUP, wparam|lparam, VK_SHIFT, 0xc0000001 }, { WM_KEYUP, sent|wparam|lparam, VK_SHIFT, 0xc0000001 }, + { WM_LBUTTONUP, wparam|optional, MK_SHIFT, 0 }, /* >= w1064v1809 */ + { WM_LBUTTONUP, sent|wparam|optional, MK_SHIFT, 0 }, /* >= w1064v1809 */ { 0 } }; static const struct message WmF1Seq[] = {

1 0

Rémi Bernon : user32/tests: Skip tests expecting ascii VK wparam on non-us keyboards.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: e83486062d7f0de23aa2c24ae1583c1a070a3746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e83486062d7f0de23aa2c24a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 20:44:50 2019 +0100 user32/tests: Skip tests expecting ascii VK wparam on non-us keyboards. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 43c1859e04..6d8add4e0e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9179,6 +9179,7 @@ static void test_accelerators(void) HACCEL hAccel; HWND hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); BOOL ret; assert(hwnd != 0); @@ -9201,6 +9202,12 @@ static void test_accelerators(void) pump_msg_loop(hwnd, 0); flush_sequence(); + if (!us_kbd) + { + skip("skipping ascii VK events on non-us keyboard\n"); + goto done; + } + trace("testing VK_N press/release\n"); flush_sequence(); keybd_event('N', 0, 0, 0); @@ -15247,6 +15254,7 @@ static void test_menu_messages(void) HMENU hmenu, hmenu_popup; HWND hwnd; DWORD style; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); if (!pGetMenuInfo || !pSetMenuInfo) { @@ -15293,6 +15301,12 @@ static void test_menu_messages(void) style = get_menu_style(hmenu_popup); ok(style == 0, "expected 0, got %u\n", style); + if (!us_kbd) + { + skip("skipping ascii VK events on non-us keyboard\n"); + goto done; + } + /* Alt+E, Enter */ trace("testing a popup menu command\n"); flush_sequence();

1 0

Rémi Bernon : user32/tests: Update SetActiveWindow(0) test result for w1064v1809.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 32b3e502d9752498f54108913346344cf93223e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b3e502d9752498f5410891… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 20:44:49 2019 +0100 user32/tests: Update SetActiveWindow(0) test result for w1064v1809. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 08a106ee19..43c1859e04 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14218,8 +14218,8 @@ static void test_SetActiveWindow(void) trace("SetActiveWindow(0)\n"); ret = SetActiveWindow(0); - ok( ret == popup, "Failed to SetActiveWindow(0)\n"); - ok_sequence(SetActiveWindowSeq0, "SetActiveWindow(0)", FALSE); + ok( ret == popup || broken(ret == 0) /* w1064v1809 */, "Failed to SetActiveWindow(0), ret:%p\n", ret); + if (ret == popup) ok_sequence(SetActiveWindowSeq0, "SetActiveWindow(0)", FALSE); flush_sequence(); trace("SetActiveWindow(hwnd), hwnd visible\n");

1 0

Rémi Bernon : user32/tests: Add some wparam mask to message sequences for w1064v1809.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 37fe4b0bab2ba567c0170be201ece50bde67d6fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=37fe4b0bab2ba567c0170be2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 20:44:48 2019 +0100 user32/tests: Add some wparam mask to message sequences for w1064v1809. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 477661ab62..08a106ee19 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -780,7 +780,7 @@ static const struct message WmCreateInvisibleMaxPopupSeq[] = { static const struct message WmShowMaxPopupResizedSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { WM_GETMINMAXINFO, sent }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED, 0, SWP_STATECHANGED /* w1064v1809 */ }, { WM_NCCALCSIZE, sent|wparam, TRUE }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, { HCBT_ACTIVATE, hook }, @@ -812,7 +812,7 @@ static const struct message WmShowMaxPopupResizedSeq[] = { static const struct message WmShowMaxPopupSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { WM_GETMINMAXINFO, sent }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED, 0, SWP_STATECHANGED /* w1064v1809 */ }, { WM_NCCALCSIZE, sent|wparam, TRUE }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, { HCBT_ACTIVATE, hook }, @@ -836,7 +836,7 @@ static const struct message WmShowMaxPopupSeq[] = { { WM_ERASEBKGND, sent|optional }, { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, { WM_ERASEBKGND, sent|defwinproc|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE, 0, SWP_STATECHANGED /* w1064v1809 */ }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_SIZE, sent|defwinproc|optional }, { 0 } @@ -3476,7 +3476,7 @@ static const struct message WmMaximizeMDIchildInvisibleSeq[] = { static const struct message WmMaximizeMDIchildInvisibleSeq2[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { WM_GETMINMAXINFO, sent }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED, 0, SWP_STATECHANGED /* w1064v1809 */ }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent|wparam, 1 }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, @@ -3495,7 +3495,7 @@ static const struct message WmMaximizeMDIchildInvisibleSeq2[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc|optional }, { WM_MDIACTIVATE, sent|defwinproc|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE, 0, SWP_STATECHANGED /* w1064v1809 */ }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ { WM_SIZE, sent|defwinproc|optional }, { 0 }

1 0

Gabriel Ivăncescu : vbscript: Get rid of ident_map.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: f2058389add08357910e736aab256d15cebb17e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2058389add08357910e736a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 6 17:35:16 2019 +0100 vbscript: Get rid of ident_map. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 116 ++++++++++++----------------------------------- dlls/vbscript/vbscript.h | 6 --- 2 files changed, 28 insertions(+), 94 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 00e975e40b..12626e0275 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -24,6 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +#define DISPID_FUNCTION_MASK 0x20000000 #define FDEX_VERSION_MASK 0xf0000000 static inline BOOL is_func_id(vbdisp_t *This, DISPID id) @@ -526,49 +527,6 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) return S_OK; } -struct _ident_map_t { - const WCHAR *name; - BOOL is_var; - union { - dynamic_var_t *var; - function_t *func; - } u; -}; - -static inline DISPID ident_to_id(ScriptDisp *This, ident_map_t *ident) -{ - return (ident-This->ident_map)+1; -} - -static inline ident_map_t *id_to_ident(ScriptDisp *This, DISPID id) -{ - return 0 < id && id <= This->ident_map_cnt ? This->ident_map+id-1 : NULL; -} - -static ident_map_t *add_ident(ScriptDisp *This, const WCHAR *name) -{ - ident_map_t *ret; - - if(!This->ident_map_size) { - This->ident_map = heap_alloc(4 * sizeof(*This->ident_map)); - if(!This->ident_map) - return NULL; - This->ident_map_size = 4; - }else if(This->ident_map_cnt == This->ident_map_size) { - ident_map_t *new_map; - - new_map = heap_realloc(This->ident_map, 2*This->ident_map_size*sizeof(*new_map)); - if(!new_map) - return NULL; - This->ident_map = new_map; - This->ident_map_size *= 2; - } - - ret = This->ident_map + This->ident_map_cnt++; - ret->name = name; - return ret; -} - static inline ScriptDisp *ScriptDisp_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, ScriptDisp, IDispatchEx_iface); @@ -616,7 +574,6 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) if(!ref) { assert(!This->ctx); - heap_free(This->ident_map); heap_free(This); } @@ -675,7 +632,6 @@ static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - ident_map_t *ident; unsigned i; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -683,37 +639,16 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW if(!This->ctx) return E_UNEXPECTED; - for(ident = This->ident_map; ident < This->ident_map+This->ident_map_cnt; ident++) { - if(!wcsicmp(ident->name, bstrName)) { - *pid = ident_to_id(This, ident); - return S_OK; - } - } - for(i = 0; i < This->ctx->global_vars_cnt; i++) { - dynamic_var_t *var = This->ctx->global_vars[i]; - if(!wcsicmp(var->name, bstrName)) { - ident = add_ident(This, var->name); - if(!ident) - return E_OUTOFMEMORY; - - ident->is_var = TRUE; - ident->u.var = var; - *pid = ident_to_id(This, ident); + if(!wcsicmp(This->ctx->global_vars[i]->name, bstrName)) { + *pid = i + 1; return S_OK; } } for(i = 0; i < This->ctx->global_funcs_cnt; i++) { - function_t *func = This->ctx->global_funcs[i]; - if(!wcsicmp(func->name, bstrName)) { - ident = add_ident(This, func->name); - if(!ident) - return E_OUTOFMEMORY; - - ident->is_var = FALSE; - ident->u.func = func; - *pid = ident_to_id(This, ident); + if(!wcsicmp(This->ctx->global_funcs[i]->name, bstrName)) { + *pid = i + 1 + DISPID_FUNCTION_MASK; return S_OK; } } @@ -726,35 +661,40 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - ident_map_t *ident; HRESULT hres; TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - ident = id_to_ident(This, id); - if(!ident) - return DISP_E_MEMBERNOTFOUND; + if (id & DISPID_FUNCTION_MASK) + { + id &= ~DISPID_FUNCTION_MASK; + if (id > This->ctx->global_funcs_cnt) + return DISP_E_MEMBERNOTFOUND; - if(ident->is_var) { - if(ident->u.var->is_const) { - FIXME("const not supported\n"); - return E_NOTIMPL; + switch (wFlags) + { + case DISPATCH_METHOD: + case DISPATCH_METHOD | DISPATCH_PROPERTYGET: + hres = exec_script(This->ctx, TRUE, This->ctx->global_funcs[id - 1], NULL, pdp, pvarRes); + break; + default: + FIXME("Unsupported flags %x\n", wFlags); + hres = E_NOTIMPL; } - return invoke_variant_prop(This->ctx, &ident->u.var->v, wFlags, pdp, pvarRes); + return hres; } - switch(wFlags) { - case DISPATCH_METHOD: - case DISPATCH_METHOD|DISPATCH_PROPERTYGET: - hres = exec_script(This->ctx, TRUE, ident->u.func, NULL, pdp, pvarRes); - break; - default: - FIXME("Unsupported flags %x\n", wFlags); - hres = E_NOTIMPL; + if (id > This->ctx->global_vars_cnt) + return DISP_E_MEMBERNOTFOUND; + + if (This->ctx->global_vars[id - 1]->is_const) + { + FIXME("const not supported\n"); + return E_NOTIMPL; } - return hres; + return invoke_variant_prop(This->ctx, &This->ctx->global_vars[id - 1]->v, wFlags, pdp, pvarRes); } static HRESULT WINAPI ScriptDisp_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a2e87790ba..9f14e147ba 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -120,16 +120,10 @@ struct _vbdisp_t { VARIANT props[1]; }; -typedef struct _ident_map_t ident_map_t; - typedef struct { IDispatchEx IDispatchEx_iface; LONG ref; - ident_map_t *ident_map; - unsigned ident_map_cnt; - unsigned ident_map_size; - script_ctx_t *ctx; } ScriptDisp;

1 0

Gabriel Ivăncescu : vbscript: Store global variables in an array.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 4699d366565f7a27ac5606c7a1a318e24242ec73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4699d366565f7a27ac5606c7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 6 17:35:04 2019 +0100 vbscript: Store global variables in an array. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 30 ++++++++++++++++++++---------- dlls/vbscript/interp.c | 45 ++++++++++++++++++++++++++++++++++++--------- dlls/vbscript/vbdisp.c | 4 ++-- dlls/vbscript/vbscript.c | 9 +++++++-- dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 69 insertions(+), 24 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 4ccb164c4a..7b6649ec56 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1787,11 +1787,10 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) { class_desc_t *class; - dynamic_var_t *var; unsigned i; - for(var = script->global_vars; var; var = var->next) { - if(!wcsicmp(var->name, identifier)) + for(i = 0; i < script->global_vars_cnt; i++) { + if(!wcsicmp(script->global_vars[i]->name, identifier)) return TRUE; } @@ -1895,6 +1894,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli function_t *new_func, *func_iter; function_decl_t *func_decl; class_decl_t *class_decl; + dynamic_var_t *var_iter; compile_ctx_t ctx; vbscode_t *code; size_t cnt; @@ -1952,13 +1952,19 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli return compile_error(script, hres); } - if(ctx.global_vars) { - dynamic_var_t *var; - - for(var = ctx.global_vars; var->next; var = var->next); - - var->next = script->global_vars; - script->global_vars = ctx.global_vars; + cnt = script->global_vars_cnt; + for(var_iter = ctx.global_vars; var_iter; var_iter = var_iter->next) + cnt++; + if(cnt > script->global_vars_size) { + dynamic_var_t **new_vars; + if(script->global_vars) + new_vars = heap_realloc(script->global_vars, cnt * sizeof(*new_vars)); + else + new_vars = heap_alloc(cnt * sizeof(*new_vars)); + if(!new_vars) + return compile_error(script, E_OUTOFMEMORY); + script->global_vars = new_vars; + script->global_vars_size = cnt; } cnt = script->global_funcs_cnt; @@ -1975,6 +1981,10 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli script->global_funcs = new_funcs; script->global_funcs_size = cnt; } + + for(var_iter = ctx.global_vars; var_iter; var_iter = var_iter->next) + script->global_vars[script->global_vars_cnt++] = var_iter; + for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) { unsigned i; for(i = 0; i < script->global_funcs_cnt; i++) { diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e4f982a025..3dfcf1e7f7 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -94,6 +94,22 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re return FALSE; } +static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *ref) +{ + dynamic_var_t **vars = script->global_vars; + size_t i, cnt = script->global_vars_cnt; + + for(i = 0; i < cnt; i++) { + if(!wcsicmp(vars[i]->name, name)) { + ref->type = vars[i]->is_const ? REF_CONST : REF_VAR; + ref->u.v = &vars[i]->v; + return TRUE; + } + } + + return FALSE; +} + static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { named_item_t *item; @@ -159,7 +175,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) + if(lookup_global_vars(ctx->script, name, ref)) return S_OK; for(i = 0; i < ctx->script->global_funcs_cnt; i++) { @@ -227,8 +243,19 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { - new_var->next = ctx->script->global_vars; - ctx->script->global_vars = new_var; + size_t cnt = ctx->script->global_vars_cnt + 1; + if(cnt > ctx->script->global_vars_size) { + dynamic_var_t **new_vars; + if(ctx->script->global_vars) + new_vars = heap_realloc(ctx->script->global_vars, cnt * 2 * sizeof(*new_vars)); + else + new_vars = heap_alloc(cnt * 2 * sizeof(*new_vars)); + if(!new_vars) + return E_OUTOFMEMORY; + ctx->script->global_vars = new_vars; + ctx->script->global_vars_size = cnt * 2; + } + ctx->script->global_vars[ctx->script->global_vars_cnt++] = new_var; }else { new_var->next = ctx->dynamic_vars; ctx->dynamic_vars = new_var; @@ -1118,14 +1145,14 @@ static HRESULT interp_dim(exec_ctx_t *ctx) assert(array_id < ctx->func->array_cnt); if(ctx->func->type == FUNC_GLOBAL) { - dynamic_var_t *var; - for(var = ctx->script->global_vars; var; var = var->next) { - if(!wcsicmp(var->name, ident)) + unsigned i; + for(i = 0; i < ctx->script->global_vars_cnt; i++) { + if(!wcsicmp(ctx->script->global_vars[i]->name, ident)) break; } - assert(var != NULL); - v = &var->v; - array_ref = &var->array; + assert(i < ctx->script->global_vars_cnt); + v = &ctx->script->global_vars[i]->v; + array_ref = &ctx->script->global_vars[i]->array; }else { ref_t ref; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a5ae40d098..00e975e40b 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -675,7 +675,6 @@ static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - dynamic_var_t *var; ident_map_t *ident; unsigned i; @@ -691,7 +690,8 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW } } - for(var = This->ctx->global_vars; var; var = var->next) { + for(i = 0; i < This->ctx->global_vars_cnt; i++) { + dynamic_var_t *var = This->ctx->global_vars[i]; if(!wcsicmp(var->name, bstrName)) { ident = add_ident(This, var->name); if(!ident) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 886c9d01af..6d2bb54e52 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -131,14 +131,19 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag static void release_script(script_ctx_t *ctx) { class_desc_t *class_desc; + unsigned i; collect_objects(ctx); clear_ei(&ctx->ei); - release_dynamic_vars(ctx->global_vars); - ctx->global_vars = NULL; + for(i = 0; i < ctx->global_vars_cnt; i++) + VariantClear(&ctx->global_vars[i]->v); + heap_free(ctx->global_vars); heap_free(ctx->global_funcs); + ctx->global_vars = NULL; + ctx->global_vars_cnt = 0; + ctx->global_vars_size = 0; ctx->global_funcs = NULL; ctx->global_funcs_cnt = 0; ctx->global_funcs_size = 0; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index ac5242d94f..a2e87790ba 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -188,11 +188,14 @@ struct _script_ctx_t { EXCEPINFO ei; + dynamic_var_t **global_vars; + size_t global_vars_cnt; + size_t global_vars_size; + function_t **global_funcs; size_t global_funcs_cnt; size_t global_funcs_size; - dynamic_var_t *global_vars; class_desc_t *classes; class_desc_t *procs;

1 0

Jacek Caban : vbscript: Store global static arrays together with global variables.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 3dea7bd7fc5114ae0d6b6bcaaa503cffcdb92eca URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dea7bd7fc5114ae0d6b6bca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 17:33:26 2019 +0100 vbscript: Store global static arrays together with global variables. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 1 + dlls/vbscript/interp.c | 59 ++++++++++++++++++++++++++++++++---------------- dlls/vbscript/vbscript.h | 1 + 3 files changed, 42 insertions(+), 19 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e52b0814e0..4ccb164c4a 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1496,6 +1496,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f V_VT(&new_var->v) = VT_EMPTY; new_var->is_const = FALSE; + new_var->array = NULL; new_var->next = ctx->global_vars; ctx->global_vars = new_var; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 89f9d359da..e4f982a025 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -223,6 +223,7 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, memcpy(str, name, size); new_var->name = str; new_var->is_const = is_const; + new_var->array = NULL; V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { @@ -1108,43 +1109,61 @@ static HRESULT interp_dim(exec_ctx_t *ctx) const BSTR ident = ctx->instr->arg1.bstr; const unsigned array_id = ctx->instr->arg2.uint; const array_desc_t *array_desc; - ref_t ref; + SAFEARRAY **array_ref; + VARIANT *v; HRESULT hres; TRACE("%s\n", debugstr_w(ident)); assert(array_id < ctx->func->array_cnt); - if(!ctx->arrays) { - ctx->arrays = heap_alloc_zero(ctx->func->array_cnt * sizeof(SAFEARRAY*)); - if(!ctx->arrays) - return E_OUTOFMEMORY; - } - hres = lookup_identifier(ctx, ident, VBDISP_LET, &ref); - if(FAILED(hres)) { - FIXME("lookup %s failed: %08x\n", debugstr_w(ident), hres); - return hres; - } + if(ctx->func->type == FUNC_GLOBAL) { + dynamic_var_t *var; + for(var = ctx->script->global_vars; var; var = var->next) { + if(!wcsicmp(var->name, ident)) + break; + } + assert(var != NULL); + v = &var->v; + array_ref = &var->array; + }else { + ref_t ref; - if(ref.type != REF_VAR) { - FIXME("got ref.type = %d\n", ref.type); - return E_FAIL; + if(!ctx->arrays) { + ctx->arrays = heap_alloc_zero(ctx->func->array_cnt * sizeof(SAFEARRAY*)); + if(!ctx->arrays) + return E_OUTOFMEMORY; + } + + hres = lookup_identifier(ctx, ident, VBDISP_LET, &ref); + if(FAILED(hres)) { + FIXME("lookup %s failed: %08x\n", debugstr_w(ident), hres); + return hres; + } + + if(ref.type != REF_VAR) { + FIXME("got ref.type = %d\n", ref.type); + return E_FAIL; + } + + v = ref.u.v; + array_ref = ctx->arrays + array_id; } - if(ctx->arrays[array_id]) { + if(*array_ref) { FIXME("Array already initialized\n"); return E_FAIL; } array_desc = ctx->func->array_descs + array_id; if(array_desc->dim_cnt) { - ctx->arrays[array_id] = SafeArrayCreate(VT_VARIANT, array_desc->dim_cnt, array_desc->bounds); - if(!ctx->arrays[array_id]) + *array_ref = SafeArrayCreate(VT_VARIANT, array_desc->dim_cnt, array_desc->bounds); + if(!*array_ref) return E_OUTOFMEMORY; } - V_VT(ref.u.v) = VT_ARRAY|VT_BYREF|VT_VARIANT; - V_ARRAYREF(ref.u.v) = ctx->arrays+array_id; + V_VT(v) = VT_ARRAY|VT_BYREF|VT_VARIANT; + V_ARRAYREF(v) = array_ref; return S_OK; } @@ -2201,6 +2220,8 @@ void release_dynamic_vars(dynamic_var_t *var) { while(var) { VariantClear(&var->v); + if(var->array) + SafeArrayDestroy(var->array); var = var->next; } } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 0bd1fce156..ac5242d94f 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -169,6 +169,7 @@ typedef struct _dynamic_var_t { VARIANT v; const WCHAR *name; BOOL is_const; + SAFEARRAY *array; } dynamic_var_t; struct _script_ctx_t {

1 0

Gabriel Ivăncescu : jscript: Also clear the thread_id if the script state is set to Closed.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: d8e8d1639f5b08fc7f45336692719976cd784add URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8e8d1639f5b08fc7f453366… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 6 17:28:00 2019 +0200 jscript: Also clear the thread_id if the script state is set to Closed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 75eef39e35..2a7c028454 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -231,7 +231,7 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) FIXME("NULL ctx\n"); } - if(state == SCRIPTSTATE_UNINITIALIZED) + if(state == SCRIPTSTATE_UNINITIALIZED || state == SCRIPTSTATE_CLOSED) This->thread_id = 0; if(This->site) {

1 0

Gabriel Ivăncescu : jscript: Set the DISPID to DISPID_UNKNOWN if unknown.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 15fce35b599998193e1890eb7cf0048e6434f09e URL: https://source.winehq.org/git/wine.git/?a=commit;h=15fce35b599998193e1890eb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 6 17:27:59 2019 +0200 jscript: Set the DISPID to DISPID_UNKNOWN if unknown. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index da23d18aa2..3c2733086b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1083,6 +1083,7 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * } TRACE("not found %s\n", debugstr_w(name)); + *id = DISPID_UNKNOWN; return DISP_E_UNKNOWNNAME; }

1 0

Piotr Caban : msvcrt: Use %ls format for wchar strings in DoMessageBox.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: b6ed0ef4d5d5a2e5d9fa54bc74b673bdf77d66a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ed0ef4d5d5a2e5d9fa54bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 6 12:48:09 2019 +0100 msvcrt: Use %ls format for wchar strings in DoMessageBox. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 9f9cad0964..b357b83b33 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -187,8 +187,8 @@ void CDECL MSVCRT__exit(int exitcode) /* Print out an error message with an option to debug */ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *message) { - static const MSVCRT_wchar_t message_format[] = {'%','s','\n','\n','P','r','o','g','r','a','m',':',' ','%','s','\n', - '%','s','\n','\n','P','r','e','s','s',' ','O','K',' ','t','o',' ','e','x','i','t',' ','t','h','e',' ', + static const MSVCRT_wchar_t message_format[] = {'%','l','s','\n','\n','P','r','o','g','r','a','m',':',' ','%','l','s','\n', + '%','l','s','\n','\n','P','r','e','s','s',' ','O','K',' ','t','o',' ','e','x','i','t',' ','t','h','e',' ', 'p','r','o','g','r','a','m',',',' ','o','r',' ','C','a','n','c','e','l',' ','t','o',' ','s','t','a','r','t',' ', 't','h','e',' ','W','i','n','e',' ','d','e','b','u','g','g','e','r','.','\n',0}; static const WCHAR title[] =

1 0

Jacek Caban : msvcrt: Use %ls format for wchar strings in _wassert.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 65a371c38f052c6a1e6c9e07f79b8026ff6590f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65a371c38f052c6a1e6c9e07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 12:48:04 2019 +0100 msvcrt: Use %ls format for wchar strings in _wassert. %s does not do the right thing in ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 2f344b6dab..9f9cad0964 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -290,10 +290,10 @@ unsigned int CDECL MSVCRT__set_abort_behavior(unsigned int flags, unsigned int m void CDECL MSVCRT__wassert(const MSVCRT_wchar_t* str, const MSVCRT_wchar_t* file, unsigned int line) { static const MSVCRT_wchar_t assertion_failed[] = {'A','s','s','e','r','t','i','o','n',' ','f','a','i','l','e','d','!',0}; - static const MSVCRT_wchar_t format_msgbox[] = {'F','i','l','e',':',' ','%','s','\n','L','i','n','e',':',' ','%','d', - '\n','\n','E','x','p','r','e','s','s','i','o','n',':',' ','\"','%','s','\"',0}; + static const MSVCRT_wchar_t format_msgbox[] = {'F','i','l','e',':',' ','%','l','s','\n','L','i','n','e',':',' ','%','d', + '\n','\n','E','x','p','r','e','s','s','i','o','n',':',' ','\"','%','l','s','\"',0}; static const MSVCRT_wchar_t format_console[] = {'A','s','s','e','r','t','i','o','n',' ','f','a','i','l','e','d',':',' ', - '%','s',',',' ','f','i','l','e',' ','%','s',',',' ','l','i','n','e',' ','%','d','\n','\n',0}; + '%','l','s',',',' ','f','i','l','e',' ','%','l','s',',',' ','l','i','n','e',' ','%','d','\n','\n',0}; TRACE("(%s,%s,%d)\n", debugstr_w(str), debugstr_w(file), line);

1 0

Huw Davies : user32: Remove unused GetAsyncKeyState() driver entry.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: ae7531f673268f083a4c8de550df0e3e58a194d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae7531f673268f083a4c8de5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 6 10:06:23 2019 +0000 user32: Remove unused GetAsyncKeyState() driver entry. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 --------- dlls/user32/input.c | 68 ++++++++++++++++++++++------------------------ dlls/user32/user_private.h | 1 - 3 files changed, 32 insertions(+), 50 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 921ea2c962..66b26ca51a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -106,7 +106,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ActivateKeyboardLayout); GET_USER_FUNC(Beep); - GET_USER_FUNC(GetAsyncKeyState); GET_USER_FUNC(GetKeyNameText); GET_USER_FUNC(GetKeyboardLayout); GET_USER_FUNC(GetKeyboardLayoutList); @@ -206,11 +205,6 @@ static void CDECL nulldrv_Beep(void) { } -static SHORT CDECL nulldrv_GetAsyncKeyState( INT key ) -{ - return -1; -} - static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts ) { HKEY hKeyKeyboard; @@ -494,7 +488,6 @@ static USER_DRIVER null_driver = /* keyboard functions */ nulldrv_ActivateKeyboardLayout, nulldrv_Beep, - nulldrv_GetAsyncKeyState, nulldrv_GetKeyNameText, nulldrv_GetKeyboardLayout, nulldrv_GetKeyboardLayoutList, @@ -566,11 +559,6 @@ static void CDECL loaderdrv_Beep(void) load_driver()->pBeep(); } -static SHORT CDECL loaderdrv_GetAsyncKeyState( INT key ) -{ - return load_driver()->pGetAsyncKeyState( key ); -} - static INT CDECL loaderdrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) { return load_driver()->pGetKeyNameText( lparam, buffer, size ); @@ -715,7 +703,6 @@ static USER_DRIVER lazy_load_driver = /* keyboard functions */ loaderdrv_ActivateKeyboardLayout, loaderdrv_Beep, - loaderdrv_GetAsyncKeyState, loaderdrv_GetKeyNameText, loaderdrv_GetKeyboardLayout, loaderdrv_GetKeyboardLayoutList, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 8b2ae805aa..0325e2ce3d 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -401,51 +401,47 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) check_for_events( QS_INPUT ); - if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) + if (key_state_info && !(key_state_info->state[key] & 0xc0) && + key_state_info->counter == counter && GetTickCount() - key_state_info->time < 50) { - if (key_state_info && - !(key_state_info->state[key] & 0xc0) && - key_state_info->counter == counter && - GetTickCount() - key_state_info->time < 50) - { - /* use cached value */ - return 0; - } - else if (!key_state_info) + /* use cached value */ + return 0; + } + else if (!key_state_info) + { + key_state_info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*key_state_info) ); + get_user_thread_info()->key_state = key_state_info; + } + + ret = 0; + SERVER_START_REQ( get_key_state ) + { + req->tid = 0; + req->key = key; + if (key_state_info) { - key_state_info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*key_state_info) ); - get_user_thread_info()->key_state = key_state_info; + prev_key_state = key_state_info->state[key]; + wine_server_set_reply( req, key_state_info->state, sizeof(key_state_info->state) ); } - - ret = 0; - SERVER_START_REQ( get_key_state ) + if (!wine_server_call( req )) { - req->tid = 0; - req->key = key; + if (reply->state & 0x40) ret |= 0x0001; + if (reply->state & 0x80) ret |= 0x8000; if (key_state_info) { - prev_key_state = key_state_info->state[key]; - wine_server_set_reply( req, key_state_info->state, sizeof(key_state_info->state) ); - } - if (!wine_server_call( req )) - { - if (reply->state & 0x40) ret |= 0x0001; - if (reply->state & 0x80) ret |= 0x8000; - if (key_state_info) - { - /* force refreshing the key state cache - some multithreaded programs - * (like Adobe Photoshop CS5) expect that changes to the async key state - * are also immediately available in other threads. */ - if (prev_key_state != key_state_info->state[key]) - counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; - - key_state_info->time = GetTickCount(); - key_state_info->counter = counter; - } + /* force refreshing the key state cache - some multithreaded programs + * (like Adobe Photoshop CS5) expect that changes to the async key state + * are also immediately available in other threads. */ + if (prev_key_state != key_state_info->state[key]) + counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; + + key_state_info->time = GetTickCount(); + key_state_info->counter = counter; } } - SERVER_END_REQ; } + SERVER_END_REQ; + return ret; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c11aae707c..7e294558ef 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -64,7 +64,6 @@ typedef struct tagUSER_DRIVER { /* keyboard functions */ HKL (CDECL *pActivateKeyboardLayout)(HKL, UINT); void (CDECL *pBeep)(void); - SHORT (CDECL *pGetAsyncKeyState)(INT); INT (CDECL *pGetKeyNameText)(LONG, LPWSTR, INT); HKL (CDECL *pGetKeyboardLayout)(DWORD); UINT (CDECL *pGetKeyboardLayoutList)(INT, HKL *);

1 0

Hans Leidekker : bcrypt: Avoid recreating cipher handles when the initialization vector doesn't change.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: f4d6df8947b9e0c26c92127e5e95464a64a52bde URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d6df8947b9e0c26c92127e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 6 10:16:54 2019 +0100 bcrypt: Avoid recreating cipher handles when the initialization vector doesn't change. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 9 +++++- dlls/bcrypt/bcrypt_main.c | 28 +++++++++++++----- dlls/bcrypt/gnutls.c | 62 +++++++++++++++++++++++++++++--------- dlls/bcrypt/macos.c | 57 ++++++++++++++++++++++++++--------- dlls/bcrypt/tests/bcrypt.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 189 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4d6df8947b9e0c26c92…

1 0

Connor McAdams : d3dcompiler: Implement d3d10 reflection GetDesc() method.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 5c708c857ec8ee3f7cf8823c57011f234eca5995 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c708c857ec8ee3f7cf8823c… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Nov 6 10:06:34 2019 +0100 d3dcompiler: Implement d3d10 reflection GetDesc() method. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 41 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 6f98217385..d3d083e8d8 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1857,9 +1857,46 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderRefle static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderReflection *iface, D3D10_SHADER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); - return E_NOTIMPL; + FIXME("iface %p, desc %p partial stub!\n", iface, desc); + + if (!desc) + { + WARN("Invalid argument specified.\n"); + return E_FAIL; + } + + desc->Version = reflection->version; + desc->Creator = reflection->creator; + desc->Flags = reflection->flags; + desc->ConstantBuffers = reflection->constant_buffer_count; + desc->BoundResources = reflection->bound_resource_count; + desc->InputParameters = reflection->isgn ? reflection->isgn->element_count : 0; + desc->OutputParameters = reflection->osgn ? reflection->osgn->element_count : 0; + desc->InstructionCount = reflection->instruction_count; + desc->TempRegisterCount = reflection->temp_register_count; + desc->TempArrayCount = reflection->temp_array_count; + desc->DefCount = 0; + desc->DclCount = reflection->dcl_count; + desc->TextureNormalInstructions = reflection->texture_normal_instructions; + desc->TextureLoadInstructions = reflection->texture_load_instructions; + desc->TextureCompInstructions = reflection->texture_comp_instructions; + desc->TextureBiasInstructions = reflection->texture_bias_instructions; + desc->TextureGradientInstructions = reflection->texture_gradient_instructions; + desc->FloatInstructionCount = reflection->float_instruction_count; + desc->IntInstructionCount = reflection->int_instruction_count; + desc->UintInstructionCount = reflection->uint_instruction_count; + desc->StaticFlowControlCount = reflection->static_flow_control_count; + desc->DynamicFlowControlCount = reflection->dynamic_flow_control_count; + desc->MacroInstructionCount = 0; + desc->ArrayInstructionCount = reflection->array_instruction_count; + desc->CutInstructionCount = reflection->cut_instruction_count; + desc->EmitInstructionCount = reflection->emit_instruction_count; + desc->GSOutputTopology = reflection->gs_output_topology; + desc->GSMaxOutputVertexCount = reflection->gs_max_output_vertex_count; + + return S_OK; } static struct ID3D10ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d10_shader_reflection_GetConstantBufferByIndex(

1 0

Connor McAdams : d3dcompiler: Init reflection data in D3D10ReflectShader().
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 0ffd0cab011a52964bbf519ae90e46bf765c8fc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ffd0cab011a52964bbf519a… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Nov 6 10:06:33 2019 +0100 d3dcompiler: Init reflection data in D3D10ReflectShader(). Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 2ea0b46a1c..6f98217385 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1694,9 +1694,6 @@ static HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_refl HRESULT hr; unsigned int i; - reflection->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl; - reflection->refcount = 1; - wine_rb_init(&reflection->types, d3dcompiler_shader_reflection_type_compare); hr = dxbc_parse(data, data_size, &src_dxbc); @@ -1921,8 +1918,9 @@ static const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl = HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector) { struct d3dcompiler_shader_reflection *object; + HRESULT hr; - FIXME("data %p, data_size %lu, reflector %p stub!\n", data, data_size, reflector); + TRACE("data %p, data_size %lu, reflector %p.\n", data, data_size, reflector); if (!(object = heap_alloc_zero(sizeof(*object)))) { @@ -1933,6 +1931,14 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; object->refcount = 1; + hr = d3dcompiler_shader_reflection_init(object, data, data_size); + if (FAILED(hr)) + { + WARN("Failed to initialize shader reflection.\n"); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + *reflector = &object->ID3D10ShaderReflection_iface; TRACE("Created ID3D10ShaderReflection %p.\n", object); @@ -1971,6 +1977,9 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void if (!object) return E_OUTOFMEMORY; + object->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl; + object->refcount = 1; + hr = d3dcompiler_shader_reflection_init(object, data, data_size); if (FAILED(hr)) {

1 0

Connor McAdams : d3dcompiler: Move d3d10 reflection stubs into d3dcompiler.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 981403e50f37eda6e76505aa6058af304fa01627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=981403e50f37eda6e76505aa… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Nov 6 10:06:32 2019 +0100 d3dcompiler: Move d3d10 reflection stubs into d3dcompiler. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/Makefile.in | 7 +- dlls/d3d10/d3d10_main.c | 22 ------- dlls/d3d10/d3d10_private.h | 8 --- dlls/d3d10/shader.c | 112 -------------------------------- dlls/d3dcompiler_43/reflection.c | 134 +++++++++++++++++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 2 + 6 files changed, 141 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=981403e50f37eda6e765…

1 0

Liam Middlebrook : d3dx11: Add D3DX11SaveTextureToFileA/W() stub.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: adef99a21c5205f02464be3139031d09fa2ce69a URL: https://source.winehq.org/git/wine.git/?a=commit;h=adef99a21c5205f02464be31… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Nov 6 10:06:31 2019 +0100 d3dx11: Add D3DX11SaveTextureToFileA/W() stub. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 4 ++-- dlls/d3dx11_43/d3dx11_43.spec | 4 ++-- dlls/d3dx11_43/texture.c | 18 ++++++++++++++++++ include/d3dx11tex.h | 10 ++++------ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index dde8821a30..30bdba4244 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -39,6 +39,6 @@ @ stub D3DX11PreprocessShaderFromResourceA @ stub D3DX11PreprocessShaderFromResourceW @ stub D3DX11SHProjectCubeMap -@ stub D3DX11SaveTextureToFileA -@ stub D3DX11SaveTextureToFileW +@ stdcall D3DX11SaveTextureToFileA(ptr ptr long str) +@ stdcall D3DX11SaveTextureToFileW(ptr ptr long wstr) @ stdcall D3DX11SaveTextureToMemory(ptr ptr long ptr long) diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index dde8821a30..30bdba4244 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -39,6 +39,6 @@ @ stub D3DX11PreprocessShaderFromResourceA @ stub D3DX11PreprocessShaderFromResourceW @ stub D3DX11SHProjectCubeMap -@ stub D3DX11SaveTextureToFileA -@ stub D3DX11SaveTextureToFileW +@ stdcall D3DX11SaveTextureToFileA(ptr ptr long str) +@ stdcall D3DX11SaveTextureToFileW(ptr ptr long wstr) @ stdcall D3DX11SaveTextureToMemory(ptr ptr long ptr long) diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index bc30015102..ee6808d76d 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -63,6 +63,24 @@ HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *d return E_NOTIMPL; } +HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, const WCHAR *filename) +{ + FIXME("context %p, texture %p, format %u, filename %s stub!\n", + context, texture, format, debugstr_w(filename)); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX11SaveTextureToFileA(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, const char *filename) +{ + FIXME("context %p, texture %p, format %u, filename %s stub!\n", + context, texture, format, debugstr_a(filename)); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Resource *texture, D3DX11_IMAGE_FILE_FORMAT format, ID3D10Blob **buffer, UINT flags) { diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 4f792ec13e..b7c00ac4fd 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -110,23 +110,21 @@ extern "C" { HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult); - HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); - HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); - HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); - HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter); - HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult); - +HRESULT WINAPI D3DX11SaveTextureToFileA(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, const char *filename); +HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, const WCHAR *filename); HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Resource *texture, D3DX11_IMAGE_FILE_FORMAT format, ID3D10Blob **buffer, UINT flags);

1 0

Paul Gofman : d3dx9: Correctly handle NULL constant state for objects on 64 bit arch.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: aef11864a47a33830eca086de8bf337ee9b5114a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aef11864a47a33830eca086d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Nov 6 10:06:29 2019 +0100 d3dx9: Correctly handle NULL constant state for objects on 64 bit arch. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 63c931e172..e69a1fd1f8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5345,8 +5345,11 @@ static HRESULT d3dx_parse_effect_annotation(struct d3dx_effect *effect, struct d static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects) { - DWORD offset; + struct d3dx_parameter *param = &state->parameter; + enum STATE_CLASS state_class; const char *ptr2; + void *new_data; + DWORD offset; HRESULT hr; state->type = ST_CONSTANT; @@ -5360,7 +5363,7 @@ static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *s read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; - hr = d3dx_parse_effect_typedef(effect, &state->parameter, data, &ptr2, NULL, 0); + hr = d3dx_parse_effect_typedef(effect, param, data, &ptr2, NULL, 0); if (hr != D3D_OK) { WARN("Failed to parse type definition\n"); @@ -5369,18 +5372,42 @@ static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *s read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx_parse_init_value(effect, &state->parameter, data, data + offset, objects); + hr = d3dx_parse_init_value(effect, param, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); goto err_out; } + if (((state_class = state_table[state->operation].class) == SC_VERTEXSHADER + || state_class == SC_PIXELSHADER || state_class == SC_TEXTURE) + && param->bytes < sizeof(void *)) + { + if (param->type != D3DXPT_INT || *(unsigned int *)param->data) + { + FIXME("Unexpected parameter for object, param->type %#x, param->class %#x, *param->data %#x.\n", + param->type, param->class, *(unsigned int *)param->data); + hr = D3DXERR_INVALIDDATA; + goto err_out; + } + + new_data = heap_realloc(param->data, sizeof(void *)); + if (!new_data) + { + ERR("Out of memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + memset(new_data, 0, sizeof(void *)); + param->data = new_data; + param->bytes = sizeof(void *); + } + return D3D_OK; err_out: - free_parameter(&state->parameter, FALSE, FALSE); + free_parameter(param, FALSE, FALSE); return hr; }

1 0

Connor McAdams : d3dx10: Add D3DX10LoadTextureFromTexture() stub.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: cb79ad8217901782f404ac60b18869a166333dc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb79ad8217901782f404ac60… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Nov 6 10:06:30 2019 +0100 d3dx10: Add D3DX10LoadTextureFromTexture() stub. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 8 ++++++++ include/d3dx10tex.h | 34 ++++++++++++++++++++++++++++++++-- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index cb491241d4..36c7633d8e 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -54,7 +54,7 @@ @ stdcall D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr) @ stub D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr) -@ stub D3DX10LoadTextureFromTexture(ptr ptr ptr) +@ stdcall D3DX10LoadTextureFromTexture(ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) @ stdcall D3DX10PreprocessShaderFromMemory(ptr long str ptr ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index b0295cc093..45247756b8 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -241,3 +241,11 @@ D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) return D3DX_NOT_OPTIMIZED; } + +HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_texture, D3DX10_TEXTURE_LOAD_INFO *load_info, + ID3D10Resource *dst_texture) +{ + FIXME("src_texture %p, load_info %p, dst_texture %p stub!\n", src_texture, load_info, dst_texture); + + return E_NOTIMPL; +} diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 25ad490949..98cb82c0c9 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -103,17 +103,47 @@ typedef struct D3DX10_IMAGE_LOAD_INFO #endif } D3DX10_IMAGE_LOAD_INFO; +typedef struct _D3DX10_TEXTURE_LOAD_INFO +{ + D3D10_BOX *pSrcBox; + D3D10_BOX *pDstBox; + UINT SrcFirstMip; + UINT DstFirstMip; + UINT NumMips; + UINT SrcFirstElement; + UINT DstFirstElement; + UINT NumElements; + UINT Filter; + UINT MipFilter; + +#ifdef __cplusplus + _D3DX10_TEXTURE_LOAD_INFO() + { + pSrcBox = NULL; + pDstBox = NULL; + SrcFirstMip = 0; + DstFirstMip = 0; + NumMips = D3DX10_DEFAULT; + SrcFirstElement = 0; + DstFirstElement = 0; + NumElements = D3DX10_DEFAULT; + Filter = D3DX10_DEFAULT; + MipFilter = D3DX10_DEFAULT; + } +#endif +} D3DX10_TEXTURE_LOAD_INFO; + #ifdef __cplusplus extern "C" { #endif HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); - HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT filter); - HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult); +HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_texture, D3DX10_TEXTURE_LOAD_INFO *load_info, + ID3D10Resource *dst_texture); #ifdef __cplusplus }

1 0

Zebediah Figura : ntoskrnl.exe: Trace the call to AddDevice().
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 781fc47f361953f7411a84e32b066d5011473bd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=781fc47f361953f7411a84e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 00:13:17 2019 -0600 ntoskrnl.exe: Trace the call to AddDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 89676a06ad..a3dbe772ae 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -226,10 +226,12 @@ static void load_function_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINF return; } + TRACE("Calling AddDevice routine %p.\n", driver_obj->DriverExtension->AddDevice); if (driver_obj->DriverExtension->AddDevice) status = driver_obj->DriverExtension->AddDevice( driver_obj, device ); else status = STATUS_NOT_IMPLEMENTED; + TRACE("AddDevice routine %p returned %#x.\n", driver_obj->DriverExtension->AddDevice, status); ObDereferenceObject( driver_obj );

1 0

Zebediah Figura : ntoskrnl.exe: Implement IRP_MN_QUERY_DEVICE_RELATIONS for root-enumerated devices.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 74b98dc82b66e0bf4db50a0c4ccb376a2bc441ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b98dc82b66e0bf4db50a0c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 00:13:16 2019 -0600 ntoskrnl.exe: Implement IRP_MN_QUERY_DEVICE_RELATIONS for root-enumerated devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index b5c4e6878e..89676a06ad 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -821,6 +821,9 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) switch (stack->MinorFunction) { + case IRP_MN_QUERY_DEVICE_RELATIONS: + /* The FDO above already handled this, so return the same status. */ + break; case IRP_MN_START_DEVICE: case IRP_MN_SURPRISE_REMOVAL: case IRP_MN_REMOVE_DEVICE:

1 0

Zebediah Figura : ntoskrnl.exe: Stub IRP_MN_QUERY_CAPABILITIES for root-enumerated devices.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 481b099345b8afa074a21c34f6b020c5e58de0d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=481b099345b8afa074a21c34… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 00:13:15 2019 -0600 ntoskrnl.exe: Stub IRP_MN_QUERY_CAPABILITIES for root-enumerated devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 5b5acd2b34..b5c4e6878e 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -827,6 +827,9 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) /* Nothing to do. */ irp->IoStatus.u.Status = STATUS_SUCCESS; break; + case IRP_MN_QUERY_CAPABILITIES: + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; case IRP_MN_QUERY_ID: { BUS_QUERY_ID_TYPE type = stack->Parameters.QueryId.IdType;

1 0

Zebediah Figura : ntoskrnl.exe: Implement many more properties in IoGetDeviceProperty().
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: c4ec69adceb6ea60d91d3f723d3a2ad959fb0761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4ec69adceb6ea60d91d3f72… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 00:13:14 2019 -0600 ntoskrnl.exe: Implement many more properties in IoGetDeviceProperty(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 17d61a096a..5b5acd2b34 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -402,7 +402,12 @@ void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RE NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROPERTY property, ULONG length, void *buffer, ULONG *needed ) { - NTSTATUS status = STATUS_NOT_IMPLEMENTED; + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; + DWORD sp_property = -1; + NTSTATUS status; + HDEVINFO set; + TRACE("device %p, property %u, length %u, buffer %p, needed %p.\n", device, property, length, buffer, needed); @@ -430,7 +435,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP status = STATUS_BUFFER_TOO_SMALL; ExFreePool( id ); - break; + return status; } case DevicePropertyPhysicalDeviceObjectName: { @@ -465,11 +470,81 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP *needed = 0; } HeapFree(GetProcessHeap(), 0, name); - break; + return status; } + case DevicePropertyDeviceDescription: + sp_property = SPDRP_DEVICEDESC; + break; + case DevicePropertyHardwareID: + sp_property = SPDRP_HARDWAREID; + break; + case DevicePropertyCompatibleIDs: + sp_property = SPDRP_COMPATIBLEIDS; + break; + case DevicePropertyClassName: + sp_property = SPDRP_CLASS; + break; + case DevicePropertyClassGuid: + sp_property = SPDRP_CLASSGUID; + break; + case DevicePropertyManufacturer: + sp_property = SPDRP_MFG; + break; + case DevicePropertyFriendlyName: + sp_property = SPDRP_FRIENDLYNAME; + break; + case DevicePropertyLocationInformation: + sp_property = SPDRP_LOCATION_INFORMATION; + break; + case DevicePropertyBusTypeGuid: + sp_property = SPDRP_BUSTYPEGUID; + break; + case DevicePropertyLegacyBusType: + sp_property = SPDRP_LEGACYBUSTYPE; + break; + case DevicePropertyBusNumber: + sp_property = SPDRP_BUSNUMBER; + break; + case DevicePropertyAddress: + sp_property = SPDRP_ADDRESS; + break; + case DevicePropertyUINumber: + sp_property = SPDRP_UI_NUMBER; + break; + case DevicePropertyInstallState: + sp_property = SPDRP_INSTALL_STATE; + break; + case DevicePropertyRemovalPolicy: + sp_property = SPDRP_REMOVAL_POLICY; + break; default: FIXME("Unhandled property %u.\n", property); + return STATUS_NOT_IMPLEMENTED; + } + + if ((status = get_device_instance_id( device, device_instance_id ))) + return status; + + if ((set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL )) == INVALID_HANDLE_VALUE) + { + ERR("Failed to create device list, error %#x.\n", GetLastError()); + return GetLastError(); } + + if (!SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device)) + { + ERR("Failed to open device, error %#x.\n", GetLastError()); + SetupDiDestroyDeviceInfoList( set ); + return GetLastError(); + } + + if (SetupDiGetDeviceRegistryPropertyW( set, &sp_device, sp_property, NULL, buffer, length, needed )) + status = STATUS_SUCCESS; + else + status = GetLastError(); + + SetupDiDestroyDeviceInfoList( set ); + return status; }

1 0

Zebediah Figura : ntdll: Set the ProgramFiles(x86) and CommonProgramFiles(x86) environment variables.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 87307de2173ee813daca9bd93ec750f17d3eda94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87307de2173ee813daca9bd9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 5 21:48:59 2019 -0600 ntdll: Set the ProgramFiles(x86) and CommonProgramFiles(x86) environment variables. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40950 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 87ab9bef62..03c0a20624 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -367,10 +367,12 @@ static void set_wow64_environment( WCHAR **env ) static const WCHAR progdirW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',0}; static const WCHAR progdir86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',' ','(','x','8','6',')',0}; static const WCHAR progfilesW[] = {'P','r','o','g','r','a','m','F','i','l','e','s',0}; + static const WCHAR progfiles86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','(','x','8','6',')',0}; static const WCHAR progw6432W[] = {'P','r','o','g','r','a','m','W','6','4','3','2',0}; static const WCHAR commondirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',0}; static const WCHAR commondir86W[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',' ','(','x','8','6',')',0}; static const WCHAR commonfilesW[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s',0}; + static const WCHAR commonfiles86W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s','(','8','6',')',0}; static const WCHAR commonw6432W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','W','6','4','3','2',0}; static const WCHAR winedlldirW[] = {'W','I','N','E','D','L','L','D','I','R','%','u',0}; static const WCHAR winehomedirW[] = {'W','I','N','E','H','O','M','E','D','I','R',0}; @@ -435,9 +437,10 @@ static void set_wow64_environment( WCHAR **env ) if (is_win64 || !is_wow64) set_env_var( env, progfilesW, val ); RtlFreeHeap( GetProcessHeap(), 0, val ); } - if (is_wow64 && (val = get_registry_value( *env, hkey, progdir86W ))) + if ((val = get_registry_value( *env, hkey, progdir86W ))) { - set_env_var( env, progfilesW, val ); + if (is_win64 || is_wow64) set_env_var( env, progfiles86W, val ); + if (is_wow64) set_env_var( env, progfilesW, val ); RtlFreeHeap( GetProcessHeap(), 0, val ); } @@ -449,9 +452,10 @@ static void set_wow64_environment( WCHAR **env ) if (is_win64 || !is_wow64) set_env_var( env, commonfilesW, val ); RtlFreeHeap( GetProcessHeap(), 0, val ); } - if (is_wow64 && (val = get_registry_value( *env, hkey, commondir86W ))) + if ((val = get_registry_value( *env, hkey, commondir86W ))) { - set_env_var( env, commonfilesW, val ); + if (is_win64 || is_wow64) set_env_var( env, commonfiles86W, val ); + if (is_wow64) set_env_var( env, commonfilesW, val ); RtlFreeHeap( GetProcessHeap(), 0, val ); } NtClose( hkey );

1 0

Zebediah Figura : userenv: Add a set_env_var() helper.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: b8cf78641295c0b3a7ae1fc8ff6652649e3cccf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8cf78641295c0b3a7ae1fc8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 5 21:48:58 2019 -0600 userenv: Add a set_env_var() helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/userenv_main.c | 116 +++++++++++--------------------------------- 1 file changed, 27 insertions(+), 89 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 9f10cfa1d7..045bac0cfe 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -93,6 +93,15 @@ static BOOL get_reg_value(WCHAR *env, HKEY hkey, const WCHAR *name, WCHAR *val, return FALSE; } +static void set_env_var( WCHAR **env, const WCHAR *name, const WCHAR *val ) +{ + UNICODE_STRING nameW, valW; + + RtlInitUnicodeString( &nameW, name ); + RtlInitUnicodeString( &valW, val ); + RtlSetEnvironmentVariable( env, &nameW, &valW ); +} + static void set_registry_variables(WCHAR **env, HKEY hkey, DWORD type, BOOL set_path) { UNICODE_STRING us_name, us_value; @@ -124,25 +133,17 @@ static void set_registry_variables(WCHAR **env, HKEY hkey, DWORD type, BOOL set_ continue; value[size] = ';'; - RtlInitUnicodeString(&us_value, value); - RtlSetEnvironmentVariable(env, &us_name, &us_value); + set_env_var(env, name, value); continue; } - if (!get_reg_value(*env, hkey, name, value, sizeof(value))) - continue; - - if(!value[0]) - continue; - - RtlInitUnicodeString(&us_value, value); - RtlSetEnvironmentVariable(env, &us_name, &us_value); + if (get_reg_value(*env, hkey, name, value, sizeof(value)) && value[0]) + set_env_var(env, name, value); } } static void set_wow64_environment(WCHAR **env) { - UNICODE_STRING nameW, valueW; WCHAR buf[64]; HKEY hkey; BOOL is_win64 = (sizeof(void *) > sizeof(int)); @@ -158,66 +159,26 @@ static void set_wow64_environment(WCHAR **env) if (get_reg_value(*env, hkey, L"ProgramFilesDir", buf, sizeof(buf))) { - if (is_win64 || is_wow64) - { - RtlInitUnicodeString(&nameW, L"ProgramW6432"); - RtlInitUnicodeString(&valueW, buf); - RtlSetEnvironmentVariable(env, &nameW, &valueW); - } - if (is_win64 || !is_wow64) - { - RtlInitUnicodeString(&nameW, L"ProgramFiles"); - RtlInitUnicodeString(&valueW, buf); - RtlSetEnvironmentVariable(env, &nameW, &valueW); - } + if (is_win64 || is_wow64) set_env_var(env, L"ProgramW6432", buf); + if (is_win64 || !is_wow64) set_env_var(env, L"ProgramFiles", buf); } if (get_reg_value(*env, hkey, L"ProgramFilesDir (x86)", buf, sizeof(buf))) { - if (is_win64 || is_wow64) - { - RtlInitUnicodeString(&nameW, L"ProgramFiles(x86)"); - RtlInitUnicodeString(&valueW, buf); - RtlSetEnvironmentVariable(env, &nameW, &valueW); - } - if (is_wow64) - { - RtlInitUnicodeString(&nameW, L"ProgramFiles"); - RtlInitUnicodeString(&valueW, buf); - RtlSetEnvironmentVariable(env, &nameW, &valueW); - } + if (is_win64 || is_wow64) set_env_var(env, L"ProgramFiles(x86)", buf); + if (is_wow64) set_env_var(env, L"ProgramFiles", buf); } /* set the CommonProgramFiles variables */ if (get_reg_value(*env, hkey, L"CommonFilesDir", buf, sizeof(buf))) { - if (is_win64 || is_wow64) - { - RtlInitUnicodeString(&nameW, L"CommonProgramW6432"); - RtlInitUnicodeString(&valueW, buf); - RtlSetEnvironmentVariable(env, &nameW, &valueW); - } - if (is_win64 || !is_wow64) - { - RtlInitUnicodeString(&nameW, L"CommonProgramFiles"); - RtlInitUnicodeString(&valueW, buf); - RtlSetEnvironmentVariable(env, &nameW, &valueW); - } + if (is_win64 || is_wow64) set_env_var(env, L"CommonProgramW6432", buf); + if (is_win64 || !is_wow64) set_env_var(env, L"CommonProgramFiles", buf); } if (get_reg_value(*env, hkey, L"CommonFilesDir (x86)", buf, sizeof(buf))) { - if (is_win64 || is_wow64) - { - RtlInitUnicodeString(&nameW, L"CommonProgramFiles(x86)"); - RtlInitUnicodeString(&valueW, buf); - RtlSetEnvironmentVariable(env, &nameW, &valueW); - } - if (is_wow64) - { - RtlInitUnicodeString(&nameW, L"CommonProgramFiles"); - RtlInitUnicodeString(&valueW, buf); - RtlSetEnvironmentVariable(env, &nameW, &valueW); - } + if (is_win64 || is_wow64) set_env_var(env, L"CommonProgramFiles(x86)", buf); + if (is_wow64) set_env_var(env, L"CommonProgramFiles", buf); } RegCloseKey(hkey); @@ -230,7 +191,6 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, static const WCHAR profile_keyW[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList"; WCHAR *env, buf[UNICODE_STRING_MAX_CHARS], profiles_dir[MAX_PATH]; - UNICODE_STRING us_name, us_val; DWORD len; HKEY hkey, hsubkey; @@ -256,9 +216,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, WARN("SystemRoot variable not set\n"); } } - RtlInitUnicodeString(&us_name, L"SystemRoot"); - RtlInitUnicodeString(&us_val, buf); - RtlSetEnvironmentVariable(&env, &us_name, &us_val); + set_env_var(&env, L"SystemRoot", buf); if (!GetEnvironmentVariableW(L"SystemDrive", buf, UNICODE_STRING_MAX_CHARS)) { @@ -268,9 +226,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, WARN("SystemDrive variable not set\n"); } } - RtlInitUnicodeString(&us_name, L"SystemDrive"); - RtlInitUnicodeString(&us_val, buf); - RtlSetEnvironmentVariable(&env, &us_name, &us_val); + set_env_var(&env, L"SystemDrive", buf); set_registry_variables(&env, hkey, REG_SZ, !bInherit); set_registry_variables(&env, hkey, REG_EXPAND_SZ, !bInherit); @@ -302,11 +258,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, } if (get_reg_value(env, hkey, L"Public", buf, UNICODE_STRING_MAX_CHARS)) - { - RtlInitUnicodeString(&us_name, L"ALLUSERSPROFILE"); - RtlInitUnicodeString(&us_val, buf); - RtlSetEnvironmentVariable(&env, &us_name, &us_val); - } + set_env_var(&env, L"ALLUSERSPROFILE", buf); } else { @@ -318,11 +270,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, len = ARRAY_SIZE(buf); if (GetComputerNameW(buf, &len)) - { - RtlInitUnicodeString(&us_name, L"COMPUTERNAME"); - RtlInitUnicodeString(&us_val, buf); - RtlSetEnvironmentVariable(&env, &us_name, &us_val); - } + set_env_var(&env, L"COMPUTERNAME", buf); set_wow64_environment(&env); @@ -335,9 +283,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, { wcscpy(buf, profiles_dir); wcscat(buf, L"Default"); - RtlInitUnicodeString(&us_name, L"USERPROFILE"); - RtlInitUnicodeString(&us_val, buf); - RtlSetEnvironmentVariable(&env, &us_name, &us_val); + set_env_var(&env, L"USERPROFILE", buf); } } @@ -368,16 +314,8 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, if (LookupAccountSidW(NULL, token_user->User.Sid, buf+len, &size, NULL, &tmp, &use)) { - RtlInitUnicodeString(&us_name, L"USERNAME"); - RtlInitUnicodeString(&us_val, buf+len); - RtlSetEnvironmentVariable(&env, &us_name, &us_val); - - if (len) - { - RtlInitUnicodeString(&us_name, L"USERPROFILE"); - RtlInitUnicodeString(&us_val, buf); - RtlSetEnvironmentVariable(&env, &us_name, &us_val); - } + set_env_var(&env, L"USERNAME", buf+len); + if (len) set_env_var(&env, L"USERPROFILE", buf); } HeapFree(GetProcessHeap(), 0, token_user);

1 0

Zebediah Figura : userenv: Set the ProgramFiles(x86) and CommonProgramFiles(x86) environment variables.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 99dc0e0eeb6ff99d253921055af1ca7d95d0d6dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=99dc0e0eeb6ff99d25392105… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 5 21:48:57 2019 -0600 userenv: Set the ProgramFiles(x86) and CommonProgramFiles(x86) environment variables. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/tests/userenv.c | 2 ++ dlls/userenv/userenv_main.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 79b4d59a61..f6cfcc79ec 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -104,6 +104,8 @@ static void test_create_env(void) { "USERPROFILE" } }; static const struct profile_item common_win64_vars[] = { + { "ProgramFiles(x86)" }, + { "CommonProgramFiles(x86)" }, { "ProgramW6432" }, { "CommonProgramW6432" } }; diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 9317c82735..9f10cfa1d7 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -171,11 +171,20 @@ static void set_wow64_environment(WCHAR **env) RtlSetEnvironmentVariable(env, &nameW, &valueW); } } - if (is_wow64 && get_reg_value(*env, hkey, L"ProgramFilesDir (x86)", buf, sizeof(buf))) + if (get_reg_value(*env, hkey, L"ProgramFilesDir (x86)", buf, sizeof(buf))) { - RtlInitUnicodeString(&nameW, L"ProgramFiles"); - RtlInitUnicodeString(&valueW, buf); - RtlSetEnvironmentVariable(env, &nameW, &valueW); + if (is_win64 || is_wow64) + { + RtlInitUnicodeString(&nameW, L"ProgramFiles(x86)"); + RtlInitUnicodeString(&valueW, buf); + RtlSetEnvironmentVariable(env, &nameW, &valueW); + } + if (is_wow64) + { + RtlInitUnicodeString(&nameW, L"ProgramFiles"); + RtlInitUnicodeString(&valueW, buf); + RtlSetEnvironmentVariable(env, &nameW, &valueW); + } } /* set the CommonProgramFiles variables */ @@ -195,11 +204,20 @@ static void set_wow64_environment(WCHAR **env) RtlSetEnvironmentVariable(env, &nameW, &valueW); } } - if (is_wow64 && get_reg_value(*env, hkey, L"CommonFilesDir (x86)", buf, sizeof(buf))) + if (get_reg_value(*env, hkey, L"CommonFilesDir (x86)", buf, sizeof(buf))) { - RtlInitUnicodeString(&nameW, L"CommonProgramFiles"); - RtlInitUnicodeString(&valueW, buf); - RtlSetEnvironmentVariable(env, &nameW, &valueW); + if (is_win64 || is_wow64) + { + RtlInitUnicodeString(&nameW, L"CommonProgramFiles(x86)"); + RtlInitUnicodeString(&valueW, buf); + RtlSetEnvironmentVariable(env, &nameW, &valueW); + } + if (is_wow64) + { + RtlInitUnicodeString(&nameW, L"CommonProgramFiles"); + RtlInitUnicodeString(&valueW, buf); + RtlSetEnvironmentVariable(env, &nameW, &valueW); + } } RegCloseKey(hkey);

1 0

Zebediah Figura : userenv: Fix a copy-paste error.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: c31049b885a968524397c1bf8d39b3a523ca93a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c31049b885a968524397c1bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 5 21:48:55 2019 -0600 userenv: Fix a copy-paste error. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/userenv_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index b811c8315f..005166e5f4 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -281,7 +281,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, if (!GetEnvironmentVariableW(SystemDriveW, buf, UNICODE_STRING_MAX_CHARS)) { - if (!get_reg_value(env, hkey, SystemRootW, buf, UNICODE_STRING_MAX_CHARS)) + if (!get_reg_value(env, hkey, SystemDriveW, buf, UNICODE_STRING_MAX_CHARS)) { buf[0] = 0; WARN("SystemDrive variable not set\n");

1 0

Zebediah Figura : userenv: Use wide character string literals.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 6a079faf70d5fcb0dce14f6355fe5f0f590b217f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a079faf70d5fcb0dce14f63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 5 21:48:56 2019 -0600 userenv: Use wide character string literals. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/userenv_main.c | 114 +++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a079faf70d5fcb0dce1…

1 0

Alistair Leslie-Hughes : dmstyle: IDirectMusicTrack GetParam add pointer check.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 7f469b689a2dccc0863952cd73e592df391dc607 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f469b689a2dccc0863952cd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 5 22:18:21 2019 +0100 dmstyle: IDirectMusicTrack GetParam add pointer check. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/auditiontrack.c | 10 +++++++--- dlls/dmstyle/chordtrack.c | 10 +++++++--- dlls/dmstyle/commandtrack.c | 10 +++++++--- dlls/dmstyle/motiftrack.c | 10 +++++++--- dlls/dmstyle/mutetrack.c | 10 +++++++--- dlls/dmstyle/styletrack.c | 10 +++++++--- dlls/dmstyle/tests/dmstyle.c | 6 +++--- 7 files changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 3c304ca574..ca975093fb 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -121,9 +121,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index fd290bf7a9..70056e5677 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -124,9 +124,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index e326241c4b..0afac074c7 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -123,9 +123,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index d4a4effec7..526a28111d 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -121,9 +121,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 67bfbc30dc..5d85a1b61e 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -121,9 +121,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 79b4787ca0..a75853bf16 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -123,9 +123,13 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + + if (!rguidType) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a94640d13d..6b2275866c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -279,12 +279,12 @@ static void test_track(void) else todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); } - todo_wine { + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); - } + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); if (class[i].clsid == &CLSID_DirectMusicMuteTrack) {

1 0

Louis Lenders : wine.inf: Add value for DigitalProductId.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 51c297afa5ee9220280a1f853fcba77d20890afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c297afa5ee9220280a1f85… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Nov 5 18:48:37 2019 +0100 wine.inf: Add value for DigitalProductId. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24529 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index df74f28e66..a2bcfae935 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3756,6 +3756,13 @@ HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" +HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 @@ -3767,6 +3774,13 @@ HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" +HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100

1 0

Zhiyi Zhang : winex11.drv: Fix NoRes mode handler having an empty mode.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 427152ec7b4ee85631617b693dbf1deea763c0ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=427152ec7b4ee85631617b69… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 5 21:05:45 2019 +0800 winex11.drv: Fix NoRes mode handler having an empty mode. After 25167fb286822c93582457815bcf069fef040976 get_primary_monitor_rect() returns an empty rectangle before X11DRV_DisplayDevices_Init() is called. So use get_host_primary_monitor_rect() to get the current X desktop size. It's also more intuitive this way. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 800b65dbfd..a4f172037c 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -146,7 +146,7 @@ static LONG X11DRV_nores_SetCurrentMode(int mode) /* default handler only gets the current X desktop resolution */ void X11DRV_Settings_Init(void) { - RECT primary = get_primary_monitor_rect(); + RECT primary = get_host_primary_monitor_rect(); X11DRV_Settings_SetHandlers("NoRes", X11DRV_nores_GetCurrentMode, X11DRV_nores_SetCurrentMode,

1 0

Zhiyi Zhang : winex11.drv: Move the desktop fullscreen check after desktop init.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: b7b4bacaf99661e07c2f07a0260680b4e8bed4f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7b4bacaf99661e07c2f07a0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 5 21:05:31 2019 +0800 winex11.drv: Move the desktop fullscreen check after desktop init. After 25167fb286822c93582457815bcf069fef040976, get_primary_monitor_rect(), which is used in is_window_rect_fullscreen(), may return the primary screen size set by the last explorer instance if wineserver didn't fully shuts down. Also get_primary_monitor_rect() no longer reports the host primary monitor rect before virtual desktop initialization now. So move the desktop fullscreen check after desktop initialization so that primary screen size is updated and valid. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 2428293c4f..d70b38b2b3 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -281,7 +281,6 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) XSetWindowAttributes win_attr; Window win; Display *display = thread_init_display(); - RECT rect; WCHAR name[MAX_PATH]; if (!GetUserObjectInformationW( GetThreadDesktop( GetCurrentThreadId() ), @@ -308,18 +307,17 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) 0, 0, width, height, 0, default_visual.depth, InputOutput, default_visual.visual, CWEventMask | CWCursor | CWColormap, &win_attr ); if (!win) return FALSE; + if (!create_desktop_win_data( win )) return FALSE; - SetRect( &rect, 0, 0, width, height ); - if (is_window_rect_fullscreen( &rect )) + X11DRV_init_desktop( win, width, height ); + if (is_desktop_fullscreen()) { TRACE("setting desktop to fullscreen\n"); XChangeProperty( display, win, x11drv_atom(_NET_WM_STATE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&x11drv_atom(_NET_WM_STATE_FULLSCREEN), 1); } - if (!create_desktop_win_data( win )) return FALSE; XFlush( display ); - X11DRV_init_desktop( win, width, height ); return TRUE; }

1 0

Zhiyi Zhang : winex11.drv: Get virtual desktop size limit from the host primary display.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: acf03ed9da0f7d3f94de9b47c44366be3ee47f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=acf03ed9da0f7d3f94de9b47… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 5 21:05:10 2019 +0800 winex11.drv: Get virtual desktop size limit from the host primary display. After 25167fb286822c93582457815bcf069fef040976, get_primary_monitor_rect() maybe invalid before display device initialization or returns the desktop rectangle after desktop initialization in virtual desktop mode, which is wrong. The desktop size limit should come from host system. This fixes a regression from efbbe66669a060dd01b3ae399f5a9e7328312f03. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47815 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 8 +++----- dlls/winex11.drv/display.c | 21 +++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index a3b2f0cbf2..2428293c4f 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -238,12 +238,14 @@ static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) */ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { - RECT primary_rect; + RECT primary_rect = get_host_primary_monitor_rect(); root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ desktop_width = width; desktop_height = height; + max_width = primary_rect.right; + max_height = primary_rect.bottom; /* Initialize virtual desktop mode display device handler */ desktop_handler.name = "Virtual Desktop"; @@ -257,10 +259,6 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) TRACE("Display device functions are now handled by: Virtual Desktop\n"); X11DRV_DisplayDevices_Init( TRUE ); - primary_rect = get_primary_monitor_rect(); - max_width = primary_rect.right - primary_rect.left; - max_height = primary_rect.bottom - primary_rect.top; - /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode, diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index d3ee653f21..7ad74c9b4e 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -233,6 +233,27 @@ RECT get_primary_monitor_rect(void) return primary; } +/* Get the primary monitor rect from the host system */ +RECT get_host_primary_monitor_rect(void) +{ + INT gpu_count, adapter_count, monitor_count; + struct x11drv_gpu *gpus = NULL; + struct x11drv_adapter *adapters = NULL; + struct x11drv_monitor *monitors = NULL; + RECT rect = {0}; + + /* The first monitor is always primary */ + if (host_handler.get_gpus(&gpus, &gpu_count) && gpu_count && + host_handler.get_adapters(gpus[0].id, &adapters, &adapter_count) && adapter_count && + host_handler.get_monitors(adapters[0].id, &monitors, &monitor_count) && monitor_count) + rect = monitors[0].rc_monitor; + + if (gpus) host_handler.free_gpus(gpus); + if (adapters) host_handler.free_adapters(adapters); + if (monitors) host_handler.free_monitors(monitors); + return rect; +} + void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) { if (new_handler->priority > host_handler.priority) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4a6de9053d..ef8a42d609 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -643,6 +643,7 @@ extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; +extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern void query_work_area( RECT *rc_work ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN;

1 0

Zhiyi Zhang : winex11.drv: Use a separate virtual desktop display device handler.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 914b5519b1cd96f9ae19f1eec226e94af96354b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=914b5519b1cd96f9ae19f1ee… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 5 21:04:27 2019 +0800 winex11.drv: Use a separate virtual desktop display device handler. If we want to query host monitor dimensions, we need to use XRandR or Xinerama handler. However when in virtual desktop mode, its display device handler overrides other handlers. So we need to separate them. Then we can implement features that require host monitor dimensions like checking whether the virtual desktop window is fullscreen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 104 ++++++++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/display.c | 34 ++++++++------- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/xinerama.c | 31 +++---------- 4 files changed, 128 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=914b5519b1cd96f9ae19…

1 0

Zhiyi Zhang : winex11.drv: Introduce is_virtual_desktop().
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 99d047724e768822d6508573cd82a5c75b30bdcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=99d047724e768822d6508573… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 5 21:04:07 2019 +0800 winex11.drv: Introduce is_virtual_desktop(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 8 +++++++- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/palette.c | 2 +- dlls/winex11.drv/systray.c | 2 +- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xinerama.c | 4 ++-- dlls/winex11.drv/xrandr.c | 2 +- dlls/winex11.drv/xvidmode.c | 2 +- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index fed8dd32e9..e4eb61f7bd 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -77,6 +77,12 @@ static struct screen_size { #define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_ADD 1 +/* Return TRUE if Wine is currently in virtual desktop mode */ +BOOL is_virtual_desktop(void) +{ + return root_window != DefaultRootWindow( gdi_display ); +} + /* create the mode structures */ static void make_modes(void) { @@ -268,7 +274,7 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) Display *display = thread_display(); XEvent xev; - if (!display || root_window == DefaultRootWindow( display )) return; + if (!display || !is_virtual_desktop()) return; xev.xclient.type = ClientMessage; xev.xclient.window = root_window; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 25730192d3..dd8837c11d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -827,7 +827,7 @@ static void focus_out( Display *display , HWND hwnd ) x11drv_thread_data()->last_focus = hwnd; if ((xic = X11DRV_get_ic( hwnd ))) XUnsetICFocus( xic ); - if (root_window != DefaultRootWindow(display)) + if (is_virtual_desktop()) { if (hwnd == GetDesktopWindow()) reset_clipping_window(); return; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 15e5c04a41..290732fa93 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -572,7 +572,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) { RECT virtual_rect = get_virtual_screen_rect(); if (!EqualRect( &rect, &virtual_rect )) return FALSE; - if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + if (is_virtual_desktop()) return FALSE; } TRACE( "win %p clipping fullscreen\n", hwnd ); return grab_clipping_window( &rect ); diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 073761a5ee..25bdb5f2bf 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -217,7 +217,7 @@ int X11DRV_PALETTE_Init(void) { X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_PRIVATE; - if( root_window != DefaultRootWindow(gdi_display) ) + if (is_virtual_desktop()) { win_attr.colormap = default_colormap; XChangeWindowAttributes( gdi_display, root_window, CWColormap, &win_attr ); diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index d4262c43cf..3be4bd6534 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -587,7 +587,7 @@ static BOOL init_systray(void) WNDCLASSEXW class; Display *display; - if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + if (is_virtual_desktop()) return FALSE; if (init_done) return TRUE; icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2 * ICON_BORDER; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f3c6a1b3cb..99e4094ebd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2474,7 +2474,7 @@ static BOOL hide_icon( struct x11drv_win_data *data ) if (data->managed) return TRUE; /* hide icons in desktop mode when the taskbar is active */ - if (root_window == DefaultRootWindow( gdi_display )) return FALSE; + if (!is_virtual_desktop()) return FALSE; return IsWindowVisible( FindWindowW( trayW, NULL )); } @@ -2781,7 +2781,7 @@ static BOOL is_netwm_supported( Display *display, Atom atom ) */ static LRESULT start_screensaver(void) { - if (root_window == DefaultRootWindow(gdi_display)) + if (!is_virtual_desktop()) { const char *argv[3] = { "xdg-screensaver", "activate", NULL }; int pid = _spawnvp( _P_DETACH, argv[0], argv ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 35e27334db..a96f57dc37 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -656,6 +656,7 @@ struct x11drv_mode_info extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; +extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 57c77d6273..bd607f3006 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -310,10 +310,10 @@ void xinerama_init( unsigned int width, unsigned int height ) SetRect( &rect, 0, 0, width, height ); - if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) + if (is_virtual_desktop() || !query_screens()) { default_monitor.rcWork = default_monitor.rcMonitor = rect; - if (root_window == DefaultRootWindow( gdi_display )) + if (!is_virtual_desktop()) query_work_area( &default_monitor.rcWork ); else query_desktop_work_area( &default_monitor.rcWork ); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 0a64613fac..5616857347 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1099,7 +1099,7 @@ void X11DRV_XRandR_Init(void) if (major) return; /* already initialized? */ if (!usexrandr) return; /* disabled in config */ - if (root_window != DefaultRootWindow( gdi_display )) return; + if (is_virtual_desktop()) return; if (!(ret = load_xrandr())) return; /* can't load the Xrandr library */ /* see if Xrandr is available */ diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 975575fe77..5acc95bd2e 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -210,7 +210,7 @@ void X11DRV_XF86VM_Init(void) #endif /* X_XF86VidModeSetGammaRamp */ /* retrieve modes */ - if (usexvidmode && root_window == DefaultRootWindow( gdi_display )) + if (usexvidmode && !is_virtual_desktop()) { X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ok = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes);

1 0

Sven Baars : urlmon/tests: Fix a test failure on Windows XP.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 8180e338ea07a3b4c89641696505ee4260c9e605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8180e338ea07a3b4c8964169… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 19 14:28:56 2019 +0200 urlmon/tests: Fix a test failure on Windows XP. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 1aef981b83..287eb2702e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3911,7 +3911,8 @@ static BOOL can_do_https(void) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), + ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT) + || broken(GetLastError() == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) /* WinXP */, "request failed: %u\n", GetLastError()); InternetCloseHandle(req);

1 0

Rémi Bernon : user32/tests: Wait and flush messages after window creation.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 9099b9843f048565b8bc5b3ee084df55956c5bf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9099b9843f048565b8bc5b3e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 13:46:51 2019 +0100 user32/tests: Wait and flush messages after window creation. The window created in the separate thread in test_Input_mouse sometimes fails to catch the mouse input in time. Waiting and flushing the initial messages seems to make the issue harder to reproduce. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1e6be311ee..d0e7603811 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2196,6 +2196,7 @@ static DWORD WINAPI create_static_win(void *arg) { struct thread_data *thread_data = arg; HWND win; + MSG msg; win = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); @@ -2204,6 +2205,7 @@ static DWORD WINAPI create_static_win(void *arg) GWLP_WNDPROC, (LONG_PTR)static_hook_proc); thread_data->win = win; + while (wait_for_message(&msg)) DispatchMessageA(&msg); SetEvent(thread_data->start_event); wait_for_event(thread_data->end_event, 5000); return 0;

1 0

Alistair Leslie-Hughes : user32: WM_MOUSEACTIVATE should return MA_NOACTIVATE for WM_LBUTTONDOWN/HTCAPTION message.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 71d35d8940118bc6de6522913fb8c473fa5b2c24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d35d8940118bc6de652291… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 1 03:07:19 2019 +0000 user32: WM_MOUSEACTIVATE should return MA_NOACTIVATE for WM_LBUTTONDOWN/HTCAPTION message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47945 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 2 +- dlls/user32/tests/win.c | 60 +++++++++++++++++++++++++------------------------ 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index c0d1190710..9cd1298923 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -409,7 +409,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } /* Caption clicks are handled by NC_HandleNCLButtonDown() */ - return MA_ACTIVATE; + return ( HIWORD(lParam) == WM_LBUTTONDOWN && LOWORD(lParam) == HTCAPTION ? MA_NOACTIVATE : MA_ACTIVATE ); case WM_ACTIVATE: /* The default action in Windows is to set the keyboard focus to diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 784849b2ba..78dc55f00a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2717,7 +2717,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_SHOWWINDOW); ok(ret, "Got %d\n", ret); flush_events( TRUE ); - todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd_child); } @@ -3371,8 +3371,8 @@ static void test_SetForegroundWindow(HWND hwnd) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); if (0) check_wnd_state(hwnd2, hwnd2, hwnd2, 0); - todo_wine ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow()); - todo_wine ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus()); + ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow()); + ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus()); SetForegroundWindow(hwnd); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3936,34 +3936,36 @@ static void test_mouse_input(HWND hwnd) ok(peek_message(&msg), "no message available\n"); /* Test WM_MOUSEACTIVATE */ -#define TEST_MOUSEACTIVATE(A,B) \ +#define TEST_MOUSEACTIVATE(A,B,C) \ res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ - ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); + ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ + res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ + ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); - TEST_MOUSEACTIVATE(HTERROR,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTRANSPARENT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTNOWHERE,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLIENT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCAPTION,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTSYSMENU,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTSIZE,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMENU,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHSCROLL,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTVSCROLL,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMINBUTTON,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMAXBUTTON,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTLEFT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTRIGHT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOP,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPLEFT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPRIGHT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOM,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMLEFT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMRIGHT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBORDER,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTOBJECT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLOSE,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHELP,MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); + TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); ShowWindow(popup, SW_HIDE);

1 0

Jacek Caban : vbscript: Clean up lookup_identifier.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: ae1291cbe0c7fbe0dd4aeffbe214388c4ebecb2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae1291cbe0c7fbe0dd4aeffb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:09:20 2019 +0100 vbscript: Clean up lookup_identifier. Be more explicit about what applies only to non-global code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 211a5af5f8..89f9d359da 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -109,26 +109,26 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - for(i=0; i < ctx->func->var_cnt; i++) { - if(!wcsicmp(ctx->func->vars[i].name, name)) { - ref->type = REF_VAR; - ref->u.v = ctx->vars+i; - return TRUE; + if(ctx->func->type != FUNC_GLOBAL) { + for(i=0; i < ctx->func->var_cnt; i++) { + if(!wcsicmp(ctx->func->vars[i].name, name)) { + ref->type = REF_VAR; + ref->u.v = ctx->vars+i; + return TRUE; + } } - } - for(i=0; i < ctx->func->arg_cnt; i++) { - if(!wcsicmp(ctx->func->args[i].name, name)) { - ref->type = REF_VAR; - ref->u.v = ctx->args+i; - return S_OK; + for(i=0; i < ctx->func->arg_cnt; i++) { + if(!wcsicmp(ctx->func->args[i].name, name)) { + ref->type = REF_VAR; + ref->u.v = ctx->args+i; + return S_OK; + } } - } - if(lookup_dynamic_vars(ctx->func->type == FUNC_GLOBAL ? ctx->script->global_vars : ctx->dynamic_vars, name, ref)) - return S_OK; + if(lookup_dynamic_vars(ctx->dynamic_vars, name, ref)) + return S_OK; - if(ctx->func->type != FUNC_GLOBAL) { if(ctx->vbthis) { /* FIXME: Bind such identifier while generating bytecode. */ for(i=0; i < ctx->vbthis->desc->prop_cnt; i++) { @@ -159,7 +159,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref)) + if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; for(i = 0; i < ctx->script->global_funcs_cnt; i++) {

1 0

Jacek Caban : vbscript: Store only VBScript this objects in execution context.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 708c1e865d8938973491fe44fcd25d658e218a71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=708c1e865d8938973491fe44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:09:04 2019 +0100 vbscript: Store only VBScript this objects in execution context. If it's an implicit this, we can handle that in interp_me. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a74c6c320e..211a5af5f8 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -31,7 +31,6 @@ typedef struct { instr_t *instr; script_ctx_t *script; function_t *func; - IDispatch *this_obj; vbdisp_t *vbthis; VARIANT *args; @@ -1446,13 +1445,21 @@ static HRESULT interp_stop(exec_ctx_t *ctx) static HRESULT interp_me(exec_ctx_t *ctx) { + IDispatch *disp; VARIANT v; TRACE("\n"); - IDispatch_AddRef(ctx->this_obj); + if(ctx->vbthis) + disp = (IDispatch*)&ctx->vbthis->IDispatchEx_iface; + else if(ctx->script->host_global) + disp = ctx->script->host_global; + else + disp = (IDispatch*)&ctx->script->script_obj->IDispatchEx_iface; + + IDispatch_AddRef(disp); V_VT(&v) = VT_DISPATCH; - V_DISPATCH(&v) = ctx->this_obj; + V_DISPATCH(&v) = disp; return stack_push(ctx, &v); } @@ -2205,8 +2212,8 @@ static void release_exec(exec_ctx_t *ctx) VariantClear(&ctx->ret_val); release_dynamic_vars(ctx->dynamic_vars); - if(ctx->this_obj) - IDispatch_Release(ctx->this_obj); + if(ctx->vbthis) + IDispatchEx_Release(&ctx->vbthis->IDispatchEx_iface); if(ctx->args) { for(i=0; i < ctx->func->arg_cnt; i++) @@ -2301,14 +2308,9 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd IActiveScriptSite_OnEnterScript(ctx->site); if(vbthis) { - exec.this_obj = (IDispatch*)&vbthis->IDispatchEx_iface; + IDispatchEx_AddRef(&vbthis->IDispatchEx_iface); exec.vbthis = vbthis; - }else if (ctx->host_global) { - exec.this_obj = ctx->host_global; - }else { - exec.this_obj = (IDispatch*)&ctx->script_obj->IDispatchEx_iface; } - IDispatch_AddRef(exec.this_obj); exec.instr = exec.code->instrs + func->code_off; exec.script = ctx;

1 0

Jacek Caban : vbscript: Lookup this object in lookup_identifier only if it's an actual VBScript object.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 3c366be35384790713d9cc5e06ab28dcda5bf50f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c366be35384790713d9cc5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:08:47 2019 +0100 vbscript: Lookup this object in lookup_identifier only if it's an actual VBScript object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 14 +++++++------- dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4800ae7ce6..a74c6c320e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -139,14 +139,14 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } } - } - hres = disp_get_id(ctx->this_obj, name, invoke_type, TRUE, &id); - if(SUCCEEDED(hres)) { - ref->type = REF_DISP; - ref->u.d.disp = ctx->this_obj; - ref->u.d.id = id; - return S_OK; + hres = vbdisp_get_id(ctx->vbthis, name, invoke_type, TRUE, &id); + if(SUCCEEDED(hres)) { + ref->type = REF_DISP; + ref->u.d.disp = (IDispatch*)&ctx->vbthis->IDispatchEx_iface; + ref->u.d.id = id; + return S_OK; + } } } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9ed1096a4d..707fd89493 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -3025,6 +3025,12 @@ static void run_tests(void) parse_script_a("testOptionalArg 1,,2"); CHECK_CALLED(global_testoptionalarg_i); + parse_script_a("sub x()\n" + " dim y\n" + " y = cint(3)\n" + "end sub\n" + "x\n"); + strict_dispid_check = FALSE; SET_EXPECT(testobj_value_i);

1 0

Jacek Caban : vbscript: Fix parsing call expressions.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 509044296dde3688cfdaaf02325a1bc8f890bd85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=509044296dde3688cfdaaf02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:08:35 2019 +0100 vbscript: Fix parsing call expressions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41119 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 15 --------------- dlls/vbscript/lex.c | 8 +++++++- dlls/vbscript/parser.y | 22 ++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 19 +++++++++++++++++++ 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 6b0e113bef..e52b0814e0 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1038,21 +1038,6 @@ static HRESULT compile_call_statement(compile_ctx_t *ctx, call_statement_t *stat { HRESULT hres; - /* It's challenging for parser to distinguish parameterized assignment with one argument from call - * with equality expression argument, so we do it in compiler. */ - if(!stat->is_strict && stat->expr->args && !stat->expr->args->next && stat->expr->args->type == EXPR_EQUAL) { - binary_expression_t *eqexpr = (binary_expression_t*)stat->expr->args; - - if(eqexpr->left->type == EXPR_BRACKETS) { - call_expression_t new_call = *stat->expr; - - WARN("converting call expr to assign expr\n"); - - new_call.args = ((unary_expression_t*)eqexpr->left)->subexpr; - return compile_assignment(ctx, &new_call, eqexpr->right, FALSE); - } - } - hres = compile_call_expression(ctx, stat->expr, FALSE); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index f78eee4ff9..005e7c3d58 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -409,7 +409,13 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) ctx->ptr++; return tEMPTYBRACKETS; } - return '('; + /* + * Parser can't predict if bracket is part of argument expression or an argument + * in call expression. We predict it here instead. + */ + if(ctx->last_token == tIdentifier || ctx->last_token == ')') + return '('; + return tEXPRLBRACKET; case '"': return parse_string_literal(ctx, lval); case '&': diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 46af0b16be..9315b7ea39 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -107,7 +107,7 @@ static statement_t *link_statements(statement_t*,statement_t*); double dbl; } -%token tEXPRESSION tEOF tNL tEMPTYBRACKETS +%token tEXPRESSION tEOF tNL tEMPTYBRACKETS tEXPRLBRACKET %token tLTEQ tGTEQ tNEQ %token tSTOP tME tREM tDOT %token <string> tTRUE tFALSE @@ -427,7 +427,7 @@ IntegerValue | tInt { $$ = $1; } PrimaryExpression - : '(' Expression ')' { $$ = new_unary_expression(ctx, EXPR_BRACKETS, $2); } + : tEXPRLBRACKET Expression ')' { $$ = new_unary_expression(ctx, EXPR_BRACKETS, $2); } | tME { $$ = new_expression(ctx, EXPR_ME, 0); CHECK_ERROR; } ClassDeclaration @@ -729,18 +729,28 @@ static call_expression_t *make_call_expression(parser_ctx_t *ctx, expression_t * call_expr = (call_expression_t*)callee_expr; if(!call_expr->args) { call_expr->args = arguments; - }else if(call_expr->args->next) { + return call_expr; + } + + if(call_expr->args->next) { FIXME("Invalid syntax: invalid use of parentheses for arguments\n"); ctx->hres = E_FAIL; return NULL; - }else if(arguments->type != EXPR_NOARG) { + } + + call_expr->args = new_unary_expression(ctx, EXPR_BRACKETS, call_expr->args); + if(!call_expr->args) + return NULL; + if(!arguments) + return call_expr; + + if(arguments->type != EXPR_NOARG) { FIXME("Invalid syntax: missing comma\n"); ctx->hres = E_FAIL; return NULL; - }else { - call_expr->args->next = arguments->next; } + call_expr->args->next = arguments->next; return call_expr; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8a6f0ecd45..46e2ac7ab8 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1645,4 +1645,23 @@ end function set x = testsetresult(1, 2) ok x.prop = 1, "x.prop = " & x.prop +set arr(0) = new TestPropSyntax +arr(0).prop = 1 +ok arr(0).prop = 1, "arr(0) = " & arr(0).prop + +function f2(x,y) +end function + +f2 1 = 1, 2 + +function f1(x) + ok x = true, "x = " & x +end function + +f1 1 = 1 +f1 1 = (1) +f1 not 1 = 0 + +arr (0) = 2 xor -2 + reportSuccess()

1 0

Jacek Caban : vbscript: Support changing script state to SCRIPTSTATE_INITIALIZED.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 9e2700b2fc04dc4c7cfafc671d820d9ea83d52b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e2700b2fc04dc4c7cfafc67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:08:22 2019 +0100 vbscript: Support changing script state to SCRIPTSTATE_INITIALIZED. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 29 +++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 9 ++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index fd769cc280..c0a582c361 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -796,6 +796,35 @@ static void test_vbscript_uninitializing(void) test_state(script, SCRIPTSTATE_INITIALIZED); + SET_EXPECT(OnStateChange_STARTED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_STARTED); + + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_INITIALIZED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + + SET_EXPECT(OnStateChange_CLOSED); + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CLOSED); + + test_state(script, SCRIPTSTATE_CLOSED); + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + test_state(script, SCRIPTSTATE_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); hres = IActiveScript_Close(script); ok(hres == S_OK, "Close failed: %08x\n", hres); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index ebd100f4e5..886c9d01af 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -207,14 +207,13 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) /* FALLTHROUGH */ case SCRIPTSTATE_STARTED: case SCRIPTSTATE_DISCONNECTED: - if(This->state == SCRIPTSTATE_DISCONNECTED) - change_state(This, SCRIPTSTATE_INITIALIZED); - if(state == SCRIPTSTATE_INITIALIZED) - break; + change_state(This, SCRIPTSTATE_INITIALIZED); /* FALLTHROUGH */ case SCRIPTSTATE_INITIALIZED: case SCRIPTSTATE_UNINITIALIZED: change_state(This, state); + if(state == SCRIPTSTATE_INITIALIZED) + break; release_script(This->ctx); This->thread_id = 0; break; @@ -469,7 +468,7 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE exec_queued_code(This->ctx); break; case SCRIPTSTATE_INITIALIZED: - FIXME("unimplemented SCRIPTSTATE_INITIALIZED\n"); + decrease_state(This, SCRIPTSTATE_INITIALIZED); return S_OK; case SCRIPTSTATE_DISCONNECTED: FIXME("unimplemented SCRIPTSTATE_DISCONNECTED\n");

1 0

Jacek Caban : vbscript: Don't allow changing script state when script site is not set.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 706898dcbb5d1553a3e9f60c422f9112fad57694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=706898dcbb5d1553a3e9f60c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:08:09 2019 +0100 vbscript: Don't allow changing script state when script site is not set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 5 +++++ dlls/vbscript/vbscript.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index fdbfc4465b..fd769cc280 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -713,6 +713,11 @@ static void test_vbscript_uninitializing(void) test_no_script_dispatch(script); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_INITIALIZED) failed: %08x\n", hres); + SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 59ec577846..ebd100f4e5 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -457,7 +457,7 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE return S_OK; } - if(!This->is_initialized) + if(!This->is_initialized || !This->ctx->site) return E_UNEXPECTED; switch(ss) {

1 0

Jacek Caban : vbscript: Add Replace function implementation.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: e343fcaf7656eb0ca0b648d8aa159ab2f6007785 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e343fcaf7656eb0ca0b648d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:07:58 2019 +0100 vbscript: Add Replace function implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 76 +++++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 68 +++++++++++++++++++++++++++++++++++++--- dlls/vbscript/vbregexp.c | 42 +++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 179 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e4ff572412..8d4150ad70 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2278,10 +2278,80 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return E_NOTIMPL; } -static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR string, find = NULL, replace = NULL, ret; + int from = 1, cnt = -1; + HRESULT hres = S_OK; + + TRACE("%s %s %s %u...\n", debugstr_variant(args), debugstr_variant(args+1), debugstr_variant(args+2), args_cnt); + + assert(3 <= args_cnt && args_cnt <= 6); + if(V_VT(args) != VT_BSTR) { + hres = to_string(args, &string); + if(FAILED(hres)) + return hres; + }else { + string = V_BSTR(args); + } + + if(V_VT(args+1) != VT_BSTR) { + hres = to_string(args+1, &find); + if(FAILED(hres)) + goto error; + }else { + find = V_BSTR(args+1); + } + + if(V_VT(args+2) != VT_BSTR) { + hres = to_string(args+2, &replace); + if(FAILED(hres)) + goto error; + }else { + replace = V_BSTR(args+2); + } + + if(args_cnt >= 4) { + hres = to_int(args+3, &from); + if(FAILED(hres)) + goto error; + if(from < 1) { + hres = E_INVALIDARG; + goto error; + } + } + + if(args_cnt >= 5) { + hres = to_int(args+4, &cnt); + if(FAILED(hres)) + goto error; + if(cnt < -1) { + hres = E_INVALIDARG; + goto error; + } + } + + if(args_cnt == 6) + FIXME("copare argument not supported\n"); + + ret = string_replace(string, find, replace, from - 1, cnt); + if(!ret) { + hres = E_OUTOFMEMORY; + }else if(res) { + V_VT(res) = VT_BSTR; + V_BSTR(res) = ret; + }else { + SysFreeString(ret); + } + +error: + if(V_VT(args) != VT_BSTR) + SysFreeString(string); + if(V_VT(args+1) != VT_BSTR) + SysFreeString(find); + if(V_VT(args+2) != VT_BSTR) + SysFreeString(replace); + return hres; } static HRESULT Global_StrReverse(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index d4f3eeaa47..0a65984483 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -640,11 +640,6 @@ TestLTrim "", "" TestLTrim 123, "123" if isEnglishLang then TestLTrim true, "True" -Sub TestRound(val, exval, vt) - Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) - Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val))) -End Sub - Sub TestRTrim(str, exstr) Call ok(RTrim(str) = exstr, "RTrim(" & str & ") = " & RTrim(str)) End Sub @@ -657,6 +652,69 @@ TestRTrim "", "" TestRTrim 123, "123" if isEnglishLang then TestRTrim true, "True" +sub test_replace(str, find, rep, exp) + dim r + r = Replace(str, find, rep) + ok r = exp, "Replace(""" & str & """, """ & find & """, """ & rep & """) = """ & _ + r & """ expected """ & exp & """" +end sub + +sub test_replace_from(str, find, rep, from, exp) + dim r + r = Replace(str, find, rep, from) + ok r = exp, "Replace(""" & str & """, """ & find & """, """ & rep & """, " & from & ") = """ & _ + r & """ expected """ & exp & """" +end sub + +sub test_replace_cnt(str, find, rep, from, cnt, exp) + dim r + r = Replace(str, find, rep, from, cnt) + ok r = exp, "Replace(""" & str & """, """ & find & """, """ & rep & """, " & from & ", " & cnt & ") = """ & _ + r & """ expected """ & exp & """" +end sub + +test_replace "xx testxx(xx)", "xx", "!", "! test!(!)" +test_replace "xxx", "", "y", "xxx" +test_replace "xxxxx", "xx", "y", "yyx" +test_replace 123, 2, 6, "163" +test_replace "xyz" & Chr(0) & "xyz", "y", "Y", "xYz" & Chr(0) & "xYz" +test_replace "xyz" & Chr(0) & "xyz", Chr(0) & "x", "Y" & Chr(0) & Chr(0), "xyzY" & Chr(0) & Chr(0) & "yz" + +test_replace_from "xx testxx(xx)", "xx", "!", 1, "! test!(!)" +test_replace_from "xx testxx(xx)", "xx", "!", 1, "! test!(!)" +test_replace_from "xx testxx(xx)", "xx", "!", 2, "x test!(!)" +test_replace_from "xx testxx(xx)", "xx", "!", 2000, "" +test_replace_from "xxx", "", "y", 2, "xx" + +test_replace_cnt "xx testxx(xx)", "xx", "!", 1, 2, "! test!(xx)" +test_replace_cnt "xx testxx(xx)", "xx", "!", 1, 1, "! testxx(xx)" +test_replace_cnt "xx testxx(xx)", "xx", "!", 2, 1, "x test!(xx)" +test_replace_cnt "xx testxx(xx)", "xx", "!", 1, -1, "! test!(!)" +test_replace_cnt "xx testxx(xx)", "xx", "!", 1, 0, "xx testxx(xx)" + +on error resume next +Replace "xx", "x", "y", -1 +x = err.number +on error goto 0 +ok x = 5, "err = " & x + +on error resume next +Replace "xx", "x", "y", 0 +x = err.number +on error goto 0 +ok x = 5, "err = " & x + +on error resume next +Replace "xx", "x", "y", 1, -2 +x = err.number +on error goto 0 +ok x = 5, "err = " & x + +Sub TestRound(val, exval, vt) + Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) + Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val))) +End Sub + TestRound 3, 3, "VT_I2" TestRound 3.3, 3, "VT_R8" TestRound 3.8, 4, "VT_R8" diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 4edf9dcbfe..ac667da442 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1629,6 +1629,48 @@ static const IRegExp2Vtbl RegExp2Vtbl = { RegExp2_Replace }; +BSTR string_replace(BSTR string, BSTR find, BSTR replace, int from, int cnt) +{ + const WCHAR *ptr, *string_end; + strbuf_t buf = { NULL, 0, 0 }; + size_t replace_len, find_len; + BSTR ret = NULL; + HRESULT hres = S_OK; + + string_end = string + SysStringLen(string); + ptr = from > SysStringLen(string) ? string_end : string + from; + + find_len = SysStringLen(find); + replace_len = SysStringLen(replace); + if(!replace_len) + cnt = 0; + + while(string_end - ptr >= find_len && cnt && find_len) { + if(memcmp(ptr, find, find_len * sizeof(WCHAR))) { + hres = strbuf_append(&buf, ptr, 1); + if(FAILED(hres)) + break; + ptr++; + }else { + hres = strbuf_append(&buf, replace, replace_len); + if(FAILED(hres)) + break; + ptr += find_len; + if(cnt != -1) + cnt--; + } + } + + if(SUCCEEDED(hres)) { + hres = strbuf_append(&buf, ptr, string_end - ptr); + if(SUCCEEDED(hres)) + ret = SysAllocStringLen(buf.buf, buf.len); + } + + heap_free(buf.buf); + return ret; +} + static inline RegExp2 *impl_from_IRegExp(IRegExp *iface) { return CONTAINING_RECORD(iface, RegExp2, IRegExp_iface); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 8543813c49..0bd1fce156 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -373,6 +373,7 @@ static inline BOOL is_int32(double d) } HRESULT create_regexp(IDispatch**) DECLSPEC_HIDDEN; +BSTR string_replace(BSTR,BSTR,BSTR,int,int) DECLSPEC_HIDDEN; HRESULT map_hres(HRESULT) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : msxml3: Remove "stub" from traces.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: be89f936877a3218e5361c2c1efec761045a98ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=be89f936877a3218e5361c2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:34:18 2019 +0300 msxml3: Remove "stub" from traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/parseerror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 438c9eb3c4..2ca0885708 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -224,7 +224,7 @@ static HRESULT WINAPI parseError_get_line( { parse_error_t *This = impl_from_IXMLDOMParseError2( iface ); - TRACE("(%p)->(%p): stub\n", This, line); + TRACE("%p, %p.\n", This, line); if (!line) return E_INVALIDARG;

1 0

Nikolay Sivov : ole32: Remove "stub" from traces.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 4fe18052c552268c1a5c5e8de7c9ac654436a4f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fe18052c552268c1a5c5e8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:34:08 2019 +0300 ole32: Remove "stub" from traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 3837a1f74c..07d55e2f94 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -142,7 +142,7 @@ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) ******************************************************************************/ static HRESULT WINAPI ClassMoniker_GetClassID(IMoniker* iface,CLSID *pClassID) { - TRACE("(%p,%p),stub!\n",iface,pClassID); + TRACE("(%p, %p)\n", iface, pClassID); if (pClassID==NULL) return E_POINTER;

1 0

Nikolay Sivov : shell32: Remove "stub" from traces.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 539644ad63702a71080427a2be3359d6f081019c URL: https://source.winehq.org/git/wine.git/?a=commit;h=539644ad63702a71080427a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:33:47 2019 +0300 shell32: Remove "stub" from traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 4 ++-- dlls/shell32/shellstring.c | 2 +- dlls/shell32/shlview.c | 19 +++++++------------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 54fb818526..e2746deb48 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1105,7 +1105,7 @@ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR filename, shortname; WIN32_FIND_DATAA * pfd; - TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len); + TRACE_(shell)("%p, %p, %d, %p, %d.\n", psf, pidl, nFormat, dest, len); pdump(pidl); if (!psf || !dest) @@ -1163,7 +1163,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR filename, shortname; WIN32_FIND_DATAW * pfd = dest; - TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len); + TRACE_(shell)("%p, %p, %d, %p, %d.\n", psf, pidl, nFormat, dest, len); pdump(pidl); diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 956fd50871..3b70a2a94b 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -269,7 +269,7 @@ DWORD WINAPI CheckEscapesW( DWORD size = lstrlenW(string); LPWSTR s, d; - TRACE("(%s %d) stub\n", debugstr_w(string), len); + TRACE("%s, %u.\n", debugstr_w(string), len); if (StrPBrkW(string, strEscapedChars) && size + 2 <= len) { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index bcb9466315..ff1332087d 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -778,13 +778,9 @@ static HMENU ShellView_BuildFileMenu(IShellViewImpl * This) TRACE("-- return (menu=%p)\n",hSubMenu); return hSubMenu; } -/********************************************************** -* ShellView_MergeFileMenu() -*/ + static void ShellView_MergeFileMenu(IShellViewImpl *This, HMENU hSubMenu) { - TRACE("(%p)->(submenu=%p) stub\n",This,hSubMenu); - if (hSubMenu) { static const WCHAR dummyW[] = {'d','u','m','m','y','4','5',0}; @@ -806,8 +802,6 @@ static void ShellView_MergeFileMenu(IShellViewImpl *This, HMENU hSubMenu) mii.fType = MFT_STRING; InsertMenuItemW(hSubMenu, 0, TRUE, &mii); } - - TRACE("--\n"); } /********************************************************** @@ -989,7 +983,7 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL LPCONTEXTMENU pContextMenu = NULL; CMINVOKECOMMANDINFO cmi; - TRACE("(%p)->(0x%08x 0x%08x 0x%08x) stub\n",This, x, y, bDefault); + TRACE("%p, %d, %d, %d.\n", This, x, y, bDefault); /* look, what's selected and create a context menu object of it*/ if( ShellView_GetSelections(This) ) @@ -1230,7 +1224,7 @@ static LRESULT ShellView_OnSetFocus(IShellViewImpl * This) */ static LRESULT ShellView_OnKillFocus(IShellViewImpl * This) { - TRACE("(%p) stub\n",This); + TRACE("%p.\n", This); ShellView_OnActivate(This, SVUIA_ACTIVATE_NOFOCUS); /* Notify the ICommDlgBrowser */ @@ -1870,7 +1864,7 @@ static HRESULT WINAPI IShellView_fnUIActivate(IShellView3 *iface, UINT uState) LRESULT lResult; int nPartArray[1] = {-1}; - TRACE("(%p)->(state=%x) stub\n",This, uState); + TRACE("%p, %d.\n", This, uState); /*don't do anything if the state isn't really changing*/ if(This->uState == uState) @@ -2677,7 +2671,7 @@ static ULONG WINAPI FolderView_Release(IFolderView2 *iface) static HRESULT WINAPI FolderView_GetCurrentViewMode(IFolderView2 *iface, UINT *mode) { IShellViewImpl *This = impl_from_IFolderView2(iface); - TRACE("(%p)->(%p), stub\n", This, mode); + TRACE("%p, %p.\n", This, mode); if(!mode) return E_INVALIDARG; @@ -2690,7 +2684,8 @@ static HRESULT WINAPI FolderView_SetCurrentViewMode(IFolderView2 *iface, UINT mo { IShellViewImpl *This = impl_from_IFolderView2(iface); DWORD dwStyle; - TRACE("(%p)->(%u), stub\n", This, mode); + + TRACE("%p, %u.\n", This, mode); if((mode < FVM_FIRST || mode > FVM_LAST) && (mode != FVM_AUTO))

1 0

Nikolay Sivov : ole32/tests: Remove Win9x workarounds from moniker tests.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: ef1e187ae214a73d75975bf9ed5c45f803c18ead URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef1e187ae214a73d75975bf9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:33:30 2019 +0300 ole32/tests: Remove Win9x workarounds from moniker tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 18ea4d465b..9e2c23b421 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -708,11 +708,8 @@ static void test_ROT(void) ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); todo_wine { - ok(hr == CO_E_WRONG_SERVER_IDENTITY || - broken(hr == S_OK) /* Win9x */, - "IRunningObjectTable_Register should have returned CO_E_WRONG_SERVER_IDENTITY instead of 0x%08x\n", hr); + ok(hr == CO_E_WRONG_SERVER_IDENTITY, "Unexpected hr %#x.\n", hr); } - if (hr == S_OK) IRunningObjectTable_Revoke(pROT, dwCookie); hr = IRunningObjectTable_Register(pROT, 0xdeadbeef, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); @@ -919,8 +916,8 @@ static void test_MkParseDisplayName(void) eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszNonExistentProgId, &eaten, &pmk); - ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, - "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); +todo_wine + ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -929,8 +926,8 @@ static void test_MkParseDisplayName(void) eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszDisplayNameClsid, &eaten, &pmk); - ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, - "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); +todo_wine + ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -1009,8 +1006,8 @@ static void test_MkParseDisplayName(void) eaten = 0xdeadbeef; pmk = (IMoniker *)0xdeadbeef; hr = MkParseDisplayName(pbc, wszDisplayNameProgIdFail, &eaten, &pmk); - ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, - "MkParseDisplayName with ProgId without marker should fail with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); +todo_wine + ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten); ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk); @@ -2054,11 +2051,6 @@ static void test_save_load_filemoniker(void) START_TEST(moniker) { - if (!GetProcAddress(GetModuleHandleA("ole32.dll"), "CoRegisterSurrogateEx")) { - win_skip("skipping test on win9x\n"); - return; - } - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_ROT();

1 0

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 November 2019