May 2022 - Wine-devel - list.winehq.org

[PATCH 4/5] d3dx10_43: Add D3DX10CreateAsyncTextureInfoProcessor stub.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 6 ++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10.h | 2 +- include/d3dx10async.h | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-)

1 0

[PATCH 3/5] d3dx10_43: Share code for resource data loading.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 93 ++++++++++++++++++++++++++++---------- dlls/d3dx10_43/compiler.c | 34 ++------------ dlls/d3dx10_43/dxhelpers.h | 4 ++ dlls/d3dx10_43/texture.c | 70 ++++------------------------ 4 files changed, 89 insertions(+), 112 deletions(-)

1 0

[PATCH 2/5] d3dx10_43: Share code for file data loading.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 39 +++++++++++++++--------- dlls/d3dx10_43/dxhelpers.h | 19 ++++++++++++ dlls/d3dx10_43/texture.c | 62 +++++--------------------------------- 3 files changed, 51 insertions(+), 69 deletions(-) create mode 100644 dlls/d3dx10_43/dxhelpers.h

1 0

[PATCH 1/5] d3dx10_43: Try loading the resource as bitmap in D3DX10CreateAsyncResourceLoader.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tools] winetest/tests: Add CORS page for testing CORS and XDomainRequest.
by Gabriel Ivăncescu 26 May '22

26 May '22

"text/plain" content type is important since native has too many restrictions on XDomainRequest and doesn't support anything else. The fact the file is a html page also enables detection testing instead of it reading the header only. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- winetest/tests/.htaccess | 7 +++++++ winetest/tests/cors.html | 1 + 2 files changed, 8 insertions(+) create mode 100644 winetest/tests/cors.html diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess index 73bab30..18c8b24 100644 --- a/winetest/tests/.htaccess +++ b/winetest/tests/.htaccess @@ -24,3 +24,10 @@ Header set Pragma "no-cache" Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" </ifModule> </FilesMatch> + +<Files cors.html> +<ifModule mod_headers.c> +Header set Access-Control-Allow-Origin "*" +Header set Content-Type "text/plain" +</ifModule> +</Files> diff --git a/winetest/tests/cors.html b/winetest/tests/cors.html new file mode 100644 index 0000000..3a73f89 --- /dev/null +++ b/winetest/tests/cors.html @@ -0,0 +1 @@ +<html><body>test</body></html> -- 2.34.1

1 0

[PATCH v2 1/2] winepulse: Try to obtain shorter device names if it exceeds 62 chars.
by Gabriel Ivăncescu 26 May '22

26 May '22

If the device desc is longer than the limit, we try to obtain product name or alsa name (whichever is shorter) but only if both fit within the limit, as otherwise there is no point to do it anyway (and avoids another allocation, simplifying the code). Then the profile desc is appended if it doesn't cause us to exceed the limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53010 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- I've done some testing with this by hacking the checks. Sometimes, the desc is even shorter than the device name (e.g. for "Built-In Analog Stereo" case), so it's always the first attempt. Note that we have to check the length *after* conversion to WCHAR since it can change. We can't rely on the source string's length (also we can't assume UTF8 if host CP is something else, which ntdll_umbstowcs takes care of). dlls/winepulse.drv/pulse.c | 94 +++++++++++++++++++++++++++++++++----- 1 file changed, 82 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1254509..47860fa 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -426,6 +426,83 @@ static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } +static WCHAR *get_device_name(const char *desc, pa_proplist *proplist) +{ + /* + Some broken apps (e.g. Split/Second with fmodex) can't handle names that + are too long and crash even on native. If the device desc is too long, + we'll attempt to incrementally build it to try to stay under the limit. + ( + 1 is to check against full buffer after ntdll_umbstowcs ) + */ + WCHAR buf[62 + 1]; + + /* For monitors of sinks; this does not seem to be localized in PA either */ + static const WCHAR monitor_of[] = {'M','o','n','i','t','o','r',' ','o','f',' '}; + + size_t len = strlen(desc); + WCHAR *name, *tmp; + + if (!(name = malloc((len + 1) * sizeof(WCHAR)))) + return NULL; + if (!(len = ntdll_umbstowcs(desc, len, name, len))) { + free(name); + return NULL; + } + + if (len >= ARRAY_SIZE(buf) && proplist) { + const char *prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_CLASS); + const char *product_name, *alsa_name; + unsigned product_len, alsa_len; + unsigned rem = ARRAY_SIZE(buf); + BOOL monitor = FALSE; + + if (prop && !strcmp(prop, "monitor")) { + rem -= ARRAY_SIZE(monitor_of); + monitor = TRUE; + } + + product_name = pa_proplist_gets(proplist, PA_PROP_DEVICE_PRODUCT_NAME); + if (!product_name || !product_name[0] || + !(product_len = ntdll_umbstowcs(product_name, strlen(product_name), buf, rem)) || product_len == rem) + product_name = NULL; + + alsa_name = pa_proplist_gets(proplist, "alsa.card_name"); + if (!alsa_name || !alsa_name[0] || + !(alsa_len = ntdll_umbstowcs(alsa_name, strlen(alsa_name), buf, rem)) || alsa_len == rem) + alsa_name = NULL; + + prop = !product_name || (alsa_name && alsa_len < product_len) ? alsa_name : product_name; + if (prop) { + /* We know we have a name that fits within the limit now */ + WCHAR *p = name; + + if (monitor) { + memcpy(p, monitor_of, sizeof(monitor_of)); + p += ARRAY_SIZE(monitor_of); + } + len = ntdll_umbstowcs(prop, strlen(prop), p, rem); + rem -= len; + p += len; + + if (rem > 2) { + rem--; /* space */ + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION); + if (prop && prop[0] && (len = ntdll_umbstowcs(prop, strlen(prop), p + 1, rem)) && len != rem) { + *p++ = ' '; + p += len; + } + } + len = p - name; + } + } + name[len] = '\0'; + + if ((tmp = realloc(name, (len + 1) * sizeof(WCHAR)))) + name = tmp; + return name; +} + static void fill_device_info(PhysDevice *dev, pa_proplist *p) { const char *buffer; @@ -452,27 +529,18 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - UINT channel_mask, const char *pulse_name, const char *name) + UINT channel_mask, const char *pulse_name, const char *desc) { - size_t len = strlen(pulse_name), name_len = strlen(name); + size_t len = strlen(pulse_name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); - WCHAR *wname; if (!dev) return; - if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + if (!(dev->name = get_device_name(desc, proplist))) { free(dev); return; } - - if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || - !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { - free(wname); - free(dev); - return; - } - dev->name[name_len] = 0; dev->form = form; dev->index = index; dev->channel_mask = channel_mask; @@ -480,6 +548,8 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index memcpy(dev->pulse_name, pulse_name, len + 1); list_add_tail(list, &dev->entry); + + TRACE("%s\n", debugstr_w(dev->name)); } static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) -- 2.34.1

1 1

[PATCH] secur32: Remove unused field from struct schan_transport.
by Nikolay Sivov 26 May '22

26 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 2 -- dlls/secur32/secur32_priv.h | 1 - 2 files changed, 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index bbbac37c6bb..6ab5507becf 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -826,8 +826,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( else ctx->header_size = HEADER_SIZE_TLS; - ctx->transport.ctx = ctx; - if (pszTargetName && *pszTargetName) { UINT len = WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, NULL, 0, NULL, NULL ); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 64edc0581d6..be375618266 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -102,7 +102,6 @@ struct schan_buffers struct schan_transport { - struct schan_context *ctx; schan_session session; struct schan_buffers in; struct schan_buffers out; -- 2.35.1

1 0

[PATCH 0/6] MR130: user32: Progress toward PE conversion of raw input APIs.
by Zebediah Figura (＠zfigura) 26 May '22

26 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/130

4 8

[PATCH 2/2]mscms: make the correct value for bmformat.
by Zhao Yi 26 May '22

26 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> ---  dlls/mscms/transform.c | 10 +++++-----  1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..21f58e73134 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format )        switch (format)      { -    case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; -    case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; +    case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; +    case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break;      case BM_GRAY:        ret = TYPE_GRAY_8; break; -    case BM_xRGBQUADS:   ret = TYPE_ARGB_8; break; -    case BM_xBGRQUADS:   ret = TYPE_ABGR_8; break; -    case BM_KYMCQUADS:   ret = TYPE_KYMC_8; break; +    case BM_xRGBQUADS:   ret = TYPE_ABGR_8; break; +    case BM_xBGRQUADS:   ret = TYPE_ARGB_8; break; +    case BM_KYMCQUADS:   ret = TYPE_CMYK_8; break;      default:          if (!quietfixme)          { --  2.20.1

2 1

[PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Zhao Yi 26 May '22

26 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> ---  dlls/mscms/tests/profile.c | 118 +++++++++++++++++++++++++++++++++++++  1 file changed, 118 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..3d24f5aa62a 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -62,6 +62,7 @@ static BOOL     (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL);  static BOOL     (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL);    static BOOL     (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); +static BOOL     (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG);    #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \      if (!p##func) return FALSE; @@ -95,6 +96,7 @@ static BOOL init_function_ptrs( void )      GETFUNCPTR( SetStandardColorSpaceProfileW )      GETFUNCPTR( UninstallColorProfileA )      GETFUNCPTR( UninstallColorProfileW ) +    GETFUNCPTR( TranslateBitmapBits )        pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" );   @@ -123,6 +125,16 @@ L"\\color\\srgb color space profile.icm";  static const WCHAR profile2W[] =  L"\\spool\\drivers\\color\\srgb color space profile.icm";   +static const char binfile1[] = +"\\w32x86\\3\\SS0IIN03.BIN"; +static const char binfile1_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IIN03.BIN"; + +static const char binfile2[] = +"\\w32x86\\3\\SS0IO15.BIN"; +static const char binfile2_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IO15.BIN"; +  static BOOL have_color_profile;    static const unsigned char rgbheader[] = @@ -1359,6 +1371,111 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp      }  }   +static void test_TranslateBitmapBits() +{ +    PROFILE profile; +    HPROFILE handle[2]; +    HTRANSFORM transform; +    DWORD intents = INTENT_PERCEPTUAL; + +    #define DESTBUFSIZE 4 +    HANDLE binfile_handle; +    UINT uret; +    char binfilefile1[MAX_PATH], binfilefile1_ex[MAX_PATH], binfilefile2[MAX_PATH], binfilefile2_ex[MAX_PATH]; +    WCHAR binfilefile1W[MAX_PATH]; +    char *standbinfile1 = NULL; +    char *standbinfile2 = NULL; +    BYTE srcbits[] = {0,0,0xff}; +    BMFORMAT input = BM_BGRTRIPLETS; +    DWORD width = 1; +    DWORD height = 1; +    DWORD inputstride = 3; +    PVOID destbits = HeapAlloc( GetProcessHeap(), 0, DESTBUFSIZE); +    BMFORMAT output = BM_KYMCQUADS; +    DWORD outputstride = 4; +    PBMCALLBACKFN callback = NULL; +    ULONG data = 0; +    BYTE expect_destbits[]={0xff, 0xb6, 0, 0}; +    BOOL bret = FALSE; + +    uret = GetSystemDirectoryA( binfilefile1, sizeof(binfilefile1) ); +    ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); +    ok(binfilefile1[0] && lstrlenA(binfilefile1) < MAX_PATH, +        "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile1)); +    lstrcpyA(binfilefile1_ex, binfilefile1); + +    uret = GetSystemDirectoryA( binfilefile2, sizeof(binfilefile2) ); +    ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); +    ok(binfilefile2[0] && lstrlenA(binfilefile2) < MAX_PATH, +        "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile2)); +    lstrcpyA(binfilefile2_ex, binfilefile2); + +    lstrcatA( binfilefile1, binfile1 ); +    binfile_handle = CreateFileA( binfilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile1 = binfilefile1; +        CloseHandle( binfile_handle ); +    } + +    lstrcatA( binfilefile1_ex, binfile1_ex ); +    binfile_handle = CreateFileA( binfilefile1_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile1 = binfilefile1_ex; +        CloseHandle( binfile_handle ); +    } + +    lstrcatA( binfilefile2, binfile2 ); +    binfile_handle = CreateFileA( binfilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile2 = binfilefile2; +        CloseHandle( binfile_handle ); +    } + +    lstrcatA( binfilefile2_ex, binfile2_ex ); +    binfile_handle = CreateFileA( binfilefile2_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile2 = binfilefile2_ex; +        CloseHandle( binfile_handle ); +    } +    +    if (standbinfile1 && standbinfile2) +    { +        profile.dwType       = PROFILE_FILENAME; +        profile.pProfileData = standbinfile1; +        profile.cbDataSize   = strlen(standbinfile1); + +        handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); +        ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + +        profile.dwType       = PROFILE_FILENAME; +        profile.pProfileData = standbinfile2; +        profile.cbDataSize   = strlen(standbinfile2); + +        handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); +        ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + +        transform = pCreateMultiProfileTransform( handle, 2, &intents, 1, 3, 0 ); +        ok( transform != NULL, "got %lu\n", GetLastError() ); + +        ZeroMemory(destbits,DESTBUFSIZE); +        bret = pTranslateBitmapBits(transform,srcbits,input,width,height,inputstride,destbits,output,outputstride,callback,data); +        ok(bret && memcmp(expect_destbits, destbits, sizeof(expect_destbits)) == 0, "get err destbits data\n"); +        HeapFree( GetProcessHeap(), 0, destbits ); + +        pDeleteColorTransform( transform ); +        pCloseColorProfile( handle[0] ); +        pCloseColorProfile( handle[1] ); +    } +} +  START_TEST(profile)  {      UINT len; @@ -1469,6 +1586,7 @@ START_TEST(profile)        test_AssociateColorProfileWithDeviceA( testprofile );      test_CreateMultiProfileTransform( standardprofile, testprofile ); +    test_TranslateBitmapBits( );        if (testprofile) DeleteFileA( testprofile );      FreeLibrary( huser32 ); -- 2.20.1

2 1