February 2022 - Wine-Commits

Eric Pouech : sapi: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 341d9a4c59a44b318c3b013ccfa89d006908200a URL: https://source.winehq.org/git/wine.git/?a=commit;h=341d9a4c59a44b318c3b013c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:21 2022 +0100 sapi: 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/sapi/Makefile.in | 1 - dlls/sapi/automation.c | 26 +++++++++++++------------- dlls/sapi/resource.c | 4 ++-- dlls/sapi/stream.c | 18 +++++++++--------- dlls/sapi/token.c | 20 ++++++++++---------- dlls/sapi/tts.c | 48 ++++++++++++++++++++++++------------------------ 6 files changed, 58 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=341d9a4c59a44b318c3b…

1 0

Eric Pouech : schannel: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 486ad92d55728a60662fefa0e485fab0ca5ec926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=486ad92d55728a60662fefa0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:27 2022 +0100 schannel: 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/schannel/Makefile.in | 1 - dlls/schannel/lsamode.c | 2 +- dlls/schannel/schannel_main.c | 4 ++-- dlls/schannel/usermode.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/schannel/Makefile.in b/dlls/schannel/Makefile.in index 7493cf9dd5b..84c4480cf2d 100644 --- a/dlls/schannel/Makefile.in +++ b/dlls/schannel/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = schannel.dll IMPORTS = secur32 diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c index 372c5800b38..cb71115c64b 100644 --- a/dlls/schannel/lsamode.c +++ b/dlls/schannel/lsamode.c @@ -166,7 +166,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NTSTATUS WINAPI SpLsaModeInitialize(ULONG LsaVersion, PULONG PackageVersion, PSECPKG_FUNCTION_TABLE *ppTables, PULONG pcTables) { - TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); + TRACE("(%lu, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); *PackageVersion = SECPKG_INTERFACE_VERSION_8; *pcTables = 2; diff --git a/dlls/schannel/schannel_main.c b/dlls/schannel/schannel_main.c index dad82c9efd2..c0a11783e63 100644 --- a/dlls/schannel/schannel_main.c +++ b/dlls/schannel/schannel_main.c @@ -29,12 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(schannel); BOOL WINAPI SslEmptyCacheA(LPSTR target, DWORD flags) { - FIXME("%s %x\n", debugstr_a(target), flags); + FIXME("%s %lx\n", debugstr_a(target), flags); return TRUE; } BOOL WINAPI SslEmptyCacheW(LPWSTR target, DWORD flags) { - FIXME("%s %x\n", debugstr_w(target), flags); + FIXME("%s %lx\n", debugstr_w(target), flags); return TRUE; } diff --git a/dlls/schannel/usermode.c b/dlls/schannel/usermode.c index 0713f822f91..1049be8bcef 100644 --- a/dlls/schannel/usermode.c +++ b/dlls/schannel/usermode.c @@ -72,7 +72,7 @@ static SECPKG_USER_FUNCTION_TABLE secPkgUserTables[2] = NTSTATUS WINAPI SpUserModeInitialize(ULONG LsaVersion, PULONG PackageVersion, PSECPKG_USER_FUNCTION_TABLE *ppTables, PULONG pcTables) { - TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); + TRACE("(%lu, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); if (LsaVersion != SECPKG_INTERFACE_VERSION) return STATUS_INVALID_PARAMETER;

1 0

Eric Pouech : riched20: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 42d0e56643740a0eac5913a9f176e789457cb475 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42d0e56643740a0eac5913a9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:43 2022 +0100 riched20: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/Makefile.in | 1 - dlls/riched20/caret.c | 2 +- dlls/riched20/clipboard.c | 20 +-- dlls/riched20/editor.c | 22 ++-- dlls/riched20/para.c | 16 +-- dlls/riched20/richole.c | 304 +++++++++++++++++++++++----------------------- dlls/riched20/run.c | 2 +- dlls/riched20/style.c | 4 +- dlls/riched20/txthost.c | 16 +-- dlls/riched20/txtsrv.c | 12 +- dlls/riched20/wrap.c | 6 +- dlls/riched20/writer.c | 38 +++--- 12 files changed, 221 insertions(+), 222 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42d0e56643740a0eac59…

1 0

Matteo Bruni : ddraw: Filter out redundant discard maps.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 6784684abf7eae7d331fb95988ef1e85a97ddb1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6784684abf7eae7d331fb959… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 17 00:13:50 2022 -0600 ddraw: Filter out redundant discard maps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 4 ++++ dlls/ddraw/vertexbuffer.c | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7929e9e1795..0c2a491d45b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -22,6 +22,7 @@ #include <assert.h> #include <limits.h> #include <math.h> +#include <stdbool.h> #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -598,6 +599,7 @@ struct d3d_vertex_buffer DWORD fvf; DWORD size; BOOL dynamic; + bool discarded; }; HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **buffer, struct ddraw *ddraw, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6e8f109173b..860dffc5045 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4293,6 +4293,8 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE return D3D_OK; } + vb_impl->discarded = false; + stride = get_flexible_vertex_size(vb_impl->fvf); if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY) @@ -4412,6 +4414,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return D3D_OK; } + vb_impl->discarded = false; + if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY) { TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawIndexedPrimitive().\n"); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index dd35b445cc5..fa0e4f4c41a 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -159,10 +159,14 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, if (buffer->version != 7) flags &= ~(DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS); + if (buffer->discarded) + flags &= ~DDLOCK_DISCARDCONTENTS; + if (!(flags & DDLOCK_WAIT)) flags |= DDLOCK_DONOTWAIT; if (flags & DDLOCK_DISCARDCONTENTS) { + buffer->discarded = true; if (!buffer->dynamic) { struct wined3d_buffer *new_buffer;

1 0

Eric Pouech : sane.ds: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 6b6e863c525cb8d1728d132f3f9f49b4db157ca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b6e863c525cb8d1728d132f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:15 2022 +0100 sane.ds: 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/sane.ds/Makefile.in | 1 - dlls/sane.ds/capability.c | 12 ++++++------ dlls/sane.ds/ds_ctrl.c | 2 +- dlls/sane.ds/sane_main.c | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index 9c4931a0b54..59ceeda3fac 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sane.ds UNIXLIB = sane.so IMPORTS = comctl32 user32 gdi32 diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 8c0922ca176..15ca4ea740a 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -198,7 +198,7 @@ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action if (twCC == TWCC_SUCCESS) { activeDS.capXferMech = (TW_UINT16) val; - FIXME("Partial Stub: XFERMECH set to %d, but ignored\n", val); + FIXME("Partial Stub: XFERMECH set to %ld, but ignored\n", val); } break; @@ -242,7 +242,7 @@ static TW_UINT16 SANE_CAPXferCount (pTW_CAPABILITY pCapability, TW_UINT16 action case MSG_SET: twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) - FIXME("Partial Stub: XFERCOUNT set to %d, but ignored\n", val); + FIXME("Partial Stub: XFERCOUNT set to %ld, but ignored\n", val); break; case MSG_GETDEFAULT: @@ -326,7 +326,7 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) { - TRACE("Setting pixeltype to %d\n", val); + TRACE("Setting pixeltype to %ld\n", val); if (! pixeltype_to_sane_mode(val, mode, sizeof(mode))) return TWCC_BADVALUE; @@ -493,7 +493,7 @@ static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 act case MSG_SET: twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) - FIXME("Partial Stub: COMPRESSION set to %d, but ignored\n", val); + FIXME("Partial Stub: COMPRESSION set to %ld, but ignored\n", val); break; case MSG_GETDEFAULT: @@ -659,7 +659,7 @@ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 act twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) { - FIXME("Stub: PIXELFLAVOR set to %d, but ignored\n", val); + FIXME("Stub: PIXELFLAVOR set to %ld, but ignored\n", val); } break; @@ -822,7 +822,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 if (supported_sizes[i].size == val) return set_width_height(supported_sizes[i].x, supported_sizes[i].y); - ERR("Unsupported size %d\n", val); + ERR("Unsupported size %ld\n", val); twCC = TWCC_BADCAP; break; diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 915f085a481..79c268a36ae 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -176,7 +176,7 @@ TW_UINT16 SANE_ProcessEvent (pTW_IDENTITY pOrigin, pTW_EVENT pEvent = (pTW_EVENT) pData; MSG *pMsg = pEvent->pEvent; - TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%lx\n", pMsg->message, pMsg->wParam); + TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%Ix\n", pMsg->message, pMsg->wParam); activeDS.twCC = TWCC_SUCCESS; pEvent->TWMessage = MSG_NULL; /* no message to the application */ diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 48972bd4b8c..832c333ae57 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -34,7 +34,7 @@ unixlib_handle_t sane_handle = 0; 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) { @@ -333,7 +333,7 @@ DS_Entry ( pTW_IDENTITY pOrigin, { TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ - TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); + TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); switch (DG) {

1 0

Huw Davies : winealsa: Explicitly store the name and channel count in the audio client.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 8e13b4bd0c21e7fca51c033c384e6b2d7a8bc41c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e13b4bd0c21e7fca51c033c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 16 09:34:47 2022 +0000 winealsa: Explicitly store the name and channel count in the audio client. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 516bba1e5fc..abec9dc969a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -119,6 +119,7 @@ struct ACImpl { AUDCLNT_SHAREMODE share; HANDLE event; float *vols; + UINT32 channel_count; BOOL need_remapping; int alsa_channels; @@ -145,6 +146,9 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; struct list entry; + + /* Keep at end */ + char alsa_name[1]; }; typedef struct _SessionMgr { @@ -472,6 +476,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient char alsa_name[256]; EDataFlow dataflow; HRESULT hr; + int len; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); @@ -481,7 +486,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient if(dataflow != eRender && dataflow != eCapture) return E_UNEXPECTED; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); + len = strlen(alsa_name); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, offsetof(ACImpl, alsa_name[len + 1])); if(!This) return E_OUTOFMEMORY; @@ -499,6 +505,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } This->dataflow = dataflow; + memcpy(This->alsa_name, alsa_name, len + 1); + err = snd_pcm_open(&This->pcm_handle, alsa_name, alsa_get_direction(dataflow), SND_PCM_NONBLOCK); if(err < 0){ HeapFree(GetProcessHeap(), 0, This); @@ -1159,19 +1167,20 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } silence_buffer(This, This->silence_buf, This->alsa_period_frames); - This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); + This->channel_count = fmt->nChannels; + This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ hr = E_OUTOFMEMORY; goto exit; } - for(i = 0; i < fmt->nChannels; ++i) + for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; This->share = mode; This->flags = flags; - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, + hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); if(FAILED(hr)) goto exit; @@ -3385,7 +3394,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if(!out) return E_POINTER; - *out = This->fmt->nChannels; + *out = This->channel_count; return S_OK; } @@ -3400,7 +3409,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(level < 0.f || level > 1.f) return E_INVALIDARG; - if(index >= This->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; TRACE("ALSA does not support volume control\n"); @@ -3424,7 +3433,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if(!level) return E_POINTER; - if(index >= This->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; *level = This->vols[index]; @@ -3443,7 +3452,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; TRACE("ALSA does not support volume control\n"); @@ -3469,7 +3478,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&This->lock);

1 0

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

Feb. 17, 2022

Module: wine Branch: master Commit: 422f362ada7245ab4a087c0a88fec942b39a066f URL: https://source.winehq.org/git/wine.git/?a=commit;h=422f362ada7245ab4a087c0a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:13:09 2022 +0100 setupx.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/setupx.dll16/Makefile.in | 1 - dlls/setupx.dll16/devinst16.c | 2 +- dlls/setupx.dll16/setupx_main.c | 4 ++-- dlls/setupx.dll16/virtcopy.c | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/setupx.dll16/Makefile.in b/dlls/setupx.dll16/Makefile.in index 3d7de3d3dff..d7d6555baf0 100644 --- a/dlls/setupx.dll16/Makefile.in +++ b/dlls/setupx.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = setupx.dll16 IMPORTS = setupapi user32 advapi32 diff --git a/dlls/setupx.dll16/devinst16.c b/dlls/setupx.dll16/devinst16.c index 55f38b021eb..9775c19329f 100644 --- a/dlls/setupx.dll16/devinst16.c +++ b/dlls/setupx.dll16/devinst16.c @@ -104,7 +104,7 @@ RETERR16 WINAPI DiCreateDeviceInfo16(LPLPDEVICE_INFO16 lplpdi, LPCSTR lpszClassName, HWND16 hwndParent) { LPDEVICE_INFO16 lpdi; - FIXME("(%p %s %08x %x %s %s %x): stub\n", lplpdi, + FIXME("(%p %s %08lx %x %s %s %x): stub\n", lplpdi, debugstr_a(lpszDescription), dnDevnode, hkey, debugstr_a(lpszRegsubkey), debugstr_a(lpszClassName), hwndParent); lpdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DEVICE_INFO16)); diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c index 9245ead9c59..19de9480ee3 100644 --- a/dlls/setupx.dll16/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -86,7 +86,7 @@ DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName, LPDWORD lpdwReserved, LPDWORD lpdwType, LPBYTE lpbData, LPDWORD lpcbData ) { - FIXME("(%p,%s,%p,%p,%p,%d), semi-stub.\n",hkey,debugstr_a(lpszValueName), + FIXME("(%p,%s,%p,%p,%p,%ld), semi-stub.\n",hkey,debugstr_a(lpszValueName), lpdwReserved,lpdwType,lpbData,lpcbData?*lpcbData:0); return RegQueryValueExA( hkey, lpszValueName, lpdwReserved, lpdwType, lpbData, lpcbData ); @@ -608,7 +608,7 @@ RETERR16 WINAPI CtlGetLddPath16(LOGDISKID16 ldid, LPSTR szPath) */ RETERR16 WINAPI DiInstallClass16(LPCSTR lpszInfFileName, DWORD dwFlags) { - FIXME("(%s, %u), stub.\n", lpszInfFileName, dwFlags); + FIXME("(%s, %lu), stub.\n", lpszInfFileName, dwFlags); return 0; } diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index d6bcab6611f..552db5a9895 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -408,7 +408,7 @@ LPCSTR WINAPI VcpExplain16(LPVIRTNODE lpVn, DWORD dwWhat) } break; default: - FIXME("%d unimplemented !\n", dwWhat); + FIXME("%ld unimplemented !\n", dwWhat); strcpy(buffer, "Unknown error"); break; } @@ -517,7 +517,7 @@ RETERR16 WINAPI vcpDefCallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, { static int count = 0; if (count < 10) - FIXME("(%p, %04x, %04lx, %08lx, %08lx) - what to do here ?\n", + FIXME("(%p, %04x, %04x, %08lx, %08lx) - what to do here ?\n", lpvObj, uMsg, wParam, lParam, lParamRef); count++; return OK; @@ -669,7 +669,7 @@ RETERR16 WINAPI vcpUICallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, RETERR16 res = VCPN_OK; if (count < 5) - FIXME("(%p, %04x, %04lx, %08lx, %08lx) - semi-stub\n", + FIXME("(%p, %04x, %04x, %08lx, %08lx) - semi-stub\n", lpvObj, uMsg, wParam, lParam, lParamRef); count++; switch (uMsg)

1 0

Eric Pouech : serialui: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 491ef8f3df24119338229546e7f44607cd207b9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=491ef8f3df24119338229546… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:57 2022 +0100 serialui: 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/serialui/Makefile.in | 1 - dlls/serialui/confdlg.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index c7a03a98d93..6c22afda68e 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = serialui.dll IMPORTS = user32 advapi32 diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index 23c9eb68c2a..e35ceb1f36b 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -61,7 +61,7 @@ static HMODULE SERIALUI_hModule; 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) { case DLL_PROCESS_ATTACH: @@ -86,7 +86,7 @@ typedef LPVOID LPDEVICE_INFO; typedef LPVOID LPFNADDPROPSHEETPAGE; BOOL WINAPI EnumPropPages(LPDEVICE_INFO pdi, LPFNADDPROPSHEETPAGE pfnAdd, LPARAM lParam ) { - FIXME("(%p %p %lx)\n",pdi,pfnAdd,lParam); + FIXME("(%p %p %Ix)\n",pdi,pfnAdd,lParam); return FALSE; } @@ -170,13 +170,13 @@ static BOOL SERIALUI_GetConfItems(HWND hDlg, DWORD id, LPCPARAM2STR table, LPDWO if( (!hControl) || (!lpdwVal)) { - TRACE("Couldn't get window handle for item %x\n",id); + TRACE("Couldn't get window handle for item %lx\n",id); return FALSE; } if(!GetWindowTextA(hControl, &lpEntry[0], sizeof(lpEntry))) { - TRACE("Couldn't get window text for item %x\n",id); + TRACE("Couldn't get window text for item %lx\n",id); return FALSE; } /* TRACE("%ld contains %s\n",id, lpEntry); */ @@ -286,7 +286,7 @@ static void SERIALUI_DialogInfoToDCB(HWND hDlg, SERIALUI_DialogInfo *info) SERIALUI_GetConfItems( hDlg, IDC_DATA, &SERIALUI_Data2Str, &dwByteSize); SERIALUI_GetConfItems( hDlg, IDC_FLOW, &SERIALUI_Flow2Str, &dwFlowControl ); - TRACE("baud=%d stop=%d parity=%d data=%d flow=%d\n", + TRACE("baud=%ld stop=%ld parity=%ld data=%ld flow=%ld\n", dwBaudRate, dwStopBits, dwParity, dwByteSize, dwFlowControl); lpdcb->BaudRate = dwBaudRate; @@ -477,7 +477,7 @@ BOOL WINAPI drvSetDefaultCommConfigW( WCHAR szKeyName[100]; DWORD r,dwDCBSize; - TRACE("%p %p %x\n",lpszDevice,lpCommConfig,dwSize); + TRACE("%p %p %lx\n",lpszDevice,lpCommConfig,dwSize); if(!lpCommConfig) return FALSE; @@ -495,7 +495,7 @@ BOOL WINAPI drvSetDefaultCommConfigW( { dwDCBSize = sizeof (DCB); r = RegSetValueExW(hKeyPort, L"DCB", 0, REG_BINARY, (BYTE *)&lpCommConfig->dcb, dwDCBSize); - TRACE("write key r=%d\n",r); + TRACE("write key r=%ld\n",r); RegCloseKey(hKeyPort); } @@ -530,7 +530,7 @@ DWORD WINAPI drvGetDefaultCommConfigW( WCHAR szKeyName[100]; DWORD r,dwSize,dwType; - TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_w(lpszDevice), lpCommConfig, lpdwSize, lpdwSize ? *lpdwSize : 0); + TRACE("(%s, %p, %p) *lpdwSize: %lu\n", debugstr_w(lpszDevice), lpCommConfig, lpdwSize, lpdwSize ? *lpdwSize : 0); if ((!lpszDevice) || (!lpCommConfig) || (!lpdwSize)) { return ERROR_INVALID_PARAMETER;

1 0

Eric Pouech : scrobj: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: c2383fcf3e467f78f98f73522b3d27ccfe77a658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2383fcf3e467f78f98f7352… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:51 2022 +0100 scrobj: 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/scrobj/Makefile.in | 1 - dlls/scrobj/scrobj.c | 84 ++++++++++++++++++++++++------------------------- 2 files changed, 42 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2383fcf3e467f78f98f…

1 0

Eric Pouech : sechost: Enable compilation with long types.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 15bf49bf9b938eadd1368922a2d8e2c71824049d URL: https://source.winehq.org/git/wine.git/?a=commit;h=15bf49bf9b938eadd1368922… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:12:39 2022 +0100 sechost: 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/sechost/Makefile.in | 1 - dlls/sechost/security.c | 6 ++-- dlls/sechost/service.c | 88 ++++++++++++++++++++++++------------------------ dlls/sechost/trace.c | 14 ++++---- 4 files changed, 54 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=15bf49bf9b938eadd136…

1 0