February 2022 - Wine-Commits

Stefan Dösinger : ddraw/tests: Mark random WARP behavior broken in test_ck_default.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 9da1a5059dfcd8722bd0783a898042bb4735412e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9da1a5059dfcd8722bd0783a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 6 20:07:48 2022 +0300 ddraw/tests: Mark random WARP behavior broken in test_ck_default. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 11168d4a74d..304671558af 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2067,7 +2067,11 @@ static void test_ck_default(void) hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + /* Color keying is supposed to be on by default in ddraw1, but used only if a ckey is set. + * WARP begs to differ. The default of D3DRENDERSTATE_COLORKEYENABLE is random, and it + * doesn't mind the absence of a color key (the latter part affects other tests, not this one). */ + ok(compare_color(color, 0x0000ff00, 1) || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x000000ff, 1)), + "Got unexpected color 0x%08x.\n", color); hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr);

1 0

Paul Gofman : server: Always update cached socket name after connect.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 4c1a288f6347522600c9f3561be62c002c631b30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c1a288f6347522600c9f356… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 7 19:14:45 2022 +0300 server: Always update cached socket name after connect. Fixes a regression introduced by 5c009c17b3a212c3f5b0034c465077c0c593daae. For IPV6 socket already bound with bind() with IPV6_V6ONLY set to 0 the address returned by getsockname() may change after it is connected to a IPV4 peer (e. g., from :: to ::ffff:192.0.2.128). The effect of blamed commit is that before that Unix getsockname() was called for each ws2_32 getsockname() and after the commit the socket name is cached at bind and connect. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 40fb0cac535..512b7c0f78e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2340,7 +2340,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) allow_fd_caching( sock->fd ); unix_len = sizeof(unix_addr); - if (!sock->bound && !getsockname( unix_fd, &unix_addr.addr, &unix_len )) + if (!getsockname( unix_fd, &unix_addr.addr, &unix_len )) sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) ); sock->bound = 1;

1 0

Rémi Bernon : dinput/tests: Fix printf warnings with long types.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 19a5881b0b9b29b084a986bfc334513b4dad84cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=19a5881b0b9b29b084a986bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:40 2022 +0100 dinput/tests: Fix printf warnings with long types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/device.c | 126 ++-- dlls/dinput/tests/device8.c | 604 +++++++++---------- dlls/dinput/tests/dinput.c | 210 +++---- dlls/dinput/tests/driver_hid.c | 122 ++-- dlls/dinput/tests/driver_hid.h | 6 +- dlls/dinput/tests/force_feedback.c | 1120 ++++++++++++++++++------------------ dlls/dinput/tests/hid.c | 886 ++++++++++++++-------------- dlls/dinput/tests/hotplug.c | 82 +-- dlls/dinput/tests/joystick.c | 272 ++++----- dlls/dinput/tests/joystick8.c | 1032 ++++++++++++++++----------------- dlls/dinput/tests/keyboard.c | 110 ++-- dlls/dinput/tests/mouse.c | 80 +-- 13 files changed, 2325 insertions(+), 2326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19a5881b0b9b29b084a9…

1 0

Rémi Bernon : dinput: Fix printf warnings with long types.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 9f472f00d88a813adc13d7a8f5de091accafcb52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f472f00d88a813adc13d7a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:39 2022 +0100 dinput: Fix printf warnings with long types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 2 +- dlls/dinput/device.c | 53 +++++++++++------------ dlls/dinput/dinput_main.c | 54 +++++++++++------------ dlls/dinput/joystick_hid.c | 106 ++++++++++++++++++++++----------------------- dlls/dinput/keyboard.c | 12 ++--- dlls/dinput/mouse.c | 12 ++--- dlls/dinput8/Makefile.in | 2 +- 7 files changed, 120 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f472f00d88a813adc13…

1 0

Stefan Dösinger : ddraw/tests: Disable color keying in ddraw1 test_texture_load.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: cbd14598d55d98a9e6f878b9ee74a72613641462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd14598d55d98a9e6f878b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 6 20:07:47 2022 +0300 ddraw/tests: Disable color keying in ddraw1 test_texture_load. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c5afeff2343..11168d4a74d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11872,6 +11872,8 @@ static void test_texture_load(void) emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 4); emit_texture_load(&ptr, dst_texture_handle, src_texture_handle); emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, dst_texture_handle); + /* WARP randomly applies color keying without having a key set. */ + emit_set_rs(&ptr, D3DRENDERSTATE_COLORKEYENABLE, FALSE); emit_tquad(&ptr, 0); emit_end(&ptr); inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData - sizeof(tquad);

1 0

Zebediah Figura : amstream/tests: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator().
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 4e610a078a00d962b3a313ba1dc5c861f3888790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e610a078a00d962b3a313ba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:45 2022 -0600 amstream/tests: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 5b3e78e0583..6b17ba6d430 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1140,7 +1140,8 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, * when it is able to do so it's behavior changes slightly * (e.g. it uses dynamic format change instead of reconnecting in SetFormat). * We don't yet implement the custom allocator so force the standard one for now. */ - hr = BaseOutputPinImpl_InitAllocator(iface, alloc); + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)alloc); ok(hr == S_OK, "Got hr %#x.\n", hr); IMemInputPin_GetAllocatorRequirements(pin, &props);

1 0

Michael Stefaniuc : dmsynth: Implement the synth's Open and Close methods.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 1383b841c5f699c6b75511aedd84c952b39f692e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1383b841c5f699c6b75511ae… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 00:51:59 2022 +0100 dmsynth: Implement the synth's Open and Close methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 4 +- dlls/dmsynth/dmsynth_private.h | 5 +-- dlls/dmsynth/synth.c | 91 +++++++++++++++++++++++++++++++++++++++--- 3 files changed, 90 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index cec89ca80aa..d09d0120023 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -286,7 +286,7 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; @@ -312,7 +312,7 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &GUID_NULL, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index aabf1f56904..0058ce04d3a 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -56,14 +56,13 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void ** * IDirectMusicSynth8Impl implementation structure */ struct IDirectMusicSynth8Impl { - /* IUnknown fields */ IDirectMusicSynth8 IDirectMusicSynth8_iface; IKsControl IKsControl_iface; LONG ref; - - /* IDirectMusicSynth8 fields */ DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; BOOL active; + BOOL open; IReferenceClock *latency_clock; IDirectMusicSynthSink *sink; }; diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index c69d7a340b1..2db80726408 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -94,21 +94,102 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) } /* IDirectMusicSynth8Impl IDirectMusicSynth part: */ -static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, - DMUS_PORTPARAMS *pPortParams) +static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *params) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + BOOL modified = FALSE; + const DMUS_PORTPARAMS def = { + .dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS| + DMUS_PORTPARAMS_AUDIOCHANNELS|DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS| + DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES, + .dwSize = sizeof(def), .dwVoices = 32, .dwChannelGroups = 2, .dwAudioChannels = 2, + .dwSampleRate = 22050, .dwEffectFlags = DMUS_EFFECT_REVERB + }; + + TRACE("(%p, %p)\n", This, params); + + if (This->open) + return DMUS_E_ALREADYOPEN; + if (params && params->dwSize < sizeof(DMUS_PORTPARAMS7)) + return E_INVALIDARG; - FIXME("(%p)->(%p): stub\n", This, pPortParams); + This->open = TRUE; - return S_OK; + if (!params) { + memcpy(&This->params, &def, sizeof(This->params)); + return S_OK; + } + + if (params->dwValidParams & DMUS_PORTPARAMS_VOICES && params->dwVoices) { + if (params->dwVoices > This->caps.dwMaxVoices) { + modified = TRUE; + params->dwVoices = This->caps.dwMaxVoices; + } + } else + params->dwVoices = def.dwVoices; + + if (params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS && params->dwChannelGroups) { + if (params->dwChannelGroups > This->caps.dwMaxChannelGroups) { + modified = TRUE; + params->dwChannelGroups = This->caps.dwMaxChannelGroups; + } + } else + params->dwChannelGroups = def.dwChannelGroups; + + if (params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS && params->dwAudioChannels) { + if (params->dwAudioChannels > This->caps.dwMaxAudioChannels) { + modified = TRUE; + params->dwAudioChannels = This->caps.dwMaxAudioChannels; + } + } else + params->dwAudioChannels = def.dwAudioChannels; + + if (params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE && params->dwSampleRate) { + if (params->dwSampleRate > 96000) { + modified = TRUE; + params->dwSampleRate = 96000; + } else if (params->dwSampleRate < 11025) { + modified = TRUE; + params->dwSampleRate = 11025; + } + } else + params->dwSampleRate = def.dwSampleRate; + + if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS && params->dwEffectFlags != def.dwEffectFlags) + modified = TRUE; + params->dwEffectFlags = def.dwEffectFlags; + + if (params->dwValidParams & DMUS_PORTPARAMS_SHARE && params->fShare) + modified = TRUE; + params->fShare = FALSE; + + if (params->dwSize >= sizeof(params)) { + if (params->dwValidParams & DMUS_PORTPARAMS_FEATURES && params->dwFeatures) { + if (params->dwFeatures & ~(DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING)) { + modified = TRUE; + params->dwFeatures &= DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING; + } + } else + params->dwFeatures = def.dwFeatures; + params->dwValidParams = def.dwValidParams; + } else + params->dwValidParams = def.dwValidParams & ~DMUS_PORTPARAMS_FEATURES; + + memcpy(&This->params, params, min(params->dwSize, sizeof(This->params))); + + return modified ? S_FALSE : S_OK; } static HRESULT WINAPI IDirectMusicSynth8Impl_Close(IDirectMusicSynth8 *iface) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)\n", This); + + if (!This->open) + return DMUS_E_ALREADYCLOSED; + + This->open = FALSE; return S_OK; }

1 0

Eric Pouech : avifil32: Enable compilation with long types.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: beb7695d06d7df38eea7a7663771b72ead653727 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb7695d06d7df38eea7a766… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:11:21 2022 +0100 avifil32: 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/avifil32/Makefile.in | 1 - dlls/avifil32/acmstream.c | 26 +++++++++---------- dlls/avifil32/api.c | 58 +++++++++++++++++++++---------------------- dlls/avifil32/avifile.c | 62 +++++++++++++++++++++++----------------------- dlls/avifil32/editstream.c | 34 ++++++++++++------------- dlls/avifil32/extrachunk.c | 4 +-- dlls/avifil32/factory.c | 6 ++--- dlls/avifil32/getframe.c | 4 +-- dlls/avifil32/icmstream.c | 28 ++++++++++----------- dlls/avifil32/tmpfile.c | 14 +++++------ dlls/avifil32/wavfile.c | 34 ++++++++++++------------- 11 files changed, 135 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=beb7695d06d7df38eea7…

1 0

Eric Pouech : appwiz.cpl: Enable compilation with long types.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: e9c84cca2d4f763585e701ec8280f142dcaa8205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9c84cca2d4f763585e701ec… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:58 2022 +0100 appwiz.cpl: 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/appwiz.cpl/Makefile.in | 1 - dlls/appwiz.cpl/addons.c | 12 ++++++------ dlls/appwiz.cpl/appwiz.c | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 1ba9760d41a..91af64cceec 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = appwiz.cpl IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 bcrypt kernelbase DELAYIMPORTS = msi diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 71919f225c8..1d87eac5b1a 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -127,7 +127,7 @@ static BOOL sha_check(const WCHAR *file_name) file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); if(file == INVALID_HANDLE_VALUE) { - WARN("Could not open file: %u\n", GetLastError()); + WARN("Could not open file: %lu\n", GetLastError()); return FALSE; } @@ -189,7 +189,7 @@ static enum install_res install_file(const WCHAR *file_name) if(res == ERROR_PRODUCT_VERSION) res = MsiInstallProductW(file_name, L"REINSTALL=ALL REINSTALLMODE=vomus"); if(res != ERROR_SUCCESS) { - ERR("MsiInstallProduct failed: %u\n", res); + ERR("MsiInstallProduct failed: %lu\n", res); return INSTALL_FAILED; } @@ -218,7 +218,7 @@ static enum install_res install_from_dos_file(const WCHAR *dir, const WCHAR *sub hr = PathAllocCanonicalize( path, PATHCCH_ALLOW_LONG_PATHS, &canonical_path ); if (FAILED( hr )) { - ERR( "Failed to canonicalize %s, hr %#x\n", debugstr_w(path), hr ); + ERR( "Failed to canonicalize %s, hr %#lx\n", debugstr_w(path), hr ); heap_free( path ); return INSTALL_NEXT; } @@ -350,7 +350,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) if (ensure_exists && !CreateDirectoryW( cache_dir, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) { - WARN( "%s does not exist and could not be created (%u)\n", debugstr_w(cache_dir), GetLastError() ); + WARN( "%s does not exist and could not be created (%lu)\n", debugstr_w(cache_dir), GetLastError() ); heap_free( cache_dir ); return NULL; } @@ -367,7 +367,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) if (ensure_exists && !CreateDirectoryW( ret, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) { - WARN( "%s does not exist and could not be created (%u)\n", debugstr_w(ret), GetLastError() ); + WARN( "%s does not exist and could not be created (%lu)\n", debugstr_w(ret), GetLastError() ); heap_free( ret ); return NULL; } @@ -477,7 +477,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, if(hresult == E_ABORT) TRACE("Binding aborted\n"); else - ERR("Binding failed %08x\n", hresult); + ERR("Binding failed %08lx\n", hresult); return S_OK; } diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 410de81043d..593c8644b7e 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -89,7 +89,7 @@ static const WCHAR PathUninstallW[] = L"Software\\Microsoft\\Windows\\CurrentVer BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) {

1 0

Eric Pouech : atl: Enable compilation with long types.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 44b76784ec9070ce01c4bfb6e60e64f1f290f956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44b76784ec9070ce01c4bfb6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:11:04 2022 +0100 atl: 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/atl/Makefile.in | 2 +- dlls/atl/atl.c | 18 +++++++++--------- dlls/atl/atl30.c | 4 ++-- dlls/atl/atl_ax.c | 16 ++++++++-------- dlls/atl/registrar.c | 16 ++++++++-------- dlls/atl100/Makefile.in | 2 +- dlls/atl110/Makefile.in | 2 +- dlls/atl80/Makefile.in | 2 +- dlls/atl90/Makefile.in | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44b76784ec9070ce01c4…

1 0