June 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Move the job functions to the Unix library.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: 07248fc5002fb109de8fc8e51e9d05329e0cd8cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=07248fc5002fb109de8fc8e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 13:21:26 2020 +0200 ntdll: Move the job functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 229 ++-------------------------------------------- dlls/ntdll/unix/loader.c | 7 ++ dlls/ntdll/unix/sync.c | 230 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 13 ++- 4 files changed, 256 insertions(+), 223 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07248fc5002fb109de8f…

1 0

Alexandre Julliard : ntdll: Move the get/set file information functions to the Unix library.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: c3e2013b615dd449113fe8fce0700319aa082020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3e2013b615dd449113fe8fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 15:32:41 2020 +0200 ntdll: Move the get/set file information functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 951 +------------------------------------ dlls/ntdll/loader.c | 4 - dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/unix/file.c | 1006 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/loader.c | 4 +- dlls/ntdll/unix/unix_private.h | 3 - dlls/ntdll/unixlib.h | 10 +- 7 files changed, 1012 insertions(+), 967 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3e2013b615dd449113f…

1 0

Alexandre Julliard : ntdll: Initialize file redirects only after the server is connected.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: 98eab245d3c3377af0c3da6880bb8ede80cb0925 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98eab245d3c3377af0c3da68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 12:59:17 2020 +0200 ntdll: Initialize file redirects only after the server is connected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49380 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 4 ++-- dlls/ntdll/unix/loader.c | 2 -- dlls/ntdll/unix/thread.c | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 469fe55fe4..d39ca8cd63 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2689,7 +2689,7 @@ static void init_redirects(void) char *dir; struct stat st; - if (!(dir = RtlAllocateHeap( GetProcessHeap(), 0, strlen(config_dir) + sizeof(windows_dir) ))) return; + if (!(dir = malloc( strlen(config_dir) + sizeof(windows_dir) ))) return; strcpy( dir, config_dir ); strcat( dir, windows_dir ); if (!stat( dir, &st )) @@ -2699,7 +2699,7 @@ static void init_redirects(void) nb_redirects = ARRAY_SIZE( redirects ); } else ERR( "%s: %s\n", dir, strerror(errno) ); - RtlFreeHeap( GetProcessHeap(), 0, dir ); + free( dir ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3bb805103d..73be77e7af 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1227,7 +1227,6 @@ void __wine_main( int argc, char *argv[], char *envp[] ) fixup_ntdll_imports( &__wine_spec_nt_header, module ); init_environment( argc, argv, envp ); - init_files(); #ifdef __APPLE__ apple_main_thread(); @@ -1262,7 +1261,6 @@ NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, const void *ptr_in, void map_so_dll( nt, module ); fixup_ntdll_imports( &__wine_spec_nt_header, module ); init_environment( __wine_main_argc, __wine_main_argv, envp ); - init_files(); *(struct unix_funcs **)ptr_out = &unix_funcs; wine_mmap_enum_reserved_areas( add_area, NULL, 0 ); return STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 97b191e1a5..0470f5eaa8 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -110,6 +110,7 @@ TEB * CDECL init_threading( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZ server_init_process(); info_size = server_init_thread( teb->Peb, suspend ); virtual_map_user_shared_data(); + init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); if (size) *size = info_size;

1 0

Zebediah Figura : include: Correct the name of WAVEBANKMINIWAVEFORMAT.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: 362ed8c2d5ff11c49ce42c0979048c068356758f URL: https://source.winehq.org/git/wine.git/?a=commit;h=362ed8c2d5ff11c49ce42c09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 12 17:59:41 2020 -0500 include: Correct the name of WAVEBANKMINIWAVEFORMAT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3wb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xact3wb.h b/include/xact3wb.h index c68d7a30fa..81b1518930 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -138,7 +138,7 @@ typedef struct WAVEBANKDATA DWORD dwEntryMetaDataElementSize; DWORD dwEntryNameElementSize; DWORD dwAlignment; - WAVEBANKMINIFORMAT CompactFormat; + WAVEBANKMINIWAVEFORMAT CompactFormat; FILETIME BuildTime; } WAVEBANKDATA, *LPWAVEBANKDATA; typedef const WAVEBANKDATA *LPCWAVEBANKDATA;

1 0

Jacek Caban : msscript: Reimplement state property using embedded script engine state.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: 197e226e97747c5f34a387d4a76f281a46d5c255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=197e226e97747c5f34a387d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 12 17:11:25 2020 +0200 msscript: Reimplement state property using embedded script engine state. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 2d0239a4d8..35554ff123 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -100,7 +100,6 @@ struct ScriptControl { LONG timeout; VARIANT_BOOL allow_ui; VARIANT_BOOL use_safe_subset; - ScriptControlStates state; /* connection points */ ConnectionPoint *cp_list; @@ -242,7 +241,7 @@ static HRESULT start_script(struct ScriptControl *control) { HRESULT hr = S_OK; - if (!control->host || control->state != Initialized) + if (!control->host) return E_FAIL; if (control->host->script_state != SCRIPTSTATE_STARTED) @@ -1196,6 +1195,9 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan static HRESULT WINAPI ScriptControl_get_State(IScriptControl *iface, ScriptControlStates *p) { ScriptControl *This = impl_from_IScriptControl(iface); + SCRIPTSTATE state; + HRESULT hres; + TRACE("(%p)->(%p)\n", This, p); if(!p) @@ -1204,7 +1206,22 @@ static HRESULT WINAPI ScriptControl_get_State(IScriptControl *iface, ScriptContr if(!This->host) return E_FAIL; - *p = This->state; + hres = IActiveScript_GetScriptState(This->host->script, &state); + if (FAILED(hres)) return hres; + + switch (state) + { + case SCRIPTSTATE_INITIALIZED: + case SCRIPTSTATE_STARTED: + *p = Initialized; + break; + case SCRIPTSTATE_CONNECTED: + *p = Connected; + break; + default: + WARN("unexpected state %d\n", state); + return E_FAIL; + } return S_OK; } @@ -1219,8 +1236,7 @@ static HRESULT WINAPI ScriptControl_put_State(IScriptControl *iface, ScriptContr if(state != Initialized && state != Connected) return CTL_E_INVALIDPROPERTYVALUE; - This->state = state; - return S_OK; + return IActiveScript_SetScriptState(This->host->script, state == Connected ? SCRIPTSTATE_CONNECTED : SCRIPTSTATE_STARTED); } static HRESULT WINAPI ScriptControl_put_SitehWnd(IScriptControl *iface, LONG hwnd) @@ -2433,7 +2449,6 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->timeout = 10000; script_control->allow_ui = VARIANT_TRUE; script_control->use_safe_subset = VARIANT_FALSE; - script_control->state = Initialized; ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink);

1 0

Jacek Caban : msscript/tests: Add more script state tests.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: 60114e157c16f403cd93a2900d5bbde59b6a84db URL: https://source.winehq.org/git/wine.git/?a=commit;h=60114e157c16f403cd93a290… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 12 17:11:37 2020 +0200 msscript/tests: Add more script state tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 189 +++++++++++++++++++++++++++++++++++-- 1 file changed, 180 insertions(+), 9 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 92fd833026..6a0730368c 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -99,8 +99,10 @@ DEFINE_EXPECT(Invoke); DEFINE_EXPECT(InvokeEx); DEFINE_EXPECT(SetScriptSite); DEFINE_EXPECT(QI_IActiveScriptParse); +DEFINE_EXPECT(GetScriptState); DEFINE_EXPECT(SetScriptState_INITIALIZED); DEFINE_EXPECT(SetScriptState_STARTED); +DEFINE_EXPECT(SetScriptState_CONNECTED); DEFINE_EXPECT(ParseScriptText); DEFINE_EXPECT(AddNamedItem); DEFINE_EXPECT(GetScriptDispatch); @@ -498,24 +500,30 @@ static HRESULT WINAPI ActiveScript_GetScriptSite(IActiveScript *iface, REFIID ri static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE ss) { - if (ss == SCRIPTSTATE_INITIALIZED) { + switch(ss) + { + case SCRIPTSTATE_INITIALIZED: CHECK_EXPECT(SetScriptState_INITIALIZED); return S_OK; - } - else if (ss == SCRIPTSTATE_STARTED) { + case SCRIPTSTATE_STARTED: CHECK_EXPECT(SetScriptState_STARTED); return S_OK; - } - else + case SCRIPTSTATE_CONNECTED: + CHECK_EXPECT(SetScriptState_CONNECTED); + return S_OK; + default: ok(0, "unexpected call, state %u\n", ss); - - return E_NOTIMPL; + return E_NOTIMPL; + } } +static SCRIPTSTATE emulated_script_state; + static HRESULT WINAPI ActiveScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE *pssState) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(GetScriptState); + *pssState = emulated_script_state; + return S_OK; } static HRESULT WINAPI ActiveScript_Close(IActiveScript *iface) @@ -1553,6 +1561,169 @@ static void test_State(void) ok(state == Connected, "got %d\n", state); IScriptControl_Release(sc); + + /* custom script engine */ + if (have_custom_engine) + { + BSTR language, code_str; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + hr = IScriptControl_put_State(sc, Initialized); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + + SET_EXPECT(SetScriptState_STARTED); + hr = IScriptControl_put_State(sc, Initialized); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + + SET_EXPECT(SetScriptState_CONNECTED); + hr = IScriptControl_put_State(sc, Connected); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_CONNECTED); + + SET_EXPECT(SetScriptState_STARTED); + hr = IScriptControl_put_State(sc, Initialized); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + parse_item_name = NULL; + parse_flags = SCRIPTTEXT_ISVISIBLE; + code_str = SysAllocString(L"1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + emulated_script_state = SCRIPTSTATE_INITIALIZED; + SET_EXPECT(GetScriptState); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == Initialized, "got %d\n", state); + CHECK_CALLED(GetScriptState); + + emulated_script_state = SCRIPTSTATE_STARTED; + SET_EXPECT(GetScriptState); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == Initialized, "got %d\n", state); + CHECK_CALLED(GetScriptState); + + emulated_script_state = SCRIPTSTATE_CONNECTED; + SET_EXPECT(GetScriptState); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == Connected, "got %d\n", state); + CHECK_CALLED(GetScriptState); + + emulated_script_state = SCRIPTSTATE_UNINITIALIZED; + SET_EXPECT(GetScriptState); + hr = IScriptControl_get_State(sc, &state); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + CHECK_CALLED(GetScriptState); + + SET_EXPECT(ParseScriptText); + code_str = SysAllocString(L"0x100"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + hr = IScriptControl_put_State(sc, Initialized); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + + SET_EXPECT(SetScriptState_STARTED); + hr = IScriptControl_put_State(sc, Initialized); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + + SET_EXPECT(SetScriptState_CONNECTED); + hr = IScriptControl_put_State(sc, Connected); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_CONNECTED); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + parse_item_name = NULL; + parse_flags = SCRIPTTEXT_ISVISIBLE; + code_str = SysAllocString(L"1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(SetScriptState_CONNECTED); + hr = IScriptControl_put_State(sc, Connected); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_CONNECTED); + + SET_EXPECT(ParseScriptText); + code_str = SysAllocString(L"0x100"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + } } #define CHECK_ERROR(sc,exp_num) _check_error(sc, exp_num, __LINE__)

1 0

Jacek Caban : msscript: Parse script host object instead of control to parse_script_text.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: b531e51cd706ff356976a58a97e23e63d6487827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b531e51cd706ff356976a58a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 12 17:11:51 2020 +0200 msscript: Parse script host object instead of control to parse_script_text. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 35554ff123..e397044fd7 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -237,15 +237,12 @@ static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) return hr; } -static HRESULT start_script(struct ScriptControl *control) +static HRESULT start_script(ScriptHost *host) { HRESULT hr = S_OK; - if (!control->host) - return E_FAIL; - - if (control->host->script_state != SCRIPTSTATE_STARTED) - hr = set_script_state(control->host, SCRIPTSTATE_STARTED); + if (host->script_state != SCRIPTSTATE_STARTED) + hr = set_script_state(host, SCRIPTSTATE_STARTED); return hr; } @@ -1421,15 +1418,15 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } -static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD flag, VARIANT *res) +static HRESULT parse_script_text(ScriptHost *host, BSTR script_text, DWORD flag, VARIANT *res) { EXCEPINFO excepinfo; HRESULT hr; - hr = start_script(control); + hr = start_script(host); if (FAILED(hr)) return hr; - hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, + hr = IActiveScriptParse_ParseScriptText(host->parse, script_text, NULL, NULL, NULL, 0, 1, flag, res, &excepinfo); /* FIXME: more error handling */ return hr; @@ -1441,7 +1438,10 @@ static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) TRACE("(%p)->(%s).\n", This, debugstr_w(code)); - return parse_script_text(This, code, SCRIPTTEXT_ISVISIBLE, NULL); + if (!This->host) + return E_FAIL; + + return parse_script_text(This->host, code, SCRIPTTEXT_ISVISIBLE, NULL); } static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) @@ -1453,8 +1453,10 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, if (!res) return E_POINTER; V_VT(res) = VT_EMPTY; + if (!This->host) + return E_FAIL; - return parse_script_text(This, expression, SCRIPTTEXT_ISEXPRESSION, res); + return parse_script_text(This->host, expression, SCRIPTTEXT_ISEXPRESSION, res); } static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) @@ -1463,7 +1465,10 @@ static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR TRACE("(%p)->(%s)\n", This, debugstr_w(statement)); - return parse_script_text(This, statement, 0, NULL); + if (!This->host) + return E_FAIL; + + return parse_script_text(This->host, statement, 0, NULL); } static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) @@ -1486,7 +1491,9 @@ static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_na if (sa->cDims == 0) return DISP_E_BADINDEX; if (!(sa->fFeatures & FADF_VARIANT)) return DISP_E_BADVARTYPE; - hr = start_script(This); + + if (!This->host) return E_FAIL; + hr = start_script(This->host); if (FAILED(hr)) return hr; hr = get_script_dispatch(This, &disp);

1 0

Alexandre Julliard : makefiles: Also build import libs for extra test modules.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: c873db8c1d089ad5c8d87acbbe74b2024a537b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c873db8c1d089ad5c8d87acb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 19:40:25 2020 +0200 makefiles: Also build import libs for extra test modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 536d2263e3..743eaf6e35 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -183,6 +183,7 @@ struct makefile struct strarray install_lib; struct strarray install_dev; struct strarray extra_targets; + struct strarray extra_imports; struct list sources; struct list includes; const char *base_dir; @@ -1958,6 +1959,12 @@ static void add_generated_sources( struct makefile *make ) if (!make->disabled) strarray_add_uniq( &linguas, replace_extension( source->name, ".po", "" )); } + if (strendswith( source->name, ".spec" )) + { + char *obj = replace_extension( source->name, ".spec", "" ); + strarray_addall_uniq( &make->extra_imports, + get_expanded_file_local_var( make, obj, "IMPORTS" )); + } } if (make->testdll) { @@ -4361,8 +4368,8 @@ static void load_sources( struct makefile *make ) if (make->is_cross) { - for (i = 0; i < make->imports.count; i++) - strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); + strarray_addall_uniq( &cross_import_libs, make->imports ); + strarray_addall_uniq( &cross_import_libs, make->extra_imports ); if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "kernel32" );

1 0

Paul Gofman : ntoskrnl.exe/tests: Add initial test for netio.sys.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: e63c3ed8279d782ef23702893ce1a3a98bf58885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e63c3ed8279d782ef2370289… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 11 17:47:45 2020 +0300 ntoskrnl.exe/tests: Add initial test for netio.sys. Test driver should import netio.sys which is available since Vista, so a new test driver is needed to preserve XP compatibility for the existing tests. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 + dlls/ntoskrnl.exe/tests/driver4.c | 246 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver4.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 59 +++++++-- 4 files changed, 302 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e63c3ed8279d782ef237…

1 0

Paul Gofman : netio.sys: Add WSK provider stub interface.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: 10331eb2b76c1b0220ac93a1be1d78771495c2fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=10331eb2b76c1b0220ac93a1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 11 17:47:46 2020 +0300 netio.sys: Add WSK provider stub interface. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 118 ++++++++++++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/driver4.c | 8 ++- 2 files changed, 118 insertions(+), 8 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 839a06d30d..fac91736ab 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -32,32 +32,138 @@ #include "ddk/wsk.h" #include "wine/debug.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(netio); +struct _WSK_CLIENT +{ + WSK_REGISTRATION *registration; + WSK_CLIENT_NPI *client_npi; +}; + +static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_family, USHORT socket_type, + ULONG protocol, ULONG Flags, void *socket_context, const void *dispatch, PEPROCESS owning_process, + PETHREAD owning_thread, SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) +{ + FIXME("client %p, address_family %#x, socket_type %#x, protocol %#x, Flags %#x, socket_context %p, dispatch %p, " + "owning_process %p, owning_thread %p, security_descriptor %p, irp %p stub.\n", + client, address_family, socket_type, protocol, Flags, socket_context, dispatch, owning_process, + owning_thread, security_descriptor, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_socket_connect(WSK_CLIENT *client, USHORT socket_type, ULONG protocol, + SOCKADDR *local_address, SOCKADDR *remote_address, ULONG flags, void *socket_context, + const WSK_CLIENT_CONNECTION_DISPATCH *dispatch, PEPROCESS owning_process, PETHREAD owning_thread, + SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) +{ + FIXME("client %p, socket_type %#x, protocol %#x, local_address %p, remote_address %p, " + "flags %#x, socket_context %p, dispatch %p, owning_process %p, owning_thread %p, " + "security_descriptor %p, irp %p stub.\n", + client, socket_type, protocol, local_address, remote_address, flags, socket_context, + dispatch, owning_process, owning_thread, security_descriptor, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_control_client(WSK_CLIENT *client, ULONG control_code, SIZE_T input_size, + void *input_buffer, SIZE_T output_size, void *output_buffer, SIZE_T *output_size_returned, + IRP *irp +) +{ + FIXME("client %p, control_code %#x, input_size %lu, input_buffer %p, output_size %lu, " + "output_buffer %p, output_size_returned %p, irp %p, stub.\n", + client, control_code, input_size, input_buffer, output_size, output_buffer, + output_size_returned, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING *node_name, + UNICODE_STRING *service_name, ULONG name_space, GUID *provider, ADDRINFOEXW *hints, + ADDRINFOEXW **result, PEPROCESS owning_process, PETHREAD owning_thread, IRP *irp) +{ + FIXME("client %p, node_name %p, service_name %p, name_space %#x, provider %p, hints %p, " + "result %p, owning_process %p, owning_thread %p, irp %p stub.\n", + client, node_name, service_name, name_space, provider, hints, result, + owning_process, owning_thread, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static void WINAPI wsk_free_address_info(WSK_CLIENT *client, ADDRINFOEXW *addr_info) +{ + FIXME("client %p, addr_info %p stub.\n", client, addr_info); +} + +static NTSTATUS WINAPI wsk_get_name_info(WSK_CLIENT *client, SOCKADDR *sock_addr, ULONG sock_addr_length, + UNICODE_STRING *node_name, UNICODE_STRING *service_name, ULONG flags, PEPROCESS owning_process, + PETHREAD owning_thread, IRP *irp) +{ + FIXME("client %p, sock_addr %p, sock_addr_length %u, node_name %p, service_name %p, " + "flags %#x, owning_process %p, owning_thread %p, irp %p stub.\n", + client, sock_addr, sock_addr_length, node_name, service_name, flags, + owning_process, owning_thread, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static const WSK_PROVIDER_DISPATCH wsk_dispatch = +{ + MAKE_WSK_VERSION(1, 0), 0, + wsk_socket, + wsk_socket_connect, + wsk_control_client, + wsk_get_address_info, + wsk_free_address_info, + wsk_get_name_info, +}; + NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG wait_timeout, WSK_PROVIDER_NPI *wsk_provider_npi) { - FIXME("wsk_registration %p, wait_timeout %u, wsk_provider_npi %p stub.\n", + WSK_CLIENT *client = wsk_registration->ReservedRegistrationContext; + + TRACE("wsk_registration %p, wait_timeout %u, wsk_provider_npi %p.\n", wsk_registration, wait_timeout, wsk_provider_npi); - return STATUS_NOT_IMPLEMENTED; + wsk_provider_npi->Client = client; + wsk_provider_npi->Dispatch = &wsk_dispatch; + return STATUS_SUCCESS; } void WINAPI WskReleaseProviderNPI(WSK_REGISTRATION *wsk_registration) { - FIXME("wsk_registration %p stub.\n", wsk_registration); + TRACE("wsk_registration %p.\n", wsk_registration); + } NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) { - FIXME("wsk_client_npi %p, wsk_registration %p stub.\n", wsk_client_npi, wsk_registration); + WSK_CLIENT *client; - return STATUS_NOT_IMPLEMENTED; + TRACE("wsk_client_npi %p, wsk_registration %p.\n", wsk_client_npi, wsk_registration); + + if (!(client = heap_alloc(sizeof(*client)))) + { + ERR("No memory.\n"); + return STATUS_NO_MEMORY; + } + + client->registration = wsk_registration; + client->client_npi = wsk_client_npi; + wsk_registration->ReservedRegistrationContext = client; + + return STATUS_SUCCESS; } void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration) { - FIXME("wsk_registration %p stub.\n", wsk_registration); + TRACE("wsk_registration %p.\n", wsk_registration); + + heap_free(wsk_registration->ReservedRegistrationContext); } static void WINAPI driver_unload(DRIVER_OBJECT *driver) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index 2fe6072ec5..d863d74836 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -66,10 +66,14 @@ static void netio_init(void) client_npi.Dispatch = &client_dispatch; status = WskRegister(&client_npi, &registration); - todo_wine ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); status = WskCaptureProviderNPI(&registration, WSK_INFINITE_WAIT, &provider_npi); - todo_wine ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + + ok(provider_npi.Dispatch->Version >= MAKE_WSK_VERSION(1, 0), "Got unexpected version %#x.\n", + provider_npi.Dispatch->Version); + ok(!!provider_npi.Client, "Got null WSK_CLIENT.\n"); } static void netio_uninit(void)

1 0