May 2018 - Wine-commits - list.winehq.org

Kyle Auble : Remove fix for PNG rendering in old browsers
by Jeremy Newman 02 May '18

02 May '18

Module: website Branch: master Commit: f7a0cff42d8d5a661c83ef7231d658ddfa58dcf7 URL: https://source.winehq.org/git/website.git/?a=commit;h=f7a0cff42d8d5a661c83e… Author: Kyle Auble <kyle.auble(a)zoho.com> Date: Tue May 1 22:51:25 2018 -0400 Remove fix for PNG rendering in old browsers Signed-off-by: Kyle Auble <kyle.auble(a)zoho.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- js/jquery.pngfix.js | 126 ---------------------------------------------------- 1 file changed, 126 deletions(-) diff --git a/js/jquery.pngfix.js b/js/jquery.pngfix.js deleted file mode 100644 index 29f9ef4..0000000 --- a/js/jquery.pngfix.js +++ /dev/null @@ -1,126 +0,0 @@ -/** - * jQuery (PNG Fix) v1.2 - * Microsoft Internet Explorer 24bit PNG Fix - * - * The MIT License - * - * Copyright (c) 2007 Paul Campbell (pauljamescampbell.co.uk) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * @param Object - * @return Array - */ -(function($) { - - $.fn.pngfix = function(options) { - - // Review the Microsoft IE developer library for AlphaImageLoader reference - // http://msdn2.microsoft.com/en-us/library/ms532969(VS.85).aspx - - // ECMA scope fix - var elements = this; - var settings = $.extend({ - imageFixSrc: false, - sizingMethod: false - }, options); - - if(!$.browser.msie || ($.browser.msie && $.browser.version >= 7)) { - return(elements); - } - - function setFilter(el, path, mode) { - var fs = el.attr("filters"); - var alpha = "DXImageTransform.Microsoft.AlphaImageLoader"; - if (fs[alpha]) { - fs[alpha].enabled = true; - fs[alpha].src = path; - fs[alpha].sizingMethod = mode; - } else { - el.css("filter", 'progid:' + alpha + '(enabled="true", sizingMethod="' + mode + '", src="' + path + '")'); - } - } - - function setDOMElementWidth(el) { - if(el.css("width") == "auto" & el.css("height") == "auto") { - el.css("width", el.attr("offsetWidth") + "px"); - } - } - - return( - elements.each(function() { - - // Scope - var el = $(this); - - if(el.attr("tagName").toUpperCase() == "IMG" && (/\.png/i).test(el.attr("src"))) { - if(!settings.imageFixSrc) { - - // Wrap the <img> in a <span> then apply style/filters, - // removing the <img> tag from the final render - el.wrap("<span></span>"); - var par = el.parent(); - par.css({ - height: el.height(), - width: el.width(), - display: "inline-block" - }); - setFilter(par, el.attr("src"), "scale"); - el.remove(); - } else if((/\.gif/i).test(settings.imageFixSrc)) { - - // Replace the current image with a transparent GIF - // and apply the filter to the background of the - // <img> tag (not the preferred route) - setDOMElementWidth(el); - setFilter(el, el.attr("src"), "image"); - el.attr("src", settings.imageFixSrc); - } - - } else { - var bg = new String(el.css("backgroundImage")); - var matches = bg.match(/^url$"(.*)"$$/); - if(matches && matches.length) { - - // Elements with a PNG as a backgroundImage have the - // filter applied with a sizing method relevant to the - // background repeat type - setDOMElementWidth(el); - el.css("backgroundImage", "none"); - - // Restrict scaling methods to valid MSDN definitions (or one custom) - var sc = "crop"; - if(settings.sizingMethod) { - sc = settings.sizingMethod; - } - setFilter(el, matches[1], sc); - - // Fix IE peek-a-boo bug for internal links - // within that DOM element - el.find("a").each(function() { - $(this).css("position", "relative"); - }); - } - } - - }) - ); - } - -})(jQuery) \ No newline at end of file

1 0

Kyle Auble : Clear out pre-CSS3 styling images
by Jeremy Newman 02 May '18

02 May '18

Module: website Branch: master Commit: 3e735e7dc5292294eb593ac9774a569193a5b624 URL: https://source.winehq.org/git/website.git/?a=commit;h=3e735e7dc5292294eb593… Author: Kyle Auble <kyle.auble(a)zoho.com> Date: Tue May 1 22:51:24 2018 -0400 Clear out pre-CSS3 styling images Signed-off-by: Kyle Auble <kyle.auble(a)zoho.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- images/blank.gif | Bin 61 -> 0 bytes images/checker.gif | Bin 87 -> 0 bytes images/grey_pixel.gif | Bin 43 -> 0 bytes images/side_menu_bg.png | Bin 226 -> 0 bytes images/side_menu_bot.png | Bin 564 -> 0 bytes images/side_menu_top.png | Bin 3287 -> 0 bytes images/tab_h.png | Bin 584 -> 0 bytes images/tab_s.png | Bin 614 -> 0 bytes images/tab_u.png | Bin 616 -> 0 bytes images/winehq_logo_glass_rtl.png | Bin 36545 -> 0 bytes images/winehq_logo_glass_sm.png | Bin 14291 -> 0 bytes images/winehq_logo_glass_sm_rtl.png | Bin 14311 -> 0 bytes 12 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/blank.gif b/images/blank.gif deleted file mode 100644 index c080147..0000000 Binary files a/images/blank.gif and /dev/null differ diff --git a/images/checker.gif b/images/checker.gif deleted file mode 100644 index 83cd1b3..0000000 Binary files a/images/checker.gif and /dev/null differ diff --git a/images/grey_pixel.gif b/images/grey_pixel.gif deleted file mode 100644 index bf677fd..0000000 Binary files a/images/grey_pixel.gif and /dev/null differ diff --git a/images/side_menu_bg.png b/images/side_menu_bg.png deleted file mode 100644 index c8cbcc0..0000000 Binary files a/images/side_menu_bg.png and /dev/null differ diff --git a/images/side_menu_bot.png b/images/side_menu_bot.png deleted file mode 100644 index 8bc9b5d..0000000 Binary files a/images/side_menu_bot.png and /dev/null differ diff --git a/images/side_menu_top.png b/images/side_menu_top.png deleted file mode 100644 index 047c4c0..0000000 Binary files a/images/side_menu_top.png and /dev/null differ diff --git a/images/tab_h.png b/images/tab_h.png deleted file mode 100644 index 59620cd..0000000 Binary files a/images/tab_h.png and /dev/null differ diff --git a/images/tab_s.png b/images/tab_s.png deleted file mode 100644 index 54d367b..0000000 Binary files a/images/tab_s.png and /dev/null differ diff --git a/images/tab_u.png b/images/tab_u.png deleted file mode 100644 index ff84b7a..0000000 Binary files a/images/tab_u.png and /dev/null differ diff --git a/images/winehq_logo_glass_rtl.png b/images/winehq_logo_glass_rtl.png deleted file mode 100644 index 9e97396..0000000 Binary files a/images/winehq_logo_glass_rtl.png and /dev/null differ diff --git a/images/winehq_logo_glass_sm.png b/images/winehq_logo_glass_sm.png deleted file mode 100644 index 949334b..0000000 Binary files a/images/winehq_logo_glass_sm.png and /dev/null differ diff --git a/images/winehq_logo_glass_sm_rtl.png b/images/winehq_logo_glass_sm_rtl.png deleted file mode 100644 index 00b5a9c..0000000 Binary files a/images/winehq_logo_glass_sm_rtl.png and /dev/null differ

1 0

Jeremy Newman : remove old wineconf media page
by Jeremy Newman 02 May '18

02 May '18

Module: website Branch: master Commit: c24b39ad7c664446913f24b725b079c9a68215fd URL: https://source.winehq.org/git/website.git/?a=commit;h=c24b39ad7c664446913f2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 2 10:29:36 2018 -0500 remove old wineconf media page this page is no longer linked anywhere, and the video is available on the wiki. --- js/swfobject.js | 4 ---- templates/en/wineconf/media.template | 33 --------------------------------- templates/ko/wineconf/media.template | 32 -------------------------------- 3 files changed, 69 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=c24b39ad7c6644469…

1 0

Zebediah Figura : makedep: Also pass EXTRADLLFLAGS to the cross-compiled test DLL.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 0b90dc78a47b1cfd79d4a6685f12f7e42dd660e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b90dc78a47b1cfd79d4a668… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 30 13:59:57 2018 -0500 makedep: Also pass EXTRADLLFLAGS to the cross-compiled test DLL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2c5b40a..207c41e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2823,9 +2823,11 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c static void output_source_spec( struct makefile *make, struct incl_file *source, const char *obj ) { struct strarray imports = get_expanded_file_local_var( make, obj, "IMPORTS" ); + struct strarray dll_flags = get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" ); struct strarray all_libs, dep_libs = empty_strarray; if (!imports.count) imports = make->imports; + if (!dll_flags.count) dll_flags = make->extradllflags; all_libs = add_import_libs( make, &dep_libs, imports, 0 ); add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ strarray_addall( &all_libs, libs ); @@ -2848,7 +2850,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); output_filenames( target_flags ); output_filenames( unwind_flags ); - output_filenames( make->extradllflags ); + output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); output_filename( strmake( "%s.o", obj_dir_path( make, obj ))); @@ -2880,6 +2882,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); output_filename( "--lib-suffix=.cross.a" ); + output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); output_filename( strmake( "%s.cross.o", obj_dir_path( make, obj )));

1 0

Alexandre Julliard : winegcc: Add support for building native subsystem libraries.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 470bd0c2fa988721ba1cb17bb12e164cb6f9bee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=470bd0c2fa988721ba1cb17b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 1 12:57:54 2018 +0200 winegcc: Add support for building native subsystem libraries. Based on a patch by Zebediah Figura. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 4be35d5..5d604d2 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -210,6 +210,7 @@ struct options const char* image_base; const char* section_align; const char* lib_suffix; + const char* subsystem; strarray* prefix; strarray* lib_dirs; strarray* linker_args; @@ -913,7 +914,19 @@ static void build(struct options* opts) else { strarray_add(link_args, opts->gui_app ? "-mwindows" : "-mconsole"); - if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs"); + } + + if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs"); + if (opts->nostartfiles) strarray_add(link_args, "-nostartfiles" ); + + if (opts->subsystem) + { + strarray_add(link_args, strmake("-Wl,--subsystem,%s", opts->subsystem)); + if (!strcmp( opts->subsystem, "native" )) + { + const char *entry = opts->target_cpu == CPU_x86 ? "_DriverEntry(a)8" : "DriverEntry"; + strarray_add(link_args, strmake( "-Wl,--entry,%s", entry )); + } } for ( j = 0 ; j < opts->linker_args->size ; j++ ) @@ -1070,6 +1083,12 @@ static void build(struct options* opts) if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" ); } + if (opts->subsystem) + { + strarray_add(spec_args, "--subsystem"); + strarray_add(spec_args, opts->subsystem); + } + for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(spec_args, strmake("-L%s", lib_dirs->base[j])); @@ -1211,19 +1230,11 @@ static void forward(int argc, char **argv, struct options* opts) strarray_free (args); } -/* - * Linker Options - * object-file-name -llibrary -nostartfiles -nodefaultlibs - * -nostdlib -s -static -static-libgcc -shared -shared-libgcc - * -symbolic -Wl,option -Xlinker option -u symbol - * -framework name - */ static int is_linker_arg(const char* arg) { static const char* link_switches[] = { - "-nostartfiles", "-nostdlib", "-s", - "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", + "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", "-framework", "--coverage", "-fprofile-generate", "-fprofile-use" }; unsigned int j; @@ -1600,6 +1611,11 @@ int main(int argc, char **argv) opts.large_address_aware = 1; continue; } + if (!strcmp(Wl->base[j], "--subsystem") && j < Wl->size - 1) + { + opts.subsystem = strdup( Wl->base[++j] ); + continue; + } if (!strcmp(Wl->base[j], "-static")) linking = -1; strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); }

1 0

Sebastian Lackner : ntoskrnl.exe/tests: Add test driver.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 417e542e7adda01fe8c8fe7b369b6eb0f36c7321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=417e542e7adda01fe8c8fe7b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 30 13:59:58 2018 -0500 ntoskrnl.exe/tests: Add test driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ntoskrnl.exe/tests/Makefile.in | 10 +++ dlls/ntoskrnl.exe/tests/driver.c | 126 ++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 27 ++++++ dlls/ntoskrnl.exe/tests/driver.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 159 ++++++++++++++++++++++++++++++++++++ 7 files changed, 325 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=417e542e7adda01fe8c8…

1 0

Daniel Lehman : include: Add _countof macro.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 1ce735649820cf1526d3cb7e6af98361a406b52b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ce735649820cf1526d3cb7e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 1 10:27:40 2016 -0700 include: Add _countof macro. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 174df43..892f36a 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -60,6 +60,9 @@ typedef struct _ldiv_t { __msvcrt_long rem; } ldiv_t; + +#define _countof(x) (sizeof(x)/sizeof((x)[0])) + #define __max(a,b) (((a) > (b)) ? (a) : (b)) #define __min(a,b) (((a) < (b)) ? (a) : (b)) #ifndef __cplusplus

1 0

Daniel Lehman : include: Add wcstof.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 1863ec6414ca688076b9341bf4ac81356592de12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1863ec6414ca688076b9341b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Feb 16 07:22:42 2018 -0800 include: Add wcstof. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 1 + include/msvcrt/wchar.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 892f36a..a325187 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -240,6 +240,7 @@ __msvcrt_long __cdecl _wtol(const wchar_t*); size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); int __cdecl mbtowc(wchar_t*,const char*,size_t); +float __cdecl wcstof(const wchar_t*,wchar_t**); double __cdecl wcstod(const wchar_t*,wchar_t**); __msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); size_t __cdecl wcstombs(char*,const wchar_t*,size_t); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 7f5428f..a679724 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -398,6 +398,7 @@ __msvcrt_long __cdecl _wtol(const wchar_t*); size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); int __cdecl mbtowc(wchar_t*,const char*,size_t); +float __cdecl wcstof(const wchar_t*,wchar_t**); double __cdecl wcstod(const wchar_t*,wchar_t**); __msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); size_t __cdecl wcstombs(char*,const wchar_t*,size_t);

1 0

Francois Gouget : msi/tests: Add trailing '\n's to ok() calls.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 4d1c3a022bcf28d46aa38cec458ac701b3cc615f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d1c3a022bcf28d46aa38cec… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 30 04:32:11 2018 +0200 msi/tests: Add trailing '\n's to ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index e2328ab..477ab0a 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9719,8 +9719,8 @@ static void test_primary_keys(void) r = MsiRecordGetFieldCount(keys); ok(r == 1, "got %d\n", r); - ok(check_record(keys, 0, "T"), "expected 'T'"); - ok(check_record(keys, 1, "A"), "expected 'A'"); + ok(check_record(keys, 0, "T"), "expected 'T'\n"); + ok(check_record(keys, 1, "A"), "expected 'A'\n"); MsiCloseHandle(keys); @@ -9732,9 +9732,9 @@ static void test_primary_keys(void) r = MsiRecordGetFieldCount(keys); ok(r == 2, "got %d\n", r); - ok(check_record(keys, 0, "U"), "expected 'U'"); - ok(check_record(keys, 1, "B"), "expected 'B'"); - ok(check_record(keys, 2, "C"), "expected 'C'"); + ok(check_record(keys, 0, "U"), "expected 'U'\n"); + ok(check_record(keys, 1, "B"), "expected 'B'\n"); + ok(check_record(keys, 2, "C"), "expected 'C'\n"); MsiCloseHandle(keys); MsiCloseHandle(hdb);

1 0

Zebediah Figura : msi: Execute the custom action server with the correct bitness.
by Alexandre Julliard 01 May '18

01 May '18

Module: wine Branch: master Commit: 6049b0f8c3637b6ef55b05a57893191ab808c69f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6049b0f8c3637b6ef55b05a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 30 13:36:50 2018 -0500 msi: Execute the custom action server with the correct bitness. The bitness depends solely on the bitness of the DLL (tested manually). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 72c3efd..e0781fc 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -579,11 +579,17 @@ UINT __wine_msi_call_dll_function(const GUID *guid) static DWORD WINAPI DllThread( LPVOID arg ) { - WCHAR buffer[64] = {'m','s','i','e','x','e','c','.','e','x','e',' ','-','E','m','b','e','d','d','i','n','g',' ',0}; + static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c','.','e','x','e',0}; + static const WCHAR argsW[] = {' ','-','E','m','b','e','d','d','i','n','g',' ',0}; + msi_custom_action_info *info; PROCESS_INFORMATION pi = {0}; STARTUPINFOW si = {0}; + WCHAR buffer[MAX_PATH], cmdline[MAX_PATH + 60]; RPC_STATUS status; GUID *guid = arg; + void *cookie; + BOOL wow64; + DWORD arch; DWORD rc; TRACE("custom action (%x) started\n", GetCurrentThreadId() ); @@ -605,8 +611,27 @@ static DWORD WINAPI DllThread( LPVOID arg ) return status; } - StringFromGUID2(guid, buffer + strlenW(buffer), 39); - CreateProcessW(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + info = find_action_by_guid(guid); + GetBinaryTypeW(info->source, &arch); + + if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) + GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); + else + GetSystemDirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); + strcatW(buffer, msiexecW); + strcpyW(cmdline, buffer); + strcatW(cmdline, argsW); + StringFromGUID2(guid, cmdline + strlenW(cmdline), 39); + + if (IsWow64Process(GetCurrentProcess(), &wow64) && wow64 && arch == SCS_64BIT_BINARY) + { + Wow64DisableWow64FsRedirection(&cookie); + CreateProcessW(buffer, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + Wow64RevertWow64FsRedirection(cookie); + } + else + CreateProcessW(buffer, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + WaitForSingleObject(pi.hProcess, INFINITE); GetExitCodeProcess(pi.hProcess, &rc); CloseHandle(pi.hProcess);

1 0