wine-devel April 2019

wine-devel@winehq.org

82 participants
743 discussions

[PATCH 1/4] mfreadwrite: Keep media stream id for event matching.
by Nikolay Sivov 09 Apr '19

09 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 78d96e4f8c..e41bdf6e9d 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)) -- 2.20.1

1 3

[PATCH 1/4] [v2] gdi32: Implement GetCharWidthInfo().
by Akihiro Sagawa 09 Apr '19

09 Apr '19

2 1

[PATCH v3 2/2] gdi32/tests: Add tests for GetCharWidthInfo().
by Huw Davies 09 Apr '19

09 Apr '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 67e8941b5e..245fb4d4c2 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(); -- 2.18.0

1 0

[PATCH v3 1/2] gdi32: Implement GetCharWidthInfo().
by Huw Davies 09 Apr '19

09 Apr '19

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 3456002171..a3f84bd688 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -430,6 +430,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ @@ -1052,6 +1053,7 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 054d7cf418..88f49a03b6 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -310,6 +310,11 @@ static BOOL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffe return FALSE; } +static BOOL nulldrv_GetCharWidthInfo( PHYSDEV dev, void *info ) +{ + return FALSE; +} + static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) { int bpp; @@ -756,6 +761,7 @@ const struct gdi_dc_funcs null_driver = nulldrv_GetCharABCWidths, /* pGetCharABCWidths */ nulldrv_GetCharABCWidthsI, /* pGetCharABCWidthsI */ nulldrv_GetCharWidth, /* pGetCharWidth */ + nulldrv_GetCharWidthInfo, /* pGetCharWidthInfo */ nulldrv_GetDeviceCaps, /* pGetDeviceCaps */ nulldrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ nulldrv_GetFontData, /* pGetFontData */ diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 305f052c0a..960d1b295c 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -860,6 +860,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 51133705a5..1cd838ab8e 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -73,6 +73,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b3d67ff624..633fb10116 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3968,3 +3968,27 @@ BOOL WINAPI GdiRealizationInfo(HDC hdc, struct realization_info *info) return ret; } + +/************************************************************* + * GetCharWidthInfo (GDI32.@) + * + */ +BOOL WINAPI GetCharWidthInfo(HDC hdc, struct char_width_info *info) +{ + PHYSDEV dev; + BOOL ret; + DC *dc; + + dc = get_dc_ptr(hdc); + if (!dc) return FALSE; + dev = GET_DC_PHYSDEV( dc, pGetCharWidthInfo ); + ret = dev->funcs->pGetCharWidthInfo( dev, info ); + + if (ret) + { + info->lsb = width_to_LP( dc, info->lsb ); + info->rsb = width_to_LP( dc, info->rsb ); + } + release_dc_ptr(dc); + return ret; +} diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 352a86653a..703dc3a997 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8417,6 +8417,40 @@ static BOOL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, L return TRUE; } +/************************************************************* + * freetype_GetCharWidthInfo + */ +static BOOL freetype_GetCharWidthInfo( PHYSDEV dev, void* ptr ) +{ + struct freetype_physdev *physdev = get_freetype_dev( dev ); + struct char_width_info *info = ptr; + TT_HoriHeader *pHori; + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetCharWidthInfo ); + return dev->funcs->pGetCharWidthInfo( dev, ptr ); + } + + TRACE("%p, %p\n", physdev->font, info); + + if (FT_IS_SCALABLE(physdev->font->ft_face) && + (pHori = pFT_Get_Sfnt_Table(physdev->font->ft_face, ft_sfnt_hhea))) + { + FT_Fixed em_scale; + em_scale = MulDiv(physdev->font->ppem, 1 << 16, + physdev->font->ft_face->units_per_EM); + info->lsb = (SHORT)pFT_MulFix(pHori->min_Left_Side_Bearing, em_scale); + info->rsb = (SHORT)pFT_MulFix(pHori->min_Right_Side_Bearing, em_scale); + } + else + info->lsb = info->rsb = 0; + + info->unk = 0; + + return TRUE; +} + /************************************************************* * freetype_GetCharABCWidths */ @@ -9112,6 +9146,7 @@ static const struct gdi_dc_funcs freetype_funcs = freetype_GetCharABCWidths, /* pGetCharABCWidths */ freetype_GetCharABCWidthsI, /* pGetCharABCWidthsI */ freetype_GetCharWidth, /* pGetCharWidth */ + freetype_GetCharWidthInfo, /* pGetCharWidthInfo */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ freetype_GetFontData, /* pGetFontData */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6e8f0285f4..2d158e0f1b 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -251,7 +251,7 @@ @ stdcall GetCharWidthFloatA(long long long ptr) @ stdcall GetCharWidthFloatW(long long long ptr) @ stdcall GetCharWidthI(ptr long long ptr ptr) -# @ stub GetCharWidthInfo +@ stdcall GetCharWidthInfo(ptr ptr) @ stdcall GetCharWidthW(long long long long) GetCharWidth32W @ stub GetCharWidthWOW @ stdcall GetCharacterPlacementA(long str long long ptr long) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 01473dd7e2..fc3961bd70 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,6 +294,14 @@ struct font_realization_info WORD simulations; /* 0 bit - bold simulation, 1 bit - oblique simulation */ }; +/* Undocumented structure filled in by GetCharWidthInfo */ +struct char_width_info +{ + INT lsb; /* minimum left side bearing */ + INT rsb; /* minimum right side bearing */ + INT unk; /* unknown */ +}; + extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngCreateScalableFontResource(DWORD, LPCWSTR, LPCWSTR, LPCWSTR) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index d766d025e5..4ef509a89f 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -136,6 +136,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ MFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 402b082f4c..8cf86ccb2e 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2158,6 +2158,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index b5c85eea83..7a2945c80f 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -321,6 +321,7 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 40478fdb86..7156a3c3a8 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -300,6 +300,7 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ macdrv_GetDeviceCaps, /* pGetDeviceCaps */ macdrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 8a1353cedf..0dff6cc868 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -818,6 +818,7 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ PSDRV_GetCharWidth, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ PSDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 326873314c..20710cc0c9 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -381,6 +381,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ X11DRV_GetDeviceCaps, /* pGetDeviceCaps */ X11DRV_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 8350bad548..61729ecf29 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2194,6 +2194,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 4693235cae..d3e5bcefb4 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -102,6 +102,7 @@ struct gdi_dc_funcs BOOL (*pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC); BOOL (*pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); + BOOL (*pGetCharWidthInfo)(PHYSDEV,void*); INT (*pGetDeviceCaps)(PHYSDEV,INT); BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID); DWORD (*pGetFontData)(PHYSDEV,DWORD,DWORD,LPVOID,DWORD); @@ -199,7 +200,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 48 +#define WINE_GDI_DRIVER_VERSION 49 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ -- 2.18.0

1 0

[PATCH v2] taskmgr: Replace repeated assignments with for loops.
by Isira Seneviratne 09 Apr '19

09 Apr '19

2 3

GSOC 2019 Project
by Aaron 09 Apr '19

09 Apr '19

Hi, I'm Aaron De Zoysa I am interested to work on the project for AppDB improvement. I would like to know more about the project. Also I would like to get a template for the project proposal

1 0

[PATCH] wineps.drv: Avoid using the comma operator
by Michael Stefaniuc 09 Apr '19

09 Apr '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wineps.drv/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index c4d0a965ae..c1de724b8e 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -271,7 +271,7 @@ DWORD PSDRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, } dst_x = dst->visrect.left; - dst_y = dst->visrect.top, + dst_y = dst->visrect.top; dst_width = dst->visrect.right - dst->visrect.left; dst_height = dst->visrect.bottom - dst->visrect.top; if (src->width * dst->width < 0) -- 2.20.1

2 1

[PATCH] gdi32: Don't use strcasecmp.
by Piotr Caban 09 Apr '19

09 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

GSOC 2019 Participation
by Aaron 09 Apr '19

09 Apr '19

Hello, My name is Aaron De Zoysa. I am currently doing my BSc in Computer Science at Informatics Institute of Technology Colombo, Sri Lanka, which is in partnership with the University of Westminster. I am interested to participate in GSoC 2019 with the interest of working with The Wine Project as there are interesting projects which caught my attention. The project that I am interested in contributing to is the AppDB improvements. I have experience with JSON, PHP, Java, JavaScript, Python, HTML, XML, CSS3, SQL and jQuery. I would love to be a part of the Wine community and would like some guidance on contributing to this project and wha information is required for my proposal. Thank you, Aaron De Zoysa

2 1

[PATCH v2 1/8] ntoskrnl.exe: Implement ExInitializeResourceLite().
by Zebediah Figura 09 Apr '19

09 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45819 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 -------- dlls/ntoskrnl.exe/sync.c | 10 +++++++ include/ddk/wdm.h | 54 +++++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 60953dfc1c..c6a10f19d2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2371,17 +2371,6 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) HeapFree( GetProcessHeap(), 0, ptr ); } - -/*********************************************************************** - * ExInitializeResourceLite (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI ExInitializeResourceLite(PERESOURCE Resource) -{ - FIXME( "stub: %p\n", Resource ); - return STATUS_NOT_IMPLEMENTED; -} - - /*********************************************************************** * ExInitializeNPagedLookasideList (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 12dacae408..168c6d1642 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -717,3 +717,13 @@ void WINAPI ExReleaseFastMutexUnsafe( FAST_MUTEX *mutex ) if (count < 1) KeSetEvent( &mutex->Event, IO_NO_INCREMENT, FALSE ); } + +/*********************************************************************** + * ExInitializeResourceLite (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExInitializeResourceLite( ERESOURCE *resource ) +{ + TRACE("resource %p.\n", resource); + memset(resource, 0, sizeof(*resource)); + return STATUS_SUCCESS; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index e5804c0270..a6536212b6 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -153,12 +153,63 @@ typedef struct _KWAIT_BLOCK { USHORT WaitType; } KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; +typedef struct _OWNER_ENTRY +{ + ERESOURCE_THREAD OwnerThread; + union + { + struct + { + ULONG IoPriorityBoosted : 1; + ULONG OwnerReferenced : 1; + ULONG IoQoSPriorityBoosted : 1; + ULONG OwnerCount : 29; + }; + ULONG TableSize; + }; +} OWNER_ENTRY, *POWNER_ENTRY; + +#define ResourceNeverExclusive 0x0010 +#define ResourceReleaseByOtherThread 0x0020 +#define ResourceOwnedExclusive 0x0080 + +typedef struct _ERESOURCE +{ + LIST_ENTRY SystemResourcesList; + OWNER_ENTRY *OwnerTable; + SHORT ActiveCount; + union + { + USHORT Flag; + struct + { + UCHAR ReservedLowFlags; + UCHAR WaiterPriority; + }; + }; + KSEMAPHORE *SharedWaiters; + KEVENT *ExclusiveWaiters; + OWNER_ENTRY OwnerEntry; + ULONG ActiveEntries; + ULONG ContentionCount; + ULONG NumberOfSharedWaiters; + ULONG NumberOfExclusiveWaiters; +#ifdef _WIN64 + void *Reserved2; +#endif + union + { + void *Address; + ULONG_PTR CreatorBackTraceIndex; + }; + KSPIN_LOCK SpinLock; +} ERESOURCE, *PERESOURCE; + typedef struct _IO_TIMER *PIO_TIMER; typedef struct _IO_TIMER_ROUTINE *PIO_TIMER_ROUTINE; typedef struct _ETHREAD *PETHREAD; typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD; typedef struct _EPROCESS *PEPROCESS; -typedef struct _ERESOURCE *PERESOURCE; typedef struct _IO_WORKITEM *PIO_WORKITEM; typedef struct _PAGED_LOOKASIDE_LIST *PPAGED_LOOKASIDE_LIST; typedef struct _OBJECT_TYPE *POBJECT_TYPE; @@ -1469,6 +1520,7 @@ void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); +NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); 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*); -- 2.21.0

2 8

← Newer
1
...
48
49
50
51
52
53
54
...
75
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 April 2019