December 2018 - Wine-Commits

Dmitry Timoshkov : windowscodecs: Add support for palette image formats to TIFF encoder.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: d13d34d10194c087af4dfa05e0fb9c2be31d9d1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d13d34d10194c087af4dfa05… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:05:53 2018 +0300 windowscodecs: Add support for palette image formats to TIFF encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/main.c | 2 +- dlls/windowscodecs/regsvr.c | 5 +++++ dlls/windowscodecs/tests/converter.c | 3 --- dlls/windowscodecs/tiffformat.c | 32 ++++++++++++++++++++++++++++++-- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 6f781b8..7650c75 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -182,7 +182,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, if (FAILED(hr)) { ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr); - return hr; + return E_NOTIMPL; } stride = (bpp * width + 7)/8; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 3f53591..ca02ff9 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1211,6 +1211,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, @@ -1370,6 +1372,9 @@ static GUID const * const tiff_encode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index df3cf3b..44a2c08 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1510,8 +1510,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in test_encoder(&testdata_BlackWhite, &CLSID_WICTiffEncoder, &testdata_BlackWhite, &CLSID_WICTiffDecoder, "TIFF encoder BlackWhite"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, @@ -1520,7 +1518,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); -} test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 81c6394..01d62d9 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -461,6 +462,12 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->bpp = bps; switch (bps) { + case 1: + decode_info->format = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + decode_info->format = &GUID_WICPixelFormat2bppIndexed; + break; case 4: decode_info->format = &GUID_WICPixelFormat4bppIndexed; break; @@ -469,7 +476,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) break; default: FIXME("unhandled indexed bit count %u\n", bps); - return E_FAIL; + return E_NOTIMPL; } break; case 4: /* Transparency mask */ @@ -1408,6 +1415,9 @@ static const struct tiff_encode_format formats[] = { {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {&GUID_WICPixelFormat1bppIndexed, 3, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat4bppIndexed, 3, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppIndexed, 3, 8, 1, 8, 0, 0, 0}, {0} }; @@ -1579,9 +1589,12 @@ static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *ifac return WINCODEC_ERR_WRONGSTATE; } + if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormat2bppIndexed)) + *pPixelFormat = GUID_WICPixelFormat4bppIndexed; + for (i=0; formats[i].guid; i++) { - if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + if (IsEqualGUID(formats[i].guid, pPixelFormat)) break; } @@ -1690,6 +1703,21 @@ static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, pTIFFSetField(This->parent->tiff, TIFFTAG_YRESOLUTION, (float)This->yres); } + if (This->format->bpp <= 8 && This->colors && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite)) + { + uint16 red[256], green[256], blue[256]; + UINT i; + + for (i = 0; i < This->colors; i++) + { + red[i] = (This->palette[i] >> 8) & 0xff00; + green[i] = This->palette[i] & 0xff00; + blue[i] = (This->palette[i] << 8) & 0xff00; + } + + pTIFFSetField(This->parent->tiff, TIFFTAG_COLORMAP, red, green, blue); + } + This->info_written = TRUE; }

1 0

Alexandre Julliard : testbot: Fix a typo.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: tools Branch: master Commit: 1db885b190f1375b3f3afd680700f731623ab647 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1db885b190f1375b3f3afd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 6 19:27:28 2018 +0100 testbot: Fix a typo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 99d7b70..e06f515 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -72,7 +72,7 @@ sub GenerateHeaderCell($$$) { my ($self, $PropertyDescriptor) = @_; - my $PropertyName = $PropertyDescriptor->GetName() + my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Ended") { print "<th><a class='title' title='Ended'>Time</a></th>\n";

1 0

Francois Gouget : testbot/TestAgent: Don't append a '\0' when sending data.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: tools Branch: master Commit: 18afecb4b786e7069e989d1400ee86ccbc818141 URL: https://source.winehq.org/git/tools.git/?a=commit;h=18afecb4b786e7069e989d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 01:39:20 2018 +0100 testbot/TestAgent: Don't append a '\0' when sending data. _SendString() is used to both send data, typically the content of files, and perl strings. In the first case $Type is 'd', and in the latter 's' and a trailing '\0' is added to match the C convention. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 8957b9f..a128e34 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -791,10 +791,12 @@ sub _SendUInt64($$$) sub _SendString($$$;$) { my ($self, $Name, $Str, $Type) = @_; + $Type ||= 's'; + debug(" SendString('$Name', '$Str', '$Type')\n"); - debug(" SendString('$Name', '$Str')\n"); - $Str .= "\0"; - return $self->_SendEntryHeader($Name, $Type || 's', length($Str)) && + # Add a trailing '\0' to strings to match the C convention. + $Str .= "\0" if ($Type eq 's'); + return $self->_SendEntryHeader($Name, $Type, length($Str)) && $self->_SendRawData($Name, $Str); }

1 0

Francois Gouget : testbot/web: Show the job and task run time.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: tools Branch: master Commit: 3d2b36946eb1ee9e22b476e93e09162b117c6949 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3d2b36946eb1ee9e22b476e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 5 14:02:31 2018 +0100 testbot/web: Show the job and task run time. The run time is shown instead of the end time, though the latter is still visible as a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 19 ++++++++++---- testbot/web/JobDetails.pl | 35 ++++++++++++++++++++++++++ testbot/web/index.pl | 35 ++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 105280e..f9e590c 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -81,12 +81,21 @@ function Pad2(n) { return n < 10 ? '0' + n : n; } -function ShowDateTime(Sec1970) + +function ShowDateTime(Sec1970, Id, Attr) { var Dt = new Date(Sec1970 * 1000); - document.write(Dt.getFullYear() + '/' + Pad2(Dt.getMonth() + 1) + '/' + - Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + - Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds())); + var Pretty = Dt.getFullYear() + '/' + Pad2(Dt.getMonth() + 1) + '/' + + Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + + Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds()) + if (Id != null) + { + document.getElementById(Id).setAttribute(Attr || "title", Pretty); + } + else + { + document.write(Pretty); + } } //--></script> EOF @@ -450,7 +459,7 @@ sub GetDisplayValue($$$) { if (defined($Value)) { -$Value = + $Value = "<noscript><div>" . strftime("%Y/%m/%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . "<script type='text/javascript'></script>\n"; + print "</td>\n"; + } + else + { + print "<td> </td>\n"; + } + } else { $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 37b41ea..99d7b70 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -24,10 +24,12 @@ package JobStatusBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); +use POSIX qw(strftime); use URI::Escape; use WineTestBot::Branches; use WineTestBot::Users; +use WineTestBot::Utils; @@ -66,6 +68,21 @@ sub DisplayProperty($$) return $self->SUPER::DisplayProperty($PropertyDescriptor); } +sub GenerateHeaderCell($$$) +{ + my ($self, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName() + if ($PropertyName eq "Ended") + { + print "<th><a class='title' title='Ended'>Time</a></th>\n"; + } + else + { + return $self->SUPER::GenerateHeaderCell($PropertyDescriptor); + } +} + sub GetDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_; @@ -135,6 +152,24 @@ sub GenerateDataCell($$$$) } print "</a></td>\n"; } + elsif ($PropertyName eq "Ended") + { + if (defined $Item->Ended) + { + my $Duration = $Item->Ended - $Item->Submitted; + my $TagId = "E". $Item->Id; + print "<td><a id='$TagId' class='title' title='", + strftime("%Y/%m/%d %H:%M:%S", localtime($Item->Ended)), + "'>", DurationToString($Duration), "</a>\n"; + print "<script type='text/javascript'></script>\n"; + print "</td>\n"; + } + else + { + print "<td> </td>\n"; + } + } else { $self->SUPER::GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage);

1 0

Akihiro Sagawa : loader/wine.inf: Remove obsolete time zone entries.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: aa99e9f524a03e7928e95f52de253fad70b27397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa99e9f524a03e7928e95f52… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 6 00:01:39 2018 +0900 loader/wine.inf: Remove obsolete time zone entries. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 5a3f8c4..c11d683 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2667,7 +2667,7 @@ system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" ; http://www.twinsun.com/tz/tz-link.htm ; The mapping of Windows timezone names to Olson Tzids is based on the ; Unicode.org CLDR data: -; http://unicode.org/cldr/data/diff/supplemental/windows_tzid.html +; https://www.unicode.org/cldr/charts/latest/supplemental/zone_tzid.html HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Display",,"Asia/Kabul" HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Dlt",,"Afghanistan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Std",,"Afghanistan Standard Time" @@ -2692,10 +2692,6 @@ HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Display",,"America/B HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Dlt",,"Argentina Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Std",,"Argentina Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Armenian Standard Time,"Display",,"Asia/Yerevan" -HKLM,%CurrentVersionNT%\Time Zones\Armenian Standard Time,"Dlt",,"Armenian Daylight Time" -HKLM,%CurrentVersionNT%\Time Zones\Armenian Standard Time,"Std",,"Armenian Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Armenian Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Display",,"America/Halifax" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Dlt",,"Atlantic Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Std",,"Atlantic Standard Time" @@ -3050,18 +3046,6 @@ HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Display",,"Indian/Ma HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Dlt",,"Mauritius Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Std",,"Mauritius Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Display",,"America/Mexico_City" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Dlt",,"Mexico Daylight Time" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Std",,"Mexico Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time 2,"Display",,"America/Chihuahua" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time 2,"Dlt",,"Mexico Daylight Time 2" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time 2,"Std",,"Mexico Standard Time 2" -HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time 2,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Mid-Atlantic Standard Time,"Display",,"America/Noronha" -HKLM,%CurrentVersionNT%\Time Zones\Mid-Atlantic Standard Time,"Dlt",,"Mid-Atlantic Daylight Time" -HKLM,%CurrentVersionNT%\Time Zones\Mid-Atlantic Standard Time,"Std",,"Mid-Atlantic Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Mid-Atlantic Standard Time,"TZI",1,78,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Display",,"Asia/Beirut" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Dlt",,"Middle East Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Std",,"Middle East Standard Time"

1 0

Michael Stefaniuc : ntoskrnl.exe: Drop the WINE_ prefix from debug functions.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 7a43ea94ee01a33d781fc11fb8d34b83619f9e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a43ea94ee01a33d781fc11f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 5 18:57:40 2018 +0100 ntoskrnl.exe: Drop the WINE_ prefix from debug functions. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2b3b2ec..aea7d44 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3323,8 +3323,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) { - WINE_TRACE( "%s: relocating from %p to %p\n", - wine_dbgstr_w(name), (char *)module - delta, module ); + TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); while (rel < end && rel->SizeOfBlock) { @@ -3379,7 +3378,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn if (RegOpenKeyW( HKEY_LOCAL_MACHINE, keyname->Buffer + 18 /* skip \registry\machine */, &driver_hkey )) { - WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); + ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); return NULL; } @@ -3435,7 +3434,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn } RegCloseKey( driver_hkey ); - WINE_TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); + TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); module = load_driver_module( str ); HeapFree( GetProcessHeap(), 0, path ); @@ -3473,12 +3472,12 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING TRACE_(relay)( "\1Ret driver init %p (obj=%p,str=%s) retval=%08x\n", driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status ); - WINE_TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); - WINE_TRACE( "- DriverInit = %p\n", driver_object->DriverInit ); - WINE_TRACE( "- DriverStartIo = %p\n", driver_object->DriverStartIo ); - WINE_TRACE( "- DriverUnload = %p\n", driver_object->DriverUnload ); + TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); + TRACE( "- DriverInit = %p\n", driver_object->DriverInit ); + TRACE( "- DriverStartIo = %p\n", driver_object->DriverStartIo ); + TRACE( "- DriverUnload = %p\n", driver_object->DriverUnload ); for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - WINE_TRACE( "- MajorFunction[%d] = %p\n", i, driver_object->MajorFunction[i] ); + TRACE( "- MajorFunction[%d] = %p\n", i, driver_object->MajorFunction[i] ); return status; }

1 0

Alexandre Julliard : loader: Duplicate some preloader code instead of trying to share it.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: df8c5a37ecf236085de4f81a225ab06009ee46ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=df8c5a37ecf236085de4f81a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 21:17:05 2018 +0100 loader: Duplicate some preloader code instead of trying to share it. This mostly reverts bd2d795240d996f6cc8884b33e28ea15c2d47afe. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 328 +++++++++++++++++++++++++++---------------------- loader/preloader.h | 66 ---------- loader/preloader_mac.c | 160 +++++++++++++++++++++++- 3 files changed, 337 insertions(+), 217 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df8c5a37ecf236085de4…

1 0

Akihiro Sagawa : loader/wine.inf: Update display names as seen in mapping tables.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 628e8c30d271d86a41f9ebf6ff7838683f0cb102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=628e8c30d271d86a41f9ebf6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 6 00:01:44 2018 +0900 loader/wine.inf: Update display names as seen in mapping tables. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=628e8c30d271d86a41f9…

1 0

Michael Stefaniuc : shcore: Print the debugstr instead of the pointer to it.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 1ab06f46659b63b15e3765f40b30394ea8bc7b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ab06f46659b63b15e3765f4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 5 18:57:39 2018 +0100 shcore: Print the debugstr instead of the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index c5b9856..a544f27 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2285,7 +2285,7 @@ DWORD WINAPI SHSetValueA(HKEY hkey, const char *subkey, const char *value, */ DWORD WINAPI SHRegSetPathA(HKEY hkey, const char *subkey, const char *value, const char *path, DWORD flags) { - FIXME("(%p, %s, %s, %p, %#x) - semi-stub\n", hkey, debugstr_a(subkey), + FIXME("(%p, %s, %s, %s, %#x) - semi-stub\n", hkey, debugstr_a(subkey), debugstr_a(value), debugstr_a(path), flags); /* FIXME: PathUnExpandEnvStringsA() */

1 0

Akihiro Sagawa : loader/wine.inf: Remove non-standard Chile Standard Time.
by Alexandre Julliard Dec. 5, 2018

Dec. 5, 2018

Module: wine Branch: master Commit: 7e83b006aca9a1bc65871bcd4c6523fa20cd69c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e83b006aca9a1bc65871bcd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 6 00:01:42 2018 +0900 loader/wine.inf: Remove non-standard Chile Standard Time. Use Pacific SA Standard Time instead. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c11d683..9ba283f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2779,13 +2779,6 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Display",,"Am HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Dlt",,"Central Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Std",,"Central Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Display",,"Chile/Continental" -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Dlt",,"Chile Daylight Time" -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Std",,"Chile Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,00,00,1a,00,01,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time\Dynamic DST,"LastEntry",0x10001,2015 HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Display",,"Asia/Shanghai" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Dlt",,"China Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Std",,"China Standard Time" @@ -3110,7 +3103,10 @@ HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"TZI",1,5c,fe,ff,ff, HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Display",,"America/Santiago" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Dlt",,"Pacific SA Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Std",,"Pacific SA Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,00,00,1a,00,01,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"LastEntry",0x10001,2015 HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Display",,"America/Los_Angeles" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Dlt",,"Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Std",,"Pacific Standard Time"

1 0