October 2023 - Wine-Commits

Rémi Bernon : dmime: Implement GUID_(Download|Unload)FromAudioPath for wave track.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 4a7a8a7ecc8bc259da58470a7e4be64b9ba2cd8e URL: https://gitlab.winehq.org/wine/wine/-/commit/4a7a8a7ecc8bc259da58470a7e4be6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 25 11:21:38 2023 +0200 dmime: Implement GUID_(Download|Unload)FromAudioPath for wave track. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=9027 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34751 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45135 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48220 --- dlls/dmime/dmime_private.h | 2 ++ dlls/dmime/performance.c | 14 ++++++++++ dlls/dmime/wavetrack.c | 70 ++++++++++++++++++++++++++++++++++++++++------ dlls/dmusic/dmusic_wave.h | 1 + dlls/dmusic/wave.c | 39 ++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 8 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 636004aed84..c1f777f3949 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -80,6 +80,8 @@ extern HRESULT segment_state_end_play(IDirectMusicSegmentState *iface); extern HRESULT wave_track_create_from_chunk(IStream *stream, struct chunk_entry *parent, IDirectMusicTrack8 **ret_iface); +extern HRESULT performance_get_dsound(IDirectMusicPerformance8 *iface, IDirectSound **dsound); + /***************************************************************************** * Auxiliary definitions */ diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 327f7d88c3b..84b4b4b8575 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1731,3 +1731,17 @@ HRESULT create_dmperformance(REFIID iid, void **ret_iface) IDirectMusicPerformance_Release(&obj->IDirectMusicPerformance8_iface); return hr; } + +static inline struct performance *unsafe_impl_from_IDirectMusicPerformance8(IDirectMusicPerformance8 *iface) +{ + if (iface->lpVtbl != &performance_vtbl) return NULL; + return CONTAINING_RECORD(iface, struct performance, IDirectMusicPerformance8_iface); +} + +HRESULT performance_get_dsound(IDirectMusicPerformance8 *iface, IDirectSound **dsound) +{ + struct performance *This = unsafe_impl_from_IDirectMusicPerformance8(iface); + if (!This || !(*dsound = This->dsound)) return E_FAIL; + IDirectSound_AddRef(*dsound); + return S_OK; +} diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index d9d6334adad..7c72065520a 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -25,6 +25,7 @@ struct wave_item { struct list entry; DMUS_IO_WAVE_ITEM_HEADER header; IUnknown *object; + IDirectSoundBuffer *buffer; }; struct wave_part { @@ -97,13 +98,18 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) struct wave_item *item, *item2; struct wave_part *part, *part2; - LIST_FOR_EACH_ENTRY_SAFE(part, part2, &This->parts, struct wave_part, entry) { + LIST_FOR_EACH_ENTRY_SAFE(part, part2, &This->parts, struct wave_part, entry) + { list_remove(&part->entry); - LIST_FOR_EACH_ENTRY_SAFE(item, item2, &part->items, struct wave_item, entry) { + + LIST_FOR_EACH_ENTRY_SAFE(item, item2, &part->items, struct wave_item, entry) + { list_remove(&item->entry); + if (item->buffer) IDirectSoundBuffer_Release(item->buffer); if (item->object) IUnknown_Release(item->object); free(item); } + free(part); } @@ -171,9 +177,46 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ FIXME("GUID_Download not handled yet\n"); return S_OK; } - if (IsEqualGUID(type, &GUID_DownloadToAudioPath)) { - FIXME("GUID_DownloadToAudioPath not handled yet\n"); - return S_OK; + if (IsEqualGUID(type, &GUID_DownloadToAudioPath)) + { + IDirectMusicPerformance8 *performance; + IDirectMusicAudioPath *audio_path; + IUnknown *object = param; + struct wave_part *part; + struct wave_item *item; + IDirectSound *dsound; + HRESULT hr; + + if (FAILED(hr = IDirectMusicAudioPath_QueryInterface(object, &IID_IDirectMusicPerformance8, (void **)&performance)) + && SUCCEEDED(hr = IDirectMusicAudioPath_QueryInterface(object, &IID_IDirectMusicAudioPath, (void **)&audio_path))) + { + hr = IDirectMusicAudioPath_GetObjectInPath(audio_path, DMUS_PCHANNEL_ALL, DMUS_PATH_PERFORMANCE, 0, + &GUID_All_Objects, 0, &IID_IDirectMusicPerformance8, (void **)&performance); + IDirectMusicAudioPath_Release(audio_path); + } + + if (SUCCEEDED(hr)) + hr = performance_get_dsound(performance, &dsound); + IDirectMusicPerformance_Release(performance); + + if (FAILED(hr)) + { + WARN("Failed to get direct sound from param %p, hr %#lx\n", param, hr); + return hr; + } + + LIST_FOR_EACH_ENTRY(part, &This->parts, struct wave_part, entry) + { + LIST_FOR_EACH_ENTRY(item, &part->items, struct wave_item, entry) + { + if (item->buffer) continue; + if (FAILED(hr = wave_download_to_dsound(item->object, dsound, &item->buffer))) + { + WARN("Failed to download wave %p to direct sound, hr %#lx\n", item->object, hr); + return hr; + } + } + } } if (IsEqualGUID(type, &GUID_Enable_Auto_Download)) { FIXME("GUID_Enable_Auto_Download not handled yet\n"); @@ -183,9 +226,20 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ FIXME("GUID_Unload not handled yet\n"); return S_OK; } - if (IsEqualGUID(type, &GUID_UnloadFromAudioPath)) { - FIXME("GUID_UnloadFromAudioPath not handled yet\n"); - return S_OK; + if (IsEqualGUID(type, &GUID_UnloadFromAudioPath)) + { + struct wave_part *part; + struct wave_item *item; + + LIST_FOR_EACH_ENTRY(part, &This->parts, struct wave_part, entry) + { + LIST_FOR_EACH_ENTRY(item, &part->items, struct wave_item, entry) + { + if (!item->buffer) continue; + IDirectSoundBuffer_Release(item->buffer); + item->buffer = NULL; + } + } } return DMUS_E_TYPE_UNSUPPORTED; diff --git a/dlls/dmusic/dmusic_wave.h b/dlls/dmusic/dmusic_wave.h index 3f7209e250e..43396250261 100644 --- a/dlls/dmusic/dmusic_wave.h +++ b/dlls/dmusic/dmusic_wave.h @@ -32,4 +32,5 @@ struct chunk_entry; extern HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IUnknown **out); extern HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry *parent, IUnknown **out); extern HRESULT wave_download_to_port(IUnknown *iface, IDirectMusicPortDownload *port, DWORD *id); +extern HRESULT wave_download_to_dsound(IUnknown *iface, IDirectSound *dsound, IDirectSoundBuffer **ret_iface); extern HRESULT wave_get_duration(IUnknown *iface, REFERENCE_TIME *duration); diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c index 2f5e1409106..ef1cd2990ff 100644 --- a/dlls/dmusic/wave.c +++ b/dlls/dmusic/wave.c @@ -339,6 +339,45 @@ HRESULT wave_download_to_port(IUnknown *iface, IDirectMusicPortDownload *port, D return hr; } +HRESULT wave_download_to_dsound(IUnknown *iface, IDirectSound *dsound, IDirectSoundBuffer **ret_iface) +{ + struct wave *This = impl_from_IUnknown(iface); + DSBUFFERDESC desc = + { + .dwSize = sizeof(desc), + .dwBufferBytes = This->data_size, + .lpwfxFormat = This->format, + }; + IDirectSoundBuffer *buffer; + HRESULT hr; + void *data; + DWORD size; + + TRACE("%p, %p, %p\n", This, dsound, ret_iface); + + if (FAILED(hr = IDirectSound_CreateSoundBuffer(dsound, &desc, &buffer, NULL))) + { + WARN("Failed to create direct sound buffer, hr %#lx\n", hr); + return hr; + } + + if (SUCCEEDED(hr = IDirectSoundBuffer_Lock(buffer, 0, This->data_size, &data, &size, NULL, 0, 0))) + { + memcpy(data, This->data, This->data_size); + hr = IDirectSoundBuffer_Unlock(buffer, data, This->data_size, NULL, 0); + } + + if (FAILED(hr)) + { + WARN("Failed to download wave to dsound, hr %#lx\n", hr); + IDirectSoundBuffer_Release(buffer); + return hr; + } + + *ret_iface = buffer; + return S_OK; +} + HRESULT wave_get_duration(IUnknown *iface, REFERENCE_TIME *duration) { struct wave *This = impl_from_IUnknown(iface);

1 0

Arkadiusz Hiler : xinput1_3: Hold module reference while the hid thread is running.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 10a0a8eabc5882bf045ca08d4fc4768533e9a8dc URL: https://gitlab.winehq.org/wine/wine/-/commit/10a0a8eabc5882bf045ca08d4fc476… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Oct 10 13:08:12 2023 +0300 xinput1_3: Hold module reference while the hid thread is running. We have no means of stopping the thread from DllMain on DLL_PROCESS_DETACH without having a race condition - waiting on the thread itself is not an option due to the loader lock. The best we can do is just never unload the DLL as long as the thread is active which is forever. This fixes crashes in Mighty Switch Force! Collection while controllers are unplugged - the game loads and frees xinput in a loop. --- dlls/xinput1_3/main.c | 50 +++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 2abf33a8d45..e69553fba16 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -121,8 +121,6 @@ static struct xinput_controller controllers[XUSER_MAX_COUNT] = static HMODULE xinput_instance; static HANDLE start_event; -static HANDLE stop_event; -static HANDLE done_event; static HANDLE update_event; static BOOL find_opened_device(const WCHAR *device_path, int *free_slot) @@ -547,21 +545,6 @@ static void controller_destroy(struct xinput_controller *controller, BOOL alread LeaveCriticalSection(&controller->crit); } -static void stop_update_thread(void) -{ - int i; - - SetEvent(stop_event); - WaitForSingleObject(done_event, INFINITE); - - CloseHandle(start_event); - CloseHandle(stop_event); - CloseHandle(done_event); - CloseHandle(update_event); - - for (i = 0; i < XUSER_MAX_COUNT; i++) controller_destroy(&controllers[i], FALSE); -} - static LONG sign_extend(ULONG value, const HIDP_VALUE_CAPS *caps) { UINT sign = 1 << (caps->BitSize - 1); @@ -687,9 +670,9 @@ static LRESULT CALLBACK xinput_devnotify_wndproc(HWND hwnd, UINT msg, WPARAM wpa static DWORD WINAPI hid_update_thread_proc(void *param) { - struct xinput_controller *devices[XUSER_MAX_COUNT + 2]; - HANDLE events[XUSER_MAX_COUNT + 2]; - DWORD i, count = 2, ret = WAIT_TIMEOUT; + struct xinput_controller *devices[XUSER_MAX_COUNT + 1]; + HANDLE events[XUSER_MAX_COUNT + 1]; + DWORD i, count = 1, ret = WAIT_TIMEOUT; DEV_BROADCAST_DEVICEINTERFACE_W filter = { .dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE_W), @@ -721,7 +704,7 @@ static DWORD WINAPI hid_update_thread_proc(void *param) { if (ret == count) while (PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)) DispatchMessageW(&msg); if (ret == WAIT_TIMEOUT) update_controller_list(); - if (ret < count - 2) read_controller_state(devices[ret]); + if (ret < count - 1) read_controller_state(devices[ret]); count = 0; for (i = 0; i < XUSER_MAX_COUNT; ++i) @@ -737,33 +720,30 @@ static DWORD WINAPI hid_update_thread_proc(void *param) LeaveCriticalSection(&controllers[i].crit); } events[count++] = update_event; - events[count++] = stop_event; } - while ((ret = MsgWaitForMultipleObjectsEx(count, events, 2000, QS_ALLINPUT, MWMO_ALERTABLE)) < count - 1 || - ret == count || ret == WAIT_TIMEOUT); + while ((ret = MsgWaitForMultipleObjectsEx(count, events, 2000, QS_ALLINPUT, MWMO_ALERTABLE)) <= count || + ret == WAIT_TIMEOUT); + + ERR("wait failed in the update thread, ret %lu, error %lu\n", ret, GetLastError()); UnregisterDeviceNotification(notif); DestroyWindow(hwnd); UnregisterClassW(cls.lpszClassName, xinput_instance); - if (ret != count - 1) ERR("update thread exited unexpectedly, ret %lu\n", ret); - SetEvent(done_event); - return ret; + FreeLibraryAndExitThread(xinput_instance, ret); } static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ) { HANDLE thread; + HMODULE module; + + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (void*)hid_update_thread_proc, &module)) + WARN("Failed to increase module's reference count, error: %lu\n", GetLastError()); start_event = CreateEventA(NULL, FALSE, FALSE, NULL); if (!start_event) ERR("failed to create start event, error %lu\n", GetLastError()); - stop_event = CreateEventA(NULL, FALSE, FALSE, NULL); - if (!stop_event) ERR("failed to create stop event, error %lu\n", GetLastError()); - - done_event = CreateEventA(NULL, FALSE, FALSE, NULL); - if (!done_event) ERR("failed to create done event, error %lu\n", GetLastError()); - update_event = CreateEventA(NULL, FALSE, FALSE, NULL); if (!update_event) ERR("failed to create update event, error %lu\n", GetLastError()); @@ -811,10 +791,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) xinput_instance = inst; DisableThreadLibraryCalls(inst); break; - case DLL_PROCESS_DETACH: - if (reserved) break; - stop_update_thread(); - break; } return TRUE; }

1 0

Piotr Caban : gdi32: Add GdiGetDevmodeForPage implementation.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 12c3579bcb79a3de261fda5f396c7d625dcd7db8 URL: https://gitlab.winehq.org/wine/wine/-/commit/12c3579bcb79a3de261fda5f396c7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 18:04:59 2023 +0200 gdi32: Add GdiGetDevmodeForPage implementation. --- dlls/gdi32/dc.c | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 208 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 106dbe4deba..c21bc99a6b6 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -25,6 +25,7 @@ #include "ntuser.h" #include "ddrawgdi.h" #include "winnls.h" +#include "winppi.h" #include "wine/list.h" #include "wine/debug.h" @@ -68,6 +69,47 @@ struct print DEVMODEW *devmode; }; +BOOL WINAPI SeekPrinter( HANDLE, LARGE_INTEGER, LARGE_INTEGER*, DWORD, BOOL ); + +enum +{ + EMRI_METAFILE = 1, + EMRI_ENGINE_FONT, + EMRI_DEVMODE, + EMRI_TYPE1_FONT, + EMRI_PRESTARTPAGE, + EMRI_DESIGNVECTOR, + EMRI_SUBSET_FONT, + EMRI_DELTA_FONT, + EMRI_FORM_METAFILE, + EMRI_BW_METAFILE, + EMRI_BW_FORM_METAFILE, + EMRI_METAFILE_DATA, + EMRI_METAFILE_EXT, + EMRI_BW_METAFILE_EXT, + EMRI_ENGINE_FONT_EXT, + EMRI_TYPE1_FONT_EXT, + EMRI_DESIGNVECTOR_EXT, + EMRI_SUBSET_FONT_EXT, + EMRI_DELTA_FONT_EXT, + EMRI_PS_JOB_DATA, + EMRI_EMBED_FONT_EXT, + EMRI_HEADER = 65536 +}; + +struct spool_handle +{ + HANDLE spool; + + int devmodes_no; + int devmodes_size; + struct + { + int page; + DEVMODEW *devmode; + } *devmodes; +}; + DC_ATTR *get_dc_attr( HDC hdc ) { DWORD type = gdi_handle_type( hdc ); @@ -2670,8 +2712,41 @@ ULONG WINAPI DdQueryDisplaySettingsUniqueness(void) HANDLE WINAPI GdiGetSpoolFileHandle( WCHAR *printer_name, DEVMODEW *devmode, WCHAR *doc_name ) { - FIXME( "%s %p %s\n", wine_dbgstr_w(printer_name), devmode, wine_dbgstr_w(doc_name) ); - return NULL; + struct spool_handle *ret; + HANDLE spool; + + TRACE( "%s %p %s\n", wine_dbgstr_w(printer_name), devmode, wine_dbgstr_w(doc_name) ); + + if (!devmode) return NULL; + if (!OpenPrinterW( doc_name, &spool, NULL )) return NULL; + + ret = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret) ); + if (!ret) + { + ClosePrinter( spool ); + return NULL; + } + ret->spool = spool; + + ret->devmodes = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret->devmodes) * 8); + if (!ret->devmodes) + { + GdiDeleteSpoolFileHandle( ret ); + return NULL; + } + ret->devmodes_size = 8; + + ret->devmodes[0].devmode = HeapAlloc( GetProcessHeap(), 0, + devmode->dmSize + devmode->dmDriverExtra ); + if (!ret->devmodes[0].devmode) + { + GdiDeleteSpoolFileHandle( ret ); + return NULL; + } + memcpy( ret->devmodes[0].devmode, devmode, devmode->dmSize + devmode->dmDriverExtra ); + ret->devmodes[0].page = 0; + ret->devmodes_no = 1; + return ret; } /******************************************************************* @@ -2679,8 +2754,108 @@ HANDLE WINAPI GdiGetSpoolFileHandle( WCHAR *printer_name, */ BOOL WINAPI GdiDeleteSpoolFileHandle( HANDLE h ) { - FIXME( "%p\n", h ); - return FALSE; + struct spool_handle *sh = (struct spool_handle *)h; + int i; + + TRACE( "%p\n", h ); + + if (!sh) + return FALSE; + + ClosePrinter( sh->spool ); + for (i = 0; i < sh->devmodes_no; i++) + HeapFree( GetProcessHeap(), 0, sh->devmodes[i].devmode ); + HeapFree( GetProcessHeap(), 0, sh->devmodes ); + return TRUE; +} + +static BOOL read_emfspool_record( struct spool_handle *sh ) +{ + struct record_hdr + { + unsigned int ulID; + unsigned int cjSize; + } hdr; + LARGE_INTEGER pos; + BOOL ret; + DWORD r; + + if (!sh->spool) return FALSE; + + ret = ReadPrinter( sh->spool, &hdr, sizeof(hdr), &r ); + if (!ret || r != sizeof(hdr)) + { + ClosePrinter( sh->spool ); + sh->spool = NULL; + return FALSE; + } + TRACE( "parsing record %u\n", hdr.ulID ); + + if (hdr.ulID == EMRI_HEADER) + hdr.cjSize -= sizeof(hdr); + + switch (hdr.ulID) + { + case EMRI_DEVMODE: + /* remove unused devmode */ + if (sh->devmodes_no - 2 >= 0 && sh->devmodes[sh->devmodes_no - 2].page == + sh->devmodes[sh->devmodes_no - 1].page) + { + HeapFree( GetProcessHeap(), 0, sh->devmodes[sh->devmodes_no - 1].devmode ); + sh->devmodes_no--; + } + else if (sh->devmodes_no == sh->devmodes_size) + { + void *alloc = HeapReAlloc( GetProcessHeap(), 0, sh->devmodes, sh->devmodes_size * 2 ); + + if (!alloc) + { + ClosePrinter( sh->spool ); + sh->spool = NULL; + return FALSE; + } + sh->devmodes = alloc; + sh->devmodes_size *= 2; + } + + sh->devmodes[sh->devmodes_no].devmode = HeapAlloc( GetProcessHeap(), 0, hdr.cjSize ); + if (!sh->devmodes[sh->devmodes_no].devmode) + { + ClosePrinter( sh->spool ); + sh->spool = NULL; + return FALSE; + } + + ret = ReadPrinter( sh->spool, sh->devmodes[sh->devmodes_no].devmode, hdr.cjSize, &r ); + if (!ret || r != hdr.cjSize) + { + ClosePrinter( sh->spool ); + sh->spool = NULL; + return FALSE; + } + sh->devmodes[sh->devmodes_no].page = sh->devmodes[sh->devmodes_no - 1].page; + sh->devmodes_no++; + return TRUE; + + case EMRI_METAFILE: + case EMRI_FORM_METAFILE: + case EMRI_BW_METAFILE: + case EMRI_BW_FORM_METAFILE: + case EMRI_METAFILE_EXT: + case EMRI_BW_METAFILE_EXT: + sh->devmodes[sh->devmodes_no - 1].page++; + /* fall through */ + default: + pos.QuadPart = hdr.cjSize; + ret = SeekPrinter( sh->spool, pos, NULL, FILE_CURRENT, FALSE ); + if (!ret) + { + ClosePrinter( sh->spool ); + sh->spool = NULL; + return FALSE; + } + return TRUE; + } } /******************************************************************* @@ -2688,6 +2863,33 @@ BOOL WINAPI GdiDeleteSpoolFileHandle( HANDLE h ) */ BOOL WINAPI GdiGetDevmodeForPage( HANDLE h, DWORD page, DEVMODEW **cur, DEVMODEW **prev ) { - FIXME( "%p %ld %p %p\n", h, page, cur, prev ); - return FALSE; + struct spool_handle *sh = (struct spool_handle *)h; + int i; + + TRACE( "%p %ld %p %p\n", h, page, cur, prev ); + + if (!sh) + return FALSE; + + i = 0; + while (1) + { + if (sh->devmodes[i].page >= page) + { + if (cur) *cur = sh->devmodes[i].devmode; + if (prev) + { + if (!i || sh->devmodes[i - 1].page != page - 1) + *prev = sh->devmodes[i].devmode; + else + *prev = sh->devmodes[i - 1].devmode; + } + return TRUE; + } + + if (i + 1 < sh->devmodes_no) + i++; + else if (!read_emfspool_record( sh )) + return FALSE; + } }

1 0

Piotr Caban : gdi32: Add GdiGetDevmodeForPage stub.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 78acbb6fecde0f322a105c964360e8b772949cf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/78acbb6fecde0f322a105c964360e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 17:04:14 2023 +0200 gdi32: Add GdiGetDevmodeForPage stub. --- dlls/gdi32/dc.c | 9 +++++++++ dlls/gdi32/gdi32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 458a58f8ee5..106dbe4deba 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2682,3 +2682,12 @@ BOOL WINAPI GdiDeleteSpoolFileHandle( HANDLE h ) FIXME( "%p\n", h ); return FALSE; } + +/******************************************************************* + * GdiGetDevmodeForPage (GDI32.@) + */ +BOOL WINAPI GdiGetDevmodeForPage( HANDLE h, DWORD page, DEVMODEW **cur, DEVMODEW **prev ) +{ + FIXME( "%p %ld %p %p\n", h, page, cur, prev ); + return FALSE; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index c64af92301a..0ad47111eaa 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -191,7 +191,7 @@ @ stdcall GdiGetCharDimensions(long ptr ptr) @ stdcall GdiGetCodePage(long) # @ stub GdiGetDC -# @ stub GdiGetDevmodeForPage +@ stdcall GdiGetDevmodeForPage(ptr long ptr ptr) @ stub GdiGetLocalBitmap @ stub GdiGetLocalBrush @ stub GdiGetLocalDC

1 0

Piotr Caban : wineps.drv: Use first page DEVMODE to determine number of copies and collation.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 7128a6595adc94606667c8a14f66d804918a580a URL: https://gitlab.winehq.org/wine/wine/-/commit/7128a6595adc94606667c8a14f66d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 15:35:05 2023 +0200 wineps.drv: Use first page DEVMODE to determine number of copies and collation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55718 --- dlls/wineps.drv/printproc.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 3de05eea3f5..46ebe0b8e04 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -23,6 +23,7 @@ #include <windows.h> #include <ntgdi.h> +#include <winppi.h> #include <winspool.h> #include <ddk/winsplp.h> #include <usp10.h> @@ -40,6 +41,7 @@ struct pp_data { DWORD magic; HANDLE hport; + WCHAR *port; WCHAR *doc_name; WCHAR *out_file; @@ -2980,6 +2982,7 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) return NULL; data->magic = PP_MAGIC; data->hport = hport; + data->port = wcsdup(port); data->doc_name = wcsdup(open_data->pDocumentName); data->out_file = wcsdup(open_data->pOutputFile); @@ -3003,6 +3006,7 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) { struct pp_data *data = get_handle_data(pp); + DEVMODEW *devmode = NULL; emfspool_header header; LARGE_INTEGER pos, cur; record_hdr record; @@ -3016,6 +3020,21 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) if (!data) return FALSE; + spool_data = GdiGetSpoolFileHandle(data->port, + &data->ctx->Devmode->dmPublic, doc_name); + GdiGetDevmodeForPage(spool_data, 1, &devmode, NULL); + if (devmode && devmode->dmFields & DM_COPIES) + { + data->ctx->Devmode->dmPublic.dmFields |= DM_COPIES; + data->ctx->Devmode->dmPublic.dmCopies = devmode->dmCopies; + } + if (devmode && devmode->dmFields & DM_COLLATE) + { + data->ctx->Devmode->dmPublic.dmFields |= DM_COLLATE; + data->ctx->Devmode->dmPublic.dmCollate = devmode->dmCollate; + } + GdiDeleteSpoolFileHandle(spool_data); + if (!OpenPrinterW(doc_name, &spool_data, NULL)) return FALSE; @@ -3166,6 +3185,7 @@ BOOL WINAPI ClosePrintProcessor(HANDLE pp) return FALSE; ClosePrinter(data->hport); + free(data->port); free(data->doc_name); free(data->out_file); DeleteDC(data->ctx->hdc);

1 0

Piotr Caban : gdi32: Add GdiDeleteSpoolFileHandle stub.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: c2489c501dcadb33103d3bb5b52ca85215413596 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2489c501dcadb33103d3bb5b52ca8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 17:01:02 2023 +0200 gdi32: Add GdiDeleteSpoolFileHandle stub. --- dlls/gdi32/dc.c | 9 +++++++++ dlls/gdi32/gdi32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3023f02eb79..458a58f8ee5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2673,3 +2673,12 @@ HANDLE WINAPI GdiGetSpoolFileHandle( WCHAR *printer_name, FIXME( "%s %p %s\n", wine_dbgstr_w(printer_name), devmode, wine_dbgstr_w(doc_name) ); return NULL; } + +/******************************************************************* + * GdiDeleteSpoolFileHandle (GDI32.@) + */ +BOOL WINAPI GdiDeleteSpoolFileHandle( HANDLE h ) +{ + FIXME( "%p\n", h ); + return FALSE; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6045f3c454a..c64af92301a 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -177,7 +177,7 @@ @ stub GdiDciSetDestination @ stub GdiDeleteLocalDC @ stub GdiDeleteLocalObject -# @ stub GdiDeleteSpoolFileHandle +@ stdcall GdiDeleteSpoolFileHandle(ptr) @ stdcall GdiDescribePixelFormat(long long long ptr) NtGdiDescribePixelFormat @ stdcall GdiDllInitialize(ptr long ptr) @ stdcall GdiDrawStream(long long ptr) NtGdiDrawStream

1 0

Zhiyi Zhang : winex11.drv: Set _NET_WM_FULLSCREEN_MONITORS only when necessary.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 70c9239cb2eef696eea109f3f8e7a58f80cd3823 URL: https://gitlab.winehq.org/wine/wine/-/commit/70c9239cb2eef696eea109f3f8e7a5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 14 17:17:05 2023 +0800 winex11.drv: Set _NET_WM_FULLSCREEN_MONITORS only when necessary. If _NET_WM_FULLSCREEN_MONITORS is set then the property needs to be updated because it can't be deleted by sending a _NET_WM_FULLSCREEN_MONITORS client message to the root window according to the wm-spec version 1.5. Having the window spanning more than two monitors also needs the property set. In other cases, _NET_WM_FULLSCREEN_MONITORS doesn't need to be set. What's more, setting _NET_WM_FULLSCREEN_MONITORS adds a constraint on Mutter so that such a window can't be moved to another monitor by using the Shift+Super+Up/Down/Left/Right shortcut. So the property should be added only when necessary. --- dlls/winex11.drv/window.c | 15 +++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ed3728773af..53982bb8c3b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -993,6 +993,20 @@ static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) if (!xinerama_get_fullscreen_monitors( &data->whole_rect, monitors )) return; + /* If _NET_WM_FULLSCREEN_MONITORS is not set and the fullscreen monitors are spanning only one + * monitor then do not set _NET_WM_FULLSCREEN_MONITORS. + * + * If _NET_WM_FULLSCREEN_MONITORS is set then the property needs to be updated because it can't + * be deleted by sending a _NET_WM_FULLSCREEN_MONITORS client message to the root window + * according to the wm-spec version 1.5. Having the window spanning more than two monitors also + * needs the property set. In other cases, _NET_WM_FULLSCREEN_MONITORS doesn't need to be set. + * What's more, setting _NET_WM_FULLSCREEN_MONITORS adds a constraint on Mutter so that such a + * window can't be moved to another monitor by using the Shift+Super+Up/Down/Left/Right + * shortcut. So the property should be added only when necessary. */ + if (monitors[0] == monitors[1] && monitors[1] == monitors[2] && monitors[2] == monitors[3] + && !data->net_wm_fullscreen_monitors_set) + return; + if (!data->mapped) { XChangeProperty( data->display, data->whole_window, x11drv_atom(_NET_WM_FULLSCREEN_MONITORS), @@ -1012,6 +1026,7 @@ static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) XSendEvent( data->display, root_window, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev ); } + data->net_wm_fullscreen_monitors_set = TRUE; } /*********************************************************************** diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8e233a051f4..e80cb6682bf 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -625,6 +625,7 @@ struct x11drv_win_data BOOL use_alpha : 1; /* does window use an alpha channel? */ BOOL skip_taskbar : 1; /* does window should be deleted from taskbar */ BOOL add_taskbar : 1; /* does window should be added to taskbar regardless of style */ + BOOL net_wm_fullscreen_monitors_set : 1; /* is _NET_WM_FULLSCREEN_MONITORS set */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */

1 0

Piotr Caban : gdi32: Add GdiGetSpoolFileHandle stub.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 8dfa1d66b1324fd334133d1aac2bc38ee817fda3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8dfa1d66b1324fd334133d1aac2bc3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 16:55:49 2023 +0200 gdi32: Add GdiGetSpoolFileHandle stub. --- dlls/gdi32/dc.c | 10 ++++++++++ dlls/gdi32/gdi32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 21005fa0719..3023f02eb79 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2663,3 +2663,13 @@ ULONG WINAPI DdQueryDisplaySettingsUniqueness(void) if (!warn_once++) FIXME( "stub\n" ); return 0; } + +/******************************************************************* + * GdiGetSpoolFileHandle (GDI32.@) + */ +HANDLE WINAPI GdiGetSpoolFileHandle( WCHAR *printer_name, + DEVMODEW *devmode, WCHAR *doc_name ) +{ + FIXME( "%s %p %s\n", wine_dbgstr_w(printer_name), devmode, wine_dbgstr_w(doc_name) ); + return NULL; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 84c294c286f..6045f3c454a 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -198,7 +198,7 @@ @ stub GdiGetLocalFont # @ stub GdiGetPageCount # @ stub GdiGetPageHandle -# @ stub GdiGetSpoolFileHandle +@ stdcall GdiGetSpoolFileHandle(wstr ptr wstr) @ stdcall GdiGetSpoolMessage(ptr long ptr long) NtGdiGetSpoolMessage @ stdcall GdiGradientFill(long ptr long ptr long long) @ stdcall GdiInitSpool() NtGdiInitSpool

1 0

Piotr Caban : gdi32: Test PlayMetaFile on METADC.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 25e15e9e2c34b85d6aef5010532e7e343ccb9c80 URL: https://gitlab.winehq.org/wine/wine/-/commit/25e15e9e2c34b85d6aef5010532e7e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 11 11:59:15 2023 +0200 gdi32: Test PlayMetaFile on METADC. --- dlls/gdi32/tests/metafile.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 0e5da463f7f..b013fe1f196 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -5066,6 +5066,65 @@ static void test_emf_blit(void) ok(ret, "DeleteMetaFile(%p) error %ld\n", hmf, GetLastError()); } +struct check_mf_arg +{ + int pos; + const WORD *records; +}; + +static int WINAPI check_mf_records(HDC hdc, HANDLETABLE *htable, + METARECORD *rec, int n, LPARAM ctx) +{ + struct check_mf_arg *records = (struct check_mf_arg *)ctx; + + ok(rec->rdFunction == records->records[records->pos], "got record %x, expected %x\n", + rec->rdFunction, records->records[records->pos]); + return rec->rdFunction == records->records[records->pos++]; +} + +static void test_PlayMetaFile(void) +{ + static WORD line_records[] = { META_LINETO, 0 }; + struct check_mf_arg records; + HMETAFILE hmeta; + HDC dc, metadc; + BOOL r; + + dc = CreateCompatibleDC(NULL); + ok(dc != NULL, "CreateCompatibleDC failed\n"); + + metadc = CreateMetaFileW(NULL); + ok(metadc != NULL, "CreateMetaFile failed\n"); + r = LineTo(metadc, 10, 10); + ok(r, "LineTo failed\n"); + hmeta = CloseMetaFile(metadc); + ok(hmeta != NULL, "CloseMetaFile failed\n"); + + records.pos = 0; + records.records = line_records; + r = EnumMetaFile(dc, hmeta, check_mf_records, (LPARAM)&records); + ok(r, "EnumMetaFile failed\n"); + + metadc = CreateMetaFileW(NULL); + ok(metadc != NULL, "CreateMetaFile failed\n"); + r = PlayMetaFile(metadc, hmeta); + ok(r, "PlayMetaFile failed\n"); + r = DeleteMetaFile(hmeta); + ok(r, "DeleteMetaFile failed\n"); + hmeta = CloseMetaFile(metadc); + ok(hmeta != NULL, "CloseMetaFile failed\n"); + + records.pos = 0; + records.records = line_records; + r = EnumMetaFile(dc, hmeta, check_mf_records, (LPARAM)&records); + ok(r, "EnumMetaFile failed\n"); + + r = DeleteMetaFile(hmeta); + ok(r, "DeleteMetaFile failed\n"); + r = DeleteDC(dc); + ok(r, "DeleteDC failed\n"); +} + static void test_emf_mask_blit(void) { BITMAPINFO bmi = {{ sizeof(bmi) }}; @@ -10769,6 +10828,7 @@ START_TEST(metafile) test_mf_select(); test_mf_palette(); test_mf_blit(); + test_PlayMetaFile(); /* For metafile conversions */ test_mf_conversions();

1 0

Piotr Caban : gdi32: Fix METADC handling in PlayMetaFile.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 5e507b3e3dc999ae55f314f863ea613a14f0ae84 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e507b3e3dc999ae55f314f863ea61… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 11 00:39:01 2023 +0200 gdi32: Fix METADC handling in PlayMetaFile. --- dlls/gdi32/metafile.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 50910956e1d..911dfeecf61 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -360,6 +360,7 @@ HMETAFILE WINAPI CopyMetaFileA( HMETAFILE hSrcMetaFile, LPCSTR lpFilename ) */ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) { + BOOL metadc = GetObjectType(hdc) == OBJ_METADC; METAHEADER *mh = get_metafile_bits( hmf ); METARECORD *mr; HANDLETABLE *ht; @@ -372,16 +373,19 @@ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) if (!mh) return FALSE; - /* save DC */ - hPen = GetCurrentObject(hdc, OBJ_PEN); - hBrush = GetCurrentObject(hdc, OBJ_BRUSH); - hPal = GetCurrentObject(hdc, OBJ_PAL); - - hRgn = NtGdiCreateRectRgn(0, 0, 0, 0); - if (!GetClipRgn(hdc, hRgn)) + if (!metadc) { - DeleteObject(hRgn); - hRgn = 0; + /* save DC */ + hPen = GetCurrentObject(hdc, OBJ_PEN); + hBrush = GetCurrentObject(hdc, OBJ_BRUSH); + hPal = GetCurrentObject(hdc, OBJ_PAL); + + hRgn = NtGdiCreateRectRgn(0, 0, 0, 0); + if (!GetClipRgn(hdc, hRgn)) + { + DeleteObject(hRgn); + hRgn = 0; + } } /* create the handle table */ @@ -414,12 +418,15 @@ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) PlayMetaFileRecord( hdc, ht, mr, mh->mtNoObjects ); } - /* restore DC */ - SelectObject(hdc, hPen); - SelectObject(hdc, hBrush); - SelectPalette(hdc, hPal, FALSE); - ExtSelectClipRgn(hdc, hRgn, RGN_COPY); - DeleteObject(hRgn); + if (!metadc) + { + /* restore DC */ + SelectObject(hdc, hPen); + SelectObject(hdc, hBrush); + SelectPalette(hdc, hPal, FALSE); + ExtSelectClipRgn(hdc, hRgn, RGN_COPY); + DeleteObject(hRgn); + } /* free objects in handle table */ for(i = 0; i < mh->mtNoObjects; i++)

1 0