wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Rémi Bernon : dmusic: Use the IDirectMusicObject interface for waves.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: 80e6310a884f59c1faeccc441aa808888ab0898b URL: https://gitlab.winehq.org/wine/wine/-/commit/80e6310a884f59c1faeccc441aa808… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 17 13:08:38 2023 +0200 dmusic: Use the IDirectMusicObject interface for waves. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmime/wavetrack.c | 6 +++--- dlls/dmusic/collection.c | 8 ++++---- dlls/dmusic/dmusic_private.h | 2 +- dlls/dmusic/dmusic_wave.h | 11 ++++++----- dlls/dmusic/instrument.c | 4 ++-- dlls/dmusic/wave.c | 35 ++++++++++++++++++++--------------- 6 files changed, 36 insertions(+), 30 deletions(-)

1 0

Rémi Bernon : dmusic: Implement IDirectMusicObject interface on wave objects.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: dc0431b8190b09aefa9991810c28f658802cd730 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc0431b8190b09aefa9991810c28f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 17 11:46:17 2023 +0200 dmusic: Implement IDirectMusicObject interface on wave objects. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmusic/wave.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 119 insertions(+), 12 deletions(-) diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c index ef1cd2990ff..e5e7c4dc2a0 100644 --- a/dlls/dmusic/wave.c +++ b/dlls/dmusic/wave.c @@ -32,6 +32,7 @@ C_ASSERT(sizeof(struct sample) == offsetof(struct sample, loops[0])); struct wave { IUnknown IUnknown_iface; + struct dmobject dmobj; LONG ref; struct sample *sample; @@ -58,6 +59,20 @@ static HRESULT WINAPI wave_QueryInterface(IUnknown *iface, REFIID riid, void **r return S_OK; } + if (IsEqualIID(riid, &IID_IDirectMusicObject)) + { + *ret_iface = &This->dmobj.IDirectMusicObject_iface; + IDirectMusicObject_AddRef(&This->dmobj.IDirectMusicObject_iface); + return S_OK; + } + + if (IsEqualIID(riid, &IID_IPersistStream)) + { + *ret_iface = &This->dmobj.IPersistStream_iface; + IDirectMusicObject_AddRef(&This->dmobj.IPersistStream_iface); + return S_OK; + } + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); *ret_iface = NULL; return E_NOINTERFACE; @@ -96,18 +111,6 @@ static const IUnknownVtbl unknown_vtbl = wave_Release, }; -static HRESULT wave_create(IUnknown **ret_iface) -{ - struct wave *obj; - - if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; - obj->IUnknown_iface.lpVtbl = &unknown_vtbl; - obj->ref = 1; - - *ret_iface = &obj->IUnknown_iface; - return S_OK; -} - static HRESULT parse_wsmp_chunk(struct wave *This, IStream *stream, struct chunk_entry *chunk) { struct sample *sample; @@ -167,6 +170,110 @@ static HRESULT parse_wave_chunk(struct wave *This, IStream *stream, struct chunk return hr; } +static HRESULT WINAPI wave_object_ParseDescriptor(IDirectMusicObject *iface, + IStream *stream, DMUS_OBJECTDESC *desc) +{ + struct chunk_entry chunk = {0}; + HRESULT hr; + + TRACE("(%p, %p, %p)\n", iface, stream, desc); + + if (!stream || !desc) return E_POINTER; + + if ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + { + switch (MAKE_IDTYPE(chunk.id, chunk.type)) + { + case MAKE_IDTYPE(FOURCC_RIFF, mmioFOURCC('W','A','V','E')): + hr = dmobj_parsedescriptor(stream, &chunk, desc, + DMUS_OBJ_NAME_INFO | DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION); + break; + + default: + WARN("Invalid wave chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); + hr = DMUS_E_CHUNKNOTFOUND; + break; + } + } + + if (FAILED(hr)) return hr; + + TRACE("returning descriptor:\n"); + dump_DMUS_OBJECTDESC(desc); + return S_OK; +} + +static const IDirectMusicObjectVtbl wave_object_vtbl = +{ + dmobj_IDirectMusicObject_QueryInterface, + dmobj_IDirectMusicObject_AddRef, + dmobj_IDirectMusicObject_Release, + dmobj_IDirectMusicObject_GetDescriptor, + dmobj_IDirectMusicObject_SetDescriptor, + wave_object_ParseDescriptor, +}; + +static inline struct wave *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, struct wave, dmobj.IPersistStream_iface); +} + +static HRESULT WINAPI wave_persist_stream_Load(IPersistStream *iface, IStream *stream) +{ + struct wave *This = impl_from_IPersistStream(iface); + struct chunk_entry chunk = {0}; + HRESULT hr; + + TRACE("(%p, %p)\n", This, stream); + + if (!stream) return E_POINTER; + + if ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + { + switch (MAKE_IDTYPE(chunk.id, chunk.type)) + { + case MAKE_IDTYPE(FOURCC_RIFF, mmioFOURCC('W','A','V','E')): + hr = parse_wave_chunk(This, stream, &chunk); + break; + + default: + WARN("Invalid wave chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); + hr = DMUS_E_UNSUPPORTED_STREAM; + break; + } + } + + stream_skip_chunk(stream, &chunk); + return hr; +} + +static const IPersistStreamVtbl wave_persist_stream_vtbl = +{ + dmobj_IPersistStream_QueryInterface, + dmobj_IPersistStream_AddRef, + dmobj_IPersistStream_Release, + dmobj_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, + wave_persist_stream_Load, + unimpl_IPersistStream_Save, + unimpl_IPersistStream_GetSizeMax, +}; + +static HRESULT wave_create(IUnknown **ret_iface) +{ + struct wave *obj; + + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; + obj->IUnknown_iface.lpVtbl = &unknown_vtbl; + obj->ref = 1; + dmobject_init(&obj->dmobj, &CLSID_DirectSoundWave, &obj->IUnknown_iface); + obj->dmobj.IDirectMusicObject_iface.lpVtbl = &wave_object_vtbl; + obj->dmobj.IPersistStream_iface.lpVtbl = &wave_persist_stream_vtbl; + + *ret_iface = &obj->IUnknown_iface; + return S_OK; +} + HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry *parent, IUnknown **ret_iface) { struct wave *This;

1 0

Rémi Bernon : dmime: Return hr from wave track SetParam GUID_DownloadToAudioPath.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: b1bfc52676cbb41e3fbc0f114588acc486028c7d URL: https://gitlab.winehq.org/wine/wine/-/commit/b1bfc52676cbb41e3fbc0f114588ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 17 11:29:18 2023 +0200 dmime: Return hr from wave track SetParam GUID_DownloadToAudioPath. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmime/wavetrack.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 79169a2a6fa..fcf57c1148d 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -273,6 +273,8 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ } } } + + return hr; } if (IsEqualGUID(type, &GUID_Enable_Auto_Download)) { FIXME("GUID_Enable_Auto_Download not handled yet\n");

1 0

Rémi Bernon : dmime: Return S_OK from wave track SetParam GUID_UnloadFromAudioPath.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: 0431c88a9dffce2bd9360fc412e26ef913f8f974 URL: https://gitlab.winehq.org/wine/wine/-/commit/0431c88a9dffce2bd9360fc412e26e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 17 11:28:42 2023 +0200 dmime: Return S_OK from wave track SetParam GUID_UnloadFromAudioPath. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmime/wavetrack.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index def1e59fb23..79169a2a6fa 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -296,6 +296,8 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ item->buffer = NULL; } } + + return S_OK; } return DMUS_E_TYPE_UNSUPPORTED;

1 0

Rémi Bernon : dmime: Avoid crashing when purging notification messages.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: 4d0c3d89a46029697cbc5414fc882cae3136b3d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d0c3d89a46029697cbc5414fc882c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 17 11:23:16 2023 +0200 dmime: Avoid crashing when purging notification messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmime/performance.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a8fcd869331..a2e611523a6 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1783,6 +1783,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, do { previous = LIST_ENTRY(list_head(&This->notifications), struct message, entry); + if (This->notification_timeout <= 0) break; /* negative values may be used to keep everything */ if (message->msg.rtTime - previous->msg.rtTime <= This->notification_timeout) break; list_remove(&previous->entry); list_init(&previous->entry);

1 0

Jacek Caban : d2d1: Don't cast D2D1_THREADING_MODE to D2D1_FACTORY_TYPE in D2D1CreateDevice.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: 6239db72ed4f00eb0c84105ed51fcea64b60bab3 URL: https://gitlab.winehq.org/wine/wine/-/commit/6239db72ed4f00eb0c84105ed51fce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 10:23:37 2023 +0200 d2d1: Don't cast D2D1_THREADING_MODE to D2D1_FACTORY_TYPE in D2D1CreateDevice. --- dlls/d2d1/factory.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index fff9895e930..3b2b1f5e4ec 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -1308,6 +1308,7 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, { D2D1_CREATION_PROPERTIES default_properties = {0}; D2D1_FACTORY_OPTIONS factory_options; + D2D1_FACTORY_TYPE factory_type; ID3D11Device *d3d_device; ID2D1Factory1 *factory; HRESULT hr; @@ -1325,9 +1326,20 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, properties = &default_properties; } + switch (properties->threadingMode) + { + case D2D1_THREADING_MODE_SINGLE_THREADED: + factory_type = D2D1_FACTORY_TYPE_SINGLE_THREADED; + break; + case D2D1_THREADING_MODE_MULTI_THREADED: + factory_type = D2D1_FACTORY_TYPE_MULTI_THREADED; + break; + default: + return E_INVALIDARG; + } + factory_options.debugLevel = properties->debugLevel; - if (FAILED(hr = D2D1CreateFactory(properties->threadingMode, - &IID_ID2D1Factory1, &factory_options, (void **)&factory))) + if (FAILED(hr = D2D1CreateFactory(factory_type, &IID_ID2D1Factory1, &factory_options, (void **)&factory))) return hr; hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, device);

1 0

Jacek Caban : d2d1: Pass interpolation mode as D2D1_INTERPOLATION_MODE to d2d_device_context_draw_bitmap.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: f319d4ce8edb1803f536858f745372c4bfb0788b URL: https://gitlab.winehq.org/wine/wine/-/commit/f319d4ce8edb1803f536858f745372… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 22:30:48 2023 +0200 d2d1: Pass interpolation mode as D2D1_INTERPOLATION_MODE to d2d_device_context_draw_bitmap. --- dlls/d2d1/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index a8993e79d4d..e5548878ee9 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2544,8 +2544,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawImage(ID2D1DeviceContext1 * if (SUCCEEDED(ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap))) { - d2d_device_context_draw_bitmap(context, bitmap, NULL, 1.0f, d2d1_1_interp_mode_from_d2d1(interpolation_mode), - image_rect, target_offset, NULL); + d2d_device_context_draw_bitmap(context, bitmap, NULL, 1.0f, interpolation_mode, image_rect, target_offset, NULL); ID2D1Bitmap_Release(bitmap); return;

1 0

Jacek Caban : d2d1/tests: Use D2D1_INTERPOLATION_MODE constants in DrawImage calls.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: a07fbb93072ff236ea3782f65a22dd76c765483b URL: https://gitlab.winehq.org/wine/wine/-/commit/a07fbb93072ff236ea3782f65a22dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 22:28:44 2023 +0200 d2d1/tests: Use D2D1_INTERPOLATION_MODE constants in DrawImage calls. --- dlls/d2d1/tests/d2d1.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 024886706c3..58f905ca1dc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2266,41 +2266,41 @@ static void test_bitmap_brush(BOOL d3d11) /* Crash on Windows 7+ */ if (0) { - ID2D1DeviceContext_DrawImage(context, NULL, NULL, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, NULL, NULL, NULL, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); } - ID2D1DeviceContext_DrawImage(context, image, NULL, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, NULL, NULL, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); set_rect(&src_rect, 0.0f, 0.0f, image_size.width, image_size.height); - ID2D1DeviceContext_DrawImage(context, image, NULL, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, NULL, &src_rect, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); offset.x = -1; offset.y = -1; - ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); offset.x = image_size.width * 2; offset.y = image_size.height; - ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, NULL, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); offset.x = image_size.width * 3; set_rect(&src_rect, image_size.width / 2, image_size.height / 2, image_size.width, image_size.height); - ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); offset.x = image_size.width * 4; set_rect(&src_rect, 0.0f, 0.0f, image_size.width * 2, image_size.height * 2); - ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); offset.x = image_size.width * 5; set_rect(&src_rect, image_size.width, image_size.height, 0.0f, 0.0f); - ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); @@ -2312,7 +2312,7 @@ static void test_bitmap_brush(BOOL d3d11) offset.x = image_size.width * 6; set_rect(&src_rect, 1.0f, 0.0f, 1.0f, image_size.height); - ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + ID2D1DeviceContext_DrawImage(context, image, &offset, &src_rect, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR, D2D1_COMPOSITE_MODE_SOURCE_OVER); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);

1 0

Alexandre Julliard : shlwapi: Remove unneeded UNALIGNED attributes.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: 6289a5848b4745a2f0a086fce51195ca08b81992 URL: https://gitlab.winehq.org/wine/wine/-/commit/6289a5848b4745a2f0a086fce51195… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 12:44:51 2023 +0200 shlwapi: Remove unneeded UNALIGNED attributes. They are causing compiler warnings. --- dlls/shlwapi/ordinal.c | 4 ++-- dlls/shlwapi/tests/ordinal.c | 10 +++++----- include/shlwapi.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index bf43a17fba2..f99dbf795ff 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4282,7 +4282,7 @@ HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey, * failure: 0 * */ -INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, +INT WINAPI SHFormatDateTimeW(const FILETIME *fileTime, DWORD *flags, LPWSTR buf, UINT size) { #define SHFORMATDT_UNSUPPORTED_FLAGS (FDTF_RELATIVE | FDTF_LTRDATE | FDTF_RTLDATE | FDTF_NOAUTOREADINGORDER) @@ -4346,7 +4346,7 @@ INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, * See SHFormatDateTimeW. * */ -INT WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *fileTime, DWORD *flags, +INT WINAPI SHFormatDateTimeA(const FILETIME *fileTime, DWORD *flags, LPSTR buf, UINT size) { WCHAR *bufW; diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 676a537744d..474c447686d 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -51,8 +51,8 @@ static HRESULT(WINAPI *pIConnectionPoint_InvokeWithCancel)(IConnectionPoint*,DIS static HRESULT(WINAPI *pConnectToConnectionPoint)(IUnknown*,REFIID,BOOL,IUnknown*, LPDWORD,IConnectionPoint **); static HRESULT(WINAPI *pSHPropertyBag_ReadLONG)(IPropertyBag *,LPCWSTR,LPLONG); static LONG (WINAPI *pSHSetWindowBits)(HWND, INT, UINT, UINT); -static INT (WINAPI *pSHFormatDateTimeA)(const FILETIME UNALIGNED*, DWORD*, LPSTR, UINT); -static INT (WINAPI *pSHFormatDateTimeW)(const FILETIME UNALIGNED*, DWORD*, LPWSTR, UINT); +static INT (WINAPI *pSHFormatDateTimeA)(const FILETIME*, DWORD*, LPSTR, UINT); +static INT (WINAPI *pSHFormatDateTimeW)(const FILETIME*, DWORD*, LPWSTR, UINT); static DWORD (WINAPI *pSHGetObjectCompatFlags)(IUnknown*, const CLSID*); static BOOL (WINAPI *pGUIDFromStringA)(LPSTR, CLSID *); static HRESULT (WINAPI *pIUnknown_QueryServiceExec)(IUnknown*, REFIID, const GUID*, DWORD, DWORD, VARIANT*, VARIANT*); @@ -1668,8 +1668,8 @@ static void test_SHSetWindowBits(void) static void test_SHFormatDateTimeA(const SYSTEMTIME *st) { - FILETIME UNALIGNED filetime; - FILETIME UNALIGNED filetimeCheck; + FILETIME filetime; + FILETIME filetimeCheck; SYSTEMTIME universalSystemTime; CHAR buff[100], buff2[100], buff3[100]; BOOL dstMatch; @@ -1837,7 +1837,7 @@ static void test_SHFormatDateTimeA(const SYSTEMTIME *st) static void test_SHFormatDateTimeW(void) { - FILETIME UNALIGNED filetime; + FILETIME filetime; SYSTEMTIME universalSystemTime; WCHAR buff[100], buff2[100], buff3[100], *p1, *p2; SYSTEMTIME st; diff --git a/include/shlwapi.h b/include/shlwapi.h index 15615786c4a..aafbdd3870b 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1166,8 +1166,8 @@ WINSHLWAPI BOOL WINAPI IsOS(DWORD); #define FDTF_RTLDATE 0x00000200 #define FDTF_NOAUTOREADINGORDER 0x00000400 -WINSHLWAPI int WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *filetime, DWORD *flags, LPSTR buffer, UINT size); -WINSHLWAPI int WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *filetime, DWORD *flags, LPWSTR buffer, UINT size); +WINSHLWAPI int WINAPI SHFormatDateTimeA(const FILETIME *filetime, DWORD *flags, LPSTR buffer, UINT size); +WINSHLWAPI int WINAPI SHFormatDateTimeW(const FILETIME *filetime, DWORD *flags, LPWSTR buffer, UINT size); typedef struct {

1 0

Alexandre Julliard : winebuild: Always use .balign for alignment.
by Alexandre Julliard 20 Oct '23

20 Oct '23

Module: wine Branch: master Commit: 9a4e41c45d30c5850d6f42b3c2e3ce6c9b3d8910 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a4e41c45d30c5850d6f42b3c2e3ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 11:59:26 2023 +0200 winebuild: Always use .balign for alignment. It seems to be portable enough nowadays. --- tools/winebuild/build.h | 1 - tools/winebuild/import.c | 22 +++++++++++----------- tools/winebuild/relay.c | 2 +- tools/winebuild/res32.c | 4 ++-- tools/winebuild/spec16.c | 10 +++++----- tools/winebuild/spec32.c | 24 ++++++++++++------------ tools/winebuild/utils.c | 49 +----------------------------------------------- 7 files changed, 32 insertions(+), 80 deletions(-)

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
71
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 October 2023