April 2016 - Wine-commits - list.winehq.org

Alexandre Julliard : secur32/tests: Don' t check the exact number of cipher bits.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 9a8220c4ed66146627c5d7ad2bf1da1a91add5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8220c4ed66146627c5d7ad2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 18:20:29 2015 +0100 secur32/tests: Don't check the exact number of cipher bits. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9ab03dd7bbded6f9a2a93e5fec2f60b61125140a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/tests/schannel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 35100f7..51c22d5 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -927,8 +927,7 @@ todo_wine status = pQueryContextAttributesA(&context, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_CONNECTION_INFO) failed: %08x\n", status); if(status == SEC_E_OK) { - ok(conn_info.dwCipherStrength == 128 || conn_info.dwCipherStrength == 168, - "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); + ok(conn_info.dwCipherStrength >= 128, "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); }

1 0

Michael Stefaniuc : Release 1.8.2.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 24a730187e08699b51c698d4fed58ba2947f0c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a730187e08699b51c698d4f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Apr 7 14:25:40 2016 +0200 Release 1.8.2. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 274 +++++++++++++++++++++++++++++++++++++++++--------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 ++--- 4 files changed, 197 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24a730187e08699b51c69…

1 0

Tag wine-1.8.2 : Alexandre Julliard : Release 1.8.2
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: refs/tags/wine-1.8.2 Tag: 953d3e2b38afa83c8d23752753c589c813e1c6bc URL: http://source.winehq.org/git/wine.git/?a=tag;h=953d3e2b38afa83c8d23752753c5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 12 20:42:53 2016 +0900 Release 1.8.2

1 0

Józef Kucia : wined3d: Limit amount of video memory for older Windows versions.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: ab5d004f1dd3a3c48d4bc11ce51f87f60f58d352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab5d004f1dd3a3c48d4bc11ce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 11 13:28:03 2016 +0100 wined3d: Limit amount of video memory for older Windows versions. This should affect only 32-bit applications when the emulated Windows version is set to "Windows 2003" or older. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 565a5715468fa990cf9e7cbfe38ac59ddcde1e76) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 76fc04a..07ceed6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1506,6 +1506,18 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, driver = DRIVER_UNKNOWN; } + /** + * Diablo 2 crashes when the amount of video memory is greater than 0x7fffffff. + * In order to avoid this application bug we limit the amount of video memory + * to LONG_MAX for older Windows versions. + */ + if (os_version.dwMajorVersion <= 5 && os_version.dwMinorVersion <= 2 + && driver_info->vram_bytes > LONG_MAX) + { + TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX); + driver_info->vram_bytes = LONG_MAX; + } + if (wined3d_settings.emulated_textureram) { TRACE("Overriding amount of video memory with 0x%s bytes.\n",

1 0

Józef Kucia : wined3d: Fix driver version check.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 53370ec5d0d560bc8e998c92616098cb8dfcd28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=53370ec5d0d560bc8e998c926… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:46 2016 +0100 wined3d: Fix driver version check. The previous check didn't catch older Windows versions for which dwMinorVersion > 2. Spotted by Michael Müller. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 97c70c86be26e02a398411877d6e6a26367d3ab8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 07ceed6..254102e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1511,8 +1511,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, * In order to avoid this application bug we limit the amount of video memory * to LONG_MAX for older Windows versions. */ - if (os_version.dwMajorVersion <= 5 && os_version.dwMinorVersion <= 2 - && driver_info->vram_bytes > LONG_MAX) + if (driver_model < DRIVER_MODEL_NT6X && driver_info->vram_bytes > LONG_MAX) { TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX); driver_info->vram_bytes = LONG_MAX;

1 0

Józef Kucia : wined3d: Allow to query if surface format supports gamma correction.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: b67659f49d57139aec708e2d2b2560e6255fd0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67659f49d57139aec708e2d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 8 00:04:41 2016 +0100 wined3d: Allow to query if surface format supports gamma correction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b7dcf112e9b3893ff0e7c680c59ff4a6eafaa7b7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 254102e..eb414cc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4651,6 +4651,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; + if (usage & WINED3DUSAGE_RENDERTARGET) + allowed_usage |= WINED3DUSAGE_QUERY_SRGBWRITE; gl_type = WINED3D_GL_RES_TYPE_RB; break;

1 0

Hans Leidekker : msi: Fix the CHAR column type.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 72ad32b6693ebdc2b9e22dd6c71e623e19aa69f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ad32b6693ebdc2b9e22dd6c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 15 10:16:12 2016 +0100 msi: Fix the CHAR column type. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b21373bf112aed3cce495f1ef51334cf51224bc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/sql.y | 2 +- dlls/msi/tests/db.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 553cc6d..366764d 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -355,7 +355,7 @@ data_type_l: data_type: TK_CHAR { - $$ = MSITYPE_STRING | 1; + $$ = MSITYPE_STRING | 0x400; } | TK_CHAR TK_LP data_count TK_RP { diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 98e0e96..7dd878a 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1286,13 +1286,15 @@ static void test_viewgetcolumninfo(void) r = run_query( hdb, 0, "CREATE TABLE `Properties` " "( `Property` CHAR(255), " - " `Value` CHAR(1), " - " `Intvalue` INT, " - " `Integervalue` INTEGER, " - " `Shortvalue` SHORT, " - " `Longvalue` LONG, " - " `Longcharvalue` LONGCHAR " - " PRIMARY KEY `Property`)" ); + " `Value` CHAR(1), " + " `Intvalue` INT, " + " `Integervalue` INTEGER, " + " `Shortvalue` SHORT, " + " `Longvalue` LONG, " + " `Longcharvalue` LONGCHAR, " + " `Charvalue` CHAR, " + " `Localizablevalue` CHAR LOCALIZABLE " + " PRIMARY KEY `Property`)" ); ok( r == ERROR_SUCCESS , "Failed to create table\n" ); /* check the column types */ @@ -1306,6 +1308,8 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 5, "I2"), "wrong record type\n"); ok( check_record( rec, 6, "I4"), "wrong record type\n"); ok( check_record( rec, 7, "S0"), "wrong record type\n"); + ok( check_record( rec, 8, "S0"), "wrong record type\n"); + ok( check_record( rec, 9, "L0"), "wrong record type\n"); MsiCloseHandle( rec ); @@ -1317,6 +1321,8 @@ static void test_viewgetcolumninfo(void) ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n"); ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n"); + ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 8 ), "_columns table wrong\n"); + ok( 0x1f00 == get_columns_table_type(hdb, "Properties", 9 ), "_columns table wrong\n"); /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); @@ -1329,6 +1335,8 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 5, "Shortvalue"), "wrong record type\n"); ok( check_record( rec, 6, "Longvalue"), "wrong record type\n"); ok( check_record( rec, 7, "Longcharvalue"), "wrong record type\n"); + ok( check_record( rec, 8, "Charvalue"), "wrong record type\n"); + ok( check_record( rec, 9, "Localizablevalue"), "wrong record type\n"); MsiCloseHandle( rec );

1 0

Andrew Eikum : winepulse.drv: Check that the server connection actually succeeded.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 327ac6c86a9ff242169f10affb2e6eb179fdcbc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=327ac6c86a9ff242169f10aff… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 4 10:16:15 2016 -0600 winepulse.drv: Check that the server connection actually succeeded. When there is no PA server running, some older PulseAudio versions have pa_mainloop_iterate fail instead of setting the connection state to failed. So, we should also check the connection state after exiting the loop to ensure it really succeeded before continuing. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0766334d04d00f1de6d601a4b052f7dfedcd9c64) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index ef171d3..fcb27d86 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -566,6 +566,9 @@ static HRESULT pulse_test_connect(void) break; } + if (pa_context_get_state(pulse_ctx) != PA_CONTEXT_READY) + goto fail; + TRACE("Test-connected to server %s with protocol version: %i.\n", pa_context_get_server(pulse_ctx), pa_context_get_server_protocol_version(pulse_ctx));

1 0

Alexandre Julliard : advapi32: Fix null termination in RegQueryInfoKeyA.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 85b003cb2e08a6e45b64413dcb4ce34f60dccdea URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b003cb2e08a6e45b64413dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 14:06:29 2016 +0900 advapi32: Fix null termination in RegQueryInfoKeyA. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 303daeef58b7fe56ef991dde8504d65c11924937) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4f33fe6..0b40a8d 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1091,12 +1091,12 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW (WCHAR *)(buf_ptr + info->ClassOffset), info->ClassLength ); if (len) { - class[len - 1] = 0; if (*class_len + 1 > len) { status = STATUS_BUFFER_OVERFLOW; *class_len -= 1; } + class[*class_len] = 0; } } else status = STATUS_SUCCESS; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 254a8b6..b798129 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1985,6 +1985,17 @@ static void test_reg_query_info(void) "classbuffer = \"%.*s\", expected %s\n", (int)sizeof(classbuffer), classbuffer, expectbuffer); + memset(classbuffer, 0x55, sizeof(classbuffer)); + classlen = 0xdeadbeef; + ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + memset(expectbuffer, 0x55, sizeof(expectbuffer)); + strcpy(expectbuffer, subkey_class); + ok(!memcmp(classbuffer, expectbuffer, sizeof(classbuffer)), + "classbuffer = \"%.*s\", expected %s\n", + (int)sizeof(classbuffer), classbuffer, expectbuffer); + memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = sizeof(subkey_class); ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -1996,6 +2007,17 @@ static void test_reg_query_info(void) "classbufferW = %s, expected %s\n", wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + memset(classbufferW, 0x55, sizeof(classbufferW)); + classlen = 0xdeadbeef; + ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + memset(expectbufferW, 0x55, sizeof(expectbufferW)); + lstrcpyW(expectbufferW, subkey_classW); + ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), + "classbufferW = %s, expected %s\n", + wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + RegDeleteKeyA(subsubkey, ""); RegCloseKey(subsubkey); RegDeleteKeyA(subkey, "");

1 0

Nikolay Sivov : dwrite: Handle font data initialization failure when building collections.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 61fe2c74abbe59b890e4ad7d4c2635985739e9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fe2c74abbe59b890e4ad7d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 23 17:47:14 2016 +0300 dwrite: Handle font data initialization failure when building collections. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7276d5fac1417dd81344db45b3af904f8f2c7d77) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/font.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9244978..68b2c17 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -359,7 +359,8 @@ static void release_font_data(struct dwrite_font_data *data) if (data->info_strings[i]) IDWriteLocalizedStrings_Release(data->info_strings[i]); } - IDWriteLocalizedStrings_Release(data->names); + if (data->names) + IDWriteLocalizedStrings_Release(data->names); IDWriteFontFile_Release(data->file); IDWriteFactory2_Release(data->factory); @@ -3141,8 +3142,11 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat /* alloc and init new font data structure */ hr = init_font_data(factory, file, face_type, i, &family_name, &font_data); - if (FAILED(hr)) + if (FAILED(hr)) { + /* move to next one */ + hr = S_OK; continue; + } fontstrings_get_en_string(family_name, familyW, sizeof(familyW)/sizeof(WCHAR));

1 0