wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Francois Gouget : testbot/Engine: Only reschedule once in HandleWinePatchWebSubmission().
by Alexandre Julliard 07 May '18

07 May '18

Module: tools Branch: master Commit: 53f26742a6b329f402bcbe8e7782e7a8e32a3a4b URL: https://source.winehq.org/git/tools.git/?a=commit;h=53f26742a6b329f402bcbe8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 7 01:57:46 2018 +0200 testbot/Engine: Only reschedule once in HandleWinePatchWebSubmission(). There is no need to reschedule after handling each patch in the staging directory. The scheduler will handle them all at once. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 64359ae..1775782 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -516,6 +516,7 @@ sub HandleWinePatchWebSubmission() # Add the patches in increasing WebPatchId order so that next time # $LatestWebPatchId still makes sense in case something goes wrong now + my $NewPatch; foreach my $WebPatchId (sort { $a <=> $b } @WebPatchIds) { # Create a working dir @@ -526,9 +527,14 @@ sub HandleWinePatchWebSubmission() $Parser->output_dir($WorkDir); my $Entity = $Parser->parse_open("$DataDir/webpatches/$WebPatchId"); my $ErrMessage = $Patches->NewPatch($Entity, $WebPatchId); - push @ErrMessages, $ErrMessage if (defined $ErrMessage); - - ScheduleJobs(); + if (defined $ErrMessage) + { + push @ErrMessages, $ErrMessage; + } + else + { + $NewPatch = 1; + } # Clean up if (!rmtree($WorkDir)) @@ -537,6 +543,7 @@ sub HandleWinePatchWebSubmission() LogMsg "Unable to delete '$WorkDir': $!\n"; } } + ScheduleJobs() if ($NewPatch); return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; }

1 0

Francois Gouget : testbot/Engine: Only reschedule once in HandleWinePatchMLSubmission().
by Alexandre Julliard 07 May '18

07 May '18

Module: tools Branch: master Commit: 426215c272755d6cf213fcf1b51a36b99f7859f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=426215c272755d6cf213fcf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 7 01:57:41 2018 +0200 testbot/Engine: Only reschedule once in HandleWinePatchMLSubmission(). There is no need to reschedule after handling each patch in the staging directory. The scheduler will handle them all at once. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index b61db88..64359ae 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -431,7 +431,7 @@ sub HandleWinePatchMLSubmission() my @Entries = readdir($dh); closedir($dh); - my @ErrMessages; + my ($NewPatch, @ErrMessages); foreach my $Entry (@Entries) { # Validate file name @@ -446,9 +446,14 @@ sub HandleWinePatchMLSubmission() $Parser->output_dir($WorkDir); my $Entity = $Parser->parse_open($FullMessageFileName); my $ErrMessage = CreatePatches()->NewPatch($Entity); - push @ErrMessages, $ErrMessage if (defined $ErrMessage); - - ScheduleJobs(); + if (defined $ErrMessage) + { + push @ErrMessages, $ErrMessage; + } + else + { + $NewPatch = 1; + } # Clean up if (!rmtree($WorkDir)) @@ -463,6 +468,7 @@ sub HandleWinePatchMLSubmission() LogMsg "Unable to delete '$FullMessageFileName': $!\n"; } } + ScheduleJobs() if ($NewPatch); return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; }

1 0

Francois Gouget : testbot: Scheduling jobs is the Engine's responsibility.
by Alexandre Julliard 07 May '18

07 May '18

Module: tools Branch: master Commit: 54621055ec0ceb7a11b227e08c2905ad3ad1b740 URL: https://source.winehq.org/git/tools.git/?a=commit;h=54621055ec0ceb7a11b227e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 7 01:57:36 2018 +0200 testbot: Scheduling jobs is the Engine's responsibility. It already does not make sense to call ScheduleJobs() in other processes. So only call it from Engine.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 6 +++++- testbot/lib/WineTestBot/Patches.pm | 7 ++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 3d1f2c1..b61db88 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -448,6 +448,8 @@ sub HandleWinePatchMLSubmission() my $ErrMessage = CreatePatches()->NewPatch($Entity); push @ErrMessages, $ErrMessage if (defined $ErrMessage); + ScheduleJobs(); + # Clean up if (!rmtree($WorkDir)) { @@ -520,6 +522,8 @@ sub HandleWinePatchWebSubmission() my $ErrMessage = $Patches->NewPatch($Entity, $WebPatchId); push @ErrMessages, $ErrMessage if (defined $ErrMessage); + ScheduleJobs(); + # Clean up if (!rmtree($WorkDir)) { @@ -621,7 +625,6 @@ checks whether any pending patchsets are now complete and thus can be scheduled. sub SafetyNet() { CheckJobs(); - ScheduleJobs(); HandleWinePatchWebSubmission(); my $Set = CreatePendingPatchSets(); @@ -630,6 +633,7 @@ sub SafetyNet() { LogMsg "Failed to check completeness of patch series: $ErrMessage\n"; } + ScheduleJobs(); } sub PrepareSocket($) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 5edeab0..26127e9 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -147,8 +147,8 @@ sub GetTestList() Analyzes the current patch to determine which Wine tests are impacted. Then for each impacted test it creates a high priority WineTestBot::Job to run that test. This also creates the WineTestBot::Step objects for that Job, as well as the -WineTestBot::Task objects to run the test on each 'base' VM. Finally it calls -C<WineTestBot::Jobs::ScheduleJobs()> to run the new Jobs. +WineTestBot::Task objects to run the test on each 'base' VM. It is the +responsibility of the caller to arrange for rescheduling of the jobs. Note that the path to the file containing the actual patch is passed as a parameter. This is used to apply a combined patch for patch series. See @@ -341,9 +341,6 @@ sub Submit($$$) $Disposition .= $NewJob->Id; } $self->Disposition($Disposition); - - ScheduleJobs(); - return undef; }

1 0

Zebediah Figura : testbot: Only strip '.exe' from a test executable if it' s a program.
by Alexandre Julliard 07 May '18

07 May '18

Module: tools Branch: master Commit: d5ba29fd52d8dfbef0fb8ca27152cc97c893abcf URL: https://source.winehq.org/git/tools.git/?a=commit;h=d5ba29fd52d8dfbef0fb8ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 5 02:00:28 2018 +0200 testbot: Only strip '.exe' from a test executable if it's a program. Otherwise we try to build dlls/ntoskrnl/Makefile etc. and fail. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 90c261b..3a52dbd 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -332,7 +332,10 @@ foreach my $OtherStep (@{$Job->Steps->GetItems()}) if ($OtherFileName =~ m/^([\w_.]+)_test(?:64)?\.exe$/) { my $OtherBaseName = $1; - $OtherBaseName =~ s/\.exe$//; + if ($Step->FileType eq "patchprograms") + { + $OtherBaseName =~ s/\.exe$//; + } if (defined $BaseName and $BaseName ne $OtherBaseName) { FatalError("$OtherBaseName doesn't match previously found $BaseName\n");

1 0

Kyle Auble : Delete old distro icons & screenshots
by Jeremy Newman 07 May '18

07 May '18

Module: website Branch: master Commit: 458b852f3539940178352fc15b0239dfc5329410 URL: https://source.winehq.org/git/website.git/?a=commit;h=458b852f3539940178352… Author: Kyle Auble <kyle.auble(a)zoho.com> Date: Fri May 4 18:41:43 2018 -0400 Delete old distro icons & screenshots It seems the only files here still in use are already on the wiki. We should probably move over to SVGs for the icons anyways. Signed-off-by: Kyle Auble <kyle.auble(a)zoho.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- images/distro/crossover.png | Bin 2501 -> 0 bytes images/distro/crossover_swoosh.png | Bin 23210 -> 0 bytes images/distro/de_ubuntu-ppa.png | Bin 80414 -> 0 bytes images/distro/debian.png | Bin 1253 -> 0 bytes images/distro/fr_ubuntu-ppa.png | Bin 44730 -> 0 bytes images/distro/freebsd.png | Bin 2091 -> 0 bytes images/distro/redhat.png | Bin 2634 -> 0 bytes images/distro/slackware.png | Bin 2771 -> 0 bytes images/distro/sun.png | Bin 1547 -> 0 bytes images/distro/suse.png | Bin 882 -> 0 bytes images/distro/transgaming.png | Bin 2015 -> 0 bytes images/distro/ubuntu-ppa.png | Bin 58532 -> 0 bytes images/distro/ubuntu-softwaresources1.png | Bin 48850 -> 0 bytes images/distro/ubuntu-softwaresources2.png | Bin 36288 -> 0 bytes images/distro/ubuntu.png | Bin 2037 -> 0 bytes images/distro/windows.png | Bin 1590 -> 0 bytes images/distro/winetools.png | Bin 2226 -> 0 bytes 17 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/distro/crossover.png b/images/distro/crossover.png deleted file mode 100644 index f2b1543..0000000 Binary files a/images/distro/crossover.png and /dev/null differ diff --git a/images/distro/crossover_swoosh.png b/images/distro/crossover_swoosh.png deleted file mode 100644 index 5d03e09..0000000 Binary files a/images/distro/crossover_swoosh.png and /dev/null differ diff --git a/images/distro/de_ubuntu-ppa.png b/images/distro/de_ubuntu-ppa.png deleted file mode 100644 index 7a55111..0000000 Binary files a/images/distro/de_ubuntu-ppa.png and /dev/null differ diff --git a/images/distro/debian.png b/images/distro/debian.png deleted file mode 100644 index 65fba63..0000000 Binary files a/images/distro/debian.png and /dev/null differ diff --git a/images/distro/fr_ubuntu-ppa.png b/images/distro/fr_ubuntu-ppa.png deleted file mode 100644 index 8aed5e5..0000000 Binary files a/images/distro/fr_ubuntu-ppa.png and /dev/null differ diff --git a/images/distro/freebsd.png b/images/distro/freebsd.png deleted file mode 100644 index 3614407..0000000 Binary files a/images/distro/freebsd.png and /dev/null differ diff --git a/images/distro/redhat.png b/images/distro/redhat.png deleted file mode 100644 index d026186..0000000 Binary files a/images/distro/redhat.png and /dev/null differ diff --git a/images/distro/slackware.png b/images/distro/slackware.png deleted file mode 100644 index 4dfd9f9..0000000 Binary files a/images/distro/slackware.png and /dev/null differ diff --git a/images/distro/sun.png b/images/distro/sun.png deleted file mode 100644 index 88c1107..0000000 Binary files a/images/distro/sun.png and /dev/null differ diff --git a/images/distro/suse.png b/images/distro/suse.png deleted file mode 100644 index 6d7c630..0000000 Binary files a/images/distro/suse.png and /dev/null differ diff --git a/images/distro/transgaming.png b/images/distro/transgaming.png deleted file mode 100644 index 6261284..0000000 Binary files a/images/distro/transgaming.png and /dev/null differ diff --git a/images/distro/ubuntu-ppa.png b/images/distro/ubuntu-ppa.png deleted file mode 100644 index d839cfc..0000000 Binary files a/images/distro/ubuntu-ppa.png and /dev/null differ diff --git a/images/distro/ubuntu-softwaresources1.png b/images/distro/ubuntu-softwaresources1.png deleted file mode 100644 index f64f15f..0000000 Binary files a/images/distro/ubuntu-softwaresources1.png and /dev/null differ diff --git a/images/distro/ubuntu-softwaresources2.png b/images/distro/ubuntu-softwaresources2.png deleted file mode 100644 index a4bdb12..0000000 Binary files a/images/distro/ubuntu-softwaresources2.png and /dev/null differ diff --git a/images/distro/ubuntu.png b/images/distro/ubuntu.png deleted file mode 100644 index 08c88e9..0000000 Binary files a/images/distro/ubuntu.png and /dev/null differ diff --git a/images/distro/windows.png b/images/distro/windows.png deleted file mode 100644 index c623437..0000000 Binary files a/images/distro/windows.png and /dev/null differ diff --git a/images/distro/winetools.png b/images/distro/winetools.png deleted file mode 100644 index f3e104e..0000000 Binary files a/images/distro/winetools.png and /dev/null differ

1 0

Kyle Auble : Keep all event and wineconf photos on wiki
by Jeremy Newman 07 May '18

07 May '18

Module: website Branch: master Commit: 6a4b94365dc077caa63ad3d4b1f2e9a7c8124495 URL: https://source.winehq.org/git/website.git/?a=commit;h=6a4b94365dc077caa63ad… Author: Kyle Auble <kyle.auble(a)zoho.com> Date: Fri May 4 18:47:04 2018 -0400 Keep all event and wineconf photos on wiki Signed-off-by: Kyle Auble <kyle.auble(a)zoho.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- images/misc/WineAward_2008.png | Bin 336388 -> 0 bytes images/misc/WineAward_2008_sm.png | Bin 19124 -> 0 bytes images/wineconf/wineconf_logo.jpg | Bin 6076 -> 0 bytes images/wineconf05_fei.jpg | Bin 149591 -> 0 bytes images/wineconf05_fei_thmb.jpg | Bin 21892 -> 0 bytes images/wineconf05_grp.jpg | Bin 1258517 -> 0 bytes images/wineconf05_grp_thmb.jpg | Bin 24928 -> 0 bytes images/wineconf06_grp.jpg | Bin 1030627 -> 0 bytes images/wineconf06_grp_thmb.jpg | Bin 18105 -> 0 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/misc/WineAward_2008.png b/images/misc/WineAward_2008.png deleted file mode 100644 index 69921a5..0000000 Binary files a/images/misc/WineAward_2008.png and /dev/null differ diff --git a/images/misc/WineAward_2008_sm.png b/images/misc/WineAward_2008_sm.png deleted file mode 100644 index 2748c76..0000000 Binary files a/images/misc/WineAward_2008_sm.png and /dev/null differ diff --git a/images/wineconf/wineconf_logo.jpg b/images/wineconf/wineconf_logo.jpg deleted file mode 100644 index 8b0e51d..0000000 Binary files a/images/wineconf/wineconf_logo.jpg and /dev/null differ diff --git a/images/wineconf05_fei.jpg b/images/wineconf05_fei.jpg deleted file mode 100644 index 32dfe2a..0000000 Binary files a/images/wineconf05_fei.jpg and /dev/null differ diff --git a/images/wineconf05_fei_thmb.jpg b/images/wineconf05_fei_thmb.jpg deleted file mode 100644 index 86d9eb6..0000000 Binary files a/images/wineconf05_fei_thmb.jpg and /dev/null differ diff --git a/images/wineconf05_grp.jpg b/images/wineconf05_grp.jpg deleted file mode 100644 index 7207ce2..0000000 Binary files a/images/wineconf05_grp.jpg and /dev/null differ diff --git a/images/wineconf05_grp_thmb.jpg b/images/wineconf05_grp_thmb.jpg deleted file mode 100644 index f7b4bdd..0000000 Binary files a/images/wineconf05_grp_thmb.jpg and /dev/null differ diff --git a/images/wineconf06_grp.jpg b/images/wineconf06_grp.jpg deleted file mode 100644 index 8637c5a..0000000 Binary files a/images/wineconf06_grp.jpg and /dev/null differ diff --git a/images/wineconf06_grp_thmb.jpg b/images/wineconf06_grp_thmb.jpg deleted file mode 100644 index e04014b..0000000 Binary files a/images/wineconf06_grp_thmb.jpg and /dev/null differ

1 0

Zebediah Figura : msi: Disable WoW redirection when installing a 64-bit package.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: 540c48b91175b11c7b8646d0a036b20c46425080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=540c48b91175b11c7b8646d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 4 00:17:39 2018 -0500 msi: Disable WoW redirection when installing a 64-bit package. 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/action.c | 8 ++++ dlls/msi/tests/install.c | 101 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 104 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 67dfbe4..7197bca 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7855,8 +7855,12 @@ StandardActions[] = static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) { UINT rc = ERROR_FUNCTION_NOT_CALLED; + void *cookie; UINT i; + if (is_wow64 && package->platform == PLATFORM_X64) + Wow64DisableWow64FsRedirection(&cookie); + i = 0; while (StandardActions[i].action != NULL) { @@ -7891,6 +7895,10 @@ static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) } i++; } + + if (is_wow64 && package->platform == PLATFORM_X64) + Wow64RevertWow64FsRedirection(cookie); + return rc; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5c83d30..ac2c837 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -48,6 +48,8 @@ static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static HMODULE hsrclient = 0; static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); @@ -1334,6 +1336,18 @@ static const char da_install_exec_seq_dat[] = "immediate\t\t800\n" "InstallFinalize\t\t1100\n"; +static const CHAR x64_directory_dat[] = + "Directory\tDirectory_Parent\tDefaultDir\n" + "s72\tS72\tl255\n" + "Directory\tDirectory\n" + "CABOUTDIR\tMSITESTDIR\tcabout\n" + "CHANGEDDIR\tMSITESTDIR\tchanged:second\n" + "FIRSTDIR\tMSITESTDIR\tfirst\n" + "MSITESTDIR\tProgramFiles64Folder\tmsitest\n" + "NEWDIR\tCABOUTDIR\tnew\n" + "ProgramFiles64Folder\tTARGETDIR\t.\n" + "TARGETDIR\t\tSourceDir"; + typedef struct _msi_table { const CHAR *filename; @@ -2015,6 +2029,18 @@ static const msi_table da_tables[] = ADD_TABLE(da_custom_action), }; +static const msi_table x64_tables[] = +{ + ADD_TABLE(media), + ADD_TABLE(x64_directory), + ADD_TABLE(file), + ADD_TABLE(component), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(property), + ADD_TABLE(install_exec_seq), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -2145,6 +2171,8 @@ static void init_functionpointers(void) GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) + GET_PROC(hkernel32, Wow64DisableWow64FsRedirection); + GET_PROC(hkernel32, Wow64RevertWow64FsRedirection); hsrclient = LoadLibraryA("srclient.dll"); GET_PROC(hsrclient, SRRemoveRestorePoint); @@ -2330,7 +2358,8 @@ static BOOL get_system_dirs(void) HKEY hkey; DWORD type, size; - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", + 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &hkey)) return FALSE; size = MAX_PATH; @@ -5693,16 +5722,16 @@ static void test_package_validation(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_INSTALL_PACKAGE_INVALID, "Expected ERROR_INSTALL_PACKAGE_INVALID, got %u\n", r); - ok(!delete_pf_native("msitest\\maximus", TRUE), "file exists\n"); - ok(!delete_pf_native("msitest", FALSE), "directory exists\n"); + ok(!delete_pf("msitest\\maximus", TRUE), "file exists\n"); + ok(!delete_pf("msitest", FALSE), "directory exists\n"); DeleteFileA(msifile); create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "x64;0"); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf_native("msitest\\maximus", TRUE), "file exists\n"); - ok(delete_pf_native("msitest", FALSE), "directory exists\n"); + ok(delete_pf("msitest\\maximus", TRUE), "file exists\n"); + ok(delete_pf("msitest", FALSE), "directory exists\n"); } else { @@ -6124,6 +6153,67 @@ error: DeleteFileA(msifile); } +static void test_wow64(void) +{ + void *cookie; + UINT r; + + if (!is_wow64) + { + skip("test must be run on WoW64\n"); + return; + } + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_database_template(msifile, x64_tables, sizeof(x64_tables)/sizeof(msi_table), 200, "x64;0"); + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + + pWow64DisableWow64FsRedirection(&cookie); + + ok(!delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout\\new", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\cabout\\four.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\changed\\three.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\changed", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\first\\two.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\first", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); + ok(!delete_pf("msitest", FALSE), "Directory created\n"); + + ok(delete_pf_native("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest", FALSE), "Directory not created\n"); + + pWow64RevertWow64FsRedirection(cookie); + +error: + delete_test_files(); + DeleteFileA(msifile); +} + START_TEST(install) { DWORD len; @@ -6217,6 +6307,7 @@ START_TEST(install) test_remove_upgrade_code(); test_feature_tree(); test_deferred_action(); + test_wow64(); DeleteFileA(customdll);

1 0

Zebediah Figura : msi: Check return value of GetBinaryType().
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: deb4f970009d6fd85a61d3183877e67e1ccf66fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=deb4f970009d6fd85a61d318… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 4 00:32:57 2018 -0500 msi: Check return value of GetBinaryType(). 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index ca0362b..956b3e9 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -585,6 +585,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) void *cookie; BOOL wow64; DWORD arch; + BOOL ret; DWORD rc; TRACE("custom action (%x) started\n", GetCurrentThreadId() ); @@ -607,9 +608,9 @@ static DWORD WINAPI DllThread( LPVOID arg ) } info = find_action_by_guid(guid); - GetBinaryTypeW(info->source, &arch); + ret = GetBinaryTypeW(info->source, &arch); - if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) + if (sizeof(void *) == 8 && ret && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); else GetSystemDirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR));

1 0

Alex Henrie : include: Add lldiv and lldiv_t.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: b8c27cca3719cff353acc4a52b9e4a9d3d8a4a6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8c27cca3719cff353acc4a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 3 21:44:24 2018 -0600 include: Add lldiv and lldiv_t. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 3c9c4a7..2db48c5 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -60,6 +60,11 @@ typedef struct _ldiv_t { __msvcrt_long rem; } ldiv_t; +typedef struct _lldiv_t { + __int64 quot; + __int64 rem; +} lldiv_t; + #define _countof(x) (sizeof(x)/sizeof((x)[0])) @@ -194,6 +199,7 @@ void* __cdecl calloc(size_t,size_t); div_t __cdecl div(int,int); ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); #endif +lldiv_t __cdecl lldiv(__int64,__int64); void __cdecl exit(int); void __cdecl free(void*); char* __cdecl getenv(const char*);

1 0

Michael Müller : combase: Add stub for CleanupTlsOleState.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: 7bb7bc86d63cbc2ade8e627515422ae19ece6d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb7bc86d63cbc2ade8e6275… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:18 2018 +0000 combase: Add stub for CleanupTlsOleState. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 72a7eb5..c8a8dee 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -66,7 +66,7 @@ @ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID @ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString @ stub CleanupOleStateInAllTls -@ stub CleanupTlsOleState +@ stdcall CleanupTlsOleState(ptr) @ stub ClearCleanupFlag @ stdcall CoAddRefServerProcess() ole32.CoAddRefServerProcess @ stub CoAllowUnmarshalerCLSID diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index ee03bd3..63e218d 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -274,3 +274,11 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF return S_OK; } + +/*********************************************************************** + * CleanupTlsOleState (combase.@) + */ +void WINAPI CleanupTlsOleState(void *unknown) +{ + FIXME("(%p): stub\n", unknown); +}

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018