July 2010 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Properly advance the patch pointer in msi_check_product_patches.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: d99b6d393404ddaa9211e19f79b4ea5c8da0b083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d99b6d393404ddaa9211e19f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 21 09:48:27 2010 +0200 msi: Properly advance the patch pointer in msi_check_product_patches. Fixes patch enumeration when multiple patches are registered for a given product. --- dlls/msi/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 518303f..2a84e11 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1918,7 +1918,7 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, goto done; ptr = patches; - for (ptr = patches; *ptr && r == ERROR_NO_MORE_ITEMS; ptr += lstrlenW(ptr)) + for (ptr = patches; *ptr && r == ERROR_NO_MORE_ITEMS; ptr += lstrlenW(ptr) + 1) { if (!unsquash_guid(ptr, patch)) {

1 0

Alexandre Julliard : winebuild: Add a -m16 option to specify a 16-bit build .
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 7f6831aa9adbced3161cff3bcdfc2f1deb611e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6831aa9adbced3161cff3bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 12:43:53 2010 +0200 winebuild: Add a -m16 option to specify a 16-bit build. --- tools/winebuild/main.c | 9 +++++---- tools/winebuild/winebuild.man.in | 9 +++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0e662f8..33800eb 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -251,7 +251,7 @@ static const char usage_str[] = " --ld-cmd=LD Command to use for linking (default: ld)\n" " -l, --library=LIB Import the specified library\n" " -L, --library-path=DIR Look for imports libraries in DIR\n" -" -m32, -m64 Force building 32-bit resp. 64-bit code\n" +" -m16, -m32, -m64 Force building 16-bit, 32-bit resp. 64-bit code\n" " -M, --main-module=MODULE Set the name of the main module for a Win16 dll\n" " --nm-cmd=NM Command to use to get undefined symbols (default: nm)\n" " --nxcompat=y|n Set the NX compatibility flag (default: yes)\n" @@ -382,9 +382,10 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) lib_path[nb_lib_paths++] = xstrdup( optarg ); break; case 'm': - if (strcmp( optarg, "32" ) && strcmp( optarg, "64" )) - fatal_error( "Invalid -m option '%s', expected -m32 or -m64\n", optarg ); - if (!strcmp( optarg, "32" )) force_pointer_size = 4; + if (strcmp( optarg, "16" ) && strcmp( optarg, "32" ) && strcmp( optarg, "64" )) + fatal_error( "Invalid -m option '%s', expected -m16, -m32 or -m64\n", optarg ); + if (!strcmp( optarg, "16" )) spec->type = SPEC_WIN16; + else if (!strcmp( optarg, "32" )) force_pointer_size = 4; else force_pointer_size = 8; break; case 'M': diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 2b0f0b7..2da97c7 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -157,8 +157,8 @@ Import the specified library, looking for a corresponding \fIlibname.def\fR file in the directories specified with the \fB-L\fR option. .TP -.B \-m32, -m64 -Generate 32-bit, respectively 64-bit code. +.B \-m16, -m32, -m64 +Generate 16-bit, 32-bit, respectively 64-bit code. .TP .BI \-M,\ --main-module= module When building a 16-bit dll, set the name of its 32-bit counterpart to @@ -211,10 +211,7 @@ for a command line executable, for a graphical executable, .br .B native -for a native-mode dll, -.br -.B win16 -for a 16-bit module. +for a native-mode dll. .br The entry point of a command line executable is a normal C \fBmain\fR function. A \fBwmain\fR function can be used instead if you need the

1 0

Alexandre Julliard : winegcc: Add support for a -m16 option to specify a 16-bit build.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 0c7b27aa14d12590598083c88a4c7c889d8be8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7b27aa14d12590598083c88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 12:44:12 2010 +0200 winegcc: Add support for a -m16 option to specify a 16-bit build. --- tools/winegcc/winegcc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5fed4a3..884ef6a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -194,6 +194,7 @@ struct options int noshortwchar; int gui_app; int unicode_app; + int win16_app; int compile_only; int force_pointer_size; int large_address_aware; @@ -694,6 +695,9 @@ static void build(struct options* opts) strarray *resources = strarray_alloc(); char *res_o_name = NULL; + if (opts->win16_app) + error( "Building 16-bit code is not supported for Windows\n" ); + if (opts->shared) { /* run winebuild to generate the .def file */ @@ -848,6 +852,7 @@ static void build(struct options* opts) strarray_add(spec_args, "-E"); strarray_add(spec_args, spec_file); } + if (opts->win16_app) strarray_add(spec_args, "-m16"); if (!opts->shared) { @@ -1270,6 +1275,8 @@ int main(int argc, char **argv) opts.gui_app = 0; else if (strcmp("-municode", argv[i]) == 0) opts.unicode_app = 1; + else if (strcmp("-m16", argv[i]) == 0) + opts.win16_app = 1; else if (strcmp("-m32", argv[i]) == 0) { if (opts.target_cpu == CPU_x86_64)

1 0

Alexandre Julliard : winegcc: Don' t pass -nodefaultlibs to the Unix compiler so that it can be used by Wine.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 121a7f78408655d353a939d850a95d981cdb4a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=121a7f78408655d353a939d85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 12:44:50 2010 +0200 winegcc: Don't pass -nodefaultlibs to the Unix compiler so that it can be used by Wine. --- tools/winegcc/winegcc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 884ef6a..e754a19 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1006,7 +1006,7 @@ static int is_linker_arg(const char* arg) { static const char* link_switches[] = { - "-nostartfiles", "-nodefaultlibs", "-nostdlib", "-s", + "-nostartfiles", "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", "-framework", "--coverage", "-fprofile-generate", "-fprofile-use" };

1 0

Alexandre Julliard : makefiles: Specify -nodefaultlibs when building low-level dlls.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: f9253bbb45cf4e83354ffde1e0e3f40fbaa3a286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9253bbb45cf4e83354ffde1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 12:49:45 2010 +0200 makefiles: Specify -nodefaultlibs when building low-level dlls. --- dlls/kernel32/Makefile.in | 2 +- dlls/krnl386.exe16/Makefile.in | 4 ++-- dlls/ntdll/Makefile.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index c145a00..1056174 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -7,7 +7,7 @@ MODULE = kernel32.dll IMPORTLIB = kernel32 IMPORTS = ntdll EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@ -EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 +EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 C_SRCS = \ actctx.c \ diff --git a/dlls/krnl386.exe16/Makefile.in b/dlls/krnl386.exe16/Makefile.in index c85c200..0798e54 100644 --- a/dlls/krnl386.exe16/Makefile.in +++ b/dlls/krnl386.exe16/Makefile.in @@ -6,8 +6,8 @@ MODULE = krnl386.exe16 IMPORTLIB = kernel IMPORTS = kernel32 ntdll DELAYIMPORTS = ddraw dsound user32 -EXTRAIMPLIBFLAGS = --subsystem win16 -EXTRADLLFLAGS = -Wb,--subsystem,win16,--dll-name,kernel +EXTRAIMPLIBFLAGS = -m16 +EXTRADLLFLAGS = -m16 -nodefaultlibs -Wb,--dll-name,kernel EXTRARCFLAGS = -O res16 C_SRCS = \ diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index c51776b..885036e 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = ntdll.dll IMPORTLIB = ntdll EXTRALIBS = @IOKITLIB@ @LIBPTHREAD@ -EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000 +EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 C_SRCS = \ actctx.c \

1 0

Alexandre Julliard : winegcc: Import kernel32 and ntdll by default also when building Wine.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 9f34a57743b864b8ec87a975a4a534130d4096aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f34a57743b864b8ec87a975a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 13:03:12 2010 +0200 winegcc: Import kernel32 and ntdll by default also when building Wine. They are needed to resolve symbols in winecrt0 which is always imported. --- tools/winegcc/winegcc.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e754a19..1e02f1a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -745,7 +745,15 @@ static void build(struct options* opts) for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j])); - if (!opts->nostartfiles) add_library(opts, lib_dirs, files, "winecrt0"); + if (!opts->nostartfiles) + { + add_library(opts, lib_dirs, files, "winecrt0"); + if (!opts->nodefaultlibs) + { + add_library(opts, lib_dirs, files, "kernel32"); + add_library(opts, lib_dirs, files, "ntdll"); + } + } if (opts->shared && !opts->nostdlib) add_library(opts, lib_dirs, files, "wine"); if (!opts->shared && opts->use_msvcrt && opts->target_platform == PLATFORM_CYGWIN) add_library(opts, lib_dirs, files, "msvcrt"); @@ -823,10 +831,18 @@ static void build(struct options* opts) } add_library(opts, lib_dirs, files, "advapi32"); add_library(opts, lib_dirs, files, "user32"); - add_library(opts, lib_dirs, files, "kernel32"); } - if (!opts->nostartfiles) add_library(opts, lib_dirs, files, "winecrt0"); + if (!opts->nostartfiles) + { + add_library(opts, lib_dirs, files, "winecrt0"); + if (!opts->nodefaultlibs) + { + if (opts->win16_app) add_library(opts, lib_dirs, files, "kernel"); + add_library(opts, lib_dirs, files, "kernel32"); + add_library(opts, lib_dirs, files, "ntdll"); + } + } if (!opts->nostdlib) add_library(opts, lib_dirs, files, "wine"); /* run winebuild to generate the .spec.o file */

1 0

Hans Leidekker : msi: Set feature states to the installed state if the Preselected property is not set .
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 568c7c198c8b2d6b4d507f9b4db53b62375d233f URL: http://source.winehq.org/git/wine.git/?a=commit;h=568c7c198c8b2d6b4d507f9b4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 21 09:46:46 2010 +0200 msi: Set feature states to the installed state if the Preselected property is not set. --- dlls/msi/action.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1e2af4b..8ddd0dc 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1794,6 +1794,18 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) msi_feature_set_state(package, fl->feature, INSTALLSTATE_UNKNOWN); } } + else + { + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + BOOL selected = feature->Level > 0 && feature->Level <= level; + + if (selected && feature->Action == INSTALLSTATE_UNKNOWN) + { + msi_feature_set_state(package, feature, feature->Installed); + } + } + } /* * now we want to enable or disable components base on feature

1 0

Hans Leidekker : msi: Move the component enabled check into the standard actions.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 424e3a9fb8d24a49cad0330a50d63bee126a7102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424e3a9fb8d24a49cad0330a5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 21 09:47:03 2010 +0200 msi: Move the component enabled check into the standard actions. --- dlls/msi/action.c | 145 +++++++++++++++++++++++++++++++++++++--------- dlls/msi/classes.c | 24 ++++++++ dlls/msi/files.c | 32 ++++++++++- dlls/msi/font.c | 12 ++++ dlls/msi/tests/install.c | 4 +- 5 files changed, 186 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=424e3a9fb8d24a49cad03…

1 0

Hans Leidekker : msi: Reverse the transform storage list order.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: fba248642b6cc9612b43cf519d47b3604bc57150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba248642b6cc9612b43cf519… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 21 09:47:18 2010 +0200 msi: Reverse the transform storage list order. This ensures that we use the most recently added stream if another transform storage contains a stream by the same name. Fixes wordconv.msp, an update for Word 2007. --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 3e57792..b77b6fa 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -226,7 +226,7 @@ void append_storage_to_db( MSIDATABASE *db, IStorage *stg ) t = msi_alloc( sizeof *t ); t->stg = stg; IStorage_AddRef( stg ); - list_add_tail( &db->transforms, &t->entry ); + list_add_head( &db->transforms, &t->entry ); /* the transform may add or replace streams */ free_streams( db );

1 0

Hans Leidekker : msi: Improve traces in db_get_raw_stream.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: d10208e863aeaab95490a09ca221e7bfbe8c468b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10208e863aeaab95490a09ca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 21 09:47:39 2010 +0200 msi: Improve traces in db_get_raw_stream. --- dlls/msi/database.c | 5 +++-- dlls/msi/msipriv.h | 1 + dlls/msi/streams.c | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index b77b6fa..01c3249 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -126,8 +126,10 @@ static UINT clone_open_stream( MSIDATABASE *db, LPCWSTR name, IStream **stm ) UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) { HRESULT r; + WCHAR decoded[MAX_STREAM_NAME_LEN]; - TRACE("%s\n", debugstr_w(stname)); + decode_streamname( stname, decoded ); + TRACE("%s -> %s\n", debugstr_w(stname), debugstr_w(decoded)); if (clone_open_stream( db, stname, stm ) == ERROR_SUCCESS) return ERROR_SUCCESS; @@ -140,7 +142,6 @@ UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) LIST_FOR_EACH_ENTRY( transform, &db->transforms, MSITRANSFORM, entry ) { - TRACE("looking for %s in transform storage\n", debugstr_w(stname) ); r = IStorage_OpenStream( transform->stg, stname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); if (SUCCEEDED(r)) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index df9f045..bdb1884 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -44,6 +44,7 @@ #define MSITYPE_KEY 0x2000 #define MSITYPE_TEMPORARY 0x4000 +#define MAX_STREAM_NAME_LEN 62 /* Install UI level mask for AND operation to exclude flags */ #define INSTALLUILEVEL_MASK 0x0007 diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 59e845d..44c4e67 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -37,7 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define NUM_STREAMS_COLS 2 -#define MAX_STREAM_NAME_LEN 62 typedef struct tabSTREAM {

1 0