February 2022 - Wine-Commits

Eric Pouech : wbemprox: Use correct integral type.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 60b82dbda483bb49ac0550baa2b0167675343d34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60b82dbda483bb49ac0550ba… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:49:30 2022 +0100 wbemprox: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c71bab80ee2..050e9462a4c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1939,7 +1939,8 @@ static WCHAR *append_path( const WCHAR *path, const WCHAR *segment, UINT *len ) static WCHAR *get_file_version( const WCHAR *filename ) { VS_FIXEDFILEINFO *info; - DWORD size, len = 4 * 5 + ARRAY_SIZE( L"%u.%u.%u.%u" ); + UINT size; + DWORD len = 4 * 5 + ARRAY_SIZE( L"%u.%u.%u.%u" ); void *block; WCHAR *ret; @@ -2499,7 +2500,8 @@ static WCHAR *get_ip4_string( DWORD addr ) static enum fill_status fill_ip4routetable( struct table *table, const struct expr *cond ) { struct record_ip4routetable *rec; - UINT i, row = 0, offset = 0, size = 0; + UINT i, row = 0, offset = 0; + ULONG size = 0; MIB_IPFORWARDTABLE *forwards; enum fill_status status = FILL_STATUS_UNFILTERED; @@ -3710,8 +3712,8 @@ static enum fill_status fill_service( struct table *table, const struct expr *co ENUM_SERVICE_STATUS_PROCESSW *tmp, *services = NULL; SERVICE_STATUS_PROCESS *status; WCHAR sysnameW[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = ARRAY_SIZE( sysnameW ); - UINT i, row = 0, offset = 0, size = 256, needed, count; + DWORD len = ARRAY_SIZE( sysnameW ), needed, count; + UINT i, row = 0, offset = 0, size = 256; enum fill_status fill_status = FILL_STATUS_FAILED; BOOL ret;

1 0

Eric Pouech : xaudio2_7: Use correct integral type.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: d4bd5aaa910b5e5a8d3c0d2fafd8cc28cfe79f1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4bd5aaa910b5e5a8d3c0d2f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:06 2022 +0100 xaudio2_7: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 12383896b42..e5a83ebdbf8 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1291,7 +1291,7 @@ static void WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, TRACE("%p, %p\n", This, pChannelMask); - FAudioMasteringVoice_GetChannelMask(This->faudio_voice, pChannelMask); + FAudioMasteringVoice_GetChannelMask(This->faudio_voice, (uint32_t *)pChannelMask); } static const struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = {

1 0

Eric Pouech : chcp.com: Enable compilation with long types.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: abbde22d98507976fecbe1146f8c1b38ba3977ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=abbde22d98507976fecbe114… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:56:01 2022 +0100 chcp.com: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/chcp.com/Makefile.in | 1 - programs/chcp.com/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/chcp.com/Makefile.in b/programs/chcp.com/Makefile.in index 7a55d3cf15f..c7037abb10f 100644 --- a/programs/chcp.com/Makefile.in +++ b/programs/chcp.com/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = chcp.com IMPORTS = kernelbase diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c index 31ddba4c137..6c5864d0e19 100644 --- a/programs/chcp.com/main.c +++ b/programs/chcp.com/main.c @@ -56,7 +56,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args) fmt, 0, 0, (WCHAR *)&str, 0, &va_args); if (!len && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return; } output_writeconsole(str, len); @@ -71,7 +71,7 @@ static void WINAPIV output_message(unsigned int id, ...) if (!(len = LoadStringW(GetModuleHandleW(NULL), id, (WCHAR *)&fmt, 0))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); return; }

1 0

Derek Lesho : userenv: Set ProgramData in CreateEnvironmentBlock.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: c29621ff70a988ff25e5c5202d04df93be2a6e9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c29621ff70a988ff25e5c520… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Feb 3 17:09:08 2022 -0500 userenv: Set ProgramData in CreateEnvironmentBlock. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/tests/userenv.c | 17 ++++++++++++++++- dlls/userenv/userenv_main.c | 3 +++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index a91edeef260..c7a6791e2be 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -78,7 +78,7 @@ static void test_create_env(void) BOOL r, is_wow64 = FALSE; HANDLE htok; WCHAR * env[4]; - char * st, systemroot[100]; + char * st, systemroot[100], programdata[100]; int i, j; static const struct profile_item common_vars[] = { @@ -96,6 +96,7 @@ static void test_create_env(void) }; static const struct profile_item common_post_nt4_vars[] = { { "ALLUSERSPROFILE" }, + { "ProgramData" }, { "TEMP" }, { "TMP" }, { "CommonProgramFiles" }, @@ -119,6 +120,12 @@ static void test_create_env(void) r = SetEnvironmentVariableA("SystemRoot", "overwrite"); expect(TRUE, r); + r = GetEnvironmentVariableA("ProgramData", programdata, sizeof(programdata)); + ok(r != 0, "GetEnvironmentVariable failed (%d)\n", GetLastError()); + + r = SetEnvironmentVariableA("ProgramData", "overwrite"); + expect(TRUE, r); + if (0) { /* Crashes on NT4 */ @@ -151,12 +158,20 @@ static void test_create_env(void) r = SetEnvironmentVariableA("SystemRoot", systemroot); expect(TRUE, r); + r = SetEnvironmentVariableA("ProgramData", programdata); + expect(TRUE, r); + for(i=0; i<4; i++) { r = get_env(env[i], "SystemRoot", &st); ok(!strcmp(st, "SystemRoot=overwrite"), "%s\n", st); expect(TRUE, r); HeapFree(GetProcessHeap(), 0, st); + + r = get_env(env[i], "ProgramData", &st); + ok(strcmp(st, "ProgramData=overwrite"), "%s\n", st); + expect(TRUE, r); + HeapFree(GetProcessHeap(), 0, st); } /* Test for common environment variables (NT4 and higher) */ diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 87ace7d5c11..08dede60d35 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -243,7 +243,10 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, } if (get_reg_value(env, hkey, L"Public", buf, UNICODE_STRING_MAX_CHARS)) + { set_env_var(&env, L"ALLUSERSPROFILE", buf); + set_env_var(&env, L"ProgramData", buf); + } } else {

1 0

Michael Stefaniuc : dmusic/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: ade67db2cb3881cdce9fff97efb4554ef7aa2139 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ade67db2cb3881cdce9fff97… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 3 22:51:34 2022 +0100 dmusic/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/Makefile.in | 1 - dlls/dmusic/tests/dmusic.c | 380 +++++++++++++++++++++--------------------- 2 files changed, 190 insertions(+), 191 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ade67db2cb3881cdce9f…

1 0

Zebediah Figura : winegstreamer: Constify some static variables.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 83023a9f2b4840a97c5b587a2ba6c2f05a44b7b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83023a9f2b4840a97c5b587a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 18:45:25 2022 -0600 winegstreamer: Constify some static variables. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 10 +++++----- dlls/winegstreamer/wma_decoder.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index aa5e60ec116..a111bbe196d 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -437,21 +437,21 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) } static WCHAR audio_converterW[] = L"Audio Converter"; -static const GUID *audio_converter_supported_types[] = +static const GUID *const audio_converter_supported_types[] = { &MFAudioFormat_PCM, &MFAudioFormat_Float, }; static WCHAR wma_decoderW[] = L"WMAudio Decoder MFT"; -static const GUID *wma_decoder_input_types[] = +static const GUID *const wma_decoder_input_types[] = { &MEDIASUBTYPE_MSAUDIO1, &MFAudioFormat_WMAudioV8, &MFAudioFormat_WMAudioV9, &MFAudioFormat_WMAudio_Lossless, }; -static const GUID *wma_decoder_output_types[] = +static const GUID *const wma_decoder_output_types[] = { &MFAudioFormat_PCM, &MFAudioFormat_Float, @@ -465,9 +465,9 @@ static const struct mft const UINT32 flags; const GUID *major_type; const UINT32 input_types_count; - const GUID **input_types; + const GUID *const *input_types; const UINT32 output_types_count; - const GUID **output_types; + const GUID *const *output_types; } mfts[] = { diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 945390f44db..78316059052 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -30,14 +30,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmadec); -static const GUID *wma_decoder_input_types[] = +static const GUID *const wma_decoder_input_types[] = { &MEDIASUBTYPE_MSAUDIO1, &MFAudioFormat_WMAudioV8, &MFAudioFormat_WMAudioV9, &MFAudioFormat_WMAudio_Lossless, }; -static const GUID *wma_decoder_output_types[] = +static const GUID *const wma_decoder_output_types[] = { &MFAudioFormat_Float, &MFAudioFormat_PCM,

1 0

Nikolay Sivov : dxva2: Fix long types warnings in traces.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 7868f1b918f7972316382b66468f2f9cf53604d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7868f1b918f7972316382b66… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 4 09:46:33 2022 +0300 dxva2: Fix long types warnings in traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/Makefile.in | 1 - dlls/dxva2/main.c | 38 +++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index 66add06535b..8f7a62bb902 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxva2.dll IMPORTS = uuid ole32 IMPORTLIB = dxva2 diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 5beac4164a6..b262990e0f7 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -163,7 +163,7 @@ static ULONG WINAPI video_processor_AddRef(IDirectXVideoProcessor *iface) struct video_processor *processor = impl_from_IDirectXVideoProcessor(iface); ULONG refcount = InterlockedIncrement(&processor->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -173,7 +173,7 @@ static ULONG WINAPI video_processor_Release(IDirectXVideoProcessor *iface) struct video_processor *processor = impl_from_IDirectXVideoProcessor(iface); ULONG refcount = InterlockedDecrement(&processor->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -314,7 +314,7 @@ static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *if if (FAILED(hr = IDirect3DSurface9_GetDevice(rt, &device))) { - WARN("Failed to get surface device, hr %#x.\n", hr); + WARN("Failed to get surface device, hr %#lx.\n", hr); return hr; } @@ -330,7 +330,7 @@ static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *if if (FAILED(hr = IDirect3DDevice9_StretchRect(device, samples[i].SrcSurface, &samples[i].SrcRect, rt, &dst_rect, D3DTEXF_POINT))) { - WARN("Failed to copy sample %u, hr %#x.\n", i, hr); + WARN("Failed to copy sample %u, hr %#lx.\n", i, hr); } } @@ -398,7 +398,7 @@ static HRESULT WINAPI device_manager_processor_service_CreateSurface(IDirectXVid unsigned int i, j; HRESULT hr; - TRACE("%p, %u, %u, %u, %u, %u, %u, %u, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, + TRACE("%p, %u, %u, %u, %u, %u, %lu, %lu, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, surfaces, shared_handle); if (backbuffers >= UINT_MAX) @@ -679,7 +679,7 @@ static HRESULT WINAPI device_manager_decoder_service_CreateSurface(IDirectXVideo UINT width, UINT height, UINT backbuffers, D3DFORMAT format, D3DPOOL pool, DWORD usage, DWORD dxvaType, IDirect3DSurface9 **surfaces, HANDLE *shared_handle) { - FIXME("%p, %u, %u, %u, %#x, %d, %d, %d, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, + FIXME("%p, %u, %u, %u, %#x, %d, %ld, %ld, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, surfaces, shared_handle); return E_NOTIMPL; @@ -753,7 +753,7 @@ static ULONG WINAPI device_manager_AddRef(IDirect3DDeviceManager9 *iface) struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface); ULONG refcount = InterlockedIncrement(&manager->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -764,7 +764,7 @@ static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface) ULONG refcount = InterlockedDecrement(&manager->refcount); size_t i; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1037,7 +1037,7 @@ static const IDirect3DDeviceManager9Vtbl device_manager_vtbl = BOOL WINAPI CapabilitiesRequestAndCapabilitiesReply( HMONITOR monitor, LPSTR buffer, DWORD length ) { - FIXME("(%p, %p, %d): stub\n", monitor, buffer, length); + FIXME("%p, %p, %ld: stub.\n", monitor, buffer, length); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1113,7 +1113,7 @@ BOOL WINAPI DestroyPhysicalMonitor( HMONITOR monitor ) BOOL WINAPI DestroyPhysicalMonitors( DWORD arraySize, LPPHYSICAL_MONITOR array ) { - FIXME("(0x%x, %p): stub\n", arraySize, array); + FIXME("%lu, %p: stub.\n", arraySize, array); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1221,7 +1221,7 @@ HRESULT WINAPI GetNumberOfPhysicalMonitorsFromIDirect3DDevice9( IDirect3DDevice9 BOOL WINAPI GetPhysicalMonitorsFromHMONITOR( HMONITOR monitor, DWORD arraySize, LPPHYSICAL_MONITOR array ) { - FIXME("(%p, 0x%x, %p): stub\n", monitor, arraySize, array); + FIXME("%p, %lu, %p: stub.\n", monitor, arraySize, array); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1229,7 +1229,7 @@ BOOL WINAPI GetPhysicalMonitorsFromHMONITOR( HMONITOR monitor, DWORD arraySize, HRESULT WINAPI GetPhysicalMonitorsFromIDirect3DDevice9( IDirect3DDevice9 *device, DWORD arraySize, LPPHYSICAL_MONITOR array ) { - FIXME("(%p, 0x%x, %p): stub\n", device, arraySize, array); + FIXME("%p, %lu, %p: stub.\n", device, arraySize, array); return E_NOTIMPL; } @@ -1301,7 +1301,7 @@ BOOL WINAPI SaveCurrentSettings( HMONITOR monitor ) BOOL WINAPI SetMonitorBrightness( HMONITOR monitor, DWORD brightness ) { - FIXME("(%p, 0x%x): stub\n", monitor, brightness); + FIXME("%p, %#lx: stub.\n", monitor, brightness); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1317,7 +1317,7 @@ BOOL WINAPI SetMonitorColorTemperature( HMONITOR monitor, MC_COLOR_TEMPERATURE t BOOL WINAPI SetMonitorContrast( HMONITOR monitor, DWORD contrast ) { - FIXME("(%p, 0x%x): stub\n", monitor, contrast); + FIXME("%p, %#lx: stub.\n", monitor, contrast); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1325,7 +1325,7 @@ BOOL WINAPI SetMonitorContrast( HMONITOR monitor, DWORD contrast ) BOOL WINAPI SetMonitorDisplayAreaPosition( HMONITOR monitor, MC_POSITION_TYPE type, DWORD position ) { - FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, position); + FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, position); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1333,7 +1333,7 @@ BOOL WINAPI SetMonitorDisplayAreaPosition( HMONITOR monitor, MC_POSITION_TYPE ty BOOL WINAPI SetMonitorDisplayAreaSize( HMONITOR monitor, MC_SIZE_TYPE type, DWORD size ) { - FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, size); + FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, size); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1341,7 +1341,7 @@ BOOL WINAPI SetMonitorDisplayAreaSize( HMONITOR monitor, MC_SIZE_TYPE type, DWOR BOOL WINAPI SetMonitorRedGreenOrBlueDrive( HMONITOR monitor, MC_DRIVE_TYPE type, DWORD drive ) { - FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, drive); + FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, drive); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1349,7 +1349,7 @@ BOOL WINAPI SetMonitorRedGreenOrBlueDrive( HMONITOR monitor, MC_DRIVE_TYPE type, BOOL WINAPI SetMonitorRedGreenOrBlueGain( HMONITOR monitor, MC_GAIN_TYPE type, DWORD gain ) { - FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, gain); + FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, gain); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -1357,7 +1357,7 @@ BOOL WINAPI SetMonitorRedGreenOrBlueGain( HMONITOR monitor, MC_GAIN_TYPE type, D BOOL WINAPI SetVCPFeature( HMONITOR monitor, BYTE vcpCode, DWORD value ) { - FIXME("(%p, 0x%02x, 0x%x): stub\n", monitor, vcpCode, value); + FIXME("%p, 0x%02x, %#lx: stub.\n", monitor, vcpCode, value); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE;

1 0

Kevin Puetz : winegcc: --out-implib needs to propagate -m32/-m64 to winebuild.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: ccf7b4459bc6a8303aa93a9743e7a3b01ffb9783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf7b4459bc6a8303aa93a97… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Feb 3 16:08:25 2022 -0600 winegcc: --out-implib needs to propagate -m32/-m64 to winebuild. This was already passed through for linking, and for spec.o files, but was overlooked when implementing -Wl,--out-implib Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 8644afe7535..2eb0bdbcf3b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -888,6 +888,8 @@ static struct strarray get_winebuild_args(struct options *opts) strarray_add( &spec_args, "--target" ); strarray_add( &spec_args, opts->target_alias ); } + if (opts->force_pointer_size) + strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); for (i = 0; i < opts->prefix.count; i++) strarray_add( &spec_args, strmake( "-B%s", opts->prefix.str[i] )); strarray_addall( &spec_args, opts->winebuild_args ); @@ -1016,8 +1018,6 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, } spec_o_name = get_temp_file(output_name, ".spec.o"); - if (opts->force_pointer_size) - strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); if (opts->pic && !is_pe) strarray_add(&spec_args, "-fPIC"); strarray_add(&spec_args, opts->shared ? "--dll" : "--exe"); if (opts->fake_module)

1 0

Zebediah Figura : opencl: Export unsuffixed KHR_gl_sharing functions.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: b5f115e8dfeb50b3ec49cbf6e8a3048ea065c40a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f115e8dfeb50b3ec49cbf6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 15:08:16 2022 -0600 opencl: Export unsuffixed KHR_gl_sharing functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46470 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 52 ++++++++++++++++++++++++++++--- dlls/opencl/opencl.spec | 9 ++++++ dlls/opencl/opencl_types.h | 23 ++++++++++++++ dlls/opencl/pe_wrappers.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b5f115e8dfeb50b3ec49…

1 0

Bastien Orivel : ws2_32: Fix setsockopt(TCP_NODELAY) when optlen is less than 4.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: d6ea38f32dfd3edbe107a255c37e9f7f3da06ae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6ea38f32dfd3edbe107a255… Author: Bastien Orivel <eijebong(a)bananium.fr> Date: Thu Feb 3 11:28:27 2022 +0100 ws2_32: Fix setsockopt(TCP_NODELAY) when optlen is less than 4. According to MSDN [1], the `TCP_NODELAY` parameter should be of type `BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte instead of an int, any program written in rust that tries to set that option on a socket will fail with a "Invalid parameter supplied" error. Turns out that setsockopt on linux does not want optlen to be less than 4 bytes [3]. Windows' behavior is the following: - For optlen <= 0, return SOCKET_ERROR and set last error to WSAEFAULT - For optlen > 0, ignore the optlen value and set the TCP_NODELAY value to one if the first byte of the given optvalue is not 0. This will fix any rust program using the hyper library to do HTTP requests. [1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-o… [2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80… [3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c302… Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 10 ++++++-- dlls/ws2_32/tests/sock.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a75aaee68be..4b3ca3c2507 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2903,8 +2903,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); - + { + INT nodelay = *optval; + if (optlen <= 0) { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); + } default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b38357954b7..d208c17e43f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1259,6 +1259,69 @@ static void test_set_getsockopt(void) ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any positive value */ + size = sizeof(value); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, -1); + /* On win 10 pro, this sets the error to WSAENOBUFS instead of WSAEFAULT */ + ok(err == SOCKET_ERROR && (WSAGetLastError() == WSAEFAULT || WSAGetLastError() == WSAENOBUFS), + "got %d with %d (expected SOCKET_ERROR with either WSAEFAULT or WSAENOBUFS)\n", err, WSAGetLastError()); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + value = 0x100; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4 and optvalue = 0x100\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size);

1 0