March 2020 - Wine-commits - list.winehq.org

Sven Baars : d3dx9: Handle DT_SINGLELINE in ID3DXFont_DrawText.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 333687f522730befb8c64d297dc52f654e53a744 URL: https://source.winehq.org/git/wine.git/?a=commit;h=333687f522730befb8c64d29… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Mar 10 11:21:38 2020 +0100 d3dx9: Handle DT_SINGLELINE in ID3DXFont_DrawText. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 29 ++++++++++++++++++++--------- dlls/d3dx9_36/tests/core.c | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 5d4c0a5786..e27858a2ce 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -512,7 +512,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, } static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, - unsigned int chars_fit, unsigned int *chars_used, SIZE *size) + unsigned int chars_fit, unsigned int *chars_used, DWORD format, SIZE *size) { SCRIPT_LOGATTR *sla; SCRIPT_ANALYSIS sa; @@ -535,7 +535,7 @@ static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, --i; /* If the there is no word that fits put in all characters that do fit */ - if (!sla[i].fSoftBreak) + if (!sla[i].fSoftBreak || (format & DT_SINGLELINE)) i = chars_fit; *chars_used = i; @@ -561,10 +561,10 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, SIZE size; *dest_len = 0; - while (*count && str[i] != '\n') + while (*count && (str[i] != '\n' || (format & DT_SINGLELINE))) { --(*count); - if (str[i] != '\r') + if (str[i] != '\r' && str[i] != '\n') dest[(*dest_len)++] = str[i]; ++i; } @@ -572,13 +572,21 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, num_fit = 0; GetTextExtentExPointW(hdc, dest, *dest_len, width, &num_fit, NULL, &size); - if (num_fit < *dest_len && (format & DT_WORDBREAK)) + if (num_fit < *dest_len) { - unsigned int chars_used; + if (format & DT_WORDBREAK) + { + unsigned int chars_used; - word_break(hdc, dest, dest_len, num_fit, &chars_used, &size); - *count = orig_count - chars_used; - i = chars_used; + word_break(hdc, dest, dest_len, num_fit, &chars_used, format, &size); + *count = orig_count - chars_used; + i = chars_used; + } + else if (format & DT_SINGLELINE) + { + *dest_len = num_fit; + *count = 0; + } } if (*count && str[i] == '\n') @@ -617,6 +625,9 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, if (format & DT_CALCRECT) format |= DT_NOCLIP; + if (format & DT_SINGLELINE) + format &= ~DT_WORDBREAK; + if (!rect) { y = ID3DXFont_DrawTextW(iface, NULL, string, count, &textrect, format | DT_CALCRECT, 0); diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 45cde62b3a..2b5a868033 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -771,7 +771,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(height == 12, "Got unexpected height %d.\n", height); height = ID3DXFont_DrawTextW(font, NULL, L"a\na", -1, &rect, DT_SINGLELINE, 0xff00ff); - todo_wine ok(height == 12, "Got unexpected height %d.\n", height); + ok(height == 12, "Got unexpected height %d.\n", height); height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, 0, 0xff00ff); ok(height == 24, "Got unexpected height %d.\n", height);

1 0

Sven Baars : d3dx9: Handle DT_CALCRECT in ID3DXFont_DrawText.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 143a2a30f89dfc79cc2a49cd34af6fd587ce3f69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=143a2a30f89dfc79cc2a49cd… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Mar 10 11:21:39 2020 +0100 d3dx9: Handle DT_CALCRECT in ID3DXFont_DrawText. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 24 +++++++++++++++++++----- dlls/d3dx9_36/tests/core.c | 18 ++++++++++++++++-- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index e27858a2ce..3645903367 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -553,12 +553,11 @@ static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, } static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, - WCHAR *dest, unsigned int *dest_len, int width, DWORD format) + WCHAR *dest, unsigned int *dest_len, int width, DWORD format, SIZE *size) { unsigned int i = 0; int orig_count = *count; int num_fit; - SIZE size; *dest_len = 0; while (*count && (str[i] != '\n' || (format & DT_SINGLELINE))) @@ -570,7 +569,7 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, } num_fit = 0; - GetTextExtentExPointW(hdc, dest, *dest_len, width, &num_fit, NULL, &size); + GetTextExtentExPointW(hdc, dest, *dest_len, width, &num_fit, NULL, size); if (num_fit < *dest_len) { @@ -578,7 +577,7 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, { unsigned int chars_used; - word_break(hdc, dest, dest_len, num_fit, &chars_used, format, &size); + word_break(hdc, dest, dest_len, num_fit, &chars_used, format, size); *count = orig_count - chars_used; i = chars_used; } @@ -608,7 +607,9 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, WCHAR *line; RECT textrect = {0}; int lh, x, y, width; + int max_width = 0; int ret = 0; + SIZE size; TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x.\n", iface, sprite, debugstr_wn(string, count), count, wine_dbgstr_rect(rect), format, color); @@ -660,7 +661,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, { unsigned int line_len; - string = read_line(font->hdc, string, &count, line, &line_len, width, format); + string = read_line(font->hdc, string, &count, line, &line_len, width, format, &size); if (!(format & DT_CALCRECT)) { @@ -705,11 +706,24 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, heap_free(results.lpCaretPos); heap_free(results.lpGlyphs); } + else if (size.cx > max_width) + { + max_width = size.cx; + } + y += lh; if (!(DT_NOCLIP & format) && (y > textrect.bottom)) break; } + if (format & DT_CALCRECT) + { + *rect = textrect; + + rect->bottom = y; + rect->right = rect->left + max_width; + } + ret = y - textrect.top; cleanup: diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 2b5a868033..6fae8bf8d5 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -64,6 +64,15 @@ static inline void check_mat(D3DXMATRIX got, D3DXMATRIX exp) U(exp).m[3][0],U(exp).m[3][1],U(exp).m[3][2],U(exp).m[3][3]); } +#define check_rect(rect, left, top, right, bottom) _check_rect(__LINE__, rect, left, top, right, bottom) +static inline void _check_rect(unsigned int line, const RECT *rect, int left, int top, int right, int bottom) +{ + ok_(__FILE__, line)(rect->left == left, "Unexpected rect.left %d\n", rect->left); + ok_(__FILE__, line)(rect->top == top, "Unexpected rect.top %d\n", rect->top); + ok_(__FILE__, line)(rect->right == right, "Unexpected rect.right %d\n", rect->right); + ok_(__FILE__, line)(rect->bottom == bottom, "Unexpected rect.bottom %d\n", rect->bottom); +} + static void test_ID3DXBuffer(void) { ID3DXBuffer *buffer; @@ -667,8 +676,8 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(height == tests[i].font_height, "Test %d: got unexpected height %u.\n", i, height); ok(!rect.left, "Test %d: got unexpected rect left %d.\n", i, rect.left); ok(!rect.top, "Test %d: got unexpected rect top %d.\n", i, rect.top); - todo_wine ok(rect.right, "Test %d: got unexpected rect right %d.\n", i, rect.right); - todo_wine ok(rect.bottom == tests[i].font_height, "Test %d: got unexpected rect bottom %d.\n", i, rect.bottom); + ok(rect.right, "Test %d: got unexpected rect right %d.\n", i, rect.right); + ok(rect.bottom == tests[i].font_height, "Test %d: got unexpected rect bottom %d.\n", i, rect.bottom); hr = ID3DXSprite_End(sprite); ok (hr == D3D_OK, "Test %d: got unexpected hr %#x.\n", i, hr); @@ -839,6 +848,11 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_CENTER, 0xff00ff); ok(height == 24, "Got unexpected height %d.\n", height); + SetRect(&rect, 10, 10, 50, 50); + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_CALCRECT, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + check_rect(&rect, 10, 10, 30, 34); + ID3DXFont_Release(font); }

1 0

Roman Pišl : wininet: Add stub for INTERNET_OPTION_IGNORE_OFFLINE.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 6fcd1378b2516165468bcbd71263c1b18c6be491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fcd1378b2516165468bcbd7… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Thu Mar 12 12:01:15 2020 +0100 wininet: Add stub for INTERNET_OPTION_IGNORE_OFFLINE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48739 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index aaa8b2a569..cdafbfa139 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2955,6 +2955,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_DISABLE_PASSPORT_AUTH: TRACE("Option INTERNET_OPTION_DISABLE_PASSPORT_AUTH: harmless stub, since not enabled\n"); break; + case INTERNET_OPTION_IGNORE_OFFLINE: + FIXME("Option INTERNET_OPTION_IGNORE_OFFLINE: STUB\n"); + break; case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: case INTERNET_OPTION_DATA_SEND_TIMEOUT:

1 0

Serge Gautherie : tools: Remove 0x0501 API versions forced by winapi_test.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: aa384d36429110970aa72acbc5043158de6aff03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa384d36429110970aa72acb… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Mar 11 16:49:21 2020 +0100 tools: Remove 0x0501 API versions forced by winapi_test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/generated.c | 4 ---- dlls/kernel32/tests/generated.c | 4 ---- dlls/ntdll/tests/generated.c | 4 ---- dlls/rpcrt4/tests/generated.c | 4 ---- dlls/shell32/tests/generated.c | 4 ---- dlls/shlwapi/tests/generated.c | 4 ---- dlls/urlmon/tests/generated.c | 4 ---- dlls/user32/tests/generated.c | 4 ---- dlls/wininet/tests/generated.c | 4 ---- dlls/winmm/tests/generated.c | 4 ---- tools/winapi/winapi_test | 4 ---- 11 files changed, 44 deletions(-) diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c index 019524df86..fe3ecd937d 100644 --- a/dlls/gdi32/tests/generated.c +++ b/dlls/gdi32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index a166d9746c..7c57feaab7 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index b099a5c084..d277e02073 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "ntdll_test.h" diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 7eb8faa073..72672cd3a9 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index ace877eb42..55f4eab894 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c index e5e0896af8..3a8e4269fc 100644 --- a/dlls/shlwapi/tests/generated.c +++ b/dlls/shlwapi/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c index 63e892bc54..45fd5d84f3 100644 --- a/dlls/urlmon/tests/generated.c +++ b/dlls/urlmon/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/user32/tests/generated.c b/dlls/user32/tests/generated.c index 2107a44cb3..be1b698a2c 100644 --- a/dlls/user32/tests/generated.c +++ b/dlls/user32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c index 1282b6fda5..f88834ab9d 100644 --- a/dlls/wininet/tests/generated.c +++ b/dlls/wininet/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index ec25e076df..4c0fe7a530 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windef.h" diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 92f4ae366a..48c29f8f4a 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -503,10 +503,6 @@ sub output_header($$$) { print OUT " */\n"; print OUT "\n"; - print OUT "#define WINVER 0x0501\n"; - print OUT "#define _WIN32_IE 0x0501\n"; - print OUT "#define _WIN32_WINNT 0x0501\n"; - print OUT "\n"; print OUT "#define WINE_NOWINSOCK\n"; print OUT "\n"; foreach my $test (@tests) {

1 0

Alexandre Julliard : Release 5.4.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 4c61c8dce09307ecfe0beea307213bd1fb6a69db URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c61c8dce09307ecfe0beea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 21:23:09 2020 +0100 Release 5.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 936 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 493 insertions(+), 464 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c61c8dce09307ecfe0b…

1 0

Tag wine-5.4 : Alexandre Julliard : Release 5.4
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: refs/tags/wine-5.4 Tag: 85ae5a2e7fc1cb4a2f1153980905475e4cfbcbe7 URL: https://source.winehq.org/git/wine.git/?a=tag;h=85ae5a2e7fc1cb4a2f115398090… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 21:23:09 2020 +0100 Release 5.4

1 0

Alexandre Julliard : unicode: Fix parsing of Indic data files.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: dec6f0773b616f5b1138dba663a61ebbe3b00dd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec6f0773b616f5b1138dba6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 11:37:52 2020 +0100 unicode: Fix parsing of Indic data files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/indicsyllable.c | 326 ++++++++++++++++++++++----------------------- tools/make_unicode | 18 +-- 2 files changed, 171 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dec6f0773b616f5b1138…

1 0

Alexandre Julliard : unicode: Read data files from inside the zip without extracting them.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: eb7d7ef86383c8ae1986876d8247ea9abfc27096 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb7d7ef86383c8ae1986876d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 11:55:59 2020 +0100 unicode: Read data files from inside the zip without extracting them. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 60ca333a4f..ca7842c654 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -436,26 +436,28 @@ sub open_data_file($$) my ($base, $name) = @_; (my $dir = "data/$name") =~ s/\/[^\/]+$//; local *FILE; - unless (-f "data/$name") + + if ($base =~ /.*\/([^\/]+)\.zip$/) { - system "mkdir", "-p", $dir; - if ($base =~ /.*\/([^\/]+\.zip)$/) + my $zip = $1; + unless (-f "data/$zip") { - my $zip = $1; - unless (-f "data/$zip") - { - print "Fetching $base...\n"; - !system "wget", "-q", "-O", "data/$zip", "$base" or die "cannot fetch $base"; - } - !system "unzip", "-q", "-d", "data", "data/$zip", $name or die "cannot extract $name from $zip"; + mkdir "data"; + print "Fetching $base...\n"; + !system "wget", "-q", "-O", "data/$zip", $base or die "cannot fetch $base"; } - else + open FILE, "-|", "unzip", "-p", "data/$zip", $name or die "cannot extract $name from $zip"; + } + else + { + unless (-f "data/$name") { + system "mkdir", "-p", $dir; print "Fetching $base/$name...\n"; !system "wget", "-q", "-O", "data/$name", "$base/$name" or die "cannot fetch $base/$name"; } + open FILE, "<data/$name" or die "cannot open data/$name"; } - open FILE, "<data/$name" or die "cannot open data/$name"; return *FILE; }

1 0

Alexandre Julliard : unicode: Update data tables to Unicode 13.0.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: b83af7c763b40280650990d4ca6385ad35143b00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b83af7c763b40280650990d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 11:42:31 2020 +0100 unicode: Update data tables to Unicode 13.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/direction.c | 482 ++++++++++---------- dlls/dwrite/linebreak.c | 1034 ++++++++++++++++++++++--------------------- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 957 ++++++++++++++++++++-------------------- dlls/dwrite/scripts.h | 2 +- dlls/gdi32/direction.c | 482 ++++++++++---------- dlls/gdi32/vertical.c | 6 +- dlls/kernelbase/digitmap.c | 2 +- dlls/kernelbase/wctype.c | 1042 ++++++++++++++++++++++---------------------- dlls/usp10/bracket.c | 2 +- dlls/usp10/direction.c | 482 ++++++++++---------- dlls/usp10/indicsyllable.c | 18 +- dlls/usp10/linebreak.c | 1034 ++++++++++++++++++++++--------------------- dlls/usp10/mirror.c | 2 +- dlls/usp10/shape.c | 2 + dlls/usp10/shaping.c | 265 +++++------ dlls/wineps.drv/vertical.c | 6 +- libs/port/casemap.c | 43 +- libs/port/wctype.c | 62 +-- nls/l_intl.nls | Bin 5432 -> 5512 bytes nls/normidna.nls | Bin 82058 -> 82658 bytes nls/normnfc.nls | Bin 57630 -> 58166 bytes nls/normnfd.nls | Bin 50942 -> 51466 bytes nls/normnfkc.nls | Bin 79052 -> 79762 bytes nls/normnfkd.nls | Bin 72684 -> 73382 bytes tools/make_unicode | 13 +- 27 files changed, 2957 insertions(+), 2983 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b83af7c763b402806509…

1 0

Zebediah Figura : wined3d: Implement independent blend.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 2da5422bd2628ad79ae65cee17702817aa1476f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2da5422bd2628ad79ae65cee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 23:25:01 2020 -0500 wined3d: Implement independent blend. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 3 +- dlls/d3d11/state.c | 22 ++-- dlls/d3d11/tests/d3d11.c | 7 +- dlls/wined3d/adapter_gl.c | 7 ++ dlls/wined3d/device.c | 21 ++-- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 214 +++++++++++++++++++++++++++++++-------- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 19 ++-- 10 files changed, 220 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2da5422bd2628ad79ae6…

1 0