October 2020 - Wine-Commits

Michael Stefaniuc : cryptnet: Use wide-char string literals.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 081f5ae24f8264c203f6ec1a577b5ae77c943a59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081f5ae24f8264c203f6ec1a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 22 12:46:00 2020 +0200 cryptnet: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 2e0ab21f89b..5243481ff28 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); #define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0) -static const WCHAR cryptNet[] = { 'c','r','y','p','t','n','e','t','.', - 'd','l','l',0 }; /*********************************************************************** * DllRegisterServer (CRYPTNET.@) @@ -48,11 +46,11 @@ HRESULT WINAPI DllRegisterServer(void) { TRACE("\n"); CryptRegisterDefaultOIDFunction(X509_ASN_ENCODING, - CRYPT_OID_VERIFY_REVOCATION_FUNC, 0, cryptNet); + CRYPT_OID_VERIFY_REVOCATION_FUNC, 0, L"cryptnet.dll"); CryptRegisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, "Ldap", - cryptNet, "LdapProvOpenStore"); + L"cryptnet.dll", "LdapProvOpenStore"); CryptRegisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, - CERT_STORE_PROV_LDAP_W, cryptNet, "LdapProvOpenStore"); + CERT_STORE_PROV_LDAP_W, L"cryptnet.dll", "LdapProvOpenStore"); return S_OK; } @@ -63,7 +61,7 @@ HRESULT WINAPI DllUnregisterServer(void) { TRACE("\n"); CryptUnregisterDefaultOIDFunction(X509_ASN_ENCODING, - CRYPT_OID_VERIFY_REVOCATION_FUNC, cryptNet); + CRYPT_OID_VERIFY_REVOCATION_FUNC, L"cryptnet.dll"); CryptUnregisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, "Ldap"); CryptUnregisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, CERT_STORE_PROV_LDAP_W); @@ -851,28 +849,6 @@ static BOOL WINAPI FTP_RetrieveEncodedObjectW(LPCWSTR pszURL, return FALSE; } -static const WCHAR x509cacert[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','x','5','0','9','-','c','a','-','c','e','r','t',0 }; -static const WCHAR x509emailcert[] = { 'a','p','p','l','i','c','a','t','i','o', - 'n','/','x','-','x','5','0','9','-','e','m','a','i','l','-','c','e','r','t', - 0 }; -static const WCHAR x509servercert[] = { 'a','p','p','l','i','c','a','t','i','o', - 'n','/','x','-','x','5','0','9','-','s','e','r','v','e','r','-','c','e','r', - 't',0 }; -static const WCHAR x509usercert[] = { 'a','p','p','l','i','c','a','t','i','o', - 'n','/','x','-','x','5','0','9','-','u','s','e','r','-','c','e','r','t',0 }; -static const WCHAR pkcs7cert[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','c','e','r','t','i','f','c','a','t','e', - 's',0 }; -static const WCHAR pkixCRL[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','p','k','i','x','-','c','r','l',0 }; -static const WCHAR pkcs7CRL[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','c','r','l',0 }; -static const WCHAR pkcs7sig[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','s','i','g','n','a','t','u','r','e',0 }; -static const WCHAR pkcs7mime[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','m','i','m','e',0 }; - static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, LPCSTR pszObjectOid, DWORD dwRetrievalFlags, DWORD dwTimeout, PCRYPT_BLOB_ARRAY pObject, PFN_FREE_ENCODED_OBJECT_FUNC *ppfnFreeObject, @@ -908,9 +884,14 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, &hHost); if (ret) { - static LPCWSTR types[] = { x509cacert, x509emailcert, - x509servercert, x509usercert, pkcs7cert, pkixCRL, pkcs7CRL, - pkcs7sig, pkcs7mime, NULL }; + static LPCWSTR types[] = + { + L"application/x-x509-ca-cert", L"application/x-x509-email-cert", + L"application/x-x509-server-cert", L"application/x-x509-user-cert", + L"application/x-pkcs7-certifcates", L"application/pkix-crl", + L"application/x-pkcs7-crl", L"application/x-pkcs7-signature", + L"application/x-pkcs7-mime", NULL + }; HINTERNET hHttp = HttpOpenRequestW(hHost, NULL, components.lpszUrlPath, NULL, NULL, types, INTERNET_FLAG_NO_COOKIES | INTERNET_FLAG_NO_UI,

1 0

Nikolay Sivov : evr/mixer: Fill output surfaces when not streaming.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 775daad7efcd272a35dc01178b18d701d0924e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=775daad7efcd272a35dc0117… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:02:46 2020 +0300 evr/mixer: Fill output surfaces when not streaming. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 19 ++++++++--- 2 files changed, 100 insertions(+), 10 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 2c2fda51cd1..b4bf1ed0967 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -712,6 +712,13 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const return count ? S_OK : hr; } +static HRESULT video_mixer_open_device_handle(struct video_mixer *mixer) +{ + IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); + mixer->device_handle = NULL; + return IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &mixer->device_handle); +} + static HRESULT video_mixer_get_processor_service(struct video_mixer *mixer, IDirectXVideoProcessorService **service) { HRESULT hr; @@ -728,9 +735,7 @@ static HRESULT video_mixer_get_processor_service(struct video_mixer *mixer, IDir &IID_IDirectXVideoProcessorService, (void **)service); if (hr == DXVA2_E_NEW_VIDEO_DEVICE) { - IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); - mixer->device_handle = NULL; - if (SUCCEEDED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &mixer->device_handle))) + if (SUCCEEDED(hr = video_mixer_open_device_handle(mixer))) continue; } break; @@ -1083,12 +1088,86 @@ static HRESULT WINAPI video_mixer_transform_ProcessInput(IMFTransform *iface, DW return hr; } +static HRESULT video_mixer_get_sample_surface(IMFSample *sample, IDirect3DSurface9 **surface) +{ + IMFMediaBuffer *buffer; + IMFGetService *gs; + HRESULT hr; + + if (FAILED(hr = IMFSample_GetBufferByIndex(sample, 0, &buffer))) + return hr; + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); + IMFMediaBuffer_Release(buffer); + if (FAILED(hr)) + return hr; + + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)surface); + IMFGetService_Release(gs); + return hr; +} + +static HRESULT video_mixer_get_d3d_device(struct video_mixer *mixer, IDirect3DDevice9 **device) +{ + HRESULT hr; + + for (;;) + { + hr = IDirect3DDeviceManager9_LockDevice(mixer->device_manager, mixer->device_handle, + device, TRUE); + if (hr == DXVA2_E_NEW_VIDEO_DEVICE) + { + if (SUCCEEDED(hr = video_mixer_open_device_handle(mixer))) + continue; + } + break; + } + + return hr; +} + static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, - MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) + MFT_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { - FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + IDirect3DSurface9 *surface; + IDirect3DDevice9 *device; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %#x, %u, %p, %p.\n", iface, flags, count, buffers, status); + + if (!buffers || !count || !buffers->pSample) + return E_INVALIDARG; + + if (count > 1) + FIXME("Multiple buffers are not handled.\n"); + + *status = 0; + + EnterCriticalSection(&mixer->cs); + + if (SUCCEEDED(hr = video_mixer_get_sample_surface(buffers->pSample, &surface))) + { + if (mixer->is_streaming) + { + FIXME("Streaming state is not handled.\n"); + hr = E_NOTIMPL; + } + else + { + if (SUCCEEDED(hr = video_mixer_get_d3d_device(mixer, &device))) + { + IDirect3DDevice9_ColorFill(device, surface, NULL, 0); + IDirect3DDeviceManager9_UnlockDevice(mixer->device_manager, mixer->device_handle, FALSE); + IDirect3DDevice9_Release(device); + } + } + IDirect3DSurface9_Release(surface); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static const IMFTransformVtbl video_mixer_transform_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7cf127d4d8c..fc74a11496b 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2062,6 +2062,7 @@ static void test_mixer_samples(void) { IDirect3DDeviceManager9 *manager; MFT_OUTPUT_DATA_BUFFER buffer; + IMFVideoProcessor *processor; IDirect3DSurface9 *surface; IMFDesiredSample *desired; IDirect3DDevice9 *device; @@ -2086,6 +2087,9 @@ static void test_mixer_samples(void) hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoProcessor, (void **)&processor); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetInputStatus(mixer, 0, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); @@ -2147,7 +2151,6 @@ static void test_mixer_samples(void) memset(&buffer, 0, sizeof(buffer)); hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); /* It needs a sample with a backing surface. */ @@ -2156,7 +2159,6 @@ todo_wine buffer.pSample = sample; hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IMFSample_Release(sample); @@ -2175,17 +2177,25 @@ todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); color = get_surface_color(surface, 0, 0); +todo_wine ok(color == D3DCOLOR_ARGB(0x10, 0xff, 0x00, 0x00), "Unexpected color %#x.\n", color); /* Streaming is not started yet. Output is colored black, but only if desired timestamps were set. */ IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired, 100, 0); hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); color = get_surface_color(surface, 0, 0); -todo_wine + ok(!color, "Unexpected color %#x.\n", color); + + hr = IMFVideoProcessor_SetBackgroundColor(processor, RGB(0, 0, 255)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + color = get_surface_color(surface, 0, 0); ok(!color, "Unexpected color %#x.\n", color); IMFDesiredSample_Clear(desired); @@ -2231,6 +2241,7 @@ todo_wine IDirect3DSurface9_Release(surface); + IMFVideoProcessor_Release(processor); IMFTransform_Release(mixer); IDirect3DDevice9_Release(device);

1 0

Alexandre Julliard : gdi32: Move the GetGlyphIndices() implementation out of freetype.c.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 5bdc6e0fe64222d8d7d383616f5e230928af011a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bdc6e0fe64222d8d7d38361… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 13:13:52 2020 +0200 gdi32: Move the GetGlyphIndices() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 44 +++++++++++++++++++-- dlls/gdi32/freetype.c | 100 ++++++++++++++++------------------------------- dlls/gdi32/gdi_private.h | 3 +- 3 files changed, 76 insertions(+), 71 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8c85614cb49..9c4fec88e1a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1103,17 +1103,55 @@ static DWORD CDECL font_GetFontUnicodeRanges( PHYSDEV dev, GLYPHSET *glyphset ) static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT count, WORD *gi, DWORD flags ) { struct font_physdev *physdev = get_font_dev( dev ); - DWORD ret; + UINT default_char; + char ch; + BOOL used, got_default = FALSE; + int i; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetGlyphIndices ); return dev->funcs->pGetGlyphIndices( dev, str, count, gi, flags ); } + + if (flags & GGI_MARK_NONEXISTING_GLYPHS) + { + default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ + got_default = TRUE; + } + EnterCriticalSection( &font_cs ); - ret = font_funcs->pGetGlyphIndices( physdev->font, str, count, gi, flags ); + + for (i = 0; i < count; i++) + { + UINT glyph = str[i]; + + if (!font_funcs->get_glyph_index( physdev->font, &glyph )) + { + glyph = 0; + if (physdev->font->codepage == CP_SYMBOL) + { + if (str[i] >= 0xf020 && str[i] <= 0xf100) glyph = str[i] - 0xf000; + else if (str[i] < 0x100) glyph = str[i]; + } + else if (WideCharToMultiByte( physdev->font->codepage, 0, &str[i], 1, + &ch, 1, NULL, &used ) && !used) + glyph = (unsigned char)ch; + } + if (!glyph) + { + if (!got_default) + { + default_char = font_funcs->get_default_glyph( physdev->font ); + got_default = TRUE; + } + glyph = default_char; + } + gi[i] = glyph; + } + LeaveCriticalSection( &font_cs ); - return ret; + return count; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b06a26b9e34..718c7f3407e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5661,89 +5661,54 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) return pFT_Get_Char_Index(font->ft_face, glyph); } -/* helper for freetype_GetGlyphIndices */ -static FT_UInt get_gdi_glyph_index(const GdiFont *font, UINT glyph) +/************************************************************* + * freetype_get_glyph_index + */ +static BOOL CDECL freetype_get_glyph_index( struct gdi_font *gdi_font, UINT *glyph ) { - struct gdi_font *gdi_font = font->gdi_font; - WCHAR wc = (WCHAR)glyph; - BOOL default_used = FALSE; - BOOL *default_used_pointer = NULL; - FT_UInt ret; - char buf; + GdiFont *font = get_font_ptr( gdi_font ); - if(font->ft_face->charmap->encoding != FT_ENCODING_NONE) - return get_glyph_index(font, glyph); + if (font->ft_face->charmap->encoding == FT_ENCODING_NONE) return FALSE; - if (codepage_sets_default_used(gdi_font->codepage)) - default_used_pointer = &default_used; - if(!WideCharToMultiByte(gdi_font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) - || default_used) + if (font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) { - if (gdi_font->codepage == CP_SYMBOL && wc < 0x100) - ret = (unsigned char)wc; - else - ret = 0; - } - else - ret = (unsigned char)buf; - TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, (unsigned char)buf, ret, default_used); - return ret; -} - -static FT_UInt get_default_char_index(GdiFont *font) -{ - FT_UInt default_char; + if (!(*glyph = get_glyph_index_symbol( font, *glyph ))) + { + WCHAR wc = *glyph; + char ch; - if (FT_IS_SFNT(font->ft_face)) - { - TT_OS2 *pOS2 = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_os2); - default_char = (pOS2->usDefaultChar ? get_glyph_index(font, pOS2->usDefaultChar) : 0); - } - else - { - TEXTMETRICW textm; - get_text_metrics(font, &textm); - default_char = textm.tmDefaultChar; + if (WideCharToMultiByte( CP_ACP, 0, &wc, 1, &ch, 1, NULL, NULL )) + *glyph = get_glyph_index_symbol( font, (unsigned char)ch ); + } + return TRUE; } - return default_char; + if ((*glyph = pFT_Get_Char_Index( font->ft_face, *glyph ))) + *glyph = get_GSUB_vert_glyph( font, *glyph ); + + return TRUE; } /************************************************************* - * freetype_GetGlyphIndices + * freetype_get_default_glyph */ -static DWORD CDECL freetype_GetGlyphIndices( struct gdi_font *gdi_font, LPCWSTR lpstr, - INT count, LPWORD pgi, DWORD flags ) +static UINT CDECL freetype_get_default_glyph( struct gdi_font *gdi_font ) { - GdiFont *font = get_font_ptr(gdi_font); - int i; - WORD default_char; - BOOL got_default = FALSE; - - if (flags & GGI_MARK_NONEXISTING_GLYPHS) - { - default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ - got_default = TRUE; - } + GdiFont *font = get_font_ptr( gdi_font ); + FT_WinFNT_HeaderRec winfnt; + TT_OS2 *pOS2; - for(i = 0; i < count; i++) + if ((pOS2 = pFT_Get_Sfnt_Table( font->ft_face, ft_sfnt_os2 ))) { - pgi[i] = get_gdi_glyph_index(font, lpstr[i]); - if (pgi[i] == 0) - { - if (!got_default) - { - default_char = get_default_char_index(font); - got_default = TRUE; - } - pgi[i] = default_char; - } - else - pgi[i] = get_GSUB_vert_glyph(font, pgi[i]); + UINT glyph = pOS2->usDefaultChar; + freetype_get_glyph_index( gdi_font, &glyph ); + return glyph; } - return count; + if (!pFT_Get_WinFNT_Header( font->ft_face, &winfnt )) return winfnt.default_char + winfnt.first_char; + return 32; } + static inline BOOL is_identity_FMAT2(const FMAT2 *matrix) { static const FMAT2 identity = { 1.0, 0.0, 0.0, 1.0 }; @@ -7838,7 +7803,6 @@ static const struct font_backend_funcs font_funcs = freetype_FontIsLinked, freetype_GetCharWidthInfo, freetype_GetFontUnicodeRanges, - freetype_GetGlyphIndices, freetype_GetKerningPairs, freetype_GetOutlineTextMetrics, freetype_GetTextMetrics, @@ -7849,6 +7813,8 @@ static const struct font_backend_funcs font_funcs = freetype_CreateScalableFontResource, freetype_alloc_font, freetype_get_font_data, + freetype_get_glyph_index, + freetype_get_default_glyph, freetype_get_glyph_outline, freetype_destroy_font }; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2302dc5a7a7..6d1caf6c65e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -356,7 +356,6 @@ struct font_backend_funcs BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); DWORD (CDECL *pGetFontUnicodeRanges)( struct gdi_font *font, GLYPHSET *glyphset ); - DWORD (CDECL *pGetGlyphIndices)( struct gdi_font *font, const WCHAR *str, INT count, WORD *gi, DWORD flags ); DWORD (CDECL *pGetKerningPairs)( struct gdi_font *font, DWORD count, KERNINGPAIR *pairs ); UINT (CDECL *pGetOutlineTextMetrics)( struct gdi_font *font, UINT size, OUTLINETEXTMETRICW *metrics ); BOOL (CDECL *pGetTextMetrics)( struct gdi_font *font, TEXTMETRICW *metrics ); @@ -371,6 +370,8 @@ struct font_backend_funcs BOOL (CDECL *alloc_font)( struct gdi_font *font ); DWORD (CDECL *get_font_data)( struct gdi_font *gdi_font, DWORD table, DWORD offset, void *buf, DWORD count ); + BOOL (CDECL *get_glyph_index)( struct gdi_font *gdi_font, UINT *glyph ); + UINT (CDECL *get_default_glyph)( struct gdi_font *gdi_font ); DWORD (CDECL *get_glyph_outline)( struct gdi_font *font, UINT glyph, UINT format, GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); void (CDECL *destroy_font)( struct gdi_font *font );

1 0

Alexandre Julliard : gdi32: Move the GetFontFileData() implementation out of freetype.c.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 2d15ea5012e1fbd9e16a86c69d68b587128832ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d15ea5012e1fbd9e16a86c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 11:57:48 2020 +0200 gdi32: Move the GetFontFileData() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 12 +++++- dlls/gdi32/freetype.c | 99 +++++++++++++----------------------------------- dlls/gdi32/gdi_private.h | 15 ++++++-- 3 files changed, 49 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d15ea5012e1fbd9e16a…

1 0

Huw Davies : riched20: Simplify some of the drawing code using a few helpers.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 6488613a3ad605d5640cff29aa86d65b2531b419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6488613a3ad605d5640cff29… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:50 2020 +0100 riched20: Simplify some of the drawing code using a few helpers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 3 +++ dlls/riched20/paint.c | 59 +++++++++++++++++++++++--------------------------- dlls/riched20/table.c | 22 +++++++++++++++++++ 3 files changed, 52 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 97d4c3bc5ab..68c54c2b328 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -280,6 +280,8 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; +ME_Paragraph *cell_end_para( ME_Cell *cell ) DECLSPEC_HIDDEN; +ME_Paragraph *cell_first_para( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_next( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_prev( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; @@ -289,6 +291,7 @@ ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 5a0432a9eed..30c0d7f57fd 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -23,12 +23,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph); +static void draw_paragraph( ME_Context *c, ME_Paragraph *para ); void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) { - ME_DisplayItem *item; + ME_Paragraph *para; ME_Context c; + ME_Cell *cell; int ys, ye; HRGN oldRgn; @@ -44,36 +45,29 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); - item = editor->pBuffer->pFirst->next; + para = editor_first_para( editor ); /* This context point is an offset for the paragraph positions stored * during wrapping. It shouldn't be modified during painting. */ c.pt.x = c.rcView.left - editor->horz_si.nPos; c.pt.y = c.rcView.top - editor->vert_si.nPos; - while(item != editor->pBuffer->pLast) + while (para_next( para )) { - assert(item->type == diParagraph); - - ys = c.pt.y + item->member.para.pt.y; - if (item->member.para.pCell - != item->member.para.next_para->member.para.pCell) - { - ME_Cell *cell = NULL; - cell = &ME_FindItemBack(item->member.para.next_para, diCell)->member.cell; + ys = c.pt.y + para->pt.y; + cell = para_cell( para ); + if (cell && para == cell_end_para( cell )) ye = c.pt.y + cell->pt.y + cell->nHeight; - } else { - ye = ys + item->member.para.nHeight; - } - if (item->member.para.pCell && !(item->member.para.nFlags & MEPF_ROWEND) && - item->member.para.pCell != item->member.para.prev_para->member.para.pCell) + else ye = ys + para->nHeight; + + if (cell && !(para->nFlags & MEPF_ROWEND) && para == cell_first_para( cell )) { /* the border shifts the text down */ - ys -= item->member.para.pCell->member.cell.yTextOffset; + ys -= para_cell( para )->yTextOffset; } /* Draw the paragraph if any of the paragraph is in the update region. */ if (ys < rcUpdate->bottom && ye > rcUpdate->top) - ME_DrawParagraph(&c, item); - item = item->member.para.next_para; + draw_paragraph( &c, para ); + para = para_next( para ); } if (c.pt.y + editor->nTotalLength < c.rcView.bottom) { @@ -909,12 +903,12 @@ static void draw_para_number( ME_Context *c, ME_Paragraph *para ) } } -static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) +static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) { int align = SetTextAlign(c->hDC, TA_BASELINE); ME_DisplayItem *p; + ME_Cell *cell; ME_Run *run; - ME_Paragraph *para = NULL; RECT rc, bounds; int y; int height = 0, baseline = 0, no=0; @@ -923,32 +917,33 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.left = c->pt.x; rc.right = c->rcView.right; - assert(paragraph); - para = &paragraph->member.para; y = c->pt.y + para->pt.y; - if (para->pCell) + if ((cell = para_cell( para ))) { - ME_Cell *cell = &para->pCell->member.cell; rc.left = c->pt.x + cell->pt.x; rc.right = rc.left + cell->nWidth; } - if (para->nFlags & MEPF_ROWSTART) { - ME_Cell *cell = &para->next_para->member.para.pCell->member.cell; + if (para->nFlags & MEPF_ROWSTART) + { + cell = table_row_first_cell( para ); rc.right = c->pt.x + cell->pt.x; - } else if (para->nFlags & MEPF_ROWEND) { - ME_Cell *cell = &para->prev_para->member.para.pCell->member.cell; + } + else if (para->nFlags & MEPF_ROWEND) + { + cell = table_row_end_cell( para ); rc.left = c->pt.x + cell->pt.x + cell->nWidth; } ME_DrawParaDecoration(c, para, y, &bounds); y += bounds.top; - if (bounds.left || bounds.right) { + if (bounds.left || bounds.right) + { rc.left = max(rc.left, c->pt.x + bounds.left); rc.right = min(rc.right, c->pt.x - bounds.right + max(c->editor->sizeWindow.cx, c->editor->nTotalWidth)); } - for (p = paragraph->next; p != para->next_para; p = p->next) + for (p = para_get_di( para )->next; p != para_get_di( para_next( para ) ); p = p->next) { switch(p->type) { case diParagraph: diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 63b5d0fd05b..daae18d5968 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -180,6 +180,14 @@ ME_Cell *table_row_first_cell( ME_Paragraph *para ) return para_cell( para ); } +ME_Cell *table_row_end_cell( ME_Paragraph *para ) +{ + if (!para_in_table( para )) return NULL; + + para = para_prev( table_row_end( para )); + return cell_next( para_cell( para ) ); +} + ME_Cell *cell_next( ME_Cell *cell ) { if (!cell->next_cell) return NULL; @@ -192,6 +200,20 @@ ME_Cell *cell_prev( ME_Cell *cell ) return &cell->prev_cell->member.cell; } +ME_Paragraph *cell_first_para( ME_Cell *cell ) +{ + return &ME_FindItemFwd( cell_get_di( cell ), diParagraph )->member.para; +} + +ME_Paragraph *cell_end_para( ME_Cell *cell ) +{ + ME_Cell *next = cell_next( cell ); + + if (!next) return cell_first_para( cell ); /* End of row */ + + return &ME_FindItemBack( cell_get_di( next ), diParagraph )->member.para; +} + /* Make a bunch of assertions to make sure tables haven't been corrupted. * * These invariants may not hold true in the middle of streaming in rich text

1 0

Huw Davies : riched20: Use cell ptrs in the rtf parsing code.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 431ee50875a0356ece4c27f5c8699494f044b550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=431ee50875a0356ece4c27f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:48 2020 +0100 riched20: Use cell ptrs in the rtf parsing code. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 39 ++++++++++++++++++++------------------- dlls/riched20/editor.h | 9 +++++++++ dlls/riched20/para.c | 6 ++++++ dlls/riched20/table.c | 20 ++++++++++++++++++++ 4 files changed, 55 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 15dd75b9575..0cc33ad5d9b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -987,8 +987,9 @@ void ME_RTFSpecialCharHook(RTF_Info *info) /* else fall through since v4.1 treats rtfNestRow and rtfRow the same */ case rtfRow: { - ME_DisplayItem *cell, *run; + ME_DisplayItem *run; ME_Paragraph *para; + ME_Cell *cell; int i; if (!tableDef) @@ -1004,44 +1005,44 @@ void ME_RTFSpecialCharHook(RTF_Info *info) info->nestingLevel++; } para = tableDef->row_start; - cell = ME_FindItemFwd( para_get_di( para ), diCell ); - assert(cell && !cell->member.cell.prev_cell); + cell = table_row_first_cell( para ); + assert( cell && !cell_prev( cell ) ); if (tableDef->numCellsDefined < 1) { /* 2000 twips appears to be the cell size that native richedit uses * when no cell sizes are specified. */ - const int defaultCellSize = 2000; - int nRightBoundary = defaultCellSize; - cell->member.cell.nRightBoundary = nRightBoundary; - while (cell->member.cell.next_cell) { - cell = cell->member.cell.next_cell; - nRightBoundary += defaultCellSize; - cell->member.cell.nRightBoundary = nRightBoundary; + const int default_size = 2000; + int right_boundary = default_size; + cell->nRightBoundary = right_boundary; + while (cell_next( cell )) + { + cell = cell_next( cell ); + right_boundary += default_size; + cell->nRightBoundary = right_boundary; } para = table_insert_cell( info->editor, info->editor->pCursors ); - cell = para->pCell; - cell->member.cell.nRightBoundary = nRightBoundary; + cell = para_cell( para ); + cell->nRightBoundary = right_boundary; } else { for (i = 0; i < tableDef->numCellsDefined; i++) { RTFCell *cellDef = &tableDef->cells[i]; - cell->member.cell.nRightBoundary = cellDef->rightBoundary; - ME_ApplyBorderProperties(info, &cell->member.cell.border, - cellDef->border); - cell = cell->member.cell.next_cell; + cell->nRightBoundary = cellDef->rightBoundary; + ME_ApplyBorderProperties( info, &cell->border, cellDef->border ); + cell = cell_next( cell ); if (!cell) { para = table_insert_cell( info->editor, info->editor->pCursors ); - cell = para->pCell; + cell = para_cell( para ); } } /* Cell for table row delimiter is empty */ - cell->member.cell.nRightBoundary = tableDef->cells[i-1].rightBoundary; + cell->nRightBoundary = tableDef->cells[i - 1].rightBoundary; } - run = ME_FindItemFwd(cell, diRun); + run = ME_FindItemFwd( cell_get_di( cell) , diRun ); if (info->editor->pCursors[0].pRun != run || info->editor->pCursors[0].nOffset) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 168a8e58cc2..97d4c3bc5ab 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -204,6 +204,7 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPE void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; +ME_Cell *para_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_destroy( ME_TextEditor *editor, ME_Paragraph *item ) DECLSPEC_HIDDEN; ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; @@ -279,6 +280,8 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; +ME_Cell *cell_next( ME_Cell *cell ) DECLSPEC_HIDDEN; +ME_Cell *cell_prev( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; @@ -286,6 +289,7 @@ ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nChars) DECLSPEC_HIDDEN; @@ -293,6 +297,11 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) DECLSPEC_HID void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_HIDDEN; +static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) +{ + return (ME_DisplayItem *)((ptrdiff_t)cell - offsetof(ME_DisplayItem, member)); +} + /* txthost.c */ ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 1db553a3478..db258947916 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -124,6 +124,12 @@ BOOL para_in_table( ME_Paragraph *para ) return para->fmt.wEffects & PFE_TABLE; } +ME_Cell *para_cell( ME_Paragraph *para ) +{ + if (!para->pCell) return NULL; + return &para->pCell->member.cell; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { static const WCHAR cr_lf[] = {'\r','\n',0}; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index aff4f0dc13f..63b5d0fd05b 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -172,6 +172,26 @@ ME_Paragraph* table_outer_para( ME_Paragraph *para ) return para; } +ME_Cell *table_row_first_cell( ME_Paragraph *para ) +{ + if (!para_in_table( para )) return NULL; + + para = para_next( table_row_start( para ) ); + return para_cell( para ); +} + +ME_Cell *cell_next( ME_Cell *cell ) +{ + if (!cell->next_cell) return NULL; + return &cell->next_cell->member.cell; +} + +ME_Cell *cell_prev( ME_Cell *cell ) +{ + if (!cell->prev_cell) return NULL; + return &cell->prev_cell->member.cell; +} + /* Make a bunch of assertions to make sure tables haven't been corrupted. * * These invariants may not hold true in the middle of streaming in rich text

1 0

Huw Davies : riched20: Return paragraph ptrs from the remaining table insert functions.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 670dadf719798c7ae95a0922d610d2c011df4a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=670dadf719798c7ae95a0922… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:47 2020 +0100 riched20: Return paragraph ptrs from the remaining table insert functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 8 ++++---- dlls/riched20/editor.h | 4 ++-- dlls/riched20/table.c | 16 +++++++--------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 36c2e108b2d..15dd75b9575 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -966,7 +966,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) tableDef->row_start = table_insert_row_start_at_para( info->editor, para ); info->nestingLevel = 1; } - ME_InsertTableCellFromCursor(info->editor); + table_insert_cell( info->editor, info->editor->pCursors ); } } else /* v1.0 - v3.0 */ @@ -1018,7 +1018,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) nRightBoundary += defaultCellSize; cell->member.cell.nRightBoundary = nRightBoundary; } - para = &ME_InsertTableCellFromCursor(info->editor)->member.para; + para = table_insert_cell( info->editor, info->editor->pCursors ); cell = para->pCell; cell->member.cell.nRightBoundary = nRightBoundary; } @@ -1033,7 +1033,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) cell = cell->member.cell.next_cell; if (!cell) { - para = &ME_InsertTableCellFromCursor(info->editor)->member.para; + para = table_insert_cell( info->editor, info->editor->pCursors ); cell = para->pCell; } } @@ -1056,7 +1056,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) nChars, TRUE); } - para = &ME_InsertTableRowEndFromCursor(info->editor)->member.para; + para = table_insert_row_end( info->editor, info->editor->pCursors ); para->fmt.dxOffset = abs(info->tableDef->gapH); para->fmt.dxStartIndent = info->tableDef->leftEdge; ME_ApplyBorderProperties( info, &para->border, tableDef->border ); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e9a7a77e234..168a8e58cc2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -279,9 +279,9 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_InsertTableCellFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; +ME_Paragraph *table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; +ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 1b735638606..aff4f0dc13f 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -113,21 +113,19 @@ ME_Paragraph* table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragrap /* Inserts a diCell and starts a new paragraph for the next cell. * * Returns the first paragraph of the new cell. */ -ME_DisplayItem* ME_InsertTableCellFromCursor(ME_TextEditor *editor) +ME_Paragraph* table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_Paragraph *para; WCHAR tab = '\t'; - para = table_insert_end_para( editor, editor->pCursors, &tab, 1, MEPF_CELL ); - return para_get_di( para ); + return table_insert_end_para( editor, editor->pCursors, &tab, 1, MEPF_CELL ); } -ME_DisplayItem* ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) +ME_Paragraph* table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Paragraph *para; - para = table_insert_end_para( editor, editor->pCursors, cr_lf, 2, MEPF_ROWEND ); - return para_get_di( para_prev( para ) ); + para = table_insert_end_para( editor, cursor, cr_lf, 2, MEPF_ROWEND ); + return para_prev( para ); } ME_Paragraph* table_row_end( ME_Paragraph *para ) @@ -424,13 +422,13 @@ ME_Paragraph* table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) while (cell->member.cell.next_cell) { cell = cell->member.cell.next_cell; - para = &ME_InsertTableCellFromCursor( editor )->member.para; + para = table_insert_cell( editor, editor->pCursors ); insertedCell = ME_FindItemBack( para_get_di( para ), diCell ); /* Copy cell properties */ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; insertedCell->member.cell.border = cell->member.cell.border; }; - para = &ME_InsertTableRowEndFromCursor(editor)->member.para; + para = table_insert_row_end( editor, editor->pCursors ); para->fmt = prev_table_end->fmt; /* return the table row start for the inserted paragraph */ return para_next( &ME_FindItemFwd( cell, diParagraph )->member.para );

1 0

Nikolay Sivov : mf/evr: Create sample allocators on demand.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: b8d10aa46c123f0c35729e8982e8976c77dc5536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8d10aa46c123f0c35729e89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:29:03 2020 +0300 mf/evr: Create sample allocators on demand. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 957d0e0f797..cc3f828e540 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -528,13 +528,26 @@ static ULONG WINAPI video_stream_get_service_Release(IMFGetService *iface) static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { struct video_stream *stream = impl_from_stream_IMFGetService(iface); + HRESULT hr = S_OK; TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); if (IsEqualGUID(service, &MR_VIDEO_ACCELERATION_SERVICE)) { if (IsEqualIID(riid, &IID_IMFVideoSampleAllocator)) - return IMFVideoSampleAllocator_QueryInterface(stream->allocator, riid, obj); + { + EnterCriticalSection(&stream->cs); + + if (!stream->allocator) + hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&stream->allocator); + if (SUCCEEDED(hr)) + hr = IMFVideoSampleAllocator_QueryInterface(stream->allocator, riid, obj); + + LeaveCriticalSection(&stream->cs); + + return hr; + } + return E_NOINTERFACE; } @@ -569,9 +582,6 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns if (FAILED(hr = MFCreateEventQueue(&stream->event_queue))) goto failed; - if (FAILED(hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&stream->allocator))) - goto failed; - stream->parent = renderer; IMFMediaSink_AddRef(&stream->parent->IMFMediaSink_iface); stream->id = id;

1 0

Nikolay Sivov : evr/sample: Implement SetDirectXManager().
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: a6512b32efcf4a4306a8b13b4c46cc387562fc91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6512b32efcf4a4306a8b13b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:29:02 2020 +0300 evr/sample: Implement SetDirectXManager(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index cd6cef001aa..f5189443307 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -21,6 +21,8 @@ #include "evr.h" #include "mfapi.h" #include "mferror.h" +#include "d3d9.h" +#include "dxva2api.h" #include "wine/debug.h" #include "wine/heap.h" @@ -108,6 +110,7 @@ struct sample_allocator IMFVideoSampleAllocatorNotify *callback; unsigned int free_samples; + IDirect3DDeviceManager9 *device_manager; CRITICAL_SECTION cs; }; @@ -168,6 +171,8 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) { if (allocator->callback) IMFVideoSampleAllocatorNotify_Release(allocator->callback); + if (allocator->device_manager) + IDirect3DDeviceManager9_Release(allocator->device_manager); DeleteCriticalSection(&allocator->cs); heap_free(allocator); } @@ -178,9 +183,27 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) static HRESULT WINAPI sample_allocator_SetDirectXManager(IMFVideoSampleAllocator *iface, IUnknown *manager) { - FIXME("%p, %p.\n", iface, manager); + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface); + IDirect3DDeviceManager9 *device_manager = NULL; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, manager); + + if (manager && FAILED(hr = IUnknown_QueryInterface(manager, &IID_IDirect3DDeviceManager9, + (void **)&device_manager))) + { + return hr; + } + + EnterCriticalSection(&allocator->cs); + + if (allocator->device_manager) + IDirect3DDeviceManager9_Release(allocator->device_manager); + allocator->device_manager = device_manager; + + LeaveCriticalSection(&allocator->cs); + + return S_OK; } static HRESULT WINAPI sample_allocator_UninitializeSampleAllocator(IMFVideoSampleAllocator *iface)

1 0

Nikolay Sivov : evr/presenter: Add IMFVideoPositionMapper stub.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 529eb28488c4ef7300a22423228aaa0aaede561b URL: https://source.winehq.org/git/wine.git/?a=commit;h=529eb28488c4ef7300a22423… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:02:48 2020 +0300 evr/presenter: Add IMFVideoPositionMapper stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/evr/tests/evr.c | 8 ++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 8fcd6d58b3c..96eaa4426fc 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -48,6 +48,7 @@ struct video_presenter IMFVideoDisplayControl IMFVideoDisplayControl_iface; IMFRateSupport IMFRateSupport_iface; IMFGetService IMFGetService_iface; + IMFVideoPositionMapper IMFVideoPositionMapper_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -104,6 +105,11 @@ static struct video_presenter *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct video_presenter, IMFGetService_iface); } +static struct video_presenter *impl_from_IMFVideoPositionMapper(IMFVideoPositionMapper *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoPositionMapper_iface); +} + static unsigned int get_gcd(unsigned int a, unsigned int b) { unsigned int m; @@ -191,6 +197,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFGetService_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoPositionMapper)) + { + *obj = &presenter->IMFVideoPositionMapper_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -900,8 +910,11 @@ static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface if (IsEqualGUID(&MR_VIDEO_RENDER_SERVICE, service)) { - if (IsEqualIID(riid, &IID_IMFVideoDisplayControl)) + if (IsEqualIID(riid, &IID_IMFVideoDisplayControl) || + IsEqualIID(riid, &IID_IMFVideoPositionMapper)) + { return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); + } else { FIXME("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -922,6 +935,40 @@ static const IMFGetServiceVtbl video_presenter_getservice_vtbl = video_presenter_getservice_GetService, }; +static HRESULT WINAPI video_presenter_position_mapper_QueryInterface(IMFVideoPositionMapper *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFVideoPositionMapper(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_position_mapper_AddRef(IMFVideoPositionMapper *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoPositionMapper(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_position_mapper_Release(IMFVideoPositionMapper *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoPositionMapper(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_position_mapper_MapOutputCoordinateToInputStream(IMFVideoPositionMapper *iface, + float x_out, float y_out, DWORD output_stream, DWORD input_stream, float *x_in, float *y_in) +{ + FIXME("%p, %f, %f, %u, %u, %p, %p.\n", iface, x_out, y_out, output_stream, input_stream, x_in, y_in); + + return E_NOTIMPL; +} + +static const IMFVideoPositionMapperVtbl video_presenter_position_mapper_vtbl = +{ + video_presenter_position_mapper_QueryInterface, + video_presenter_position_mapper_AddRef, + video_presenter_position_mapper_Release, + video_presenter_position_mapper_MapOutputCoordinateToInputStream, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -984,6 +1031,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFVideoDisplayControl_iface.lpVtbl = &video_presenter_control_vtbl; object->IMFRateSupport_iface.lpVtbl = &video_presenter_rate_support_vtbl; object->IMFGetService_iface.lpVtbl = &video_presenter_getservice_vtbl; + object->IMFVideoPositionMapper_iface.lpVtbl = &video_presenter_position_mapper_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7447f388ed7..0158a0320a7 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1099,6 +1099,14 @@ static void test_default_presenter(void) if (FAILED(hr)) return; + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoPositionMapper, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0