February 2022 - Wine-Commits

Huw Davies : winealsa: Move get_latency to the unixlib.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 5516e83f9aceaa7887dc1d2cb207dafc7c56501f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5516e83f9aceaa7887dc1d2c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 23 09:08:22 2022 +0000 winealsa: Move get_latency to the unixlib. 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/alsa.c | 22 ++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 20 +++++--------------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index cc0f9166d1a..c40c87bca31 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1250,6 +1250,27 @@ static NTSTATUS get_buffer_size(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_latency(void *args) +{ + struct get_latency_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + /* Hide some frames in the ALSA buffer. Allows us to return GetCurrentPadding=0 + * yet have enough data left to play (as if it were in native's mixer). Add: + * + mmdevapi_period such that at the end of it, ALSA still has data; + * + EXTRA_SAFE (~4ms) to allow for late callback invocation / fluctuation; + * + alsa_period such that ALSA always has at least one period to play. */ + if(stream->flow == eRender) + *params->latency = muldiv(stream->hidden_frames, 10000000, stream->fmt->nSamplesPerSec); + else + *params->latency = muldiv(stream->alsa_period_frames, 10000000, stream->fmt->nSamplesPerSec) + + stream->mmdev_period_rt; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1258,4 +1279,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = is_format_supported, get_mix_format, get_buffer_size, + get_latency, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 46fd2b3aef5..b8fc6802e28 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -849,7 +849,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *latency) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct get_latency_params params; TRACE("(%p)->(%p)\n", This, latency); @@ -859,22 +859,12 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - /* Hide some frames in the ALSA buffer. Allows us to return GetCurrentPadding=0 - * yet have enough data left to play (as if it were in native's mixer). Add: - * + mmdevapi_period such that at the end of it, ALSA still has data; - * + EXTRA_SAFE (~4ms) to allow for late callback invocation / fluctuation; - * + alsa_period such that ALSA always has at least one period to play. */ - if(stream->flow == eRender) - *latency = MulDiv(stream->hidden_frames, 10000000, stream->fmt->nSamplesPerSec); - else - *latency = MulDiv(stream->alsa_period_frames, 10000000, stream->fmt->nSamplesPerSec) - + stream->mmdev_period_rt; + params.stream = This->stream; + params.latency = latency; - alsa_unlock(stream); + ALSA_CALL(get_latency, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e079b88cbde..e51d3d3d510 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -115,6 +115,13 @@ struct get_buffer_size_params UINT32 *size; }; +struct get_latency_params +{ + struct alsa_stream *stream; + HRESULT result; + REFERENCE_TIME *latency; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -123,6 +130,7 @@ enum alsa_funcs alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, + alsa_get_latency, }; extern unixlib_handle_t alsa_handle;

1 0

Huw Davies : winealsa: Move get_buffer_size to the unixlib.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 413b3c59e5a401797a584cd4ead127c5b697d789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=413b3c59e5a401797a584cd4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 23 09:08:21 2022 +0000 winealsa: Move get_buffer_size to the unixlib. 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/alsa.c | 31 +++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 11 +++++------ dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index f79a655780c..cc0f9166d1a 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -160,6 +160,24 @@ static int muldiv( int a, int b, int c ) return ret; } +static void alsa_lock(struct alsa_stream *stream) +{ + pthread_mutex_lock(&stream->lock); +} + +static void alsa_unlock(struct alsa_stream *stream) +{ + pthread_mutex_unlock(&stream->lock); +} + +static NTSTATUS alsa_unlock_result(struct alsa_stream *stream, + HRESULT *result, HRESULT value) +{ + *result = value; + alsa_unlock(stream); + return STATUS_SUCCESS; +} + static BOOL alsa_try_open(const char *devnode, EDataFlow flow) { snd_pcm_t *handle; @@ -1220,6 +1238,18 @@ exit: return STATUS_SUCCESS; } +static NTSTATUS get_buffer_size(void *args) +{ + struct get_buffer_size_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + *params->size = stream->bufsize_frames; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1227,4 +1257,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, is_format_supported, get_mix_format, + get_buffer_size, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a1477dbe850..46fd2b3aef5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -827,7 +827,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, UINT32 *out) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct get_buffer_size_params params; TRACE("(%p)->(%p)\n", This, out); @@ -837,13 +837,12 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - *out = stream->bufsize_frames; + params.stream = This->stream; + params.size = out; - alsa_unlock(stream); + ALSA_CALL(get_buffer_size, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 771f189bca4..e079b88cbde 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -108,6 +108,13 @@ struct get_mix_format_params HRESULT result; }; +struct get_buffer_size_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT32 *size; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -115,6 +122,7 @@ enum alsa_funcs alsa_release_stream, alsa_is_format_supported, alsa_get_mix_format, + alsa_get_buffer_size, }; extern unixlib_handle_t alsa_handle;

1 0

Eric Pouech : fusion/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 2d0e84e60196693d1caa6e2d70422051b56cfe08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0e84e60196693d1caa6e2d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:29:46 2022 +0100 fusion/tests: 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/fusion/tests/Makefile.in | 1 - dlls/fusion/tests/asmcache.c | 344 +++++++++++++++++++++--------------------- dlls/fusion/tests/asmenum.c | 82 +++++----- dlls/fusion/tests/asmname.c | 316 +++++++++++++++++++------------------- dlls/fusion/tests/fusion.c | 22 +-- 5 files changed, 382 insertions(+), 383 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d0e84e60196693d1caa…

1 0

Eric Pouech : dxdiagn/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 309a564dccf93dc952f6379ac23dcbf631311e87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=309a564dccf93dc952f6379a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:29:15 2022 +0100 dxdiagn/tests: 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/dxdiagn/tests/Makefile.in | 1 - dlls/dxdiagn/tests/container.c | 174 ++++++++++++++++++++--------------------- dlls/dxdiagn/tests/provider.c | 30 +++---- 3 files changed, 102 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=309a564dccf93dc952f6…

1 0

Eric Pouech : dpvoice/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 2b78dfb5bcf51197f4ce048de607424db85596f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b78dfb5bcf51197f4ce048d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:32 2022 +0100 dpvoice/tests: 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/dpvoice/tests/Makefile.in | 1 - dlls/dpvoice/tests/voice.c | 100 ++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b78dfb5bcf51197f4ce…

1 0

Rémi Bernon : dinput/tests: Add tests for IGamepadStatics_get_Gamepads.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 3c2bb0f87c48faf17adc5f2ae8a1229043b7ee70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2bb0f87c48faf17adc5f2a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 23 17:49:39 2022 +0100 dinput/tests: Add tests for IGamepadStatics_get_Gamepads. Showing that HID gamepads aren't listed as WGI gamepads. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index d98faf7d3ee..f01bed08030 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3271,11 +3271,14 @@ static void test_windows_gaming_input(void) .InputReportByteLength = 8, }; static const WCHAR *controller_class_name = RuntimeClass_Windows_Gaming_Input_RawGameController; + static const WCHAR *gamepad_class_name = RuntimeClass_Windows_Gaming_Input_Gamepad; IRawGameController *raw_controller, *tmp_raw_controller; IVectorView_RawGameController *controllers_view; IRawGameControllerStatics *controller_statics; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IVectorView_Gamepad *gamepads_view; + IGamepadStatics *gamepad_statics; IGameController *game_controller; UINT32 size; HSTRING str; @@ -3331,6 +3334,21 @@ static void test_windows_gaming_input(void) goto done; } + /* HID gamepads aren't exposed as WGI gamepads on Windows */ + + hr = WindowsCreateString( gamepad_class_name, wcslen( gamepad_class_name ), &str ); + ok( hr == S_OK, "WindowsCreateString returned %#lx\n", hr ); + hr = RoGetActivationFactory( str, &IID_IGamepadStatics, (void **)&gamepad_statics ); + ok( hr == S_OK, "RoGetActivationFactory returned %#lx\n", hr ); + WindowsDeleteString( str ); + hr = IGamepadStatics_get_Gamepads( gamepad_statics, &gamepads_view ); + ok( hr == S_OK, "get_Gamepads returned %#lx\n", hr ); + hr = IVectorView_Gamepad_get_Size( gamepads_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 0, "got size %u\n", size ); + IVectorView_Gamepad_Release( gamepads_view ); + IGamepadStatics_Release( gamepad_statics ); + check_runtimeclass( raw_controller, RuntimeClass_Windows_Gaming_Input_RawGameController ); check_interface( raw_controller, &IID_IUnknown, TRUE ); check_interface( raw_controller, &IID_IInspectable, TRUE );

1 0

Huw Davies : winealsa: Move get_current_padding to the unixlib.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 45f1cbe476b27443d62cb73bb085cb89784b9648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45f1cbe476b27443d62cb73b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 23 09:08:23 2022 +0000 winealsa: Move get_current_padding to the unixlib. 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/alsa.c | 14 ++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 12 +++++------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index c40c87bca31..c73490ebfe6 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1271,6 +1271,19 @@ static NTSTATUS get_latency(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_current_padding(void *args) +{ + struct get_current_padding_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + /* padding is solely updated at callback time in shared mode */ + *params->padding = stream->held_frames; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1280,4 +1293,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_mix_format, get_buffer_size, get_latency, + get_current_padding, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b8fc6802e28..a4ab0e179d1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -871,7 +871,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *out) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct get_current_padding_params params; TRACE("(%p)->(%p)\n", This, out); @@ -881,16 +881,14 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); + params.stream = This->stream; + params.padding = out; - /* padding is solely updated at callback time in shared mode */ - *out = stream->held_frames; - - alsa_unlock(stream); + ALSA_CALL(get_current_padding, &params); TRACE("pad: %u\n", *out); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e51d3d3d510..2484fca8c90 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -122,6 +122,13 @@ struct get_latency_params REFERENCE_TIME *latency; }; +struct get_current_padding_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT32 *padding; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -131,6 +138,7 @@ enum alsa_funcs alsa_get_mix_format, alsa_get_buffer_size, alsa_get_latency, + alsa_get_current_padding, }; extern unixlib_handle_t alsa_handle;

1 0

Eric Pouech : explorerframe/tests: Use correct integral type.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 4bd7b55df3eb85b6ed30b1a3068d69fc264d185e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bd7b55df3eb85b6ed30b1a3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:29:28 2022 +0100 explorerframe/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/nstc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 6433b69ebf8..617c93d9b09 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -910,7 +910,7 @@ static void test_basics(void) ok(style == tmp, "Got style %x (expected %x)\n", style, tmp); if(SUCCEEDED(hr)) { - DWORD tmp2; + NSTCSTYLE tmp2; for(i = 0; styles[i] != 0; i++) { hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, styles[i], &tmp2); @@ -966,7 +966,7 @@ static void test_basics(void) ok(style2 == tmp, "Got style %x (expected %x)\n", style2, tmp); if(SUCCEEDED(hr)) { - DWORD tmp2; + NSTCSTYLE2 tmp2; for(i = 0; styles2[i] != 0; i++) { hr = INameSpaceTreeControl2_GetControlStyle2(pnstc2, styles2[i], &tmp2); @@ -1372,7 +1372,7 @@ static void test_basics(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - UINT count; + DWORD count; hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(count == 1, "Got %d selected items.\n", count); @@ -1400,7 +1400,7 @@ static void test_basics(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - UINT count; + DWORD count; hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(count == 1, "Got %d selected items.\n", count); @@ -1426,7 +1426,7 @@ static void test_basics(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - UINT count; + DWORD count; hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(count == 1, "Got %d selected items.\n", count);

1 0

Eric Pouech : dsdmo/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: efa323405d65ba5b332072c20e933b5034ef8daf URL: https://source.winehq.org/git/wine.git/?a=commit;h=efa323405d65ba5b332072c2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:38 2022 +0100 dsdmo/tests: 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/dsdmo/tests/Makefile.in | 1 - dlls/dsdmo/tests/dsdmo.c | 170 +++++++++++++++++++++---------------------- 2 files changed, 85 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=efa323405d65ba5b3320…

1 0

Eric Pouech : dhcpcsvc/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 20ca4e9a06442fa1865a8f63a2bdfc6aa3404399 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20ca4e9a06442fa1865a8f63… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:27:45 2022 +0100 dhcpcsvc/tests: 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/dhcpcsvc/tests/Makefile.in | 1 - dlls/dhcpcsvc/tests/dhcpcsvc.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/dhcpcsvc/tests/Makefile.in b/dlls/dhcpcsvc/tests/Makefile.in index 1f1e6acb7ce..47440eb2cd4 100644 --- a/dlls/dhcpcsvc/tests/Makefile.in +++ b/dlls/dhcpcsvc/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dhcpcsvc.dll IMPORTS = dhcpcsvc iphlpapi diff --git a/dlls/dhcpcsvc/tests/dhcpcsvc.c b/dlls/dhcpcsvc/tests/dhcpcsvc.c index 547fb515329..52b1b150ad8 100644 --- a/dlls/dhcpcsvc/tests/dhcpcsvc.c +++ b/dlls/dhcpcsvc/tests/dhcpcsvc.c @@ -56,24 +56,24 @@ static void test_DhcpRequestParams(void) for (ptr = adapters; ptr; ptr = ptr->Next) { MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) ); - trace( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(ptr->Description), ptr->IfType, ptr->Dhcpv4Enabled ); + trace( "adapter '%s' type %lu dhcpv4 enabled %d\n", wine_dbgstr_w(ptr->Description), ptr->IfType, ptr->Dhcpv4Enabled ); if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; memset( &send_params, 0, sizeof(send_params) ); memset( &recv_params, 0, sizeof(recv_params) ); err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, NULL, NULL, send_params, recv_params, NULL, NULL, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, nosuchW, NULL, send_params, recv_params, NULL, NULL, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, NULL, NULL, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); size = 0; err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, NULL, &size, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); memset( params, 0, sizeof(params) ); params[0].OptionId = OPTION_SUBNET_MASK; @@ -106,8 +106,8 @@ static void test_DhcpRequestParams(void) case OPTION_BROADCAST_ADDRESS: if (params[i].Data) { - ok( params[i].nBytesData == sizeof(DWORD), "got %u\n", params[i].nBytesData ); - trace( "%u: Data %p (%08x) nBytesData %u OptionId %u Flags %08x IsVendor %d\n", + ok( params[i].nBytesData == sizeof(DWORD), "got %lu\n", params[i].nBytesData ); + trace( "%lu: Data %p (%08lx) nBytesData %lu OptionId %lu Flags %08lx IsVendor %d\n", i, params[i].Data, *(DWORD *)params[i].Data, params[i].nBytesData, params[i].OptionId, params[i].Flags, params[i].IsVendor ); } @@ -120,14 +120,14 @@ static void test_DhcpRequestParams(void) char *str = HeapAlloc( GetProcessHeap(), 0, params[i].nBytesData + 1 ); memcpy( str, params[i].Data, params[i].nBytesData ); str[params[i].nBytesData] = 0; - trace( "%u: Data %p (%s) nBytesData %u OptionId %u Flags %08x IsVendor %d\n", + trace( "%lu: Data %p (%s) nBytesData %lu OptionId %lu Flags %08lx IsVendor %d\n", i, params[i].Data, str, params[i].nBytesData, params[i].OptionId, params[i].Flags, params[i].IsVendor ); HeapFree( GetProcessHeap(), 0, str ); } break; default: - ok( 0, "unexpected option %u\n", params[i].OptionId ); + ok( 0, "unexpected option %lu\n", params[i].OptionId ); break; } }

1 0