wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Alexandre Julliard : ntdll: Dynamically load callback functions from the Unix library.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: c1dc5021ac2534ea7bf52246f13c19941b791efa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1dc5021ac2534ea7bf52246… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 11:57:32 2020 +0200 ntdll: Dynamically load callback functions from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 100 ++++++++++++++++++++++++---------------- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 4 +- dlls/ntdll/unix/signal_i386.c | 4 +- dlls/ntdll/unix/signal_x86_64.c | 4 +- dlls/ntdll/unix/thread.c | 4 +- dlls/ntdll/unix/unix_private.h | 7 ++- 8 files changed, 74 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1dc5021ac2534ea7bf5…

1 0

Hans Leidekker : winhttp: Implement WinHttpWebSocketCompleteUpgrade.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 0b48050da58be2ee72bcc5c4848822d6853d857c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b48050da58be2ee72bcc5c4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 17 11:53:41 2020 +0200 winhttp: Implement WinHttpWebSocketCompleteUpgrade. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 101 +++++++++++++++++++++++++++++++++++++++-- dlls/winhttp/session.c | 13 ++---- dlls/winhttp/tests/winhttp.c | 34 +++++++------- dlls/winhttp/winhttp_private.h | 14 ++++++ 4 files changed, 133 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b48050da58be2ee72bc…

1 0

Alistair Leslie-Hughes : winhttp: Status HTTP_STATUS_SWITCH_PROTOCOLS doesn't have any content.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: a6de059eef5e0aa4aa688885c1d91497c588576f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6de059eef5e0aa4aa688885… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 17 11:53:40 2020 +0200 winhttp: Status HTTP_STATUS_SWITCH_PROTOCOLS doesn't have any content. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 79d66fd5e8..9173bdb56d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2353,8 +2353,11 @@ static void set_content_length( struct request *request, DWORD status ) WCHAR encoding[20]; DWORD buflen = sizeof(request->content_length); - if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || !wcscmp( request->verb, L"HEAD" )) + if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || + status == HTTP_STATUS_SWITCH_PROTOCOLS || !wcscmp( request->verb, L"HEAD" )) + { request->content_length = 0; + } else { if (query_headers( request, WINHTTP_QUERY_CONTENT_LENGTH|WINHTTP_QUERY_FLAG_NUMBER,

1 0

Zhiyi Zhang : winemac.drv: Support multiple adapter display settings in registry.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 6b6a7124a67c6eadbe4408163f93dbf0379b6565 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b6a7124a67c6eadbe440816… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 11 17:22:48 2020 +0800 winemac.drv: Support multiple adapter display settings in registry. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 82 ++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index c024885e2d..522ff57d7a 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -71,6 +71,7 @@ static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR adapter_prefixW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { @@ -151,44 +152,58 @@ static void release_display_device_init_mutex(HANDLE mutex) CloseHandle(mutex); } -static BOOL get_display_device_reg_key(char *key, unsigned len) +static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; + WCHAR value_name[MAX_PATH], buffer[MAX_PATH], *end_ptr; + DWORD adapter_index, size; - assert(len >= sizeof(video_path) + sizeof(display0) + 40); - - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; + /* Device name has to be \\.\DISPLAY%d */ + if (strncmpiW(device_name, adapter_prefixW, ARRAY_SIZE(adapter_prefixW))) + return FALSE; - memcpy(key, video_path, sizeof(video_path)); + /* Parse \\.\DISPLAY* */ + adapter_index = strtolW(device_name + ARRAY_SIZE(adapter_prefixW), &end_ptr, 10) - 1; + if (*end_ptr) + return FALSE; - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) + /* Open \Device\Video* in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + sprintfW(value_name, device_video_fmtW, adapter_index); + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, value_name, RRF_RT_REG_SZ, NULL, buffer, &size)) return FALSE; - strcat(key, display0); + if (len < lstrlenW(buffer + 18) + 1) + return FALSE; - TRACE("display device key %s\n", wine_dbgstr_a(key)); + /* Skip \Registry\Machine\ prefix */ + lstrcpyW(key, buffer + 18); + TRACE("display device %s registry settings key %s.\n", wine_dbgstr_w(device_name), wine_dbgstr_w(key)); return TRUE; } -static BOOL read_registry_settings(DEVMODEW *dm) +static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) { - char wine_mac_reg_key[128]; + WCHAR wine_mac_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; DWORD type, size; BOOL ret = TRUE; dm->dmFields = 0; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + if (RegOpenKeyExW(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define query_value(name, data) \ size = sizeof(DWORD); \ @@ -216,22 +231,31 @@ static BOOL read_registry_settings(DEVMODEW *dm) #undef query_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } -static BOOL write_registry_settings(const DEVMODEW *dm) +static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm) { - char wine_mac_reg_key[128]; + WCHAR wine_mac_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, + if (RegCreateKeyExW(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define set_value(name, data) \ if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \ @@ -250,6 +274,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) #undef set_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } @@ -833,12 +858,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } - if (lstrcmpiW(primary_adapter, devname)) - { - FIXME("Changing non-primary adapter settings is currently unsupported.\n"); - return DISP_CHANGE_SUCCESSFUL; - } - if (is_detached_mode(devmode)) { FIXME("Detaching adapters is currently unsupported.\n"); @@ -958,13 +977,18 @@ better: /* we have a valid mode */ TRACE("Requested display settings match mode %ld\n", best); - if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devmode)) + if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devname, devmode)) { WARN("Failed to update registry\n"); ret = DISP_CHANGE_NOTUPDATED; } else if (flags & (CDS_TEST | CDS_NORESET)) ret = DISP_CHANGE_SUCCESSFUL; + else if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter settings is currently unsupported.\n"); + ret = DISP_CHANGE_SUCCESSFUL; + } else if (macdrv_set_display_mode(&displays[0], best_display_mode)) { int mode_bpp = display_mode_bits_per_pixel(best_display_mode); @@ -1034,7 +1058,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, if (mode == ENUM_REGISTRY_SETTINGS) { TRACE("mode %d (registry) -- getting default mode\n", mode); - return read_registry_settings(devmode); + return read_registry_settings(devname, devmode); } if (macdrv_get_displays(&displays, &num_displays))

1 0

Zhiyi Zhang : winemac.drv: Use helpers to get and release display device init mutex.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 13e3d8f6354d23226ac5e7b1a2fb3aeb81d0b402 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e3d8f6354d23226ac5e7b1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 11 17:22:24 2020 +0800 winemac.drv: Use helpers to get and release display device init mutex. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 001906efdf..c024885e2d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -136,6 +136,21 @@ static CRITICAL_SECTION modes_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL inited_original_display_mode; +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + static BOOL get_display_device_reg_key(char *key, unsigned len) { static const char display_device_guid_prop[] = "__wine_display_device_guid"; @@ -1675,7 +1690,6 @@ static void cleanup_devices(void) */ void macdrv_init_display_devices(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct macdrv_gpu *gpus = NULL; struct macdrv_adapter *adapters = NULL; @@ -1691,8 +1705,7 @@ void macdrv_init_display_devices(BOOL force) LUID gpu_luid; UINT output_id = 0; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -1760,8 +1773,7 @@ done: SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); macdrv_free_gpus(gpus); macdrv_free_adapters(adapters);

1 0

Ziqing Hui : windowscodecs: Fix MIME types of DDS decoder.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: a2fa0e76b17fb4f247e529b284841e89de99750f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2fa0e76b17fb4f247e529b2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 16 13:54:47 2020 +0800 windowscodecs: Fix MIME types of DDS decoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 2 +- dlls/windowscodecs/tests/info.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 584897689d..00be59c98f 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1298,7 +1298,7 @@ static struct regsvr_decoder const decoder_list[] = { "1.0.0.0", &GUID_VendorMicrosoft, &GUID_ContainerFormatDds, - "image/vnd-ms.dds", + "image/vnd.ms-dds", ".dds", dds_formats, dds_patterns diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 707b0715b7..bb8d3310bc 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -193,7 +193,6 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); todo_wine_if(test->todo) { - todo_wine_if(i == 6) ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); } @@ -205,7 +204,6 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); todo_wine_if(test->todo) { - todo_wine_if(i == 6) ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); }

1 0

Ziqing Hui : windowscodecs/tests: Add decoder info tests for DDS decoder.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: f69619791d38ba2737a91256a0ba6ed42c0a8f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f69619791d38ba2737a91256… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 16 13:54:07 2020 +0800 windowscodecs/tests: Add decoder info tests for DDS decoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/info.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index af2532efb4..707b0715b7 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -105,6 +105,11 @@ static void test_decoder_info(void) ".tiff,.tif", 1 }, + { + &CLSID_WICDdsDecoder, + "image/vnd.ms-dds", + ".dds", + } }; IWICBitmapDecoderInfo *decoder_info, *decoder_info2; IWICComponentInfo *info; @@ -124,6 +129,10 @@ static void test_decoder_info(void) WCHAR mimetypeW[64]; hr = CoCreateInstance(test->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void **)&decoder); + if (test->clsid == &CLSID_WICDdsDecoder && hr != S_OK) { + win_skip("DDS decoder is not supported\n"); + continue; + } ok(SUCCEEDED(hr), "Failed to create decoder, hr %#x.\n", hr); decoder_info = NULL; @@ -184,6 +193,7 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); todo_wine_if(test->todo) { + todo_wine_if(i == 6) ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); } @@ -195,6 +205,7 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); todo_wine_if(test->todo) { + todo_wine_if(i == 6) ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); }

1 0

Ziqing Hui : windowscodecs/tests: Add tests for DdsFrameDecode_GetPixelFormat().
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 67a50f125298a4888d7f9df27d35559b06d4c8fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=67a50f125298a4888d7f9df2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 16 13:52:01 2020 +0800 windowscodecs/tests: Add tests for DdsFrameDecode_GetPixelFormat(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index a69ff35dcb..5e0340bdef 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -168,17 +168,18 @@ static struct test_data { BYTE *data; UINT size; UINT expected_frame_count; + const GUID *expected_pixel_format; WICDdsParameters expected_parameters; } test_data[] = { - { test_dds_image, sizeof(test_dds_image), 1, + { test_dds_image, sizeof(test_dds_image), 1, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 1, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, - { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3, + { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, - { test_dds_volume, sizeof(test_dds_volume), 7, + { test_dds_volume, sizeof(test_dds_volume), 7, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 4, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture3D, WICDdsAlphaModePremultiplied } }, - { test_dds_array, sizeof(test_dds_array), 9, + { test_dds_array, sizeof(test_dds_array), 9, &GUID_WICPixelFormat32bppBGRA, { 4, 4, 1, 3, 3, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown } }, - { test_dds_dxt3, sizeof(test_dds_dxt3), 8, + { test_dds_dxt3, sizeof(test_dds_dxt3), 8, &GUID_WICPixelFormat32bppBGRA, { 12, 12, 1, 4, 2, DXGI_FORMAT_BC2_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown } }, }; @@ -446,6 +447,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod UINT width, height ,expected_width, expected_height, slice_index, depth; UINT width_in_blocks, height_in_blocks, expected_width_in_blocks, expected_height_in_blocks; WICDdsFormatInfo format_info; + GUID pixel_format; /* frame size tests */ @@ -511,6 +513,15 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod ok (height_in_blocks == expected_height_in_blocks, "%d: [frame %d] Expected height in blocks %d, got %d\n", i, frame_index, expected_height_in_blocks, height_in_blocks); + /* pixel format tests */ + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, NULL); + todo_wine ok (hr == E_INVALIDARG, "[%d, frame %d] GetPixelFormat got unexpected hr %x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, &pixel_format); + todo_wine ok (hr == S_OK, "[%d, frame %d] GetPixelFormat failed\n", i, frame_index); + if (hr != S_OK) return; + todo_wine ok (IsEqualGUID(&pixel_format, test_data[i].expected_pixel_format), + "[%d, frame %d] Got unexpected pixel format %s\n", i, frame_index, debugstr_guid(&pixel_format)); } static void test_dds_decoder_frame_data(IWICDdsFrameDecode *dds_frame, UINT frame_count, WICDdsParameters *params,

1 0

Zhiyi Zhang : user32: Change slave to a more neutral word.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 2affb854e524dde962f983a36628f22fe9e165c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2affb854e524dde962f983a3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 16 22:17:36 2020 +0800 user32: Change slave to a more neutral word. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 82ed851364..768aeb5d4f 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3910,7 +3910,7 @@ static BOOL update_monitor_cache(void) HANDLE mutex = NULL; DWORD state_flags; BOOL ret = FALSE; - BOOL mirrored_slave; + BOOL is_replica; DWORD i = 0, j; DWORD type; @@ -3956,17 +3956,17 @@ static BOOL update_monitor_cache(void) (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) goto fail; - /* Mirrored slave monitors also don't get enumerated */ - mirrored_slave = FALSE; + /* Replicas in mirroring monitor sets don't get enumerated */ + is_replica = FALSE; for (j = 0; j < monitor_count; j++) { if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor)) { - mirrored_slave = TRUE; + is_replica = TRUE; break; } } - if (mirrored_slave) + if (is_replica) continue; if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type,

1 0

Dmitry Timoshkov : prntvpt: Add initial implementation of PTGetPrintCapabilities.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 9f2512d836cc62204c7ef61b661a02682ecb34c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f2512d836cc62204c7ef61b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:43 2020 +0800 prntvpt: Add initial implementation of PTGetPrintCapabilities. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/main.c | 12 ++ dlls/prntvpt/prntvpt.spec | 2 +- dlls/prntvpt/prntvpt_private.h | 1 + dlls/prntvpt/ticket.c | 281 +++++++++++++++++++++++++++++++++++++++++ include/prntvpt.h | 1 + 5 files changed, 296 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f2512d836cc62204c7e…

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020