February 2022 - Wine-Commits

Eric Pouech : wintab32: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 2ec60930088a3af3d1c570a3a312714a8148353d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ec60930088a3af3d1c570a3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:22 2022 +0100 wintab32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/Makefile.in | 1 - dlls/wintab32/context.c | 22 +++++++++++----------- dlls/wintab32/manager.c | 6 +++--- dlls/wintab32/wintab32.c | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index 56cfd6c2f41..050c78b86d3 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wintab32.dll IMPORTLIB = wintab32 IMPORTS = user32 advapi32 diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 2da04621934..58ba6b49074 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -102,7 +102,7 @@ static const char* DUMPBITS(int x) static inline void DUMPPACKET(WTPACKET packet) { - TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%x pkChanged: 0x%x pkSerialNumber: 0x%x pkCursor : %i pkButtons: %x pkX: %i pkY: %i pkZ: %i pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", + TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%lx pkChanged: 0x%lx pkSerialNumber: 0x%x pkCursor : %i pkButtons: %lx pkX: %li pkY: %li pkZ: %li pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", packet.pkContext, packet.pkStatus, packet.pkTime, packet.pkChanged, packet.pkSerialNumber, packet.pkCursor, packet.pkButtons, packet.pkX, packet.pkY, packet.pkZ, packet.pkNormalPressure, packet.pkTangentPressure, @@ -115,19 +115,19 @@ static inline void DUMPCONTEXT(LOGCONTEXTW lc) TRACE("Name: %s, Options: %x, Status: %x, Locks: %x, MsgBase: %x, Device: %x\n", wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice); TRACE("PktRate %x\n", lc.lcPktRate); - TRACE("PktData 0x%04x %s\n", lc.lcPktData, DUMPBITS(lc.lcPktData)); - TRACE("PktMode 0x%04x %s\n", lc.lcPktMode, DUMPBITS(lc.lcPktMode)); - TRACE("MovMask 0x%04x %s\n", lc.lcMoveMask, DUMPBITS(lc.lcMoveMask)); - TRACE("BtnDnMask: %x, BtnUpMask: %x\n", lc.lcBtnDnMask, lc.lcBtnUpMask); - TRACE("InOrgX: %i, InOrgY: %i, InOrgZ: %i\n", lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ); - TRACE("InExtX: %i, InExtY: %i, InExtZ: %i\n", lc.lcInExtX, lc.lcInExtY, lc.lcInExtZ); - TRACE("OutOrgX: %i, OutOrgY: %i, OutOrgZ: %i\n", lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ); - TRACE("OutExtX: %i, OutExtY: %i, OutExtZ: %i\n", lc.lcOutExtX, lc.lcOutExtY, lc.lcOutExtZ); - TRACE("SensX: %i, SensY: %i, SensZ: %i\n", lc.lcSensX, lc.lcSensY, lc.lcSensZ); + TRACE("PktData 0x%04lx %s\n", lc.lcPktData, DUMPBITS(lc.lcPktData)); + TRACE("PktMode 0x%04lx %s\n", lc.lcPktMode, DUMPBITS(lc.lcPktMode)); + TRACE("MovMask 0x%04lx %s\n", lc.lcMoveMask, DUMPBITS(lc.lcMoveMask)); + TRACE("BtnDnMask: %lx, BtnUpMask: %lx\n", lc.lcBtnDnMask, lc.lcBtnUpMask); + TRACE("InOrgX: %li, InOrgY: %li, InOrgZ: %li\n", lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ); + TRACE("InExtX: %li, InExtY: %li, InExtZ: %li\n", lc.lcInExtX, lc.lcInExtY, lc.lcInExtZ); + TRACE("OutOrgX: %li, OutOrgY: %li, OutOrgZ: %li\n", lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ); + TRACE("OutExtX: %li, OutExtY: %li, OutExtZ: %li\n", lc.lcOutExtX, lc.lcOutExtY, lc.lcOutExtZ); + TRACE("SensX: %li, SensY: %li, SensZ: %li\n", lc.lcSensX, lc.lcSensY, lc.lcSensZ); TRACE("SysMode: %i\n", lc.lcSysMode); TRACE("SysOrgX: %i, SysOrgY: %i\n", lc.lcSysOrgX, lc.lcSysOrgY); TRACE("SysExtX: %i, SysExtY: %i\n", lc.lcSysExtX, lc.lcSysExtY); - TRACE("SysSensX: %i, SysSensY: %i\n", lc.lcSysSensX, lc.lcSysSensY); + TRACE("SysSensX: %li, SysSensY: %li\n", lc.lcSysSensX, lc.lcSysSensY); } diff --git a/dlls/wintab32/manager.c b/dlls/wintab32/manager.c index d8d69554582..1a059f55f88 100644 --- a/dlls/wintab32/manager.c +++ b/dlls/wintab32/manager.c @@ -59,7 +59,7 @@ BOOL WINAPI WTMgrClose(HMGR hMgr) */ BOOL WINAPI WTMgrContextEnum(HMGR hMgr, WTENUMPROC lpEnumFunc, LPARAM lParam) { - FIXME("(%p, %p, %ld): stub\n", hMgr, lpEnumFunc, lParam); + FIXME("(%p, %p, %Id): stub\n", hMgr, lpEnumFunc, lParam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -190,7 +190,7 @@ BOOL WINAPI WTMgrPacketUnhook(HWTHOOK hHook) LRESULT WINAPI WTMgrPacketHookNext(HWTHOOK hHook, int nCode, WPARAM wParam, LPARAM lParam) { - FIXME("(%p, %d, %lu, %lu): stub\n", hHook, nCode, wParam, lParam); + FIXME("(%p, %d, %Iu, %Iu): stub\n", hHook, nCode, wParam, lParam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -243,7 +243,7 @@ BOOL WINAPI WTMgrCsrButtonMap(HMGR hMgr, UINT wCursor, BOOL WINAPI WTMgrCsrPressureBtnMarks(HMGR hMgr, UINT wCsr, DWORD dwNMarks, DWORD dwTMarks) { - FIXME("(%p, %u, %u, %u): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); + FIXME("(%p, %u, %lu, %lu): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index d56706b4223..b13c0573454 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -95,7 +95,7 @@ static HMODULE load_graphics_driver(void) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { - TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); + TRACE("%p, %lx, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH:

1 0

Eric Pouech : wininet: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 5151d1acbc0e4663ec158540e41631134336f7e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5151d1acbc0e4663ec158540… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:58 2022 +0100 wininet: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/Makefile.in | 1 - dlls/wininet/cookie.c | 28 ++++----- dlls/wininet/dialogs.c | 24 +++---- dlls/wininet/ftp.c | 34 +++++----- dlls/wininet/http.c | 104 +++++++++++++++--------------- dlls/wininet/internet.c | 146 +++++++++++++++++++++---------------------- dlls/wininet/netconnection.c | 28 ++++----- dlls/wininet/urlcache.c | 106 +++++++++++++++---------------- dlls/wininet/utility.c | 4 +- 9 files changed, 237 insertions(+), 238 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5151d1acbc0e4663ec15…

1 0

Gabriel Ivăncescu : winepulse.drv: Cache the devices looked up in the registry.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 0f4fe1c149e677f44f87dbe4c34128f068d54a2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f4fe1c149e677f44f87dbe4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 18 20:38:00 2022 +0200 winepulse.drv: Cache the devices looked up in the registry. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 8ef3575fa50..0d9f56f8ffe 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -63,6 +63,14 @@ static struct pulse_config pulse_config; static HANDLE pulse_thread; static struct list g_sessions = LIST_INIT(g_sessions); +static struct list g_devices_cache = LIST_INIT(g_devices_cache); + +struct device_cache { + struct list entry; + GUID guid; + EDataFlow dataflow; + char pulse_name[0]; +}; static GUID pulse_render_guid = { 0xfd47d9cc, 0x4218, 0x4135, { 0x9c, 0xe2, 0x0c, 0x19, 0x5c, 0x87, 0x40, 0x5b } }; @@ -90,6 +98,10 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) if (__wine_unix_call(pulse_handle, process_attach, NULL)) return FALSE; } else if (reason == DLL_PROCESS_DETACH) { + struct device_cache *device, *device_next; + + LIST_FOR_EACH_ENTRY_SAFE(device, device_next, &g_devices_cache, struct device_cache, entry) + free(device); __wine_unix_call(pulse_handle, process_detach, NULL); if (pulse_thread) { WaitForSingleObject(pulse_thread, INFINITE); @@ -387,6 +399,7 @@ int WINAPI AUDDRV_GetPriority(void) static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_NAME_LEN], EDataFlow *flow) { + struct device_cache *device; WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; DWORD key_name_size; DWORD index = 0; @@ -402,6 +415,15 @@ static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_N return TRUE; } + /* Check the cache first */ + LIST_FOR_EACH_ENTRY(device, &g_devices_cache, struct device_cache, entry) { + if (!IsEqualGUID(guid, &device->guid)) + continue; + *flow = device->dataflow; + strcpy(pulse_name, device->pulse_name); + return TRUE; + } + if (RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_READ | KEY_WOW64_64KEY, &key) != ERROR_SUCCESS) { WARN("No devices found in registry\n"); return FALSE; @@ -412,6 +434,7 @@ static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_N LSTATUS status; GUID reg_guid; HKEY dev_key; + int len; key_name_size = ARRAY_SIZE(key_name); if (RegEnumKeyExW(key, index++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) @@ -440,7 +463,16 @@ static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_N return FALSE; } - return WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, pulse_name, MAX_PULSE_NAME_LEN, NULL, NULL); + if (!(len = WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, pulse_name, MAX_PULSE_NAME_LEN, NULL, NULL))) + return FALSE; + + if ((device = malloc(FIELD_OFFSET(struct device_cache, pulse_name[len])))) { + device->guid = reg_guid; + device->dataflow = *flow; + strcpy(device->pulse_name, pulse_name); + list_add_tail(&g_devices_cache, &device->entry); + } + return TRUE; } }

1 0

Gabriel Ivăncescu : winepulse.drv: Implement GetPropValue.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 8ba4e8f85b889b404541cdc8835dbadceed3f2ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ba4e8f85b889b404541cdc8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 18 20:38:01 2022 +0200 winepulse.drv: Implement GetPropValue. Based on a patch by Mark Harmstone <mark(a)harmstone.com>. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 32 +++++++++++- dlls/winepulse.drv/pulse.c | 114 ++++++++++++++++++++++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 22 ++++++++ 3 files changed, 162 insertions(+), 6 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 0d9f56f8ffe..a07253a1b97 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2543,6 +2543,10 @@ HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) { + struct get_prop_value_params params; + char pulse_name[MAX_PULSE_NAME_LEN]; + DWORD size; + TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); if (IsEqualGUID(guid, &pulse_render_guid) && IsEqualPropertyKey(*prop, PKEY_AudioEndpoint_PhysicalSpeakers)) { @@ -2552,5 +2556,31 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI return out->ulVal ? S_OK : E_FAIL; } - return E_NOTIMPL; + if (!get_pulse_name_by_guid(guid, pulse_name, &params.flow)) + return E_FAIL; + + params.pulse_name = pulse_name; + params.guid = guid; + params.prop = prop; + pulse_call(get_prop_value, &params); + + if (params.result != S_OK) + return params.result; + + switch (params.vt) { + case VT_LPWSTR: + size = (wcslen(params.wstr) + 1) * sizeof(WCHAR); + if (!(out->pwszVal = CoTaskMemAlloc(size))) + return E_OUTOFMEMORY; + memcpy(out->pwszVal, params.wstr, size); + break; + case VT_UI4: + out->ulVal = params.ulVal; + break; + default: + assert(0); + } + out->vt = params.vt; + + return S_OK; } diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 311c9bbaecc..d41160bffa7 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -84,6 +84,10 @@ typedef struct _ACPacket typedef struct _PhysDevice { struct list entry; WCHAR *name; + enum phys_device_bus_type bus_type; + USHORT vendor_id, product_id; + EndpointFormFactor form; + UINT index; char pulse_name[0]; } PhysDevice; @@ -418,7 +422,33 @@ static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } -static void pulse_add_device(struct list *list, const char *pulse_name, const char *name) +static void fill_device_info(PhysDevice *dev, pa_proplist *p) +{ + const char *buffer; + + dev->bus_type = phys_device_bus_invalid; + dev->vendor_id = 0; + dev->product_id = 0; + + if (!p) + return; + + if ((buffer = pa_proplist_gets(p, PA_PROP_DEVICE_BUS))) { + if (!strcmp(buffer, "usb")) + dev->bus_type = phys_device_bus_usb; + else if (!strcmp(buffer, "pci")) + dev->bus_type = phys_device_bus_pci; + } + + if ((buffer = pa_proplist_gets(p, PA_PROP_DEVICE_VENDOR_ID))) + dev->vendor_id = strtol(buffer, NULL, 16); + + if ((buffer = pa_proplist_gets(p, PA_PROP_DEVICE_PRODUCT_ID))) + dev->product_id = strtol(buffer, NULL, 16); +} + +static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, + const char *pulse_name, const char *name) { DWORD len = strlen(pulse_name), name_len = strlen(name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); @@ -439,6 +469,9 @@ static void pulse_add_device(struct list *list, const char *pulse_name, const ch return; } dev->name[name_len] = 0; + dev->form = form; + dev->index = index; + fill_device_info(dev, proplist); memcpy(dev->pulse_name, pulse_name, len + 1); list_add_tail(list, &dev->entry); @@ -453,14 +486,15 @@ static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); - pulse_add_device(&g_phys_speakers, i->name, i->description); + pulse_add_device(&g_phys_speakers, i->proplist, i->index, Speakers, i->name, i->description); } static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eol, void *userdata) { if (!i || !i->name || !i->name[0]) return; - pulse_add_device(&g_phys_sources, i->name, i->description); + pulse_add_device(&g_phys_sources, i->proplist, i->index, + (i->monitor_of_sink == PA_INVALID_INDEX) ? Microphone : LineLevel, i->name, i->description); } /* For most hardware on Windows, users must choose a configuration with an even @@ -682,8 +716,8 @@ static NTSTATUS pulse_test_connect(void *args) list_init(&g_phys_sources); g_phys_speakers_mask = 0; - pulse_add_device(&g_phys_speakers, "", "PulseAudio"); - pulse_add_device(&g_phys_sources, "", "PulseAudio"); + pulse_add_device(&g_phys_speakers, NULL, 0, Speakers, "", "PulseAudio"); + pulse_add_device(&g_phys_sources, NULL, 0, Microphone, "", "PulseAudio"); o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL); if (o) { @@ -2081,6 +2115,75 @@ static NTSTATUS pulse_is_started(void *args) return STATUS_SUCCESS; } +static BOOL get_device_path(PhysDevice *dev, struct get_prop_value_params *params) +{ + const GUID *guid = params->guid; + UINT serial_number; + const char *fmt; + char path[128]; + int len; + + switch (dev->bus_type) { + case phys_device_bus_pci: + fmt = "{1}.HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X\\%u&%08X"; + break; + case phys_device_bus_usb: + fmt = "{1}.USB\\VID_%04X&PID_%04X\\%u&%08X"; + break; + default: + return FALSE; + } + + /* As hardly any audio devices have serial numbers, Windows instead + appears to use a persistent random number. We emulate this here + by instead using the last 8 hex digits of the GUID. */ + serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; + + len = sprintf(path, fmt, dev->vendor_id, dev->product_id, dev->index, serial_number); + ntdll_umbstowcs(path, len + 1, params->wstr, ARRAY_SIZE(params->wstr)); + + params->vt = VT_LPWSTR; + return TRUE; +} + +static NTSTATUS pulse_get_prop_value(void *args) +{ + static const GUID PKEY_AudioEndpoint_GUID = { + 0x1da5d803, 0xd492, 0x4edd, {0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e} + }; + static const PROPERTYKEY devicepath_key = { /* undocumented? - {b3f8fa53-0004-438e-9003-51a46e139bfc},2 */ + {0xb3f8fa53, 0x0004, 0x438e, {0x90, 0x03, 0x51, 0xa4, 0x6e, 0x13, 0x9b, 0xfc}}, 2 + }; + struct get_prop_value_params *params = args; + struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; + PhysDevice *dev; + + params->result = S_OK; + LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { + if (strcmp(params->pulse_name, dev->pulse_name)) + continue; + if (IsEqualPropertyKey(*params->prop, devicepath_key)) { + if (!get_device_path(dev, params)) + break; + return STATUS_SUCCESS; + } else if (IsEqualGUID(&params->prop->fmtid, &PKEY_AudioEndpoint_GUID)) { + switch (params->prop->pid) { + case 0: /* FormFactor */ + params->vt = VT_UI4; + params->ulVal = dev->form; + return STATUS_SUCCESS; + default: + break; + } + } + params->result = E_NOTIMPL; + return STATUS_SUCCESS; + } + + params->result = E_FAIL; + return STATUS_SUCCESS; +} + const unixlib_entry_t __wine_unix_call_funcs[] = { pulse_process_attach, @@ -2107,4 +2210,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_set_event_handle, pulse_test_connect, pulse_is_started, + pulse_get_prop_value, }; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 982704a94ad..4acebb1aa8b 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -23,6 +23,12 @@ struct pulse_stream; +enum phys_device_bus_type { + phys_device_bus_invalid = -1, + phys_device_bus_pci, + phys_device_bus_usb +}; + struct pulse_config { struct @@ -205,6 +211,21 @@ struct is_started_params BOOL started; }; +struct get_prop_value_params +{ + const char *pulse_name; + const GUID *guid; + const PROPERTYKEY *prop; + EDataFlow flow; + HRESULT result; + VARTYPE vt; + union + { + WCHAR wstr[128]; + ULONG ulVal; + }; +}; + enum unix_funcs { process_attach, @@ -231,4 +252,5 @@ enum unix_funcs set_event_handle, test_connect, is_started, + get_prop_value, };

1 0

Mark Harmstone : winepulse.drv: Fetch actual application name, if possible.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 0b6640e3e72e1d8e504560c28587b38ee6f14aa1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b6640e3e72e1d8e504560c2… Author: Mark Harmstone <mark(a)harmstone.com> Date: Fri Feb 18 20:38:02 2022 +0200 winepulse.drv: Fetch actual application name, if possible. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/Makefile.in | 2 +- dlls/winepulse.drv/mmdevdrv.c | 106 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 103 insertions(+), 5 deletions(-) diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in index c71b2833d13..d4b40e66644 100644 --- a/dlls/winepulse.drv/Makefile.in +++ b/dlls/winepulse.drv/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winepulse.drv UNIXLIB = winepulse.so -IMPORTS = dxguid uuid winmm user32 advapi32 ole32 +IMPORTS = dxguid uuid winmm user32 advapi32 ole32 version EXTRALIBS = $(PULSE_LIBS) $(PTHREAD_LIBS) -lm EXTRAINCL = $(PULSE_CFLAGS) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index a07253a1b97..49fafb65342 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -30,6 +30,7 @@ #include "wine/list.h" #include "ole2.h" +#include "mimeole.h" #include "dshow.h" #include "dsound.h" #include "propsys.h" @@ -243,13 +244,110 @@ static DWORD CALLBACK pulse_mainloop_thread(void *event) return 0; } -static char *get_application_name(void) +typedef struct tagLANGANDCODEPAGE +{ + WORD wLanguage; + WORD wCodePage; +} LANGANDCODEPAGE; + +static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, DWORD *len) +{ + WCHAR pn[37]; + swprintf(pn, ARRAY_SIZE(pn), L"\\StringFileInfo\\%04x%04x\\ProductName", lang->wLanguage, lang->wCodePage); + return VerQueryValueW(data, pn, buffer, len) && *len; +} + +static char *get_application_name(BOOL query_app_name) { WCHAR path[MAX_PATH], *name; + char *str = NULL; size_t len; - char *str; GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); + + if (query_app_name) + { + UINT translate_size, productname_size; + LANGANDCODEPAGE *translate; + LPVOID productname; + BOOL found = FALSE; + void *data = NULL; + unsigned int i; + LCID locale; + DWORD size; + + size = GetFileVersionInfoSizeW(path, NULL); + if (!size) + goto skip; + + data = malloc(size); + if (!data) + goto skip; + + if (!GetFileVersionInfoW(path, 0, size, data)) + goto skip; + + if (!VerQueryValueW(data, L"\\VarFileInfo\\Translation", (LPVOID *)&translate, &translate_size)) + goto skip; + + /* no translations found */ + if (translate_size < sizeof(LANGANDCODEPAGE)) + goto skip; + + /* The following code will try to find the best translation. We first search for an + * exact match of the language, then a match of the language PRIMARYLANGID, then we + * search for a LANG_NEUTRAL match, and if that still doesn't work we pick the + * first entry which contains a proper productname. */ + locale = GetThreadLocale(); + + for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { + if (translate[i].wLanguage == locale && + query_productname(data, &translate[i], &productname, &productname_size)) { + found = TRUE; + break; + } + } + + if (!found) { + for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { + if (PRIMARYLANGID(translate[i].wLanguage) == PRIMARYLANGID(locale) && + query_productname(data, &translate[i], &productname, &productname_size)) { + found = TRUE; + break; + } + } + } + + if (!found) { + for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { + if (PRIMARYLANGID(translate[i].wLanguage) == LANG_NEUTRAL && + query_productname(data, &translate[i], &productname, &productname_size)) { + found = TRUE; + break; + } + } + } + + if (!found) { + for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { + if (query_productname(data, &translate[i], &productname, &productname_size)) { + found = TRUE; + break; + } + } + } + + if (found) { + len = WideCharToMultiByte(CP_UTF8, 0, productname, -1, NULL, 0, NULL, NULL); + str = malloc(len); + if (str) WideCharToMultiByte(CP_UTF8, 0, productname, -1, str, len, NULL, NULL); + } + + skip: + free(data); + if (str) return str; + } + name = wcsrchr(path, '\\'); if (!name) name = path; @@ -390,7 +488,7 @@ int WINAPI AUDDRV_GetPriority(void) struct test_connect_params params; char *name; - params.name = name = get_application_name(); + params.name = name = get_application_name(FALSE); params.config = &pulse_config; pulse_call(test_connect, &params); free(name); @@ -776,7 +874,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CloseHandle(event); } - params.name = name = get_application_name(); + params.name = name = get_application_name(TRUE); params.pulse_name = This->pulse_name; params.dataflow = This->dataflow; params.mode = mode;

1 0

Mark Harmstone : winepulse.drv: Implement PKEY_AudioEndpoint_PhysicalSpeakers device prop.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 5a65a60347f887aeb858eceb02319039e1aada58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a65a60347f887aeb858eceb… Author: Mark Harmstone <mark(a)harmstone.com> Date: Fri Feb 18 20:38:03 2022 +0200 winepulse.drv: Implement PKEY_AudioEndpoint_PhysicalSpeakers device prop. And get rid of config->speakers_mask and g_phys_speakers_mask since they are no longer needed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 7 ------- dlls/winepulse.drv/pulse.c | 30 +++++++++++++++++++++--------- dlls/winepulse.drv/unixlib.h | 1 - 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 49fafb65342..7b5ef7cfe39 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2647,13 +2647,6 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); - if (IsEqualGUID(guid, &pulse_render_guid) && IsEqualPropertyKey(*prop, PKEY_AudioEndpoint_PhysicalSpeakers)) { - out->vt = VT_UI4; - out->ulVal = pulse_config.speakers_mask; - - return out->ulVal ? S_OK : E_FAIL; - } - if (!get_pulse_name_by_guid(guid, pulse_name, &params.flow)) return E_FAIL; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index d41160bffa7..6552e4ce250 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -87,6 +87,7 @@ typedef struct _PhysDevice { enum phys_device_bus_type bus_type; USHORT vendor_id, product_id; EndpointFormFactor form; + DWORD channel_mask; UINT index; char pulse_name[0]; } PhysDevice; @@ -98,7 +99,6 @@ static pa_mainloop *pulse_ml; static WAVEFORMATEXTENSIBLE pulse_fmt[2]; static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; -static UINT g_phys_speakers_mask = 0; static struct list g_phys_speakers = LIST_INIT(g_phys_speakers); static struct list g_phys_sources = LIST_INIT(g_phys_sources); @@ -448,7 +448,7 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - const char *pulse_name, const char *name) + DWORD channel_mask, const char *pulse_name, const char *name) { DWORD len = strlen(pulse_name), name_len = strlen(name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); @@ -471,6 +471,7 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index dev->name[name_len] = 0; dev->form = form; dev->index = index; + dev->channel_mask = channel_mask; fill_device_info(dev, proplist); memcpy(dev->pulse_name, pulse_name, len + 1); @@ -479,14 +480,20 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) { + struct list *speaker; + DWORD channel_mask; + if (!i || !i->name || !i->name[0]) return; + channel_mask = pulse_channel_map_to_channel_mask(&i->channel_map); /* For default PulseAudio render device, OR together all of the * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ - g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + speaker = list_head(&g_phys_speakers); + if (speaker) + LIST_ENTRY(speaker, PhysDevice, entry)->channel_mask |= channel_mask; - pulse_add_device(&g_phys_speakers, i->proplist, i->index, Speakers, i->name, i->description); + pulse_add_device(&g_phys_speakers, i->proplist, i->index, Speakers, channel_mask, i->name, i->description); } static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eol, void *userdata) @@ -494,7 +501,7 @@ static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eo if (!i || !i->name || !i->name[0]) return; pulse_add_device(&g_phys_sources, i->proplist, i->index, - (i->monitor_of_sink == PA_INVALID_INDEX) ? Microphone : LineLevel, i->name, i->description); + (i->monitor_of_sink == PA_INVALID_INDEX) ? Microphone : LineLevel, 0, i->name, i->description); } /* For most hardware on Windows, users must choose a configuration with an even @@ -714,10 +721,9 @@ static NTSTATUS pulse_test_connect(void *args) free_phys_device_lists(); list_init(&g_phys_speakers); list_init(&g_phys_sources); - g_phys_speakers_mask = 0; - pulse_add_device(&g_phys_speakers, NULL, 0, Speakers, "", "PulseAudio"); - pulse_add_device(&g_phys_sources, NULL, 0, Microphone, "", "PulseAudio"); + pulse_add_device(&g_phys_speakers, NULL, 0, Speakers, 0, "", "PulseAudio"); + pulse_add_device(&g_phys_sources, NULL, 0, Microphone, 0, "", "PulseAudio"); o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL); if (o) { @@ -740,7 +746,6 @@ static NTSTATUS pulse_test_connect(void *args) pa_mainloop_free(pulse_ml); pulse_ml = NULL; - config->speakers_mask = g_phys_speakers_mask; config->modes[0].format = pulse_fmt[0]; config->modes[0].def_period = pulse_def_period[0]; config->modes[0].min_period = pulse_min_period[0]; @@ -2172,6 +2177,12 @@ static NTSTATUS pulse_get_prop_value(void *args) params->vt = VT_UI4; params->ulVal = dev->form; return STATUS_SUCCESS; + case 3: /* PhysicalSpeakers */ + if (!dev->channel_mask) + goto fail; + params->vt = VT_UI4; + params->ulVal = dev->channel_mask; + return STATUS_SUCCESS; default: break; } @@ -2180,6 +2191,7 @@ static NTSTATUS pulse_get_prop_value(void *args) return STATUS_SUCCESS; } +fail: params->result = E_FAIL; return STATUS_SUCCESS; } diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 4acebb1aa8b..9089e2829fc 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -37,7 +37,6 @@ struct pulse_config REFERENCE_TIME def_period; REFERENCE_TIME min_period; } modes[2]; - unsigned int speakers_mask; }; struct endpoint

1 0

Eric Pouech : wiaservc: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 48dc5189342c77b7a67c9cc0f0a7fc813cb3fdd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48dc5189342c77b7a67c9cc0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:41:58 2022 +0100 wiaservc: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/Makefile.in | 1 - dlls/wiaservc/service.c | 6 +++--- dlls/wiaservc/wiadevmgr.c | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wiaservc/Makefile.in b/dlls/wiaservc/Makefile.in index 9d71d10423e..c2ba299c4e3 100644 --- a/dlls/wiaservc/Makefile.in +++ b/dlls/wiaservc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wiaservc.dll IMPORTS = uuid ole32 advapi32 diff --git a/dlls/wiaservc/service.c b/dlls/wiaservc/service.c index 524181f72a0..3d2ba148ea1 100644 --- a/dlls/wiaservc/service.c +++ b/dlls/wiaservc/service.c @@ -69,7 +69,7 @@ ServiceHandler(DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context) SetEvent(stop_event); break; default: - FIXME("ignoring handle service ctrl %x\n", ctrl); + FIXME("ignoring handle service ctrl %lx\n", ctrl); UpdateStatus(status.dwCurrentState, NO_ERROR, 0); break; } @@ -107,7 +107,7 @@ StartCount(void) VOID WINAPI ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) { - TRACE("(%d, %p)\n", dwArgc, lpszArgv); + TRACE("(%ld, %p)\n", dwArgc, lpszArgv); stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); if (!stop_event) { @@ -117,7 +117,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) status_handle = RegisterServiceCtrlHandlerExW(L"stisvc", ServiceHandler, NULL); if (!status_handle) { - ERR("failed to register handler: %u\n", GetLastError()); + ERR("failed to register handler: %lu\n", GetLastError()); return; } diff --git a/dlls/wiaservc/wiadevmgr.c b/dlls/wiaservc/wiadevmgr.c index 58720ef361a..e0156b7f5a2 100644 --- a/dlls/wiaservc/wiadevmgr.c +++ b/dlls/wiaservc/wiadevmgr.c @@ -67,7 +67,7 @@ static ULONG WINAPI enumwiadevinfo_AddRef(IEnumWIA_DEV_INFO *iface) { enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -76,7 +76,7 @@ static ULONG WINAPI enumwiadevinfo_Release(IEnumWIA_DEV_INFO *iface) enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -87,7 +87,7 @@ static HRESULT WINAPI enumwiadevinfo_Next(IEnumWIA_DEV_INFO *iface, ULONG count, { enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); - FIXME("(%p, %d, %p, %p): stub\n", This, count, elem, fetched); + FIXME("(%p, %ld, %p, %p): stub\n", This, count, elem, fetched); *fetched = 0; return E_NOTIMPL; @@ -97,7 +97,7 @@ static HRESULT WINAPI enumwiadevinfo_Skip(IEnumWIA_DEV_INFO *iface, ULONG count) { enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); - FIXME("(%p, %u): stub\n", This, count); + FIXME("(%p, %lu): stub\n", This, count); return E_NOTIMPL; } @@ -182,7 +182,7 @@ static HRESULT WINAPI wiadevmgr_EnumDeviceInfo(IWiaDevMgr *iface, LONG flag, IEn wiadevmgr *This = impl_from_IWiaDevMgr(iface); enumwiadevinfo *enuminfo; - TRACE("(%p)->(%x, %p)\n", This, flag, ret); + TRACE("(%p)->(%lx, %p)\n", This, flag, ret); *ret = NULL; @@ -208,7 +208,7 @@ static HRESULT WINAPI wiadevmgr_SelectDeviceDlg(IWiaDevMgr *iface, HWND hwndPare LONG lFlags, BSTR *pbstrDeviceID, IWiaItem **ppItemRoot) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, %p, %d, 0x%x, %p, %p): stub\n", This, hwndParent, lDeviceType, lFlags, pbstrDeviceID, ppItemRoot); + FIXME("(%p, %p, %ld, 0x%lx, %p, %p): stub\n", This, hwndParent, lDeviceType, lFlags, pbstrDeviceID, ppItemRoot); return E_NOTIMPL; } @@ -216,7 +216,7 @@ static HRESULT WINAPI wiadevmgr_SelectDeviceDlgID(IWiaDevMgr *iface, HWND hwndPa LONG lFlags, BSTR *pbstrDeviceID) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, %p, %d, 0x%x, %p): stub\n", This, hwndParent, lDeviceType, lFlags, pbstrDeviceID); + FIXME("(%p, %p, %ld, 0x%lx, %p): stub\n", This, hwndParent, lDeviceType, lFlags, pbstrDeviceID); return E_NOTIMPL; } @@ -225,7 +225,7 @@ static HRESULT WINAPI wiadevmgr_GetImageDlg(IWiaDevMgr *iface, HWND hwndParent, BSTR bstrFilename, GUID *pguidFormat) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, %p, %d, 0x%x, %d, %p, %s, %s): stub\n", This, hwndParent, lDeviceType, lFlags, + FIXME("(%p, %p, %ld, 0x%lx, %ld, %p, %s, %s): stub\n", This, hwndParent, lDeviceType, lFlags, lIntent, pItemRoot, debugstr_w(bstrFilename), debugstr_guid(pguidFormat)); return E_NOTIMPL; } @@ -235,7 +235,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackProgram(IWiaDevMgr *iface, BSTR bstrName, BSTR bstrDescription, BSTR bstrIcon) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, 0x%x, %s, %s, %s, %s, %s, %s): stub\n", This, lFlags, debugstr_w(bstrDeviceID), + FIXME("(%p, 0x%lx, %s, %s, %s, %s, %s, %s): stub\n", This, lFlags, debugstr_w(bstrDeviceID), debugstr_guid(pEventGUID), debugstr_w(bstrCommandline), debugstr_w(bstrName), debugstr_w(bstrDescription), debugstr_w(bstrIcon)); return E_NOTIMPL; @@ -246,7 +246,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackInterface(IWiaDevMgr *iface IUnknown **pEventObject) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, 0x%x, %s, %s, %p, %p): stub\n", This, lFlags, debugstr_w(bstrDeviceID), + FIXME("(%p, 0x%lx, %s, %s, %p, %p): stub\n", This, lFlags, debugstr_w(bstrDeviceID), debugstr_guid(pEventGUID), pIWiaEventCallback, pEventObject); return E_NOTIMPL; } @@ -256,7 +256,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackCLSID(IWiaDevMgr *iface, LO BSTR bstrDescription, BSTR bstrIcon) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, 0x%x, %s, %s, %s, %s, %s, %s): stub\n", This, lFlags, debugstr_w(bstrDeviceID), + FIXME("(%p, 0x%lx, %s, %s, %s, %s, %s, %s): stub\n", This, lFlags, debugstr_w(bstrDeviceID), debugstr_guid(pEventGUID), debugstr_guid(pClsID), debugstr_w(bstrName), debugstr_w(bstrDescription), debugstr_w(bstrIcon)); return E_NOTIMPL; @@ -265,7 +265,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackCLSID(IWiaDevMgr *iface, LO static HRESULT WINAPI wiadevmgr_AddDeviceDlg(IWiaDevMgr *iface, HWND hwndParent, LONG lFlags) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, %p, 0x%x): stub\n", This, hwndParent, lFlags); + FIXME("(%p, %p, 0x%lx): stub\n", This, hwndParent, lFlags); return E_NOTIMPL; }

1 0

Eric Pouech : win87em.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 0b5bea5e5fe1be9ed35f28d5a46c352544f6f76b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b5bea5e5fe1be9ed35f28d5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:10 2022 +0100 win87em.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win87em.dll16/Makefile.in | 1 - dlls/win87em.dll16/win87em.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/win87em.dll16/Makefile.in b/dlls/win87em.dll16/Makefile.in index b4a9ebea56b..b40ceb0c68d 100644 --- a/dlls/win87em.dll16/Makefile.in +++ b/dlls/win87em.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = win87em.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/win87em.dll16/win87em.c b/dlls/win87em.dll16/win87em.c index c8d454516f1..9a0029b98e9 100644 --- a/dlls/win87em.dll16/win87em.c +++ b/dlls/win87em.dll16/win87em.c @@ -101,7 +101,7 @@ static void WIN87_Init( CONTEXT *context ) */ void WINAPI _fpMath( CONTEXT *context ) { - TRACE("(cs:eip=%04x:%04x es=%04x bx=%04x ax=%04x dx=%04x)\n", + TRACE("(cs:eip=%04lx:%04lx es=%04lx bx=%04lx ax=%04lx dx=%04lx)\n", context->SegCs, context->Eip, context->SegEs, context->Ebx, context->Eax, context->Edx ); @@ -174,7 +174,7 @@ void WINAPI _fpMath( CONTEXT *context ) */ /* FIXME: could someone who really understands asm() fix this please? --AJ */ /* __asm__("fistp %0;wait" : "=m" (dw) : : "memory"); */ - TRACE("On top of stack was %d\n",dw); + TRACE("On top of stack was %ld\n",dw); context->Eax = (context->Eax & ~0xffff) | LOWORD(dw); context->Edx = (context->Edx & ~0xffff) | HIWORD(dw); }

1 0

Eric Pouech : winscard: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 2868116ca2fb68eee75bfdcde461f70e9acf542d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2868116ca2fb68eee75bfdcd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:10 2022 +0100 winscard: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winscard/Makefile.in | 1 - dlls/winscard/winscard.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winscard/Makefile.in b/dlls/winscard/Makefile.in index e162e6d3cda..89449698b66 100644 --- a/dlls/winscard/Makefile.in +++ b/dlls/winscard/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winscard.dll IMPORTLIB = winscard diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index d524483ffc3..accbaf75c3d 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -34,7 +34,7 @@ const SCARD_IO_REQUEST g_rgSCardRawPci = { SCARD_PROTOCOL_RAW, 8 }; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { @@ -84,14 +84,14 @@ LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT context, LPCWSTR reader, LPCWSTR LONG WINAPI SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext) { - FIXME("(%x,%p,%p,%p) stub\n", dwScope, pvReserved1, pvReserved2, phContext); + FIXME("(%lx,%p,%p,%p) stub\n", dwScope, pvReserved1, pvReserved2, phContext); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } LONG WINAPI SCardIsValidContext(SCARDCONTEXT context) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } @@ -105,21 +105,21 @@ LONG WINAPI SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, LPCGUID rgguid LONG WINAPI SCardReleaseContext(SCARDCONTEXT context) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } LONG WINAPI SCardStatusA(SCARDHANDLE context, LPSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } LONG WINAPI SCardStatusW(SCARDHANDLE context, LPWSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState,LPDWORD pdwProtocol,LPBYTE pbAtr,LPDWORD pcbArtLen) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } @@ -131,19 +131,19 @@ void WINAPI SCardReleaseStartedEvent(void) LONG WINAPI SCardListReadersA(SCARDCONTEXT context, const CHAR *groups, CHAR *readers, DWORD *buflen) { - FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); + FIXME("(%Ix, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); return SCARD_E_NO_READERS_AVAILABLE; } LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *buflen) { - FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); + FIXME("(%Ix, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); return SCARD_E_NO_READERS_AVAILABLE; } LONG WINAPI SCardCancel(SCARDCONTEXT context) { - FIXME("(%lx) stub\n", context); + FIXME("(%Ix) stub\n", context); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; }

1 0

Eric Pouech : windowscodecs/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: e5a71cad957f537fccb17e4cc86b3696e90e31ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5a71cad957f537fccb17e4c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:08:26 2022 +0100 windowscodecs/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/pngformat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 50cb7a68a87..875e97cc320 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -815,7 +815,7 @@ static void test_color_formats(void) if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else -todo_wine_if(td[i].todo_load) + todo_wine_if(td[i].todo_load) ok(hr == S_OK, "%d: Failed to load PNG image data (type %d, bpp %d) %#x\n", i, td[i].color_type, td[i].bit_depth, hr); if (hr != S_OK) goto next_1; @@ -843,7 +843,7 @@ next_1: if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else -todo_wine_if(td[i].todo_load) + todo_wine_if(td[i].todo_load) ok(hr == S_OK, "%d: Failed to load PNG image data (type %d, bpp %d) %#x\n", i, td[i].color_type, td[i].bit_depth, hr); if (hr != S_OK) goto next_2; @@ -871,7 +871,7 @@ next_2: if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else -todo_wine_if(td[i].todo_load) + todo_wine_if(td[i].todo_load) ok(hr == S_OK, "%d: Failed to load PNG image data (type %d, bpp %d) %#x\n", i, td[i].color_type, td[i].bit_depth, hr); if (hr != S_OK) goto next_3; @@ -898,7 +898,7 @@ next_3: if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else -todo_wine_if(td[i].todo_load) + todo_wine_if(td[i].todo_load) ok(hr == S_OK, "%d: Failed to load PNG image data (type %d, bpp %d) %#x\n", i, td[i].color_type, td[i].bit_depth, hr); if (hr != S_OK) continue;

1 0