February 2024 - Wine-commits

Rémi Bernon : winegstreamer: Complete H264 current output type reported attributes.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 6599f2ff90f674dd86c86710055925c351668201 URL: https://gitlab.winehq.org/wine/wine/-/commit/6599f2ff90f674dd86c86710055925… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 17 08:56:27 2024 +0100 winegstreamer: Complete H264 current output type reported attributes. --- dlls/winegstreamer/h264_decoder.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index e4ac11f98b8..fae4ede3b54 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -115,9 +115,9 @@ static HRESULT try_create_wg_transform(struct h264_decoder *decoder) } static HRESULT create_output_media_type(struct h264_decoder *decoder, const GUID *subtype, - IMFMediaType **media_type) + IMFMediaType *output_type, IMFMediaType **media_type) { - IMFMediaType *default_type = decoder->output_type; + IMFMediaType *default_type = decoder->output_type, *stream_type = output_type ? output_type : decoder->stream_type; IMFVideoMediaType *video_type; UINT32 value, width, height; MFVideoArea aperture; @@ -127,31 +127,31 @@ static HRESULT create_output_media_type(struct h264_decoder *decoder, const GUID if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(subtype, &video_type))) return hr; - if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_FRAME_SIZE, &ratio))) + if (FAILED(IMFMediaType_GetUINT64(stream_type, &MF_MT_FRAME_SIZE, &ratio))) ratio = (UINT64)1920 << 32 | 1080; if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, ratio))) goto done; width = ratio >> 32; height = ratio; - if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_FRAME_RATE, &ratio))) + if (FAILED(IMFMediaType_GetUINT64(stream_type, &MF_MT_FRAME_RATE, &ratio))) ratio = (UINT64)30000 << 32 | 1001; if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_RATE, ratio))) goto done; - if (FAILED(IMFMediaType_GetUINT64(decoder->stream_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio))) + if (FAILED(IMFMediaType_GetUINT64(stream_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio))) ratio = (UINT64)1 << 32 | 1; if (FAILED(hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_PIXEL_ASPECT_RATIO, ratio))) goto done; - if (FAILED(hr = MFCalculateImageSize(subtype, width, height, &value))) - goto done; - if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_SAMPLE_SIZE, value))) + if (!output_type || FAILED(IMFMediaType_GetUINT32(output_type, &MF_MT_SAMPLE_SIZE, &value))) + hr = MFCalculateImageSize(subtype, width, height, &value); + if (FAILED(hr) || FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_SAMPLE_SIZE, value))) goto done; - if (FAILED(hr = MFGetStrideForBitmapInfoHeader(subtype->Data1, width, (LONG *)&value))) - goto done; - if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_DEFAULT_STRIDE, value))) + if (!output_type || FAILED(IMFMediaType_GetUINT32(output_type, &MF_MT_DEFAULT_STRIDE, &value))) + hr = MFGetStrideForBitmapInfoHeader(subtype->Data1, width, (LONG *)&value); + if (FAILED(hr) || FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_DEFAULT_STRIDE, value))) goto done; if (!default_type || FAILED(IMFMediaType_GetUINT32(default_type, &MF_MT_INTERLACE_MODE, &value))) @@ -174,7 +174,7 @@ static HRESULT create_output_media_type(struct h264_decoder *decoder, const GUID if (FAILED(hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, value))) goto done; - if (SUCCEEDED(IMFMediaType_GetBlob(decoder->stream_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, + if (SUCCEEDED(IMFMediaType_GetBlob(stream_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (BYTE *)&aperture, sizeof(aperture), &value))) { if (FAILED(hr = IMFVideoMediaType_SetBlob(video_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, @@ -394,7 +394,7 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR return MF_E_TRANSFORM_TYPE_NOT_SET; if (index >= decoder->output_type_count) return MF_E_NO_MORE_TYPES; - return create_output_media_type(decoder, decoder->output_types[index], type); + return create_output_media_type(decoder, decoder->output_types[index], NULL, type); } static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) @@ -521,17 +521,16 @@ static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD i static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { struct h264_decoder *decoder = impl_from_IMFTransform(iface); + GUID subtype; HRESULT hr; TRACE("iface %p, id %#lx, type %p\n", iface, id, type); if (!decoder->output_type) return MF_E_TRANSFORM_TYPE_NOT_SET; - - if (FAILED(hr = MFCreateMediaType(type))) + if (FAILED(hr = IMFMediaType_GetGUID(decoder->output_type, &MF_MT_SUBTYPE, &subtype))) return hr; - - return IMFMediaType_CopyAllItems(decoder->output_type, (IMFAttributes *)*type); + return create_output_media_type(decoder, &subtype, decoder->output_type, type); } static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)

1 0

Alex Henrie : include: Annotate NdrGetBuffer with __WINE_(ALLOC_SIZE|MALLOC).
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: e7364e2165924c393055cc3f9f910aa347556bd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7364e2165924c393055cc3f9f910a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 19 01:08:32 2024 -0700 include: Annotate NdrGetBuffer with __WINE_(ALLOC_SIZE|MALLOC). It would be nice to annotate it with __WINE_DEALLOC(NdrFreeBuffer) too, but that causes a bunch of spurious -Wfree-nonheap-object warnings. --- include/rpcndr.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 75f93b48771..15698a8778a 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -692,7 +692,8 @@ RPCRTAPI void RPC_ENTRY PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, void *pParamList ); RPCRTAPI unsigned char* RPC_ENTRY - NdrGetBuffer( PMIDL_STUB_MESSAGE stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle ); + NdrGetBuffer( PMIDL_STUB_MESSAGE stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle ) + __WINE_ALLOC_SIZE(2) __WINE_MALLOC; RPCRTAPI void RPC_ENTRY NdrFreeBuffer( PMIDL_STUB_MESSAGE pStubMsg ); RPCRTAPI unsigned char* RPC_ENTRY

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 7e0177e1e43ab150e81e76276d1be75860fe6170 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e0177e1e43ab150e81e76276d1be7… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Feb 17 17:13:34 2024 +0100 po: Update Dutch translation. --- po/nl.po | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/po/nl.po b/po/nl.po index a149c8e8625..996f8f27ec0 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-12-11 19:30+0100\n" +"PO-Revision-Date: 2024-02-17 17:00+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -4092,22 +4092,21 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kan onschrijfbare eigenschap '|' niet veranderen" #: dlls/jscript/jscript.rc:80 -#, fuzzy -#| msgid "'this' is not a | object" msgid "'this' is not a DataView object" -msgstr "'this' is geen | object" +msgstr "'this' is geen DataView object" #: dlls/jscript/jscript.rc:81 msgid "Required argument offset or value in DataView method is not specified" msgstr "" +"Vereiste argument offset of waarde in DataView methode is niet opgegeven" #: dlls/jscript/jscript.rc:82 msgid "DataView operation access beyond specified buffer length" -msgstr "" +msgstr "DataView bewerkingstoegang buiten opgegeven bufferlengte" #: dlls/jscript/jscript.rc:83 msgid "DataView constructor argument offset is invalid" -msgstr "" +msgstr "Ongeldige offset van het DataView constructor argument" #: dlls/jscript/jscript.rc:84 msgid "'this' is not a | object" @@ -4118,10 +4117,8 @@ msgid "'key' is not an object" msgstr "'key' is geen object" #: dlls/jscript/jscript.rc:86 -#, fuzzy -#| msgid "Array object expected" msgid "ArrayBuffer object expected" -msgstr "Array object verwacht" +msgstr "ArrayBuffer object verwacht" #: dlls/jscript/jscript.rc:87 msgid "Property cannot have both accessors and a value" @@ -7147,7 +7144,7 @@ msgstr "Ongeldig argument.\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Cannot assign requested address.\n" -msgstr "" +msgstr "Kan het gevraagde adres niet toewijzen.\n" #: dlls/kernelbase/winerror.mc:3783 msgid "Connection reset by peer.\n" @@ -15117,7 +15114,7 @@ msgstr "De volgende services draaien:\n" #: programs/net/net.rc:44 msgid "A command was used with conflicting switches.\n" -msgstr "" +msgstr "Er is een opdracht gebruikt met tegenstrijdige parameters.\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections"

1 0

Piotr Caban : wininet: Add support for INTERNET_PER_CONN_AUTOCONFIG_URL in InternetSetOption.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: b16110f17bd75f4989d4058bc5492f2b1a718241 URL: https://gitlab.winehq.org/wine/wine/-/commit/b16110f17bd75f4989d4058bc5492f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 7 17:16:39 2024 +0100 wininet: Add support for INTERNET_PER_CONN_AUTOCONFIG_URL in InternetSetOption. --- dlls/wininet/internet.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 54063a25b7e..7744b359040 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -446,7 +446,7 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) } } - if (lpwpi->autoconf_url) + if (lpwpi->autoconf_url && lpwpi->flags & PROXY_TYPE_AUTO_PROXY_URL) { if ((ret = RegSetValueExW( key, L"AutoConfigURL", 0, REG_SZ, (BYTE*)lpwpi->autoconf_url, sizeof(WCHAR) * (lstrlenW(lpwpi->autoconf_url) + 1)))) @@ -3395,6 +3395,10 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; case INTERNET_PER_CONN_AUTOCONFIG_URL: + free(pi.autoconf_url); + pi.autoconf_url = wcsdup(option->Value.pszValue); + break; + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS:

1 0

Piotr Caban : wininet: Fix INTERNET_PER_CONN_AUTOCONFIG_URL option when quering global proxy settings.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 9aa7f27d82438bf68d52e71ac7b6804db6131f8f URL: https://gitlab.winehq.org/wine/wine/-/commit/9aa7f27d82438bf68d52e71ac7b680… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 16 13:47:56 2024 +0100 wininet: Fix INTERNET_PER_CONN_AUTOCONFIG_URL option when quering global proxy settings. --- dlls/wininet/internet.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7744b359040..1f1f63f2671 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2873,25 +2873,25 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u } case INTERNET_OPTION_PER_CONNECTION_OPTION: { - WCHAR *url; + WCHAR *url = NULL; INTERNET_PER_CONN_OPTION_LISTW *con = buffer; INTERNET_PER_CONN_OPTION_LISTA *conA = buffer; DWORD res = ERROR_SUCCESS, i; proxyinfo_t pi; LONG ret; - TRACE("Getting global proxy info\n"); if((ret = INTERNET_LoadProxySettings(&pi))) return ret; - FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); + TRACE("INTERNET_OPTION_PER_CONNECTION_OPTION\n"); if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) { FreeProxyInfo(&pi); return ERROR_INSUFFICIENT_BUFFER; } - url = get_proxy_autoconfig_url(); + if (pi.flags & PROXY_TYPE_AUTO_DETECT) + url = get_proxy_autoconfig_url(); for (i = 0; i < con->dwOptionCount; i++) { INTERNET_PER_CONN_OPTIONW *optionW = con->pOptions + i; @@ -2900,9 +2900,6 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u switch (optionW->dwOption) { case INTERNET_PER_CONN_FLAGS: optionW->Value.dwValue = pi.flags; - if (url) - /* native includes PROXY_TYPE_DIRECT even if PROXY_TYPE_PROXY is set */ - optionW->Value.dwValue |= PROXY_TYPE_DIRECT|PROXY_TYPE_AUTO_PROXY_URL; break; case INTERNET_PER_CONN_PROXY_SERVER: @@ -2920,22 +2917,26 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u break; case INTERNET_PER_CONN_AUTOCONFIG_URL: - if (!url) - optionW->Value.pszValue = NULL; - else if (unicode) - optionW->Value.pszValue = copy_optionW(url); + if (unicode) + optionW->Value.pszValue = copy_optionW(pi.autoconf_url); else - optionA->Value.pszValue = copy_optionA(url); + optionA->Value.pszValue = copy_optionA(pi.autoconf_url); break; case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: optionW->Value.dwValue = AUTO_PROXY_FLAG_ALWAYS_DETECT; break; + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + if (unicode) + optionW->Value.pszValue = copy_optionW(url); + else + optionA->Value.pszValue = copy_optionA(url); + break; + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: - case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: FIXME("Unhandled dwOption %ld\n", optionW->dwOption); memset(&optionW->Value, 0, sizeof(optionW->Value)); break;

1 0

Piotr Caban : wininet: Add support for INTERNET_OPTION_PER_CONNECTION_OPTION option on session handles.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 62027a9c4d8cc98a2420b6dd75b6b22f873620d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/62027a9c4d8cc98a2420b6dd75b6b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 16 13:48:37 2024 +0100 wininet: Add support for INTERNET_OPTION_PER_CONNECTION_OPTION option on session handles. --- dlls/wininet/internet.c | 185 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 154 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1f1f63f2671..5ee1242da1b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -110,6 +110,8 @@ static ULONG connect_timeout = 60000; static const WCHAR szInternetSettings[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; +static WCHAR *get_proxy_autoconfig_url(void); + void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t size) { UINT_PTR handle = 0, num; @@ -985,6 +987,37 @@ static VOID APPINFO_Destroy(object_header_t *hdr) free(lpwai->proxyPassword); } +static WCHAR *copy_optionW(WCHAR *value) +{ + DWORD len; + void *tmp; + + if (!value) + return NULL; + + len = (wcslen(value) + 1) * sizeof(WCHAR); + if (!(tmp = GlobalAlloc(0, len))) + return NULL; + + return memcpy(tmp, value, len); +} + +static char *copy_optionA(WCHAR *value) +{ + DWORD len; + void *tmp; + + if (!value) + return NULL; + + len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); + if (!(tmp = GlobalAlloc(0, len))) + return NULL; + + WideCharToMultiByte(CP_ACP, 0, value, -1, tmp, len, NULL, NULL); + return tmp; +} + static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { appinfo_t *ai = (appinfo_t*)hdr; @@ -1123,6 +1156,80 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(ULONG); return ERROR_SUCCESS; + + case INTERNET_OPTION_PER_CONNECTION_OPTION: { + INTERNET_PER_CONN_OPTION_LISTW *con = buffer; + INTERNET_PER_CONN_OPTION_LISTA *conA = buffer; + LONG res = ERROR_SUCCESS; + WCHAR *url = NULL; + int i; + + if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) + return ERROR_INSUFFICIENT_BUFFER; + + EnterCriticalSection(&WININET_cs); + + if (global_proxy.flags & PROXY_TYPE_AUTO_DETECT) + url = get_proxy_autoconfig_url(); + + for (i = 0; i < con->dwOptionCount; i++) { + INTERNET_PER_CONN_OPTIONW *optionW = con->pOptions + i; + INTERNET_PER_CONN_OPTIONA *optionA = conA->pOptions + i; + + switch (optionW->dwOption) { + case INTERNET_PER_CONN_FLAGS: + optionW->Value.dwValue = global_proxy.flags; + break; + + case INTERNET_PER_CONN_PROXY_SERVER: + if (unicode) + optionW->Value.pszValue = copy_optionW(global_proxy.proxy); + else + optionA->Value.pszValue = copy_optionA(global_proxy.proxy); + break; + + case INTERNET_PER_CONN_PROXY_BYPASS: + if (unicode) + optionW->Value.pszValue = copy_optionW(global_proxy.proxyBypass); + else + optionA->Value.pszValue = copy_optionA(global_proxy.proxyBypass); + break; + + case INTERNET_PER_CONN_AUTOCONFIG_URL: + if (unicode) + optionW->Value.pszValue = copy_optionW(global_proxy.autoconf_url); + else + optionA->Value.pszValue = copy_optionA(global_proxy.autoconf_url); + break; + + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + optionW->Value.dwValue = AUTO_PROXY_FLAG_ALWAYS_DETECT; + break; + + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + if (unicode) + optionW->Value.pszValue = copy_optionW(url); + else + optionA->Value.pszValue = copy_optionA(url); + break; + + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: + case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: + FIXME("Unhandled dwOption %ld\n", optionW->dwOption); + memset(&optionW->Value, 0, sizeof(optionW->Value)); + break; + + default: + FIXME("Unknown dwOption %ld\n", optionW->dwOption); + res = ERROR_INVALID_PARAMETER; + break; + } + } + + LeaveCriticalSection(&WININET_cs); + return res; + } } return INET_QueryOption(hdr, option, buffer, size, unicode); @@ -1150,6 +1257,53 @@ static DWORD APPINFO_SetOption(object_header_t *hdr, DWORD option, void *buf, DW case INTERNET_OPTION_REFRESH: FIXME("INTERNET_OPTION_REFRESH\n"); return ERROR_SUCCESS; + case INTERNET_OPTION_PER_CONNECTION_OPTION: { + INTERNET_PER_CONN_OPTION_LISTW *con = buf; + unsigned int i; + + EnterCriticalSection( &WININET_cs ); + for (i = 0; i < con->dwOptionCount; i++) { + INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i; + + switch (option->dwOption) { + case INTERNET_PER_CONN_PROXY_SERVER: + free(global_proxy.proxy); + global_proxy.proxy = wcsdup(option->Value.pszValue); + break; + + case INTERNET_PER_CONN_FLAGS: + if(option->Value.dwValue & ~(PROXY_TYPE_PROXY | PROXY_TYPE_DIRECT)) + FIXME("Unhandled flags: 0x%lx\n", option->Value.dwValue); + global_proxy.flags = option->Value.dwValue; + break; + + case INTERNET_PER_CONN_PROXY_BYPASS: + free(global_proxy.proxyBypass); + global_proxy.proxyBypass = wcsdup(option->Value.pszValue); + break; + + case INTERNET_PER_CONN_AUTOCONFIG_URL: + free(global_proxy.autoconf_url); + global_proxy.autoconf_url = wcsdup(option->Value.pszValue); + break; + + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: + case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + FIXME("Unhandled dwOption %ld\n", option->dwOption); + break; + + default: + FIXME("Unknown dwOption %ld\n", option->dwOption); + SetLastError(ERROR_INVALID_PARAMETER); + break; + } + } + LeaveCriticalSection( &WININET_cs ); + return ERROR_SUCCESS; + } } return INET_SetOption(hdr, option, buf, size); @@ -2759,37 +2913,6 @@ static WCHAR *get_proxy_autoconfig_url(void) return ret; } -static WCHAR *copy_optionW(WCHAR *value) -{ - DWORD len; - void *tmp; - - if (!value) - return NULL; - - len = (wcslen(value) + 1) * sizeof(WCHAR); - if (!(tmp = GlobalAlloc(0, len))) - return NULL; - - return memcpy(tmp, value, len); -} - -static char *copy_optionA(WCHAR *value) -{ - DWORD len; - void *tmp; - - if (!value) - return NULL; - - len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); - if (!(tmp = GlobalAlloc(0, len))) - return NULL; - - WideCharToMultiByte(CP_ACP, 0, value, -1, tmp, len, NULL, NULL); - return tmp; -} - static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode) { /* FIXME: This function currently handles more options than it should. Options requiring

1 0

Piotr Caban : wininet/tests: Add more INTERNET_OPTION_PER_CONNECTION_OPTION tests.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: a5ce5d637ffee9a6410135daec0562c03ea7d558 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5ce5d637ffee9a6410135daec0562… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Feb 11 15:42:08 2024 +0100 wininet/tests: Add more INTERNET_OPTION_PER_CONNECTION_OPTION tests. --- dlls/wininet/tests/internet.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 1475d2161ce..b1216d63de7 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1308,6 +1308,13 @@ static void test_Option_PerConnectionOption(void) ok(ret, "HeapValidate failed, last error %lu\n", GetLastError()); GlobalFree(options[0].Value.pszValue); + /* verify that global proxy settings were not changed */ + ret = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, &size); + ok(ret, "InternetQueryOption should've succeeded\n"); + ok(lstrcmpW(options[0].Value.pszValue, proxy_srvW), + "Retrieved proxy server should've been %s, was: %s\n", + wine_dbgstr_w(proxy_srvW), wine_dbgstr_w(options[0].Value.pszValue)); + /* disable the proxy server */ list.dwOptionCount = 1; options[0].dwOption = INTERNET_PER_CONN_FLAGS;

1 0

Piotr Caban : inetcpl.cpl: Use wininet functions to set proxy settings.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: b049dad6fd07f3c7c69111e998a201dfb20099a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b049dad6fd07f3c7c69111e998a201… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 7 12:38:07 2024 +0100 inetcpl.cpl: Use wininet functions to set proxy settings. --- dlls/inetcpl.cpl/connections.c | 272 ++++++++++------------------------------- 1 file changed, 64 insertions(+), 208 deletions(-)

1 0

Piotr Caban : wininet/tests: Add initial PAC script tests.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 8314812354e8565ffbcc47be1f37e02adca2c30b URL: https://gitlab.winehq.org/wine/wine/-/commit/8314812354e8565ffbcc47be1f37e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Feb 4 20:21:33 2024 +0100 wininet/tests: Add initial PAC script tests. --- dlls/wininet/tests/http.c | 72 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 9405991c3b0..705f89f28ba 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -529,11 +529,13 @@ typedef struct { HINTERNET request; } test_request_t; -#define open_simple_request(a,b,c,d,e) _open_simple_request(__LINE__,a,b,c,d,e) +#define open_simple_request(a,b,c,d,e) _open_simple_request(__LINE__,a,b,c,d,e,FALSE) +#define open_simple_request_proxy(a,b,c,d,e) _open_simple_request(__LINE__,a,b,c,d,e,TRUE) static void _open_simple_request(unsigned line, test_request_t *req, const char *host, - int port, const char *verb, const char *url) + int port, const char *verb, const char *url, BOOL use_proxy) { - req->session = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + req->session = InternetOpenA(NULL, use_proxy ? INTERNET_OPEN_TYPE_PRECONFIG : INTERNET_OPEN_TYPE_DIRECT, + NULL, NULL, 0); ok_(__FILE__,line)(req->session != NULL, "InternetOpenA failed: %lu\n", GetLastError()); req->connection = InternetConnectA(req->session, host, port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); @@ -2445,6 +2447,11 @@ static const char ok_with_length2[] = "Content-Length: 19\r\n\r\n" "HTTP/1.1 211 OK\r\n\r\n"; +static const char proxy_pac[] = +"function FindProxyForURL(url, host) {\r\n" +" return 'PROXY localhost:%d';\r\n" +"}\r\n\r\n"; + struct server_info { HANDLE hEvent; int port; @@ -2858,6 +2865,18 @@ static DWORD CALLBACK server_thread(LPVOID param) sprintf(msg, largemsg, content_length); send(c, msg, strlen(msg), 0); } + if (strstr(buffer, "GET /proxy.pac")) + { + char script[sizeof(proxy_pac) + 16]; + sprintf(script, proxy_pac, si->port); + send(c, okmsg, sizeof(okmsg)-1, 0); + send(c, script, strlen(script), 0); + } + if (strstr(buffer, "GET http://test.winehq.org/tests/hello.html")) + { + send(c, okmsg, sizeof(okmsg)-1, 0); + send(c, page1, sizeof(page1)-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -6625,6 +6644,52 @@ static void test_header_length(int port) close_request(&req); } +static void test_pac(int port) +{ + static const WCHAR autoconf_url_fmt[] = L"http://localhost:%d/proxy.pac?ver=1"; + INTERNET_PER_CONN_OPTION_LISTW option_list; + INTERNET_PER_CONN_OPTIONW options[2]; + WCHAR autoconf_url[64]; + test_request_t req; + char buf[1000]; + DWORD len; + BOOL r; + + open_simple_request_proxy(&req, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, "GET", "/tests/hello.html"); + + swprintf(autoconf_url, ARRAY_SIZE(autoconf_url), autoconf_url_fmt, port); + memset(&option_list, 0, sizeof(option_list)); + option_list.dwSize = sizeof(option_list); + option_list.dwOptionCount = ARRAY_SIZE(options); + option_list.pOptions = options; + options[0].dwOption = INTERNET_PER_CONN_AUTOCONFIG_URL; + options[0].Value.pszValue = autoconf_url; + options[1].dwOption = INTERNET_PER_CONN_FLAGS; + options[1].Value.dwValue = PROXY_TYPE_AUTO_PROXY_URL; + r = InternetSetOptionW(req.session, INTERNET_OPTION_PER_CONNECTION_OPTION, (void*)&option_list, sizeof(option_list)); + ok(r, "InternetSetOptionW failed: %lu\n", GetLastError()); + + r = HttpSendRequestW(req.request, NULL, 0, NULL, 0); + ok(r, "HttpSendRequestW failed: %lu\n", GetLastError()); + + test_status_code(req.request, 200); + len = receive_simple_request(req.request, buf, sizeof(buf)); + todo_wine + ok(len == sizeof(page1) - 1, "unexpected buffer size\n"); + buf[len] = 0; + todo_wine + ok(!strcmp(buf, page1), "unexpected buffer content\n"); + + len = sizeof(option_list); + r = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, (void*)&option_list, &len); + ok(r, "InternetGetOptionW failed: %lu\n", GetLastError()); + r = InternetSetOptionW(req.session, INTERNET_OPTION_PER_CONNECTION_OPTION, (void*)&option_list, sizeof(option_list)); + ok(r, "InternetSetOptionW failed: %lu\n", GetLastError()); + GlobalFree(options[0].Value.pszValue); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -6692,6 +6757,7 @@ static void test_http_connection(void) test_remove_dot_segments(si.port); test_large_content(si.port); test_header_length(si.port); + test_pac(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Alexandre Julliard : mpg123: Import upstream release 1.32.5.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 3881edf6f308797026143908be882d871f4c718c URL: https://gitlab.winehq.org/wine/wine/-/commit/3881edf6f308797026143908be882d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 18:07:34 2024 +0100 mpg123: Import upstream release 1.32.5. --- configure | 2 +- configure.ac | 2 +- libs/mpg123/config.h | 48 +-------- libs/mpg123/src/{libmpg123 => common}/abi_align.h | 0 libs/mpg123/src/{libmpg123 => common}/debug.h | 4 +- libs/mpg123/src/{libmpg123 => common}/sample.h | 6 +- .../src/{libmpg123 => common}/swap_bytes_impl.h | 0 libs/mpg123/src/{libmpg123 => common}/true.h | 0 libs/mpg123/src/compat/compat.c | 2 +- libs/mpg123/src/compat/compat.h | 54 ++-------- libs/mpg123/src/compat/compat_str.c | 2 +- libs/mpg123/src/{libmpg123 => include}/fmt123.h | 9 +- libs/mpg123/src/{libmpg123 => include}/mpg123.h | 58 +++++------ libs/mpg123/src/libmpg123/decode.h | 17 ++- libs/mpg123/src/libmpg123/dither_impl.h | 2 +- libs/mpg123/src/libmpg123/format.c | 6 +- libs/mpg123/src/libmpg123/frame.c | 9 +- libs/mpg123/src/libmpg123/frame.h | 4 +- libs/mpg123/src/libmpg123/gapless.h | 6 +- libs/mpg123/src/libmpg123/getbits.h | 2 +- libs/mpg123/src/libmpg123/icy.h | 2 +- libs/mpg123/src/libmpg123/icy2utf8.c | 2 +- libs/mpg123/src/libmpg123/id3.c | 10 +- libs/mpg123/src/libmpg123/index.c | 4 +- libs/mpg123/src/libmpg123/index.h | 2 +- libs/mpg123/src/libmpg123/layer1.c | 2 +- libs/mpg123/src/libmpg123/layer3.c | 114 ++++++++++++++++++++- libs/mpg123/src/libmpg123/lfs_wrap.c | 28 +++-- libs/mpg123/src/libmpg123/libmpg123.c | 14 +-- libs/mpg123/src/libmpg123/mpg123lib_intern.h | 12 +-- libs/mpg123/src/libmpg123/ntom.c | 2 +- libs/mpg123/src/libmpg123/optimize.c | 56 ++-------- libs/mpg123/src/libmpg123/optimize.h | 9 +- libs/mpg123/src/libmpg123/parse.c | 2 +- libs/mpg123/src/libmpg123/readers.c | 4 +- libs/mpg123/src/libmpg123/stringbuf.c | 4 +- libs/mpg123/src/libmpg123/synth.c | 4 +- libs/mpg123/src/libmpg123/synth_8bit.c | 4 +- libs/mpg123/src/libmpg123/synth_real.c | 4 +- libs/mpg123/src/libmpg123/synth_s32.c | 4 +- libs/mpg123/src/libmpg123/tabinit.c | 2 +- libs/mpg123/src/version.h | 2 +- 42 files changed, 252 insertions(+), 268 deletions(-)

1 0