April 2019 - Wine-commits - list.winehq.org

Zebediah Figura : ntoskrnl.exe: Implement ExReleaseResourceForThreadLite() .
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 9dfa9f6b26d4d50d3b6f74bc2760ebbe0f8d0350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dfa9f6b26d4d50d3b6f74bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:15 2019 -0500 ntoskrnl.exe: Implement ExReleaseResourceForThreadLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ------ dlls/ntoskrnl.exe/sync.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 454d6f5..2d8bdb5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3365,14 +3365,6 @@ NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource) } /*********************************************************************** - * ExReleaseResourceForThreadLite (NTOSKRNL.EXE.@) - */ -void WINAPI ExReleaseResourceForThreadLite( PERESOURCE resource, ERESOURCE_THREAD tid ) -{ - FIXME( "stub: %p %lu\n", resource, tid ); -} - -/*********************************************************************** * KeEnterCriticalRegion (NTOSKRNL.EXE.@) */ void WINAPI KeEnterCriticalRegion(void) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index e89fddc..88c9ea7 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1006,3 +1006,63 @@ BOOLEAN WINAPI ExAcquireSharedWaitForExclusive( ERESOURCE *resource, BOOLEAN wai return TRUE; } + +/*********************************************************************** + * ExReleaseResourceForThreadLite (NTOSKRNL.EXE.@) + */ +void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREAD thread ) +{ + OWNER_ENTRY *entry; + KIRQL irql; + + TRACE("resource %p, thread %#lx.\n", resource, thread); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + if (resource->Flag & ResourceOwnedExclusive) + { + if (resource->OwnerEntry.OwnerThread == thread) + { + if (!--resource->ActiveEntries) + { + resource->OwnerEntry.OwnerThread = 0; + resource->Flag &= ~ResourceOwnedExclusive; + } + } + else + { + ERR("Trying to release %p for thread %#lx, but resource is exclusively owned by %#lx.\n", + resource, thread, resource->OwnerEntry.OwnerThread); + return; + } + } + else + { + entry = resource_get_shared_entry( resource, thread ); + if (entry->OwnerCount) + { + entry->OwnerCount--; + resource->ActiveEntries--; + } + else + { + ERR("Trying to release %p for thread %#lx, but resource is not owned by that thread.\n", resource, thread); + return; + } + } + + if (!resource->ActiveEntries) + { + if (resource->NumberOfExclusiveWaiters) + { + KeSetEvent( resource->ExclusiveWaiters, IO_NO_INCREMENT, FALSE ); + } + else if (resource->NumberOfSharedWaiters) + { + KeReleaseSemaphore( resource->SharedWaiters, IO_NO_INCREMENT, + resource->NumberOfSharedWaiters, FALSE ); + } + } + + KeReleaseSpinLock( &resource->SpinLock, irql ); +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 4609790..1a3f6bb 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1529,6 +1529,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); +void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); void WINAPI IoAcquireCancelSpinLock(KIRQL*);

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExReleaseResourceLite().
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: aeed70689cee9b0da5912d79ea0a84d66879e256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeed70689cee9b0da5912d79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:16 2019 -0500 ntoskrnl.exe: Implement ExReleaseResourceLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 -------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 9 +++++++++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2d8bdb5..06ec176 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4225,14 +4225,6 @@ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) } /********************************************************************* - * ExReleaseResourceLite (NTOSKRNL.@) - */ -void WINAPI ExReleaseResourceLite(PERESOURCE resource) -{ - FIXME("stub: %p\n", resource); -} - -/********************************************************************* * PsGetProcessWow64Process (NTOSKRNL.@) */ PVOID WINAPI PsGetProcessWow64Process(PEPROCESS process) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ee26d8b..2d1c826 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -9,7 +9,7 @@ @ stdcall -fastcall -arch=i386 ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection @ stdcall -fastcall ExReleaseFastMutexUnsafe(ptr) -@ stdcall ExReleaseResourceLite(ptr) +@ stdcall -fastcall ExReleaseResourceLite(ptr) @ stub ExReleaseRundownProtection @ stub ExReleaseRundownProtectionEx @ stub ExRundownCompleted diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 88c9ea7..2ea2e61 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1066,3 +1066,12 @@ void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREA KeReleaseSpinLock( &resource->SpinLock, irql ); } + +/*********************************************************************** + * ExReleaseResourceLite (NTOSKRNL.EXE.@) + */ +DEFINE_FASTCALL1_WRAPPER( ExReleaseResourceLite ) +void WINAPI ExReleaseResourceLite( ERESOURCE *resource ) +{ + ExReleaseResourceForThreadLite( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); +}

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExDeleteResourceLite().
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 5698bb29a3e038a7480de3c040abcb0d87cfcfe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5698bb29a3e038a7480de3c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:17 2019 -0500 ntoskrnl.exe: Implement ExDeleteResourceLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 --------- dlls/ntoskrnl.exe/sync.c | 12 ++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 06ec176..acb204d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3356,15 +3356,6 @@ NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_ } /*********************************************************************** - * ExDeleteResourceLite (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource) -{ - FIXME("(%p): stub\n", resource); - return STATUS_NOT_IMPLEMENTED; -} - -/*********************************************************************** * KeEnterCriticalRegion (NTOSKRNL.EXE.@) */ void WINAPI KeEnterCriticalRegion(void) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 2ea2e61..c8cae7d 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -743,6 +743,18 @@ NTSTATUS WINAPI ExInitializeResourceLite( ERESOURCE *resource ) return STATUS_SUCCESS; } +/*********************************************************************** + * ExDeleteResourceLite (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExDeleteResourceLite( ERESOURCE *resource ) +{ + TRACE("resource %p.\n", resource); + heap_free(resource->OwnerTable); + heap_free(resource->ExclusiveWaiters); + heap_free(resource->SharedWaiters); + return STATUS_SUCCESS; +} + /* Find an existing entry in the shared owner list, or create a new one. */ static OWNER_ENTRY *resource_get_shared_entry( ERESOURCE *resource, ERESOURCE_THREAD thread ) { diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 1a3f6bb..41c462f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1521,6 +1521,7 @@ PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG); PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); +NTSTATUS WINAPI ExDeleteResourceLite(ERESOURCE*); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT);

1 0

Akihiro Sagawa : gdi32: Implement GetCharWidthInfo().
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 1128587fd262f9ad476b49e7837ac74dd656e6ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=1128587fd262f9ad476b49e7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 9 10:32:59 2019 +0100 gdi32: Implement GetCharWidthInfo(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 2 ++ dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/dc.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/font.c | 24 ++++++++++++++++++++++++ dlls/gdi32/freetype.c | 35 +++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdi_private.h | 8 ++++++++ dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/path.c | 1 + dlls/wineandroid.drv/init.c | 1 + dlls/winemac.drv/gdi.c | 1 + dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 ++- 16 files changed, 87 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1128587fd262f9ad476b…

1 0

Akihiro Sagawa : gdi32/tests: Add tests for GetCharWidthInfo().
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: eca601d7bb5d0f5d8c667a6eb1ceb89745b4d804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca601d7bb5d0f5d8c667a6e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 9 10:33:00 2019 +0100 gdi32/tests: Add tests for GetCharWidthInfo(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 67e8941..245fb4d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -48,6 +48,7 @@ static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC static BOOL (WINAPI *pGetCharABCWidthsFloatW)(HDC hdc, UINT first, UINT last, LPABCFLOAT abc); static BOOL (WINAPI *pGetCharWidth32A)(HDC hdc, UINT first, UINT last, LPINT buffer); static BOOL (WINAPI *pGetCharWidth32W)(HDC hdc, UINT first, UINT last, LPINT buffer); +static BOOL (WINAPI *pGetCharWidthInfo)(HDC hdc, void *); static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); @@ -94,6 +95,7 @@ static void init(void) pGetCharABCWidthsFloatW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsFloatW"); pGetCharWidth32A = (void *)GetProcAddress(hgdi32, "GetCharWidth32A"); pGetCharWidth32W = (void *)GetProcAddress(hgdi32, "GetCharWidth32W"); + pGetCharWidthInfo = (void *)GetProcAddress(hgdi32, "GetCharWidthInfo"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); @@ -7004,6 +7006,189 @@ static void test_long_names(void) ReleaseDC(NULL, dc); } +typedef struct +{ + USHORT majorVersion; + USHORT minorVersion; + SHORT ascender; + SHORT descender; + SHORT lineGap; + USHORT advanceWidthMax; + SHORT minLeftSideBearing; + SHORT minRightSideBearing; + SHORT xMaxExtent; + SHORT caretSlopeRise; + SHORT caretSlopeRun; + SHORT caretOffset; + SHORT reserved[4]; + SHORT metricDataFormat; + SHORT numberOfHMetrics; +} TT_Hori_Header; + +static void test_GetCharWidthInfo(void) +{ + HDC hdc; + HFONT hfont, hfont_prev; + LOGFONTA lf; + BOOL r; + DWORD ret, i; + OUTLINETEXTMETRICA otm; + TT_Hori_Header hhea; + struct char_width_info + { + INT lsb, rsb, unk; + } info, info2; + SHORT minLeftSideBearing, minRightSideBearing; + POINT pt[2]; + const char* face_list[] = { "Symbol", "Ume Gothic", "MS Gothic" }; + + if (!pGetCharWidthInfo) + { + win_skip("GetCharWidthInfo is unavailable\n"); + return; + } + + hdc = GetDC(NULL); + + /* test default (System) font */ + memset(&info, 0xaa, sizeof(info)); + r = pGetCharWidthInfo(hdc, &info); + if (r) /* win10 1803 succeeds */ + { + ok(info.lsb == 0, "expected 0, got %d\n", info.lsb); + ok(info.rsb == 0, "expected 0, got %d\n", info.rsb); + ok(info.unk == 0, "expected 0, got %d\n", info.unk); + } + + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = ANSI_CHARSET; + strcpy(lf.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + ret = GetOutlineTextMetricsA(hdc, sizeof(otm), &otm); + ok(ret != 0, "GetOutlineTextMetricsA failed\n"); + DeleteObject(SelectObject(hdc, hfont_prev)); + + /* test Tahoma at the em square size */ + lf.lfHeight = -(int)otm.otmEMSquare; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + ret = GetFontData(hdc, MS_MAKE_TAG('h','h','e','a'), 0, &hhea, sizeof(hhea)); + ok(ret == sizeof(hhea), "got %u\n", ret); + minLeftSideBearing = GET_BE_WORD(hhea.minLeftSideBearing); + minRightSideBearing = GET_BE_WORD(hhea.minRightSideBearing); + + memset(&info, 0xaa, sizeof(info)); + r = pGetCharWidthInfo(hdc, &info); + ok(r, "GetCharWidthInfo failed\n"); + ok(info.lsb == minLeftSideBearing, "expected %d, got %d\n", minLeftSideBearing, info.lsb); + ok(info.rsb == minRightSideBearing, "expected %d, got %d\n", minRightSideBearing, info.rsb); + + DeleteObject(SelectObject(hdc, hfont_prev)); + + /* these values are scaled, try with smaller size */ + lf.lfHeight /= 3; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "pGetCharWidthInfo failed\n"); + ok(info2.lsb == info.lsb/3, "expected %d, got %d\n", info.lsb/3, info2.lsb); + ok(info2.rsb == info.rsb/3, "expected %d, got %d\n", info.rsb/3, info2.rsb); + + DeleteObject(SelectObject(hdc, hfont_prev)); + ReleaseDC(NULL, hdc); + + /* test with another mapping mode */ + hdc = GetDC(NULL); + SetMapMode(hdc, MM_ISOTROPIC); + SetWindowExtEx(hdc, 2, 2, NULL); + SetViewportExtEx(hdc, 1, 1, NULL); + + memset(pt, 0, sizeof(pt)); + pt[0].y = otm.otmEMSquare; + DPtoLP(hdc, pt, 1); + + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = ANSI_CHARSET; + lf.lfHeight = -abs(pt[0].y); + strcpy(lf.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "GetCharWidthInfo failed\n"); + pt[0].x = info.lsb; pt[0].y = 0; + pt[1].x = info.rsb; pt[1].y = 0; + DPtoLP(hdc, pt, 2); + ok(pt[0].x == info2.lsb, "expected %d, got %d\n", pt[0].x, info2.lsb); + ok(pt[1].x == info2.rsb, "expected %d, got %d\n", pt[1].x, info2.rsb); + + DeleteObject(SelectObject(hdc, hfont_prev)); + ReleaseDC(NULL, hdc); + + /* test with synthetic fonts */ + hdc = GetDC(NULL); + for (i = 0; i < ARRAY_SIZE(face_list); i++) + { + const char* face = face_list[i]; + if (!is_truetype_font_installed(face)) + { + skip("%s is not installed\n", face); + continue; + } + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfItalic = FALSE; + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfHeight = -256; + strcpy(lf.lfFaceName, face); + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + + memset(&info, 0xaa, sizeof(info)); + r = pGetCharWidthInfo(hdc, &info); + ok(r, "%s: GetCharWidthInfo failed\n", face); + + /* test with synthetic bold */ + lf.lfWeight = FW_BOLD; + lf.lfItalic = FALSE; + hfont = CreateFontIndirectA(&lf); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "%s: GetCharWidthInfo failed\n", face); + ok(info.lsb == info2.lsb, "%s: expected %d, got %d\n", face, info.lsb, info2.lsb); + ok(info.rsb == info2.rsb, "%s: expected %d, got %d\n", face, info.rsb, info2.rsb); + + /* test with synthetic italic */ + lf.lfWeight = FW_NORMAL; + lf.lfItalic = TRUE; + hfont = CreateFontIndirectA(&lf); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "%s: GetCharWidthInfo failed\n", face); + todo_wine ok(info.lsb > info2.lsb, "%s: expected less than %d, got %d\n", face, info.lsb, info2.lsb); + todo_wine ok(info.rsb > info2.rsb, "%s: expected less than %d, got %d\n", face, info.rsb, info2.rsb); + DeleteObject(SelectObject(hdc, hfont_prev)); + } + + ReleaseDC(NULL, hdc); +} + START_TEST(font) { static const char *test_names[] = @@ -7072,6 +7257,7 @@ START_TEST(font) test_GetTextMetrics2("Arial", -55); test_GetTextMetrics2("Arial", -110); test_GetCharacterPlacement(); + test_GetCharWidthInfo(); test_CreateFontIndirect(); test_CreateFontIndirectEx(); test_oemcharset();

1 0

Nikolay Sivov : mfreadwrite: Keep media stream id for event matching.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 2d834c472d1659120a57af77d16e7f0375bd53a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d834c472d1659120a57af77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 9 13:45:08 2019 +0300 mfreadwrite: Keep media stream id for event matching. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 78d96e4..e41bdf6 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -75,6 +75,7 @@ HRESULT WINAPI DllUnregisterServer(void) struct media_stream { IMFMediaType *current; + DWORD id; }; typedef struct source_reader @@ -644,6 +645,9 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(object->descriptor, i, &selected, &sd))) break; + if (FAILED(hr = IMFStreamDescriptor_GetStreamIdentifier(sd, &object->streams[i].id))) + WARN("Failed to get stream identifier, hr %#x.\n", hr); + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); IMFStreamDescriptor_Release(sd); if (FAILED(hr))

1 0

Alexandre Julliard : msvcrt: Don't set invalid std handles with kernel32.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: b5408ff58cd7803a251dd020a01e1ff170788713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5408ff58cd7803a251dd020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 14:06:43 2019 +0200 msvcrt: Don't set invalid std handles with kernel32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 851a89c..8f91ca9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -417,6 +417,7 @@ static void msvcrt_set_fd(ioinfo *fdinfo, HANDLE hand, int flag) fdinfo->lookahead[2] = '\n'; fdinfo->exflag &= EF_CRIT_INIT; + if (hand == MSVCRT_NO_CONSOLE) hand = 0; switch (fdinfo-MSVCRT___pioinfo[0]) { case 0: SetStdHandle(STD_INPUT_HANDLE, hand); break;

1 0

Alexandre Julliard : makefiles: Add a helper to generate a winegcc command line.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: cc7c6a734b76a33d2696c49236fd4626ff6d9077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7c6a734b76a33d2696c492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 09:34:05 2019 +0200 makefiles: Add a helper to generate a winegcc command line. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 59 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 1a21b3d..3f09f3b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2224,6 +2224,28 @@ static struct strarray get_shared_lib_names( const char *libname ) /******************************************************************* + * output_winegcc_command + */ +static void output_winegcc_command( struct makefile *make, int cross ) +{ + output( "\t%s -o $@", tools_path( make, "winegcc" )); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + if (cross) + { + output_filename( "-b" ); + output_filename( crosstarget ); + output_filename( "--lib-suffix=.cross.a" ); + } + else + { + output_filenames( target_flags ); + output_filenames( unwind_flags ); + } +} + + +/******************************************************************* * output_symlink_rule * * Output a rule to create a symlink. @@ -2870,11 +2892,8 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); + output_filename( "-s" ); output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); @@ -2903,10 +2922,8 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filename( "--lib-suffix=.cross.a" ); + output_winegcc_command( make, 1 ); + output_filename( "-s" ); output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); @@ -3107,11 +3124,7 @@ static void output_module( struct makefile *make ) output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); if (spec_file) { output( " -shared %s", spec_file ); @@ -3262,22 +3275,15 @@ static void output_test_module( struct makefile *make ) strarray_add( &make->all_targets, strmake( "%s%s", testmodule, dll_ext )); strarray_add( &make->clean_files, strmake( "%s%s", stripped, dll_ext )); output( "%s%s:\n", obj_dir_path( make, testmodule ), dll_ext ); - output( "\t%s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); output_filenames( make->appmode ); output_filenames_obj_dir( make, make->object_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); output( "%s%s:\n", obj_dir_path( make, stripped ), dll_ext ); - output( "\t%s -s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); + output_filename( "-s" ); output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( make->appmode ); output_filenames_obj_dir( make, make->object_files ); @@ -3314,10 +3320,7 @@ static void output_test_module( struct makefile *make ) output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filename( "--lib-suffix=.cross.a" ); + output_winegcc_command( make, 1 ); output_filenames_obj_dir( make, make->crossobj_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" );

1 0

Alexandre Julliard : makefiles: Default to building test resource dlls as PE.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 0022af881e567093621b20d29794503be9400e0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0022af881e567093621b20d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 09:39:47 2019 +0200 makefiles: Default to building test resource dlls as PE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 102 +++++++++++++++++++++++--------------------------------- 1 file changed, 42 insertions(+), 60 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 3f09f3b..c1cbf78 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2872,66 +2872,39 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, struct strarray imports = get_expanded_file_local_var( make, obj, "IMPORTS" ); struct strarray dll_flags = get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" ); struct strarray all_libs, dep_libs = empty_strarray; + char *dll_name, *obj_name; if (!imports.count) imports = make->imports; if (!dll_flags.count) dll_flags = make->extradllflags; - all_libs = add_import_libs( make, &dep_libs, imports, 0 ); - add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ + all_libs = add_import_libs( make, &dep_libs, imports, !!crosstarget ); + add_import_libs( make, &dep_libs, get_default_imports( make ), !!crosstarget ); /* dependencies only */ strarray_addall( &all_libs, libs ); + dll_name = strmake( "%s.dll%s", obj, crosstarget ? "" : dll_ext ); + obj_name = strmake( "%s%s", obj_dir_path( make, obj ), crosstarget ? ".cross.o" : ".o" ); - strarray_add( &make->clean_files, strmake( "%s.dll%s", obj, dll_ext )); + strarray_add( &make->clean_files, dll_name ); strarray_add( &make->object_files, strmake( "%s.res", obj )); - output( "%s.res: %s.dll%s\n", obj_dir_path( make, obj ), obj_dir_path( make, obj ), dll_ext ); - output( "\techo \"%s.dll TESTDLL \\\"%s.dll%s\\\"\" | %s -o $@\n", obj, - obj_dir_path( make, obj ), dll_ext, tools_path( make, "wrc" )); + if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); + output( "%s.res: %s\n", obj_dir_path( make, obj ), obj_dir_path( make, dll_name )); + output( "\techo \"%s.dll TESTDLL \\\"%s\\\"\" | %s -o $@\n", obj, + obj_dir_path( make, dll_name ), tools_path( make, "wrc" )); - output( "%s.dll%s:", obj_dir_path( make, obj ), dll_ext ); + output( "%s:", obj_dir_path( make, dll_name )); output_filename( source->filename ); - output_filename( strmake( "%s.o", obj_dir_path( make, obj ))); + output_filename( obj_name ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output_winegcc_command( make, 0 ); + output_winegcc_command( make, !!crosstarget ); output_filename( "-s" ); output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); - output_filename( strmake( "%s.o", obj_dir_path( make, obj ))); + output_filename( obj_name ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); - - if (crosstarget) - { - dep_libs = empty_strarray; - all_libs = add_import_libs( make, &dep_libs, imports, 1 ); - add_import_libs( make, &dep_libs, get_default_imports( make ), 1 ); /* dependencies only */ - strarray_addall( &all_libs, libs ); - - strarray_add( &make->clean_files, strmake( "%s.dll", obj )); - strarray_add( &make->crossobj_files, strmake( "%s.cross.res", obj )); - output( "%s.cross.res: %s.dll\n", obj_dir_path( make, obj ), obj_dir_path( make, obj ) ); - output( "\techo \"%s.dll TESTDLL \\\"%s.dll\\\"\" | %s -o $@\n", obj, - obj_dir_path( make, obj ), tools_path( make, "wrc" )); - - output( "%s.dll:", obj_dir_path( make, obj )); - output_filename( source->filename ); - output_filename( strmake( "%s.cross.o", obj_dir_path( make, obj ))); - output_filenames( dep_libs ); - output_filename( tools_path( make, "winebuild" )); - output_filename( tools_path( make, "winegcc" )); - output( "\n" ); - output_winegcc_command( make, 1 ); - output_filename( "-s" ); - output_filenames( dll_flags ); - output_filename( "-shared" ); - output_filename( source->filename ); - output_filename( strmake( "%s.cross.o", obj_dir_path( make, obj ))); - output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); - output( "\n" ); - } } @@ -2944,30 +2917,39 @@ static void output_source_default( struct makefile *make, struct incl_file *sour int is_dll_src = (make->testdll && strendswith( source->name, ".c" ) && find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); - int need_cross = (make->testdll || - (source->file->flags & FLAG_C_IMPLIB) || - (make->module && make->staticlib)); + int need_cross = (crosstarget && + (make->testdll || + (source->file->flags & FLAG_C_IMPLIB) || + (make->module && make->staticlib))); + int need_obj = (!need_cross || + (make->testdll && !is_dll_src) || + (source->file->flags & FLAG_C_IMPLIB) || + (make->module && make->staticlib)); if ((source->file->flags & FLAG_GENERATED) && (!make->testdll || !strendswith( source->filename, "testlist.c" ))) strarray_add( &make->clean_files, source->filename ); if (source->file->flags & FLAG_C_IMPLIB) strarray_add( &make->implib_objs, strmake( "%s.o", obj )); - strarray_add( is_dll_src ? &make->clean_files : &make->object_files, strmake( "%s.o", obj )); - output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t$(CC) -c -o $@ %s", source->filename ); - output_filenames( make->include_args ); - output_filenames( make->define_args ); - output_filenames( extradefs ); - if (make->module || make->staticlib || make->sharedlib || make->testdll) + + if (need_obj) { - output_filenames( dll_flags ); - if (make->use_msvcrt) output_filenames( msvcrt_flags ); + strarray_add( is_dll_src ? &make->clean_files : &make->object_files, strmake( "%s.o", obj )); + output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); + output( "\t$(CC) -c -o $@ %s", source->filename ); + output_filenames( make->include_args ); + output_filenames( make->define_args ); + output_filenames( extradefs ); + if (make->module || make->staticlib || make->sharedlib || make->testdll) + { + output_filenames( dll_flags ); + if (make->use_msvcrt) output_filenames( msvcrt_flags ); + } + output_filenames( extra_cflags ); + output_filenames( cpp_flags ); + output_filename( "$(CFLAGS)" ); + output( "\n" ); } - output_filenames( extra_cflags ); - output_filenames( cpp_flags ); - output_filename( "$(CFLAGS)" ); - output( "\n" ); - if (crosstarget && need_cross) + if (need_cross) { strarray_add( is_dll_src ? &make->clean_files : &make->crossobj_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj_dir_path( make, obj ), source->filename ); @@ -2994,8 +2976,8 @@ static void output_source_default( struct makefile *make, struct incl_file *sour dll_ext, obj ); } } - output( "%s.o", obj_dir_path( make, obj )); - if (crosstarget && need_cross) output( " %s.cross.o", obj_dir_path( make, obj )); + if (need_obj) output_filename( strmake( "%s.o", obj_dir_path( make, obj ))); + if (need_cross) output_filename( strmake( "%s.cross.o", obj_dir_path( make, obj ))); output( ":" ); output_filenames( source->dependencies ); output( "\n" );

1 0

Alexandre Julliard : makefiles: Default to building test modules as PE.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 1459a0105d6124f7eb58c2885500bf678068abf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1459a0105d6124f7eb58c288… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 09:48:23 2019 +0200 makefiles: Default to building test modules as PE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 - dlls/gameux/tests/test.gdf.xml | 2 +- dlls/imagehlp/tests/integrity.c | 2 +- dlls/ntdll/tests/info.c | 8 ----- dlls/shell32/tests/shlexec.c | 6 ++-- tools/makedep.c | 80 +++++++++-------------------------------- tools/runtest | 10 +++--- 7 files changed, 28 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1459a0105d6124f7eb58…

1 0