November 2018 - Wine-commits

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

30 Nov '18

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 : setupapi: Turn several constants and variables into static constants.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 837b4aa429ea0b7200a56df4f5ed30286e26c75e URL: https://source.winehq.org/git/wine.git/?a=commit;h=837b4aa429ea0b7200a56df4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:19 2018 -0700 setupapi: Turn several constants and variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 6 +++--- dlls/setupapi/install.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ae7a575..b3d7099 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -259,7 +259,7 @@ static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) static WCHAR *get_iface_key_path(struct device_iface *iface) { - const WCHAR slashW[] = {'\\',0}; + static const WCHAR slashW[] = {'\\',0}; WCHAR *path, *ptr; size_t len = strlenW(DeviceClasses) + 1 + 38 + 1 + strlenW(iface->symlink); @@ -286,8 +286,8 @@ static WCHAR *get_iface_key_path(struct device_iface *iface) static WCHAR *get_refstr_key_path(struct device_iface *iface) { - const WCHAR hashW[] = {'#',0}; - const WCHAR slashW[] = {'\\',0}; + static const WCHAR hashW[] = {'#',0}; + static const WCHAR slashW[] = {'\\',0}; WCHAR *path, *ptr; size_t len = strlenW(DeviceClasses) + 1 + 38 + 1 + strlenW(iface->symlink) + 1 + 1; diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 1453f52..0abd716 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1598,7 +1598,7 @@ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, } else { - WCHAR infdir[] = {'\\','i','n','f',0 }; + static const WCHAR infdir[] = {'\\','i','n','f',0}; DWORD msize; dir_len = GetWindowsDirectoryW( NULL, 0 ); msize = ( 7 + 4 + dir_len ) * sizeof( WCHAR );

1 0

Józef Kucia : mfplat: Fix memory allocation in mfsourceresolver_CreateObjectFromByteStream() ( Coverity).
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 7176f9b2d2053b0b6a6f0dcc5d4a7d337ce4eb68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7176f9b2d2053b0b6a6f0dcc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 30 11:19:51 2018 +0100 mfplat: Fix memory allocation in mfsourceresolver_CreateObjectFromByteStream() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 83afb94..c7c3465 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1907,7 +1907,7 @@ static HRESULT WINAPI mfsourceresolver_CreateObjectFromByteStream(IMFSourceResol { mfsource *new_object; - new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*new_object) ); if (!new_object) return E_OUTOFMEMORY;

1 0

Alexandre Julliard : makefiles: Output rules for building generated .rc files.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 364f97c2e174f5969bbea65a13ba91a83ce6b635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364f97c2e174f5969bbea65a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 12:55:18 2018 +0100 makefiles: Output rules for building generated .rc files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/Makefile.in | 5 ++--- tools/makedep.c | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 85eacb9..d74a279 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -16,7 +16,7 @@ SVG_SRCS = winetest.svg EXTRA_OBJS = build.res -EXTRA_TARGETS = build.rc build.nfo +EXTRA_TARGETS = build.nfo INSTALL_LIB = none @@ -26,8 +26,7 @@ build.rc: dummy build.nfo: -$(CC) -v 2>$@ -build.res: build.rc build.nfo - $(WRC) -o $@ build.rc +build.res: build.nfo dummy: .PHONY: dummy diff --git a/tools/makedep.c b/tools/makedep.c index e2f6d23..1afac8d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1805,7 +1805,9 @@ static struct makefile *parse_makefile( const char *path ) */ static void add_generated_sources( struct makefile *make ) { + unsigned int i; struct incl_file *source, *next, *file; + struct strarray objs = get_expanded_make_var_array( make, "EXTRA_OBJS" ); LIST_FOR_EACH_ENTRY_SAFE( source, next, &make->sources, struct incl_file, entry ) { @@ -1904,6 +1906,16 @@ static void add_generated_sources( struct makefile *make ) add_dependency( file->file, "wine/test.h", INCL_NORMAL ); add_all_includes( make, file, file->file ); } + for (i = 0; i < objs.count; i++) + { + /* default to .c for unknown extra object files */ + if (strendswith( objs.str[i], ".o" )) + add_generated_source( make, objs.str[i], replace_extension( objs.str[i], ".o", ".c" )); + else if (strendswith( objs.str[i], ".res" )) + add_generated_source( make, replace_extension( objs.str[i], ".res", ".rc" ), NULL ); + else + add_generated_source( make, objs.str[i], NULL ); + } } @@ -2514,6 +2526,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c struct strarray extradefs = get_expanded_file_local_var( make, obj, "EXTRADEFS" ); unsigned int i; + if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); strarray_add( &make->object_files, strmake( "%s.res", obj )); if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); @@ -4086,16 +4099,6 @@ static void load_sources( struct makefile *make ) add_generated_sources( make ); - value = get_expanded_make_var_array( make, "EXTRA_OBJS" ); - for (i = 0; i < value.count; i++) - { - /* default to .c for unknown extra object files */ - if (strendswith( value.str[i], ".o" )) - add_generated_source( make, value.str[i], replace_extension( value.str[i], ".o", ".c" ) ); - else - add_generated_source( make, value.str[i], NULL ); - } - LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); }

1 0

Alexandre Julliard : makefiles: Look in the extra targets for dependencies.
by Alexandre Julliard 30 Nov '18

30 Nov '18

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

Alexandre Julliard : makefiles: Expand more variables into the generated makefiles.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 1fd60d5656d9dda8486f1e4fcf8a45ab2188de43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fd60d5656d9dda8486f1e4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 13:26:36 2018 +0100 makefiles: Expand more variables into the generated makefiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- tools/makedep.c | 26 ++++++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index 13b5a5a..5e7ad68 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,7 +75,7 @@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) PACKAGE_VERSION = @PACKAGE_VERSION@ -SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@srcdir\@,$(srcdir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' +SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@srcdir\@,${srcdir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ INSTALL_PROGRAM = STRIPPROG="$(STRIP)" $(top_srcdir)/tools/install-sh $(INSTALL_PROGRAM_FLAGS) diff --git a/tools/makedep.c b/tools/makedep.c index 355f7fc..6b631b6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -148,11 +148,16 @@ static const char *man_ext; static const char *crosstarget; static const char *fontforge; static const char *convert; +static const char *flex; +static const char *bison; +static const char *ar; +static const char *ranlib; static const char *rsvg; static const char *icotool; static const char *dlltool; static const char *msgfmt; static const char *ln_s; +static const char *sed_cmd; struct makefile { @@ -2492,15 +2497,15 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co if (find_include_file( make, header )) { output( "%s: %s\n", obj_dir_path( make, header ), source->filename ); - output( "\t$(BISON) -p %s_ -o %s.tab.c -d %s\n", - obj, obj_dir_path( make, obj ), source->filename ); + output( "\t%s -p %s_ -o %s.tab.c -d %s\n", + bison, obj, obj_dir_path( make, obj ), source->filename ); output( "%s.tab.c: %s %s\n", obj_dir_path( make, obj ), source->filename, obj_dir_path( make, header )); strarray_add( &make->clean_files, header ); } else output( "%s.tab.c: %s\n", obj, source->filename ); - output( "\t$(BISON) -p %s_ -o $@ %s\n", obj, source->filename ); + output( "\t%s -p %s_ -o $@ %s\n", bison, obj, source->filename ); } @@ -2510,7 +2515,7 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co static void output_source_l( struct makefile *make, struct incl_file *source, const char *obj ) { output( "%s.yy.c: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t$(FLEX) -o$@ %s\n", source->filename ); + output( "\t%s -o$@ %s\n", flex, source->filename ); } @@ -2825,7 +2830,7 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c strarray_add( &make->in_files, xstrdup(obj) ); strarray_add( &make->all_targets, xstrdup(obj) ); output( "%s: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t$(SED_CMD) %s >$@ || (rm -f $@ && false)\n", source->filename ); + output( "\t%s %s >$@ || (rm -f $@ && false)\n", sed_cmd, source->filename ); output( "%s:", obj_dir_path( make, obj )); output_filenames( source->dependencies ); output( "\n" ); @@ -3177,9 +3182,9 @@ static void output_static_lib( struct makefile *make ) output( "%s:", obj_dir_path( make, make->staticlib )); output_filenames_obj_dir( make, make->object_files ); output( "\n\trm -f $@\n" ); - output( "\t$(AR) $(ARFLAGS) $@" ); + output( "\t%s rc $@", ar ); output_filenames_obj_dir( make, make->object_files ); - output( "\n\t$(RANLIB) $@\n" ); + output( "\n\t%s $@\n", ranlib ); add_install_rule( make, make->staticlib, make->staticlib, strmake( "d$(dlldir)/%s", make->staticlib )); if (crosstarget && make->module) @@ -3190,7 +3195,7 @@ static void output_static_lib( struct makefile *make ) output( "%s:", obj_dir_path( make, name )); output_filenames_obj_dir( make, make->crossobj_files ); output( "\n\trm -f $@\n" ); - output( "\t%s-ar $(ARFLAGS) $@", crosstarget ); + output( "\t%s-ar rc $@", crosstarget ); output_filenames_obj_dir( make, make->crossobj_files ); output( "\n\t%s-ranlib $@\n", crosstarget ); } @@ -4229,10 +4234,15 @@ int main( int argc, char *argv[] ) crosstarget = get_expanded_make_variable( top_makefile, "CROSSTARGET" ); fontforge = get_expanded_make_variable( top_makefile, "FONTFORGE" ); convert = get_expanded_make_variable( top_makefile, "CONVERT" ); + flex = get_expanded_make_variable( top_makefile, "FLEX" ); + bison = get_expanded_make_variable( top_makefile, "BISON" ); + ar = get_expanded_make_variable( top_makefile, "AR" ); + ranlib = get_expanded_make_variable( top_makefile, "RANLIB" ); rsvg = get_expanded_make_variable( top_makefile, "RSVG" ); icotool = get_expanded_make_variable( top_makefile, "ICOTOOL" ); dlltool = get_expanded_make_variable( top_makefile, "DLLTOOL" ); msgfmt = get_expanded_make_variable( top_makefile, "MSGFMT" ); + sed_cmd = get_expanded_make_variable( top_makefile, "SED_CMD" ); ln_s = get_expanded_make_variable( top_makefile, "LN_S" ); if (root_src_dir && !strcmp( root_src_dir, "." )) root_src_dir = NULL;

1 0

Nikolay Sivov : shcore: Add registry access helpers.
by Alexandre Julliard 30 Nov '18

30 Nov '18

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

Nikolay Sivov : shcore: Add IsOS().
by Alexandre Julliard 30 Nov '18

30 Nov '18

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 : shcore: Fix return value for file-based Commit().
by Alexandre Julliard 30 Nov '18

30 Nov '18

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 : shlwapi: Forward file-base stream calls to shcore.
by Alexandre Julliard 30 Nov '18

30 Nov '18

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