November 2018 - Wine-Devel - list.winehq.org

[PATCH 3/4] d3d11/tests: Add test for readback from 1D array texture.
by Józef Kucia Nov. 16, 2018

Nov. 16, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index aeba9efe7394..5c6dfe000735 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12375,6 +12375,16 @@ static void test_copy_subresource_region_1d(void) } release_resource_readback(&rb); + get_texture1d_readback(texture1d, 0, &rb); + for (i = 0; i < texture1d_desc.Width; ++i) + { + color = get_readback_color(&rb, i, 0, 0); + ok(compare_color(color, bitmap_data[i], 1), + "Got color 0x%08x at %u, expected 0x%08x.\n", + color, i, bitmap_data[i]); + } + release_resource_readback(&rb); + ID3D11Texture1D_Release(texture1d); ID3D11Texture2D_Release(texture2d); release_test_context(&test_context); -- 2.18.1

3 2

[PATCH 1/4] wined3d: Add support for WINED3DFMT_R10G10B10A2_UINT.
by Józef Kucia Nov. 16, 2018

Nov. 16, 2018

Unfortunately, GL_RGB10_A2UI is not supported for buffer textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1fd3f321283c..a0abe6a0c2ed 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1531,6 +1531,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, NULL}, + {WINED3DFMT_R10G10B10A2_UINT, GL_RGB10_A2UI, GL_RGB10_A2UI, 0, + GL_RGBA_INTEGER, GL_UNSIGNED_INT_2_10_10_10_REV, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RGB10_A2UI, NULL}, {WINED3DFMT_R10G10B10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING -- 2.18.1

2 1

[PATCH vkd3d] vkd3d: Use at least D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT for textures.
by Józef Kucia Nov. 16, 2018

Nov. 16, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> It's the smallest alignment for textures supported by D3D12. Vulkan implementations may return lower values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 3 +++ tests/d3d12.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c85405024e75..cf40e7a1f064 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2062,6 +2062,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour } else { + /* FIXME: Should we support D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT for small MSSA resources? */ if (desc->SampleDesc.Count != 1) default_alignment = D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT; @@ -2070,6 +2071,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour WARN("Failed to get allocation info for texture.\n"); valid = false; } + + info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); } if (valid && desc->Alignment % info->Alignment) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7fb0b4108023..c82778594129 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21218,6 +21218,8 @@ static void test_suballocate_small_textures(void) check_alignment(info.SizeInBytes, info.Alignment); } + ok(info.Alignment >= D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, "Got alignment %"PRIu64".\n", info.Alignment); + heap_desc.SizeInBytes = ARRAY_SIZE(textures) * info.SizeInBytes; memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; -- 2.18.1

2 1

[PATCH] winecoreaudio.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Nov. 16, 2018

Nov. 16, 2018

Not compile tested. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winecoreaudio.drv/midi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index a40ca2a3b9..edaf128312 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -148,7 +148,7 @@ LONG CoreAudio_MIDIInit(void) sources[i].source = MIDIGetSource(i); CoreMIDI_GetObjectName(sources[i].source, szPname, sizeof(szPname)); - MultiByteToWideChar(CP_ACP, 0, szPname, -1, sources[i].caps.szPname, sizeof(sources[i].caps.szPname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, sources[i].caps.szPname, ARRAY_SIZE(sources[i].caps.szPname)); MIDIPortConnectSource(MIDIInPort, sources[i].source, &sources[i].wDevID); @@ -164,7 +164,7 @@ LONG CoreAudio_MIDIInit(void) for (i = 0; i < MAX_MIDI_SYNTHS; i++) { snprintf(szPname, sizeof(szPname), "CoreAudio MIDI Synth %d", i); - MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, sizeof(destinations[i].caps.szPname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, ARRAY_SIZE(destinations[i].caps.szPname)); destinations[i].caps.wTechnology = MOD_SYNTH; destinations[i].caps.wChannelMask = 0xFFFF; @@ -182,7 +182,7 @@ LONG CoreAudio_MIDIInit(void) destinations[i].dest = MIDIGetDestination(i - MAX_MIDI_SYNTHS); CoreMIDI_GetObjectName(destinations[i].dest, szPname, sizeof(szPname)); - MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, sizeof(destinations[i].caps.szPname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, ARRAY_SIZE(destinations[i].caps.szPname)); destinations[i].caps.wTechnology = MOD_MIDIPORT; destinations[i].caps.wChannelMask = 0xFFFF; -- 2.14.5

2 1

[PATCH] msgsm32.acm: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Nov. 16, 2018

Nov. 16, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msgsm32.acm/msgsm32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 99eef9624e..cbf396f3b4 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -125,13 +125,13 @@ static LRESULT GSM_DriverDetails(PACMDRIVERDETAILSW add) add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "Microsoft GSM 6.10", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); + add->szShortName, ARRAY_SIZE( add->szShortName )); MultiByteToWideChar( CP_ACP, 0, "Wine GSM 6.10 libgsm codec", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); + add->szLongName, ARRAY_SIZE( add->szLongName )); MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); + add->szCopyright, ARRAY_SIZE( add->szCopyright )); MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + add->szLicensing, ARRAY_SIZE( add->szLicensing )); add->szFeatures[0] = 0; return MMSYSERR_NOERROR; } -- 2.14.5

2 1

[PATCH] msg711.acm: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Nov. 16, 2018

Nov. 16, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msg711.acm/msg711.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index cb8b76240a..d20c89bfaf 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -658,13 +658,13 @@ static LRESULT G711_DriverDetails(PACMDRIVERDETAILSW add) add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "Microsoft CCITT G.711", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); + add->szShortName, ARRAY_SIZE( add->szShortName )); MultiByteToWideChar( CP_ACP, 0, "Wine G711 converter", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); + add->szLongName, ARRAY_SIZE( add->szLongName )); MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); + add->szCopyright, ARRAY_SIZE( add->szCopyright )); MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + add->szLicensing, ARRAY_SIZE( add->szLicensing )); add->szFeatures[0] = 0; return MMSYSERR_NOERROR; -- 2.14.5

2 1

[PATCH] dsound: Primary buffers don't support IDirectSoundNotify
by Michael Stefaniuc Nov. 16, 2018

Nov. 16, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/primary.c | 1 - dlls/dsound/tests/dsound.c | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index c64a6e79eb..f74db2f6e0 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -1101,7 +1101,6 @@ static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer8 *ifac if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { ERR("app requested IDirectSoundNotify on primary buffer\n"); - /* FIXME: should we support this? */ return E_NOINTERFACE; } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0807d43788..89f0aa03ff 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -465,6 +465,7 @@ static HRESULT test_primary(LPGUID lpGuid) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { LONG vol; + IDirectSoundNotify *notify; /* Try to create a second primary buffer */ /* DSOUND: Error: The primary buffer already exists. @@ -509,8 +510,10 @@ static HRESULT test_primary(LPGUID lpGuid) ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref); ref=IDirectSoundBuffer_Release(primary); - ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " - "should have 0\n",ref); + ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref); + + rc=IDirectSoundBuffer_QueryInterface(primary,&IID_IDirectSoundNotify,(void **)&notify); + ok(rc==E_NOINTERFACE,"IDirectSoundBuffer_QueryInterface() failed %08x\n",rc); } /* Set the CooperativeLevel back to normal */ -- 2.14.5

2 1

[PATCH 1/5] msvcrt: Add _iswgraph_l().
by Nikolay Sivov Nov. 16, 2018

Nov. 16, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 4667e9970f..7693755a71 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -27,7 +27,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) ucrtbase._iswctype_l @ cdecl _iswdigit_l(long ptr) ucrtbase._iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) ucrtbase._iswgraph_l @ cdecl _iswlower_l(long ptr) ucrtbase._iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) ucrtbase._iswpunct_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 69e5a1be85..e38672efbd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1023,7 +1023,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8dc1a68816..ed930d7817 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1369,7 +1369,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d4bcc65759..1f3d22d983 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1375,7 +1375,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 42b3e54375..aa4b2b874b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1240,7 +1240,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) msvcr120._iswctype_l @ cdecl _iswdigit_l(long ptr) msvcr120._iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) msvcr120._iswgraph_l @ cdecl _iswlower_l(long ptr) msvcr120._iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) msvcr120._iswpunct_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 295fae565e..8c69215cdb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -695,7 +695,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7c3c3e5a5f..842cb5f32e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -673,7 +673,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9491205b74..fa234fb99d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -638,7 +638,7 @@ # stub _iswcntrl_l(long ptr) @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -# stub _iswgraph_l(long ptr) +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l # stub _iswprint_l(long ptr) @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b68cc51561..c4e27e1439 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1854,6 +1854,14 @@ INT CDECL MSVCRT_iswgraph( MSVCRT_wchar_t wc ) return isgraphW( wc ); } +/********************************************************************* + * _iswgraph_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswgraph_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isgraphW( wc ); +} + /********************************************************************* * iswlower (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b3f4d9e0f1..adb3198305 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -514,7 +514,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l -- 2.19.1

2 9

[PATCH] ws2_32: Ignore small SNDBUF values
by Alistair Leslie-Hughes Nov. 16, 2018

Nov. 16, 2018

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40264 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index df068fe..ee265d6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5809,9 +5809,10 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, break; case WS_SO_RCVBUF: + case WS_SO_SNDBUF: if (*(const int*)optval < 2048) { - WARN("SO_RCVBF for %d bytes is too small: ignored\n", *(const int*)optval ); + WARN("SO_RCVBF/WS_SO_SNDBUF for %d bytes is too small: ignored\n", *(const int*)optval ); return 0; } /* Fall through */ @@ -5828,7 +5829,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, * however, using it the BSD way fixes bug 8513 and seems to be what * most programmers assume, anyway */ case WS_SO_REUSEADDR: - case WS_SO_SNDBUF: case WS_SO_TYPE: convert_sockopt(&level, &optname); break; -- 1.9.1

3 2

[PATCH v2] widl: Add option to not generate RPC includes.
by Józef Kucia Nov. 16, 2018

Nov. 16, 2018

This makes it easier to use header files generated by widl without Windows headers. In particular, headers generated with --no-rpc-includes do not need rpc.h and rpcndr.h header files. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This change is mainly for vkd3d. Currently, we use an ugly hack to strip RPC includes from the generated header files. Version 2: Rebased. --- tools/widl/header.c | 13 ++++++++----- tools/widl/widl.c | 7 +++++++ tools/widl/widl.h | 1 + tools/widl/widl.man.in | 2 ++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index defc7f850371..212c20a90148 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1784,12 +1784,15 @@ void write_header(const statement_list_t *stmts) } fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n\n", PACKAGE_VERSION, input_name); - fprintf(header, "#ifndef __REQUIRED_RPCNDR_H_VERSION__\n"); - fprintf(header, "#define __REQUIRED_RPCNDR_H_VERSION__ 475\n"); - fprintf(header, "#endif\n\n"); + if (!no_rpc_includes) { + fprintf(header, "#ifndef __REQUIRED_RPCNDR_H_VERSION__\n"); + fprintf(header, "#define __REQUIRED_RPCNDR_H_VERSION__ 475\n"); + fprintf(header, "#endif\n\n"); + + fprintf(header, "#include <rpc.h>\n" ); + fprintf(header, "#include <rpcndr.h>\n" ); + } - fprintf(header, "#include <rpc.h>\n" ); - fprintf(header, "#include <rpcndr.h>\n" ); if (!for_each_serializable(stmts, NULL, serializable_exists)) fprintf(header, "#include <midles.h>\n" ); fprintf(header, "\n" ); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 8fe8e4c62584..96b9d79b94b9 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -59,6 +59,7 @@ static const char usage[] = " -I path Set include search dir to path (multiple -I allowed)\n" " --local-stubs=file Write empty stubs for call_as/local methods to file\n" " -m32, -m64 Set the target architecture (Win32 or Win64)\n" +" --no-rpc-includes Do not generate RPC includes in header files.\n" " -N Do not preprocess input\n" " --oldnames Use old naming conventions\n" " -o, --output=NAME Set the output file name\n" @@ -119,6 +120,7 @@ int do_server = 0; int do_regscript = 0; int do_idfile = 0; int do_dlldata = 0; +int no_rpc_includes = 0; static int no_preprocess = 0; int old_names = 0; int win32_packing = 8; @@ -167,6 +169,7 @@ enum { PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, PRINT_HELP, + NO_RPC_INCLUDES_OPTION, RT_NS_PREFIX, RT_OPTION, ROBUST_OPTION, @@ -185,6 +188,7 @@ static const struct option long_options[] = { { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, { "help", 0, NULL, PRINT_HELP }, { "local-stubs", 1, NULL, LOCAL_STUBS_OPTION }, + { "no-rpc-includes", 0, NULL, NO_RPC_INCLUDES_OPTION }, { "ns_prefix", 0, NULL, RT_NS_PREFIX }, { "oldnames", 0, NULL, OLDNAMES_OPTION }, { "output", 0, NULL, 'o' }, @@ -611,6 +615,9 @@ int main(int argc,char *argv[]) case RT_OPTION: winrt_mode = 1; break; + case NO_RPC_INCLUDES_OPTION: + no_rpc_includes = 1; + break; case RT_NS_PREFIX: use_abi_namespace = 1; break; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 4f4252e3ea3a..4767602231ca 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -44,6 +44,7 @@ extern int do_server; extern int do_regscript; extern int do_idfile; extern int do_dlldata; +extern int no_rpc_includes; extern int old_names; extern int win32_packing; extern int win64_packing; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index ec81488a0e8d..402d9ebfc22b 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -47,6 +47,8 @@ Force the target architecture to 32-bit or 64-bit. Generate header files. The default output filename is \fIinfile\fB.h\fR. .IP "\fB--oldnames\fR" Use old naming conventions. +.IP "\fB--no-rpc-headers\fR" +Do not generate RPC includes. .PP .B Type library options: .IP \fB-t\fR -- 2.18.1

3 5