wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Alexandre Julliard : configure: Fix notice message for libSDL2.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: bdab9bd2c90f591490a3799663e8754eeb3718ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdab9bd2c90f591490a37996… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 20:35:42 2018 +0100 configure: Fix notice message for libSDL2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d5fce3c..7ef096d 100755 --- a/configure +++ b/configure @@ -13227,7 +13227,7 @@ test -z "$SDL2_CFLAGS" || SDL2_CFLAGS=`echo " $SDL2_CFLAGS" | sed 's/ -I$[^/]$ test -z "$SDL2_LIBS" || SDL2_LIBS=`echo " $SDL2_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi -if test "x$SDL_LIBS" = "x"; then : +if test "x$ac_cv_lib_soname_SDL2" = "x"; then : case "x$with_sdl" in x) as_fn_append wine_notices "|libSDL2 ${notice_platform}development files not found, SDL2 won't be supported." ;; xno) ;; diff --git a/configure.ac b/configure.ac index cd7a785..7b796ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1601,7 +1601,7 @@ then [AC_CHECK_HEADERS([SDL2/SDL.h], [WINE_CHECK_SONAME(SDL2,SDL_Init,,,,[[libSDL2-2.0*]])])]) fi -WINE_NOTICE_WITH(sdl,[test "x$SDL_LIBS" = "x"], +WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], [libSDL2 ${notice_platform}development files not found, SDL2 won't be supported.]) dnl **** Check for capi4linux ****

1 0

Alexandre Julliard : makefiles: Generate the remaining top-level rules from makedep.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: e91304e4165cd825f63b52105b3df8f70e0de54f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91304e4165cd825f63b5210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 18:17:46 2018 +0100 makefiles: Generate the remaining top-level rules from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- aclocal.m4 | 40 +++------------------------ configure | 48 +++++++-------------------------- tools/makedep.c | 83 ++++++++++++++++++++++++++++++++++++++++----------------- 4 files changed, 73 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e91304e4165cd825f63b…

1 0

Alexandre Julliard : makefiles: Generate the top-level test rules from makedep.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 2b59daf32608902f5f0450aeb0719504884cdc72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b59daf32608902f5f0450ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 17:32:35 2018 +0100 makefiles: Generate the top-level test rules from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 18 +----------------- configure | 18 +----------------- tools/makedep.c | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 34 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 4fc6cd4..830ec2f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -309,23 +309,7 @@ wine_fn_config_test () wine_fn_append_file ALL_TEST_RESOURCES $ac_name.res wine_fn_all_rules - - wine_fn_append_rule \ -"$ac_dir: __builddeps__ -programs/winetest: $ac_dir -check test: $ac_dir/test -.PHONY: $ac_dir/test -$ac_dir/test: dummy - @cd $ac_dir && \$(MAKE) test" - - if test -n "$CROSSTARGET" - then - wine_fn_append_rule \ -"crosstest: $ac_dir/crosstest -.PHONY: $ac_dir/crosstest -$ac_dir/crosstest: __builddeps__ dummy - @cd $ac_dir && \$(MAKE) crosstest" - fi + wine_fn_append_rule "$ac_dir: __builddeps__" } wine_fn_config_tool () diff --git a/configure b/configure index 6c09a96..4dae327 100755 --- a/configure +++ b/configure @@ -7816,23 +7816,7 @@ fi wine_fn_append_file ALL_TEST_RESOURCES $ac_name.res wine_fn_all_rules - - wine_fn_append_rule \ -"$ac_dir: __builddeps__ -programs/winetest: $ac_dir -check test: $ac_dir/test -.PHONY: $ac_dir/test -$ac_dir/test: dummy - @cd $ac_dir && \$(MAKE) test" - - if test -n "$CROSSTARGET" - then - wine_fn_append_rule \ -"crosstest: $ac_dir/crosstest -.PHONY: $ac_dir/crosstest -$ac_dir/crosstest: __builddeps__ dummy - @cd $ac_dir && \$(MAKE) crosstest" - fi + wine_fn_append_rule "$ac_dir: __builddeps__" } wine_fn_config_tool () diff --git a/tools/makedep.c b/tools/makedep.c index b9f1948..a0b7ff5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3406,6 +3406,8 @@ static void output_subdirs( struct makefile *make ) struct strarray testclean_files = empty_strarray; struct strarray distclean_files = empty_strarray; struct strarray tools_deps = empty_strarray; + struct strarray winetest_deps = empty_strarray; + struct strarray crosstest_deps = empty_strarray; unsigned int i, j; strarray_add( &tools_deps, tools_dir_path( make, "widl" )); @@ -3483,6 +3485,20 @@ static void output_subdirs( struct makefile *make ) } if (submake->disabled) continue; + if (submake->testdll) + { + output( "check test::\n" ); + output( "\t@cd %s && $(MAKE) test\n", subdir ); + strarray_add( &winetest_deps, subdir ); + if (crosstarget) + { + char *target = base_dir_path( submake, "crosstest" ); + output( "crosstest: %s\n", target ); + output( "%s: __builddeps__ dummy\n", target ); + output( "\t@cd %s && $(MAKE) crosstest\n", subdir ); + strarray_add( &crosstest_deps, target ); + } + } if (submake->install_rules[INSTALL_LIB].count) { output( "install install-lib:: %s\n", submake->base_dir ); @@ -3499,14 +3515,23 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); output_filenames( makefile_deps ); output( ":\n" ); + output( "programs/winetest:" ); + output_filenames( winetest_deps ); + output( "\n" ); + output( "crosstest:" ); + output_filenames( crosstest_deps ); + output( "\n" ); output( "clean::\n"); output_rm_filenames( clean_files ); output( "testclean::\n"); output_rm_filenames( testclean_files ); output( "distclean::\n"); output_rm_filenames( distclean_files ); + strarray_add( &make->phony_targets, "check" ); + strarray_add( &make->phony_targets, "test" ); strarray_add( &make->phony_targets, "distclean" ); strarray_add( &make->phony_targets, "testclean" ); + strarray_addall( &make->phony_targets, crosstest_deps ); strarray_addall( &make->clean_files, symlinks ); strarray_addall( &build_deps, symlinks );

1 0

Alexandre Julliard : makefiles: Generate the top-level import library rules from makedep.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 1c31b75e622f27de3a8d771e3bcf5fde8fda0be4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c31b75e622f27de3a8d771e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 17:03:44 2018 +0100 makefiles: Generate the top-level import library rules from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 72 +-------- configure | 424 ++++++++++++++++++++++----------------------------- configure.ac | 370 ++++++++++++++++++++++---------------------- tools/make_makefiles | 23 +-- tools/makedep.c | 67 +++++++- 5 files changed, 444 insertions(+), 512 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c31b75e622f27de3a8d…

1 0

Alexandre Julliard : makefiles: Generate the top-level install rules using the subdirs rules.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 733ed05650274a02a09ee0ae998ba2662252a25f URL: https://source.winehq.org/git/wine.git/?a=commit;h=733ed05650274a02a09ee0ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 14:34:56 2018 +0100 makefiles: Generate the top-level install rules using the subdirs rules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 126 +++------------------ configure | 312 ++++++++++++++++++--------------------------------- configure.ac | 206 +++++++++++++++++----------------- tools/make_makefiles | 29 ----- tools/makedep.c | 93 +++++++++------ 5 files changed, 281 insertions(+), 485 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=733ed05650274a02a09e…

1 0

Alexandre Julliard : makefiles: Disable binary installation in the individual makefiles on Wow64.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: d5f316bf0a9a6e78e1b096c7b82365fa4b23303e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5f316bf0a9a6e78e1b096c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 14:15:08 2018 +0100 makefiles: Disable binary installation in the individual makefiles on Wow64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 3 +++ configure.ac | 1 + programs/msiexec/Makefile.in | 2 +- programs/notepad/Makefile.in | 2 +- programs/regedit/Makefile.in | 2 +- programs/regsvr32/Makefile.in | 2 +- programs/wineboot/Makefile.in | 2 +- programs/winecfg/Makefile.in | 2 +- programs/wineconsole/Makefile.in | 2 +- programs/winedbg/Makefile.in | 2 +- programs/winefile/Makefile.in | 2 +- programs/winemine/Makefile.in | 2 +- programs/winepath/Makefile.in | 2 +- 14 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6a152ae..4738d79 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,6 +33,7 @@ dlldir = ${libdir}/wine top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ +wine64_disable = @wine64_disable@ SHELL = /bin/sh RM = rm -f MV = mv diff --git a/configure b/configure index 41cb3bb..a0713c0 100755 --- a/configure +++ b/configure @@ -757,6 +757,7 @@ AR BISON FLEX TOOLSDIR +wine64_disable TARGETFLAGS LD CPPBIN @@ -5371,6 +5372,8 @@ then You should create a separate build directory and run configure from there." "$LINENO" 5 enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} + wine64_disable=\# + elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" diff --git a/configure.ac b/configure.ac index 0fb6863..e72efce 100644 --- a/configure.ac +++ b/configure.ac @@ -228,6 +228,7 @@ then You should create a separate build directory and run configure from there.]) enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} + AC_SUBST(wine64_disable,[\#]) elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 7686b10..73a6d26 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -12,4 +12,4 @@ MANPAGES = msiexec.man.in SVG_SRCS = msiexec.svg -INSTALL_LIB = msiexec.exe msiexec +INSTALL_LIB = msiexec.exe $(wine64_disable)msiexec diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index e5d39a8..28e3710 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -12,4 +12,4 @@ MANPAGES = notepad.man.in SVG_SRCS = notepad.svg -INSTALL_LIB = notepad.exe notepad +INSTALL_LIB = notepad.exe $(wine64_disable)notepad diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 54f00f7..78981bf 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -21,4 +21,4 @@ MANPAGES = regedit.man.in SVG_SRCS = regedit.svg -INSTALL_LIB = regedit.exe regedit +INSTALL_LIB = regedit.exe $(wine64_disable)regedit diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index e91f206..25434bf 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -9,4 +9,4 @@ RC_SRCS = regsvr32.rc MANPAGES = regsvr32.man.in -INSTALL_LIB = regsvr32.exe regsvr32 +INSTALL_LIB = regsvr32.exe $(wine64_disable)regsvr32 diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 419ec16..2006067 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -11,4 +11,4 @@ RC_SRCS = wineboot.rc MANPAGES = wineboot.man.in -INSTALL_LIB = wineboot.exe wineboot +INSTALL_LIB = wineboot.exe $(wine64_disable)wineboot diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 7b52a69..d516778 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -23,4 +23,4 @@ SVG_SRCS = \ logo.svg \ winecfg.svg -INSTALL_LIB = winecfg.exe winecfg +INSTALL_LIB = winecfg.exe $(wine64_disable)winecfg diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index b1ba9ef..cc131e3 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -14,4 +14,4 @@ RC_SRCS = wineconsole.rc MANPAGES = wineconsole.man.in -INSTALL_LIB = wineconsole.exe wineconsole +INSTALL_LIB = wineconsole.exe $(wine64_disable)wineconsole diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index ff75874..194a30c 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -35,4 +35,4 @@ BISON_SRCS = dbg.y MANPAGES = winedbg.man.in -INSTALL_LIB = winedbg.exe winedbg +INSTALL_LIB = winedbg.exe $(wine64_disable)winedbg diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index 5106718..06fd218 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -13,4 +13,4 @@ MANPAGES = winefile.man.in SVG_SRCS = winefile.svg -INSTALL_LIB = winefile.exe winefile +INSTALL_LIB = winefile.exe $(wine64_disable)winefile diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index ea9b9d3..bd7bdb6 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -13,4 +13,4 @@ MANPAGES = winemine.man.in SVG_SRCS = winemine.svg -INSTALL_LIB = winemine.exe winemine +INSTALL_LIB = winemine.exe $(wine64_disable)winemine diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in index ca28e30..176388b 100644 --- a/programs/winepath/Makefile.in +++ b/programs/winepath/Makefile.in @@ -5,4 +5,4 @@ C_SRCS = winepath.c MANPAGES = winepath.man.in -INSTALL_LIB = winepath.exe winepath +INSTALL_LIB = winepath.exe $(wine64_disable)winepath

1 0

Fabian Maurer : uiribbon.idl: Add UIRibbonImageFromBitmapFactory coclass and more interface definitions.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: cdc179273d9498917a8dafca48ead35ee1d7189e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdc179273d9498917a8dafca… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Feb 18 15:30:55 2018 +0100 uiribbon.idl: Add UIRibbonImageFromBitmapFactory coclass and more interface definitions. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiribbon.idl | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/include/uiribbon.idl b/include/uiribbon.idl index 6759400..d67e5cd 100644 --- a/include/uiribbon.idl +++ b/include/uiribbon.idl @@ -64,6 +64,17 @@ typedef enum UI_COMMANDTYPE { UI_COMMANDTYPE_COLORCOLLECTION, } UI_COMMANDTYPE; +typedef [v1_enum] enum UI_OWNERSHIP { + UI_OWNERSHIP_TRANSFER = 0, + UI_OWNERSHIP_COPY = 1, +} UI_OWNERSHIP; + +typedef [v1_enum] enum UI_COLLECTIONCHANGE { + UI_COLLECTIONCHANGE_INSERT = 0, + UI_COLLECTIONCHANGE_REMOVE = 1, + UI_COLLECTIONCHANGE_REPLACE = 2, + UI_COLLECTIONCHANGE_RESET = 3 +} UI_COLLECTIONCHANGE; [ object, @@ -175,8 +186,125 @@ interface IUIFramework : IUnknown } [ + object, + uuid(23c8c838-4de6-436b-ab01-5554bb7c30dd), + local, + pointer_default(unique) +] +interface IUIImage : IUnknown +{ + HRESULT GetBitmap( + [out] HBITMAP *bitmap + ); +} + +[ + object, + uuid(803982ab-370a-4f7e-a9e7-8784036a6e26), + local, + pointer_default(unique) +] +interface IUIRibbon : IUnknown +{ + HRESULT GetHeight( + [out] UINT32 *cy + ); + HRESULT LoadSettingsFromStream( + [in] IStream *pStream + ); + HRESULT SaveSettingsToStream( + [in] IStream *pStream + ); +} + +[ + object, + uuid(df4f45bf-6f9d-4dd7-9d68-d8f9cd18c4db), + local, + pointer_default(unique) +] +interface IUICollection : IUnknown +{ + HRESULT GetCount( + [out] UINT32 *count + ); + HRESULT GetItem( + [in] UINT32 index, + [out] IUnknown **item + ); + HRESULT Add( + [in] IUnknown *item + ); + HRESULT Insert( + [in] UINT32 index, + [in] IUnknown *item + ); + HRESULT RemoveAt( + [in] UINT32 index + ); + HRESULT Replace( + [in] UINT32 indexReplaced, + [in] IUnknown *itemReplaceWith + ); + HRESULT Clear(); +} + +[ + object, + uuid(eea11f37-7c46-437c-8e55-b52122b29293), + local, + pointer_default(unique) +] +interface IUIContextualUI : IUnknown +{ + HRESULT ShowAtLocation( + [in] INT32 x, + [in] INT32 y + ); +} + +[ + object, + uuid(6502ae91-a14d-44b5-bbd0-62aacc581d52), + local, + pointer_default(unique) +] +interface IUICollectionChangedEvent : IUnknown +{ + HRESULT OnChanged( + [in] UI_COLLECTIONCHANGE action, + [in] UINT32 oldIndex, + [in] IUnknown *oldItem, + [in] UINT32 newIndex, + [in] IUnknown *newItem + ); +} + +[ + object, + uuid(18aba7f3-4c1c-4ba2-bf6c-f5c3326fa816), + local, + pointer_default(unique) +] +interface IUIImageFromBitmap : IUnknown +{ + HRESULT CreateImage( + [in] HBITMAP bitmap, + [in] UI_OWNERSHIP options, + [out] IUIImage **image + ); +} + + +[ helpstring("UIRibbonFramework Object"), threading(apartment), uuid(926749fa-2615-4987-8845-c33e65f2b957) ] coclass UIRibbonFramework { interface IUIFramework; } + +[ + threading(apartment), + uuid(0f7434b6-59b6-4250-999e-d168d6ae4293) +] +coclass UIRibbonImageFromBitmapFactory { interface IUIImageFromBitmap; }

1 0

Fabian Maurer : propsys: Add PropVariantToStringWithDefault and tests.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 8f1e4097bb62f53dc395718b27eef5f86a4fd8a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1e4097bb62f53dc395718b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 17 23:33:54 2018 +0100 propsys: Add PropVariantToStringWithDefault and tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 18 ++++++++ dlls/propsys/tests/propsys.c | 101 +++++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 121 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 86a5e69..f518519 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -137,7 +137,7 @@ @ stdcall PropVariantToStringAlloc(ptr ptr) @ stub PropVariantToStringVector @ stub PropVariantToStringVectorAlloc -@ stub PropVariantToStringWithDefault +@ stdcall PropVariantToStringWithDefault(ptr wstr) @ stdcall PropVariantToUInt16(ptr ptr) @ stub PropVariantToUInt16Vector @ stub PropVariantToUInt16VectorAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 3e3b502..e6d4eba 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -337,6 +337,24 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) return hr; } +PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault) +{ + static const WCHAR str_empty[] = {0}; + if (propvarIn->vt == VT_BSTR) + { + if (propvarIn->u.bstrVal == NULL) + return str_empty; + + return propvarIn->u.bstrVal; + } + + if (propvarIn->vt == VT_LPWSTR && propvarIn->u.pwszVal != NULL) + return propvarIn->u.pwszVal; + + return pszDefault; +} + + /****************************************************************** * PropVariantChangeType (PROPSYS.@) */ diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 327c606..a6c7023 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1094,6 +1094,106 @@ static void test_PropVariantToBoolean(void) ok(val == TRUE, "Unexpected value %d\n", val); } +static void test_PropVariantToStringWithDefault(void) +{ + PROPVARIANT propvar; + static WCHAR default_value[] = {'t', 'e', 's', 't', 0}; + static WCHAR wstr_test2[] = {'t', 'e', 's', 't', '2', 0}; + static WCHAR wstr_empty[] = {0}; + static WCHAR wstr_space[] = {' ', 0}; + static CHAR str_test2[] = "test2"; + static CHAR str_empty[] = ""; + static CHAR str_space[] = " "; + LPCWSTR result; + + propvar.vt = VT_EMPTY; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_BOOL; + propvar.u.boolVal = VARIANT_TRUE; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_I4; + propvar.u.lVal = 15; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_LPWSTR */ + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_empty; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_empty, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_space; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_space, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_test2; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_test2, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_LPSTR */ + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_empty; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_space; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_test2; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_BSTR */ + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_empty), "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_empty); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_empty), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_space); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_space), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_test2); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_test2), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); +} + static void test_PropVariantChangeType_LPWSTR(void) { PROPVARIANT dest, src; @@ -1143,4 +1243,5 @@ START_TEST(propsys) test_intconversions(); test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean(); + test_PropVariantToStringWithDefault(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 4dc3521..ced51ec 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -77,6 +77,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret);

1 0

Owen Rudge : wsdapi/tests: Add test for Publish.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 233d8244aebc7b23082b386004aaf27733c6dc6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=233d8244aebc7b23082b3860… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Feb 19 22:47:04 2018 +0000 wsdapi/tests: Add test for Publish. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 359 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 357 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=233d8244aebc7b23082b…

1 0

Owen Rudge : include: Define ipv6_mreq structure.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 3211de48397ea9f1f02865175c1826a7f7866a19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3211de48397ea9f1f0286517… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Feb 19 22:46:48 2018 +0000 include: Define ipv6_mreq structure. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index e13cf6e..e4cbce1 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -152,6 +152,12 @@ typedef struct WS(ip_mreq) struct WS(in_addr) imr_interface; } WS(IP_MREQ), *WS(PIP_MREQ); +typedef struct WS(ipv6_mreq) +{ + struct WS(in6_addr) ipv6mr_multiaddr; + unsigned int ipv6mr_interface; +} WS(IPV6_MREQ), *WS(PIPV6_MREQ); + typedef struct WS(ip_mreq_source) { struct WS(in_addr) imr_multiaddr; struct WS(in_addr) imr_sourceaddr;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2018