wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Esme Povirk : gdiplus: Implement reference counting for private font families.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: a5540798605b3ef9abcf654bc28d9dd8d8736e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5540798605b3ef9abcf654b… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed May 26 15:49:18 2021 -0500 gdiplus: Implement reference counting for private font families. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50896 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 22 ++++++++++++++++------ dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/tests/font.c | 13 ++++++++++++- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index cf43985d02a..64604367da3 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -190,7 +190,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->unit = unit; (*font)->emSize = emSize; (*font)->otm = otm; - (*font)->family = (GpFontFamily *)fontFamily; + GdipCloneFontFamily((GpFontFamily*)fontFamily, &(*font)->family); TRACE("<-- %p\n", *font); @@ -323,8 +323,7 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family) if (!(font && family)) return InvalidParameter; - *family = font->family; - return Ok; + return GdipCloneFontFamily(font->family, family); } static REAL get_font_size(const GpFont *font) @@ -746,9 +745,8 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, { if (!wcsicmp(lf.lfFaceName, collection->FontFamilies[i]->FamilyName)) { - *family = collection->FontFamilies[i]; + status = GdipCloneFontFamily(collection->FontFamilies[i], family); TRACE("<-- %p\n", *family); - status = Ok; break; } } @@ -778,6 +776,10 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily *family, GpFontFamily **clo TRACE("%p (%s), %p\n", family, debugstr_w(family->FamilyName), clone); *clone = family; + + if (!family->installed) + InterlockedIncrement(&family->ref); + return Ok; } @@ -835,6 +837,11 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) if (!FontFamily) return InvalidParameter; + if (!FontFamily->installed && !InterlockedDecrement(&FontFamily->ref)) + { + heap_free(FontFamily); + } + return Ok; } @@ -1079,7 +1086,7 @@ GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection **fontColle if (!fontCollection) return InvalidParameter; - for (i = 0; i < (*fontCollection)->count; i++) heap_free((*fontCollection)->FontFamilies[i]); + for (i = 0; i < (*fontCollection)->count; i++) GdipDeleteFontFamily((*fontCollection)->FontFamilies[i]); heap_free((*fontCollection)->FontFamilies); heap_free(*fontCollection); @@ -1541,6 +1548,7 @@ GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList( for (i = 0; i < numSought && i < fontCollection->count; i++) { + /* caller is responsible for cloning these if it keeps references */ gpfamilies[i] = fontCollection->FontFamilies[i]; } @@ -1641,6 +1649,8 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, family->descent = fm.descent; family->line_spacing = fm.line_spacing; family->dpi = fm.dpi; + family->installed = param->is_system; + family->ref = 1; lstrcpyW(family->FamilyName, lfw->lfFaceName); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2b0f920473d..22213e9f278 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -543,6 +543,8 @@ struct GpFontFamily{ WCHAR FamilyName[LF_FACESIZE]; UINT16 em_height, ascent, descent, line_spacing; /* in font units */ int dpi; + BOOL installed; + LONG ref; }; /* internal use */ diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 32cd1ff2c4f..b208989c054 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -72,7 +72,7 @@ static void test_long_name(void) GpStatus stat; GpFontCollection *fonts; INT num_families; - GpFontFamily *family; + GpFontFamily *family, *cloned_family; WCHAR family_name[LF_FACESIZE]; GpFont *font; @@ -98,6 +98,10 @@ static void test_long_name(void) stat = GdipCreateFont(family, 256.0, FontStyleRegular, UnitPixel, &font); ok(stat == Ok, "GdipCreateFont failed: %d\n", stat); + stat = GdipCloneFontFamily(family, &cloned_family); + ok(stat == Ok, "GdipCloneFontFamily failed: %d\n", stat); + ok(family == cloned_family, "GdipCloneFontFamily returned new object\n"); + /* Cleanup */ stat = GdipDeleteFont(font); @@ -106,6 +110,13 @@ static void test_long_name(void) stat = GdipDeletePrivateFontCollection(&fonts); ok(stat == Ok, "GdipDeletePrivateFontCollection failed: %d\n", stat); + /* Cloned family survives after collection is deleted */ + stat = GdipGetFamilyName(cloned_family, family_name, LANG_NEUTRAL); + ok(stat == Ok, "GdipGetFamilyName failed: %d\n", stat); + + stat = GdipDeleteFontFamily(cloned_family); + ok(stat == Ok, "GdipDeleteFontFamily failed: %d\n", stat); + DELETE_FONTFILE(path); }

1 0

Alistair Leslie-Hughes : gdi32: Don't override FontSubstitutes on a DPI only change.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 7763efa347327868f6c8ba0c91f60f53a885688a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7763efa347327868f6c8ba0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 27 15:50:48 2021 +1000 gdi32: Don't override FontSubstitutes on a DPI only change. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36010 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 49775b7a806..c990fe5e233 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2485,7 +2485,8 @@ static void update_codepage(void) add_font_list(hkey, &nls_update_font_list[i], screen_dpi); RegCloseKey(hkey); } - if (!RegCreateKeyW( HKEY_LOCAL_MACHINE, + /* Only update these if the Codepage changed. */ + if (strcmp( buf, cpbuf ) && !RegCreateKeyW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes", &hkey )) { RegSetValueExA(hkey, "MS Shell Dlg", 0, REG_SZ, (const BYTE *)nls_update_font_list[i].shelldlg,

1 0

Damjan Jovanovic : shell32: Use the paste_pidls() helper function for the CFSTR_SHELLIDLISTW format too.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 9bc7d41080f5e6805154b9d52a765f2be5d37279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc7d41080f5e6805154b9d5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 25 07:53:46 2021 +0200 shell32: Use the paste_pidls() helper function for the CFSTR_SHELLIDLISTW format too. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 76 ++++++++++---------------------------------- 1 file changed, 17 insertions(+), 59 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index dd03c64e654..ef11957e921 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1182,15 +1182,15 @@ static HRESULT paste_pidls(ContextMenu *This, ITEMIDLIST **pidls, UINT count) return hr; } -static BOOL DoPaste(ContextMenu *This) +static HRESULT DoPaste(ContextMenu *This) { - BOOL bSuccess = TRUE; IDataObject * pda; HRESULT hr; TRACE("\n"); - if(SUCCEEDED(OleGetClipboard(&pda))) + hr = OleGetClipboard(&pda); + if(SUCCEEDED(hr)) { STGMEDIUM medium; FORMATETC formatetc; @@ -1204,68 +1204,29 @@ static BOOL DoPaste(ContextMenu *This) /* Get the pidls from IDataObject */ format_hr = IDataObject_GetData(pda,&formatetc,&medium); if(SUCCEEDED(format_hr)) - { + { LPITEMIDLIST * apidl; LPITEMIDLIST pidl; - IShellFolder *psfFrom = NULL, *psfDesktop; - int i; LPIDA lpcida = GlobalLock(medium.u.hGlobal); TRACE("cida=%p\n", lpcida); - - apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - - for (i = 0; bSuccess && i < lpcida->cidl; i++) { - ITEMIDLIST *apidl_dir = NULL; - ITEMIDLIST *apidl_item; - - psfFrom = NULL; - /* bind to the source shellfolder */ - SHGetDesktopFolder(&psfDesktop); - if(psfDesktop) - { - apidl_dir = ILClone(apidl[i]); - ILRemoveLastID(apidl_dir); - apidl_item = ILFindLastID(apidl[i]); - IShellFolder_BindToObject(psfDesktop, apidl_dir, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom); - IShellFolder_Release(psfDesktop); - } - - if (psfFrom) + if(lpcida) + { + apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + if (apidl) { - /* get source and destination shellfolder */ - ISFHelper *psfhlpdst, *psfhlpsrc; - IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); - IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (void**)&psfhlpsrc); - - /* do the copy/move */ - if (psfhlpdst && psfhlpsrc) - { - HRESULT hr = ISFHelper_CopyItems(psfhlpdst, psfFrom, 1, (LPCITEMIDLIST*)&apidl_item); - if (FAILED(hr)) - bSuccess = FALSE; - /* FIXME handle move - ISFHelper_DeleteItems(psfhlpsrc, 1, &apidl_item); - */ - } - if(psfhlpdst) ISFHelper_Release(psfhlpdst); - if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); - IShellFolder_Release(psfFrom); + hr = paste_pidls(This, apidl, lpcida->cidl); + _ILFreeaPidl(apidl, lpcida->cidl); + SHFree(pidl); } else - bSuccess = FALSE; - SHFree(apidl_dir); + hr = HRESULT_FROM_WIN32(GetLastError()); + GlobalUnlock(medium.u.hGlobal); } - - _ILFreeaPidl(apidl, lpcida->cidl); - SHFree(pidl); - GlobalUnlock(medium.u.hGlobal); - - /* release the medium*/ + else + hr = HRESULT_FROM_WIN32(GetLastError()); ReleaseStgMedium(&medium); } - else - bSuccess = FALSE; if(FAILED(format_hr)) { @@ -1298,20 +1259,17 @@ static BOOL DoPaste(ContextMenu *This) else hr = HRESULT_FROM_WIN32(GetLastError()); ReleaseStgMedium(&medium); - bSuccess = SUCCEEDED(hr); } } if (FAILED(format_hr)) { ERR("there are no supported and retrievable clipboard formats\n"); - bSuccess = FALSE; + hr = format_hr; } IDataObject_Release(pda); } - else - bSuccess = FALSE; #if 0 HGLOBAL hMem; @@ -1336,7 +1294,7 @@ static BOOL DoPaste(ContextMenu *This) } CloseClipboard(); #endif - return bSuccess; + return hr; } static HRESULT WINAPI BackgroundMenu_InvokeCommand(

1 0

Damjan Jovanovic : shell32: Support the CF_HDROP format too when pasting from the context menu.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 91b0340170a60f7229cb9419ccb6b6f7d9adc692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91b0340170a60f7229cb9419… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 25 07:53:28 2021 +0200 shell32: Support the CF_HDROP format too when pasting from the context menu. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 95 +++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shlfolder.c | 10 +++++ 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 3d79f82a92e..dd03c64e654 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1134,10 +1134,59 @@ static void DoNewFolder(ContextMenu *This, IShellView *view) } } +static HRESULT paste_pidls(ContextMenu *This, ITEMIDLIST **pidls, UINT count) +{ + IShellFolder *psfDesktop; + UINT i; + HRESULT hr = S_OK; + + /* bind to the source shellfolder */ + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + + for (i = 0; SUCCEEDED(hr) && i < count; i++) { + ITEMIDLIST *pidl_dir = NULL; + ITEMIDLIST *pidl_item; + IShellFolder *psfFrom = NULL; + + pidl_dir = ILClone(pidls[i]); + ILRemoveLastID(pidl_dir); + pidl_item = ILFindLastID(pidls[i]); + hr = IShellFolder_BindToObject(psfDesktop, pidl_dir, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom); + + if (psfFrom) + { + /* get source and destination shellfolder */ + ISFHelper *psfhlpdst, *psfhlpsrc; + hr = IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); + if (SUCCEEDED(hr)) + hr = IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (void**)&psfhlpsrc); + + /* do the copy/move */ + if (psfhlpdst && psfhlpsrc) + { + hr = ISFHelper_CopyItems(psfhlpdst, psfFrom, 1, (LPCITEMIDLIST*)&pidl_item); + /* FIXME handle move + ISFHelper_DeleteItems(psfhlpsrc, 1, &pidl_item); + */ + } + if(psfhlpdst) ISFHelper_Release(psfhlpdst); + if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); + IShellFolder_Release(psfFrom); + } + SHFree(pidl_dir); + } + + IShellFolder_Release(psfDesktop); + return hr; +} + static BOOL DoPaste(ContextMenu *This) { BOOL bSuccess = TRUE; IDataObject * pda; + HRESULT hr; TRACE("\n"); @@ -1145,6 +1194,7 @@ static BOOL DoPaste(ContextMenu *This) { STGMEDIUM medium; FORMATETC formatetc; + HRESULT format_hr; TRACE("pda=%p\n", pda); @@ -1152,7 +1202,8 @@ static BOOL DoPaste(ContextMenu *This) InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLISTW), TYMED_HGLOBAL); /* Get the pidls from IDataObject */ - if(SUCCEEDED(IDataObject_GetData(pda,&formatetc,&medium))) + format_hr = IDataObject_GetData(pda,&formatetc,&medium); + if(SUCCEEDED(format_hr)) { LPITEMIDLIST * apidl; LPITEMIDLIST pidl; @@ -1215,6 +1266,48 @@ static BOOL DoPaste(ContextMenu *This) } else bSuccess = FALSE; + + if(FAILED(format_hr)) + { + InitFormatEtc(formatetc, CF_HDROP, TYMED_HGLOBAL); + format_hr = IDataObject_GetData(pda,&formatetc,&medium); + if(SUCCEEDED(format_hr)) + { + WCHAR path[MAX_PATH]; + UINT i, count; + ITEMIDLIST **pidls; + + TRACE("CF_HDROP=%p\n", medium.u.hGlobal); + count = DragQueryFileW(medium.u.hGlobal, -1, NULL, 0); + pidls = SHAlloc(count*sizeof(ITEMIDLIST**)); + if (pidls) + { + for (i = 0; i < count; i++) + { + DragQueryFileW(medium.u.hGlobal, i, path, ARRAY_SIZE(path)); + if ((pidls[i] = ILCreateFromPathW(path)) == NULL) + { + hr = E_FAIL; + break; + } + } + if (SUCCEEDED(hr)) + hr = paste_pidls(This, pidls, count); + _ILFreeaPidl(pidls, count); + } + else + hr = HRESULT_FROM_WIN32(GetLastError()); + ReleaseStgMedium(&medium); + bSuccess = SUCCEEDED(hr); + } + } + + if (FAILED(format_hr)) + { + ERR("there are no supported and retrievable clipboard formats\n"); + bSuccess = FALSE; + } + IDataObject_Release(pda); } else diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 8e92a0896b5..29fcd0b7754 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4387,7 +4387,17 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) { trace("Got ID %d, verb %s, string %s.\n", mii.wID, debugstr_a(buf), debugstr_a(mii.dwTypeData)); if (!strcmp(buf, "copy")) + { + CMINVOKECOMMANDINFO cmi; ok(mii.wID == 64 - 0x7000 + FCIDM_SHVIEW_COPY, "wrong menu wID %d\n", mii.wID); + memset(&cmi, 0, sizeof(CMINVOKECOMMANDINFO)); + cmi.cbSize = sizeof(CMINVOKECOMMANDINFO); + cmi.lpVerb = "copy"; + hr = IContextMenu_InvokeCommand(menu, &cmi); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsClipboardFormatAvailable(RegisterClipboardFormatA(CFSTR_SHELLIDLISTA)), "CFSTR_SHELLIDLISTA not available\n"); + ok(IsClipboardFormatAvailable(CF_HDROP), "CF_HDROP not available\n"); + } else if (!strcmp(buf, "paste")) ok(mii.wID == 64 - 0x7000 + FCIDM_SHVIEW_INSERT, "wrong menu wID %d\n", mii.wID); else if (!strcmp(buf, "properties"))

1 0

Damjan Jovanovic : shell32: Fix a lock leak.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 401de24b89d751f553b5c62c867da2956e9d4bc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=401de24b89d751f553b5c62c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 25 07:53:08 2021 +0200 shell32: Fix a lock leak. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 67f5ac80d84..3d79f82a92e 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1208,6 +1208,7 @@ static BOOL DoPaste(ContextMenu *This) _ILFreeaPidl(apidl, lpcida->cidl); SHFree(pidl); + GlobalUnlock(medium.u.hGlobal); /* release the medium*/ ReleaseStgMedium(&medium);

1 0

Paul Gofman : server: Check for system regs before suspending for ptrace.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 385142bb9ec9bdfcb8d46f38f0a6f054d6448dbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=385142bb9ec9bdfcb8d46f38… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 24 14:45:40 2021 +0300 server: Check for system regs before suspending for ptrace. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 3621e8d82ad..b2d23d89aaf 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -571,15 +571,15 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); - if (!suspend_for_ptrace( thread )) return; - if (!(thread->system_regs & SERVER_CTX_DEBUG_REGISTERS)) { /* caller has initialized everything to 0 already, just return */ context->flags |= SERVER_CTX_DEBUG_REGISTERS; - goto done; + return; } + if (!suspend_for_ptrace( thread )) return; + for (i = 0; i < 8; i++) { if (i == 4 || i == 5) continue;

1 0

Ziqing Hui : windowscodecs: Implement DdsEncoder_CreateNewFrame on top of DdsEncoder_Dds_CreateNewFrame.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 8a54803c4acfdf6cc64424ee21c887b7e885d57d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a54803c4acfdf6cc64424ee… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 26 09:54:16 2021 +0800 windowscodecs: Implement DdsEncoder_CreateNewFrame on top of DdsEncoder_Dds_CreateNewFrame. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 31 +------------------------------ dlls/windowscodecs/tests/ddsformat.c | 4 ---- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 790fe72b8c9..6dd7a01ff42 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -2043,39 +2043,10 @@ static HRESULT WINAPI DdsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **frameEncode, IPropertyBag2 **encoderOptions) { DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); - DdsFrameEncode *result; - HRESULT hr; TRACE("(%p,%p,%p)\n", iface, frameEncode, encoderOptions); - EnterCriticalSection(&This->lock); - - if (!This->stream) - { - hr = WINCODEC_ERR_WRONGSTATE; - goto end; - } - - result = HeapAlloc(GetProcessHeap(), 0, sizeof(*result)); - if (!result) - { - hr = E_OUTOFMEMORY; - goto end; - } - - result->IWICBitmapFrameEncode_iface.lpVtbl = &DdsFrameEncode_Vtbl; - result->ref = 1; - result->parent = This; - result->initialized = FALSE; - result->frame_created = FALSE; - IWICBitmapEncoder_AddRef(iface); - - *frameEncode = &result->IWICBitmapFrameEncode_iface; - hr = S_OK; - -end: - LeaveCriticalSection(&This->lock); - return hr; + return IWICDdsEncoder_CreateNewFrame(&This->IWICDdsEncoder_iface, frameEncode, NULL, NULL, NULL); } static HRESULT WINAPI DdsEncoder_Commit(IWICBitmapEncoder *iface) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 8900b7699f8..d530e65eb2d 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1431,15 +1431,11 @@ static void test_dds_encoder_create_frame(void) hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame0, NULL); ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame1, NULL); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "CreateNewFrame got unexpected hr %#x\n", hr); - if (hr == S_OK) IWICBitmapFrameEncode_Release(frame1); IWICBitmapFrameEncode_Release(frame0); hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame1, NULL); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "CreateNewFrame got unexpected hr %#x\n", hr); - if (hr == S_OK) IWICBitmapFrameEncode_Release(frame1); release_encoder(encoder, dds_encoder, stream);

1 0

Ziqing Hui : windowscodecs: Implement IWICDdsEncoder_CreateNewFrame.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: bd609f5ed4f12dc6ca07bc64e47a071a48fa5a9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd609f5ed4f12dc6ca07bc64… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 26 09:54:04 2021 +0800 windowscodecs: Implement IWICDdsEncoder_CreateNewFrame. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 85 ++++++++++++++++++++++++++++-------- dlls/windowscodecs/tests/ddsformat.c | 6 +-- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index af062de06f2..790fe72b8c9 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -166,6 +166,7 @@ typedef struct DdsEncoder { CRITICAL_SECTION lock; IStream *stream; UINT frame_count; + UINT frame_index; BOOL uncommitted_frame; BOOL committed; dds_info info; @@ -511,6 +512,27 @@ static UINT get_frame_count(UINT depth, UINT mip_levels, UINT array_size, WICDds return frame_count; } +static void get_frame_dds_index(UINT index, dds_info *info, UINT *array_index, UINT *mip_level, UINT *slice_index) +{ + UINT frame_per_texture, depth; + + if (info->dimension == WICDdsTextureCube) + frame_per_texture = info->mip_levels; + else + frame_per_texture = info->frame_count / info->array_size; + + *array_index = index / frame_per_texture; + *slice_index = index % frame_per_texture; + depth = info->depth; + *mip_level = 0; + while (*slice_index >= depth) + { + *slice_index -= depth; + (*mip_level)++; + if (depth > 1) depth /= 2; + } +} + static const GUID *dxgi_format_to_wic_format(DXGI_FORMAT dxgi_format) { UINT i; @@ -1208,7 +1230,7 @@ static HRESULT WINAPI DdsDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); - UINT frame_per_texture, array_index, mip_level, slice_index, depth; + UINT array_index, mip_level, slice_index; TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); @@ -1221,21 +1243,7 @@ static HRESULT WINAPI DdsDecoder_GetFrame(IWICBitmapDecoder *iface, return WINCODEC_ERR_WRONGSTATE; } - if (This->info.dimension == WICDdsTextureCube) { - frame_per_texture = This->info.mip_levels; - } else { - frame_per_texture = This->info.frame_count / This->info.array_size; - } - array_index = index / frame_per_texture; - slice_index = index % frame_per_texture; - depth = This->info.depth; - mip_level = 0; - while (slice_index >= depth) - { - slice_index -= depth; - mip_level++; - if (depth > 1) depth /= 2; - } + get_frame_dds_index(index, &This->info, &array_index, &mip_level, &slice_index); LeaveCriticalSection(&This->lock); @@ -1819,8 +1827,48 @@ static HRESULT WINAPI DdsEncoder_Dds_CreateNewFrame(IWICDdsEncoder *iface, IWICBitmapFrameEncode **frameEncode, UINT *arrayIndex, UINT *mipLevel, UINT *sliceIndex) { - FIXME("(%p,%p,%p,%p,%p): stub.\n", iface, frameEncode, arrayIndex, mipLevel, sliceIndex); - return E_NOTIMPL; + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + UINT array_index, mip_level, slice_index; + DdsFrameEncode *result; + HRESULT hr; + + TRACE("(%p,%p,%p,%p,%p)\n", iface, frameEncode, arrayIndex, mipLevel, sliceIndex); + + EnterCriticalSection(&This->lock); + + if (!This->stream || This->committed || This->uncommitted_frame) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(*result)); + if (!result) + { + hr = E_OUTOFMEMORY; + goto end; + } + + get_frame_dds_index(This->frame_index, &This->info, &array_index, &mip_level, &slice_index); + if (arrayIndex) *arrayIndex = array_index; + if (mipLevel) *mipLevel = mip_level; + if (sliceIndex) *sliceIndex = slice_index; + + This->frame_index++; + result->IWICBitmapFrameEncode_iface.lpVtbl = &DdsFrameEncode_Vtbl; + result->ref = 1; + result->parent = This; + result->parent->uncommitted_frame = TRUE; + result->initialized = FALSE; + result->frame_created = FALSE; + IWICDdsEncoder_AddRef(iface); + + *frameEncode = &result->IWICBitmapFrameEncode_iface; + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + return hr; } static const IWICDdsEncoderVtbl DdsEncoder_Dds_Vtbl = @@ -2076,6 +2124,7 @@ HRESULT DdsEncoder_CreateInstance( REFIID iid, void **ppv) This->ref = 1; This->stream = NULL; This->frame_count = 0; + This->frame_index = 0; This->uncommitted_frame = FALSE; This->committed = FALSE; InitializeCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index ecc5d0ec00d..8900b7699f8 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1446,17 +1446,15 @@ static void test_dds_encoder_create_frame(void) create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); IWICDdsEncoder_SetParameters(dds_encoder, &params); hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, &array_index, &mip_level, &slice_index); - todo_wine ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); - if (hr == S_OK) IWICBitmapFrameEncode_Release(frame0); + IWICBitmapFrameEncode_Release(frame0); release_encoder(encoder, dds_encoder, stream); create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); IWICDdsEncoder_SetParameters(dds_encoder, &params); hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, NULL, NULL, NULL); - todo_wine ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); - if (hr == S_OK) IWICBitmapFrameEncode_Release(frame0); + IWICBitmapFrameEncode_Release(frame0); end: release_encoder(encoder, dds_encoder, stream);

1 0

Ziqing Hui : windowscodecs/tests: Test CreateNewFrame for DDS encoder.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: c798ae1af896ad5bb816ca3da784520d7c9d832d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c798ae1af896ad5bb816ca3d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 26 09:53:54 2021 +0800 windowscodecs/tests: Test CreateNewFrame for DDS encoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 51 ++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index f369569104a..ecc5d0ec00d 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1412,10 +1412,61 @@ end: release_encoder(encoder, dds_encoder, stream); } +static void test_dds_encoder_create_frame(void) +{ + WICDdsParameters params = { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, + WICDdsTexture2D, WICDdsAlphaModePremultiplied }; + IWICBitmapFrameEncode *frame0 = NULL, *frame1 = NULL; + UINT array_index, mip_level, slice_index; + IWICDdsEncoder *dds_encoder = NULL; + IWICBitmapEncoder *encoder = NULL; + IWICStream *stream = NULL; + BYTE buffer[1024]; + HRESULT hr; + + hr = create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); + if (hr != S_OK) goto end; + IWICDdsEncoder_SetParameters(dds_encoder, &params); + + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame0, NULL); + ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame1, NULL); + todo_wine + ok(hr == WINCODEC_ERR_WRONGSTATE, "CreateNewFrame got unexpected hr %#x\n", hr); + if (hr == S_OK) IWICBitmapFrameEncode_Release(frame1); + + IWICBitmapFrameEncode_Release(frame0); + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame1, NULL); + todo_wine + ok(hr == WINCODEC_ERR_WRONGSTATE, "CreateNewFrame got unexpected hr %#x\n", hr); + if (hr == S_OK) IWICBitmapFrameEncode_Release(frame1); + + release_encoder(encoder, dds_encoder, stream); + + create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); + IWICDdsEncoder_SetParameters(dds_encoder, &params); + hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, &array_index, &mip_level, &slice_index); + todo_wine + ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); + if (hr == S_OK) IWICBitmapFrameEncode_Release(frame0); + release_encoder(encoder, dds_encoder, stream); + + create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); + IWICDdsEncoder_SetParameters(dds_encoder, &params); + hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, NULL, NULL, NULL); + todo_wine + ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); + if (hr == S_OK) IWICBitmapFrameEncode_Release(frame0); + +end: + release_encoder(encoder, dds_encoder, stream); +} + static void test_dds_encoder(void) { test_dds_encoder_initialize(); test_dds_encoder_params(); + test_dds_encoder_create_frame(); } START_TEST(ddsformat)

1 0

Jacek Caban : ntdll: Use DECLSPEC_HIDDEN for a few more symbols.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 1215c2a6b73f4cc66ef82ba9bd116bb218ab6b06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1215c2a6b73f4cc66ef82ba9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 17:25:40 2021 +0200 ntdll: Use DECLSPEC_HIDDEN for a few more symbols. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 7 +++++-- dlls/ntdll/unix/signal_x86_64.c | 10 ++++++++-- dlls/ntdll/unix/system.c | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 4a332a50055..87024e1bfce 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -638,7 +638,7 @@ static int solaris_sigaction( int sig, const struct sigaction *new, struct sigac #endif -extern void clear_alignment_flag(void); +extern void clear_alignment_flag(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( clear_alignment_flag, "pushfl\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -914,7 +914,7 @@ static inline void restore_context( const struct xcontext *xcontext, ucontext_t * * Set the new CPU context. */ -extern void set_full_cpu_context(void); +extern void set_full_cpu_context(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( set_full_cpu_context, "movl %fs:0x1f8,%ecx\n\t" "movl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame = NULL */ @@ -1622,6 +1622,9 @@ struct apc_stack_layout CONTEXT context; }; +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack, + void *arg1, void *arg2, void *arg3, + void *func, NTSTATUS status ) DECLSPEC_HIDDEN; struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack, void *arg1, void *arg2, void *arg3, void *func, NTSTATUS status ) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 0b7dde1b931..dcb0e588c66 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1568,7 +1568,7 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon * * Set the new CPU context. */ -extern void set_full_cpu_context(void); +extern void set_full_cpu_context(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( set_full_cpu_context, "movq %gs:0x30,%rdx\n\t" "movq 0x328(%rdx),%rsp\n\t" /* amd64_thread_data()->syscall_frame */ @@ -1874,7 +1874,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) } -extern void CDECL raise_func_trampoline( void *dispatcher ); +extern void CDECL raise_func_trampoline( void *dispatcher ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( raise_func_trampoline, "jmpq *%r8\n\t") @@ -1971,6 +1971,9 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) /*********************************************************************** * call_user_apc_dispatcher */ +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, + struct apc_stack_layout *stack, + NTSTATUS status ) DECLSPEC_HIDDEN; struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack, NTSTATUS status ) @@ -2051,6 +2054,9 @@ void WINAPI call_raise_user_exception_dispatcher( NTSTATUS (WINAPI *dispatcher)( /*********************************************************************** * call_user_exception_dispatcher */ +struct stack_layout * WINAPI setup_user_exception_dispatcher_stack( EXCEPTION_RECORD *rec, CONTEXT *context, + NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*), + struct stack_layout *stack ) DECLSPEC_HIDDEN; struct stack_layout * WINAPI setup_user_exception_dispatcher_stack( EXCEPTION_RECORD *rec, CONTEXT *context, NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*), struct stack_layout *stack ) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 01381630600..429f5fe3fb8 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -197,7 +197,7 @@ static inline void do_cpuid(unsigned int ax, unsigned int cx, unsigned int *p) } #ifdef __i386__ -extern int have_cpuid(void); +extern int have_cpuid(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( have_cpuid, "pushfl\n\t" "pushfl\n\t"

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
77
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 May 2021