September 2011 - Wine-commits

Hans Leidekker : msi: Avoid a leak when a query is executed more than once.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: a8b51497e518817716a8f79c29999d22726ad35d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b51497e518817716a8f79c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:47:37 2011 +0200 msi: Avoid a leak when a query is executed more than once. --- dlls/msi/where.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 5304900..0e346d6 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -73,6 +73,7 @@ typedef struct tagMSIWHEREVIEW struct expr *cond; UINT rec_index; MSIORDERINFO *order_info; + UINT error; } MSIWHEREVIEW; #define INITIAL_REORDER_SIZE 16 @@ -617,6 +618,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if( !table ) return ERROR_FUNCTION_FAILED; + if (wv->reorder) + return wv->error; + r = init_reorder(wv); if (r != ERROR_SUCCESS) return r; @@ -648,7 +652,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if (wv->order_info) r = wv->order_info->error; + msi_free( rows ); + wv->error = r; return r; }

1 0

Hans Leidekker : msi/tests: Fix a number of test messages.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: eaf8848d0d7fb0cb6e87a3b83dc9ff595cf5d997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf8848d0d7fb0cb6e87a3b83… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:48:03 2011 +0200 msi/tests: Fix a number of test messages. --- dlls/msi/tests/action.c | 36 +++--- dlls/msi/tests/automation.c | 10 +- dlls/msi/tests/install.c | 249 +++++++++++++++++++++---------------------- 3 files changed, 147 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaf8848d0d7fb0cb6e87a…

1 0

Hans Leidekker : msi: Use a higher value for the initial transform disk id.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 470688f7292297e4a542bf95be6d5c28653b1427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=470688f7292297e4a542bf95b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:48:35 2011 +0200 msi: Use a higher value for the initial transform disk id. --- dlls/msi/msipriv.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 998970b..96f0808 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -76,7 +76,7 @@ struct tagMSIOBJECTHDR }; #define MSI_INITIAL_MEDIA_TRANSFORM_OFFSET 10000 -#define MSI_INITIAL_MEDIA_TRANSFORM_DISKID 10000 +#define MSI_INITIAL_MEDIA_TRANSFORM_DISKID 30000 typedef struct tagMSIDATABASE {

1 0

Hans Leidekker : msi: Initialize a variable.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 9cb38911d22e2da7e459d08979f4053b2b9dc0cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb38911d22e2da7e459d0897… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:49:17 2011 +0200 msi: Initialize a variable. --- dlls/msi/package.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index e635886..1025607 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1508,6 +1508,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) TRACE("%s %p\n", debugstr_w(szPackage), pPackage); + localfile[0] = 0; if( szPackage[0] == '#' ) { handle = atoiW(&szPackage[1]);

1 0

Alexandre Julliard : advapi32: Include system headers before Windows headers.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: d37c85d6a78a4ebde4311cc8db2a0b750eba0875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37c85d6a78a4ebde4311cc8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 17:22:10 2011 +0200 advapi32: Include system headers before Windows headers. --- dlls/advapi32/cred.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 0c8c129..c7af18b 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -21,18 +21,18 @@ #include <stdarg.h> #include <time.h> -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wincred.h" -#include "winternl.h" - #ifdef __APPLE__ # include <Security/SecKeychain.h> # include <Security/SecKeychainItem.h> # include <Security/SecKeychainSearch.h> #endif +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wincred.h" +#include "winternl.h" + #include "crypt.h" #include "wine/unicode.h"

1 0

Alexandre Julliard : crypt32: Include system headers before Windows headers .
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: f9a9a18e1d5bd43ef9232713d4070b370fe18176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a9a18e1d5bd43ef9232713d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 17:22:17 2011 +0200 crypt32: Include system headers before Windows headers. --- dlls/crypt32/rootstore.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 44c3d81..386bc9b 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -31,6 +31,9 @@ #endif #include <errno.h> #include <limits.h> +#ifdef HAVE_SECURITY_SECURITY_H +#include <Security/Security.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -40,9 +43,6 @@ #include "winternl.h" #include "wine/debug.h" #include "crypt32_private.h" -#ifdef HAVE_SECURITY_SECURITY_H -#include <Security/Security.h> -#endif WINE_DEFAULT_DEBUG_CHANNEL(crypt);

1 0

Alexandre Julliard : gphoto2.ds: Include system headers before Windows headers.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 08272af642f88429a90a1c5b3f74d0aa38aae48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08272af642f88429a90a1c5b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 17:22:33 2011 +0200 gphoto2.ds: Include system headers before Windows headers. --- dlls/gphoto2.ds/capability.c | 3 --- dlls/gphoto2.ds/ds_image.c | 7 ++----- dlls/gphoto2.ds/gphoto2_i.h | 1 + dlls/gphoto2.ds/gphoto2_main.c | 3 --- dlls/gphoto2.ds/ui.c | 5 +---- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c index 378ef2a..34d081e 100644 --- a/dlls/gphoto2.ds/capability.c +++ b/dlls/gphoto2.ds/capability.c @@ -24,9 +24,6 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "twain.h" #include "gphoto2_i.h" #include "wine/debug.h" diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index f26b3dd..c870ec4 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -20,17 +20,14 @@ #include "config.h" #include "wine/port.h" -#include "wine/library.h" #include <stdarg.h> #include <stdio.h> -#include "windef.h" -#include "winbase.h" +#include "gphoto2_i.h" #include "wingdi.h" #include "winuser.h" -#include "twain.h" -#include "gphoto2_i.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(twain); diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 373c6fc..edc4d91 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -48,6 +48,7 @@ # include <jpeglib.h> # undef HAVE_STDLIB_H # define HAVE_STDLIB_H 1 +# undef UINT8 # undef UINT16 #endif diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 5d80d4c..8c14632 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -28,9 +28,6 @@ #endif #include <stdlib.h> -#include "windef.h" -#include "winbase.h" -#include "twain.h" #include "gphoto2_i.h" #include "wine/debug.h" diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index b769a6e..df79875 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -26,16 +26,13 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" +#include "gphoto2_i.h" #include "winuser.h" #include "winnls.h" #include "wingdi.h" #include "winreg.h" #include "commctrl.h" #include "prsht.h" -#include "twain.h" -#include "gphoto2_i.h" #include "wine/debug.h" #include "resource.h"

1 0

Alexandre Julliard : sane.ds: Include system headers before Windows headers .
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 37e358404ff71794bbb2ce76a8f42c756ba057c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e358404ff71794bbb2ce76a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 17:22:50 2011 +0200 sane.ds: Include system headers before Windows headers. --- dlls/sane.ds/capability.c | 3 --- dlls/sane.ds/ds_ctrl.c | 1 - dlls/sane.ds/ds_image.c | 5 +---- dlls/sane.ds/options.c | 1 - dlls/sane.ds/sane_i.h | 16 +++++++++------- dlls/sane.ds/sane_main.c | 3 --- dlls/sane.ds/ui.c | 5 +---- 7 files changed, 11 insertions(+), 23 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 20fd2c3..1381220 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -25,9 +25,6 @@ #include <stdio.h> #include <math.h> -#include "windef.h" -#include "winbase.h" -#include "twain.h" #include "sane_i.h" #include "winnls.h" #include "wine/debug.h" diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 9901fff..713f311 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -22,7 +22,6 @@ # include <unistd.h> #endif #include <stdlib.h> -#include "twain.h" #include "sane_i.h" #include "wine/debug.h" diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 4945e55..77826b0 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -21,12 +21,9 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" +#include "sane_i.h" #include "wingdi.h" #include "winuser.h" -#include "twain.h" -#include "sane_i.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(twain); diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index 67cb1dc..7b792b2 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -19,7 +19,6 @@ #include "config.h" #include <stdlib.h> -#include "twain.h" #include "sane_i.h" #include "wine/debug.h" diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 17826d2..ae58159 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -23,10 +23,19 @@ # error You must include config.h first #endif +#include <stdarg.h> + #ifdef SONAME_LIBSANE # include <sane/sane.h> # include <sane/saneopts.h> +#endif + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "twain.h" +#ifdef SONAME_LIBSANE #define MAKE_FUNCPTR(f) typeof(f) * p##f DECLSPEC_HIDDEN; MAKE_FUNCPTR(sane_init) MAKE_FUNCPTR(sane_exit) @@ -43,14 +52,7 @@ MAKE_FUNCPTR(sane_set_io_mode) MAKE_FUNCPTR(sane_get_select_fd) MAKE_FUNCPTR(sane_strstatus) #undef MAKE_FUNCPTR - #endif -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "twain.h" extern HINSTANCE SANE_instance DECLSPEC_HIDDEN; diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index f482098..1c73252 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -24,9 +24,6 @@ #include <stdarg.h> #include <stdio.h> -#include "windef.h" -#include "winbase.h" -#include "twain.h" #include "sane_i.h" #include "wine/debug.h" #include "wine/library.h" diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 147c759..5d4cd83 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -26,14 +26,11 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" +#include "sane_i.h" #include "winuser.h" #include "winnls.h" #include "wingdi.h" #include "prsht.h" -#include "twain.h" -#include "sane_i.h" #include "wine/debug.h" #include "resource.h" #include "wine/unicode.h"

1 0

Alexandre Julliard : wldap32: Include system headers before Windows headers .
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: e04866f3cfae4dd90d8c578211360019ab5ff137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04866f3cfae4dd90d8c57821… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 17:23:34 2011 +0200 wldap32: Include system headers before Windows headers. --- dlls/wldap32/add.c | 10 ++++------ dlls/wldap32/bind.c | 10 ++++------ dlls/wldap32/compare.c | 10 ++++------ dlls/wldap32/control.c | 10 ++++------ dlls/wldap32/delete.c | 10 ++++------ dlls/wldap32/dn.c | 10 ++++------ dlls/wldap32/error.c | 10 ++++------ dlls/wldap32/extended.c | 10 ++++------ dlls/wldap32/init.c | 10 ++++------ dlls/wldap32/misc.c | 10 ++++------ dlls/wldap32/modify.c | 10 ++++------ dlls/wldap32/modrdn.c | 10 ++++------ dlls/wldap32/option.c | 10 ++++------ dlls/wldap32/page.c | 17 +++++++---------- dlls/wldap32/parse.c | 10 ++++------ dlls/wldap32/rename.c | 10 ++++------ dlls/wldap32/search.c | 10 ++++------ dlls/wldap32/value.c | 10 ++++------ 18 files changed, 75 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e04866f3cfae4dd90d8c5…

1 0

André Hentschel : configure: Install view.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 31f0f09a17624eeafcc9fbedf38fd06d0090dbd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f0f09a17624eeafcc9fbedf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 1 21:04:14 2011 +0200 configure: Install view. (better subject, maybe) I still think "view" should be available to users, so the only thing between the user and "view" is they have to compile Wine theirselves and that should change. It's very hard to find good wmf/emf viewers for Linux(and most likely other OS), but "view" is a great program for people who need to take a look at wmf/emf files. --- configure | 2 +- configure.ac | 2 +- tools/make_makefiles | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 7c1af08..dfc540f 100755 --- a/configure +++ b/configure @@ -15256,7 +15256,7 @@ wine_fn_config_program taskmgr enable_taskmgr install,po wine_fn_config_program termsv enable_termsv install wine_fn_config_program uninstaller enable_uninstaller install,po wine_fn_config_program unlodctr enable_unlodctr install -wine_fn_config_program view enable_view po +wine_fn_config_program view enable_view install,po wine_fn_config_program wineboot enable_wineboot install,installbin,manpage wine_fn_config_program winebrowser enable_winebrowser install wine_fn_config_program winecfg enable_winecfg install,installbin,manpage,po diff --git a/configure.ac b/configure.ac index 0421c74..a2c3efe 100644 --- a/configure.ac +++ b/configure.ac @@ -2949,7 +2949,7 @@ WINE_CONFIG_PROGRAM(taskmgr,,[install,po]) WINE_CONFIG_PROGRAM(termsv,,[install]) WINE_CONFIG_PROGRAM(uninstaller,,[install,po]) WINE_CONFIG_PROGRAM(unlodctr,,[install]) -WINE_CONFIG_PROGRAM(view,,[po]) +WINE_CONFIG_PROGRAM(view,,[install,po]) WINE_CONFIG_PROGRAM(wineboot,,[install,installbin,manpage]) WINE_CONFIG_PROGRAM(winebrowser,,[install]) WINE_CONFIG_PROGRAM(winecfg,,[install,installbin,manpage,po]) diff --git a/tools/make_makefiles b/tools/make_makefiles index 3a27cf0..d94880a 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -51,7 +51,6 @@ my %bin_install = my %dont_install = ( "cmdlgtst" => 1, - "view" => 1, "winetest" => 1, );

1 0