November 2020 - Wine-Commits

Alistair Leslie-Hughes : include: Add IRowsetUpdate interface.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: ec9311ebd6642d336a0567f1afca7363ec27a7ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9311ebd6642d336a0567f1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 11 21:32:55 2020 +1100 include: Add IRowsetUpdate interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/rstupd.idl | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 24439dc7522..3df4da64233 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -616,6 +616,7 @@ SOURCES = \ rstinf.idl \ rstloc.idl \ rstnot.idl \ + rstupd.idl \ rtutils.h \ rtworkq.idl \ sal.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 256d5fc7917..5609e219320 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -75,6 +75,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "cvttyp.idl" #include "cmdpre.idl" #include "rstchg.idl" +#include "rstupd.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/rstupd.idl b/include/rstupd.idl new file mode 100644 index 00000000000..c823658edba --- /dev/null +++ b/include/rstupd.idl @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + local, + object, + uuid(0c733a6d-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetUpdate : IRowsetChange +{ + typedef DWORD DBPENDINGSTATUS; + + enum DBPENDINGSTATUSENUM + { + DBPENDINGSTATUS_NEW = 0x01, + DBPENDINGSTATUS_CHANGED = 0x02, + DBPENDINGSTATUS_DELETED = 0x04, + DBPENDINGSTATUS_UNCHANGED = 0x08, + DBPENDINGSTATUS_INVALIDROW = 0x10, + }; + + HRESULT GetOriginalData([in] HROW row, [in] HACCESSOR accessor, [out] void *data ); + + HRESULT GetPendingRows([in] HCHAPTER reserved, [in] DBPENDINGSTATUS status, [in, out] DBCOUNTITEM *pending_cnt, + [out, size_is(,*pending_cnt)] HROW **rending_rows, + [out, size_is(,*pending_cnt)] DBPENDINGSTATUS **pending_status); + + HRESULT GetRowStatus([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [out, size_is(count)] DBPENDINGSTATUS status[]); + + HRESULT Undo([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [in, out] DBCOUNTITEM *undone_cnt, [out, size_is(,*undone_cnt)] HROW **undone, + [out, size_is(,*undone_cnt)] DBROWSTATUS ** status); + + HRESULT Update([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [in, out] DBCOUNTITEM *row_cnt, [out, size_is(,*row_cnt)] HROW **hrows, + [out, size_is(,*row_cnt)] DBROWSTATUS **status); +}

1 0

Paul Gofman : mshtml: Check for EVENTID_LAST in ensure_doc_nsevent_handler().
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 8ea89841964c6df98aa6230cc66ef1fd07c543eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea89841964c6df98aa6230c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 11 20:27:55 2020 +0300 mshtml: Check for EVENTID_LAST in ensure_doc_nsevent_handler(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50110 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0f041cbae6c..0bf3de54a96 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2832,6 +2832,8 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, nsIDOMNode *nsnode, ev doc->event_vector[eid] = TRUE; eid = EVENTID_BLUR; break; + case EVENTID_LAST: + return S_OK; default: break; }

1 0

Jacek Caban : kernel32: Allow non-console handles in DuplicateConsoleHandle.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 1335768f0a0e2e520c786edfddd2895a57bc4dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1335768f0a0e2e520c786edf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:06:39 2020 +0100 kernel32: Allow non-console handles in DuplicateConsoleHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 10 +++------- dlls/kernel32/tests/console.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4b74c1183ca..8d5f8181ffe 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -113,13 +113,9 @@ BOOL WINAPI VerifyConsoleIoHandle(HANDLE handle) HANDLE WINAPI DuplicateConsoleHandle(HANDLE handle, DWORD access, BOOL inherit, DWORD options) { - HANDLE ret; - - if (!is_console_handle(handle) || - !DuplicateHandle(GetCurrentProcess(), wine_server_ptr_handle(console_handle_unmap(handle)), - GetCurrentProcess(), &ret, access, inherit, options)) - return INVALID_HANDLE_VALUE; - return console_handle_map(ret); + HANDLE ret; + return DuplicateHandle(GetCurrentProcess(), handle, GetCurrentProcess(), &ret, + access, inherit, options) ? ret : INVALID_HANDLE_VALUE; } /****************************************************************** diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 4a06a2b396e..69005bab5f1 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1506,6 +1506,34 @@ static void test_GetSetStdHandle(void) ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); } +static void test_DuplicateConsoleHandle(void) +{ + HANDLE handle, event; + BOOL ret; + + if (skip_nt) return; + + event = CreateEventW(NULL, TRUE, FALSE, NULL); + + /* duplicate an event handle with DuplicateConsoleHandle */ + handle = DuplicateConsoleHandle(event, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(handle != NULL, "DuplicateConsoleHandle failed: %u\n", GetLastError()); + + ret = SetEvent(handle); + ok(ret, "SetEvent failed: %u\n", GetLastError()); + + ret = CloseConsoleHandle(handle); + todo_wine + ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); + ret = CloseConsoleHandle(event); + todo_wine + ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); + + handle = DuplicateConsoleHandle((HANDLE)0xdeadbeef, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(handle == INVALID_HANDLE_VALUE, "DuplicateConsoleHandle failed: %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error = %u\n", GetLastError()); +} + static void test_GetNumberOfConsoleInputEvents(HANDLE input_handle) { DWORD count; @@ -4387,6 +4415,7 @@ START_TEST(console) test_OpenCON(); test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle(); + test_DuplicateConsoleHandle(); test_GetNumberOfConsoleInputEvents(hConIn); test_WriteConsoleInputA(hConIn); test_WriteConsoleInputW(hConIn);

1 0

Jacek Caban : conhost: Use console debug channel.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 1f15ddce9c7d0ee71521d7b98c698488b76d3f01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f15ddce9c7d0ee71521d7b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:07:13 2020 +0100 conhost: Use console debug channel. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- programs/conhost/window.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 6985a9ca0b0..c7562974222 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -26,7 +26,7 @@ #include "wine/server.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(conhost); +WINE_DEFAULT_DEBUG_CHANNEL(console); static const char_info_t empty_char_info = { ' ', 0x0007 }; /* white on black space */ diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 5ec435a33ed..3d83632fabf 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -27,7 +27,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(conhost); +WINE_DEFAULT_DEBUG_CHANNEL(console); #define WM_UPDATE_CONFIG (WM_USER + 1)

1 0

Jacek Caban : conhost/tests: Initialize whole OVERLAPPED struct in fetch_console_output.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 817ff31811dda0b4cadc9cc4f0c36b5cd5776917 URL: https://source.winehq.org/git/wine.git/?a=commit;h=817ff31811dda0b4cadc9cc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:07:06 2020 +0100 conhost/tests: Initialize whole OVERLAPPED struct in fetch_console_output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 1e2f9550727..4eb85a17a01 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -37,6 +37,7 @@ static void fetch_console_output_(unsigned int line) if (console_output_count == sizeof(console_output)) return; + memset(&o, 0, sizeof(o)); o.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ret = ReadFile(console_pipe, console_output + console_output_count, sizeof(console_output) - console_output_count, NULL, &o);

1 0

Piotr Caban : ucrtbase: Add support for utf8 codepage in setlocale.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: e460b37a25226f36b973a66b613e2542b1f9cc16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e460b37a25226f36b973a66b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 11 18:49:08 2020 +0100 ucrtbase: Add support for utf8 codepage in setlocale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c49439951a9..fda3d11b86d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -351,6 +351,11 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *s } else if (!MSVCRT__strnicmp(cp, ".OCP", 4)) { GetLocaleInfoW(lcid, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR *)&locale_cp, sizeof(DWORD)/sizeof(WCHAR)); +#if _MSVCR_VER >= 140 + } else if (!MSVCRT__strnicmp(cp, ".UTF-8", 6) + || !MSVCRT__strnicmp(cp, ".UTF8", 5)) { + locale_cp = CP_UTF8; +#endif } else { locale_cp = atoi(cp + 1); }

1 0

Nikolay Sivov : mf/session: Forward MEQualityNotify event to the quality manager.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 3b230b58c89aaabb567f1e47ad1494a6d48803b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b230b58c89aaabb567f1e47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:51 2020 +0300 mf/session: Forward MEQualityNotify event to the quality manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 5bbd47b3418..d586f1c6be9 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2910,6 +2910,7 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM IMFMediaEventGenerator *event_source; IMFMediaEvent *event = NULL; MediaEventType event_type; + IUnknown *object = NULL; IMFMediaSource *source; IMFMediaStream *stream; PROPVARIANT value; @@ -3057,6 +3058,21 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM (IMFStreamSink *)event_source); LeaveCriticalSection(&session->cs); + break; + case MEQualityNotify: + + if (session->quality_manager) + { + if (FAILED(IMFMediaEventGenerator_QueryInterface(event_source, &IID_IMFStreamSink, (void **)&object))) + IMFMediaEventGenerator_QueryInterface(event_source, &IID_IMFTransform, (void **)&object); + + if (object) + { + IMFQualityManager_NotifyQualityEvent(session->quality_manager, object, event); + IUnknown_Release(object); + } + } + break; default: ;

1 0

Nikolay Sivov : mf/session: Notify quality manager when setting new topology.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: fd22009339383227896e771605c5e55e10ae9f00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd22009339383227896e7716… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:49 2020 +0300 mf/session: Notify quality manager when setting new topology. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 0fa6b49498d..8d5ff6d5c07 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -42,7 +42,9 @@ enum session_command SESSION_CMD_START, SESSION_CMD_PAUSE, SESSION_CMD_STOP, - SESSION_CMD_END, /* Internal use only. */ + /* Internally used commands. */ + SESSION_CMD_END, + SESSION_CMD_QM_NOTIFY_TOPOLOGY, }; struct session_op @@ -62,6 +64,10 @@ struct session_op GUID time_format; PROPVARIANT start_position; } start; + struct + { + IMFTopology *topology; + } notify_topology; } u; struct list entry; }; @@ -492,6 +498,10 @@ static ULONG WINAPI session_op_Release(IUnknown *iface) case SESSION_CMD_START: PropVariantClear(&op->u.start.start_position); break; + case SESSION_CMD_QM_NOTIFY_TOPOLOGY: + if (op->u.notify_topology.topology) + IMFTopology_Release(op->u.notify_topology.topology); + break; default: ; } @@ -1301,9 +1311,21 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo DWORD caps, object_flags; struct media_sink *sink; struct topo_node *node; + struct session_op *op; IMFMediaEvent *event; HRESULT hr; + if (session->quality_manager) + { + if (SUCCEEDED(create_session_op(SESSION_CMD_QM_NOTIFY_TOPOLOGY, &op))) + { + op->u.notify_topology.topology = topology; + IMFTopology_AddRef(op->u.notify_topology.topology); + session_submit_command(session, op); + IUnknown_Release(&op->IUnknown_iface); + } + } + if (FAILED(hr = IMFTopology_CloneFrom(session->presentation.current_topology, topology))) { WARN("Failed to clone topology, hr %#x.\n", hr); @@ -1929,6 +1951,9 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, case SESSION_CMD_CLOSE: session_close(session); break; + case SESSION_CMD_QM_NOTIFY_TOPOLOGY: + IMFQualityManager_NotifyTopology(session->quality_manager, op->u.notify_topology.topology); + break; default: ; } @@ -4481,7 +4506,7 @@ static HRESULT WINAPI standard_quality_manager_NotifyTopology(IMFQualityManager { FIXME("%p, %p stub.\n", iface, topology); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualityManager *iface,

1 0

Alexandre Julliard : mscms: Install the sRGB color profile.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: e06ae69d2cdd757843208175dfa27436191101e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e06ae69d2cdd757843208175… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:06:06 2020 +0100 mscms: Install the sRGB color profile. Based on a patch by Alex Henrie. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37396 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/srgb2014.icc | Bin 0 -> 3024 bytes dlls/mscms/version.rc | 3 +++ loader/wine.inf.in | 14 ++++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/mscms/srgb2014.icc b/dlls/mscms/srgb2014.icc new file mode 100644 index 00000000000..49afbfef10f Binary files /dev/null and b/dlls/mscms/srgb2014.icc differ diff --git a/dlls/mscms/version.rc b/dlls/mscms/version.rc index 11ebdd64b09..05ebf0c959f 100644 --- a/dlls/mscms/version.rc +++ b/dlls/mscms/version.rc @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: srgb2014.icc */ +1 WINE_DATA_FILE srgb2014.icc + #define WINE_FILEDESCRIPTION_STR "Wine Color Management System" #define WINE_FILENAME_STR "mscms.dll" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index da21245954e..5210672c295 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -54,7 +54,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -2667,14 +2667,12 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [FakeDlls] ; create some directories first 10,help, -10,inf, 10,logs, 10,tasks, 10,temp, 11,catroot, 11,mui, 11,tasks, -11,spool\drivers\color, 11,spool\printers, 10,,explorer.exe 10,,hh.exe @@ -4058,6 +4056,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 +[ColorFiles] +srgb color space profile.icm,"@mscms.dll,-1" + [InfFiles] winebus.inf,"@winebus.sys,-1" winehid.inf,"@winehid.sys,-1" @@ -4145,6 +4146,7 @@ NlsFiles = nls SortFiles = nls [DestinationDirs] +ColorFiles = 23 InfFiles = 17 NlsFiles = 11 SortFiles = 10,globalization\sorting

1 0

Alexandre Julliard : mscms/tests: Avoid depending on the exact Microsoft color profile.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 42cb8e802773d82d3e5b9e66ec59841582f6cb7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=42cb8e802773d82d3e5b9e66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:05:39 2020 +0100 mscms/tests: Avoid depending on the exact Microsoft color profile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/tests/profile.c | 53 ++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 2ef20129e63..15a0533145d 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -236,13 +236,8 @@ static void test_GetColorProfileElement( char *standardprofile ) BOOL ret, ref; DWORD size; TAGTYPE tag = 0x63707274; /* 'cprt' */ - static char buffer[51]; - static const char expect[] = - { 0x74, 0x65, 0x78, 0x74, 0x00, 0x00, 0x00, 0x00, 0x43, 0x6f, 0x70, - 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x29, 0x20, - 0x31, 0x39, 0x39, 0x38, 0x20, 0x48, 0x65, 0x77, 0x6c, 0x65, 0x74, - 0x74, 0x2d, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x72, 0x64, 0x20, 0x43, - 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x00 }; + char buffer[256]; + static const char expect[] = "text\0\0\0\0Copyright"; profile.dwType = PROFILE_FILENAME; profile.pProfileData = standardprofile; @@ -270,7 +265,7 @@ static void test_GetColorProfileElement( char *standardprofile ) ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); ok( size > 0, "wrong size\n" ); - ok( !memcmp( buffer, expect, sizeof(expect) ), "Unexpected tag data\n" ); + ok( !memcmp( buffer, expect, sizeof(expect)-1 ), "Unexpected tag data\n" ); pCloseColorProfile( handle ); } @@ -309,7 +304,7 @@ static void test_GetColorProfileElementTag( char *standardprofile ) /* Functional checks */ - ret = pGetColorProfileElementTag( handle, index, &tag ); + while ((ret = pGetColorProfileElementTag( handle, index, &tag )) && tag != expect) index++; ok( ret && tag == expect, "GetColorProfileElementTag() failed (%d)\n", GetLastError() ); @@ -321,20 +316,11 @@ static void test_GetColorProfileFromHandle( char *testprofile ) { if (testprofile) { + PROFILEHEADER *header; PROFILE profile; HPROFILE handle; DWORD size; BOOL ret; - static const unsigned char expect[] = - { 0x00, 0x00, 0x0c, 0x48, 0x4c, 0x69, 0x6e, 0x6f, 0x02, 0x10, 0x00, - 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, - 0x5a, 0x20, 0x07, 0xce, 0x00, 0x02, 0x00, 0x09, 0x00, 0x06, 0x00, - 0x31, 0x00, 0x00, 0x61, 0x63, 0x73, 0x70, 0x4d, 0x53, 0x46, 0x54, - 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x43, 0x20, 0x73, 0x52, 0x47, - 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x00, 0xd3, 0x2d, 0x48, 0x50, 0x20, 0x20 }; - unsigned char *buffer; profile.dwType = PROFILE_FILENAME; @@ -366,7 +352,16 @@ static void test_GetColorProfileFromHandle( char *testprofile ) ret = pGetColorProfileFromHandle( handle, buffer, &size ); ok( ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); - ok( !memcmp( buffer, expect, sizeof(expect) ), "Unexpected header data\n" ); + header = (PROFILEHEADER *)buffer; + ok( header->phClass == 0x72746e6d, "wrong phClass %x\n", header->phClass ); + ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %x\n", header->phDataColorSpace ); + ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %x\n", header->phConnectionSpace ); + ok( header->phSignature == 0x70736361, "wrong phSignature %x\n", header->phSignature ); + ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header->phProfileFlags ); + ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header->phRenderingIntent ); + ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %x\n", header->phIlluminant.ciexyzX ); + ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %x\n", header->phIlluminant.ciexyzY ); + ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %x\n", header->phIlluminant.ciexyzZ ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -410,7 +405,15 @@ static void test_GetColorProfileHeader( char *testprofile ) ret = pGetColorProfileHeader( handle, &header ); ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); - ok( !memcmp( &header, rgbheader, sizeof(rgbheader) ), "Unexpected header data\n" ); + ok( header.phClass == 0x6d6e7472, "wrong phClass %x\n", header.phClass ); + ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %x\n", header.phDataColorSpace ); + ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %x\n", header.phConnectionSpace ); + ok( header.phSignature == 0x61637370, "wrong phSignature %x\n", header.phSignature ); + ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header.phProfileFlags ); + ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header.phRenderingIntent ); + ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %x\n", header.phIlluminant.ciexyzX ); + ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %x\n", header.phIlluminant.ciexyzY ); + ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %x\n", header.phIlluminant.ciexyzZ ); pCloseColorProfile( handle ); } @@ -423,7 +426,7 @@ static void test_GetCountColorProfileElements( char *standardprofile ) PROFILE profile; HPROFILE handle; BOOL ret; - DWORD count, expect = 17; + DWORD count; profile.dwType = PROFILE_FILENAME; profile.pProfileData = standardprofile; @@ -445,8 +448,8 @@ static void test_GetCountColorProfileElements( char *standardprofile ) /* Functional checks */ ret = pGetCountColorProfileElements( handle, &count ); - ok( ret && count == expect, - "GetCountColorProfileElements() failed (%d)\n", GetLastError() ); + ok( ret && count > 15 && count < 20, + "GetCountColorProfileElements() failed (%d) %u\n", GetLastError(), count ); pCloseColorProfile( handle ); } @@ -1020,7 +1023,7 @@ static void test_SetColorProfileElement( char *testprofile ) TAGTYPE tag = 0x63707274; /* 'cprt' */ static char data[] = "(c) The Wine Project"; - static char buffer[51]; + char buffer[256]; profile.dwType = PROFILE_FILENAME; profile.pProfileData = testprofile;

1 0