January 2020 - Wine-Commits

Francois Gouget : testbot/LogUtils: Store the filename in the $LogInfo structures.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: tools Branch: master Commit: 96cd74841084de0c2d23108e897bc76ef8476861 URL: https://source.winehq.org/git/tools.git/?a=commit;h=96cd74841084de0c2d23108… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 28 12:05:35 2020 +0100 testbot/LogUtils: Store the filename in the $LogInfo structures. Also standardize on $LogPath for the full path to log files, and $LogName for their basename, which matches the field names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 55 +++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 9aa2e81..8187826 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -90,16 +90,22 @@ Contains an error message if the task log could not be read. sub ParseTaskLog($) { - my ($FileName) = @_; + my ($LogPath) = @_; + + my $LogName = basename($LogPath); + my $LogInfo = { + LogName => $LogName, + LogPath => $LogPath, + }; my $LogFile; - if (!open($LogFile, "<", $FileName)) + if (!open($LogFile, "<", $LogPath)) { - my $LogName = basename($FileName); - return {BadLog => "Unable to open '$LogName' for reading: $!"}; + $LogInfo->{BadLog} = "Unable to open '$LogName' for reading: $!"; + return $LogInfo; } - my $LogInfo = {Type => "build"}; + $LogInfo->{Type} = "build"; foreach my $Line (<$LogFile>) { chomp $Line; @@ -362,16 +368,12 @@ Contains an error message if the report could not be read. sub ParseWineTestReport($$$) { - my ($FileName, $IsWineTest, $TaskTimedOut) = @_; - - my $LogFile; - if (!open($LogFile, "<", $FileName)) - { - my $LogName = basename($FileName); - return {BadLog => "Unable to open '$LogName' for reading: $!"}; - } + my ($LogPath, $IsWineTest, $TaskTimedOut) = @_; + my $LogName = basename($LogPath); my $LogInfo = { + LogName => $LogName, + LogPath => $LogPath, IsWineTest => $IsWineTest, TaskTimedOut => $TaskTimedOut, @@ -381,6 +383,13 @@ sub ParseWineTestReport($$$) Extra => [], }; + my $LogFile; + if (!open($LogFile, "<", $LogPath)) + { + $LogInfo->{BadLog} = "Unable to open '$LogName' for reading: $!"; + return $LogInfo; + } + my $Cur = _NewCurrentUnit("", ""); foreach my $Line (<$LogFile>) { @@ -757,10 +766,10 @@ An array containing the error messages. sub GetLogErrors($) { - my ($LogFileName) = @_; + my ($LogPath) = @_; my ($IsReport, $GetCategory); - if ($LogFileName =~ /\.report$/) + if ($LogPath =~ /\.report$/) { $IsReport = 1; $GetCategory = \&GetReportLineCategory; @@ -770,12 +779,16 @@ sub GetLogErrors($) $GetCategory = \&GetLogLineCategory; } + my $LogName = basename($LogPath); my $LogInfo = { + LogName => $LogName, + LogPath => $LogPath, + ErrCount => undef, # until we open a log ErrGroupNames => [], ErrGroups => {}, }; - if (open(my $LogFile, "<", $LogFileName)) + if (open(my $LogFile, "<", $LogPath)) { $LogInfo->{ErrCount} ||= 0; my $CurrentModule = ""; @@ -805,14 +818,14 @@ sub GetLogErrors($) } close($LogFile); } - elsif (-f $LogFileName) + elsif (-f $LogPath) { - $LogInfo->{BadLog} = "Could not open '". basename($LogFileName) ."' for reading: $!"; + $LogInfo->{BadLog} = "Could not open '$LogName' for reading: $!"; my $Group = _AddLogGroup($LogInfo, "TestBot errors"); _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); } - if (open(my $LogFile, "<", "$LogFileName.err")) + if (open(my $LogFile, "<", "$LogPath.err")) { $LogInfo->{ErrCount} ||= 0; # Add the related extra errors @@ -831,9 +844,9 @@ sub GetLogErrors($) } close($LogFile); } - elsif (-f "$LogFileName.err") + elsif (-f "$LogPath.err") { - $LogInfo->{BadLog} ||= "Could not open '". basename($LogFileName) .".err' for reading: $!"; + $LogInfo->{BadLog} ||= "Could not open '$LogName.err' for reading: $!"; my $Group = _AddLogGroup($LogInfo, "TestBot errors"); _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); }

1 0

Francois Gouget : testbot/LogUtils: Keep track of the first line of each error group.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: tools Branch: master Commit: b8f646134f2988fa733301ec5882e6970a61a156 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b8f646134f2988fa733301e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 28 12:12:16 2020 +0100 testbot/LogUtils: Keep track of the first line of each error group. This will make it possible to jump to the first line of a test unit that contains failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 75d2833..4d0d99b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -709,16 +709,20 @@ sub _DumpErrors($$) } } -sub _AddLogGroup($$) +sub _AddLogGroup($$;$) { - my ($LogInfo, $GroupName) = @_; + my ($LogInfo, $GroupName, $LineNo) = @_; # In theory the error group names are all unique. But, just in case, make # sure we don't overwrite $LogInfo->{ErrGroups}->{$GroupName}. if (!$LogInfo->{ErrGroups}->{$GroupName}) { push @{$LogInfo->{ErrGroupNames}}, $GroupName; - $LogInfo->{ErrGroups}->{$GroupName} = { LineNos => [], Errors => [] }; + $LogInfo->{ErrGroups}->{$GroupName} = { + LineNo => $LineNo || 0, + LineNos => [], + Errors => [] + }; } return $LogInfo->{ErrGroups}->{$GroupName}; } @@ -758,6 +762,10 @@ A hashtable indexed by the error group name. Each entry contains: =over +=item LineNo +The line number of the start of this error group. Note that this is normally +different from the line of the first error in that group. + =item Errors An array containing the error messages. @@ -798,7 +806,7 @@ sub GetLogErrors($) { $LogInfo->{ErrCount} ||= 0; my $CurrentModule = ""; - my $CurrentGroup; + my ($CurrentGroup, $GroupLineNo); my $LineNo = 0; foreach my $Line (<$LogFile>) { @@ -807,6 +815,7 @@ sub GetLogErrors($) if ($IsReport and $Line =~ /^([_.a-z0-9-]+):[_a-z0-9]* start /) { $CurrentModule = $1; + $GroupLineNo = $LineNo; $CurrentGroup = undef; next; } @@ -820,7 +829,7 @@ sub GetLogErrors($) } if (!$CurrentGroup) { - $CurrentGroup = _AddLogGroup($LogInfo, $CurrentModule); + $CurrentGroup = _AddLogGroup($LogInfo, $CurrentModule, $GroupLineNo || $LineNo); } _AddLogError($LogInfo, $CurrentGroup, $Line, $LineNo); } @@ -848,7 +857,7 @@ sub GetLogErrors($) # Note: $GroupName must not depend on the previous content as this # would break diffs. my $GroupName = $IsReport ? "Report errors" : "Task errors"; - $CurrentGroup = _AddLogGroup($LogInfo, $GroupName); + $CurrentGroup = _AddLogGroup($LogInfo, $GroupName, $LineNo); } _AddLogError($LogInfo, $CurrentGroup, $Line, $LineNo); }

1 0

Julian Rüger : German translation for release 5.0.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: website Branch: master Commit: 53bbbed2a8e32700d914275dadb1fa46e60b705f URL: https://source.winehq.org/git/website.git/?a=commit;h=53bbbed2a8e32700d9142… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jan 24 11:27:24 2020 +0100 German translation for release 5.0. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020012101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2020012101.xml b/news/de/2020012101.xml new file mode 100644 index 00000000..f41b82ae --- /dev/null +++ b/news/de/2020012101.xml @@ -0,0 +1,16 @@ +<news> +<date>21. Januar 2020</date> +<title>Wine 5.0 freigegeben</title> +<body> + Das Wine-Team ist stolz verkünden zu können, dass die stabile Version Wine 5.0 verfügbar ist. + Dieses Release verkörpert den Entwicklungsaufwand eines Jahres und über 7400 individuellen Änderungen. Enthalten sind eine große Zahl an Verbesserungen, welche in den <a href="{$root}/announce/5.0">Release Notes (en)</a> aufgeführt sind. Die Höhepunkte lauten: +<ul> + <li>Eingebaute Module im PE-Format.</li> + <li>Multi-Monitor-Unterstützung.</li> + <li>XAudio2-Reimplementierung.</li> + <li>Unterstützung von Vulkan 1.1.</li> +</ul> + Dieses Release ist dem Gedenken an Józef Kucia gewidmet, der im August 2019 im jungen Alter von 30 Jahren von uns ging. Józef hat maßgeblich zu Wines Direct3D-Implementierung beigetragen und war der leitende Entwickler des vkd3d-Projekts. Seine außerordentlichen Fähigkeiten und seine Liebenswürdigkeit werden von uns allen schmerzlich vermisst. +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Dmitry Timoshkov : gdiplus: GdipCreateBitmapFromHBITMAP should use palette from the GDI bitmap.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 619ef41f3365b90cb14abd9e02f3ffffb157601f URL: https://source.winehq.org/git/wine.git/?a=commit;h=619ef41f3365b90cb14abd9e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 27 12:13:40 2020 +0800 gdiplus: GdipCreateBitmapFromHBITMAP should use palette from the GDI bitmap. This patch fixes painting bitmaps with bpp <= 8. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 354801348e..bfa0c8afa7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5106,6 +5106,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi GpStatus retval; PixelFormat format; BitmapData lockeddata; + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *pbmi = (BITMAPINFO *)bmibuf; TRACE("%p %p %p\n", hbm, hpal, bitmap); @@ -5155,8 +5157,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi if (retval == Ok) { HDC hdc; - char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; - BITMAPINFO *pbmi = (BITMAPINFO *)bmibuf; INT src_height; hdc = CreateCompatibleDC(NULL); @@ -5176,29 +5176,28 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi GdipBitmapUnlockBits(*bitmap, &lockeddata); } - if (retval == Ok && hpal) + /* According to the tests hpal is ignored */ + if (retval == Ok && pbmi->bmiHeader.biBitCount <= 8) { - PALETTEENTRY entry[256]; - ColorPalette *palette=NULL; + ColorPalette *palette; int i, num_palette_entries; - num_palette_entries = GetPaletteEntries(hpal, 0, 256, entry); + num_palette_entries = pbmi->bmiHeader.biClrUsed; if (!num_palette_entries) - retval = GenericError; + num_palette_entries = 1 << pbmi->bmiHeader.biBitCount; palette = heap_alloc_zero(sizeof(ColorPalette) + sizeof(ARGB) * (num_palette_entries-1)); if (!palette) retval = OutOfMemory; - - if (retval == Ok) + else { palette->Flags = 0; palette->Count = num_palette_entries; for (i=0; i<num_palette_entries; i++) { - palette->Entries[i] = 0xff000000 | entry[i].peRed << 16 | - entry[i].peGreen << 8 | entry[i].peBlue; + palette->Entries[i] = 0xff000000 | pbmi->bmiColors[i].rgbRed << 16 | + pbmi->bmiColors[i].rgbGreen << 8 | pbmi->bmiColors[i].rgbBlue; } retval = GdipSetImagePalette(&(*bitmap)->image, palette);

1 0

Roman Pišl : kernelbase: Implement GetThreadIdealProcessorEx stub.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: b53e4667942da95148418574d47b60323bebcd71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b53e4667942da95148418574… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Fri Jan 24 00:10:41 2020 +0100 kernelbase: Implement GetThreadIdealProcessorEx stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48313 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 11 +++++++++++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index e4cfec2b64..c0187f100f 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -28,7 +28,7 @@ @ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW @ stdcall GetThreadContext(long ptr) kernel32.GetThreadContext @ stdcall GetThreadId(ptr) kernel32.GetThreadId -@ stub GetThreadIdealProcessorEx +@ stdcall GetThreadIdealProcessorEx(long ptr) kernel32.GetThreadIdealProcessorEx @ stdcall GetThreadPriority(long) kernel32.GetThreadPriority @ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost @ stdcall GetThreadTimes(long ptr ptr ptr ptr) kernel32.GetThreadTimes diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 45d52ff171..793015cf53 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -31,7 +31,7 @@ @ stdcall GetThreadContext(long ptr) kernel32.GetThreadContext @ stdcall GetThreadIOPendingFlag(long ptr) kernel32.GetThreadIOPendingFlag @ stdcall GetThreadId(ptr) kernel32.GetThreadId -@ stub GetThreadIdealProcessorEx +@ stdcall GetThreadIdealProcessorEx(long ptr) kernel32.GetThreadIdealProcessorEx @ stub GetThreadInformation @ stdcall GetThreadPriority(long) kernel32.GetThreadPriority @ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index be48ef1694..f9295dc3ee 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -853,7 +853,7 @@ @ stdcall -import GetThreadGroupAffinity(long ptr) @ stdcall -import GetThreadIOPendingFlag(long ptr) @ stdcall -import GetThreadId(ptr) -# @ stub GetThreadIdealProcessorEx +@ stdcall -import GetThreadIdealProcessorEx(long ptr) @ stdcall -import GetThreadLocale() @ stdcall GetThreadPreferredUILanguages(long ptr ptr ptr) @ stdcall -import GetThreadPriority(long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f36d4d525c..caa6de1d51 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -716,7 +716,7 @@ @ stdcall GetThreadGroupAffinity(long ptr) @ stdcall GetThreadIOPendingFlag(long ptr) @ stdcall GetThreadId(ptr) -# @ stub GetThreadIdealProcessorEx +@ stdcall GetThreadIdealProcessorEx(long ptr) # @ stub GetThreadInformation @ stdcall GetThreadLocale() @ stdcall GetThreadPreferredUILanguages(long ptr ptr ptr) kernel32.GetThreadPreferredUILanguages diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index f669c9d873..6af9ffa406 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -245,6 +245,17 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetThreadId( HANDLE thread ) } +/*********************************************************************** + * GetThreadIdealProcessorEx (kernelbase.@) + */ +BOOL WINAPI /* DECLSPEC_HOTPATCH */ GetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal ) +{ + FIXME( "(%p %p): stub\n", thread, ideal ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + + /*********************************************************************** * GetThreadLocale (kernelbase.@) */

1 0

Dmitry Timoshkov : gdiplus/tests: Add more tests for GdipCreateBitmapFromHBITMAP and palette images.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: cf6546fb3b914dc1d87b23d6920526b7487cfd6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf6546fb3b914dc1d87b23d6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 27 12:13:54 2020 +0800 gdiplus/tests: Add more tests for GdipCreateBitmapFromHBITMAP and palette images. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 88 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 79 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 62cd79fec6..eeeea8746a 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -866,7 +866,7 @@ static void test_LockBits_UserBuf(void) struct BITMAPINFOWITHBITFIELDS { BITMAPINFOHEADER bmiHeader; - DWORD masks[3]; + DWORD masks[255]; }; union BITMAPINFOUNION @@ -882,7 +882,10 @@ static void test_GdipCreateBitmapFromHBITMAP(void) HPALETTE hpal = NULL; GpStatus stat; BYTE buff[1000]; - LOGPALETTE* LogPal = NULL; + char logpalette_buf[sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * 255]; + LOGPALETTE *LogPal = (LOGPALETTE *)logpalette_buf; + char colorpalette_buf[sizeof(ColorPalette) + sizeof(ARGB) * 255]; + ColorPalette *palette = (ColorPalette *)colorpalette_buf; REAL width, height; const REAL WIDTH1 = 5; const REAL HEIGHT1 = 15; @@ -892,6 +895,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) union BITMAPINFOUNION bmi; BYTE *bits; PixelFormat format; + int i; stat = GdipCreateBitmapFromHBITMAP(NULL, NULL, NULL); expect(InvalidParameter, stat); @@ -905,6 +909,9 @@ static void test_GdipCreateBitmapFromHBITMAP(void) expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); expectf(WIDTH1, width); expectf(HEIGHT1, height); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat1bppIndexed, format); if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); DeleteObject(hbm); @@ -916,6 +923,10 @@ static void test_GdipCreateBitmapFromHBITMAP(void) /* raw format */ expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)gpbm, __LINE__, FALSE); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat1bppIndexed, format); + expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); expectf(WIDTH2, width); expectf(HEIGHT2, height); @@ -943,6 +954,9 @@ static void test_GdipCreateBitmapFromHBITMAP(void) expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); expectf(WIDTH1, width); expectf(HEIGHT1, height); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat24bppRGB, format); if (stat == Ok) { /* test whether writing to the bitmap affects the original */ @@ -954,21 +968,77 @@ static void test_GdipCreateBitmapFromHBITMAP(void) GdipDisposeImage((GpImage*)gpbm); } - LogPal = GdipAlloc(sizeof(LOGPALETTE)); - ok(LogPal != NULL, "unable to allocate LOGPALETTE\n"); LogPal->palVersion = 0x300; - LogPal->palNumEntries = 1; + LogPal->palNumEntries = 8; + for (i = 0; i < 8; i++) + { + LogPal->palPalEntry[i].peRed = i; + LogPal->palPalEntry[i].peGreen = i; + LogPal->palPalEntry[i].peBlue = i; + LogPal->palPalEntry[i].peFlags = 0; + } + hpal = CreatePalette(LogPal); ok(hpal != NULL, "CreatePalette failed\n"); - GdipFree(LogPal); stat = GdipCreateBitmapFromHBITMAP(hbm, hpal, &gpbm); expect(Ok, stat); + stat = GdipGetImagePalette((GpImage *)gpbm, palette, sizeof(colorpalette_buf)); + expect(Ok, stat); + expect(0, palette->Count); + GdipDisposeImage((GpImage*)gpbm); + DeleteObject(hbm); - if (stat == Ok) - GdipDisposeImage((GpImage*)gpbm); + for (i = 0; i < 16; i++) + { + RGBQUAD *colors = bmi.bi.bmiColors; + BYTE clr = 255 - i; + colors[i].rgbBlue = clr; + colors[i].rgbGreen = clr; + colors[i].rgbRed = clr; + colors[i].rgbReserved = 0; + } + + bmi.bi.bmiHeader.biBitCount = 8; + bmi.bi.bmiHeader.biClrUsed = 16; + bmi.bi.bmiHeader.biClrImportant = 16; + hbm = CreateDIBSection(hdc, &bmi.bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + stat = GdipCreateBitmapFromHBITMAP(hbm, hpal, &gpbm); + expect(Ok, stat); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, format); + stat = GdipGetImagePalette((GpImage *)gpbm, palette, sizeof(colorpalette_buf)); + expect(Ok, stat); + expect(256, palette->Count); + for (i = 0; i < 16; i++) + { + BYTE clr = 255 - i; + ARGB argb = 0xff000000 | (clr << 16) | (clr << 8) | clr; + ok(palette->Entries[i] == argb, "got %08x, expected %08x\n", palette->Entries[i], argb); + } + GdipDisposeImage((GpImage*)gpbm); DeleteObject(hpal); + + stat = GdipCreateBitmapFromHBITMAP(hbm, 0, &gpbm); + expect(Ok, stat); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, format); + stat = GdipGetImagePalette((GpImage *)gpbm, palette, sizeof(colorpalette_buf)); + expect(Ok, stat); + expect(256, palette->Count); + for (i = 0; i < 16; i++) + { + BYTE clr = 255 - i; + ARGB argb = 0xff000000 | (clr << 16) | (clr << 8) | clr; + ok(palette->Entries[i] == argb, "got %08x, expected %08x\n", palette->Entries[i], argb); + } + GdipDisposeImage((GpImage*)gpbm); + DeleteObject(hbm); /* 16-bit 555 dib, rgb */ @@ -999,7 +1069,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) DeleteObject(hbm); /* 16-bit 555 dib, with bitfields */ - bmi.bi.bmiHeader.biSize = sizeof(bmi); + bmi.bi.bmiHeader.biSize = sizeof(bmi.bi.bmiHeader); bmi.bi.bmiHeader.biCompression = BI_BITFIELDS; bmi.bf.masks[0] = 0x7c00; bmi.bf.masks[1] = 0x3e0;

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipCreateBitmapFromGdiDib by using GdipCreateBitmapFromHBITMAP.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 506f3bf53df421e453549127c74f1af98ddfde56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=506f3bf53df421e453549127… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 27 12:13:48 2020 +0800 gdiplus: Reimplement GdipCreateBitmapFromGdiDib by using GdipCreateBitmapFromHBITMAP. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 47 +++++++++++++---------------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bfa0c8afa7..9fa2aaee95 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1381,50 +1381,29 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO* info, VOID *bits, GpBitmap **bitmap) { DWORD height, stride; - PixelFormat format; + HBITMAP hbm; + void *bmbits; + GpStatus status; - FIXME("(%p, %p, %p) - partially implemented\n", info, bits, bitmap); + TRACE("(%p, %p, %p)\n", info, bits, bitmap); if (!info || !bits || !bitmap) return InvalidParameter; + hbm = CreateDIBSection(0, info, DIB_RGB_COLORS, &bmbits, NULL, 0); + if (!hbm) + return InvalidParameter; + height = abs(info->bmiHeader.biHeight); stride = ((info->bmiHeader.biWidth * info->bmiHeader.biBitCount + 31) >> 3) & ~3; + TRACE("height %u, stride %u, image size %u\n", height, stride, height * stride); - if(info->bmiHeader.biHeight > 0) /* bottom-up */ - { - bits = (BYTE*)bits + (height - 1) * stride; - stride = -stride; - } + memcpy(bmbits, bits, height * stride); - switch(info->bmiHeader.biBitCount) { - case 1: - format = PixelFormat1bppIndexed; - break; - case 4: - format = PixelFormat4bppIndexed; - break; - case 8: - format = PixelFormat8bppIndexed; - break; - case 16: - format = PixelFormat16bppRGB555; - break; - case 24: - format = PixelFormat24bppRGB; - break; - case 32: - format = PixelFormat32bppRGB; - break; - default: - FIXME("don't know how to handle %d bpp\n", info->bmiHeader.biBitCount); - *bitmap = NULL; - return InvalidParameter; - } - - return GdipCreateBitmapFromScan0(info->bmiHeader.biWidth, height, stride, format, - bits, bitmap); + status = GdipCreateBitmapFromHBITMAP(hbm, NULL, bitmap); + DeleteObject(hbm); + return status; } /* FIXME: no icm */

1 0

Michael Cronenworth : sane.ds: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: c13d58780f78393571dfdeb5b4952e3dcd7ded90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c13d58780f78393571dfdeb5… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:24 2020 -0600 sane.ds: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/sane_i.h | 6 ++++-- dlls/sane.ds/sane_main.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 941e8b9e1b..9351bdc222 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -36,7 +36,7 @@ #include "twain.h" #ifdef SONAME_LIBSANE -#define MAKE_FUNCPTR(f) typeof(f) * p##f DECLSPEC_HIDDEN; +#define MAKE_FUNCPTR(f) extern typeof(f) * p##f DECLSPEC_HIDDEN; MAKE_FUNCPTR(sane_init) MAKE_FUNCPTR(sane_exit) MAKE_FUNCPTR(sane_get_devices) @@ -84,7 +84,9 @@ struct tagActiveDS TW_FIX32 defaultXResolution; BOOL YResolutionSet; TW_FIX32 defaultYResolution; -} activeDS DECLSPEC_HIDDEN; +}; + +extern struct tagActiveDS activeDS DECLSPEC_HIDDEN; /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 7af0a2321a..0cf211d098 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,9 +30,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +struct tagActiveDS activeDS; + DSMENTRYPROC SANE_dsmentry; #ifdef SONAME_LIBSANE +#define MAKE_FUNCPTR(f) typeof(f) * p##f; +MAKE_FUNCPTR(sane_init) +MAKE_FUNCPTR(sane_exit) +MAKE_FUNCPTR(sane_get_devices) +MAKE_FUNCPTR(sane_open) +MAKE_FUNCPTR(sane_close) +MAKE_FUNCPTR(sane_get_option_descriptor) +MAKE_FUNCPTR(sane_control_option) +MAKE_FUNCPTR(sane_get_parameters) +MAKE_FUNCPTR(sane_start) +MAKE_FUNCPTR(sane_read) +MAKE_FUNCPTR(sane_cancel) +MAKE_FUNCPTR(sane_set_io_mode) +MAKE_FUNCPTR(sane_get_select_fd) +MAKE_FUNCPTR(sane_strstatus) +#undef MAKE_FUNCPTR HINSTANCE SANE_instance;

1 0

Michael Cronenworth : webservices: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: bc51c5d589de709e1d393b58b0cc5985c78061ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc51c5d589de709e1d393b58… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:28 2020 -0600 webservices: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 6f2b90dad2..b352aa52d4 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -18,7 +18,7 @@ #include "winhttp.h" -_locale_t c_locale DECLSPEC_HIDDEN; +extern _locale_t c_locale DECLSPEC_HIDDEN; #define STREAM_BUFSIZE 4096 @@ -50,8 +50,8 @@ struct dictionary ULONG current_sequence; ULONG *sequence; }; -struct dictionary dict_builtin DECLSPEC_HIDDEN; -const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; +extern struct dictionary dict_builtin DECLSPEC_HIDDEN; +extern const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN;

1 0

Michael Cronenworth : gphoto2.ds: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 453980e13015e20dd551531be69b3361b63f22b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=453980e13015e20dd551531b… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:21 2020 -0600 gphoto2.ds: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/gphoto2_i.h | 4 +++- dlls/gphoto2.ds/gphoto2_main.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 9ab8bbbf33..4171fcae4f 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -100,7 +100,9 @@ struct tagActiveDS struct jpeg_decompress_struct jd; struct jpeg_error_mgr jerr; #endif -} activeDS DECLSPEC_HIDDEN; +}; + +extern struct tagActiveDS activeDS DECLSPEC_HIDDEN; /* Helper functions */ extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 28100414cc..4d71c89e2e 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +struct tagActiveDS activeDS; + DSMENTRYPROC GPHOTO2_dsmentry; #ifdef HAVE_GPHOTO2

1 0

Michael Cronenworth : msi: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: cc7f698b8245a48669d248569e7589ff824f2c70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7f698b8245a48669d24856… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:23 2020 -0600 msi: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 2 ++ dlls/msi/msipriv.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7bf5004bed..6387b0a937 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -51,6 +51,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); +BOOL is_wow64; + static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fca2f9e7b4..6b87cfb3d8 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -42,7 +42,7 @@ #include "winemsi.h" static const BOOL is_64bit = sizeof(void *) > sizeof(int); -BOOL is_wow64 DECLSPEC_HIDDEN; +extern BOOL is_wow64 DECLSPEC_HIDDEN; #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100

1 0

Kevin Puetz : rpcrt4: Fix ITypeInfo leak in get_iface_info.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: a09c08f17a1ace1205e4c579c4f08b548258d539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a09c08f17a1ace1205e4c579… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Jan 27 16:02:27 2020 +0100 rpcrt4: Fix ITypeInfo leak in get_iface_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 7cb7da18ad..fb78c9b5ab 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -1265,14 +1265,16 @@ static HRESULT get_iface_info(ITypeInfo *typeinfo, WORD *funcs, WORD *parentfunc if (FAILED(hr)) goto err; hr = ITypeInfo_GetRefTypeInfo(*real_typeinfo, reftype, &parentinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetTypeAttr(parentinfo, &typeattr); + ITypeInfo_Release(parentinfo); + } if (FAILED(hr)) goto err; - hr = ITypeInfo_GetTypeAttr(parentinfo, &typeattr); - if (FAILED(hr)) - goto err; + *parentiid = typeattr->guid; ITypeInfo_ReleaseTypeAttr(parentinfo, typeattr); - ITypeInfo_Release(parentinfo); return S_OK;

1 0

Evan Tang : kernel32/lzexpand: Fix uninitialized read in read_header.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 4e9dae37767462c531f489fab13980f210b32da6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e9dae37767462c531f489fa… Author: Evan Tang <etang110(a)gmail.com> Date: Mon Jan 27 02:13:41 2020 -0600 kernel32/lzexpand: Fix uninitialized read in read_header. read_header calls _lread which can either return the number of characters read or HFILE_ERROR (-1), cast to a UINT. Signed-off-by: Evan Tang <etang110(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lzexpand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/lzexpand.c b/dlls/kernel32/lzexpand.c index 4b2ec2ed45..73c9ddc031 100644 --- a/dlls/kernel32/lzexpand.c +++ b/dlls/kernel32/lzexpand.c @@ -139,7 +139,7 @@ static INT read_header(HFILE fd,struct lzfileheader *head) /* We can't directly read the lzfileheader struct due to * structure element alignment */ - if (_lread(fd,buf,LZ_HEADER_LEN)<LZ_HEADER_LEN) + if (_lread(fd,buf,LZ_HEADER_LEN) != LZ_HEADER_LEN) return 0; memcpy(head->magic,buf,LZ_MAGIC_LEN); memcpy(&(head->compressiontype),buf+LZ_MAGIC_LEN,1);

1 0

Jacek Caban : scrrun: Add MoveFile implementation.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: c8c00d6f4ab7adf8ca64723125c25250e2888198 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8c00d6f4ab7adf8ca647231… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 27 15:40:22 2020 +0100 scrrun: Add MoveFile implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 7 ++--- dlls/scrrun/tests/filesystem.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5893435af7..d537239b3a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3638,12 +3638,11 @@ static HRESULT WINAPI filesys_DeleteFolder(IFileSystem3 *iface, BSTR FolderSpec, return delete_folder(FolderSpec, SysStringLen(FolderSpec), Force); } -static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR Source, - BSTR Destination) +static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR source, BSTR destination) { - FIXME("%p %s %s\n", iface, debugstr_w(Source), debugstr_w(Destination)); + TRACE("%p %s %s\n", iface, debugstr_w(source), debugstr_w(destination)); - return E_NOTIMPL; + return MoveFileW(source, destination) ? S_OK : create_error(GetLastError()); } static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface,BSTR Source, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 68ac70ce3a..c96f704ca7 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2467,6 +2467,67 @@ static void test_GetSpecialFolder(void) IFolder_Release(folder); } +static void test_MoveFile(void) +{ + ITextStream *stream; + BSTR str, src, dst; + HRESULT hr; + + str = SysAllocString(L"test.txt"); + hr = IFileSystem3_CreateTextFile(fs3, str, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + str = SysAllocString(L"test"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "Write failed: %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + str = SysAllocString(L"test2.txt"); + hr = IFileSystem3_CreateTextFile(fs3, str, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + ITextStream_Release(stream); + + src = SysAllocString(L"test.txt"); + dst = SysAllocString(L"test3.txt"); + hr = IFileSystem3_MoveFile(fs3, src, dst); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(src); + SysFreeString(dst); + + str = SysAllocString(L"test.txt"); + hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); + ok(hr == CTL_E_FILENOTFOUND, "DeleteFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + SysFreeString(str); + + src = SysAllocString(L"test3.txt"); + dst = SysAllocString(L"test2.txt"); /* already exists */ + hr = IFileSystem3_MoveFile(fs3, src, dst); + ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x, expected CTL_E_FILEALREADYEXISTS\n", hr); + SysFreeString(src); + SysFreeString(dst); + + src = SysAllocString(L"nonexistent.txt"); + dst = SysAllocString(L"test4.txt"); + hr = IFileSystem3_MoveFile(fs3, src, dst); + ok(hr == CTL_E_FILENOTFOUND, "got 0x%08x, expected CTL_E_FILENOTFOUND\n", hr); + SysFreeString(src); + SysFreeString(dst); + + str = SysAllocString(L"test3.txt"); + hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + str = SysAllocString(L"test2.txt"); + hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); +} + START_TEST(filesystem) { HRESULT hr; @@ -2506,6 +2567,7 @@ START_TEST(filesystem) test_SerialNumber(); test_GetExtensionName(); test_GetSpecialFolder(); + test_MoveFile(); IFileSystem3_Release(fs3);

1 0

Jacek Caban : vbscript: Overflow hex literals in 16-bit range.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: cd1918948f28b7fb874790d3f3d223c4e8471b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd1918948f28b7fb874790d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 27 14:25:32 2020 +0100 vbscript: Overflow hex literals in 16-bit range. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 6 +++--- dlls/vbscript/lex.c | 4 ++-- dlls/vbscript/tests/lang.vbs | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index a4442960d9..d42091990b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2793,7 +2793,7 @@ static const builtin_prop_t global_props[] = { {L"vbFormFeed", NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbFormFeed}, {L"vbFriday", NULL, BP_GET, VT_I2, 6}, {L"vbGeneralDate", NULL, BP_GET, VT_I2, 0}, - {L"vbGreen", NULL, BP_GET, VT_I4, 0x00ff00}, + {L"vbGreen", NULL, BP_GET, VT_I4, (INT16)0x00ff00}, {L"vbIgnore", NULL, BP_GET, VT_I2, IDIGNORE}, {L"vbInformation", NULL, BP_GET, VT_I2, MB_ICONASTERISK}, {L"vbInteger", NULL, BP_GET, VT_I2, VT_I2}, @@ -2840,7 +2840,7 @@ static const builtin_prop_t global_props[] = { {L"vbVerticalTab", NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbVerticalTab}, {L"vbWednesday", NULL, BP_GET, VT_I2, 4}, {L"vbWhite", NULL, BP_GET, VT_I4, 0xffffff}, - {L"vbYellow", NULL, BP_GET, VT_I4, 0x00ffff}, + {L"vbYellow", NULL, BP_GET, VT_I4, (INT16)0x00ffff}, {L"vbYes", NULL, BP_GET, VT_I2, IDYES}, {L"vbYesNo", NULL, BP_GET, VT_I2, MB_YESNO}, {L"vbYesNoCancel", NULL, BP_GET, VT_I2, MB_YESNOCANCEL}, @@ -2945,7 +2945,7 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA if(SUCCEEDED(hres)) { script_ctx_t *ctx = This->ctx; - error = (code & ~0xffff) ? map_hres(code) : MAKE_VBSERROR(code); + error = (code == (INT16)code) ? MAKE_VBSERROR((UINT16)code) : map_hres(code); if(source) { SysFreeString(ctx->ei.bstrSource); diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index db104fd892..f6070134f4 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -310,7 +310,7 @@ static int hex_to_int(WCHAR c) static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) { const WCHAR *begin = ctx->ptr; - LONG l = 0, d; + unsigned l = 0, d; while((d = hex_to_int(*++ctx->ptr)) != -1) l = l*16 + d; @@ -323,7 +323,7 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) if(*ctx->ptr == '&') ctx->ptr++; - *ret = l; + *ret = l == (UINT16)l ? (INT16)l : l; return tInt; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index fb9f96e427..8007823394 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -53,6 +53,8 @@ Call ok(true = -1, "! true = -1") Call ok(false = 0, "false <> 0") Call ok(&hff = 255, "&hff <> 255") Call ok(&Hff = 255, "&Hff <> 255") +Call ok(&hffff = -1, "&hffff <> -1") +Call ok(&hfffe = -2, "&hfffe <> -2") W = 5 Call ok(W = 5, "W = " & W & " expected " & 5) @@ -88,6 +90,7 @@ Call ok(getVT(&h10&) = "VT_I2", "getVT(&h10&) is not VT_I2") Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") +Call ok(getVT(&hffFFffFE&) = "VT_I2", "getVT(&hffFFffFE &) is not VT_I2") Call ok(getVT(1e2) = "VT_R8", "getVT(1e2) is not VT_R8") Call ok(getVT(1e0) = "VT_R8", "getVT(1e0) is not VT_R8") Call ok(getVT(0.1e2) = "VT_R8", "getVT(0.1e2) is not VT_R8")

1 0

Jacek Caban : vbscript: Fix VT_UNKNOWN handling in set statements.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 1c194f3b21967024b10de5b2f6b72947d687731b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c194f3b21967024b10de5b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 27 14:25:39 2020 +0100 vbscript: Fix VT_UNKNOWN handling in set statements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 12 ++++++------ dlls/vbscript/tests/lang.vbs | 6 ++++++ dlls/vbscript/tests/run.c | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9c07535517..333fe0f6bd 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -458,22 +458,22 @@ static HRESULT stack_assume_disp(exec_ctx_t *ctx, unsigned n, IDispatch **disp) { VARIANT *v = stack_top(ctx, n), *ref; - if(V_VT(v) != VT_DISPATCH) { + if(V_VT(v) != VT_DISPATCH && (disp || V_VT(v) != VT_UNKNOWN)) { if(V_VT(v) != (VT_VARIANT|VT_BYREF)) { FIXME("not supported type: %s\n", debugstr_variant(v)); return E_FAIL; } ref = V_VARIANTREF(v); - if(V_VT(ref) != VT_DISPATCH) { + if(V_VT(ref) != VT_DISPATCH && (disp || V_VT(ref) != VT_UNKNOWN)) { FIXME("not disp %s\n", debugstr_variant(ref)); return E_FAIL; } - V_VT(v) = VT_DISPATCH; - V_DISPATCH(v) = V_DISPATCH(ref); - if(V_DISPATCH(v)) - IDispatch_AddRef(V_DISPATCH(v)); + V_VT(v) = V_VT(ref); + V_UNKNOWN(v) = V_UNKNOWN(ref); + if(V_UNKNOWN(v)) + IUnknown_AddRef(V_UNKNOWN(v)); } if(disp) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8007823394..f527b3411b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1197,6 +1197,12 @@ Call ok(obj.Test1 = 6, "obj.Test1 is not 6") obj.AddToTest1(5) Call ok(obj.Test1 = 11, "obj.Test1 is not 11") +set obj = unkObj +set x = obj +call ok(getVT(obj) = "VT_UNKNOWN*", "getVT(obj) = " & getVT(obj)) +call ok(getVT(x) = "VT_UNKNOWN*", "getVT(x) = " & getVT(x)) +call ok(getVT(unkObj) = "VT_UNKNOWN", "getVT(unkObj) = " & getVT(unkObj)) + ' Array tests Call ok(getVT(arr) = "VT_EMPTY*", "getVT(arr) = " & getVT(arr)) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 015f2b816a..8acf220f9f 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -144,6 +144,7 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_TESTERROROBJECT 1023 #define DISPID_GLOBAL_THROWWITHDESC 1024 #define DISPID_GLOBAL_PROPARGSET 1025 +#define DISPID_GLOBAL_UNKOBJ 1026 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -214,6 +215,8 @@ static const char *vt2a(VARIANT *v) return "VT_BSTR"; case VT_DISPATCH: return "VT_DISPATCH"; + case VT_UNKNOWN: + return "VT_UNKNOWN"; case VT_BOOL: return "VT_BOOL"; case VT_ARRAY|VT_VARIANT: @@ -595,6 +598,35 @@ static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) static IDispatchEx enumDisp; +static HRESULT WINAPI unkObj_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI unkObj_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI unkObj_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl unkObjVtbl = { + unkObj_QueryInterface, + unkObj_AddRef, + unkObj_Release +}; + +static IUnknown unkObj = { &unkObjVtbl }; + static HRESULT WINAPI EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumVARIANT)) { @@ -1138,7 +1170,8 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"throwInt", DISPID_GLOBAL_THROWINT }, { L"testOptionalArg", DISPID_GLOBAL_TESTOPTIONALARG }, { L"testErrorObject", DISPID_GLOBAL_TESTERROROBJECT }, - { L"throwWithDesc", DISPID_GLOBAL_THROWWITHDESC } + { L"throwWithDesc", DISPID_GLOBAL_THROWWITHDESC }, + { L"unkObj", DISPID_GLOBAL_UNKOBJ } }; test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -1657,6 +1690,10 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(hres == S_OK, "Invoke failed: %08x\n", hres); return S_OK; } + case DISPID_GLOBAL_UNKOBJ: + V_VT(pvarRes) = VT_UNKNOWN; + V_UNKNOWN(pvarRes) = &unkObj; + return S_OK; } ok(0, "unexpected call %d\n", id);

1 0

Jacek Caban : vbscript: Fix VT_UNKNOWN handling in is expressions.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 47f3abb633d94835b1c93e57e77009cf357ce85e URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f3abb633d94835b1c93e57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 27 14:25:45 2020 +0100 vbscript: Fix VT_UNKNOWN handling in is expressions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 96 ++++++++++++++++++-------------------------- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 40 insertions(+), 57 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 333fe0f6bd..906545cf4a 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1928,75 +1928,57 @@ static HRESULT interp_case(exec_ctx_t *ctx) return S_OK; } -static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, VARIANT_BOOL *ret) +static HRESULT interp_is(exec_ctx_t *ctx) { - IObjectIdentity *identity; - IUnknown *unk1, *unk2; - HRESULT hres; + IUnknown *l = NULL, *r = NULL; + variant_val_t v; + HRESULT hres = S_OK; - if(disp1 == disp2) { - *ret = VARIANT_TRUE; - return S_OK; - } + TRACE("\n"); - if(!disp1 || !disp2) { - *ret = VARIANT_FALSE; - return S_OK; + stack_pop_deref(ctx, &v); + if(V_VT(v.v) != VT_DISPATCH && V_VT(v.v) != VT_UNKNOWN) { + FIXME("Unhandled type %s\n", debugstr_variant(v.v)); + hres = E_NOTIMPL; + }else if(V_UNKNOWN(v.v)) { + hres = IUnknown_QueryInterface(V_UNKNOWN(v.v), &IID_IUnknown, (void**)&r); } - - hres = IDispatch_QueryInterface(disp1, &IID_IUnknown, (void**)&unk1); + if(v.owned) VariantClear(v.v); if(FAILED(hres)) return hres; - hres = IDispatch_QueryInterface(disp2, &IID_IUnknown, (void**)&unk2); - if(FAILED(hres)) { - IUnknown_Release(unk1); - return hres; - } - - if(unk1 == unk2) { - *ret = VARIANT_TRUE; - }else { - hres = IUnknown_QueryInterface(unk1, &IID_IObjectIdentity, (void**)&identity); - if(SUCCEEDED(hres)) { - hres = IObjectIdentity_IsEqualObject(identity, unk2); - IObjectIdentity_Release(identity); - *ret = hres == S_OK ? VARIANT_TRUE : VARIANT_FALSE; - }else { - *ret = VARIANT_FALSE; - } + stack_pop_deref(ctx, &v); + if(V_VT(v.v) != VT_DISPATCH && V_VT(v.v) != VT_UNKNOWN) { + FIXME("Unhandled type %s\n", debugstr_variant(v.v)); + hres = E_NOTIMPL; + }else if(V_UNKNOWN(v.v)) { + hres = IUnknown_QueryInterface(V_UNKNOWN(v.v), &IID_IUnknown, (void**)&l); } + if(v.owned) VariantClear(v.v); - IUnknown_Release(unk1); - IUnknown_Release(unk2); - return S_OK; -} - -static HRESULT interp_is(exec_ctx_t *ctx) -{ - IDispatch *l, *r; - VARIANT v; - HRESULT hres; - - TRACE("\n"); - - hres = stack_pop_disp(ctx, &r); - if(FAILED(hres)) - return hres; - - hres = stack_pop_disp(ctx, &l); if(SUCCEEDED(hres)) { - V_VT(&v) = VT_BOOL; - hres = disp_cmp(l, r, &V_BOOL(&v)); - if(l) - IDispatch_Release(l); + VARIANT res; + V_VT(&res) = VT_BOOL; + if(r == l) + V_BOOL(&res) = VARIANT_TRUE; + else if(!r || !l) + V_BOOL(&res) = VARIANT_FALSE; + else { + IObjectIdentity *identity; + hres = IUnknown_QueryInterface(l, &IID_IObjectIdentity, (void**)&identity); + if(SUCCEEDED(hres)) { + hres = IObjectIdentity_IsEqualObject(identity, r); + IObjectIdentity_Release(identity); + } + V_BOOL(&res) = hres == S_OK ? VARIANT_TRUE : VARIANT_FALSE; + } + hres = stack_push(ctx, &res); } if(r) - IDispatch_Release(r); - if(FAILED(hres)) - return hres; - - return stack_push(ctx, &v); + IUnknown_Release(r); + if(l) + IUnknown_Release(l); + return hres; } static HRESULT interp_concat(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index f527b3411b..12104a2a4a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1202,6 +1202,7 @@ set x = obj call ok(getVT(obj) = "VT_UNKNOWN*", "getVT(obj) = " & getVT(obj)) call ok(getVT(x) = "VT_UNKNOWN*", "getVT(x) = " & getVT(x)) call ok(getVT(unkObj) = "VT_UNKNOWN", "getVT(unkObj) = " & getVT(unkObj)) +call ok(obj is unkObj, "obj is not unkObj") ' Array tests

1 0

Henri Verbeet : d3d9/tests: Introduce adapter_is_amd().
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 05a5e606d5da0c0b6a8adb28f9e3b6262ecc4b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=05a5e606d5da0c0b6a8adb28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 15:55:26 2020 +0330 d3d9/tests: Introduce adapter_is_amd(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fb0746f58b..366862a05a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -104,6 +104,16 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) return !strcmp(identifier->Driver, "d3d10warp.dll"); } +static BOOL adapter_is_vendor(const D3DADAPTER_IDENTIFIER9 *identifier, DWORD vendor) +{ + return identifier->VendorId == vendor; +} + +static BOOL adapter_is_amd(const D3DADAPTER_IDENTIFIER9 *identifier) +{ + return adapter_is_vendor(identifier, 0x1002); +} + /* Locks a given surface and returns the color at (x,y). It's the caller's * responsibility to only pass in lockable surfaces and valid x,y coordinates */ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y) @@ -26592,7 +26602,7 @@ static void test_alpha_to_coverage(void) nvidia_mode = FALSE; hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - if (identifier.VendorId != 0x1002 /* AMD */) + if (!adapter_is_amd(&identifier)) { skip("Alpha to coverage is not supported.\n"); refcount = IDirect3DDevice9_Release(device);

1 0

Paul Gofman : wined3d: Support sRGB reads for WINED3DFMT_B5G6R5_UNORM.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 941bd46597a8e8f2c40a80a8e429620c050a6fef URL: https://source.winehq.org/git/wine.git/?a=commit;h=941bd46597a8e8f2c40a80a8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jan 27 15:55:28 2020 +0330 wined3d: Support sRGB reads for WINED3DFMT_B5G6R5_UNORM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48302 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5581c145ef..bd239d7659 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1490,15 +1490,15 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE, WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_RGB5, GL_RGB8, + {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_SRGB8_EXT, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_RENDERTARGET, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_B5G6R5_UNORM, GL_RGB565, GL_RGB565, GL_RGB8, + {WINED3DFMT_B5G6R5_UNORM, GL_RGB565, GL_SRGB8_EXT, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_RENDERTARGET, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ, ARB_ES2_COMPATIBILITY, NULL}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0,

1 0

Nikolay Sivov : wineboot: Do not use SHGetMalloc() internally.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 664d57d0ebea341b38507739a01ece74e0ef55c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=664d57d0ebea341b38507739… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 11:33:51 2020 +0300 wineboot: Do not use SHGetMalloc() internally. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index dd9a5bd8f6..8e3e234397 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1267,7 +1267,6 @@ static BOOL ProcessStartupItems(void) { BOOL ret = FALSE; HRESULT hr; - IMalloc *ppM = NULL; IShellFolder *psfDesktop = NULL, *psfStartup = NULL; LPITEMIDLIST pidlStartup = NULL, pidlItem; ULONG NumPIDLs; @@ -1277,13 +1276,6 @@ static BOOL ProcessStartupItems(void) WINE_TRACE("Processing items in the StartUp folder.\n"); - hr = SHGetMalloc(&ppM); - if (FAILED(hr)) - { - WINE_ERR("Couldn't get IMalloc object.\n"); - goto done; - } - hr = SHGetDesktopFolder(&psfDesktop); if (FAILED(hr)) { @@ -1333,7 +1325,7 @@ static BOOL ProcessStartupItems(void) } } - IMalloc_Free(ppM, pidlItem); + ILFree(pidlItem); } /* Return success */ @@ -1342,7 +1334,7 @@ static BOOL ProcessStartupItems(void) done: if (iEnumList) IEnumIDList_Release(iEnumList); if (psfStartup) IShellFolder_Release(psfStartup); - if (pidlStartup) IMalloc_Free(ppM, pidlStartup); + if (pidlStartup) ILFree(pidlStartup); return ret; }

1 0

Hans Leidekker : msi: Add support for custom action type 7.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 54ef6e5e3932a5ce747fca717c697b67f2bd3e24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54ef6e5e3932a5ce747fca71… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 27 14:07:31 2020 +0100 msi: Add support for custom action type 7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44618 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 230 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 159 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54ef6e5e3932a5ce747f…

1 0

Nikolay Sivov : shell32: Do not use SHGetMalloc() internally.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 84e06f228973e5dc7b79803d8f3b2a251006bda9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84e06f228973e5dc7b79803d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 11:37:17 2020 +0300 shell32: Do not use SHGetMalloc() internally. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 4 +--- dlls/shell32/shellord.c | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 0dfb81c6e7..5b044d4be1 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -405,7 +405,6 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLEST static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *filename) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - IMalloc *pMalloc; TRACE("(%p)->(%p)\n", This, filename); @@ -415,8 +414,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *f return S_FALSE; } - SHGetMalloc(&pMalloc); - *filename = IMalloc_Alloc(pMalloc, (strlenW(This->filepath)+1)*sizeof(WCHAR)); + *filename = CoTaskMemAlloc((strlenW(This->filepath) + 1) * sizeof(WCHAR)); if (!*filename) return E_OUTOFMEMORY; strcpyW(*filename, This->filepath); diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index b04a56e783..e1262accdd 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -760,7 +760,6 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) CHAR link_dir[MAX_PATH]; CHAR new_lnk_filepath[MAX_PATH]; CHAR new_lnk_name[MAX_PATH]; - IMalloc *ppM; LPITEMIDLIST pidl; HWND hwnd = 0; /* FIXME: get real window handle */ INT ret; @@ -815,24 +814,18 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) /* Get path to user's "Recent" directory */ - if(SUCCEEDED(SHGetMalloc(&ppM))) { - if (SUCCEEDED(SHGetSpecialFolderLocation(hwnd, CSIDL_RECENT, - &pidl))) { - SHGetPathFromIDListA(pidl, link_dir); - IMalloc_Free(ppM, pidl); - } - else { - /* serious issues */ - link_dir[0] = 0; - ERR("serious issues 1\n"); - } - IMalloc_Release(ppM); + if (SUCCEEDED(SHGetSpecialFolderLocation(hwnd, CSIDL_RECENT, &pidl))) + { + SHGetPathFromIDListA(pidl, link_dir); + ILFree(pidl); } - else { - /* serious issues */ - link_dir[0] = 0; - ERR("serious issues 2\n"); + else + { + /* serious issues */ + link_dir[0] = 0; + ERR("serious issues 1\n"); } + TRACE("Users Recent dir %s\n", link_dir); /* If no input, then go clear the lists */

1 0

Nikolay Sivov : ole32: Fix string buffer size.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: a697aa21f39f693482290ca810d07f7166665294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a697aa21f39f693482290ca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 09:24:20 2020 +0300 ole32: Fix string buffer size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 0f0f824a77..c5d2a42e1c 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -554,7 +554,7 @@ static HRESULT PropertyStorage_StringCopy(LPCSTR src, UINT srcCP, LPSTR *dst, UI len = (lstrlenW((LPCWSTR)src) + 1) * sizeof(WCHAR); else len = strlen(src) + 1; - *dst = CoTaskMemAlloc(len * sizeof(WCHAR)); + *dst = CoTaskMemAlloc(len); if (!*dst) hr = STG_E_INSUFFICIENTMEMORY; else

1 0

Nikolay Sivov : ole32: Add support for writing VT_BSTR properties.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 433c17c0104a124178f1012f14987f528ac4cf9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=433c17c0104a124178f1012f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 09:24:16 2020 +0300 ole32: Add support for writing VT_BSTR properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 65 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8421353155..54904a581b 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -623,15 +623,24 @@ static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, const PROPVARI assert(prop); assert(propvar); - if (propvar->vt == VT_LPSTR) + + switch (propvar->vt) { - hr = PropertyStorage_StringCopy(propvar->u.pszVal, srcCP, - &prop->u.pszVal, targetCP); + case VT_LPSTR: + hr = PropertyStorage_StringCopy(propvar->u.pszVal, srcCP, &prop->u.pszVal, targetCP); if (SUCCEEDED(hr)) prop->vt = VT_LPSTR; + break; + case VT_BSTR: + if ((prop->u.bstrVal = SysAllocStringLen(propvar->u.bstrVal, SysStringLen(propvar->u.bstrVal)))) + prop->vt = VT_BSTR; + else + hr = E_OUTOFMEMORY; + break; + default: + hr = PropVariantCopy(prop, propvar); } - else - PropVariantCopy(prop, propvar); + return hr; } @@ -1881,11 +1890,11 @@ end: static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, DWORD propNum, DWORD propid, const PROPVARIANT *var, DWORD *sectionOffset) { + DWORD len, dwType, dwTemp, bytesWritten; HRESULT hr; LARGE_INTEGER seek; PROPERTYIDOFFSET propIdOffset; ULONG count; - DWORD dwType, bytesWritten; assert(var); assert(sectionOffset); @@ -1938,8 +1947,6 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, case VT_I4: case VT_UI4: { - DWORD dwTemp; - StorageUtl_WriteDWord(&dwTemp, 0, var->u.lVal); hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); bytesWritten = count; @@ -1947,8 +1954,6 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, } case VT_LPSTR: { - DWORD len, dwTemp; - if (This->codePage == CP_UNICODE) len = (lstrlenW(var->u.pwszVal) + 1) * sizeof(WCHAR); else @@ -1961,9 +1966,45 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count + sizeof(DWORD); break; } + case VT_BSTR: + { + if (This->codePage == CP_UNICODE) + { + len = SysStringByteLen(var->u.bstrVal) + sizeof(WCHAR); + StorageUtl_WriteDWord(&dwTemp, 0, len); + hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); + if (SUCCEEDED(hr)) + hr = IStream_Write(This->stm, var->u.bstrVal, len, &count); + } + else + { + char *str; + + len = WideCharToMultiByte(This->codePage, 0, var->u.bstrVal, SysStringLen(var->u.bstrVal) + 1, + NULL, 0, NULL, NULL); + + str = heap_alloc(len); + if (!str) + { + hr = E_OUTOFMEMORY; + goto end; + } + + WideCharToMultiByte(This->codePage, 0, var->u.bstrVal, SysStringLen(var->u.bstrVal), + str, len, NULL, NULL); + StorageUtl_WriteDWord(&dwTemp, 0, len); + hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); + if (SUCCEEDED(hr)) + hr = IStream_Write(This->stm, str, len, &count); + heap_free(str); + } + + bytesWritten = count + sizeof(DWORD); + break; + } case VT_LPWSTR: { - DWORD len = lstrlenW(var->u.pwszVal) + 1, dwTemp; + len = lstrlenW(var->u.pwszVal) + 1; StorageUtl_WriteDWord(&dwTemp, 0, len); hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); @@ -1985,7 +2026,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, } case VT_CF: { - DWORD cf_hdr[2], len; + DWORD cf_hdr[2]; len = var->u.pclipdata->cbSize; StorageUtl_WriteDWord(&cf_hdr[0], 0, len + 8);

1 0

Nikolay Sivov : ole32: Validate offsets when reading storage dictionary.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: cab617bbab386f7fb5679089ea96f0c6c37e3a75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cab617bbab386f7fb5679089… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 09:24:19 2020 +0300 ole32: Validate offsets when reading storage dictionary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 119 ++++++++++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 51 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8bab995eb6..0f0f824a77 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -81,6 +81,8 @@ static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *i #define CFTAG_FMTID (-3L) #define CFTAG_NODATA 0L +#define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align))&~(_Align)) + typedef struct tagPROPERTYSETHEADER { WORD wByteOrder; /* always 0xfffe */ @@ -1175,55 +1177,6 @@ static void PropertyStorage_ByteSwapString(LPWSTR str, size_t len) #define PropertyStorage_ByteSwapString(s, l) #endif -/* Reads the dictionary from the memory buffer beginning at ptr. Interprets - * the entries according to the values of This->codePage and This->locale. - * FIXME: there isn't any checking whether the read property extends past the - * end of the buffer. - */ -static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This, - BYTE *ptr) -{ - DWORD numEntries, i; - HRESULT hr = S_OK; - - assert(This->name_to_propid); - assert(This->propid_to_name); - - StorageUtl_ReadDWord(ptr, 0, &numEntries); - TRACE("Reading %d entries:\n", numEntries); - ptr += sizeof(DWORD); - for (i = 0; SUCCEEDED(hr) && i < numEntries; i++) - { - PROPID propid; - DWORD cbEntry; - - StorageUtl_ReadDWord(ptr, 0, &propid); - ptr += sizeof(PROPID); - StorageUtl_ReadDWord(ptr, 0, &cbEntry); - ptr += sizeof(DWORD); - /* Make sure the source string is NULL-terminated */ - if (This->codePage != CP_UNICODE) - ptr[cbEntry - 1] = '\0'; - else - ((WCHAR *)ptr)[cbEntry - 1] = '\0'; - - TRACE("Reading entry with ID %#x, %d chars, name %s.\n", propid, cbEntry, This->codePage == CP_UNICODE ? - debugstr_wn((WCHAR *)ptr, cbEntry) : debugstr_an((char *)ptr, cbEntry)); - - hr = PropertyStorage_StoreNameWithId(This, (char*)ptr, This->codePage, propid); - if (This->codePage == CP_UNICODE) - { - cbEntry *= sizeof(WCHAR); - - /* Unicode entries are padded to DWORD boundaries */ - if (cbEntry % sizeof(DWORD)) - ptr += sizeof(DWORD) - (cbEntry % sizeof(DWORD)); - } - ptr += cbEntry; - } - return hr; -} - static void* WINAPI Allocate_CoTaskMemAlloc(void *this, ULONG size) { return CoTaskMemAlloc(size); @@ -1701,6 +1654,71 @@ static HRESULT PropertyStorage_ReadSectionHeaderFromStream(IStream *stm, return hr; } +/* Reads the dictionary from the memory buffer beginning at ptr. Interprets + * the entries according to the values of This->codePage and This->locale. + */ +static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This, const struct read_buffer *buffer, + size_t offset) +{ + DWORD numEntries, i; + HRESULT hr; + + assert(This->name_to_propid); + assert(This->propid_to_name); + + if (FAILED(hr = buffer_read_dword(buffer, offset, &numEntries))) + return hr; + + TRACE("Reading %d entries:\n", numEntries); + + offset += sizeof(DWORD); + + for (i = 0; SUCCEEDED(hr) && i < numEntries; i++) + { + PROPID propid; + DWORD cbEntry; + WCHAR ch = 0; + + if (SUCCEEDED(hr = buffer_read_dword(buffer, offset, &propid))) + hr = buffer_read_dword(buffer, offset + sizeof(PROPID), &cbEntry); + if (FAILED(hr)) + break; + + offset += sizeof(PROPID) + sizeof(DWORD); + + if (FAILED(hr = buffer_test_offset(buffer, offset, This->codePage == CP_UNICODE ? + ALIGNED_LENGTH(cbEntry * sizeof(WCHAR), 3) : cbEntry))) + { + WARN("Broken name length for entry %d.\n", i); + return hr; + } + + /* Make sure the source string is NULL-terminated */ + if (This->codePage != CP_UNICODE) + buffer_read_byte(buffer, offset + cbEntry - 1, (BYTE *)&ch); + else + buffer_read_word(buffer, offset + (cbEntry - 1) * sizeof(WCHAR), &ch); + + if (ch) + { + WARN("Dictionary entry name %d is not null-terminated.\n", i); + return E_FAIL; + } + + TRACE("Reading entry with ID %#x, %d chars, name %s.\n", propid, cbEntry, This->codePage == CP_UNICODE ? + debugstr_wn((WCHAR *)buffer->data, cbEntry) : debugstr_an((char *)buffer->data, cbEntry)); + + hr = PropertyStorage_StoreNameWithId(This, (char *)buffer->data + offset, This->codePage, propid); + /* Unicode entries are padded to DWORD boundaries */ + if (This->codePage == CP_UNICODE) + cbEntry = ALIGNED_LENGTH(cbEntry * sizeof(WCHAR), 3); + + offset += cbEntry; + } + + return hr; +} + static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) { struct read_buffer read_buffer; @@ -1877,8 +1895,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) This->locale = LOCALE_SYSTEM_DEFAULT; TRACE("Code page is %d, locale is %d\n", This->codePage, This->locale); if (dictOffset) - hr = PropertyStorage_ReadDictionary(This, - buf + dictOffset - sizeof(PROPERTYSECTIONHEADER)); + hr = PropertyStorage_ReadDictionary(This, &read_buffer, dictOffset - sizeof(PROPERTYSECTIONHEADER)); end: HeapFree(GetProcessHeap(), 0, buf);

1 0