wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Jacek Caban : gdi32: Use NtGdiOpenDCW for CreateDCW.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 09362dbf75e4e5654774de95bea33b364fdc8f39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09362dbf75e4e5654774de95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:07:36 2021 +0200 gdi32: Use NtGdiOpenDCW for CreateDCW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 62 ++++++------- dlls/gdi32/driver.c | 188 ++++----------------------------------- dlls/gdi32/emfdrv.c | 2 +- dlls/gdi32/gdidc.c | 215 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 3 +- 5 files changed, 260 insertions(+), 210 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09362dbf75e4e5654774…

1 0

Jacek Caban : gdi32: Remove unused argument from CreateDC driver entry point.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 6342e9217d79656dc1937144dc00b4443c047b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6342e9217d79656dc1937144… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:07:26 2021 +0200 gdi32: Remove unused argument from CreateDC driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/dibdrv/dc.c | 12 ++++++------ dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/path.c | 8 ++++---- dlls/wineandroid.drv/init.c | 4 ++-- dlls/winemac.drv/gdi.c | 9 ++++----- dlls/wineps.drv/init.c | 7 +++---- dlls/winex11.drv/init.c | 6 +++--- dlls/winex11.drv/xrender.c | 4 ++-- include/wine/gdi_driver.h | 4 ++-- 11 files changed, 33 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6342e9217d79656dc193…

1 0

Jacek Caban : gdi32: Get codepages and OS version directly from PEB.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: bdebdbafe95cc495e6afd7282b411cab3c42888e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdebdbafe95cc495e6afd728… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:07:19 2021 +0200 gdi32: Get codepages and OS version directly from PEB. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/font.c | 30 ++++++++++++++++++++---------- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 + 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 115de908cf6..9436a91a43f 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -435,7 +435,7 @@ INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) { NtGdiCombineRgn( hRgn, dc->hVisRgn, 0, RGN_COPY ); /* On Windows NT/2000, the SYSRGN returned is in screen coordinates */ - if (!(GetVersion() & 0x80000000)) + if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32s) NtGdiOffsetRgn( hRgn, dc->attr->vis_rect.left, dc->attr->vis_rect.top ); } else if (!is_rect_empty( &dc->device_rect )) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index dc0ad84242b..305bc087b18 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -202,6 +202,16 @@ static UINT asciiz_to_unicode( WCHAR *dst, const char *src ) return (p - dst) * sizeof(WCHAR); } +UINT get_acp(void) +{ + return ((const WORD *)NtCurrentTeb()->Peb->AnsiCodePageData)[1]; +} + +static UINT get_oemcp(void) +{ + return ((const WORD *)NtCurrentTeb()->Peb->OemCodePageData)[1]; +} + static inline WCHAR facename_tolower( WCHAR c ) { if (c >= 'A' && c <= 'Z') return c - 'A' + 'a'; @@ -272,7 +282,7 @@ static inline INT INTERNAL_YWSTODS(DC *dc, INT height) static inline BOOL is_win9x(void) { - return GetVersion() & 0x80000000; + return NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32s; } static inline WCHAR *strdupW( const WCHAR *p ) @@ -1864,7 +1874,7 @@ static struct gdi_font_face *find_matching_face( const LOGFONTW *lf, CHARSETINFO corresponding to the current ansi codepage */ if (!csi->fs.fsCsb[0]) { - INT acp = GetACP(); + INT acp = get_acp(); if (!translate_charset_info( (DWORD *)(INT_PTR)acp, csi, TCI_SRCCODEPAGE )) { FIXME( "TCI failed on codepage %d\n", acp ); @@ -2464,7 +2474,7 @@ static void create_child_font_list( struct gdi_font *font ) * if not SYMBOL or OEM then we also get all the fonts for Microsoft * Sans Serif. This is how asian windows get default fallbacks for fonts */ - if (is_dbcs_ansi_cp(GetACP()) && font->charset != SYMBOL_CHARSET && font->charset != OEM_CHARSET && + if (is_dbcs_ansi_cp(get_acp()) && font->charset != SYMBOL_CHARSET && font->charset != OEM_CHARSET && facename_compare( font_name, microsoft_sans_serifW, -1 ) != 0) { if ((font_link = find_gdi_font_link( microsoft_sans_serifW ))) @@ -2725,8 +2735,8 @@ static void update_codepage( UINT screen_dpi ) if (size == sizeof(DWORD) && info->Type == REG_DWORD) font_dpi = *(DWORD *)info->Data; - ansi_cp = GetACP(); - oem_cp = GetOEMCP(); + ansi_cp = get_acp(); + oem_cp = get_oemcp(); sprintf( cpbuf, "%u,%u", ansi_cp, oem_cp ); asciiz_to_unicode( cpbufW, cpbuf ); @@ -2897,7 +2907,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset *list) } else /* charset is DEFAULT_CHARSET or invalid. */ { - int acp = GetACP(); + int acp = get_acp(); DWORD mask = 0; /* Set the current codepage's charset as the first element. */ @@ -3884,7 +3894,7 @@ static void get_nearest_charset( const WCHAR *family_name, struct gdi_font_face int i; - if (translate_charset_info( (DWORD*)(INT_PTR)GetACP(), csi, TCI_SRCCODEPAGE )) + if (translate_charset_info( (DWORD*)(INT_PTR)get_acp(), csi, TCI_SRCCODEPAGE )) { const struct gdi_font_link *font_link; @@ -3904,7 +3914,7 @@ static void get_nearest_charset( const WCHAR *family_name, struct gdi_font_face FIXME("returning DEFAULT_CHARSET face->fs.fsCsb[0] = %08x file = %s\n", face->fs.fsCsb[0], debugstr_w(face->file)); - csi->ciACP = GetACP(); + csi->ciACP = get_acp(); csi->ciCharset = DEFAULT_CHARSET; } @@ -4497,10 +4507,10 @@ static void update_font_code_page( DC *dc, HANDLE font ) else { switch(charset) { case OEM_CHARSET: - dc->attr->font_code_page = GetOEMCP(); + dc->attr->font_code_page = get_oemcp(); break; case DEFAULT_CHARSET: - dc->attr->font_code_page = GetACP(); + dc->attr->font_code_page = get_acp(); break; case VISCII_CHARSET: diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 62bd2c4bd59..c0912c3ad2d 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -497,7 +497,7 @@ static UINT get_default_charset( void ) CHARSETINFO csi; UINT uACP; - uACP = GetACP(); + uACP = get_acp(); csi.ciCharset = ANSI_CHARSET; if ( !translate_charset_info( ULongToPtr(uACP), &csi, TCI_SRCCODEPAGE ) ) { diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 9f0f1d44240..c342bcf3a7c 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -339,6 +339,7 @@ struct font_callback_funcs }; extern UINT font_init(void) DECLSPEC_HIDDEN; +extern UINT get_acp(void) DECLSPEC_HIDDEN; /* opentype.c */

1 0

Jacek Caban : gdi32: Don't use wide string literals ntgdi functions.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 0758578dace8781c7c640e223c2a055c104d63c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0758578dace8781c7c640e22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:07:14 2021 +0200 gdi32: Don't use wide string literals ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 111 ++++++++++++++++++++------------- dlls/gdi32/gdiobj.c | 176 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 186 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0758578dace8781c7c64…

1 0

Jacek Caban : user32: Always initialize graphics_driver in load_desktop_driver.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 360510da94ef5e427cec24f264e14fc1d225f918 URL: https://source.winehq.org/git/wine.git/?a=commit;h=360510da94ef5e427cec24f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:07:02 2021 +0200 user32: Always initialize graphics_driver in load_desktop_driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 59a163c700d..7de45376740 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -84,7 +84,7 @@ static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) static const USER_DRIVER *load_driver(void) { void *ptr; - HMODULE graphics_driver; + HMODULE graphics_driver = NULL; USER_DRIVER *driver, *prev; driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver) );

1 0

Jacek Caban : gdi32: Fix NT prefix handling in update_external_font_keys.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 773c20ffd1c67ba48346146b178c7a2e8b66cd9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=773c20ffd1c67ba48346146b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:06:56 2021 +0200 gdi32: Fix NT prefix handling in update_external_font_keys. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 189405c2ba1..270c6b01e73 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6019,7 +6019,7 @@ static void update_external_font_keys(void) path = (WCHAR *)(buffer + info->DataOffset); if (path[0] && path[1] == ':') { - memmove( path, path + ARRAYSIZE(nt_prefixW), sizeof(nt_prefixW) ); + memmove( path + ARRAYSIZE(nt_prefixW), path, info->DataLength ); memcpy( path, nt_prefixW, sizeof(nt_prefixW) ); }

1 0

Nikolay Sivov : ole32/composite: Reimplement Reduce().
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: f95fe051f0ef6d8032d81befc944f6907b38d793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f95fe051f0ef6d8032d81bef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 10:23:27 2021 +0300 ole32/composite: Reimplement Reduce(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 89 ++++++++++++++----------------------------- dlls/ole32/tests/moniker.c | 19 ++++++++- 2 files changed, 46 insertions(+), 62 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index c6d0d3c47a6..80a1a675766 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -408,76 +408,43 @@ static HRESULT WINAPI CompositeMonikerImpl_BindToStorage(IMoniker *iface, IBindC return hr; } -/****************************************************************************** - * CompositeMoniker_Reduce - ******************************************************************************/ -static HRESULT WINAPI -CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, - IMoniker** ppmkToLeft, IMoniker** ppmkReduced) +static HRESULT WINAPI CompositeMonikerImpl_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD howfar, + IMoniker **toleft, IMoniker **reduced) { - HRESULT res; - IMoniker *tempMk,*antiMk,*rightMostMk,*leftReducedComposedMk,*rightMostReducedMk; - IEnumMoniker *enumMoniker; - - TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); - - if (ppmkReduced==NULL) - return E_POINTER; - - /* This method recursively calls Reduce for each of its component monikers. */ - - if (ppmkToLeft==NULL){ + CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); + IMoniker *m, *reduced_left, *reduced_right; + BOOL was_reduced; + HRESULT hr; - IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); - IEnumMoniker_Release(enumMoniker); + TRACE("%p, %p, %d, %p, %p.\n", iface, pbc, howfar, toleft, reduced); - CreateAntiMoniker(&antiMk); - IMoniker_ComposeWith(iface,antiMk,0,&tempMk); - IMoniker_Release(antiMk); + if (!pbc || !reduced) + return E_INVALIDARG; - res = IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); - IMoniker_Release(tempMk); - IMoniker_Release(rightMostMk); + if (FAILED(hr = IMoniker_Reduce(moniker->left, pbc, howfar, NULL, &reduced_left))) + return hr; - return res; + m = moniker->left; + if (FAILED(hr = IMoniker_Reduce(moniker->right, pbc, howfar, &m, &reduced_right))) + { + IMoniker_Release(reduced_left); + return hr; } - else if (*ppmkToLeft==NULL) - return IMoniker_Reduce(iface,pbc,dwReduceHowFar,NULL,ppmkReduced); - - else{ - - /* separate the composite moniker in to left and right moniker */ - IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); - IEnumMoniker_Release(enumMoniker); - - CreateAntiMoniker(&antiMk); - IMoniker_ComposeWith(iface,antiMk,0,&tempMk); - IMoniker_Release(antiMk); - - /* If any of the components reduces itself, the method returns S_OK and passes back a composite */ - /* of the reduced components */ - if (IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,NULL,&rightMostReducedMk) && - IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) ){ - IMoniker_Release(tempMk); - IMoniker_Release(rightMostMk); - - return CreateGenericComposite(leftReducedComposedMk,rightMostReducedMk,ppmkReduced); - } - else{ - /* If no reduction occurred, the method passes back the same moniker and returns MK_S_REDUCED_TO_SELF.*/ - IMoniker_Release(tempMk); - IMoniker_Release(rightMostMk); - - IMoniker_AddRef(iface); + if ((was_reduced = (reduced_left != moniker->left || reduced_right != moniker->right))) + { + hr = CreateGenericComposite(reduced_left, reduced_right, reduced); + } + else + { + *reduced = iface; + IMoniker_AddRef(*reduced); + } - *ppmkReduced=iface; + IMoniker_Release(reduced_left); + IMoniker_Release(reduced_right); - return MK_S_REDUCED_TO_SELF; - } - } + return was_reduced ? hr : MK_S_REDUCED_TO_SELF; } static HRESULT WINAPI CompositeMonikerImpl_ComposeWith(IMoniker *iface, IMoniker *right, diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index ea58c09356e..7e4a42a0ee6 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3439,7 +3439,6 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, moniker1, &ft); -todo_wine ok(hr == MK_E_NOTBINDABLE, "Unexpected hr %#x.\n", hr); hr = IRunningObjectTable_Revoke(rot, cookie); @@ -3629,6 +3628,24 @@ todo_wine { IMoniker_Release(moniker); + /* Reduce() */ + hr = create_moniker_from_desc("CI1I2", &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Reduce(moniker, bindctx, MKRREDUCE_ALL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &moniker2); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker, bindctx, MKRREDUCE_ALL, NULL, &moniker2); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(moniker2 == moniker, "Unexpected object.\n"); + IMoniker_Release(moniker2); + + IMoniker_Release(moniker); + IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : ole32/composite: Do not use antimoniker composition in BindToStorage().
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 5855196be9ce97c9850d395d78ddd5c79165b200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5855196be9ce97c9850d395d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 10:23:26 2021 +0300 ole32/composite: Do not use antimoniker composition in BindToStorage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 58 +++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index df9b23c515d..c6d0d3c47a6 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -372,52 +372,40 @@ static HRESULT WINAPI CompositeMonikerImpl_BindToObject(IMoniker *iface, IBindCt return hr; } -/****************************************************************************** - * CompositeMoniker_BindToStorage - ******************************************************************************/ -static HRESULT WINAPI -CompositeMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult) +static HRESULT WINAPI CompositeMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx *pbc, + IMoniker *toleft, REFIID riid, void **result) { - HRESULT res; - IMoniker *tempMk,*antiMk,*rightMostMk,*leftMk; - IEnumMoniker *enumMoniker; + CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); + IMoniker *left, *rightmost, *composed_left; + HRESULT hr; - TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); + TRACE("%p, %p, %p, %s, %p.\n", iface, pbc, toleft, debugstr_guid(riid), result); - *ppvResult=0; + *result = NULL; - /* This method recursively calls BindToStorage on the rightmost component of the composite, */ - /* passing the rest of the composite as the pmkToLeft parameter for that call. */ + if (FAILED(hr = composite_get_rightmost(moniker, &left, &rightmost))) + return hr; - if (pmkToLeft) + if (toleft) { - res = IMoniker_ComposeWith(pmkToLeft, iface, FALSE, &leftMk); - if (FAILED(res)) return res; + hr = compose_with(toleft, left, &composed_left); } else - leftMk = iface; - - IMoniker_Enum(iface, FALSE, &enumMoniker); - IEnumMoniker_Next(enumMoniker, 1, &rightMostMk, NULL); - IEnumMoniker_Release(enumMoniker); - - res = CreateAntiMoniker(&antiMk); - if (FAILED(res)) return res; - res = IMoniker_ComposeWith(leftMk, antiMk, 0, &tempMk); - if (FAILED(res)) return res; - IMoniker_Release(antiMk); - - res = IMoniker_BindToStorage(rightMostMk, pbc, tempMk, riid, ppvResult); - - IMoniker_Release(tempMk); + { + composed_left = left; + IMoniker_AddRef(composed_left); + } - IMoniker_Release(rightMostMk); + if (SUCCEEDED(hr)) + { + hr = IMoniker_BindToStorage(rightmost, pbc, composed_left, riid, result); + IMoniker_Release(composed_left); + } - if (pmkToLeft) - IMoniker_Release(leftMk); + IMoniker_Release(rightmost); + IMoniker_Release(left); - return res; + return hr; } /******************************************************************************

1 0

Nikolay Sivov : ole32/composite: Cleanup IsRunning() implementation.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: 0806f9531f2b3ca0782d122e74b8b75e28dca96d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0806f9531f2b3ca0782d122e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 10:23:25 2021 +0300 ole32/composite: Cleanup IsRunning() implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 93 ++++++++++++++----------------------------- dlls/ole32/tests/moniker.c | 9 +++++ 2 files changed, 39 insertions(+), 63 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 77e1e8aff35..df9b23c515d 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -612,82 +612,49 @@ static HRESULT WINAPI CompositeMonikerImpl_Hash(IMoniker *iface, DWORD *hash) return hr; } -/****************************************************************************** - * CompositeMoniker_IsRunning - ******************************************************************************/ -static HRESULT WINAPI -CompositeMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, IMoniker* pmkNewlyRunning) +static HRESULT WINAPI CompositeMonikerImpl_IsRunning(IMoniker *iface, IBindCtx *pbc, + IMoniker *toleft, IMoniker *newly_running) { - IRunningObjectTable* rot; - HRESULT res; - IMoniker *tempMk,*antiMk,*rightMostMk; - IEnumMoniker *enumMoniker; - - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning); - - /* If pmkToLeft is non-NULL, this method composes pmkToLeft with this moniker and calls IsRunning on the result.*/ - if (pmkToLeft!=NULL){ + CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); + IMoniker *c, *left, *rightmost; + IRunningObjectTable *rot; + HRESULT hr; - CreateGenericComposite(pmkToLeft,iface,&tempMk); + TRACE("%p, %p, %p, %p.\n", iface, pbc, toleft, newly_running); - res = IMoniker_IsRunning(tempMk,pbc,NULL,pmkNewlyRunning); + if (!pbc) + return E_INVALIDARG; - IMoniker_Release(tempMk); + if (toleft) + { + if (SUCCEEDED(hr = CreateGenericComposite(toleft, iface, &c))) + { + hr = IMoniker_IsRunning(c, pbc, NULL, newly_running); + IMoniker_Release(c); + } - return res; + return hr; } - else - /* If pmkToLeft is NULL, this method returns S_OK if pmkNewlyRunning is non-NULL and is equal */ - /* to this moniker */ - if (pmkNewlyRunning!=NULL) + if (newly_running) + return IMoniker_IsEqual(iface, newly_running); - if (IMoniker_IsEqual(iface,pmkNewlyRunning)==S_OK) - return S_OK; - - else - return S_FALSE; - - else{ - - if (pbc==NULL) - return E_INVALIDARG; - - /* If pmkToLeft and pmkNewlyRunning are both NULL, this method checks the ROT to see whether */ - /* the moniker is running. If so, the method returns S_OK; otherwise, it recursively calls */ - /* IMoniker::IsRunning on the rightmost component of the composite, passing the remainder of */ - /* the composite as the pmkToLeft parameter for that call. */ - - res=IBindCtx_GetRunningObjectTable(pbc,&rot); - - if (FAILED(res)) - return res; - - res = IRunningObjectTable_IsRunning(rot,iface); - IRunningObjectTable_Release(rot); - - if(res==S_OK) - return S_OK; - - else{ + if (FAILED(hr = IBindCtx_GetRunningObjectTable(pbc, &rot))) + return hr; - IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); - IEnumMoniker_Release(enumMoniker); + hr = IRunningObjectTable_IsRunning(rot, iface); + IRunningObjectTable_Release(rot); + if (hr == S_OK) return S_OK; - res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); - IMoniker_Release(antiMk); + if (FAILED(hr = composite_get_rightmost(moniker, &left, &rightmost))) + return hr; - res=IMoniker_IsRunning(rightMostMk,pbc,tempMk,pmkNewlyRunning); + hr = IMoniker_IsRunning(rightmost, pbc, left, NULL); - IMoniker_Release(tempMk); - IMoniker_Release(rightMostMk); + IMoniker_Release(left); + IMoniker_Release(rightmost); - return res; - } - } + return hr; } static HRESULT WINAPI CompositeMonikerImpl_GetTimeOfLastChange(IMoniker *iface, IBindCtx *pbc, diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 2d7f0789924..ea58c09356e 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3273,6 +3273,15 @@ todo_wine hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsRunning(moniker, bindctx, NULL, moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsRunning(moniker, bindctx, moniker1, moniker); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsRunning(moniker, NULL, moniker1, moniker); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); ok(hr == MK_E_NOTBINDABLE, "IMoniker_GetTimeOfLastChange should return MK_E_NOTBINDABLE, not 0x%08x\n", hr);

1 0

Nikolay Sivov : ole32/tests: Add a GetComparisonData() test for composite.
by Alexandre Julliard 29 Sep '21

29 Sep '21

Module: wine Branch: master Commit: b8ba0e6fe082977e9d7af99f05c8e0c3dad32988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8ba0e6fe082977e9d7af99f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 10:23:24 2021 +0300 ole32/tests: Add a GetComparisonData() test for composite. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index a7c0714a5d7..2d7f0789924 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3173,6 +3173,7 @@ static void test_generic_composite_moniker(void) IUnknown *unknown; IROTData *rotdata; IMarshal *marshal; + BYTE buffer[100]; IStream *stream; unsigned int i; FILETIME ft; @@ -3606,6 +3607,17 @@ todo_wine hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &str); ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + /* Comparison data, pointer component does not support it. */ + hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + len = 0; + hr = IROTData_GetComparisonData(rotdata, buffer, sizeof(buffer), &len); +todo_wine { + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!len, "Unexpected length %u.\n", len); +} + IROTData_Release(rotdata); + IMoniker_Release(moniker); IBindCtx_Release(bindctx);

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
103
Older →

Jump to page:

2025

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-commits September 2021