September 2019 - Wine-Commits

Akihiro Sagawa : dwrite: Prefer Windows platform names regardless of record order.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: ea07bc41907f8d75d6f0bcd44358c2dc777ae4fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea07bc41907f8d75d6f0bcd4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 20 21:04:02 2019 +0900 dwrite: Prefer Windows platform names regardless of record order. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 57 +++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e8efa1d196..fced4b0411 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1935,10 +1935,9 @@ static BOOL opentype_decode_namerecord(const TT_NAME_V0 *header, BYTE *storage_a static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { + int i, count, candidate_mac, candidate_unicode; const TT_NAME_V0 *header; BYTE *storage_area = 0; - USHORT count = 0; - int i, candidate; WORD format; BOOL exists; HRESULT hr; @@ -1964,7 +1963,7 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP count = GET_BE_WORD(header->count); exists = FALSE; - candidate = -1; + candidate_unicode = candidate_mac = -1; for (i = 0; i < count; i++) { const TT_NameRecord *record = &header->nameRecord[i]; USHORT platform; @@ -1972,34 +1971,40 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP if (GET_BE_WORD(record->nameID) != id) continue; - /* Right now only accept unicode and windows encoded fonts */ platform = GET_BE_WORD(record->platformID); - if (platform != OPENTYPE_PLATFORM_UNICODE && - platform != OPENTYPE_PLATFORM_MAC && - platform != OPENTYPE_PLATFORM_WIN) + switch (platform) { - FIXME("platform %i not supported\n", platform); - continue; - } - - /* Skip such entries for now, fonts tend to duplicate those strings as - WIN platform entries. If font does not have WIN or MAC entry for this id, we will - use this Unicode platform entry while assuming en-US locale. */ - if (platform == OPENTYPE_PLATFORM_UNICODE) { - candidate = i; - continue; + /* Skip Unicode or Mac entries for now, fonts tend to duplicate those + strings as WIN platform entries. If font does not have WIN entry for + this id, we will use Mac or Unicode platform entry while assuming + en-US locale. */ + case OPENTYPE_PLATFORM_UNICODE: + if (candidate_unicode == -1) + candidate_unicode = i; + break; + case OPENTYPE_PLATFORM_MAC: + if (candidate_mac == -1) + candidate_mac = i; + break; + case OPENTYPE_PLATFORM_WIN: + if (opentype_decode_namerecord(header, storage_area, i, *strings)) + exists = TRUE; + break; + default: + FIXME("platform %i not supported\n", platform); + break; } - - if (!opentype_decode_namerecord(header, storage_area, i, *strings)) - continue; - - exists = TRUE; } - if (!exists) { - if (candidate != -1) - exists = opentype_decode_namerecord(header, storage_area, candidate, *strings); - else { + if (!exists) + { + if (candidate_mac != -1) + exists = opentype_decode_namerecord(header, storage_area, candidate_mac, *strings); + if (!exists && candidate_unicode != -1) + exists = opentype_decode_namerecord(header, storage_area, candidate_unicode, *strings); + + if (!exists) + { IDWriteLocalizedStrings_Release(*strings); *strings = NULL; }

1 0

Henri Verbeet : wined3d: Derive the GL bind point for buffer object maps from the bind flags.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 2bc6941ab06bc5243eb77a5bcf26d482a58c40ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bc6941ab06bc5243eb77a5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 15:12:15 2019 +0330 wined3d: Derive the GL bind point for buffer object maps from the bind flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 20 ++++++++++++++++---- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/buffer.c | 8 +++++--- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/surface.c | 23 +++++++++++------------ dlls/wined3d/texture.c | 10 ++++------ dlls/wined3d/wined3d_private.h | 14 ++++++++------ 7 files changed, 48 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2bc6941ab06bc5243eb7…

1 0

Francois Gouget : jscript/tests: Fix the spelling of a couple of jscript ok() messages.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: a22153005dd7c2a8c4b38097a80f144a2fd4959d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a22153005dd7c2a8c4b38097… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 22 23:24:51 2019 +0200 jscript/tests: Fix the spelling of a couple of jscript ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 58a0cd332f..d62a643471 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1917,11 +1917,11 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); s = JSON.stringify(testObj); ok(s === undefined || s === "undefined" /* broken on some old versions */, - "stringify(testObj) returned " + s + " expected undfined"); + "stringify(testObj) returned " + s + " expected undefined"); s = JSON.stringify(undefined); ok(s === undefined || s === "undefined" /* broken on some old versions */, - "stringify(undefined) returned " + s + " expected undfined"); + "stringify(undefined) returned " + s + " expected undefined"); var parse_tests = [ ["true", true],

1 0

Sebastian Lackner : ntdll: Execute queued APCs before starting a process.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: b45d6125493e19e7e2befe071b7052bad4d2859f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b45d6125493e19e7e2befe07… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 19 18:36:04 2019 -0500 ntdll: Execute queued APCs before starting a process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35561 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 376a8345f4..0ab25dcc51 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3540,6 +3540,7 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) */ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknown3, ULONG_PTR unknown4 ) { + static const LARGE_INTEGER zero; NTSTATUS status; WINE_MODREF *wm; LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; @@ -3602,6 +3603,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow } RtlLeaveCriticalSection( &loader_section ); + + NtDelayExecution( TRUE, &zero ); }

1 0

Piotr Caban : ntdll: Ignore ExceptionFlags changes done by exception handlers.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: a69762541a18107fbd8e9fb8362c3af8ddf1d90b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a69762541a18107fbd8e9fb8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 21 11:33:26 2019 +0200 ntdll: Ignore ExceptionFlags changes done by exception handlers. Fixes exceptions rethrowing in 64-bit .Net. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index fbb2daff90..d8fcc54743 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2390,6 +2390,7 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); + rec->ExceptionFlags &= EH_NONCONTINUABLE; __wine_pop_frame( &frame ); return res; }

1 0

Alex Henrie : include: Add constants needed for SYSTEM_POWER_STATUS.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 9142be320ed3e90017a3e20604d0b8fee95ab452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9142be320ed3e90017a3e206… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 22 15:12:10 2019 -0600 include: Add constants needed for SYSTEM_POWER_STATUS. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 33a2f3e45a..31d45aa0cb 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -966,6 +966,24 @@ typedef struct _SYSTEM_POWER_STATUS DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS; +#define AC_LINE_OFFLINE 0x00 +#define AC_LINE_ONLINE 0x01 +#define AC_LINE_BACKUP_POWER 0x02 +#define AC_LINE_UNKNOWN 0xFF + +#define BATTERY_FLAG_HIGH 0x01 +#define BATTERY_FLAG_LOW 0x02 +#define BATTERY_FLAG_CRITICAL 0x04 +#define BATTERY_FLAG_CHARGING 0x08 +#define BATTERY_FLAG_NO_BATTERY 0x80 +#define BATTERY_FLAG_UNKNOWN 0xFF + +#define BATTERY_PERCENTAGE_UNKNOWN 0xFF + +#define SYSTEM_STATUS_FLAG_POWER_SAVING_ON 0x01 + +#define BATTERY_LIFE_UNKNOWN 0xFFFFFFFF + typedef struct _SYSTEM_INFO { union {

1 0

Fabian Maurer : shell32: Prevent text truncation inside the old "browse folder" dialog.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: b7bca1be24df0f5f59b1f3bc86d0f599b216a13a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7bca1be24df0f5f59b1f3bc… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Sep 20 23:34:43 2019 +0200 shell32: Prevent text truncation inside the old "browse folder" dialog. We use the same height for the title as in the new "browse folder" dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46404 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 46f0b6f12d..f19b09f8c2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -274,7 +274,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", 1, 80, 176, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 134, 176, 50, 14, WS_GROUP | WS_TABSTOP - LTEXT "", IDD_TITLE, 5, 4, 180, 12 + LTEXT "", IDD_TITLE, 5, 4, 180, 24 LTEXT "", IDD_STATUS, 5, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |

1 0

Zebediah Figura : quartz: Get rid of the no longer used base parser.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: d44d83b684a8d6c2299d4501e349047d25f62b46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d44d83b684a8d6c2299d4501… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 20 17:35:06 2019 -0500 quartz: Get rid of the no longer used base parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 2 - dlls/quartz/acmwrapper.c | 1 - dlls/quartz/avidec.c | 1 - dlls/quartz/dsoundrender.c | 1 - dlls/quartz/filesource.c | 1 - dlls/quartz/parser.c | 709 ------------------------------------- dlls/quartz/parser.h | 77 ---- dlls/quartz/pin.c | 818 ------------------------------------------- dlls/quartz/pin.h | 133 ------- dlls/quartz/quartz_private.h | 12 +- dlls/quartz/videorenderer.c | 1 - dlls/quartz/vmr9.c | 1 - 12 files changed, 1 insertion(+), 1756 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d44d83b684a8d6c2299d…

1 0

Nikolay Sivov : dwrite: Sort localized strings by locale name.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: c435eb5c5199e06660efc5e35add3fad848b1cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c435eb5c5199e06660efc5e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 19 17:41:02 2019 +0300 dwrite: Sort localized strings by locale name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/main.c | 14 ++++++++++++++ dlls/dwrite/opentype.c | 3 +++ 3 files changed, 18 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 32ccd63c3e..d0fed98d6f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -237,6 +237,7 @@ extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDE extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; +extern void sort_localizedstrings(IDWriteLocalizedStrings*) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory5*,IDWriteFontCollection1**) DECLSPEC_HIDDEN; extern HRESULT get_eudc_fontcollection(IDWriteFactory5*,IDWriteFontCollection1**) DECLSPEC_HIDDEN; extern IDWriteTextAnalyzer *get_text_analyzer(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 3fe2b7eaa7..fc72013feb 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -520,6 +520,20 @@ void set_en_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *string) } } +static int localizedstrings_sorting_compare(const void *left, const void *right) +{ + const struct localizedpair *_l = left, *_r = right; + + return strcmpW(_l->locale, _r->locale); +}; + +void sort_localizedstrings(IDWriteLocalizedStrings *iface) +{ + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); + + qsort(strings->data, strings->count, sizeof(*strings->data), localizedstrings_sorting_compare); +} + struct collectionloader { struct list entry; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fced4b0411..efae402f91 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2010,6 +2010,9 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP } } + if (*strings) + sort_localizedstrings(*strings); + return exists ? S_OK : E_FAIL; }

1 0

Henri Verbeet : wined3d: Use wined3d_resource_gl_legacy_map_flags() in wined3d_buffer_gl_map().
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: wine Branch: master Commit: 8b780d2d8c207224837471875e78e4d160287ca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b780d2d8c20722483747187… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 15:12:14 2019 +0330 wined3d: Use wined3d_resource_gl_legacy_map_flags() in wined3d_buffer_gl_map(). For consistency with the ARB_map_buffer_range path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d3fcdd41fe..8d72b782df 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1045,7 +1045,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) wined3d_buffer_gl_sync_apple(buffer_gl, flags, gl_info); buffer_gl->b.map_ptr = GL_EXTCALL(glMapBuffer(buffer_gl->buffer_type_hint, - GL_READ_WRITE)); + wined3d_resource_gl_legacy_map_flags(flags))); checkGLcall("glMapBuffer"); }

1 0