November 2018 - Wine-Commits

Józef Kucia : d3d8: Remove dead code from indexbuffer_init() (Coverity).
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 4dcba35b88d3f1309e175b1e16055628c09e5513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dcba35b88d3f1309e175b1e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 30 11:31:33 2018 +0100 d3d8: Remove dead code from indexbuffer_init() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 558583d..626d74e 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -586,8 +586,6 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;

1 0

Alex Henrie : jscript: Make several constants static.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 58da918e4dd0b659a1bcca6d881ef949c3a8c05c URL: https://source.winehq.org/git/wine.git/?a=commit;h=58da918e4dd0b659a1bcca6d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:07 2018 -0700 jscript: Make several constants static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 2 +- dlls/jscript/json.c | 2 +- dlls/jscript/jsutils.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 5e844ee..3f9db7a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -693,7 +693,7 @@ static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t case EXPR_IDENT: return push_instr_bstr(ctx, OP_delete_ident, ((identifier_expression_t*)expr->expression)->identifier); default: { - const WCHAR fixmeW[] = {'F','I','X','M','E',0}; + static const WCHAR fixmeW[] = {'F','I','X','M','E',0}; WARN("invalid delete, unimplemented exception message\n"); diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 0267340..d440543 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -487,7 +487,7 @@ static HRESULT json_quote(stringify_ctx_t *ctx, const WCHAR *ptr, size_t len) break; default: if(*ptr < ' ') { - const WCHAR formatW[] = {'\\','u','%','0','4','x',0}; + static const WCHAR formatW[] = {'\\','u','%','0','4','x',0}; WCHAR buf[7]; sprintfW(buf, formatW, *ptr); if(!append_string(ctx, buf)) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 72dd4db..b612e65 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -718,7 +718,7 @@ static jsstr_t *int_to_string(int i) HRESULT double_to_string(double n, jsstr_t **str) { - const WCHAR InfinityW[] = {'-','I','n','f','i','n','i','t','y',0}; + static const WCHAR InfinityW[] = {'-','I','n','f','i','n','i','t','y',0}; if(isnan(n)) { *str = jsstr_nan(); @@ -748,9 +748,9 @@ HRESULT double_to_string(double n, jsstr_t **str) /* ECMA-262 3rd Edition 9.8 */ HRESULT to_string(script_ctx_t *ctx, jsval_t val, jsstr_t **str) { - const WCHAR nullW[] = {'n','u','l','l',0}; - const WCHAR trueW[] = {'t','r','u','e',0}; - const WCHAR falseW[] = {'f','a','l','s','e',0}; + static const WCHAR nullW[] = {'n','u','l','l',0}; + static const WCHAR trueW[] = {'t','r','u','e',0}; + static const WCHAR falseW[] = {'f','a','l','s','e',0}; switch(jsval_type(val)) { case JSV_UNDEFINED:

1 0

Jacek Caban : jscript: Support undefined separator in String.split implementation.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 1fc9b2e93435ec336ba1f921ed2614de224cdbe3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fc9b2e93435ec336ba1f921… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 16:20:35 2018 +0100 jscript: Support undefined separator in String.split implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 25 +++++++++++++++++++----- dlls/jscript/tests/api.js | 22 ++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 48 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 89 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 7a6133d..79d7884 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1140,17 +1140,32 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi TRACE("\n"); - if(argc != 1 && argc != 2) { - FIXME("unsupported argc %u\n", argc); - return E_NOTIMPL; - } - hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); if(FAILED(hres)) return hres; length = jsstr_length(jsstr); + if(!argc || (is_undefined(argv[0]) && ctx->version >= SCRIPTLANGUAGEVERSION_ES5)) { + if(!r) + return S_OK; + + hres = create_array(ctx, 0, &array); + if(FAILED(hres)) + return hres; + + /* NOTE: according to spec, we should respect limit argument here (if provided). + * We have a test showing that it's broken in native IE. */ + hres = jsdisp_propput_idx(array, 0, jsval_string(jsstr)); + if(FAILED(hres)) { + jsdisp_release(array); + return hres; + } + + *r = jsval_obj(array); + return S_OK; + } + if(argc > 1 && !is_undefined(argv[1])) { hres = to_uint32(ctx, argv[1], &limit); if(FAILED(hres)) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f9178a9..ff6a6b7 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -618,6 +618,28 @@ ok(r[0] === "1", "r[0] = " + r[0]); ok(r[1] === "2", "r[1] = " + r[1]); ok(r[2] === "3", "r[1] = " + r[1]); +r = "1,2,3".split(undefined); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 1, "r.length = " + r.length); +ok(r[0] === "1,2,3", "r[0] = " + r[0]); + +r = "1,undefined2undefined,3".split(undefined); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 3, "r.length = " + r.length); +ok(r[0] === "1,", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(r[2] === ",3", "r[2] = " + r[2]); + +r = "1,undefined2undefined,3".split(); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 1, "r.length = " + r.length); +ok(r[0] === "1,undefined2undefined,3", "r[0] = " + r[0]); + +r = "".split(); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 1, "r.length = " + r.length); +ok(r[0] === "", "r[0] = " + r[0]); + tmp = "abcd".indexOf("bc",0); ok(tmp === 1, "indexOf = " + tmp); tmp = "abcd".indexOf("bc",1); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e4b9557..6097f4c 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -460,6 +460,51 @@ function test_global_properties() { next_test(); } +function test_string_split() { + var r; + + /* IE9 got this wrong*/ + if("1undefined2".split(undefined).length != 1) { + win_skip("detected broken String.prototype.split implementation"); + next_test(); + return; + } + + r = "1,2,3".split(undefined); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 1, "r.length = " + r.length); + ok(r[0] === "1,2,3", "r[0] = " + r[0]); + + r = "1,undefined2undefined,3".split(undefined); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 1, "r.length = " + r.length); + ok(r[0] === "1,undefined2undefined,3", "r[0] = " + r[0]); + + r = "1,undefined2undefined,3".split(); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 1, "r.length = " + r.length); + ok(r[0] === "1,undefined2undefined,3", "r[0] = " + r[0]); + + /* note: spec violation, limit is ignored */ + r = "1,undefined2undefined,3".split(undefined, 0); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 1, "r.length = " + r.length); + ok(r[0] === "1,undefined2undefined,3", "r[0] = " + r[0]); + + r = "1,undefined2null,3".split(null); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 2, "r.length = " + r.length); + ok(r[0] === "1,undefined2", "r[0] = " + r[0]); + ok(r[1] === ",3", "r[1] = " + r[1]); + + r = "".split(); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 1, "r.length = " + r.length); + ok(r[0] === "", "r[0] = " + r[0]); + + next_test(); +} + var tests = [ test_date_now, test_toISOString, @@ -469,5 +514,6 @@ var tests = [ test_getOwnPropertyDescriptor, test_defineProperty, test_string_trim, - test_global_properties + test_global_properties, + test_string_split ];

1 0

Nikolay Sivov : shcore: Add registry access helpers.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 6ae247bb5014c5795532b007bee7f3febe3560d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ae247bb5014c5795532b007… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 30 13:50:07 2018 +0300 shcore: Add registry access helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 442 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 42 ++--- dlls/shcore/tests/shcore.c | 333 ++++++++++++++++++++++++++++++++++ 3 files changed, 796 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ae247bb5014c5795532…

1 0

Alexandre Julliard : makefiles: Look in the extra targets for dependencies.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: cb078bd3bf627c668960345a625d9ff6103490d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb078bd3bf627c668960345a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 13:09:12 2018 +0100 makefiles: Look in the extra targets for dependencies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/Makefile.in | 4 +--- programs/winetest/winetest.rc | 3 +++ tools/makedep.c | 12 +++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index d74a279..2719a24 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -21,12 +21,10 @@ EXTRA_TARGETS = build.nfo INSTALL_LIB = none build.rc: dummy - build="BUILD_INFO STRINGRES build.nfo STRINGTABLE { 1 \"`GIT_DIR=$(top_srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1) + build="STRINGTABLE { 1 \"`GIT_DIR=$(top_srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1) build.nfo: -$(CC) -v 2>$@ -build.res: build.nfo - dummy: .PHONY: dummy diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index a9dcc18..a3898b6 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -90,3 +90,6 @@ END /* @makedep: winetest.ico */ IDI_WINE ICON "winetest.ico" + +/* @makedep: build.nfo */ +BUILD_INFO STRINGRES "build.nfo" diff --git a/tools/makedep.c b/tools/makedep.c index 1afac8d..355f7fc 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -170,6 +170,7 @@ struct makefile struct strarray extradllflags; struct strarray install_lib; struct strarray install_dev; + struct strarray extra_targets; struct list sources; struct list includes; const char *base_dir; @@ -1433,6 +1434,14 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ return file; } + /* check for extra targets */ + if (strarray_exists( &make->extra_targets, pFile->name )) + { + pFile->sourcename = filename; + pFile->filename = obj_dir_path( make, pFile->name ); + return NULL; + } + /* now try in source dir */ if ((file = open_local_file( make, pFile->name, &pFile->filename ))) return file; @@ -3740,7 +3749,7 @@ static void output_sources( struct makefile *make ) strarray_addall( &make->clean_files, make->object_files ); strarray_addall_uniq( &make->clean_files, make->crossobj_files ); strarray_addall( &make->clean_files, make->all_targets ); - strarray_addall( &make->clean_files, get_expanded_make_var_array( make, "EXTRA_TARGETS" )); + strarray_addall( &make->clean_files, make->extra_targets ); if (make->clean_files.count) { @@ -4044,6 +4053,7 @@ static void load_sources( struct makefile *make ) make->extradllflags = get_expanded_make_var_array( make, "EXTRADLLFLAGS" ); make->install_lib = get_expanded_make_var_array( make, "INSTALL_LIB" ); make->install_dev = get_expanded_make_var_array( make, "INSTALL_DEV" ); + make->extra_targets = get_expanded_make_var_array( make, "EXTRA_TARGETS" ); if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module;

1 0

Alex Henrie : secur32: Turn variables 'bs' and 'ds' into static constants.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 639243192e0629858b7912aabec75e3c32e66bd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=639243192e0629858b7912aa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:18 2018 -0700 secur32: Turn variables 'bs' and 'ds' into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index ec189fd..b3ab80a 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1001,8 +1001,8 @@ BOOLEAN WINAPI GetComputerObjectNameW( DWORD len = domainInfo->Name.Length + size + 3; if (lpNameBuffer && *nSize >= len) { - WCHAR bs[] = { '\\', 0 }; - WCHAR ds[] = { '$', 0 }; + static const WCHAR bs[] = { '\\', 0 }; + static const WCHAR ds[] = { '$', 0 }; if (domainInfo->Name.Buffer) { lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer);

1 0

Alex Henrie : msi: Turn several variables and constants into static constants.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 6a833ce0b39ae9f57162f6ffd3ff55f19f3ba540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a833ce0b39ae9f57162f6ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:12 2018 -0700 msi: Turn several variables and constants into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 4 ++-- dlls/msi/database.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8ae9dce..9407d36 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -160,7 +160,7 @@ static const WCHAR szINSTALL[] = static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template) { - WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + static const WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','A','c','t','i','o','n','T','e','x','t','`',' ','W','H','E','R','E',' ', '`','A','c','t','i','o','n','`',' ','=',' ','\'','%','s','\'',0}; MSIRECORD *row, *textrow; @@ -3546,7 +3546,7 @@ static WCHAR *build_full_keypath( MSIPACKAGE *package, MSICOMPONENT *comp ) { if (comp->assembly) { - const WCHAR prefixW[] = {'<','\\',0}; + static const WCHAR prefixW[] = {'<','\\',0}; DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); WCHAR *keypath = msi_alloc( (len + 1) * sizeof(WCHAR) ); diff --git a/dlls/msi/database.c b/dlls/msi/database.c index c1fb37b..b8ec393 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1333,7 +1333,7 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) if (MSI_RecordGetString(rec, i)) /* check record field is a string */ { /* quote string record fields */ - const WCHAR szQuote[] = {'\'', 0}; + static const WCHAR szQuote[] = {'\'', 0}; sz += 2; val = msi_alloc(sz*sizeof(WCHAR)); if (!val)

1 0

Nikolay Sivov : shcore: Fix return value for file-based Commit().
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 16eece44e357e2dd5ca021942462cb4600905fb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16eece44e357e2dd5ca02194… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 30 13:50:09 2018 +0300 shcore: Fix return value for file-based Commit(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index c18f9c8..6dca4f5 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -966,6 +966,15 @@ static HRESULT WINAPI filestream_CopyTo(IStream *iface, IStream *dest, ULARGE_IN return hr; } +static HRESULT WINAPI filestream_Commit(IStream *iface, DWORD flags) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p, %#x)\n", stream, flags); + + return S_OK; +} + static HRESULT WINAPI filestream_Stat(IStream *iface, STATSTG *statstg, DWORD flags) { struct shstream *stream = impl_from_IStream(iface); @@ -1012,7 +1021,7 @@ static const IStreamVtbl filestreamvtbl = filestream_Seek, filestream_SetSize, filestream_CopyTo, - shstream_Commit, + filestream_Commit, shstream_Revert, shstream_LockRegion, shstream_UnlockRegion,

1 0

Nikolay Sivov : shcore: Add IsOS().
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 588b734e35fb7bb6fde089e96c1c21eb11a0c696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=588b734e35fb7bb6fde089e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 30 13:50:08 2018 +0300 shcore: Add IsOS(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 2 +- 2 files changed, 121 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 45df1a8..c18f9c8 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2315,3 +2315,123 @@ LONG WINAPI SHQueryInfoKeyW(HKEY hkey, DWORD *subkeys, DWORD *subkey_max, DWORD return RegQueryInfoKeyW(hkey, NULL, NULL, NULL, subkeys, subkey_max, NULL, values, value_max, NULL, NULL, NULL); } + +/************************************************************************* + * IsOS [SHCORE.@] + */ +BOOL WINAPI IsOS(DWORD feature) +{ + DWORD platform, majorv, minorv; + OSVERSIONINFOA osvi; + + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); + if (!GetVersionExA(&osvi)) + return FALSE; + + majorv = osvi.dwMajorVersion; + minorv = osvi.dwMinorVersion; + platform = osvi.dwPlatformId; + +#define ISOS_RETURN(x) \ + TRACE("(0x%x) ret=%d\n",feature,(x)); \ + return (x) + + switch(feature) { + case OS_WIN32SORGREATER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32s + || platform == VER_PLATFORM_WIN32_WINDOWS); + case OS_NT: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT); + case OS_WIN95ORGREATER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS); + case OS_NT4ORGREATER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 4); + case OS_WIN2000ORGREATER_ALT: + case OS_WIN2000ORGREATER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5); + case OS_WIN98ORGREATER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv >= 10); + case OS_WIN98_GOLD: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv == 10); + case OS_WIN2000PRO: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5); + case OS_WIN2000SERVER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)); + case OS_WIN2000ADVSERVER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)); + case OS_WIN2000DATACENTER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)); + case OS_WIN2000TERMINAL: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)); + case OS_EMBEDDED: + FIXME("(OS_EMBEDDED) What should we return here?\n"); + return FALSE; + case OS_TERMINALCLIENT: + FIXME("(OS_TERMINALCLIENT) What should we return here?\n"); + return FALSE; + case OS_TERMINALREMOTEADMIN: + FIXME("(OS_TERMINALREMOTEADMIN) What should we return here?\n"); + return FALSE; + case OS_WIN95_GOLD: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv == 0); + case OS_MEORGREATER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv >= 90); + case OS_XPORGREATER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5 && minorv >= 1); + case OS_HOME: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5 && minorv >= 1); + case OS_PROFESSIONAL: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT); + case OS_DATACENTER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT); + case OS_ADVSERVER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5); + case OS_SERVER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT); + case OS_TERMINALSERVER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT); + case OS_PERSONALTERMINALSERVER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && minorv >= 1 && majorv >= 5); + case OS_FASTUSERSWITCHING: + FIXME("(OS_FASTUSERSWITCHING) What should we return here?\n"); + return TRUE; + case OS_WELCOMELOGONUI: + FIXME("(OS_WELCOMELOGONUI) What should we return here?\n"); + return FALSE; + case OS_DOMAINMEMBER: + FIXME("(OS_DOMAINMEMBER) What should we return here?\n"); + return TRUE; + case OS_ANYSERVER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT); + case OS_WOW6432: + { + BOOL is_wow64; + IsWow64Process(GetCurrentProcess(), &is_wow64); + return is_wow64; + } + case OS_WEBSERVER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT); + case OS_SMALLBUSINESSSERVER: + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT); + case OS_TABLETPC: + FIXME("(OS_TABLETPC) What should we return here?\n"); + return FALSE; + case OS_SERVERADMINUI: + FIXME("(OS_SERVERADMINUI) What should we return here?\n"); + return FALSE; + case OS_MEDIACENTER: + FIXME("(OS_MEDIACENTER) What should we return here?\n"); + return FALSE; + case OS_APPLIANCE: + FIXME("(OS_APPLIANCE) What should we return here?\n"); + return FALSE; + case 0x25: /*OS_VISTAORGREATER*/ + ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 6); + } + +#undef ISOS_RETURN + + WARN("(0x%x) unknown parameter\n", feature); + + return FALSE; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index c0150cb..6ad1297 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -25,7 +25,7 @@ @ stdcall IUnknown_QueryService(ptr ptr ptr ptr) @ stdcall IUnknown_Set(ptr ptr) @ stdcall IUnknown_SetSite(ptr ptr) -@ stdcall IsOS(long) shlwapi.IsOS +@ stdcall IsOS(long) @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications

1 0

Nikolay Sivov : shlwapi: Forward file-base stream calls to shcore.
by Alexandre Julliard Nov. 30, 2018

Nov. 30, 2018

Module: wine Branch: master Commit: 29a15a35f578d215a6edf832dd9878c3c4c94e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=29a15a35f578d215a6edf832… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 30 13:50:10 2018 +0300 shlwapi: Forward file-base stream calls to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 1 + dlls/shlwapi/istream.c | 497 ---------------------------------------------- dlls/shlwapi/shlwapi.spec | 6 +- 3 files changed, 4 insertions(+), 500 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29a15a35f578d215a6ed…

1 0