July 2007 - Wine-Commits - list.winehq.org

James Hawkins : msi: Implement MsiSourceListGetInfoA.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: 6cc2f0f4025fcae3fb58ae816bef4c68d8ac48a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc2f0f4025fcae3fb58ae816… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jun 29 14:12:38 2007 -0700 msi: Implement MsiSourceListGetInfoA. --- dlls/msi/msi.spec | 2 +- dlls/msi/source.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index c419ee7..6aa8957 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -258,7 +258,7 @@ 262 stub MsiSourceListForceResolutionExW 263 stub MsiSourceListEnumSourcesA 264 stub MsiSourceListEnumSourcesW -265 stub MsiSourceListGetInfoA +265 stdcall MsiSourceListGetInfoA(str str long long str ptr ptr) 266 stub MsiSourceListGetInfoW 267 stub MsiSourceListSetInfoA 268 stub MsiSourceListSetInfoW diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 3b3e47f..49b7e4e 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -150,6 +150,58 @@ static UINT find_given_source(HKEY key, LPCWSTR szSource, media_info *ss) } /****************************************************************** + * MsiSourceListGetInfoA (MSI.@) + */ +UINT WINAPI MsiSourceListGetInfoA( LPCSTR szProduct, LPCSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions, + LPCSTR szProperty, LPSTR szValue, + LPDWORD pcchValue) +{ + UINT ret; + LPWSTR product = NULL; + LPWSTR usersid = NULL; + LPWSTR property = NULL; + LPWSTR value = NULL; + DWORD len = 0; + + if (szValue && !pcchValue) + return ERROR_INVALID_PARAMETER; + + if (szProduct) product = strdupAtoW(szProduct); + if (szUserSid) usersid = strdupAtoW(szUserSid); + if (szProperty) property = strdupAtoW(szProperty); + + ret = MsiSourceListGetInfoW(product, usersid, dwContext, dwOptions, + property, NULL, &len); + if (ret != ERROR_SUCCESS) + goto done; + + value = msi_alloc(++len * sizeof(WCHAR)); + if (!value) + return ERROR_OUTOFMEMORY; + + ret = MsiSourceListGetInfoW(product, usersid, dwContext, dwOptions, + property, value, &len); + if (ret != ERROR_SUCCESS) + goto done; + + len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); + if (*pcchValue >= len) + WideCharToMultiByte(CP_ACP, 0, value, -1, szValue, len, NULL, NULL); + else if (szValue) + ret = ERROR_MORE_DATA; + + *pcchValue = len - 1; + +done: + msi_free(product); + msi_free(usersid); + msi_free(property); + msi_free(value); + return ret; +} + +/****************************************************************** * MsiSourceListGetInfoW (MSI.@) */ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, @@ -173,7 +225,7 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, FIXME("Unhandled options MSICODE_PATCH\n"); return ERROR_FUNCTION_FAILED; } - + if (szUserSid) FIXME("Unhandled UserSid %s\n",debugstr_w(szUserSid));

1 0

Andrew Talbot : ole32: Constify some variables.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: 886c970d76885033973689339af50c04246c6fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=886c970d76885033973689339… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Jul 1 17:15:22 2007 +0100 ole32: Constify some variables. --- dlls/ole32/enumx.c | 2 +- dlls/ole32/enumx.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/enumx.c b/dlls/ole32/enumx.c index 232abec..9610dbe 100644 --- a/dlls/ole32/enumx.c +++ b/dlls/ole32/enumx.c @@ -189,7 +189,7 @@ enumx_impl *enumx_allocate(REFIID riid, const void *vtbl, ULONG elem_size) * * Add an element to the enumeration. */ -void *enumx_add_element(enumx_impl *enumx, void *data) +void *enumx_add_element(enumx_impl *enumx, const void *data) { struct list *element; diff --git a/dlls/ole32/enumx.h b/dlls/ole32/enumx.h index 2d36b73..5d45c94 100644 --- a/dlls/ole32/enumx.h +++ b/dlls/ole32/enumx.h @@ -29,6 +29,6 @@ extern HRESULT WINAPI enumx_Skip(enumx_impl *, ULONG); extern HRESULT WINAPI enumx_Reset(enumx_impl *); extern HRESULT WINAPI enumx_Clone(enumx_impl *, enumx_impl **); extern enumx_impl *enumx_allocate(REFIID, const void *, ULONG); -extern void *enumx_add_element(enumx_impl *, void *); +extern void *enumx_add_element(enumx_impl *, const void *); #endif

1 0

Alexandre Julliard : configure: Don't set LDPATH if not needed.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: 3a0233d63fac98eec677ce4bf56e5054d0c97417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a0233d63fac98eec677ce4bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 14:38:04 2007 +0200 configure: Don't set LDPATH if not needed. --- configure | 14 ++++++++++---- configure.ac | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 0cbc031..31ca6df 100755 --- a/configure +++ b/configure @@ -14089,16 +14089,22 @@ If you are using Linux, you will need a newer binutils. { (exit 1); exit 1; }; } fi +LDPATH="" + case $build_os in cygwin*|mingw32*) LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\"" - ;; + ;; darwin*|macosx*) - LDPATH="DYLD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$DYLD_LIBRARY_PATH\"" - ;; + ;; + linux*|solaris*) if test -z "$LDRPATH_LOCAL" + then + LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" + fi + ;; *) LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" - ;; + ;; esac case $host_os in diff --git a/configure.ac b/configure.ac index c15b12f..c64fe05 100644 --- a/configure.ac +++ b/configure.ac @@ -1064,13 +1064,22 @@ If you are using Linux, you will need a newer binutils.] ) fi +AC_SUBST(LDPATH,"") case $build_os in cygwin*|mingw32*) - AC_SUBST(LDPATH,"PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\"") ;; + LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\"" + ;; darwin*|macosx*) - AC_SUBST(LDPATH,"DYLD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$DYLD_LIBRARY_PATH\"") ;; + ;; + linux*|solaris*) dnl FIXME: What other platforms support $ORIGIN? + if test -z "$LDRPATH_LOCAL" + then + LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" + fi + ;; *) - AC_SUBST(LDPATH,"LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"") ;; + LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" + ;; esac dnl Mingw needs explicit msvcrt for linking libwine and winsock for wininet

1 0

Alexandre Julliard : configure: Don' t use a default soname if a library is not found, leave it undefined.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: 446befbb4dfa82f135729e9e92ae65d8c749290a URL: http://source.winehq.org/git/wine.git/?a=commit;h=446befbb4dfa82f135729e9e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 13:41:36 2007 +0200 configure: Don't use a default soname if a library is not found, leave it undefined. --- aclocal.m4 | 28 ++-- configure | 423 ++++++++++++++++++++--------------------- configure.ac | 45 ++--- dlls/gphoto2.ds/ds_image.c | 4 + dlls/winex11.drv/xinerama.c | 4 + programs/explorer/hal.c | 4 + programs/wineconsole/curses.c | 6 + 7 files changed, 265 insertions(+), 249 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=446befbb4dfa82f135729…

1 0

Alexandre Julliard : configure: Export the shared library extension instead of hardcoding .so.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: 5a95cfbd9cd63a86e41c1f7fc8851f0baed5ac05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a95cfbd9cd63a86e41c1f7fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 13:40:32 2007 +0200 configure: Export the shared library extension instead of hardcoding .so. --- configure | 6 ++++++ configure.ac | 2 ++ dlls/capi2032/cap20wxx.c | 2 +- dlls/gdi32/freetype.c | 4 ++-- dlls/gphoto2.ds/gphoto2_i.h | 2 +- dlls/oleaut32/olepicture.c | 2 +- dlls/opengl32/wgl.c | 7 ------- dlls/sane.ds/sane_main.c | 2 +- dlls/winejack.drv/jack.c | 2 +- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/truetype.c | 2 +- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/opengl.c | 2 +- dlls/winex11.drv/wintab.c | 2 +- dlls/winex11.drv/xrandr.c | 8 ++++---- dlls/winex11.drv/xrender.c | 6 +++--- dlls/wininet/netconnection.c | 4 ++-- dlls/winspool.drv/info.c | 2 +- include/config.h.in | 3 +++ 19 files changed, 33 insertions(+), 29 deletions(-) diff --git a/configure b/configure index 072565d..f8f31a5 100755 --- a/configure +++ b/configure @@ -14124,6 +14124,12 @@ MAIN_BINARY="wine-pthread" esac + +cat >>confdefs.h <<_ACEOF +#define SONAME_EXT ".$LIBEXT" +_ACEOF + + if test "$LIBEXT" = "so" -o "$LIBEXT" = "dylib" then # Extract the first word of "ldd", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index 349de58..6f1fcc3 100644 --- a/configure.ac +++ b/configure.ac @@ -1094,6 +1094,8 @@ esac dnl **** Get the soname for libraries that we load dynamically **** +AC_DEFINE_UNQUOTED(SONAME_EXT,[".$LIBEXT"],[Define to the file extension of shared libraries.]) + if test "$LIBEXT" = "so" -o "$LIBEXT" = "dylib" then WINE_GET_SONAME(X11,XCreateWindow,[$X_LIBS $X_EXTRA_LIBS]) diff --git a/dlls/capi2032/cap20wxx.c b/dlls/capi2032/cap20wxx.c index 4f2352f..482c37b 100644 --- a/dlls/capi2032/cap20wxx.c +++ b/dlls/capi2032/cap20wxx.c @@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(capi); #ifdef HAVE_CAPI4LINUX #ifndef SONAME_LIBCAPI20 -#define SONAME_LIBCAPI20 "libcapi20.so" +#define SONAME_LIBCAPI20 "libcapi20" SONAME_EXT #endif static unsigned (*pcapi20_register)(unsigned, unsigned, unsigned, unsigned *) = NULL; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9842de9..e1a825b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -129,7 +129,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #endif #ifndef SONAME_LIBFREETYPE -#define SONAME_LIBFREETYPE "libfreetype.so" +#define SONAME_LIBFREETYPE "libfreetype" SONAME_EXT #endif #ifndef HAVE_FT_TRUETYPEENGINETYPE @@ -196,7 +196,7 @@ MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetString); #ifndef SONAME_LIBFONTCONFIG -#define SONAME_LIBFONTCONFIG "libfontconfig.so" +#define SONAME_LIBFONTCONFIG "libfontconfig" SONAME_EXT #endif #endif diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index bb2b6e3..7167171 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -47,7 +47,7 @@ # include <jpeglib.h> # undef UINT16 # ifndef SONAME_LIBJPEG -# define SONAME_LIBJPEG "libjpeg.so" +# define SONAME_LIBJPEG "libjpeg" SONAME_EXT # endif #endif diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 5d3a9f0..c2f32e4 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -78,7 +78,7 @@ #undef jpeg_boolean #undef UINT16 #ifndef SONAME_LIBJPEG -#define SONAME_LIBJPEG "libjpeg.so" +#define SONAME_LIBJPEG "libjpeg" SONAME_EXT #endif #endif diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index ca6702f..5ab33d8 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -676,13 +676,6 @@ void WINAPI wine_glGetIntegerv( GLenum pname, GLint* params ) } -/* No need to load any other libraries as according to the ABI, libGL should be self-sufficient and - include all dependencies -*/ -#ifndef SONAME_LIBGL -#define SONAME_LIBGL "libGL.so" -#endif - /* This is for brain-dead applications that use OpenGL functions before even creating a rendering context.... */ static BOOL process_attach(void) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index d08a968..645dbf3 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -37,7 +37,7 @@ HINSTANCE SANE_instance; #ifdef HAVE_SANE #ifndef SONAME_LIBSANE -#define SONAME_LIBSANE "libsane.so" +#define SONAME_LIBSANE "libsane" SONAME_EXT #endif static void *libsane_handle; diff --git a/dlls/winejack.drv/jack.c b/dlls/winejack.drv/jack.c index 65a1934..fa89115 100644 --- a/dlls/winejack.drv/jack.c +++ b/dlls/winejack.drv/jack.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jack); #ifdef HAVE_JACK_JACK_H #ifndef SONAME_LIBJACK -#define SONAME_LIBJACK "libjack.so" +#define SONAME_LIBJACK "libjack" SONAME_EXT #endif void *jackhandle = NULL; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 3ff0def..cf3b8a5 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); #ifndef SONAME_LIBCUPS -#define SONAME_LIBCUPS "libcups.so" +#define SONAME_LIBCUPS "libcups" SONAME_EXT #endif #ifdef HAVE_CUPS_CUPS_H diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c index 913bf21..a748ce1 100644 --- a/dlls/wineps.drv/truetype.c +++ b/dlls/wineps.drv/truetype.c @@ -84,7 +84,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); FT_LOAD_LINEAR_DESIGN ) #ifndef SONAME_LIBFREETYPE -#define SONAME_LIBFREETYPE "libfreetype.so" +#define SONAME_LIBFREETYPE "libfreetype" SONAME_EXT #endif static void *ft_handle = NULL; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 50c6337..b3e43d6 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -28,7 +28,7 @@ #ifdef HAVE_X11_XCURSOR_XCURSOR_H # include <X11/Xcursor/Xcursor.h> # ifndef SONAME_LIBXCURSOR -# define SONAME_LIBXCURSOR "libXcursor.so" +# define SONAME_LIBXCURSOR "libXcursor" SONAME_EXT # endif static void *xcursor_handle; # define MAKE_FUNCPTR(f) static typeof(f) * p##f diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 98405c1..84c5092 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -202,7 +202,7 @@ static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { include all dependencies */ #ifndef SONAME_LIBGL -#define SONAME_LIBGL "libGL.so" +#define SONAME_LIBGL "libGL" SONAME_EXT #endif #define PUSH1(attribs,att) do { attribs[nAttribs++] = (att); } while (0) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index d96ee05..842945c 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -240,7 +240,7 @@ static INT gNumCursors; #ifndef SONAME_LIBXI -#define SONAME_LIBXI "libXi.so" +#define SONAME_LIBXI "libXi" SONAME_EXT #endif /* XInput stuff */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index be262dc..df7368e 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -44,16 +44,16 @@ static void *xrandr_handle; /* some default values just in case */ #ifndef SONAME_LIBX11 -#define SONAME_LIBX11 "libX11.so" +#define SONAME_LIBX11 "libX11" SONAME_EXT #endif #ifndef SONAME_LIBXEXT -#define SONAME_LIBXEXT "libXext.so" +#define SONAME_LIBXEXT "libXext" SONAME_EXT #endif #ifndef SONAME_LIBXRENDER -#define SONAME_LIBXRENDER "libXrender.so" +#define SONAME_LIBXRENDER "libXrender" SONAME_EXT #endif #ifndef SONAME_LIBXRANDR -#define SONAME_LIBXRANDR "libXrandr.so" +#define SONAME_LIBXRANDR "libXrandr" SONAME_EXT #endif #define MAKE_FUNCPTR(f) static typeof(f) * p##f; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 1e196a7..eafe0e7 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -100,13 +100,13 @@ static int antialias = 1; /* some default values just in case */ #ifndef SONAME_LIBX11 -#define SONAME_LIBX11 "libX11.so" +#define SONAME_LIBX11 "libX11" SONAME_EXT #endif #ifndef SONAME_LIBXEXT -#define SONAME_LIBXEXT "libXext.so" +#define SONAME_LIBXEXT "libXext" SONAME_EXT #endif #ifndef SONAME_LIBXRENDER -#define SONAME_LIBXRENDER "libXrender.so" +#define SONAME_LIBXRENDER "libXrender" SONAME_EXT #endif static void *xrender_handle; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 0a9f7ba..1d08080 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -73,10 +73,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #include <openssl/err.h> #ifndef SONAME_LIBSSL -#define SONAME_LIBSSL "libssl.so" +#define SONAME_LIBSSL "libssl" SONAME_EXT #endif #ifndef SONAME_LIBCRYPTO -#define SONAME_LIBCRYPTO "libcrypto.so" +#define SONAME_LIBCRYPTO "libcrypto" SONAME_EXT #endif static void *OpenSSL_ssl_handle; diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 822fde4..d379df6 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -39,7 +39,7 @@ #ifdef HAVE_CUPS_CUPS_H # include <cups/cups.h> # ifndef SONAME_LIBCUPS -# define SONAME_LIBCUPS "libcups.so" +# define SONAME_LIBCUPS "libcups" SONAME_EXT # endif #endif diff --git a/include/config.h.in b/include/config.h.in index 09d133c..dc8b613 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -969,6 +969,9 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Define to the file extension of shared libraries. */ +#undef SONAME_EXT + /* Define to the soname of the libcapi20 library. */ #undef SONAME_LIBCAPI20

1 0

Alexandre Julliard : configure: Fix the strip command line for Mac OS.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: 65abe18a08431d4490d6a627e2d350f0d15b6a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65abe18a08431d4490d6a627e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 13:38:18 2007 +0200 configure: Fix the strip command line for Mac OS. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3f1ff43..072565d 100755 --- a/configure +++ b/configure @@ -13171,7 +13171,7 @@ fi LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" LDSHARED="\$(CC) -dynamiclib" - STRIP="$STRIP -u -r" + STRIP="$STRIP -x" LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(TOPOBJDIR)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" COREFOUNDATIONLIB="-framework CoreFoundation" diff --git a/configure.ac b/configure.ac index b262128..349de58 100644 --- a/configure.ac +++ b/configure.ac @@ -950,7 +950,7 @@ case $host_os in LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" LDSHARED="\$(CC) -dynamiclib" - STRIP="$STRIP -u -r" + STRIP="$STRIP -x" LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(TOPOBJDIR)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" dnl declare needed frameworks AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")

1 0

Paul Vriens : advapi32/tests: Add tests for OpenSCManagerA.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: 6dde764898646f1fe6cfe1a60ef25b40b79e35ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dde764898646f1fe6cfe1a60… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jul 2 10:53:47 2007 +0200 advapi32/tests: Add tests for OpenSCManagerA. --- dlls/advapi32/tests/service.c | 80 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 74 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 206e4f0..c5e391c 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -27,6 +27,64 @@ #include "wine/test.h" +static void test_open_scm(void) +{ + SC_HANDLE scm_handle; + + /* No access rights */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, 0); + ok(scm_handle != NULL, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS /* W2K3, Vista */ || + GetLastError() == 0xdeadbeef /* NT4, XP */ || + GetLastError() == ERROR_IO_PENDING /* W2K */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); + CloseServiceHandle(scm_handle); + + /* Unknown database name */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, "DoesNotExist", SC_MANAGER_CONNECT); + ok(!scm_handle, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %d\n", GetLastError()); + CloseServiceHandle(scm_handle); /* Just in case */ + + /* MSDN says only ServiceActive is allowed, or NULL */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, SERVICES_FAILED_DATABASEA, SC_MANAGER_CONNECT); + ok(!scm_handle, "Expected failure\n"); + ok(GetLastError() == ERROR_DATABASE_DOES_NOT_EXIST, "Expected ERROR_DATABASE_DOES_NOT_EXIST, got %d\n", GetLastError()); + CloseServiceHandle(scm_handle); /* Just in case */ + + /* Remote unknown host */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA("DOESNOTEXIST", SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CONNECT); + ok(!scm_handle, "Expected failure\n"); + todo_wine + ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE, "Expected RPC_S_SERVER_UNAVAILABLE, got %d\n", GetLastError()); + CloseServiceHandle(scm_handle); /* Just in case */ + + /* Proper call with an empty hostname */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA("", SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CONNECT); + ok(scm_handle != NULL, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS /* W2K3, Vista */ || + GetLastError() == ERROR_ENVVAR_NOT_FOUND /* NT4 */ || + GetLastError() == 0xdeadbeef /* XP */ || + GetLastError() == ERROR_IO_PENDING /* W2K */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING, ERROR_ENVVAR_NOT_FOUND or 0xdeadbeef, got %d\n", GetLastError()); + CloseServiceHandle(scm_handle); + + /* Again a correct one */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + ok(scm_handle != NULL, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS /* W2K3, Vista */ || + GetLastError() == 0xdeadbeef /* NT4, XP */ || + GetLastError() == ERROR_IO_PENDING /* W2K */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); + CloseServiceHandle(scm_handle); +} + static void test_sequence(void) { SC_HANDLE scm_handle, svc_handle; @@ -44,12 +102,7 @@ static void test_sequence(void) SetLastError(0xdeadbeef); scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); - if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - skip("OpenSCManagerA is not implemented\n"); - return; - } - else if (!scm_handle && (GetLastError() == ERROR_ACCESS_DENIED)) + if (!scm_handle && (GetLastError() == ERROR_ACCESS_DENIED)) { skip("Not enough rights to get a handle to the manager\n"); return; @@ -147,6 +200,21 @@ static void test_sequence(void) START_TEST(service) { + SC_HANDLE scm_handle; + + /* Bail out if we are on win98 */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + + if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + skip("OpenSCManagerA is not implemented, we are most likely on win9x\n"); + return; + } + CloseServiceHandle(scm_handle); + + /* First some parameter checking */ + test_open_scm(); /* Test the creation, querying and deletion of a service */ test_sequence(); }

1 0

H. Verbeet : wined3d: Cleanup shader_glsl_load_psamplers().
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: 973496d5e4d73145e60653ac0f3b89d11a1b0e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=973496d5e4d73145e60653ac0… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 1 23:41:57 2007 +0200 wined3d: Cleanup shader_glsl_load_psamplers(). --- dlls/wined3d/glsl_shader.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1e77b96..00536b5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -85,15 +85,17 @@ static void shader_glsl_load_psamplers( int i; char sampler_name[20]; - for (i=0; i< GL_LIMITS(fragment_samplers); ++i) { - if (stateBlock->textures[i] != NULL) { - snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i); - name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); - if (name_loc != -1) { - int mapped_unit = stateBlock->wineD3DDevice->texUnitMap[i]; + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { + snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i); + name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); + if (name_loc != -1) { + int mapped_unit = stateBlock->wineD3DDevice->texUnitMap[i]; + if (mapped_unit != -1 && mapped_unit < GL_LIMITS(fragment_samplers)) { TRACE("Loading %s for texture %d\n", sampler_name, mapped_unit); GL_EXTCALL(glUniform1iARB(name_loc, mapped_unit)); checkGLcall("glUniform1iARB"); + } else { + ERR("Trying to load sampler %s on unsupported unit %d\n", sampler_name, mapped_unit); } } }

1 0

H. Verbeet : wined3d: In tex_colorop() & tex_alphaop(), only check the mapped stage against GL_LIMITS(textures) if the texture is used.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: 6421d45f53543788014e6ba16a6ee1b558ae777d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6421d45f53543788014e6ba16… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 1 23:41:47 2007 +0200 wined3d: In tex_colorop() & tex_alphaop(), only check the mapped stage against GL_LIMITS(textures) if the texture is used. --- dlls/wined3d/state.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8223e30..fbd0cd3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1672,11 +1672,8 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D if (mapped_stage != -1) { if (GL_SUPPORT(ARB_MULTITEXTURE)) { - if (mapped_stage >= GL_LIMITS(textures)) { - if (stateblock->textureState[stage][WINED3DTSS_COLOROP] != WINED3DTOP_DISABLE && - stateblock->textureState[stage][WINED3DTSS_COLOROP] != 0) { - FIXME("Attempt to enable unsupported stage!\n"); - } + if (tex_used && mapped_stage >= GL_LIMITS(textures)) { + FIXME("Attempt to enable unsupported stage!\n"); return; } GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); @@ -1758,17 +1755,15 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D static void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; + BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map[stage]; DWORD op, arg1, arg2, arg0; TRACE("Setting alpha op for stage %d\n", stage); /* Do not care for enabled / disabled stages, just assign the settigns. colorop disables / enables required stuff */ if (mapped_stage != -1) { if (GL_SUPPORT(ARB_MULTITEXTURE)) { - if (stage >= GL_LIMITS(textures)) { - if (stateblock->textureState[stage][WINED3DTSS_COLOROP] != WINED3DTOP_DISABLE && - stateblock->textureState[stage][WINED3DTSS_COLOROP] != 0) { - FIXME("Attempt to enable unsupported stage!\n"); - } + if (tex_used && mapped_stage >= GL_LIMITS(textures)) { + FIXME("Attempt to enable unsupported stage!\n"); return; } GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage));

1 0

H. Verbeet : wined3d: Only set GL_SHADER_OPERATION_NV to GL_NONE for supported units.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: 25c673225b16b432f424235fa4b9c25beb89ec42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c673225b16b432f424235fa… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 1 23:41:15 2007 +0200 wined3d: Only set GL_SHADER_OPERATION_NV to GL_NONE for supported units. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bdb4d5b..8223e30 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1707,7 +1707,7 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D glDisable(GL_TEXTURE_CUBE_MAP_ARB); checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); } - if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { + if(GL_SUPPORT(NV_TEXTURE_SHADER2) && mapped_stage < GL_LIMITS(textures)) { glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_NONE); } }

1 0