November 2018 - Wine-Commits

Gabriel Ivăncescu : comctl32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: 1b17d8c09a2c6e3827951a4c8d88e8f52e9f8975 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b17d8c09a2c6e3827951a4c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:18 2018 +0200 comctl32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 +- dlls/comctl32/tests/listbox.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index aa42c3a..03afc5e 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2630,7 +2630,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - return descr->items[wParam].data; + return (descr->style & LBS_NODATA) ? 0 : descr->items[wParam].data; case LB_SETITEMDATA: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 8620ca3..e507688 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2305,7 +2305,6 @@ static void test_LBS_NODATA(void) ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n"); ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0); - todo_wine ok(ret == 0, "Unexpected return value %d.\n", ret); }

1 0

Andrey Gusev : pdh: Add PdhVbAddCounter stub.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: fe8ed8af8dcb6210ea9a98cc54de604c1af898a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe8ed8af8dcb6210ea9a98cc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Nov 13 18:41:49 2018 +0200 pdh: Add PdhVbAddCounter stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44109 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 72e6fa3..5f61a8a 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -141,7 +141,7 @@ @ stdcall PdhValidatePathExA(ptr str) @ stdcall PdhValidatePathExW(ptr wstr) @ stdcall PdhValidatePathW(wstr) -@ stub PdhVbAddCounter +@ stdcall PdhVbAddCounter(ptr str ptr) @ stub PdhVbCreateCounterPathList @ stub PdhVbGetCounterPathElements @ stub PdhVbGetCounterPathFromList diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index b648d8b..bc3674a 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1084,6 +1084,18 @@ PDH_STATUS WINAPI PdhValidatePathW( LPCWSTR path ) } /*********************************************************************** + * PdhVbAddCounter (PDH.@) + */ +PDH_STATUS WINAPI PdhVbAddCounter( PDH_HQUERY query, LPCSTR path, PDH_HCOUNTER *counter ) +{ + FIXME("%p, %s, %p: stub!\n", query, debugstr_a(path), counter); + + if (!path) return PDH_INVALID_ARGUMENT; + + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** * PdhValidatePathExA (PDH.@) */ PDH_STATUS WINAPI PdhValidatePathExA( PDH_HLOG source, LPCSTR path )

1 0

Michael Stefaniuc : imaadp32.acm: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: 4efdb2604411ab35c799a8d94c0a79faae605d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4efdb2604411ab35c799a8d9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 13 20:33:42 2018 +0100 imaadp32.acm: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 9518adc..a93b5f6 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -530,13 +530,13 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "Microsoft IMA ADPCM", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); + add->szShortName, ARRAY_SIZE(add->szShortName) ); MultiByteToWideChar( CP_ACP, 0, "Microsoft IMA ADPCM CODEC", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); + add->szLongName, ARRAY_SIZE(add->szLongName) ); MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); + add->szCopyright, ARRAY_SIZE(add->szCopyright) ); MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + add->szLicensing, ARRAY_SIZE(add->szLicensing) ); add->szFeatures[0] = 0; return MMSYSERR_NOERROR;

1 0

Michael Stefaniuc : d3dx9: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: wine Branch: master Commit: df722d262837e612baecf87385cceb1907101047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df722d262837e612baecf873… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 13 20:33:39 2018 +0100 d3dx9: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 5522dea..418a3be 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -105,7 +105,7 @@ static HRESULT WINAPI ID3DXFontImpl_GetDescA(ID3DXFont *iface, D3DXFONT_DESCA *d if( !desc ) return D3DERR_INVALIDCALL; memcpy(desc, &This->desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); - WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, sizeof(desc->FaceName) / sizeof(CHAR), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, ARRAY_SIZE(desc->FaceName), NULL, NULL); return D3D_OK; } @@ -284,8 +284,7 @@ HRESULT WINAPI D3DXCreateFontIndirectA(IDirect3DDevice9 *device, const D3DXFONT_ /* Copy everything but the last structure member. This requires the two D3DXFONT_DESC structures to be equal until the FaceName member */ memcpy(&widedesc, desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); - MultiByteToWideChar(CP_ACP, 0, desc->FaceName, -1, - widedesc.FaceName, sizeof(widedesc.FaceName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, desc->FaceName, -1, widedesc.FaceName, ARRAY_SIZE(widedesc.FaceName)); return D3DXCreateFontIndirectW(device, &widedesc, font); }

1 0

Francois Gouget : testbot: Allow more than one test environment per Wine build.
by Alexandre Julliard Nov. 14, 2018

Nov. 14, 2018

Module: tools Branch: master Commit: 8143d8386a986bd2f07a555d4f0507819f5e92a3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8143d8386a986bd2f07a555… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 14 02:51:45 2018 +0100 testbot: Allow more than one test environment per Wine build. This implies not assuming that the mission's build uniquely identifies the testing environment. Let GetMissionBaseName() deal with coming up with a suitable identifier for the wineprefix and test reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunWineTest.pl | 12 ++++++------ testbot/bin/build/WineReconfig.pl | 9 +++++---- testbot/bin/build/WineTest.pl | 38 ++++++++++++++++++------------------- testbot/lib/Build/Utils.pm | 24 +++++++++++++---------- testbot/lib/WineTestBot/Missions.pm | 8 +++++++- 5 files changed, 51 insertions(+), 40 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 3784ef0..592162a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -290,10 +290,10 @@ sub WrapUpAndExit($;$$$) if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { - foreach my $Build (keys %{$TaskMissions->{Builds}}) + foreach my $Mission (@{$TaskMissions->{Missions}}) { # Keep the old report if the new one is missing - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; if (-f "$TaskDir/$RptFileName" and !-z "$TaskDir/$RptFileName") { # Update the VM's reference WineTest results for WineSendLog.pl @@ -549,9 +549,9 @@ elsif (!defined $TAError) # Grab the test reports if any # -foreach my $Build (keys %{$TaskMissions->{Builds}}) +foreach my $Mission (@{$TaskMissions->{Missions}}) { - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; Debug(Elapsed($Start), " Retrieving '$RptFileName'\n"); if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { @@ -606,9 +606,9 @@ if ($NewStatus eq 'completed') { my $LatestDir = "$DataDir/latest"; my $StepDir = $Step->GetDir(); - foreach my $Build (keys %{$TaskMissions->{Builds}}) + foreach my $Mission (@{$TaskMissions->{Missions}}) { - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; my $RefReport = $Task->VM->Name ."_$RptFileName"; for my $Suffix ("", ".err") { diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 898f72c..cc25da0 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -103,17 +103,18 @@ sub UpdateWinePrefixes($) # Set up brand new WinePrefixes ready for use for testing. # This way we do it once instead of doing it for every test, thus saving - # time. Note that this requires using a different wineprefix for each build. + # time. Note that this requires using a different wineprefix for each + # mission. foreach my $Mission (@{$TaskMissions->{Missions}}) { next if ($Mission->{test} eq "build"); - SetupWineEnvironment($Mission->{Build}); - InfoMsg "\nRecreating the $Mission->{Build} wineprefix\n"; + my $BaseName = SetupWineEnvironment($Mission); + InfoMsg "\nRecreating the $BaseName wineprefix\n"; # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. - my $ErrMessage = CreateWinePrefix($Mission->{Build}, "wait"); + my $ErrMessage = CreateWinePrefix($Mission, "wait"); if (defined $ErrMessage) { LogMsg "$ErrMessage\n"; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 6891faa..1f083c2 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -84,34 +84,34 @@ sub SetupTest($$) LogMsg "tests\n" if (!$InTests); $InTests = 1; - InfoMsg "\nRunning $Test in the $Mission->{Build} Wine\n"; - SetupWineEnvironment($Mission->{Build}); + my $BaseName = SetupWineEnvironment($Mission); + InfoMsg "\nRunning $Test in the $BaseName Wine\n"; + return $BaseName; } sub DailyWineTest($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; - SetupTest("WineTest", $Mission); + my $BaseName = SetupTest("WineTest", $Mission); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - my $Tag = SanitizeTag("$BaseTag-$Mission->{Build}"); - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -o '../$Mission->{Build}.report' -t $Tag ". - ShArgv2Cmd(@$Args)); - if (!-f "$Mission->{Build}.report") + my $Tag = SanitizeTag("$BaseTag-$BaseName"); + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -o '../$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); + if (!-f "$BaseName.report") { - LogMsg "WineTest did not produce a report file\n"; + LogMsg "WineTest did not produce the $BaseName report\n"; return 0; } # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -s '../$Mission->{Build}.report'")) + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -s '../$BaseName.report'")) { - LogMsg "WineTest failed to send the $Mission->{Build} report\n"; + LogMsg "WineTest failed to send the $BaseName report\n"; # Soldier on in case it's just a network issue } @@ -153,26 +153,26 @@ sub TestPatch($$) return 1 if (!@TestList); } - SetupTest("the tests", $Mission); + my $BaseName = SetupTest("the tests", $Mission); if (!-d $ENV{WINEPREFIX}) { # FIXME Wait for the wineserver as a workaround for bug 41713. my $ErrMessage = CreateWinePrefix($Mission, "wait"); if (defined $ErrMessage) { - LogMsg "Could not create the $Mission->{Build} wineprefix: $ErrMessage\n"; + LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; return 0; } } # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -o '../$Mission->{Build}.report' -t test-$Mission->{Build} ". + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -o '../$BaseName.report' -t do.not.submit ". join(" ", @TestList)); - if (!-f "$Mission->{Build}.report") + if (!-f "$BaseName.report") { - LogMsg "WineTest did not produce a report file\n"; + LogMsg "WineTest did not produce the $BaseName report\n"; return 0; } @@ -365,7 +365,7 @@ if ($DataDir =~ /'/) # # Clean up old reports -map { unlink("$_.report") } keys %{$TaskMissions->{Builds}}; +unlink map { GetMissionBaseName($_) .".report" } @{$TaskMissions->{Missions}}; my $Impacts; if ($Action eq "testpatch") diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index aa5c205..06fb3d8 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -36,6 +36,7 @@ use Digest::SHA; use File::Path; use WineTestBot::Config; +use WineTestBot::Missions; use WineTestBot::PatchUtils; use WineTestBot::Utils; @@ -327,19 +328,22 @@ sub UpdateAddOns() sub SetupWineEnvironment($) { - my ($Build) = @_; + my ($Mission) = @_; - $ENV{WINEPREFIX} = "$DataDir/wineprefix-$Build"; + my $BaseName = GetMissionBaseName($Mission); + $ENV{WINEPREFIX} = "$DataDir/wineprefix-$BaseName"; $ENV{DISPLAY} ||= ":0.0"; + + return $BaseName; } sub RunWine($$$) { - my ($Build, $Cmd, $CmdArgs) = @_; + my ($Mission, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/wine-$Build' && file $Cmd`; + my $Magic = `cd '$DataDir/wine-$Mission->{Build}' && file $Cmd`; my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/wine-$Build' && set -x && ". + return system("cd '$DataDir/wine-$Mission->{Build}' && set -x && ". "time $Wine $Cmd $CmdArgs"); } @@ -348,24 +352,24 @@ sub RunWine($$$) # WinePrefix helpers # -sub CreateWinePrefix($$) +sub CreateWinePrefix($;$) { - my ($Build, $Wait) = @_; + my ($Mission, $Wait) = @_; return "\$WINEPREFIX is not set!" if (!$ENV{WINEPREFIX}); rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Build, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + if (RunWine($Mission, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) { - return "Failed to disable the $Build build crash dialogs: $!"; + return "Failed to disable the crash dialogs: $!"; } if ($Wait) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/wine-$Build' && ./server/wineserver -w"); + system("cd '$DataDir/wine-$Mission->{Build}' && ./server/wineserver -w"); } return undef; diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 80c1d97..0dc812d 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -26,7 +26,7 @@ WineTestBot::Missions - Missions parser and helper functions =cut use Exporter 'import'; -our @EXPORT = qw(DumpMissions ParseMissionStatement +our @EXPORT = qw(DumpMissions GetMissionBaseName ParseMissionStatement MergeMissionStatementTasks SplitMissionStatementTasks); @@ -86,6 +86,12 @@ sub ParseMissionStatement($) return (undef, \@Missions); } +sub GetMissionBaseName($) +{ + my ($Mission) = @_; + return $Mission->{Build}; +} + sub MergeMissionStatementTasks($) { my ($MissionStatement) = @_;

1 0

Gabriel Ivăncescu : comctl32/listbox: Disable LBS_NODATA if styles are incompatible with it.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: 8e13120c80697d14d3363c2acc6742ebaaa1259d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e13120c80697d14d3363c2a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 13 12:35:57 2018 +0200 comctl32/listbox: Disable LBS_NODATA if styles are incompatible with it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index d0e8e60..3d8804a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2516,6 +2516,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) if (descr->style & LBS_EXTENDEDSEL) descr->style |= LBS_MULTIPLESEL; if (descr->style & LBS_MULTICOLUMN) descr->style &= ~LBS_OWNERDRAWVARIABLE; if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT; + if ((descr->style & (LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_SORT)) != LBS_OWNERDRAWFIXED) + descr->style &= ~LBS_NODATA; descr->item_height = LISTBOX_SetFont( descr, 0 ); if (descr->style & LBS_OWNERDRAWFIXED)

1 0

André Hentschel : winedump: Add IMAGE_DEBUG_TYPE_REPRO.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: 9b94d0fda0ec10eda1865902d000ca155de5ddc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b94d0fda0ec10eda1865902… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 13 12:29:43 2018 +0100 winedump: Add IMAGE_DEBUG_TYPE_REPRO. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 1 + tools/winedump/pe.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 6b5b660..035d5bd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3739,6 +3739,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY { #define IMAGE_DEBUG_TYPE_POGO 13 #define IMAGE_DEBUG_TYPE_ILTCG 14 #define IMAGE_DEBUG_TYPE_MPX 15 +#define IMAGE_DEBUG_TYPE_REPRO 16 typedef enum ReplacesCorHdrNumericDefines { diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index ca41bb7..f8689f7 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1382,6 +1382,7 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) case IMAGE_DEBUG_TYPE_POGO: str = "POGO"; break; case IMAGE_DEBUG_TYPE_ILTCG: str = "ILTCG"; break; case IMAGE_DEBUG_TYPE_MPX: str = "MPX"; break; + case IMAGE_DEBUG_TYPE_REPRO: str = "REPRO"; break; } printf(" Type: %u (%s)\n", idd->Type, str); printf(" SizeOfData: %u\n", idd->SizeOfData);

1 0

Henri Verbeet : d3d8: Do not add map access indiscriminately in cubetexture_init().
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: 66952c922c0480371e7ef652bd39fc16757970ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=66952c922c0480371e7ef652… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 16:58:14 2018 +0330 d3d8: Do not add map access indiscriminately in cubetexture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 0b86ed9..ec5ae03 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1155,8 +1155,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = edge_length; desc.height = edge_length; desc.depth = 1;

1 0

Michael Stefaniuc : iccvid: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: ea7dd3f94252039b4ec85fe2d5d638c4a501ea73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea7dd3f94252039b4ec85fe2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 13 20:33:41 2018 +0100 iccvid: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iccvid/iccvid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 89d282b..78c53b3 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -953,8 +953,8 @@ static LRESULT ICCVID_GetInfo( ICCVID_Info *info, ICINFO *icinfo, DWORD dwSize ) icinfo->dwVersion = ICVERSION; icinfo->dwVersionICM = ICVERSION; - LoadStringW(ICCVID_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR)); - LoadStringW(ICCVID_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR)); + LoadStringW(ICCVID_hModule, IDS_NAME, icinfo->szName, ARRAY_SIZE(icinfo->szName)); + LoadStringW(ICCVID_hModule, IDS_DESCRIPTION, icinfo->szDescription, ARRAY_SIZE(icinfo->szDescription)); /* msvfw32 will fill icinfo->szDriver for us */ return sizeof(ICINFO);

1 0

Jacek Caban : ieframe/tests: Fix todo_wine for tests that work now.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: bed6f9a9c7b71bc3421a00972ed96b1bfad90296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bed6f9a9c7b71bc3421a0097… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 13 15:05:13 2018 +0100 ieframe/tests: Fix todo_wine for tests that work now. Those were fixed by typelib marshaling rewrite. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/ie.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 37845dc..cb901d7 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -261,9 +261,6 @@ static void test_InternetExplorer(void) return; hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); -#ifndef __i386__ -todo_wine -#endif ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); if (hres != S_OK) { IUnknown_Release(unk);

1 0