May 2018 - Wine-Commits - list.winehq.org

Jacek Caban : wininet: Allow INTERNET_OPTION_SETTINGS_CHANGED on all handle types.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: d9dd9023fd5793c93db29d738a8577122f6aff2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9dd9023fd5793c93db29d73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 17:14:21 2018 +0200 wininet: Allow INTERNET_OPTION_SETTINGS_CHANGED on all handle types. Based on patch by Michael Müller. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 11 +++++------ dlls/wininet/tests/internet.c | 9 +++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 699962c..be02a50 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2600,6 +2600,10 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption, DWORD INET_SetOption(object_header_t *hdr, DWORD option, void *buf, DWORD size) { switch(option) { + case INTERNET_OPTION_SETTINGS_CHANGED: + FIXME("INTERNETOPTION_SETTINGS_CHANGED semi-stub\n"); + collect_connections(COLLECT_CONNECTIONS); + return ERROR_SUCCESS; case INTERNET_OPTION_CALLBACK: WARN("Not settable option %u\n", option); return ERROR_INTERNET_OPTION_NOT_SETTABLE; @@ -2652,11 +2656,6 @@ static DWORD set_global_option(DWORD option, void *buf, DWORD size) connect_timeout = *(ULONG*)buf; return ERROR_SUCCESS; - case INTERNET_OPTION_SETTINGS_CHANGED: - FIXME("INTERNETOPTION_SETTINGS_CHANGED semi-stub\n"); - collect_connections(COLLECT_CONNECTIONS); - return ERROR_SUCCESS; - case INTERNET_OPTION_SUPPRESS_BEHAVIOR: FIXME("INTERNET_OPTION_SUPPRESS_BEHAVIOR stub\n"); @@ -2667,7 +2666,7 @@ static DWORD set_global_option(DWORD option, void *buf, DWORD size) return ERROR_SUCCESS; } - return ERROR_INTERNET_INVALID_OPTION; + return INET_SetOption(NULL, option, buf, size); } /*********************************************************************** diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 3201dd9..79282a1 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1165,6 +1165,15 @@ static void test_InternetSetOption(void) ok(ret == FALSE, "InternetSetOption should've failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %x\n", GetLastError()); + ret = InternetSetOptionA(req, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + + ret = InternetSetOptionA(con, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + + ret = InternetSetOptionA(ses, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + ret = InternetCloseHandle(req); ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); ret = InternetCloseHandle(con);

1 0

Jacek Caban : jscript: Rename PROPF_ENUM to PROPF_ENUMERABLE.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: da186c3cc58a563f73b8e505bdf22ff6927f518e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da186c3cc58a563f73b8e505… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 14:59:02 2018 +0200 jscript: Rename PROPF_ENUM to PROPF_ENUMERABLE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 12 ++++++------ dlls/jscript/jscript.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f896b30..d3f345a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -221,7 +221,7 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, flags |= PROPF_WRITABLE | PROPF_CONFIGURABLE; else if(builtin->setter) flags |= PROPF_WRITABLE; - flags &= PROPF_ENUM | PROPF_WRITABLE | PROPF_CONFIGURABLE; + flags &= PROPF_ENUMERABLE | PROPF_WRITABLE | PROPF_CONFIGURABLE; prop = alloc_prop(This, name, PROP_BUILTIN, flags); if(!prop) return E_OUTOFMEMORY; @@ -490,7 +490,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) /* fall through */ case PROP_PROTREF: prop->type = PROP_JSVAL; - prop->flags = PROPF_ENUM | PROPF_CONFIGURABLE | PROPF_WRITABLE; + prop->flags = PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE; prop->u.val = jsval_undefined(); break; case PROP_JSVAL: @@ -850,7 +850,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, } while(iter < This->props + This->prop_cnt) { - if(iter->name && (get_flags(This, iter) & PROPF_ENUM) && iter->type!=PROP_DELETED) { + if(iter->name && (get_flags(This, iter) & PROPF_ENUMERABLE) && iter->type!=PROP_DELETED) { *pid = prop_to_id(This, iter); return S_OK; } @@ -1040,7 +1040,7 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * HRESULT hres; if(flags & fdexNameEnsure) - hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUM | PROPF_CONFIGURABLE | PROPF_WRITABLE, + hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE, &prop); else hres = find_prop_name_prot(jsdisp, string_hash(name), name, &prop); @@ -1313,7 +1313,7 @@ HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, jsval_t va HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val) { - return jsdisp_propput(obj, name, PROPF_ENUM | PROPF_CONFIGURABLE | PROPF_WRITABLE, val); + return jsdisp_propput(obj, name, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE, val); } HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) @@ -1611,6 +1611,6 @@ HRESULT jsdisp_is_enumerable(jsdisp_t *obj, const WCHAR *name, BOOL *ret) if(FAILED(hres)) return hres; - *ret = prop && (prop->flags & PROPF_ENUM) && prop->type != PROP_PROTREF; + *ret = prop && (prop->flags & PROPF_ENUMERABLE) && prop->type != PROP_PROTREF; return S_OK; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 335df1a..9c28da0 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -89,7 +89,7 @@ extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN; #define PROPF_ARGMASK 0x00ff #define PROPF_METHOD 0x0100 -#define PROPF_ENUM 0x0200 +#define PROPF_ENUMERABLE 0x0200 #define PROPF_CONSTR 0x0400 #define PROPF_WRITABLE 0x0800 #define PROPF_CONFIGURABLE 0x1000

1 0

Jacek Caban : wininet: Add stub for INTERNET_OPTION_REFRESH.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 2bba45765b9d8af5f440aa3b9ec20c1a13a0f158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bba45765b9d8af5f440aa3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 17:14:36 2018 +0200 wininet: Add stub for INTERNET_OPTION_REFRESH. Based on patch by Michael Müller. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 5 +++++ dlls/wininet/tests/internet.c | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index be02a50..6d0d35c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -970,6 +970,9 @@ static DWORD APPINFO_SetOption(object_header_t *hdr, DWORD option, void *buf, DW heap_free(ai->agent); if (!(ai->agent = heap_strdupW(buf))) return ERROR_OUTOFMEMORY; return ERROR_SUCCESS; + case INTERNET_OPTION_REFRESH: + FIXME("INTERNET_OPTION_REFRESH\n"); + return ERROR_SUCCESS; } return INET_SetOption(hdr, option, buf, size); @@ -2611,6 +2614,8 @@ DWORD INET_SetOption(object_header_t *hdr, DWORD option, void *buf, DWORD size) case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: WARN("Called on global option %u\n", option); return ERROR_INTERNET_INVALID_OPERATION; + case INTERNET_OPTION_REFRESH: + return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; } return ERROR_INTERNET_INVALID_OPTION; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 79282a1..39c698f 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1174,6 +1174,19 @@ static void test_InternetSetOption(void) ret = InternetSetOptionA(ses, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + ret = InternetSetOptionA(ses, INTERNET_OPTION_REFRESH, NULL, 0); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + + SetLastError(0xdeadbeef); + ret = InternetSetOptionA(req, INTERNET_OPTION_REFRESH, NULL, 0); + ok(ret == FALSE, "InternetSetOption should've failed\n"); + ok(GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "GetLastError() = %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = InternetSetOptionA(con, INTERNET_OPTION_REFRESH, NULL, 0); + ok(ret == FALSE, "InternetSetOption should've failed\n"); + ok(GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "GetLastError() = %u\n", GetLastError()); + ret = InternetCloseHandle(req); ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); ret = InternetCloseHandle(con);

1 0

André Hentschel : ntoskrnl.exe/tests: Don' t test functions directly when reporting GetLastError().
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: e637a6f0bf1eeba3e6be62c4e1c5688bb8f6102e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e637a6f0bf1eeba3e6be62c4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 3 19:27:55 2018 +0200 ntoskrnl.exe/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5887d94..40de760 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -68,8 +68,10 @@ static void unload_driver(SC_HANDLE service) ControlService(service, SERVICE_CONTROL_STOP, &status); while (status.dwCurrentState == SERVICE_STOP_PENDING) { + BOOL ret; Sleep(100); - ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError()); + ret = QueryServiceStatus(service, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); } ok(status.dwCurrentState == SERVICE_STOPPED, "expected SERVICE_STOPPED, got %d\n", status.dwCurrentState); @@ -121,11 +123,13 @@ static SC_HANDLE load_driver(char *filename) ok(ret, "StartService failed: %u\n", GetLastError()); /* wait for the service to start up properly */ - ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError()); + ret = QueryServiceStatus(service, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); while (status.dwCurrentState == SERVICE_START_PENDING) { Sleep(100); - ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError()); + ret = QueryServiceStatus(service, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); } ok(status.dwCurrentState == SERVICE_RUNNING, "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState); @@ -194,6 +198,7 @@ START_TEST(ntoskrnl) { char filename[MAX_PATH]; SC_HANDLE service; + BOOL ret; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); @@ -205,5 +210,6 @@ START_TEST(ntoskrnl) main_test(); unload_driver(service); - ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA(filename); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); }

1 0

Alex Henrie : include: Add llabs.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 8a9812b767bb0c3fe0dc20b9d2d49a55cae8e9f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9812b767bb0c3fe0dc20b9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 2 19:53:17 2018 -0600 include: Add llabs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index ae6cc83..3c9c4a7 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -198,6 +198,7 @@ void __cdecl exit(int); void __cdecl free(void*); char* __cdecl getenv(const char*); __msvcrt_long __cdecl labs(__msvcrt_long); +__int64 __cdecl llabs(__int64); void* __cdecl malloc(size_t); int __cdecl mblen(const char*,size_t); void __cdecl perror(const char*);

1 0

Alex Henrie : include: Add atoll.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 0ab4f08954d5f171e3172b2cf762bfa229ecb0af URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ab4f08954d5f171e3172b2c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 2 19:53:15 2018 -0600 include: Add atoll. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 8d0a7c5..745f214 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -188,6 +188,7 @@ double __cdecl atof(const char*); int __cdecl atoi(const char*); int __cdecl _atoi_l(const char*,_locale_t); __msvcrt_long __cdecl atol(const char*); +__int64 __cdecl atoll(const char*); void* __cdecl calloc(size_t,size_t); #ifndef __i386__ div_t __cdecl div(int,int);

1 0

Jacek Caban : jscript: Use new PROPF_WRITABLE flag instead of PROPF_CONST.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 6b86fd795c044b3cb2b91b1cbe5792607c7dada0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b86fd795c044b3cb2b91b1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 14:58:55 2018 +0200 jscript: Use new PROPF_WRITABLE flag instead of PROPF_CONST. This is closer to how ES5 defines them. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 22 ++++++++++++---------- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 63ab21d..f896b30 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -218,8 +218,10 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, if(builtin) { unsigned flags = builtin->flags; if(flags & PROPF_METHOD) - flags |= PROPF_CONFIGURABLE; - flags &= PROPF_ENUM | PROPF_CONST | PROPF_CONFIGURABLE; + flags |= PROPF_WRITABLE | PROPF_CONFIGURABLE; + else if(builtin->setter) + flags |= PROPF_WRITABLE; + flags &= PROPF_ENUM | PROPF_WRITABLE | PROPF_CONFIGURABLE; prop = alloc_prop(This, name, PROP_BUILTIN, flags); if(!prop) return E_OUTOFMEMORY; @@ -236,7 +238,7 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, for(ptr = name; isdigitW(*ptr) && idx < 0x10000; ptr++) idx = idx*10 + (*ptr-'0'); if(!*ptr && idx < This->builtin_info->idx_length(This)) { - prop = alloc_prop(This, name, PROP_IDX, This->builtin_info->idx_put ? 0 : PROPF_CONST); + prop = alloc_prop(This, name, PROP_IDX, This->builtin_info->idx_put ? PROPF_WRITABLE : 0); if(!prop) return E_OUTOFMEMORY; @@ -272,7 +274,6 @@ static HRESULT find_prop_name_prot(jsdisp_t *This, unsigned hash, const WCHAR *n if(prop) { if(del) { del->type = PROP_PROTREF; - del->flags = 0; del->u.ref = prop - This->prototype->props; prop = del; }else { @@ -474,7 +475,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) { HRESULT hres; - if(prop->flags & PROPF_CONST) + if(!(prop->flags & PROPF_WRITABLE) && prop->type != PROP_PROTREF) return S_OK; switch(prop->type) { @@ -489,7 +490,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) /* fall through */ case PROP_PROTREF: prop->type = PROP_JSVAL; - prop->flags = PROPF_ENUM | PROPF_CONFIGURABLE; + prop->flags = PROPF_ENUM | PROPF_CONFIGURABLE | PROPF_WRITABLE; prop->u.val = jsval_undefined(); break; case PROP_JSVAL: @@ -1039,7 +1040,8 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * HRESULT hres; if(flags & fdexNameEnsure) - hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUM | PROPF_CONFIGURABLE, &prop); + hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUM | PROPF_CONFIGURABLE | PROPF_WRITABLE, + &prop); else hres = find_prop_name_prot(jsdisp, string_hash(name), name, &prop); if(FAILED(hres)) @@ -1311,7 +1313,7 @@ HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, jsval_t va HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val) { - return jsdisp_propput(obj, name, PROPF_ENUM | PROPF_CONFIGURABLE, val); + return jsdisp_propput(obj, name, PROPF_ENUM | PROPF_CONFIGURABLE | PROPF_WRITABLE, val); } HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) @@ -1319,7 +1321,7 @@ HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) dispex_prop_t *prop; HRESULT hres; - hres = ensure_prop_name(obj, name, FALSE, PROPF_CONST, &prop); + hres = ensure_prop_name(obj, name, FALSE, 0, &prop); if(FAILED(hres)) return hres; @@ -1328,7 +1330,7 @@ HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, jsval_t val) { - return jsdisp_propput(obj, name, PROPF_CONFIGURABLE, val); + return jsdisp_propput(obj, name, PROPF_CONFIGURABLE | PROPF_WRITABLE, val); } HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 2e905a9..ac0640f 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -184,7 +184,7 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) if(SUCCEEDED(hres)) hres = jsdisp_propput_dontenum(&args->jsdisp, caleeW, jsval_disp(to_disp(&args->function->dispex))); if(SUCCEEDED(hres)) - hres = jsdisp_propput(frame->base_scope->jsobj, argumentsW, 0, jsval_obj(&args->jsdisp)); + hres = jsdisp_propput(frame->base_scope->jsobj, argumentsW, PROPF_WRITABLE, jsval_obj(&args->jsdisp)); if(FAILED(hres)) { jsdisp_release(&args->jsdisp); return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 03a96c3..335df1a 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -91,7 +91,7 @@ extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN; #define PROPF_METHOD 0x0100 #define PROPF_ENUM 0x0200 #define PROPF_CONSTR 0x0400 -#define PROPF_CONST 0x0800 +#define PROPF_WRITABLE 0x0800 #define PROPF_CONFIGURABLE 0x1000 #define PROPF_VERSION_MASK 0x01ff0000

1 0

Jacek Caban : jscript: Use new PROPF_CONFIGURABLE flag instead of PROPF_DONTDELETE.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 197db9cac973fbe220e50e8b96e5aee7e37bc2e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=197db9cac973fbe220e50e8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 14:58:44 2018 +0200 jscript: Use new PROPF_CONFIGURABLE flag instead of PROPF_DONTDELETE. This is closer to how ES5 defines them. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 16 ++++++++++------ dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 12 ++++++------ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 81df4d0..63ab21d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -216,7 +216,11 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, builtin = find_builtin_prop(This, name); if(builtin) { - prop = alloc_prop(This, name, PROP_BUILTIN, builtin->flags); + unsigned flags = builtin->flags; + if(flags & PROPF_METHOD) + flags |= PROPF_CONFIGURABLE; + flags &= PROPF_ENUM | PROPF_CONST | PROPF_CONFIGURABLE; + prop = alloc_prop(This, name, PROP_BUILTIN, flags); if(!prop) return E_OUTOFMEMORY; @@ -485,7 +489,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) /* fall through */ case PROP_PROTREF: prop->type = PROP_JSVAL; - prop->flags = PROPF_ENUM; + prop->flags = PROPF_ENUM | PROPF_CONFIGURABLE; prop->u.val = jsval_undefined(); break; case PROP_JSVAL: @@ -744,7 +748,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) { - if(prop->flags & PROPF_DONTDELETE) { + if(!(prop->flags & PROPF_CONFIGURABLE)) { *ret = FALSE; return S_OK; } @@ -1035,7 +1039,7 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * HRESULT hres; if(flags & fdexNameEnsure) - hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUM, &prop); + hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUM | PROPF_CONFIGURABLE, &prop); else hres = find_prop_name_prot(jsdisp, string_hash(name), name, &prop); if(FAILED(hres)) @@ -1307,7 +1311,7 @@ HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, jsval_t va HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val) { - return jsdisp_propput(obj, name, PROPF_ENUM, val); + return jsdisp_propput(obj, name, PROPF_ENUM | PROPF_CONFIGURABLE, val); } HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) @@ -1324,7 +1328,7 @@ HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, jsval_t val) { - return jsdisp_propput(obj, name, 0, val); + return jsdisp_propput(obj, name, PROPF_CONFIGURABLE, val); } HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 8480a3b..2e905a9 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -184,7 +184,7 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) if(SUCCEEDED(hres)) hres = jsdisp_propput_dontenum(&args->jsdisp, caleeW, jsval_disp(to_disp(&args->function->dispex))); if(SUCCEEDED(hres)) - hres = jsdisp_propput(frame->base_scope->jsobj, argumentsW, PROPF_DONTDELETE, jsval_obj(&args->jsdisp)); + hres = jsdisp_propput(frame->base_scope->jsobj, argumentsW, 0, jsval_obj(&args->jsdisp)); if(FAILED(hres)) { jsdisp_release(&args->jsdisp); return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 8678619..03a96c3 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -87,12 +87,12 @@ typedef struct jsdisp_t jsdisp_t; extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN; -#define PROPF_ARGMASK 0x00ff -#define PROPF_METHOD 0x0100 -#define PROPF_ENUM 0x0200 -#define PROPF_CONSTR 0x0400 -#define PROPF_CONST 0x0800 -#define PROPF_DONTDELETE 0x1000 +#define PROPF_ARGMASK 0x00ff +#define PROPF_METHOD 0x0100 +#define PROPF_ENUM 0x0200 +#define PROPF_CONSTR 0x0400 +#define PROPF_CONST 0x0800 +#define PROPF_CONFIGURABLE 0x1000 #define PROPF_VERSION_MASK 0x01ff0000 #define PROPF_VERSION_SHIFT 16

1 0

Hans Leidekker : programs: Add a stub winmgmt service.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 623543bedc17eec14252ad3f81e87af010143b2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=623543bedc17eec14252ad3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 3 13:29:50 2018 +0200 programs: Add a stub winmgmt service. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + loader/wine.inf.in | 11 +++++ programs/winmgmt/Makefile.in | 6 +++ programs/winmgmt/main.c | 100 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+) diff --git a/configure b/configure index 119391d..a2adb44 100755 --- a/configure +++ b/configure @@ -1727,6 +1727,7 @@ enable_winemsibuilder enable_winepath enable_winetest enable_winhlp32 +enable_winmgmt enable_winver enable_wmic enable_wmplayer @@ -19298,6 +19299,7 @@ wine_fn_config_makefile programs/winetest enable_winetest wine_fn_config_makefile programs/winevdm enable_win16 wine_fn_config_makefile programs/winhelp.exe16 enable_win16 wine_fn_config_makefile programs/winhlp32 enable_winhlp32 +wine_fn_config_makefile programs/winmgmt enable_winmgmt wine_fn_config_makefile programs/winoldap.mod16 enable_win16 wine_fn_config_makefile programs/winver enable_winver wine_fn_config_makefile programs/wmic enable_wmic diff --git a/configure.ac b/configure.ac index 1bc3d13..6064081 100644 --- a/configure.ac +++ b/configure.ac @@ -3920,6 +3920,7 @@ WINE_CONFIG_MAKEFILE(programs/winetest) WINE_CONFIG_MAKEFILE(programs/winevdm,enable_win16) WINE_CONFIG_MAKEFILE(programs/winhelp.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/winhlp32) +WINE_CONFIG_MAKEFILE(programs/winmgmt) WINE_CONFIG_MAKEFILE(programs/winoldap.mod16,enable_win16) WINE_CONFIG_MAKEFILE(programs/winver) WINE_CONFIG_MAKEFILE(programs/wmic) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 627c6ef..861aa82 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -135,6 +135,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=WineHID,0,WineHIDService +AddService=Winmgmt,0,WinmgmtService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -151,6 +152,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=WineHID,0,WineHIDService +AddService=Winmgmt,0,WinmgmtService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -167,6 +169,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=WineHID,0,WineHIDService +AddService=Winmgmt,0,WinmgmtService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -3321,6 +3324,14 @@ ServiceType=32 StartType=3 ErrorControl=1 +[WinmgmtService] +Description="Provides access to Windows Management Instrumentation" +DisplayName="Windows Management Instrumentation Service" +ServiceBinary="%11%\winmgmt.exe" +ServiceType=32 +StartType=3 +ErrorControl=1 + [StiService] AddReg=StiServiceKeys Description="WIA Service" diff --git a/programs/winmgmt/Makefile.in b/programs/winmgmt/Makefile.in new file mode 100644 index 0000000..0a3b08e --- /dev/null +++ b/programs/winmgmt/Makefile.in @@ -0,0 +1,6 @@ +MODULE = winmgmt.exe +APPMODE = -mconsole -municode +IMPORTS = advapi32 + +C_SRCS = \ + main.c diff --git a/programs/winmgmt/main.c b/programs/winmgmt/main.c new file mode 100644 index 0000000..283f26e --- /dev/null +++ b/programs/winmgmt/main.c @@ -0,0 +1,100 @@ +/* + * Copyright 2018 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include <winsvc.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winmgmt); + +static WCHAR winmgmtW[] = {'W','i','n','m','g','m','t',0}; + +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + TRACE( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + FIXME( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + +static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) +{ + SERVICE_STATUS status; + + TRACE( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( winmgmtW, service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + TRACE( "service stopped\n" ); +} + +int wmain( int argc, WCHAR *argv[] ) +{ + static const SERVICE_TABLE_ENTRYW service_table[] = + { + { winmgmtW, ServiceMain }, + { NULL, NULL } + }; + + StartServiceCtrlDispatcherW( service_table ); + return 0; +}

1 0

Daniel Lehman : include: Add thread pool declarations for currently implemented functions.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 9f53887d1e9a791bf370e71c34d7eb0d04441589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f53887d1e9a791bf370e71c… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Apr 25 13:55:33 2018 -0700 include: Add thread pool declarations for currently implemented functions. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 4cc2c7e..4ddc1d3 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1921,6 +1921,7 @@ WINADVAPI BOOL WINAPI DeregisterEventSource(HANDLE); WINADVAPI BOOL WINAPI DestroyPrivateObjectSecurity(PSECURITY_DESCRIPTOR*); WINBASEAPI BOOL WINAPI DeviceIoControl(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI DisableThreadLibraryCalls(HMODULE); +WINBASEAPI VOID WINAPI DisassociateCurrentThreadFromCallback(PTP_CALLBACK_INSTANCE); WINBASEAPI BOOL WINAPI DisconnectNamedPipe(HANDLE); WINBASEAPI BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR,LPSTR,LPDWORD); WINBASEAPI BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR,LPWSTR,LPDWORD); @@ -2345,6 +2346,7 @@ WINBASEAPI BOOL WINAPI IsBadWritePtr(LPVOID,UINT_PTR); WINBASEAPI BOOL WINAPI IsDebuggerPresent(void); WINBASEAPI BOOL WINAPI IsSystemResumeAutomatic(void); WINADVAPI BOOL WINAPI IsTextUnicode(LPCVOID,INT,LPINT); +WINBASEAPI BOOL WINAPI IsThreadpoolTimerSet(PTP_TIMER); WINADVAPI BOOL WINAPI IsTokenRestricted(HANDLE); WINADVAPI BOOL WINAPI IsValidAcl(PACL); WINADVAPI BOOL WINAPI IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR); @@ -2357,6 +2359,7 @@ WINADVAPI BOOL WINAPI ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL); WINBASEAPI BOOL WINAPI IsProcessInJob(HANDLE,HANDLE,PBOOL); WINBASEAPI BOOL WINAPI IsProcessorFeaturePresent(DWORD); WINBASEAPI void WINAPI LeaveCriticalSection(CRITICAL_SECTION *lpCrit); +WINBASEAPI VOID WINAPI LeaveCriticalSectionWhenCallbackReturns(PTP_CALLBACK_INSTANCE,CRITICAL_SECTION*); WINBASEAPI HMODULE WINAPI LoadLibraryA(LPCSTR); WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR); #define LoadLibrary WINELIB_NAME_AW(LoadLibrary) @@ -2512,7 +2515,9 @@ WINBASEAPI BOOL WINAPI RegisterWaitForSingleObject(PHANDLE,HANDLE,WAITORT WINBASEAPI HANDLE WINAPI RegisterWaitForSingleObjectEx(HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); WINBASEAPI VOID WINAPI ReleaseActCtx(HANDLE); WINBASEAPI BOOL WINAPI ReleaseMutex(HANDLE); +WINBASEAPI VOID WINAPI ReleaseMutexWhenCallbackReturns(PTP_CALLBACK_INSTANCE,HANDLE); WINBASEAPI BOOL WINAPI ReleaseSemaphore(HANDLE,LONG,LPLONG); +WINBASEAPI VOID WINAPI ReleaseSemaphoreWhenCallbackReturns(PTP_CALLBACK_INSTANCE,HANDLE,DWORD); WINBASEAPI VOID WINAPI ReleaseSRWLockExclusive(PSRWLOCK); WINBASEAPI VOID WINAPI ReleaseSRWLockShared(PSRWLOCK); WINBASEAPI ULONG WINAPI RemoveVectoredExceptionHandler(PVOID); @@ -2563,6 +2568,7 @@ WINBASEAPI BOOL WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR); #define SetEnvironmentVariable WINELIB_NAME_AW(SetEnvironmentVariable) WINBASEAPI UINT WINAPI SetErrorMode(UINT); WINBASEAPI BOOL WINAPI SetEvent(HANDLE); +WINBASEAPI VOID WINAPI SetEventWhenCallbackReturns(PTP_CALLBACK_INSTANCE,HANDLE); WINBASEAPI VOID WINAPI SetFileApisToANSI(void); WINBASEAPI VOID WINAPI SetFileApisToOEM(void); WINBASEAPI BOOL WINAPI SetFileAttributesA(LPCSTR,DWORD); @@ -2608,6 +2614,8 @@ WINBASEAPI BOOL WINAPI SetThreadContext(HANDLE,const CONTEXT *); WINBASEAPI BOOL WINAPI SetThreadErrorMode(DWORD,LPDWORD); WINBASEAPI DWORD WINAPI SetThreadExecutionState(EXECUTION_STATE); WINBASEAPI DWORD WINAPI SetThreadIdealProcessor(HANDLE,DWORD); +WINBASEAPI VOID WINAPI SetThreadpoolThreadMaximum(PTP_POOL,DWORD); +WINBASEAPI BOOL WINAPI SetThreadpoolThreadMinimum(PTP_POOL,DWORD); WINBASEAPI BOOL WINAPI SetThreadPriority(HANDLE,INT); WINBASEAPI BOOL WINAPI SetThreadPriorityBoost(HANDLE,BOOL); WINADVAPI BOOL WINAPI SetThreadToken(PHANDLE,HANDLE); @@ -2688,6 +2696,8 @@ WINBASEAPI DWORD WINAPI WaitForMultipleObjectsEx(DWORD,const HANDLE*,BOOL, WINBASEAPI DWORD WINAPI WaitForSingleObject(HANDLE,DWORD); WINBASEAPI DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL); WINBASEAPI VOID WINAPI WaitForThreadpoolTimerCallbacks(PTP_TIMER,BOOL); +WINBASEAPI VOID WINAPI WaitForThreadpoolWaitCallbacks(PTP_WAIT,BOOL); +WINBASEAPI VOID WINAPI WaitForThreadpoolWorkCallbacks(PTP_WORK,BOOL); WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); #define WaitNamedPipe WINELIB_NAME_AW(WaitNamedPipe)

1 0