December 2023 - Wine-Commits

Zebediah Figura : quartz: Return the rect from get_default_rect() through a pointer.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 20b1ef6ed0f701e213b48cc148da0ae6101ba7d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/20b1ef6ed0f701e213b48cc148da0a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 5 23:04:55 2023 -0600 quartz: Return the rect from get_default_rect() through a pointer. Notably, this avoids the incorrect use of a static variable. --- dlls/quartz/quartz_private.h | 2 +- dlls/quartz/videorenderer.c | 9 +++------ dlls/quartz/vmr9.c | 11 ++++------- dlls/quartz/window.c | 4 ++-- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 849795d9c1b..58d8bb775a9 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -108,7 +108,7 @@ struct video_window struct video_window_ops { - RECT (*get_default_rect)(struct video_window *window); + void (*get_default_rect)(struct video_window *window, RECT *rect); HRESULT (*get_current_image)(struct video_window *window, LONG *size, LONG *image); }; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f725a9998ce..e6735367cb3 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -199,14 +199,11 @@ static HRESULT video_renderer_connect(struct strmbase_renderer *iface, const AM_ return S_OK; } -static RECT video_renderer_get_default_rect(struct video_window *iface) +static void video_renderer_get_default_rect(struct video_window *iface, RECT *rect) { - struct video_renderer *This = impl_from_video_window(iface); - static RECT defRect; - - SetRect(&defRect, 0, 0, This->VideoWidth, This->VideoHeight); + struct video_renderer *filter = impl_from_video_window(iface); - return defRect; + SetRect(rect, 0, 0, filter->VideoWidth, filter->VideoHeight); } static const struct strmbase_renderer_ops renderer_ops = diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e34e6cee2ba..bc4ad4898f7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -642,15 +642,12 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_pin_query_interface = vmr_pin_query_interface, }; -static RECT vmr_get_default_rect(struct video_window *This) +static void vmr_get_default_rect(struct video_window *iface, RECT *rect) { - struct quartz_vmr *pVMR9 = impl_from_video_window(This); - const BITMAPINFOHEADER *bmiheader = get_filter_bitmap_header(pVMR9); - static RECT defRect; - - SetRect(&defRect, 0, 0, bmiheader->biWidth, bmiheader->biHeight); + struct quartz_vmr *filter = impl_from_video_window(iface); + const BITMAPINFOHEADER *bitmap_header = get_filter_bitmap_header(filter); - return defRect; + SetRect(rect, 0, 0, bitmap_header->biWidth, bitmap_header->biHeight); } static HRESULT vmr_get_current_image(struct video_window *iface, LONG *size, LONG *image) diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 4a9c4aed8f7..02c6a826bb2 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -655,7 +655,7 @@ HRESULT WINAPI BaseControlWindowImpl_GetMinIdealImageSize(IVideoWindow *iface, L TRACE("window %p, width %p, height %p.\n", window, width, height); - rect = window->ops->get_default_rect(window); + window->ops->get_default_rect(window, &rect); *width = rect.right - rect.left; *height = rect.bottom - rect.top; return S_OK; @@ -668,7 +668,7 @@ HRESULT WINAPI BaseControlWindowImpl_GetMaxIdealImageSize(IVideoWindow *iface, L TRACE("window %p, width %p, height %p.\n", window, width, height); - rect = window->ops->get_default_rect(window); + window->ops->get_default_rect(window, &rect); *width = rect.right - rect.left; *height = rect.bottom - rect.top; return S_OK;

1 0

Zebediah Figura : quartz: Do not forward IVMRFilterConfig::SetRenderingMode() to IVMRFilterConfig9.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 096172f27f9f7cc2d1dd4adacb5507b280589c81 URL: https://gitlab.winehq.org/wine/wine/-/commit/096172f27f9f7cc2d1dd4adacb5507… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 6 13:37:17 2023 -0600 quartz: Do not forward IVMRFilterConfig::SetRenderingMode() to IVMRFilterConfig9. --- dlls/quartz/vmr9.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index bc4ad4898f7..e0bcd970783 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -926,10 +926,47 @@ static HRESULT WINAPI VMR7FilterConfig_GetRenderingPrefs(IVMRFilterConfig *iface static HRESULT WINAPI VMR7FilterConfig_SetRenderingMode(IVMRFilterConfig *iface, DWORD mode) { struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface); + struct default_presenter *default_presenter; + HRESULT hr = S_OK; + + TRACE("filter %p, mode %lu.\n", filter, mode); + + EnterCriticalSection(&filter->renderer.filter.filter_cs); + if (filter->mode) + { + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return VFW_E_WRONG_STATE; + } + + switch (mode) + { + case VMRMode_Windowed: + case VMRMode_Windowless: + if (FAILED(hr = default_presenter_create(filter, &default_presenter))) + { + ERR("Failed to create default presenter, hr %#lx.\n", hr); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return hr; + } + filter->allocator = &default_presenter->IVMRSurfaceAllocator9_iface; + filter->presenter = &default_presenter->IVMRImagePresenter9_iface; + IVMRImagePresenter9_AddRef(filter->presenter); - TRACE("iface %p, mode %#lx.\n", iface, mode); + IVMRSurfaceAllocator9_AdviseNotify(filter->allocator, &filter->IVMRSurfaceAllocatorNotify9_iface); + break; + case VMRMode_Renderless: + break; + default: + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return E_INVALIDARG; + } - return IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, mode); + if (mode != VMRMode_Windowed) + video_window_cleanup(&filter->window); + + filter->mode = mode; + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return hr; } static HRESULT WINAPI VMR7FilterConfig_GetRenderingMode(IVMRFilterConfig *iface, DWORD *mode)

1 0

Matteo Bruni : d3dx9: Check for successful sprite draw in DrawTextW().
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: bc1ba439424877a37504162b15a25344d5ab8505 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc1ba439424877a37504162b15a253… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 1 23:29:53 2023 +0100 d3dx9: Check for successful sprite draw in DrawTextW(). --- dlls/d3dx9_36/font.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index cc447e68f22..67058d91ecb 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -656,6 +656,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, unsigned int count; RECT r = {0}; WCHAR *line; + HRESULT hr; SIZE size; TRACE("iface %p, sprite %p, string %s, in_count %d, rect %s, format %#lx, color 0x%08lx.\n", @@ -775,8 +776,14 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, black_box.bottom = black_box.top + rect->bottom - pos.y; } - ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); + hr = ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); IDirect3DTexture9_Release(texture); + if (FAILED(hr)) + { + free(results.lpCaretPos); + free(results.lpGlyphs); + goto cleanup; + } } free(results.lpCaretPos);

1 0

Fabian Maurer : coml2: Move StgCreatePropSetStg from ole32.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 8e48d7fdbdbdcf0bf2f2ff48b9abfcfdcfe2aae0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e48d7fdbdbdcf0bf2f2ff48b9abfc… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 3 23:26:55 2023 +0100 coml2: Move StgCreatePropSetStg from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/storage32.c | 12 ++++++++++++ dlls/ole32/storage32.c | 13 ------------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index 694790350cc..f9747cb449d 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -19,7 +19,7 @@ @ stdcall ReadClassStm(ptr ptr) @ stub StgCreateDocfile @ stub StgCreateDocfileOnILockBytes -@ stub StgCreatePropSetStg +@ stdcall StgCreatePropSetStg(ptr long ptr) @ stub StgCreatePropStg @ stub StgCreateStorageEx @ stdcall StgIsStorageFile(wstr) diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c index dd803c817c9..d6dab7d6b17 100644 --- a/dlls/coml2/storage32.c +++ b/dlls/coml2/storage32.c @@ -226,3 +226,15 @@ HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn) TRACE(" -> Invalid header.\n"); return S_FALSE; } + +/****************************************************************************** + * StgCreatePropSetStg [coml2.@] + */ +HRESULT WINAPI StgCreatePropSetStg(IStorage *pstg, DWORD reserved, IPropertySetStorage **propset) +{ + TRACE("%p, %#lx, %p.\n", pstg, reserved, propset); + if (reserved) + return STG_E_INVALIDPARAMETER; + + return IStorage_QueryInterface(pstg, &IID_IPropertySetStorage, (void**)propset); +} diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f0ec0b5e954..1bf08e45701 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8649,19 +8649,6 @@ HRESULT WINAPI StgCreateStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD st return STG_E_INVALIDPARAMETER; } -/****************************************************************************** - * StgCreatePropSetStg [OLE32.@] - */ -HRESULT WINAPI StgCreatePropSetStg(IStorage *pstg, DWORD reserved, - IPropertySetStorage **propset) -{ - TRACE("%p, %#lx, %p.\n", pstg, reserved, propset); - if (reserved) - return STG_E_INVALIDPARAMETER; - - return IStorage_QueryInterface(pstg, &IID_IPropertySetStorage, (void**)propset); -} - /****************************************************************************** * StgOpenStorageEx [OLE32.@] */

1 0

Fabian Maurer : coml2: Move FmtIdToPropStgName from ole32.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: ce60cfeb81e559587b5698218976be47d30c76d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce60cfeb81e559587b5698218976be… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 3 23:22:58 2023 +0100 coml2: Move FmtIdToPropStgName from ole32. --- dlls/coml2/Makefile.in | 1 + dlls/coml2/coml2.spec | 2 +- dlls/coml2/stg_prop.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/stg_prop.c | 67 -------------------------- 4 files changed, 126 insertions(+), 68 deletions(-) diff --git a/dlls/coml2/Makefile.in b/dlls/coml2/Makefile.in index 5aa96ded363..739f791d4c5 100644 --- a/dlls/coml2/Makefile.in +++ b/dlls/coml2/Makefile.in @@ -5,4 +5,5 @@ IMPORTS = uuid SOURCES = \ memlockbytes.c \ + stg_prop.c \ storage32.c diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index 364413dbf4d..eea1f4332f4 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -11,7 +11,7 @@ @ stub Coml2DllGetClassObject @ stdcall CreateILockBytesOnHGlobal(ptr long ptr) @ stub DllGetClassObject -@ stub FmtIdToPropStgName +@ stdcall FmtIdToPropStgName(ptr wstr) @ stdcall GetConvertStg(ptr) @ stdcall GetHGlobalFromILockBytes(ptr ptr) @ stub PropStgNameToFmtId diff --git a/dlls/coml2/stg_prop.c b/dlls/coml2/stg_prop.c new file mode 100644 index 00000000000..3e1e23dfb5a --- /dev/null +++ b/dlls/coml2/stg_prop.c @@ -0,0 +1,124 @@ +/* + * Compound Storage (32 bit version) + * Storage implementation + * + * This file contains the compound file implementation + * of the storage interface. + * + * Copyright 1999 Francis Beaudet + * Copyright 1999 Sylvain St-Germain + * Copyright 1999 Thuy Nguyen + * Copyright 2005 Mike McCormack + * Copyright 2005 Juan Lang + * Copyright 2006 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * TODO: + * - I don't honor the maximum property set size. + * - Certain bogus files could result in reading past the end of a buffer. + * - Mac-generated files won't be read correctly, even if they're little + * endian, because I disregard whether the generator was a Mac. This means + * strings will probably be munged (as I don't understand Mac scripts.) + * - Not all PROPVARIANT types are supported. + * - User defined properties are not supported, see comment in + * PropertyStorage_ReadFromStream + */ + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winuser.h" +#include "wine/asm.h" +#include "wine/debug.h" +#include "wine/heap.h" +#include "oleauto.h" + +WINE_DEFAULT_DEBUG_CHANNEL(storage); + +/*********************************************************************** + * Format ID <-> name conversion + */ +static const WCHAR szSummaryInfo[] = L"\5SummaryInformation"; +static const WCHAR szDocSummaryInfo[] = L"\5DocumentSummaryInformation"; + +#define BITS_PER_BYTE 8 +#define CHARMASK 0x1f +#define BITS_IN_CHARMASK 5 +#define NUM_ALPHA_CHARS 26 + +/*********************************************************************** + * FmtIdToPropStgName [coml2.@] + */ +HRESULT WINAPI FmtIdToPropStgName(const FMTID *rfmtid, LPOLESTR str) +{ + static const char fmtMap[] = "abcdefghijklmnopqrstuvwxyz012345"; + + TRACE("%s, %p\n", debugstr_guid(rfmtid), str); + + if (!rfmtid) return E_INVALIDARG; + if (!str) return E_INVALIDARG; + + if (IsEqualGUID(&FMTID_SummaryInformation, rfmtid)) + lstrcpyW(str, szSummaryInfo); + else if (IsEqualGUID(&FMTID_DocSummaryInformation, rfmtid)) + lstrcpyW(str, szDocSummaryInfo); + else if (IsEqualGUID(&FMTID_UserDefinedProperties, rfmtid)) + lstrcpyW(str, szDocSummaryInfo); + else + { + const BYTE *fmtptr; + WCHAR *pstr = str; + ULONG bitsRemaining = BITS_PER_BYTE; + + *pstr++ = 5; + for (fmtptr = (const BYTE *)rfmtid; fmtptr < (const BYTE *)rfmtid + sizeof(FMTID); ) + { + ULONG i = *fmtptr >> (BITS_PER_BYTE - bitsRemaining); + + if (bitsRemaining >= BITS_IN_CHARMASK) + { + *pstr = (WCHAR)(fmtMap[i & CHARMASK]); + if (bitsRemaining == BITS_PER_BYTE && *pstr >= 'a' && + *pstr <= 'z') + *pstr += 'A' - 'a'; + pstr++; + bitsRemaining -= BITS_IN_CHARMASK; + if (bitsRemaining == 0) + { + fmtptr++; + bitsRemaining = BITS_PER_BYTE; + } + } + else + { + if (++fmtptr < (const BYTE *)rfmtid + sizeof(FMTID)) + i |= *fmtptr << bitsRemaining; + *pstr++ = (WCHAR)(fmtMap[i & CHARMASK]); + bitsRemaining += BITS_PER_BYTE - BITS_IN_CHARMASK; + } + } + *pstr = 0; + } + TRACE("returning %s\n", debugstr_w(str)); + return S_OK; +} diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8bc159c7dd5..db998e6d30a 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -3005,73 +3005,6 @@ static const WCHAR szDocSummaryInfo[] = L"\5DocumentSummaryInformation"; #define BITS_IN_CHARMASK 5 #define NUM_ALPHA_CHARS 26 -/*********************************************************************** - * FmtIdToPropStgName [ole32.@] - * Returns the storage name of the format ID rfmtid. - * PARAMS - * rfmtid [I] Format ID for which to return a storage name - * str [O] Storage name associated with rfmtid. - * - * RETURNS - * E_INVALIDARG if rfmtid or str i NULL, S_OK otherwise. - * - * NOTES - * str must be at least CCH_MAX_PROPSTG_NAME characters in length. - */ -HRESULT WINAPI FmtIdToPropStgName(const FMTID *rfmtid, LPOLESTR str) -{ - static const char fmtMap[] = "abcdefghijklmnopqrstuvwxyz012345"; - - TRACE("%s, %p\n", debugstr_guid(rfmtid), str); - - if (!rfmtid) return E_INVALIDARG; - if (!str) return E_INVALIDARG; - - if (IsEqualGUID(&FMTID_SummaryInformation, rfmtid)) - lstrcpyW(str, szSummaryInfo); - else if (IsEqualGUID(&FMTID_DocSummaryInformation, rfmtid)) - lstrcpyW(str, szDocSummaryInfo); - else if (IsEqualGUID(&FMTID_UserDefinedProperties, rfmtid)) - lstrcpyW(str, szDocSummaryInfo); - else - { - const BYTE *fmtptr; - WCHAR *pstr = str; - ULONG bitsRemaining = BITS_PER_BYTE; - - *pstr++ = 5; - for (fmtptr = (const BYTE *)rfmtid; fmtptr < (const BYTE *)rfmtid + sizeof(FMTID); ) - { - ULONG i = *fmtptr >> (BITS_PER_BYTE - bitsRemaining); - - if (bitsRemaining >= BITS_IN_CHARMASK) - { - *pstr = (WCHAR)(fmtMap[i & CHARMASK]); - if (bitsRemaining == BITS_PER_BYTE && *pstr >= 'a' && - *pstr <= 'z') - *pstr += 'A' - 'a'; - pstr++; - bitsRemaining -= BITS_IN_CHARMASK; - if (bitsRemaining == 0) - { - fmtptr++; - bitsRemaining = BITS_PER_BYTE; - } - } - else - { - if (++fmtptr < (const BYTE *)rfmtid + sizeof(FMTID)) - i |= *fmtptr << bitsRemaining; - *pstr++ = (WCHAR)(fmtMap[i & CHARMASK]); - bitsRemaining += BITS_PER_BYTE - BITS_IN_CHARMASK; - } - } - *pstr = 0; - } - TRACE("returning %s\n", debugstr_w(str)); - return S_OK; -} - /*********************************************************************** * PropStgNameToFmtId [ole32.@] * Returns the format ID corresponding to the given name.

1 0

Fabian Maurer : coml2: Move PropStgNameToFmtId from ole32.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: e5df1b2e51cf34d6234faabd242bcd36e0b1b470 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5df1b2e51cf34d6234faabd242bcd… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 3 23:24:18 2023 +0100 coml2: Move PropStgNameToFmtId from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/stg_prop.c | 75 ++++++++++++++++++++++++++++++++++++++++ dlls/ole32/stg_prop.c | 94 --------------------------------------------------- 3 files changed, 76 insertions(+), 95 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index eea1f4332f4..694790350cc 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -14,7 +14,7 @@ @ stdcall FmtIdToPropStgName(ptr wstr) @ stdcall GetConvertStg(ptr) @ stdcall GetHGlobalFromILockBytes(ptr ptr) -@ stub PropStgNameToFmtId +@ stdcall PropStgNameToFmtId(wstr ptr) @ stdcall ReadClassStg(ptr ptr) @ stdcall ReadClassStm(ptr ptr) @ stub StgCreateDocfile diff --git a/dlls/coml2/stg_prop.c b/dlls/coml2/stg_prop.c index 3e1e23dfb5a..93d658c2a0a 100644 --- a/dlls/coml2/stg_prop.c +++ b/dlls/coml2/stg_prop.c @@ -122,3 +122,78 @@ HRESULT WINAPI FmtIdToPropStgName(const FMTID *rfmtid, LPOLESTR str) TRACE("returning %s\n", debugstr_w(str)); return S_OK; } + +/*********************************************************************** + * PropStgNameToFmtId [coml2.@] + */ +HRESULT WINAPI PropStgNameToFmtId(const LPOLESTR str, FMTID *rfmtid) +{ + HRESULT hr = STG_E_INVALIDNAME; + + TRACE("%s, %p\n", debugstr_w(str), rfmtid); + + if (!rfmtid) return E_INVALIDARG; + if (!str) return STG_E_INVALIDNAME; + + if (!lstrcmpiW(str, szDocSummaryInfo)) + { + *rfmtid = FMTID_DocSummaryInformation; + hr = S_OK; + } + else if (!lstrcmpiW(str, szSummaryInfo)) + { + *rfmtid = FMTID_SummaryInformation; + hr = S_OK; + } + else + { + ULONG bits; + BYTE *fmtptr = (BYTE *)rfmtid - 1; + const WCHAR *pstr = str; + + memset(rfmtid, 0, sizeof(*rfmtid)); + for (bits = 0; bits < sizeof(FMTID) * BITS_PER_BYTE; + bits += BITS_IN_CHARMASK) + { + ULONG bitsUsed = bits % BITS_PER_BYTE, bitsStored; + WCHAR wc; + + if (bitsUsed == 0) + fmtptr++; + wc = *++pstr - 'A'; + if (wc > NUM_ALPHA_CHARS) + { + wc += 'A' - 'a'; + if (wc > NUM_ALPHA_CHARS) + { + wc += 'a' - '0' + NUM_ALPHA_CHARS; + if (wc > CHARMASK) + { + WARN("invalid character (%d)\n", *pstr); + goto end; + } + } + } + *fmtptr |= wc << bitsUsed; + bitsStored = min(BITS_PER_BYTE - bitsUsed, BITS_IN_CHARMASK); + if (bitsStored < BITS_IN_CHARMASK) + { + wc >>= BITS_PER_BYTE - bitsUsed; + if (bits + bitsStored == sizeof(FMTID) * BITS_PER_BYTE) + { + if (wc != 0) + { + WARN("extra bits\n"); + goto end; + } + break; + } + fmtptr++; + *fmtptr |= (BYTE)wc; + } + } + hr = S_OK; + } +end: + return hr; +} diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index db998e6d30a..66b12f3ae9e 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2994,100 +2994,6 @@ static const IPropertyStorageVtbl IPropertyStorage_Vtbl = IPropertyStorage_fnStat, }; -/*********************************************************************** - * Format ID <-> name conversion - */ -static const WCHAR szSummaryInfo[] = L"\5SummaryInformation"; -static const WCHAR szDocSummaryInfo[] = L"\5DocumentSummaryInformation"; - -#define BITS_PER_BYTE 8 -#define CHARMASK 0x1f -#define BITS_IN_CHARMASK 5 -#define NUM_ALPHA_CHARS 26 - -/*********************************************************************** - * PropStgNameToFmtId [ole32.@] - * Returns the format ID corresponding to the given name. - * PARAMS - * str [I] Storage name to convert to a format ID. - * rfmtid [O] Format ID corresponding to str. - * - * RETURNS - * E_INVALIDARG if rfmtid or str is NULL or if str can't be converted to - * a format ID, S_OK otherwise. - */ -HRESULT WINAPI PropStgNameToFmtId(const LPOLESTR str, FMTID *rfmtid) -{ - HRESULT hr = STG_E_INVALIDNAME; - - TRACE("%s, %p\n", debugstr_w(str), rfmtid); - - if (!rfmtid) return E_INVALIDARG; - if (!str) return STG_E_INVALIDNAME; - - if (!lstrcmpiW(str, szDocSummaryInfo)) - { - *rfmtid = FMTID_DocSummaryInformation; - hr = S_OK; - } - else if (!lstrcmpiW(str, szSummaryInfo)) - { - *rfmtid = FMTID_SummaryInformation; - hr = S_OK; - } - else - { - ULONG bits; - BYTE *fmtptr = (BYTE *)rfmtid - 1; - const WCHAR *pstr = str; - - memset(rfmtid, 0, sizeof(*rfmtid)); - for (bits = 0; bits < sizeof(FMTID) * BITS_PER_BYTE; - bits += BITS_IN_CHARMASK) - { - ULONG bitsUsed = bits % BITS_PER_BYTE, bitsStored; - WCHAR wc; - - if (bitsUsed == 0) - fmtptr++; - wc = *++pstr - 'A'; - if (wc > NUM_ALPHA_CHARS) - { - wc += 'A' - 'a'; - if (wc > NUM_ALPHA_CHARS) - { - wc += 'a' - '0' + NUM_ALPHA_CHARS; - if (wc > CHARMASK) - { - WARN("invalid character (%d)\n", *pstr); - goto end; - } - } - } - *fmtptr |= wc << bitsUsed; - bitsStored = min(BITS_PER_BYTE - bitsUsed, BITS_IN_CHARMASK); - if (bitsStored < BITS_IN_CHARMASK) - { - wc >>= BITS_PER_BYTE - bitsUsed; - if (bits + bitsStored == sizeof(FMTID) * BITS_PER_BYTE) - { - if (wc != 0) - { - WARN("extra bits\n"); - goto end; - } - break; - } - fmtptr++; - *fmtptr |= (BYTE)wc; - } - } - hr = S_OK; - } -end: - return hr; -} - #ifdef __i386__ /* thiscall functions are i386-specific */ #define DEFINE_STDCALL_WRAPPER(num,func,args) \

1 0

Alexandre Julliard : ntdll: Use posix_spawn() to start the server.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 48182726e93be7a573c989c822b52eb56d5fbad9 URL: https://gitlab.winehq.org/wine/wine/-/commit/48182726e93be7a573c989c822b52e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 6 11:38:45 2023 +0100 ntdll: Use posix_spawn() to start the server. Based on a patch by Brendan Shanks. --- dlls/ntdll/unix/loader.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 7b7005d282d..ee71584b953 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -30,6 +30,7 @@ #include <stdarg.h> #include <stdio.h> #include <signal.h> +#include <spawn.h> #include <string.h> #include <stdlib.h> #include <sys/types.h> @@ -69,7 +70,6 @@ # include <mach/mach_error.h> # include <mach-o/getsect.h> # include <crt_externs.h> -# include <spawn.h> # ifndef _POSIX_SPAWN_DISABLE_ASLR # define _POSIX_SPAWN_DISABLE_ASLR 0x0100 # endif @@ -77,6 +77,7 @@ #ifdef __ANDROID__ # include <jni.h> #endif +extern char **environ; #include "ntstatus.h" #define WIN32_NO_STATUS @@ -309,11 +310,14 @@ static char *build_path( const char *dir, const char *name ) /* build a path to a binary and exec it */ -static void build_path_and_exec( const char *dir, const char *name, char **argv ) +static int build_path_and_exec( pid_t *pid, const char *dir, const char *name, char **argv ) { + int ret; + argv[0] = build_path( dir, name ); - execv( argv[0], argv ); + ret = posix_spawn( pid, argv[0], NULL, NULL, argv, environ ); free( argv[0] ); + return ret; } @@ -567,7 +571,7 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i * * Exec a new wine server. */ -static void exec_wineserver( char **argv ) +static int exec_wineserver( pid_t *pid, char **argv ) { char *path; @@ -576,22 +580,20 @@ static void exec_wineserver( char **argv ) if (!is_win64) /* look for 64-bit server */ { char *loader = realpath_dirname( build_path( build_dir, "loader/wine64" )); - if (loader) build_path_and_exec( loader, "../server/wineserver", argv ); + if (loader && !build_path_and_exec( pid, loader, "../server/wineserver", argv )) return 0; } - build_path_and_exec( build_dir, "server/wineserver", argv ); - return; + return build_path_and_exec( pid, build_dir, "server/wineserver", argv ); } - build_path_and_exec( bin_dir, "wineserver", argv ); - - if ((path = getenv( "WINESERVER" ))) build_path_and_exec( "", path, argv ); + if (!build_path_and_exec( pid, bin_dir, "wineserver", argv )) return 0; + if ((path = getenv( "WINESERVER" )) && !build_path_and_exec( pid, "", path, argv )) return 0; if ((path = getenv( "PATH" ))) { for (path = strtok( strdup( path ), ":" ); path; path = strtok( NULL, ":" )) - build_path_and_exec( path, "wineserver", argv ); + if (!build_path_and_exec( pid, path, "wineserver", argv )) return 0; } - build_path_and_exec( BINDIR, "wineserver", argv ); + return build_path_and_exec( pid, BINDIR, "wineserver", argv ); } @@ -609,15 +611,11 @@ void start_server( BOOL debug ) if (!started) { int status; - int pid = fork(); - if (pid == -1) fatal_error( "fork: %s", strerror(errno) ); - if (!pid) - { - argv[1] = debug ? debug_flag : NULL; - argv[2] = NULL; - exec_wineserver( argv ); - fatal_error( "could not exec wineserver\n" ); - } + pid_t pid; + + argv[1] = debug ? debug_flag : NULL; + argv[2] = NULL; + if (exec_wineserver( &pid, argv )) fatal_error( "could not exec wineserver\n" ); waitpid( pid, &status, 0 ); status = WIFEXITED(status) ? WEXITSTATUS(status) : 1; if (status == 2) return; /* server lock held by someone else, will retry later */

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.10.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 23111d625b21b50f4195cd4deff8b180d6b7dd24 URL: https://gitlab.winehq.org/wine/wine/-/commit/23111d625b21b50f4195cd4deff8b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 6 16:15:53 2023 +0100 vkd3d: Import upstream release 1.10. --- libs/vkd3d/AUTHORS | 3 + libs/vkd3d/Makefile.in | 1 - libs/vkd3d/config.h | 4 +- libs/vkd3d/include/private/vkd3d_common.h | 23 +- libs/vkd3d/include/vkd3d.h | 1 + libs/vkd3d/include/vkd3d_shader.h | 170 +- libs/vkd3d/libs/vkd3d-common/blob.c | 1 + libs/vkd3d/libs/vkd3d-shader/d3d_asm.c | 139 +- libs/vkd3d/libs/vkd3d-shader/d3dbc.c | 142 +- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 162 +- libs/vkd3d/libs/vkd3d-shader/dxil.c | 3268 ++++++++++++++++++-- libs/vkd3d/libs/vkd3d-shader/hlsl.c | 355 ++- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 110 +- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 57 +- libs/vkd3d/libs/vkd3d-shader/hlsl.y | 703 ++++- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 1186 +++++-- libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 417 ++- libs/vkd3d/libs/vkd3d-shader/ir.c | 651 +++- libs/vkd3d/libs/vkd3d-shader/spirv.c | 931 ++++-- libs/vkd3d/libs/vkd3d-shader/tpf.c | 1718 +++++----- libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 294 +- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 233 +- libs/vkd3d/libs/vkd3d/command.c | 356 ++- libs/vkd3d/libs/vkd3d/device.c | 453 ++- libs/vkd3d/libs/vkd3d/resource.c | 121 +- libs/vkd3d/libs/vkd3d/state.c | 413 ++- libs/vkd3d/libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 61 +- libs/vkd3d/libs/vkd3d/vkd3d_shaders.h | 568 ++-- 29 files changed, 9597 insertions(+), 2948 deletions(-)

1 0

Nikolay Sivov : include: Add missing enum to wdm.h.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: dbeaaf2b0fa4bab687b434a23f258088c07a7fd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbeaaf2b0fa4bab687b434a23f2580… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 5 21:27:13 2023 +0100 include: Add missing enum to wdm.h. --- include/ddk/wdm.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 7dcec028a50..54b9e6aa199 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1657,8 +1657,12 @@ static inline void IoCopyCurrentIrpStackLocationToNext(IRP *irp) next->Control = 0; } -#define KernelMode 0 -#define UserMode 1 +typedef enum _MODE +{ + KernelMode, + UserMode, + MaximumMode +} MODE; /* directory object access rights */ #define DIRECTORY_QUERY 0x0001

1 0

Fabian Maurer : coml2: Move StgIsStorageFile from ole32.
by Alexandre Julliard Dec. 6, 2023

Dec. 6, 2023

Module: wine Branch: master Commit: 7478f15f98a98eac5f6e5b099b917cf5682b72a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/7478f15f98a98eac5f6e5b099b917c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 3 23:18:45 2023 +0100 coml2: Move StgIsStorageFile from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/storage32.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/storage32.c | 49 ------------------------------------------------- 3 files changed, 43 insertions(+), 50 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index d6b24669f22..364413dbf4d 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -22,7 +22,7 @@ @ stub StgCreatePropSetStg @ stub StgCreatePropStg @ stub StgCreateStorageEx -@ stub StgIsStorageFile +@ stdcall StgIsStorageFile(wstr) @ stdcall StgIsStorageILockBytes(ptr) @ stub StgOpenPropStg @ stub StgOpenStorage diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c index 873e9fea0e1..dd803c817c9 100644 --- a/dlls/coml2/storage32.c +++ b/dlls/coml2/storage32.c @@ -184,3 +184,45 @@ HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt) return S_FALSE; } + +/****************************************************************************** + * StgIsStorageFile [coml2.@] + */ +HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn) +{ + HANDLE hf; + BYTE magic[8]; + DWORD bytes_read; + + TRACE("%s\n", debugstr_w(fn)); + hf = CreateFileW(fn, GENERIC_READ, + FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + + if (hf == INVALID_HANDLE_VALUE) + return STG_E_FILENOTFOUND; + + if (!ReadFile(hf, magic, 8, &bytes_read, NULL)) + { + WARN(" unable to read file\n"); + CloseHandle(hf); + return S_FALSE; + } + + CloseHandle(hf); + + if (bytes_read != 8) + { + TRACE(" too short\n"); + return S_FALSE; + } + + if (!memcmp(magic, STORAGE_magic, 8)) + { + TRACE(" -> YES\n"); + return S_OK; + } + + TRACE(" -> Invalid header.\n"); + return S_FALSE; +} diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 496159773a3..f0ec0b5e954 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9339,55 +9339,6 @@ end: return r; } -/****************************************************************************** - * StgIsStorageFile [OLE32.@] - * Verify if the file contains a storage object - * - * PARAMS - * fn [ I] Filename - * - * RETURNS - * S_OK if file has magic bytes as a storage object - * S_FALSE if file is not storage - */ -HRESULT WINAPI -StgIsStorageFile(LPCOLESTR fn) -{ - HANDLE hf; - BYTE magic[8]; - DWORD bytes_read; - - TRACE("%s\n", debugstr_w(fn)); - hf = CreateFileW(fn, GENERIC_READ, - FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - - if (hf == INVALID_HANDLE_VALUE) - return STG_E_FILENOTFOUND; - - if (!ReadFile(hf, magic, 8, &bytes_read, NULL)) - { - WARN(" unable to read file\n"); - CloseHandle(hf); - return S_FALSE; - } - - CloseHandle(hf); - - if (bytes_read != 8) { - TRACE(" too short\n"); - return S_FALSE; - } - - if (!memcmp(magic,STORAGE_magic,8)) { - TRACE(" -> YES\n"); - return S_OK; - } - - TRACE(" -> Invalid header.\n"); - return S_FALSE; -} - /************************************************************************ * OleConvert Functions ***********************************************************************/

1 0