wine-devel July 2020

wine-devel@winehq.org

75 participants
841 discussions

[PATCH 04/10] kernel32: Use IOCT_CONDRV_GET_OUTPUT_INFO in GetCurrentConsoleFontEx.
by Jacek Caban 09 Jul '20

09 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 54 +++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 32 deletions(-)

2 1

[PATCH 03/10] kernel32: Use IOCTL_CONDRV_GET_OUTPUT_INFO in get_console_font_size.
by Jacek Caban 09 Jul '20

09 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)

2 1

[PATCH 02/10] server: Introduce IOCTL_CONDRV_GET_OUTPUT_INFO ioctl.
by Jacek Caban 09 Jul '20

09 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 27 ++++++++++++++++++ server/console.c | 65 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 81 insertions(+), 11 deletions(-)

1 0

[PATCH 01/10] server: Use separated fd ops for screen_buffer fd object.
by Jacek Caban 09 Jul '20

09 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-)

1 0

[PATCH] include: Update some members of KUSER_SHARED_DATA.
by Huw Davies 09 Jul '20

09 Jul '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- include/ddk/wdm.h | 36 ++++++++++++++++++++++++++++++++---- server/mapping.c | 2 +- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 23ac630f410..59af860708b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1246,6 +1246,7 @@ typedef struct _KUSER_SHARED_DATA { ULONG SuiteMask; /* 0x2d0 */ BOOLEAN KdDebuggerEnabled; /* 0x2d4 */ UCHAR NXSupportPolicy; /* 0x2d5 */ + USHORT CyclesPerYield; /* 0x2d6 */ volatile ULONG ActiveConsoleId; /* 0x2d8 */ volatile ULONG DismountCount; /* 0x2dc */ ULONG ComPlusPackage; /* 0x2e0 */ @@ -1253,16 +1254,43 @@ typedef struct _KUSER_SHARED_DATA { ULONG NumberOfPhysicalPages; /* 0x2e8 */ BOOLEAN SafeBootMode; /* 0x2ec */ UCHAR VirtualizationFlags; /* 0x2ed */ - ULONG TraceLogging; /* 0x2f0 */ + union { + ULONG SharedDataFlags; /* 0x2f0 */ + struct { + ULONG DbgErrorPortPresent : 1; + ULONG DbgElevationEnabed : 1; + ULONG DbgVirtEnabled : 1; + ULONG DbgInstallerDetectEnabled : 1; + ULONG DbgLkgEnabled : 1; + ULONG DbgDynProcessorEnabled : 1; + ULONG DbgConsoleBrokerEnabled : 1; + ULONG DbgSecureBootEnabled : 1; + ULONG DbgMultiSessionSku : 1; + ULONG DbgMultiUsersInSessionSku : 1; + ULONG DbgStateSeparationEnabled : 1; + ULONG SpareBits : 21; + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME2; + ULONG DataFlagsPad[1]; /* 0x2f4 */ ULONGLONG TestRetInstruction; /* 0x2f8 */ - ULONG SystemCall; /* 0x300 */ - ULONG SystemCallReturn; /* 0x304 */ - ULONGLONG SystemCallPad[3]; /* 0x308 */ + LONGLONG QpcFrequency; /* 0x300 */ + ULONG SystemCall; /* 0x308 */ + union { + ULONG AllFlags; /* 0x30c */ + struct { + ULONG Win32Process : 1; + ULONG Sgx2Enclave : 1; + ULONG VbsBasicEnclave : 1; + ULONG SpareBits : 29; + } DUMMYSTRUCTNAME; + } UserCetAvailableEnvironments; + ULONGLONG SystemCallPad[2]; /* 0x310 */ union { volatile KSYSTEM_TIME TickCount; /* 0x320 */ volatile ULONG64 TickCountQuad; } DUMMYUNIONNAME; ULONG Cookie; /* 0x330 */ + ULONG CookiePad[1]; /* 0x334 */ LONGLONG ConsoleSessionForegroundProcessId; /* 0x338 */ ULONGLONG TimeUpdateLock; /* 0x340 */ ULONGLONG BaselineSystemTimeQpc; /* 0x348 */ diff --git a/server/mapping.c b/server/mapping.c index ce70b696bd5..db0debe0af5 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -967,7 +967,7 @@ struct object *create_user_data_mapping( struct object *root, const struct unico if (ptr != MAP_FAILED) { user_shared_data = ptr; - user_shared_data->SystemCallPad[0] = 1; + user_shared_data->SystemCall = 1; } return &mapping->obj; } -- 2.23.0

1 0

[PATCH v2] gdi32: Add support for GCP_USEKERNING to GetCharacterPlacement.
by Dmitry Timoshkov 09 Jul '20

09 Jul '20

v2: Add tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/font.c | 97 ++++++++++++++++++++++++++++++++----- dlls/gdi32/tests/font.c | 103 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8788426a2c..e099bec5e8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3278,6 +3278,55 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, return ret; } +static int kern_pair(const KERNINGPAIR *kern, int count, WCHAR c1, WCHAR c2) +{ + int i; + + for (i = 0; i < count; i++) + { + if (kern[i].wFirst == c1 && kern[i].wSecond == c2) + return kern[i].iKernAmount; + } + + return 0; +} + +static int *kern_string(HDC hdc, const WCHAR *str, int len, int *kern_total) +{ + int i, count; + KERNINGPAIR *kern = NULL; + int *ret; + + *kern_total = 0; + + ret = heap_alloc(len * sizeof(*ret)); + if (!ret) return NULL; + + count = GetKerningPairsW(hdc, 0, NULL); + if (count) + { + kern = heap_alloc(count * sizeof(*kern)); + if (!kern) + { + heap_free(ret); + return NULL; + } + + GetKerningPairsW(hdc, count, kern); + } + + for (i = 0; i < len - 1; i++) + { + ret[i] = kern_pair(kern, count, str[i], str[i + 1]); + *kern_total += ret[i]; + } + + ret[len - 1] = 0; /* no kerning for last element */ + + heap_free(kern); + return ret; +} + /************************************************************************* * GetCharacterPlacementW [GDI32.@] * @@ -3309,6 +3358,7 @@ GetCharacterPlacementW( DWORD ret=0; SIZE size; UINT i, nSet; + int *kern = NULL, kern_total = 0; TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); @@ -3325,30 +3375,30 @@ GetCharacterPlacementW( lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); - if(dwFlags&(~GCP_REORDER)) + if (dwFlags & ~(GCP_REORDER | GCP_USEKERNING)) FIXME("flags 0x%08x ignored\n", dwFlags); - if(lpResults->lpClass) + if (lpResults->lpClass) FIXME("classes not implemented\n"); if (lpResults->lpCaretPos && (dwFlags & GCP_REORDER)) FIXME("Caret positions for complex scripts not implemented\n"); nSet = (UINT)uCount; - if(nSet > lpResults->nGlyphs) + if (nSet > lpResults->nGlyphs) nSet = lpResults->nGlyphs; /* return number of initialized fields */ lpResults->nGlyphs = nSet; - if((dwFlags&GCP_REORDER)==0 ) + if (!(dwFlags & GCP_REORDER)) { /* Treat the case where no special handling was requested in a fastpath way */ /* copy will do if the GCP_REORDER flag is not set */ - if(lpResults->lpOutString) + if (lpResults->lpOutString) memcpy( lpResults->lpOutString, lpString, nSet * sizeof(WCHAR)); - if(lpResults->lpOrder) + if (lpResults->lpOrder) { - for(i = 0; i < nSet; i++) + for (i = 0; i < nSet; i++) lpResults->lpOrder[i] = i; } } @@ -3358,6 +3408,16 @@ GetCharacterPlacementW( nSet, lpResults->lpOrder, NULL, NULL ); } + if (dwFlags & GCP_USEKERNING) + { + kern = kern_string(hdc, lpString, nSet, &kern_total); + if (!kern) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + /* FIXME: Will use the placement chars */ if (lpResults->lpDx) { @@ -3365,7 +3425,11 @@ GetCharacterPlacementW( for (i = 0; i < nSet; i++) { if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) - lpResults->lpDx[i]= c; + { + lpResults->lpDx[i] = c; + if (dwFlags & GCP_USEKERNING) + lpResults->lpDx[i] += kern[i]; + } } } @@ -3374,16 +3438,23 @@ GetCharacterPlacementW( int pos = 0; lpResults->lpCaretPos[0] = 0; - for (i = 1; i < nSet; i++) - if (GetTextExtentPoint32W(hdc, &(lpString[i - 1]), 1, &size)) - lpResults->lpCaretPos[i] = (pos += size.cx); + for (i = 0; i < nSet - 1; i++) + { + if (dwFlags & GCP_USEKERNING) + pos += kern[i]; + + if (GetTextExtentPoint32W(hdc, &lpString[i], 1, &size)) + lpResults->lpCaretPos[i + 1] = (pos += size.cx); + } } - if(lpResults->lpGlyphs) + if (lpResults->lpGlyphs) GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0); if (GetTextExtentPoint32W(hdc, lpString, uCount, &size)) - ret = MAKELONG(size.cx, size.cy); + ret = MAKELONG(size.cx + kern_total, size.cy); + + heap_free(kern); return ret; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ae4a643aa5..3be9a2ae79 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7168,6 +7168,108 @@ static void test_char_width(void) ReleaseDC(NULL, dc); } +static void test_GetCharacterPlacement_kerning(void) +{ + LOGFONTA lf; + HFONT hfont, hfont_old; + KERNINGPAIR *kp; + HDC hdc; + DWORD count, ret, i, size, width, width_kern, idx; + WCHAR str[30]; + GCP_RESULTSW result; + int kern[30], pos[30], pos_kern[30], dx[30], dx_kern[30], kern_amount; + + if (!is_font_installed("Arial")) + { + skip("Arial is not installed, skipping the test\n"); + return; + } + + hdc = GetDC(0); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Arial"); + lf.lfHeight = 120; + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "CreateFontIndirect failed\n"); + + hfont_old = SelectObject(hdc, hfont); + + count = GetKerningPairsW(hdc, 0, NULL); + kp = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*kp)); + + ret = GetKerningPairsW(hdc, count, kp); + ok(ret == count, "got %u, expected %u\n", ret, count); + + size = kern_amount = idx = 0; + for (i = 0; i < count; i++) + { + if (kp[i].wFirst >= 'A' && kp[i].wFirst <= 'z' && + kp[i].wSecond >= 'A' && kp[i].wSecond <= 'z') + { + str[size++] = kp[i].wFirst; + str[size++] = kp[i].wSecond; + str[size++] = 0; + kern[idx] = kp[i].iKernAmount; + trace("kern[%d] = %d\n", idx, kern[idx]); + idx++; + kern_amount += kp[i].iKernAmount; + if (size >= ARRAY_SIZE(str)) break; + } + } + + HeapFree(GetProcessHeap(), 0, kp); + + count = size; + trace("str: %s, kern_amount = %d\n", wine_dbgstr_wn(str, count), kern_amount); + + memset(&result, 0, sizeof(result)); + result.lStructSize = sizeof(result); + result.lpCaretPos = pos; + result.lpDx = dx; + result.nGlyphs = count; + ret = GetCharacterPlacementW(hdc, str, count, 0, &result, 0); + ok(ret, "GetCharacterPlacement failed\n"); + ok(result.nGlyphs == count, "got %u\n", result.nGlyphs); + width = LOWORD(ret); + + memset(&result, 0, sizeof(result)); + result.lStructSize = sizeof(result); + result.lpCaretPos = pos_kern; + result.lpDx = dx_kern; + result.nGlyphs = count; + ret = GetCharacterPlacementW(hdc, str, count, 0, &result, GCP_USEKERNING); + ok(ret, "GetCharacterPlacement failed\n"); + ok(result.nGlyphs == count, "got %u\n", result.nGlyphs); + width_kern = LOWORD(ret); + + if (width == width_kern) + { + win_skip("GCP_USEKERNING is broken on this platform\n"); + goto done; + } + + ok(width + kern_amount == width_kern, "%d + %d != %d\n", width, kern_amount, width_kern); + + kern_amount = idx = 0; + for (i = 0; i < count; i += 3, idx++) + { + ok(pos[i] + kern_amount == pos_kern[i], "%d: %d + %d != %d\n", i, pos[i], kern_amount, pos_kern[i]); + kern_amount += kern[idx]; + ok(pos[i+1] + kern_amount == pos_kern[i+1], "%d: %d + %d != %d\n", i, pos[i+1], kern_amount, pos_kern[i+1]); + ok(pos[i+2] + kern_amount == pos_kern[i+2], "%d: %d + %d != %d\n", i, pos[i+2], kern_amount, pos_kern[i+2]); + + ok(dx[i] + kern[idx] == dx_kern[i], "%d: %d + %d != %d\n", i, dx[i], kern[idx], dx_kern[i]); + ok(dx[i+1] == dx_kern[i+1], "%d: %d != %d\n", i, dx[i+1], dx_kern[i+1]); + ok(dx[i+2] == dx_kern[i+2], "%d: %d != %d\n", i, dx[i+2], dx_kern[i+2]); + } + +done: + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + ReleaseDC(0, hdc); +} + START_TEST(font) { static const char *test_names[] = @@ -7236,6 +7338,7 @@ START_TEST(font) test_GetTextMetrics2("Arial", -55); test_GetTextMetrics2("Arial", -110); test_GetCharacterPlacement(); + test_GetCharacterPlacement_kerning(); test_GetCharWidthInfo(); test_CreateFontIndirect(); test_CreateFontIndirectEx(); -- 2.26.2

2 1

[PATCH v2] msvfw32/tests: Add a few test for MCIWndCreate
by David Adam 09 Jul '20

09 Jul '20

All the test pass in Windows XP.

3 3

[PATCH v3] gdi32: Add support for GCP_USEKERNING to GetCharacterPlacement().
by Huw Davies 09 Jul '20

09 Jul '20

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 97 ++++++++++++++++++++++++++++++++------ dlls/gdi32/tests/font.c | 101 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8788426a2c2..e099bec5e81 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3278,6 +3278,55 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, return ret; } +static int kern_pair(const KERNINGPAIR *kern, int count, WCHAR c1, WCHAR c2) +{ + int i; + + for (i = 0; i < count; i++) + { + if (kern[i].wFirst == c1 && kern[i].wSecond == c2) + return kern[i].iKernAmount; + } + + return 0; +} + +static int *kern_string(HDC hdc, const WCHAR *str, int len, int *kern_total) +{ + int i, count; + KERNINGPAIR *kern = NULL; + int *ret; + + *kern_total = 0; + + ret = heap_alloc(len * sizeof(*ret)); + if (!ret) return NULL; + + count = GetKerningPairsW(hdc, 0, NULL); + if (count) + { + kern = heap_alloc(count * sizeof(*kern)); + if (!kern) + { + heap_free(ret); + return NULL; + } + + GetKerningPairsW(hdc, count, kern); + } + + for (i = 0; i < len - 1; i++) + { + ret[i] = kern_pair(kern, count, str[i], str[i + 1]); + *kern_total += ret[i]; + } + + ret[len - 1] = 0; /* no kerning for last element */ + + heap_free(kern); + return ret; +} + /************************************************************************* * GetCharacterPlacementW [GDI32.@] * @@ -3309,6 +3358,7 @@ GetCharacterPlacementW( DWORD ret=0; SIZE size; UINT i, nSet; + int *kern = NULL, kern_total = 0; TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); @@ -3325,30 +3375,30 @@ GetCharacterPlacementW( lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); - if(dwFlags&(~GCP_REORDER)) + if (dwFlags & ~(GCP_REORDER | GCP_USEKERNING)) FIXME("flags 0x%08x ignored\n", dwFlags); - if(lpResults->lpClass) + if (lpResults->lpClass) FIXME("classes not implemented\n"); if (lpResults->lpCaretPos && (dwFlags & GCP_REORDER)) FIXME("Caret positions for complex scripts not implemented\n"); nSet = (UINT)uCount; - if(nSet > lpResults->nGlyphs) + if (nSet > lpResults->nGlyphs) nSet = lpResults->nGlyphs; /* return number of initialized fields */ lpResults->nGlyphs = nSet; - if((dwFlags&GCP_REORDER)==0 ) + if (!(dwFlags & GCP_REORDER)) { /* Treat the case where no special handling was requested in a fastpath way */ /* copy will do if the GCP_REORDER flag is not set */ - if(lpResults->lpOutString) + if (lpResults->lpOutString) memcpy( lpResults->lpOutString, lpString, nSet * sizeof(WCHAR)); - if(lpResults->lpOrder) + if (lpResults->lpOrder) { - for(i = 0; i < nSet; i++) + for (i = 0; i < nSet; i++) lpResults->lpOrder[i] = i; } } @@ -3358,6 +3408,16 @@ GetCharacterPlacementW( nSet, lpResults->lpOrder, NULL, NULL ); } + if (dwFlags & GCP_USEKERNING) + { + kern = kern_string(hdc, lpString, nSet, &kern_total); + if (!kern) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + /* FIXME: Will use the placement chars */ if (lpResults->lpDx) { @@ -3365,7 +3425,11 @@ GetCharacterPlacementW( for (i = 0; i < nSet; i++) { if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) - lpResults->lpDx[i]= c; + { + lpResults->lpDx[i] = c; + if (dwFlags & GCP_USEKERNING) + lpResults->lpDx[i] += kern[i]; + } } } @@ -3374,16 +3438,23 @@ GetCharacterPlacementW( int pos = 0; lpResults->lpCaretPos[0] = 0; - for (i = 1; i < nSet; i++) - if (GetTextExtentPoint32W(hdc, &(lpString[i - 1]), 1, &size)) - lpResults->lpCaretPos[i] = (pos += size.cx); + for (i = 0; i < nSet - 1; i++) + { + if (dwFlags & GCP_USEKERNING) + pos += kern[i]; + + if (GetTextExtentPoint32W(hdc, &lpString[i], 1, &size)) + lpResults->lpCaretPos[i + 1] = (pos += size.cx); + } } - if(lpResults->lpGlyphs) + if (lpResults->lpGlyphs) GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0); if (GetTextExtentPoint32W(hdc, lpString, uCount, &size)) - ret = MAKELONG(size.cx, size.cy); + ret = MAKELONG(size.cx + kern_total, size.cy); + + heap_free(kern); return ret; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ae4a643aa54..ad894dfdcad 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7168,6 +7168,106 @@ static void test_char_width(void) ReleaseDC(NULL, dc); } +static void test_GetCharacterPlacement_kerning(void) +{ + LOGFONTA lf; + HFONT hfont, hfont_old; + KERNINGPAIR *kp; + HDC hdc; + DWORD count, ret, i, size, width, width_kern, idx; + WCHAR str[30]; + GCP_RESULTSW result; + int kern[30], pos[30], pos_kern[30], dx[30], dx_kern[30], kern_amount; + + if (!is_font_installed("Arial")) + { + skip("Arial is not installed, skipping the test\n"); + return; + } + + hdc = GetDC(0); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Arial"); + lf.lfHeight = 120; + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "CreateFontIndirect failed\n"); + + hfont_old = SelectObject(hdc, hfont); + + count = GetKerningPairsW(hdc, 0, NULL); + kp = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*kp)); + + ret = GetKerningPairsW(hdc, count, kp); + ok(ret == count, "got %u, expected %u\n", ret, count); + + size = kern_amount = idx = 0; + for (i = 0; i < count; i++) + { + if (kp[i].wFirst >= 'A' && kp[i].wFirst <= 'z' && + kp[i].wSecond >= 'A' && kp[i].wSecond <= 'z') + { + str[size++] = kp[i].wFirst; + str[size++] = kp[i].wSecond; + str[size++] = 0; + kern[idx] = kp[i].iKernAmount; + idx++; + kern_amount += kp[i].iKernAmount; + if (size >= ARRAY_SIZE(str)) break; + } + } + + HeapFree(GetProcessHeap(), 0, kp); + + count = size; + + memset(&result, 0, sizeof(result)); + result.lStructSize = sizeof(result); + result.lpCaretPos = pos; + result.lpDx = dx; + result.nGlyphs = count; + ret = GetCharacterPlacementW(hdc, str, count, 0, &result, 0); + ok(ret, "GetCharacterPlacement failed\n"); + ok(result.nGlyphs == count, "got %u\n", result.nGlyphs); + width = LOWORD(ret); + + memset(&result, 0, sizeof(result)); + result.lStructSize = sizeof(result); + result.lpCaretPos = pos_kern; + result.lpDx = dx_kern; + result.nGlyphs = count; + ret = GetCharacterPlacementW(hdc, str, count, 0, &result, GCP_USEKERNING); + ok(ret, "GetCharacterPlacement failed\n"); + ok(result.nGlyphs == count, "got %u\n", result.nGlyphs); + width_kern = LOWORD(ret); + + if (width == width_kern) + { + win_skip("GCP_USEKERNING is broken on this platform\n"); + goto done; + } + + ok(width + kern_amount == width_kern, "%d + %d != %d\n", width, kern_amount, width_kern); + + kern_amount = idx = 0; + for (i = 0; i < count; i += 3, idx++) + { + ok(pos[i] + kern_amount == pos_kern[i], "%d: %d + %d != %d\n", i, pos[i], kern_amount, pos_kern[i]); + kern_amount += kern[idx]; + ok(pos[i+1] + kern_amount == pos_kern[i+1], "%d: %d + %d != %d\n", i, pos[i+1], kern_amount, pos_kern[i+1]); + ok(pos[i+2] + kern_amount == pos_kern[i+2], "%d: %d + %d != %d\n", i, pos[i+2], kern_amount, pos_kern[i+2]); + + ok(dx[i] + kern[idx] == dx_kern[i], "%d: %d + %d != %d\n", i, dx[i], kern[idx], dx_kern[i]); + ok(dx[i+1] == dx_kern[i+1], "%d: %d != %d\n", i, dx[i+1], dx_kern[i+1]); + ok(dx[i+2] == dx_kern[i+2], "%d: %d != %d\n", i, dx[i+2], dx_kern[i+2]); + } + +done: + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + ReleaseDC(0, hdc); +} + START_TEST(font) { static const char *test_names[] = @@ -7236,6 +7336,7 @@ START_TEST(font) test_GetTextMetrics2("Arial", -55); test_GetTextMetrics2("Arial", -110); test_GetCharacterPlacement(); + test_GetCharacterPlacement_kerning(); test_GetCharWidthInfo(); test_CreateFontIndirect(); test_CreateFontIndirectEx(); -- 2.23.0

1 0

[PATCH] wined3d: Mark the stateblock as dirty in wined3d_stateblock_multiply_transform().
by Zebediah Figura 09 Jul '20

09 Jul '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49422 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4272d5aef2f..b5ab0e72eb0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1424,6 +1424,8 @@ void CDECL wined3d_stateblock_multiply_transform(struct wined3d_stateblock *stat TRACE("%.8e %.8e %.8e %.8e\n", matrix->_41, matrix->_42, matrix->_43, matrix->_44); multiply_matrix(mat, mat, matrix); + stateblock->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); + stateblock->changed.transforms = 1; } HRESULT CDECL wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, -- 2.27.0

2 1

[PATCH] gdi32: Fix some test failures when not using X11.
by Gijs Vermeulen 09 Jul '20

09 Jul '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/gdi32/tests/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index c656eb4245..8276c1c4be 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -107,7 +107,7 @@ static void test_D3DKMTOpenAdapterFromHdc(void) if (!pD3DKMTOpenAdapterFromHdc || pD3DKMTOpenAdapterFromHdc(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTOpenAdapterFromHdc() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromHdc() is unavailable.\n"); return; } @@ -367,7 +367,7 @@ static void test_D3DKMTCheckVidPnExclusiveOwnership(void) if (!pD3DKMTCheckVidPnExclusiveOwnership || pD3DKMTCheckVidPnExclusiveOwnership(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - win_skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); + skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); return; } @@ -591,7 +591,7 @@ static void test_D3DKMTSetVidPnSourceOwner(void) if (!pD3DKMTSetVidPnSourceOwner || pD3DKMTSetVidPnSourceOwner(&set_owner_desc) == STATUS_PROCEDURE_NOT_FOUND) { - win_skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); + skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); return; } -- 2.27.0

2 1

← Newer
1
...
62
63
64
65
66
67
68
...
85
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel July 2020