September 2021 - Wine-Commits

Nikolay Sivov : ole32: Merge ole2* source files.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: 70043501fc03d2452f8e55abdc589f0ad7dfa7d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70043501fc03d2452f8e55ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 10 09:26:43 2021 +0300 ole32: Merge ole2* source files. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 1 - dlls/ole32/ole2.c | 461 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole2impl.c | 514 ------------------------------------------------- dlls/ole32/ole2stubs.c | 2 +- 4 files changed, 462 insertions(+), 516 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70043501fc03d2452f8e…

1 0

Nikolay Sivov : ole32: Remove unused CoGetCallerTID() stub.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: d496fd488f8fc40164ee0ecdd297ce6ba2cf783f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d496fd488f8fc40164ee0ecd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 10 09:26:42 2021 +0300 ole32: Remove unused CoGetCallerTID() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2stubs.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 49130c51584..74b4e864403 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -81,12 +81,3 @@ HRESULT WINAPI DECLSPEC_HOTPATCH OleRegEnumFormatEtc ( return E_NOTIMPL; } - -/*********************************************************************** - * CoGetCallerTID [OLE32.@] - */ -HRESULT WINAPI CoGetCallerTID(LPDWORD lpdwTID) -{ - FIXME("stub!\n"); - return E_NOTIMPL; -}

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: 94e0d4b5259f5699787297f049dd0afe8a8e6f91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e0d4b5259f5699787297f0… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Sep 9 23:14:40 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/po/lt.po b/po/lt.po index 8073c7ba361..28df893327a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-09-08 22:37+0300\n" +"PO-Revision-Date: 2021-09-09 23:13+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.4.2\n" +"X-Generator: Poedit 3.0\n" "X-Project-Style: default\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 @@ -10318,7 +10318,7 @@ msgstr "Kinijos vasaros laikas" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) Pekinas, Čongčingas, Honkongas, Urumčis" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10398,7 +10398,7 @@ msgstr "Vidurio Europos vasaros laikas" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) Sarajevas, Skopjė, Varšuva, Zagrebas" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10430,7 +10430,7 @@ msgstr "Altajaus vasaros laikas" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) Barnaulas, Gorno Altaiskas" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" @@ -10442,7 +10442,7 @@ msgstr "Vidurio Europos vasaros laikas" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) Belgradas, Bratislava, Budapeštas, Liubliana, Praha" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10514,7 +10514,7 @@ msgstr "Kalnų vasaros laikas (Meksika)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) Čihuahua, La Pasas, Masatlanas" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" @@ -10526,7 +10526,7 @@ msgstr "Grinvičo vasaros laikas" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) Dublinas, Edinburgas, Lisabona, Londonas" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -10618,7 +10618,7 @@ msgstr "Vakarų Ramiojo vandenyno vasaros laikas" #: dlls/tzres/tzres.rc:437 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) Guam, Port Morsbis" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10714,7 +10714,7 @@ msgstr "Tokijo vasaros laikas" #: dlls/tzres/tzres.rc:362 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) Osaka, Saporas, Tokijas" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10770,7 +10770,7 @@ msgstr "" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) Iževskas, Samara" #: dlls/tzres/tzres.rc:414 msgid "Volgograd Standard Time" @@ -10782,7 +10782,7 @@ msgstr "Volgogrado vasaros laikas" #: dlls/tzres/tzres.rc:416 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) Volgogradas" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -10794,7 +10794,7 @@ msgstr "Azorų vasaros laikas" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) Azorai" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" @@ -10806,7 +10806,7 @@ msgstr "Šiaurės Azijos rytų vasaros laikas" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) Irkutskas" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-11" @@ -10826,7 +10826,7 @@ msgstr "Argentinos vasaros laikas" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) Buenos Airės" #: dlls/tzres/tzres.rc:375 msgid "Turks And Caicos Standard Time" @@ -10838,7 +10838,7 @@ msgstr "Terkso ir Kaikoso vasaros laikas" #: dlls/tzres/tzres.rc:377 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) Terksas ir Kaikosas" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -10850,7 +10850,7 @@ msgstr "Markizo vasaros laikas" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) Markizo salos" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time"

1 0

Eric Pouech : dbghelp/dwarf: Initialize module's word_size at module load time.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: 7f2eb08304a23cc759b5df37633f9673418d43f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f2eb08304a23cc759b5df37… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:44 2021 +0200 dbghelp/dwarf: Initialize module's word_size at module load time. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 435b2a0e3b0..13f1c0e7d9c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2409,8 +2409,6 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, return FALSE; } - module->format_info[DFI_DWARF]->u.dwarf2_info->word_size = ctx.head.word_size; - pool_init(&ctx.pool, 65536); ctx.sections = sections; ctx.section = section_debug; @@ -3570,7 +3568,7 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->remove = dwarf2_module_remove; dwarf2_modfmt->loc_compute = dwarf2_location_compute; dwarf2_modfmt->u.dwarf2_info = (struct dwarf2_module_info_s*)(dwarf2_modfmt + 1); - dwarf2_modfmt->u.dwarf2_info->word_size = 0; /* will be correctly set later on */ + dwarf2_modfmt->u.dwarf2_info->word_size = fmap->addr_size / 8; /* set the word_size for eh_frame parsing */ dwarf2_modfmt->module->format_info[DFI_DWARF] = dwarf2_modfmt; /* As we'll need later some sections' content, we won't unmap these @@ -3594,9 +3592,6 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->module->module.SourceIndexed = TRUE; dwarf2_modfmt->module->module.Publics = TRUE; - /* set the word_size for eh_frame parsing */ - dwarf2_modfmt->u.dwarf2_info->word_size = fmap->addr_size / 8; - leave: dwarf2_fini_section(&section[section_debug]); dwarf2_fini_section(&section[section_abbrev]);

1 0

Alexandre Julliard : shell32: Merge the drag & drop implementation from the Unix shell folder.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: df9c67d19695dddf5ee63d64a84244649748f94c URL: https://source.winehq.org/git/wine.git/?a=commit;h=df9c67d19695dddf5ee63d64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 10 18:52:37 2021 +0200 shell32: Merge the drag & drop implementation from the Unix shell folder. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_fs.c | 134 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 100 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 52bdccd6c38..55d380ffb1d 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -72,11 +72,11 @@ typedef struct { LPWSTR sPathTarget; /* complete path to target used for enumeration and ChangeNotify */ LPITEMIDLIST pidlRoot; /* absolute pidl */ - - UINT cfShellIDList; /* clipboardformat for IDropTarget */ - BOOL fAcceptFmt; /* flag for pending Drop */ + DWORD drop_effects_mask; } IGenericSFImpl; +static UINT cfShellIDList; + static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); @@ -102,18 +102,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper(ISFHelper *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, ISFHelper_iface); } -/************************************************************************** -* registers clipboardformat once -*/ -static void SF_RegisterClipFmt (IGenericSFImpl * This) -{ - TRACE ("(%p)\n", This); - - if (!This->cfShellIDList) { - This->cfShellIDList = RegisterClipboardFormatW (CFSTR_SHELLIDLISTW); - } -} - /************************************************************************** * inner IUnknown */ @@ -136,7 +124,7 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo *ppvObj = &This->ISFHelper_iface; else if (IsEqualIID (riid, &IID_IDropTarget)) { *ppvObj = &This->IDropTarget_iface; - SF_RegisterClipFmt(This); + if (!cfShellIDList) cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); } if (*ppvObj) { @@ -1543,22 +1531,42 @@ static ULONG WINAPI ISFDropTarget_Release(IDropTarget *iface) return IUnknown_Release(This->outer_unk); } +#define HIDA_GetPIDLFolder(pida) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[0]) +#define HIDA_GetPIDLItem(pida, i) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[i+1]) + static HRESULT WINAPI ISFDropTarget_DragEnter (IDropTarget * iface, IDataObject * pDataObject, DWORD dwKeyState, POINTL pt, DWORD * pdwEffect) { - FORMATETC fmt; - IGenericSFImpl *This = impl_from_IDropTarget(iface); + FORMATETC format; + STGMEDIUM medium; - TRACE ("(%p)->(DataObject=%p)\n", This, pDataObject); + TRACE("(%p)->(%p 0x%08x {.x=%d, .y=%d} %p)\n", This, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect); - InitFormatEtc (fmt, This->cfShellIDList, TYMED_HGLOBAL); - This->fAcceptFmt = IDataObject_QueryGetData (pDataObject, &fmt) == S_OK; - if (This->fAcceptFmt) - *pdwEffect = KeyStateToDropEffect(dwKeyState); - else - *pdwEffect = DROPEFFECT_NONE; + if (!pdwEffect || !pDataObject) + return E_INVALIDARG; + + /* Compute a mask of supported drop-effects for this shellfolder object and the given data + * object. Dropping is only supported on folders, which represent filesystem locations. One + * can't drop on file objects. And the 'move' drop effect is only supported, if the source + * folder is not identical to the target folder. */ + This->drop_effects_mask = DROPEFFECT_NONE; + InitFormatEtc(format, cfShellIDList, TYMED_HGLOBAL); + if (_ILIsFolder(ILFindLastID(This->pidlRoot)) && /* Only drop to folders, not to files */ + SUCCEEDED(IDataObject_GetData(pDataObject, &format, &medium))) /* Only ShellIDList format */ + { + LPIDA pidaShellIDList = GlobalLock(medium.u.hGlobal); + This->drop_effects_mask |= DROPEFFECT_COPY|DROPEFFECT_LINK; + + if (pidaShellIDList) { /* Files can only be moved between two different folders */ + if (!ILIsEqual(HIDA_GetPIDLFolder(pidaShellIDList), This->pidlRoot)) + This->drop_effects_mask |= DROPEFFECT_MOVE; + GlobalUnlock(medium.u.hGlobal); + } + } + + *pdwEffect = KeyStateToDropEffect(dwKeyState) & This->drop_effects_mask; return S_OK; } @@ -1569,15 +1577,12 @@ ISFDropTarget_DragOver (IDropTarget * iface, DWORD dwKeyState, POINTL pt, { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); + TRACE("(%p)->(0x%08x {.x=%d, .y=%d} %p)\n", This, dwKeyState, pt.x, pt.y, pdwEffect); if (!pdwEffect) return E_INVALIDARG; - if (This->fAcceptFmt) - *pdwEffect = KeyStateToDropEffect(dwKeyState); - else - *pdwEffect = DROPEFFECT_NONE; + *pdwEffect = KeyStateToDropEffect(dwKeyState) & This->drop_effects_mask; return S_OK; } @@ -1586,10 +1591,9 @@ static HRESULT WINAPI ISFDropTarget_DragLeave (IDropTarget * iface) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - - This->fAcceptFmt = FALSE; + TRACE("(%p)\n", This); + This->drop_effects_mask = DROPEFFECT_NONE; return S_OK; } @@ -1598,8 +1602,70 @@ ISFDropTarget_Drop (IDropTarget * iface, IDataObject * pDataObject, DWORD dwKeyState, POINTL pt, DWORD * pdwEffect) { IGenericSFImpl *This = impl_from_IDropTarget(iface); + FORMATETC format; + STGMEDIUM medium; + HRESULT hr; + + TRACE("(%p)->(%p %d {.x=%d, .y=%d} %p) semi-stub\n", + This, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect); + + InitFormatEtc(format, cfShellIDList, TYMED_HGLOBAL); + hr = IDataObject_GetData(pDataObject, &format, &medium); + if (FAILED(hr)) + return hr; + + if (medium.tymed == TYMED_HGLOBAL) { + IShellFolder *psfSourceFolder, *psfDesktopFolder; + LPIDA pidaShellIDList = GlobalLock(medium.u.hGlobal); + STRRET strret; + UINT i; + + if (!pidaShellIDList) + return HRESULT_FROM_WIN32(GetLastError()); + + hr = SHGetDesktopFolder(&psfDesktopFolder); + if (FAILED(hr)) { + GlobalUnlock(medium.u.hGlobal); + return hr; + } + + hr = IShellFolder_BindToObject(psfDesktopFolder, HIDA_GetPIDLFolder(pidaShellIDList), NULL, + &IID_IShellFolder, (LPVOID*)&psfSourceFolder); + IShellFolder_Release(psfDesktopFolder); + if (FAILED(hr)) { + GlobalUnlock(medium.u.hGlobal); + return hr; + } - FIXME ("(%p) object dropped\n", This); + for (i = 0; i < pidaShellIDList->cidl; i++) { + WCHAR wszSourcePath[MAX_PATH]; + + hr = IShellFolder_GetDisplayNameOf(psfSourceFolder, HIDA_GetPIDLItem(pidaShellIDList, i), + SHGDN_FORPARSING, &strret); + if (FAILED(hr)) + break; + + hr = StrRetToBufW(&strret, NULL, wszSourcePath, MAX_PATH); + if (FAILED(hr)) + break; + + switch (*pdwEffect) { + case DROPEFFECT_MOVE: + FIXME("Move %s to %s!\n", debugstr_w(wszSourcePath), debugstr_w(This->sPathTarget)); + break; + case DROPEFFECT_COPY: + FIXME("Copy %s to %s!\n", debugstr_w(wszSourcePath), debugstr_w(This->sPathTarget)); + break; + case DROPEFFECT_LINK: + FIXME("Link %s from %s!\n", debugstr_w(wszSourcePath), debugstr_w(This->sPathTarget)); + break; + } + } + + IShellFolder_Release(psfSourceFolder); + GlobalUnlock(medium.u.hGlobal); + return hr; + } return E_NOTIMPL; }

1 0

Eric Pouech : dbghelp: Use correct parameter name.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: c031d5aa8c68b268742d90b9407ef9fe0aaaa02e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c031d5aa8c68b268742d90b9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 10 15:52:02 2021 +0200 dbghelp: Use correct parameter name. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 23752cfed9f..29d8a5350a5 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -487,13 +487,13 @@ struct enum_types_AtoW PSYM_ENUMERATESYMBOLS_CALLBACKW callback; }; -static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG addr, PVOID _et) +static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG size, PVOID _et) { struct enum_types_AtoW* et = _et; SYMBOL_INFOW* siW = (SYMBOL_INFOW*)et->buffer; copy_symbolW(siW, si); - return et->callback(siW, addr, et->user); + return et->callback(siW, size, et->user); } /******************************************************************

1 0

Tim Clem : winemac.drv: Allow cycling of windows with Cmd+`.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: b5deeff860339c214e48f411bda94e456abf03a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5deeff860339c214e48f411… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Sep 9 15:31:56 2021 -0700 winemac.drv: Allow cycling of windows with Cmd+`. We already set up the Window menu and set the relevant bits in collectionBehavior, but windows must respond YES to -canBecomeKeyWindow in order to actually be activated by Cmd+` window cycling. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0926756c875..80cb2693409 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2358,7 +2358,11 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { if (causing_becomeKeyWindow == self) return YES; if (self.disabled || self.noActivate) return NO; - return [self isKeyWindow]; + if ([self isKeyWindow]) return YES; + + // If a window's collectionBehavior says it participates in cycling, + // it must return YES from this method to actually be eligible. + return ![self isExcludedFromWindowsMenu]; } - (BOOL) canBecomeMainWindow

1 0

Alexandre Julliard : shell32: Merge the property bag implementation from the Unix shell folder.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: ed5c88297573e389a72e10ccff2cbedcd2304a99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed5c88297573e389a72e10cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 10 18:54:46 2021 +0200 shell32: Merge the property bag implementation from the Unix shell folder. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_fs.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 55d380ffb1d..211b8d47a1a 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -62,6 +62,7 @@ typedef struct { LONG ref; IShellFolder2 IShellFolder2_iface; IPersistFolder3 IPersistFolder3_iface; + IPersistPropertyBag IPersistPropertyBag_iface; IDropTarget IDropTarget_iface; ISFHelper ISFHelper_iface; IUnknown *outer_unk; @@ -92,6 +93,11 @@ static inline IGenericSFImpl *impl_from_IPersistFolder3(IPersistFolder3 *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistFolder3_iface); } +static inline IGenericSFImpl *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) +{ + return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistPropertyBag_iface); +} + static inline IGenericSFImpl *impl_from_IDropTarget(IDropTarget *iface) { return CONTAINING_RECORD(iface, IGenericSFImpl, IDropTarget_iface); @@ -120,6 +126,8 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo else if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IPersistFolder) || IsEqualIID(riid, &IID_IPersistFolder2) || IsEqualIID(riid, &IID_IPersistFolder3)) *ppvObj = &This->IPersistFolder3_iface; + else if (IsEqualIID(&IID_IPersistPropertyBag, riid)) + *ppvObj = &This->IPersistPropertyBag_iface; else if (IsEqualIID (riid, &IID_ISFHelper)) *ppvObj = &This->ISFHelper_iface; else if (IsEqualIID (riid, &IID_IDropTarget)) { @@ -1507,6 +1515,90 @@ static const IPersistFolder3Vtbl pfvt = IFSFldr_PersistFolder3_GetFolderTargetInfo }; +/**************************************************************************** + * IPersistPropertyBag implementation + */ +static HRESULT WINAPI PersistPropertyBag_QueryInterface(IPersistPropertyBag* iface, + REFIID riid, void** ppv) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI PersistPropertyBag_AddRef(IPersistPropertyBag* iface) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI PersistPropertyBag_Release(IPersistPropertyBag* iface) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + return IUnknown_Release(This->outer_unk); +} + +static HRESULT WINAPI PersistPropertyBag_GetClassID(IPersistPropertyBag* iface, CLSID* pClassID) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + return IPersistFolder3_GetClassID(&This->IPersistFolder3_iface, pClassID); +} + +static HRESULT WINAPI PersistPropertyBag_InitNew(IPersistPropertyBag* iface) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *iface, + IPropertyBag *pPropertyBag, IErrorLog *pErrorLog) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + + static const WCHAR wszTarget[] = { 'T','a','r','g','e','t', 0 }; + PERSIST_FOLDER_TARGET_INFO pftiTarget; + VARIANT var; + HRESULT hr; + + TRACE("(%p)->(%p %p)\n", This, pPropertyBag, pErrorLog); + + if (!pPropertyBag) + return E_POINTER; + + /* Get 'Target' property from the property bag. */ + V_VT(&var) = VT_BSTR; + hr = IPropertyBag_Read(pPropertyBag, wszTarget, &var, NULL); + if (FAILED(hr)) + return E_FAIL; + lstrcpyW(pftiTarget.szTargetParsingName, V_BSTR(&var)); + SysFreeString(V_BSTR(&var)); + + pftiTarget.pidlTargetFolder = NULL; + pftiTarget.szNetworkProvider[0] = 0; + pftiTarget.dwAttributes = -1; + pftiTarget.csidl = -1; + + return IPersistFolder3_InitializeEx(&This->IPersistFolder3_iface, NULL, NULL, &pftiTarget); +} + +static HRESULT WINAPI PersistPropertyBag_Save(IPersistPropertyBag *iface, + IPropertyBag *pPropertyBag, BOOL fClearDirty, BOOL fSaveAllProperties) +{ + IGenericSFImpl *This = impl_from_IPersistPropertyBag(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static const IPersistPropertyBagVtbl ppbvt = { + PersistPropertyBag_QueryInterface, + PersistPropertyBag_AddRef, + PersistPropertyBag_Release, + PersistPropertyBag_GetClassID, + PersistPropertyBag_InitNew, + PersistPropertyBag_Load, + PersistPropertyBag_Save +}; + /**************************************************************************** * ISFDropTarget implementation */ @@ -1698,6 +1790,7 @@ HRESULT WINAPI IFSFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **pp sf->IUnknown_inner.lpVtbl = &unkvt; sf->IShellFolder2_iface.lpVtbl = &sfvt; sf->IPersistFolder3_iface.lpVtbl = &pfvt; + sf->IPersistPropertyBag_iface.lpVtbl = &ppbvt; sf->IDropTarget_iface.lpVtbl = &dtvt; sf->ISFHelper_iface.lpVtbl = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder;

1 0

Jacek Caban : gdi32/tests: Add GdiTransparentBlt tests.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: 33ecaf357e70c887e8bd6b6b6fdb5e76a35e61a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ecaf357e70c887e8bd6b6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 10 14:27:48 2021 +0200 gdi32/tests: Add GdiTransparentBlt tests. 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/tests/metafile.c | 254 ++++++++++++++++++++++++-------------------- 1 file changed, 140 insertions(+), 114 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33ecaf357e70c887e8bd…

1 0

Alexandre Julliard : shell32: Share more code between the various IShellFolder_GetDetailsOf implementations.
by Alexandre Julliard Sept. 10, 2021

Sept. 10, 2021

Module: wine Branch: master Commit: aef981df621a1caf6aa2245e5046e82e045be814 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aef981df621a1caf6aa2245e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 10 18:50:19 2021 +0200 shell32: Share more code between the various IShellFolder_GetDetailsOf implementations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 44 +++++++++++++++++------------------------ dlls/shell32/recyclebin.c | 46 ++++++++++++++----------------------------- dlls/shell32/shfldr.h | 2 ++ dlls/shell32/shfldr_desktop.c | 26 +----------------------- dlls/shell32/shfldr_fs.c | 35 ++------------------------------ dlls/shell32/shfldr_mycomp.c | 10 +++------- dlls/shell32/shfldr_unixfs.c | 20 ++++--------------- dlls/shell32/shlfolder.c | 24 ++++++++++++++++++++++ 8 files changed, 69 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aef981df621a1caf6aa2…

1 0