March 2019 - Wine-Commits - list.winehq.org

Jacek Caban : crypt32: Added support for szOID_NIST_sha* OIDs.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 0947abe05d04a209f6688c7cdc38dde2abe3626d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0947abe05d04a209f6688c7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 29 19:51:21 2018 +0100 crypt32: Added support for szOID_NIST_sha* OIDs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 86c998e551f25cbd0c04379ce17d4f3ec1161fac) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/oid.c | 7 +++++++ dlls/crypt32/tests/oid.c | 25 ++++++++++++++++++++----- include/wincrypt.h | 3 +++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index d5c2953..5a447d0 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -1053,6 +1053,9 @@ static const WCHAR rc2[] = { 'r','c','2',0 }; static const WCHAR rc4[] = { 'r','c','4',0 }; static const WCHAR sha[] = { 's','h','a',0 }; static const WCHAR sha1[] = { 's','h','a','1',0 }; +static const WCHAR sha256[] = { 's','h','a','2','5','6',0 }; +static const WCHAR sha384[] = { 's','h','a','3','8','4',0 }; +static const WCHAR sha512[] = { 's','h','a','5','1','2',0 }; static const WCHAR RSA[] = { 'R','S','A',0 }; static const WCHAR RSA_KEYX[] = { 'R','S','A','_','K','E','Y','X',0 }; static const WCHAR RSA_SIGN[] = { 'R','S','A','_','S','I','G','N',0 }; @@ -1157,6 +1160,10 @@ static const struct OIDInfoConstructor { { 1, szOID_RSA_MD5, CALG_MD5, md5, NULL }, { 1, szOID_RSA_MD4, CALG_MD4, md4, NULL }, { 1, szOID_RSA_MD2, CALG_MD2, md2, NULL }, + /* NOTE: Windows Vista+ uses -1 instead of CALG_SHA_* following SHA entries. */ + { 1, szOID_NIST_sha256, CALG_SHA_256, sha256, NULL }, + { 1, szOID_NIST_sha384, CALG_SHA_384, sha384, NULL }, + { 1, szOID_NIST_sha512, CALG_SHA_512, sha512, NULL }, { 2, szOID_OIWSEC_desCBC, CALG_DES, des, NULL }, { 2, szOID_RSA_DES_EDE3_CBC, CALG_3DES, tripledes, NULL }, diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index b661407..8fc67b3 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -36,6 +36,7 @@ struct OIDToAlgID LPCSTR oid; LPCSTR altOid; DWORD algID; + DWORD altAlgID; }; static const struct OIDToAlgID oidToAlgID[] = { @@ -72,6 +73,9 @@ static const struct OIDToAlgID oidToAlgID[] = { { szOID_OIWDIR_md2RSA, NULL, CALG_MD2 }, { szOID_INFOSEC_mosaicUpdatedSig, NULL, CALG_SHA }, { szOID_INFOSEC_mosaicKMandUpdSig, NULL, CALG_DSS_SIGN }, + { szOID_NIST_sha256, NULL, CALG_SHA_256, -1 }, + { szOID_NIST_sha384, NULL, CALG_SHA_384, -1 }, + { szOID_NIST_sha512, NULL, CALG_SHA_512, -1 } }; static const struct OIDToAlgID algIDToOID[] = { @@ -104,10 +108,7 @@ static void testOIDToAlgID(void) for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++) { alg = CertOIDToAlgId(oidToAlgID[i].oid); - /* Not all Windows installations support all these, so make sure it's - * at least not the wrong one. - */ - ok(alg == 0 || alg == oidToAlgID[i].algID, + ok(alg == oidToAlgID[i].algID || (oidToAlgID[i].altAlgID && alg == oidToAlgID[i].altAlgID), "Expected %d, got %d\n", oidToAlgID[i].algID, alg); } } @@ -126,6 +127,7 @@ static void testAlgIDToOID(void) { oid = CertAlgIdToOID(algIDToOID[i].algID); /* Allow failure, not every version of Windows supports every algo */ + ok(oid != NULL || broken(!oid), "CertAlgIdToOID failed, expected %s\n", algIDToOID[i].oid); if (oid) { if (strcmp(oid, algIDToOID[i].oid)) @@ -542,11 +544,13 @@ static void test_enumOIDInfo(void) static void test_findOIDInfo(void) { static WCHAR sha1[] = { 's','h','a','1',0 }; - static CHAR oid_rsa_md5[] = szOID_RSA_MD5; + static CHAR oid_rsa_md5[] = szOID_RSA_MD5, oid_sha256[] = szOID_NIST_sha256; ALG_ID alg = CALG_SHA1; ALG_ID algs[2] = { CALG_MD5, CALG_RSA_SIGN }; PCCRYPT_OID_INFO info; + static const WCHAR sha256W[] = {'s','h','a','2','5','6',0}; + info = CryptFindOIDInfo(0, NULL, 0); ok(info == NULL, "Expected NULL\n"); info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, oid_rsa_md5, 0); @@ -585,6 +589,17 @@ static void test_findOIDInfo(void) ok(U(*info).Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", U(*info).Algid); } + + info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, oid_sha256, 0); + ok(info != NULL, "Expected to find szOID_RSA_MD5\n"); + if (info) + { + ok(!strcmp(info->pszOID, szOID_NIST_sha256), "Expected %s, got %s\n", + szOID_NIST_sha256, info->pszOID); + ok(!lstrcmpW(info->pwszName, sha256W), "pwszName = %s\n", wine_dbgstr_w(info->pwszName)); + ok(U(*info).Algid == CALG_SHA_256 || U(*info).Algid == -1, + "Expected CALG_MD5 or -1, got %d\n", U(*info).Algid); + } } START_TEST(oid) diff --git a/include/wincrypt.h b/include/wincrypt.h index 83db673..87d5e86 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2941,6 +2941,9 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_INFOSEC_mosaicUpdatedSig "2.16.840.1.101.2.1.1.19" #define szOID_INFOSEC_mosaicKMandUpdSig "2.16.840.1.101.2.1.1.20" #define szOID_INFOSEC_mosaicUpdateInteg "2.16.840.1.101.2.1.1.21" +#define szOID_NIST_sha256 "2.16.840.1.101.3.4.2.1" +#define szOID_NIST_sha384 "2.16.840.1.101.3.4.2.2" +#define szOID_NIST_sha512 "2.16.840.1.101.3.4.2.3" #define szOID_COMMON_NAME "2.5.4.3" #define szOID_SUR_NAME "2.5.4.4" #define szOID_DEVICE_SERIAL_NUMBER "2.5.4.5"

1 0

Piotr Caban : msvcr100: Add _ReentrantPPLLock:: _Scoped_lock class implementation.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: b5f01f861403ba957c23899a553325c3526b63b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f01f861403ba957c23899a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 17:03:59 2018 +0100 msvcr100: Add _ReentrantPPLLock::_Scoped_lock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 19ef182c81bbc92aba1f73179d77f376af1d8b38) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ dlls/msvcrt/lock.c | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b5f01f861403ba957c23…

1 0

Louis Lenders : wevtapi: Add stub for EvtExportLog.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: e8ed33af8775624fd948f52ce82bca8a706b15db URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8ed33af8775624fd948f52c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Mar 23 13:23:57 2018 +0100 wevtapi: Add stub for EvtExportLog. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ecbb4fa3ea2d3a9e1d3f560c7e0dea008439db5b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wevtapi/main.c | 7 +++++++ dlls/wevtapi/wevtapi.spec | 2 +- include/winevt.h | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index a978437..9c8bb5d 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -122,3 +122,10 @@ BOOL WINAPI EvtNext(EVT_HANDLE result_set, DWORD size, EVT_HANDLE *array, DWORD SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, const WCHAR *file, DWORD flags) +{ + FIXME("(%p %s %s %s %#x) stub!\n", session, debugstr_w(path), debugstr_w(query), debugstr_w(file), flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index ddd2f32..7e6f15d 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -4,7 +4,7 @@ @ stdcall EvtClose(ptr) @ stub EvtCreateBookmark @ stub EvtCreateRenderContext -@ stub EvtExportLog +@ stub EvtExportLog(ptr wstr wstr wstr long) @ stub EvtFormatMessage @ stdcall EvtGetChannelConfigProperty(ptr long long long ptr ptr) @ stub EvtGetEventInfo diff --git a/include/winevt.h b/include/winevt.h index 6d2ef1a..a37954f 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -114,7 +114,8 @@ typedef struct _EVT_VARIANT { typedef DWORD (WINAPI *EVT_SUBSCRIBE_CALLBACK)(EVT_SUBSCRIBE_NOTIFY_ACTION Action, PVOID UserContext, EVT_HANDLE Event); - +BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, + const WCHAR *file, DWORD flags); BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, DWORD Flags, DWORD PropertyValueBufferSize,

1 0

Alexandre Julliard : user32: Use height from font metrics for empty text runs in TabbedTextOut().
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 2ef6e07c4b1303a9f0f27880505a7998caa2a3c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef6e07c4b1303a9f0f27880… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 8 13:20:36 2018 +0200 user32: Use height from font metrics for empty text runs in TabbedTextOut(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39051 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5d282ec64d1ad815586adcd57ff494b524ed1064) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/text.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 2ac3afd..66cec61 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1387,7 +1387,9 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, } } else x += extent.cx; - + + if (!extent.cy) extent.cy = tm.tmHeight; + if (fDisplayText) { r.top = y; @@ -1400,9 +1402,6 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, lpstr += j; } - if(!extent.cy) - extent.cy = tm.tmHeight; - return MAKELONG(x - start, extent.cy); }

1 0

Bernhard Übelacker : user32: Let nulldrv return some dummy monitor information.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 178d9f1cb6f590298d4c66027e04aa159fb105fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=178d9f1cb6f590298d4c6602… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Oct 2 16:27:41 2018 +0200 user32: Let nulldrv return some dummy monitor information. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43187 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f5bb76f69a96e2b5a5b0953817035a8cbe94153a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/driver.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index d59a2ea..9201660 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -197,6 +197,8 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ +#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) + static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { return 0; @@ -354,7 +356,12 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + proc(NULLDRV_DEFAULT_HMONITOR, hdc, &r, lp); + return TRUE; } static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) @@ -364,7 +371,23 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + static const WCHAR device[] = {'W','i','n','D','i','s','c',0}; + + TRACE("(%p, %p)\n", handle, info); + + if (handle != NULLDRV_DEFAULT_HMONITOR) + { + SetLastError(ERROR_INVALID_MONITOR_HANDLE); + return FALSE; + } + + info->rcMonitor = r; + info->rcWork = r; + info->dwFlags = MONITORINFOF_PRIMARY; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, device ); + return TRUE; } static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd )

1 0

Piotr Caban : msvcr100: Use scoped_lock internal buffer when locking critical_section.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 50ec64a0cf4f24aa1c3213b0a59dbf5a305df4b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50ec64a0cf4f24aa1c3213b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 2 16:36:18 2018 +0100 msvcr100: Use scoped_lock internal buffer when locking critical_section. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f042c4ea4a3bcf211288fe69ed6014687995e1de) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/lock.c | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 2e0865d..61cbc46 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -357,32 +357,38 @@ static inline void cs_set_head(critical_section *cs, cs_queue *q) cs->head = &cs->unk_active; } -/* ?lock(a)critical_section@Concurrency@@QAEXXZ */ -/* ?lock(a)critical_section@Concurrency@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(critical_section_lock, 4) -void __thiscall critical_section_lock(critical_section *this) +static inline void cs_lock(critical_section *cs, cs_queue *q) { - cs_queue q, *last; - - TRACE("(%p)\n", this); + cs_queue *last; - if(this->unk_thread_id == GetCurrentThreadId()) + if(cs->unk_thread_id == GetCurrentThreadId()) throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); - memset(&q, 0, sizeof(q)); - last = InterlockedExchangePointer(&this->tail, &q); + memset(q, 0, sizeof(*q)); + last = InterlockedExchangePointer(&cs->tail, q); if(last) { - last->next = &q; - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + last->next = q; + NtWaitForKeyedEvent(keyed_event, q, 0, NULL); } - cs_set_head(this, &q); - if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) { - spin_wait_for_next_cs(&q); - this->unk_active.next = q.next; + cs_set_head(cs, q); + if(InterlockedCompareExchangePointer(&cs->tail, &cs->unk_active, q) != q) { + spin_wait_for_next_cs(q); + cs->unk_active.next = q->next; } } +/* ?lock(a)critical_section@Concurrency@@QAEXXZ */ +/* ?lock(a)critical_section@Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(critical_section_lock, 4) +void __thiscall critical_section_lock(critical_section *this) +{ + cs_queue q; + + TRACE("(%p)\n", this); + cs_lock(this, &q); +} + /* ?try_lock(a)critical_section@Concurrency@@QAE_NXZ */ /* ?try_lock(a)critical_section@Concurrency@@QEAA_NXZ */ DEFINE_THISCALL_WRAPPER(critical_section_try_lock, 4) @@ -502,8 +508,13 @@ MSVCRT_bool __thiscall critical_section_try_lock_for( typedef struct { critical_section *cs; - void *unknown[4]; - int unknown2[2]; + union { + cs_queue q; + struct { + void *unknown[4]; + int unknown2[2]; + } unknown; + } lock; } critical_section_scoped_lock; /* ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z */ @@ -514,7 +525,7 @@ critical_section_scoped_lock* __thiscall critical_section_scoped_lock_ctor( { TRACE("(%p %p)\n", this, cs); this->cs = cs; - critical_section_lock(this->cs); + cs_lock(this->cs, &this->lock.q); return this; }

1 0

Piotr Caban : msvcr100: Add _ReentrantPPLLock class implementation.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: d37e009db00c86aecf99812acc1a5064adfef6f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d37e009db00c86aecf99812a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 2 16:36:26 2018 +0100 msvcr100: Add _ReentrantPPLLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7419eff0c21d912293e74aabbc87958a96e4f4ca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 12 ++++----- dlls/msvcr100/msvcr100.spec | 12 ++++----- dlls/msvcr110/msvcr110.spec | 18 ++++++------- dlls/msvcr120/msvcr120.spec | 18 ++++++------- dlls/msvcr120_app/msvcr120_app.spec | 18 ++++++------- dlls/msvcrt/lock.c | 52 +++++++++++++++++++++++++++++++++++++ 6 files changed, 91 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d37e009db00c86aecf99…

1 0

Nikolay Sivov : wincodecs: Add IWICPixelFormatInfo exports.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 4adec15f07e003e35463d207b01ffcb1831656c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4adec15f07e003e35463d207… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 30 14:05:57 2018 +0300 wincodecs: Add IWICPixelFormatInfo exports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 06495200af280197cd71f3d1714673b49335f50e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/proxy.c | 15 +++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index d53059e..34b618e 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -626,6 +626,21 @@ HRESULT WINAPI IWICStream_InitializeFromMemory_Proxy_W(IWICStream *iface, return IWICStream_InitializeFromMemory(iface, pbBuffer, cbBufferSize); } +HRESULT WINAPI IWICPixelFormatInfo_GetBitsPerPixel_Proxy_W(IWICPixelFormatInfo *iface, UINT *bpp) +{ + return IWICPixelFormatInfo_GetBitsPerPixel(iface, bpp); +} + +HRESULT WINAPI IWICPixelFormatInfo_GetChannelCount_Proxy_W(IWICPixelFormatInfo *iface, UINT *count) +{ + return IWICPixelFormatInfo_GetChannelCount(iface, count); +} + +HRESULT WINAPI IWICPixelFormatInfo_GetChannelMask_Proxy_W(IWICPixelFormatInfo *iface, UINT channel, UINT buffer_size, BYTE *buffer, UINT *actual) +{ + return IWICPixelFormatInfo_GetChannelMask(iface, channel, buffer_size, buffer, actual); +} + HRESULT WINAPI WICCreateColorContext_Proxy(IWICImagingFactory *iface, IWICColorContext **ppIWICColorContext) { TRACE("%p, %p\n", iface, ppIWICColorContext); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 49346fc..fb19b1e 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -99,9 +99,9 @@ @ stdcall IWICPalette_InitializeFromBitmap_Proxy(ptr ptr long long) IWICPalette_InitializeFromBitmap_Proxy_W @ stdcall IWICPalette_InitializeFromPalette_Proxy(ptr ptr) IWICPalette_InitializeFromPalette_Proxy_W @ stdcall IWICPalette_InitializePredefined_Proxy(ptr long long) IWICPalette_InitializePredefined_Proxy_W -@ stub IWICPixelFormatInfo_GetBitsPerPixel_Proxy -@ stub IWICPixelFormatInfo_GetChannelCount_Proxy -@ stub IWICPixelFormatInfo_GetChannelMask_Proxy +@ stdcall IWICPixelFormatInfo_GetBitsPerPixel_Proxy(ptr ptr) IWICPixelFormatInfo_GetBitsPerPixel_Proxy_W +@ stdcall IWICPixelFormatInfo_GetChannelCount_Proxy(ptr ptr) IWICPixelFormatInfo_GetChannelCount_Proxy_W +@ stdcall IWICPixelFormatInfo_GetChannelMask_Proxy(ptr long long ptr ptr) IWICPixelFormatInfo_GetChannelMask_Proxy_W @ stdcall IWICStream_InitializeFromIStream_Proxy(ptr ptr) IWICStream_InitializeFromIStream_Proxy_W @ stdcall IWICStream_InitializeFromMemory_Proxy(ptr ptr long) IWICStream_InitializeFromMemory_Proxy_W @ stdcall WICConvertBitmapSource(ptr ptr ptr)

1 0

Hans Leidekker : msi: Allow recursive changes to the target folder path.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 05dec73ba8c3e67a01f52fa32436fdd09da2adcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=05dec73ba8c3e67a01f52fa3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 26 15:17:19 2018 +0200 msi: Allow recursive changes to the target folder path. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7bf2a1b2099b534fd4472962d2e945bc9ab9e2b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/action.c | 10 +++------- dlls/msi/tests/msi.c | 24 ++++++++---------------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ad8b285..d7965d2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2351,15 +2351,11 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa else path = msi_build_directory_name( 2, folder->TargetDefault, NULL ); } + normalized_path = msi_normalize_path( path ); - msi_free( path ); - if (folder->ResolvedTarget && !strcmpiW( normalized_path, folder->ResolvedTarget )) - { - TRACE("%s already resolved to %s\n", debugstr_w(name), debugstr_w(folder->ResolvedTarget)); - msi_free( normalized_path ); - return; - } msi_set_property( package->db, folder->Directory, normalized_path, -1 ); + msi_free( path ); + msi_free( folder->ResolvedTarget ); folder->ResolvedTarget = normalized_path; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 85ab7ba..82574e9 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -671,16 +671,18 @@ static const char spf_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" "s72\ti2\tS64\tS0\tS255\n" "CustomAction\tAction\n" - "SetFolderProp\t51\tMSITESTDIR\t[ProgramFilesFolder]\\msitest\\added\t\n"; + "SetFolderProp\t51\tMSITESTDIR\t[ProgramFilesFolder]\\msitest\\added\t\n" + "SetFolderProp2\t51\tMSITESTDIR\t[ProgramFilesFolder]\\msitest\\added\\added2\t\n"; static const char spf_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" "CostInitialize\t\t800\n" "FileCost\t\t900\n" "SetFolderProp\t\t950\n" + "SetFolderProp2\t\t960\n" + "CostFinalize\t\t1000\n" "InstallFiles\t\t4000\n" "InstallServices\t\t5000\n" "InstallFinalize\t\t6600\n" @@ -14556,7 +14558,6 @@ static void test_setpropertyfolder(void) { UINT r; CHAR path[MAX_PATH]; - DWORD attr; if (is_process_limited()) { @@ -14581,19 +14582,10 @@ static void test_setpropertyfolder(void) goto error; } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - attr = GetFileAttributesA(path); - if (attr != INVALID_FILE_ATTRIBUTES && (attr & FILE_ATTRIBUTE_DIRECTORY)) - { - ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\added", FALSE), "Directory not created\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); - } - else - { - trace("changing folder property not supported\n"); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); - } + ok(delete_pf("msitest\\added\\added2\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\added\\added2", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\added", FALSE), "Directory not created\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: DeleteFileA(msifile);

1 0

Stefan Dösinger : msvcp140: Implement _Temp_get.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 2f3e5e7f1008530cba11b538e6cf7437909c4720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f3e5e7f1008530cba11b538… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 20 10:51:54 2018 +0200 msvcp140: Implement _Temp_get. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 17c203ea86fa9f7b1739c638c9ca20f34b8c9d1d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 26 ++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 6 ++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 0efd785..ef58db6 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3718,7 +3718,7 @@ @ stub _Strxfrm @ cdecl _Symlink(wstr wstr) tr2_sys__Symlink_wchar @ stub _Symlink_get -@ stub _Temp_get +@ cdecl _Temp_get(ptr) @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl -norelay _Thrd_current() diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 593e0ce..6620b95 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -178,6 +178,7 @@ static WCHAR* (__cdecl *p_Read_dir)(WCHAR*, void*, enum file_type*); static MSVCP_bool (__cdecl *p_Remove_dir)(WCHAR const*); static enum file_type (__cdecl *p_Stat)(WCHAR const *, int *); static int (__cdecl *p_Symlink)(WCHAR const*, WCHAR const*); +static WCHAR* (__cdecl *p_Temp_get)(WCHAR *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); @@ -260,6 +261,7 @@ static BOOL init(void) SET(p_Remove_dir, "_Remove_dir"); SET(p_Stat, "_Stat"); SET(p_Symlink, "_Symlink"); + SET(p_Temp_get, "_Temp_get"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); SET(p_Unlink, "_Unlink"); @@ -1061,6 +1063,29 @@ static void test_Unlink(void) ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); } +static void test_Temp_get(void) +{ + WCHAR path[MAX_PATH + 1], temp_path[MAX_PATH]; + WCHAR *retval; + DWORD len; + + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); + + /* This crashes on Windows, the input pointer is not validated. */ + if (0) + { + retval = p_Temp_get(NULL); + ok(!retval, "_Temp_get(): Got %p\n", retval); + } + + memset(path, 0xaa, sizeof(path)); + retval = p_Temp_get(path); + ok(retval == path, "_Temp_get(): Got %p, expected %p\n", retval, path); + ok(!wcscmp(path, temp_path), "Expected path %s, got %s\n", wine_dbgstr_w(temp_path), wine_dbgstr_w(path)); + len = wcslen(path); + todo_wine ok(path[len + 1] == 0xaaaa, "Too many bytes were zeroed - %x\n", path[len + 1]); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1079,5 +1104,6 @@ START_TEST(msvcp140) test_Stat(); test_dir_operation(); test_Unlink(); + test_Temp_get(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 4778aad..88cd454 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15798,6 +15798,12 @@ enum file_type __cdecl _Lstat(WCHAR const* path, int* permissions) return _Stat(path, permissions); } +WCHAR * __cdecl _Temp_get(WCHAR *dst) +{ + GetTempPathW(MAX_PATH, dst); + return dst; +} + /* ??1_Winit(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0