October 2010 - Wine-commits

Aleksey Bragin : msi: Fix freed memory access and fix freeing of invalid pointer.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 8c5718ec9d0613be7208e1ceaecac0e7434c4cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5718ec9d0613be7208e1cea… Author: Aleksey Bragin <aleksey(a)reactos.org> Date: Fri Oct 22 20:08:58 2010 +0400 msi: Fix freed memory access and fix freeing of invalid pointer. --- dlls/msi/action.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a8e3a5d..3ebf286 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2083,7 +2083,7 @@ static UINT ITERATE_CostFinalizeConditions(MSIRECORD *row, LPVOID param) VS_FIXEDFILEINFO *msi_get_disk_file_version( LPCWSTR filename ) { static const WCHAR name[] = {'\\',0}; - VS_FIXEDFILEINFO *ret; + VS_FIXEDFILEINFO *ptr, *ret; LPVOID version; DWORD versize, handle; UINT sz; @@ -2100,12 +2100,15 @@ VS_FIXEDFILEINFO *msi_get_disk_file_version( LPCWSTR filename ) GetFileVersionInfoW( filename, 0, versize, version ); - if (!VerQueryValueW( version, name, (LPVOID *)&ret, &sz )) + if (!VerQueryValueW( version, name, (LPVOID *)&ptr, &sz )) { msi_free( version ); return NULL; } + ret = msi_alloc( sz ); + memcpy( ret, ptr, sz ); + msi_free( version ); return ret; }

1 0

Paul Vriens : comdlg32: Fix Serbian (Latin) translations.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: b88deb5eb77f1f3b4d71d69fde2dd0aa1dcbc413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88deb5eb77f1f3b4d71d69fd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 22 11:40:22 2010 +0200 comdlg32: Fix Serbian (Latin) translations. Translation by Đorđe Vasiljević. --- dlls/comdlg32/cdlg_Sr.rc | 348 +++++++++++++++++++++++---------------------- 1 files changed, 178 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b88deb5eb77f1f3b4d71d…

1 0

Paul Vriens : comdlg32: Add the Serbian (Cyrillic) translation.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: b8b66a53870009da1d01ac56898cb9b9c97300ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b66a53870009da1d01ac568… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 22 11:46:51 2010 +0200 comdlg32: Add the Serbian (Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/comdlg32/cdlg_Sr.rc | 461 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 461 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8b66a53870009da1d01a…

1 0

Austin Lund : advapi32/tests: Fix test for WoW64 handle size differences.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: f18554c73572ef869940bb22fae54432990624b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18554c73572ef869940bb22f… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Oct 22 15:49:38 2010 +1000 advapi32/tests: Fix test for WoW64 handle size differences. --- dlls/advapi32/tests/security.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f91ebb2..edfecb9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1310,14 +1310,18 @@ static void test_token_attr(void) ret = GetTokenInformation(Token, TokenDefaultDacl, Dacl, Size, &Size2); ok(ret, "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); ok(Dacl->DefaultDacl == NULL, "expected NULL, got %p\n", Dacl->DefaultDacl); - ok(Size2 == sizeof(TOKEN_DEFAULT_DACL), "got %u expected sizeof(TOKEN_DEFAULT_DACL)\n", Size2); + ok(Size2 == sizeof(TOKEN_DEFAULT_DACL) || broken(Size2 == 2*sizeof(TOKEN_DEFAULT_DACL)), /* WoW64 */ + "got %u expected %u (sizeof(TOKEN_DEFAULT_DACL))\n", Size2, sizeof(TOKEN_DEFAULT_DACL)); Dacl->DefaultDacl = acl; ret = SetTokenInformation(Token, TokenDefaultDacl, Dacl, Size); ok(ret, "SetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); - ret = GetTokenInformation(Token, TokenDefaultDacl, Dacl, Size, &Size2); - ok(ret, "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + if (Size2 == sizeof(TOKEN_DEFAULT_DACL)) { + ret = GetTokenInformation(Token, TokenDefaultDacl, Dacl, Size, &Size2); + ok(ret, "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + } else + win_skip("TOKEN_DEFAULT_DACL size too small on WoW64\n"); HeapFree(GetProcessHeap(), 0, Dacl); CloseHandle(Token);

1 0

Paul Vriens : winspool.drv: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: b185c6a9c3b5ac95eb4c9e95cd7aabea61621bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b185c6a9c3b5ac95eb4c9e95c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 22 13:08:00 2010 +0200 winspool.drv: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/winspool.drv/Makefile.in | 1 + dlls/winspool.drv/Sr.rc | 64 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index 0b69c9c..41fe2be 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -30,6 +30,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Tr.rc \ Uk.rc \ diff --git a/dlls/winspool.drv/Sr.rc b/dlls/winspool.drv/Sr.rc new file mode 100644 index 0000000..d18db00 --- /dev/null +++ b/dlls/winspool.drv/Sr.rc @@ -0,0 +1,64 @@ +/* + * Serbian resources for winspool + * + * Copyright 2005 Huw Davies + * Copyright 2010 Đorđe Vasiljević + * + * 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 + */ + +#include "wspool.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +FILENAME_DIALOG DIALOG 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Штампање на датотеку" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Назив одредишне датотеке:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "У реду", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Откажи", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE +{ + IDS_CAPTION "Локални порт" + IDS_FILE_EXISTS "Одредишна датотека већ постоји. Кликните на дугме „У реду“ да је замените." + IDS_CANNOT_OPEN "Прављење одредишне датотеке није успело." +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +FILENAME_DIALOG DIALOG 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Štampanje na datoteku" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Naziv odredišne datoteke:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "U redu", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Otkaži", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE +{ + IDS_CAPTION "Lokalni port" + IDS_FILE_EXISTS "Odredišna datoteka već postoji. Kliknite na dugme „U redu“ da je zamenite." + IDS_CANNOT_OPEN "Pravljenje odredišne datoteke nije uspelo." +}

1 0

Aric Stewart : winegstreamer: Add wine GStreamer parser filter framework.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 2914d65579d4868bf7843559ecc2cd8ec466e128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2914d65579d4868bf7843559e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 20 13:55:16 2010 -0500 winegstreamer: Add wine GStreamer parser filter framework. --- configure | 85 ++++++++++++++++++ configure.ac | 27 ++++++ dlls/winegstreamer/Makefile.in | 16 ++++ dlls/winegstreamer/gst_guids.h | 25 ++++++ dlls/winegstreamer/gst_private.h | 40 +++++++++ dlls/winegstreamer/main.c | 154 +++++++++++++++++++++++++++++++++ dlls/winegstreamer/rsrc.rc | 28 ++++++ dlls/winegstreamer/winegstreamer.inf | 12 +++ dlls/winegstreamer/winegstreamer.spec | 5 + tools/wine.inf.in | 1 + 10 files changed, 393 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2914d65579d4868bf7843…

1 0

Damjan Jovanovic : include: Define WINCODEC_SDK_VERSION.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 0b66a0d3a385598e6154705b259cedbb604760a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b66a0d3a385598e6154705b2… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Oct 22 15:13:23 2010 +0200 include: Define WINCODEC_SDK_VERSION. --- include/wincodec.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 6343350..4139f51 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -21,6 +21,8 @@ import "propidl.idl"; import "objidl.idl"; import "ocidl.idl"; +cpp_quote("#define WINCODEC_SDK_VERSION 0x0236") + #define CODEC_FORCE_DWORD 0x7fffffff typedef enum WICDecodeOptions {

1 0

Damjan Jovanovic : windowscodecs: Add COM proxies and stubs.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 32f917399811c4f7d11cd080058fc8c1ac1ae184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f917399811c4f7d11cd0800… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Oct 22 15:14:40 2010 +0200 windowscodecs: Add COM proxies and stubs. --- .gitignore | 2 ++ dlls/windowscodecs/Makefile.in | 8 +++++++- dlls/windowscodecs/clsfactory.c | 4 +++- dlls/windowscodecs/main.c | 4 +++- dlls/windowscodecs/regsvr.c | 11 +++++++++-- dlls/windowscodecs/windowscodecs_wincodec.idl | 19 +++++++++++++++++++ 6 files changed, 43 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index dcbab53..bfb87d9 100644 --- a/.gitignore +++ b/.gitignore @@ -139,6 +139,8 @@ dlls/sti/sti_wia.h dlls/sti/sti_wia_p.c dlls/urlmon/urlmon_urlmon.h dlls/urlmon/urlmon_urlmon_p.c +dlls/windowscodecs/windowscodecs_wincodec.h +dlls/windowscodecs/windowscodecs_wincodec_p.c include/activaut.h include/activdbg.h include/activscp.h diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 53868a0..9dd9302 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,7 +1,8 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs -IMPORTS = uuid ole32 shlwapi advapi32 +IMPORTS = uuid ole32 oleaut32 shlwapi advapi32 rpcrt4 EXTRAINCL = @PNGINCL@ +EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL C_SRCS = \ bmpdecode.c \ @@ -27,4 +28,9 @@ C_SRCS = \ RC_SRCS = version.rc +IDL_P_SRCS = \ + windowscodecs_wincodec.idl + +EXTRA_OBJS = dlldata.o + @MAKE_DLL_RULES@ diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 82de283..3c718cb 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +extern HRESULT WINAPI WIC_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; + typedef struct { REFCLSID classid; HRESULT (*constructor)(IUnknown*,REFIID,void**); @@ -174,7 +176,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) if (info) ret = ClassFactoryImpl_Constructor(info, iid, ppv); else - ret = CLASS_E_CLASSNOTAVAILABLE; + ret = WIC_DllGetClassObject(rclsid, iid, ppv); TRACE("<-- %08X\n", ret); return ret; diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 6f37f5d..823fec2 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +extern BOOL WINAPI WIC_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -44,7 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; } - return TRUE; + return WIC_DllMain(hinstDLL, fdwReason, lpvReserved); } HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 3d395f6..f8f6179 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1294,13 +1294,18 @@ static struct regsvr_converter const converter_list[] = { { NULL } /* list terminator */ }; +extern HRESULT WINAPI WIC_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT WINAPI WIC_DllUnregisterServer(void) DECLSPEC_HIDDEN; + HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; TRACE("\n"); - hr = register_coclasses(coclass_list); + hr = WIC_DllRegisterServer(); + if (SUCCEEDED(hr)) + hr = register_coclasses(coclass_list); if (SUCCEEDED(hr)) register_decoders(decoder_list); if (SUCCEEDED(hr)) @@ -1316,7 +1321,9 @@ HRESULT WINAPI DllUnregisterServer(void) TRACE("\n"); - hr = unregister_coclasses(coclass_list); + hr = WIC_DllUnregisterServer(); + if (SUCCEEDED(hr)) + hr = unregister_coclasses(coclass_list); if (SUCCEEDED(hr)) unregister_decoders(decoder_list); if (SUCCEEDED(hr)) diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl new file mode 100644 index 0000000..33b4774 --- /dev/null +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2010 Damjan Jovanovic + * + * 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 + */ + +#include "wincodec.idl"

1 0

Alexandre Julliard : configure: Disable Fortify if it's enabled by default, it's too broken.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 105793bff75f6a869bd9ccfb390b2f88fa861235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=105793bff75f6a869bd9ccfb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 17:13:57 2010 +0200 configure: Disable Fortify if it's enabled by default, it's too broken. --- configure | 90 +++++++++++++++++++++------------------------------------ configure.ac | 24 ++++++++------- 2 files changed, 46 insertions(+), 68 deletions(-) diff --git a/configure b/configure index 122e443..5de5f5c 100755 --- a/configure +++ b/configure @@ -12061,63 +12061,6 @@ $as_echo "$ac_cv_c_string_h_warnings" >&6; } EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith" fi - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken unused result warnings" >&5 -$as_echo_n "checking for broken unused result warnings... " >&6; } -if test "${ac_cv_c_unused_result_warnings+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <unistd.h> -int -main () -{ -write(2,"a",1) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_unused_result_warnings=no -else - ac_cv_c_unused_result_warnings=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_unused_result_warnings" >&5 -$as_echo "$ac_cv_c_unused_result_warnings" >&6; } - CFLAGS="$saved_CFLAGS" - if test "$ac_cv_c_unused_result_warnings" = "yes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-unused-result" >&5 -$as_echo_n "checking whether the compiler supports -Wno-unused-result... " >&6; } -if test "${ac_cv_cflags__Wno_unused_result+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wno-unused-result" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wno_unused_result=yes -else - ac_cv_cflags__Wno_unused_result=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_unused_result" >&5 -$as_echo "$ac_cv_cflags__Wno_unused_result" >&6; } -if test $ac_cv_cflags__Wno_unused_result = yes; then : - EXTRACFLAGS="$EXTRACFLAGS -Wno-unused-result" -fi - fi - if test "x$enable_maintainer_mode" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5 @@ -12187,6 +12130,39 @@ $as_echo "#define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__))" >>con fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the need to disable Fortify" >&5 +$as_echo_n "checking for the need to disable Fortify... " >&6; } +if test "${ac_cv_c_fortify_enabled+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <string.h> +int +main () +{ +#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0 +#error Fortify enabled +#endif + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_fortify_enabled=no +else + ac_cv_c_fortify_enabled=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_fortify_enabled" >&5 +$as_echo "$ac_cv_c_fortify_enabled" >&6; } +if test "$ac_cv_c_fortify_enabled" = yes +then + EXTRACFLAGS="$EXTRACFLAGS -D_FORTIFY_SOURCE=0" +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether external symbols need an underscore prefix" >&5 $as_echo_n "checking whether external symbols need an underscore prefix... " >&6; } if test "${ac_cv_c_extern_prefix+set}" = set; then : diff --git a/configure.ac b/configure.ac index a13fc92..9a84cf3 100644 --- a/configure.ac +++ b/configure.ac @@ -1658,17 +1658,6 @@ then EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith" fi - dnl Fortify enables unused result warnings on a gazillion functions, making it useless - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror" - AC_CACHE_CHECK([for broken unused result warnings], ac_cv_c_unused_result_warnings, - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[write(2,"a",1)]])],[ac_cv_c_unused_result_warnings=no],[ac_cv_c_unused_result_warnings=yes])) - CFLAGS="$saved_CFLAGS" - if test "$ac_cv_c_unused_result_warnings" = "yes" - then - WINE_TRY_CFLAGS([-Wno-unused-result]) - fi - dnl Enable -Werror for maintainer mode if test "x$enable_maintainer_mode" = "xyes" then @@ -1691,6 +1680,19 @@ then fi fi +dnl **** Disable Fortify, it has too many false positives + +AC_CACHE_CHECK([for the need to disable Fortify], ac_cv_c_fortify_enabled, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], +[[#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0 +#error Fortify enabled +#endif]])], + [ac_cv_c_fortify_enabled=no],[ac_cv_c_fortify_enabled=yes])) +if test "$ac_cv_c_fortify_enabled" = yes +then + EXTRACFLAGS="$EXTRACFLAGS -D_FORTIFY_SOURCE=0" +fi + dnl **** Check for underscore on external symbols **** AC_CACHE_CHECK([whether external symbols need an underscore prefix], ac_cv_c_extern_prefix,

1 0

Hans Leidekker : msi: Register service arguments in the InstallServices action.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 031c70c965be095629181f3dec00e88076508d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031c70c965be095629181f3de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 22 10:37:02 2010 +0200 msi: Register service arguments in the InstallServices action. --- dlls/msi/action.c | 24 +++++++++++++++++++----- dlls/msi/tests/action.c | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 633557d..a8e3a5d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5369,9 +5369,8 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) SC_HANDLE hscm, service = NULL; LPCWSTR comp, key; LPWSTR name = NULL, disp = NULL, load_order = NULL, serv_name = NULL; - LPWSTR depends = NULL, pass = NULL; - DWORD serv_type, start_type; - DWORD err_control; + LPWSTR depends = NULL, pass = NULL, args = NULL, image_path = NULL; + DWORD serv_type, start_type, err_control; SERVICE_DESCRIPTIONW sd = {NULL}; static const WCHAR query[] = @@ -5400,6 +5399,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) deformat_string(package, MSI_RecordGetString(rec, 8), &depends); deformat_string(package, MSI_RecordGetString(rec, 9), &serv_name); deformat_string(package, MSI_RecordGetString(rec, 10), &pass); + deformat_string(package, MSI_RecordGetString(rec, 11), &args); comp = MSI_RecordGetString(rec, 12); deformat_string(package, MSI_RecordGetString(rec, 13), &sd.lpDescription); @@ -5420,9 +5420,21 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) goto done; } + if (!args || !args[0]) image_path = file->TargetPath; + else + { + int len = strlenW(file->TargetPath) + strlenW(args) + 2; + if (!(image_path = msi_alloc(len * sizeof(WCHAR)))) + return ERROR_OUTOFMEMORY; + + strcpyW(image_path, file->TargetPath); + strcatW(image_path, szSpace); + strcatW(image_path, args); + } service = CreateServiceW(hscm, name, disp, GENERIC_ALL, serv_type, - start_type, err_control, file->TargetPath, - load_order, NULL, depends, serv_name, pass); + start_type, err_control, image_path, load_order, + NULL, depends, serv_name, pass); + if (!service) { if (GetLastError() != ERROR_SERVICE_EXISTS) @@ -5434,6 +5446,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) WARN("failed to set service description %u\n", GetLastError()); } + if (image_path != file->TargetPath) msi_free(image_path); done: CloseServiceHandle(service); CloseServiceHandle(hscm); @@ -5444,6 +5457,7 @@ done: msi_free(serv_name); msi_free(pass); msi_free(depends); + msi_free(args); return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index f483583..f036c5b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -212,7 +212,7 @@ static const char service_install_dat[] = "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" "ServiceInstall\tServiceInstall\n" - "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\t"; + "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription"; static const char service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n"

1 0