August 2019 - Wine-Devel - list.winehq.org

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_set_current().
by Henri Verbeet Aug. 5, 2019

Aug. 5, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 29 ++++++++++++++--------------- dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fb393395258..80124c17dbe 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1255,13 +1255,13 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context if (context_gl->c.destroyed || !swapchain) { FIXME("Unable to get backup dc for destroyed context %p.\n", context_gl); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } if (!(context_gl->dc = swapchain_get_backup_dc(swapchain))) { - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } @@ -1272,7 +1272,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context { ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } @@ -1280,7 +1280,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context { ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", context_gl->dc, GetLastError()); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } @@ -1297,7 +1297,7 @@ static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HD { ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", gl_ctx, dc, GetLastError()); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); } } @@ -1508,13 +1508,14 @@ struct wined3d_context *context_get_current(void) return TlsGetValue(wined3d_context_tls_idx); } -BOOL context_set_current(struct wined3d_context *ctx) +BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) { + struct wined3d_context *ctx = context_gl ? &context_gl->c : NULL; struct wined3d_context *old = context_get_current(); if (old == ctx) { - TRACE("Already using D3D context %p.\n", ctx); + TRACE("Already using D3D context %p.\n", context_gl); return TRUE; } @@ -1532,20 +1533,18 @@ BOOL context_set_current(struct wined3d_context *ctx) if (wglGetCurrentContext()) { const struct wined3d_gl_info *gl_info = old->gl_info; - TRACE("Flushing context %p before switching to %p.\n", old, ctx); + TRACE("Flushing context %p before switching to %p.\n", old, context_gl); gl_info->gl_ops.gl.p_glFlush(); } old->current = 0; } } - if (ctx) + if (context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(ctx); - if (!context_gl->valid) { - ERR("Trying to make invalid context %p current\n", ctx); + ERR("Trying to make invalid context %p current.\n", context_gl); return FALSE; } @@ -1553,7 +1552,7 @@ BOOL context_set_current(struct wined3d_context *ctx) context_gl, context_gl->gl_ctx, context_gl->dc); if (!wined3d_context_gl_set_gl_context(context_gl)) return FALSE; - ctx->current = 1; + context_gl->c.current = 1; } else if (wglGetCurrentContext()) { @@ -2146,7 +2145,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_gl->needs_set = 1; /* Set up the context defaults */ - if (!context_set_current(context)) + if (!wined3d_context_gl_set_current(context_gl)) { ERR("Cannot activate context to set up defaults.\n"); context_release(context); @@ -4201,7 +4200,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, if (&context_gl->c != context_get_current()) { - if (!context_set_current(&context_gl->c)) + if (!wined3d_context_gl_set_current(context_gl)) ERR("Failed to activate the new context.\n"); } else if (context_gl->needs_set) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 132c9782def..5d60a44ef69 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -820,7 +820,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) break; case DLL_THREAD_DETACH: - if (!context_set_current(NULL)) + if (!wined3d_context_gl_set_current(NULL)) { ERR("Failed to clear current context.\n"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c7d9cd74258..60c69f13d04 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2116,6 +2116,7 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN; void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; @@ -2271,7 +2272,6 @@ void context_invalidate_state(struct wined3d_context *context, DWORD state_id) D void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; -BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH] dwrite: Add recent script properties.
by Nikolay Sivov Aug. 5, 2019

Aug. 5, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This only add script properties, proper support requires script table to be extended beyond BMP. dlls/dwrite/analyzer.c | 7 +++++++ dlls/dwrite/scripts.h | 9 ++++++++- tools/make_unicode | 8 ++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 8e58e615e6..7fc955eaf8 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -187,6 +187,13 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Nshu */ { 0x7568734e, 499, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, { _OT('n','s','h','u') } }, { /* Soyo */ { 0x6f796f53, 329, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('s','o','y','o') } }, { /* Zanb */ { 0x626e615a, 339, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('z','a','n','b') } }, + { /* Dogr */ { 0x72676f44, 328, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, { _OT('d','o','g','r') } }, + { /* Gong */ { 0x676e6f47, 312, 8, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, { _OT('g','o','n','g') } }, + { /* Rohg */ { 0x67686f52, 167, 8, 0x0020, 0, 1, 0, 0, 0, 1, 1 }, { _OT('r','o','h','g') } }, + { /* Maka */ { 0x616b614d, 366, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('m','a','k','a') } }, + { /* Medf */ { 0x6664654d, 265, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('m','e','d','f') } }, + { /* Sogo */ { 0x6f676f53, 142, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, { _OT('s','o','g','o') } }, + { /* Sogd */ { 0x64676f53, 141, 8, 0x0020, 1, 1, 0, 0, 0, 1, 1 }, { _OT('s','o','g','d') } }, }; #undef _OT diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h index ebf97f3b62..b3cc8fca08 100644 --- a/dlls/dwrite/scripts.h +++ b/dlls/dwrite/scripts.h @@ -145,5 +145,12 @@ enum unicode_script_id { Script_Nushu = 139, Script_Soyombo = 140, Script_Zanabazar_Square = 141, - Script_LastId = 141 + Script_Dogra = 142, + Script_Gunjala_Gondi = 143, + Script_Hanifi_Rohingya = 144, + Script_Makasar = 145, + Script_Medefaidrin = 146, + Script_Old_Sogdian = 147, + Script_Sogdian = 148, + Script_LastId = 148 }; diff --git a/tools/make_unicode b/tools/make_unicode index 4b79668a1a..8f99be290a 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1547,6 +1547,14 @@ my %scripts = "Nushu" => 139, "Soyombo" => 140, "Zanabazar_Square" => 141, + # Win10 1903 + "Dogra" => 142, + "Gunjala_Gondi" => 143, + "Hanifi_Rohingya" => 144, + "Makasar" => 145, + "Medefaidrin" => 146, + "Old_Sogdian" => 147, + "Sogdian" => 148, ); ################################################################ -- 2.20.1

1 0

[PATCH 1/5] start.exe: unquote the title
by Damjan Jovanovic Aug. 5, 2019

Aug. 5, 2019

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- programs/start/resources.h | 1 + programs/start/start.c | 28 +++++++++++++++++++++++++++- programs/start/start.rc | 2 ++ 3 files changed, 30 insertions(+), 1 deletion(-)

3 3

[PATCH] wine.inf: Update E. South America Standard Time.
by Gijs Vermeulen Aug. 4, 2019

Aug. 4, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47564 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- https://mm.icann.org/pipermail/tz-announce/2019-July/000056.html loader/wine.inf.in | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 2ac524afdb..ea647f6720 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2854,14 +2854,7 @@ HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Dlt",,"E. Sou HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"MUI_Dlt",,"@tzres.dll,-64097" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"MUI_Std",,"@tzres.dll,-64096" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Std",,"E. South America Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,df,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2023",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,e7,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,ea,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2034",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f2,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,f2,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2037",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,f5,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"LastEntry",0x10001,2037 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0c,00,02,00,05,00,17,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Display",,"Pacific/Easter"" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Dlt",,"Easter Island Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"MUI_Dlt",,"@tzres.dll,-58593" -- 2.22.0

1 0

Maybe a bug
by 1287365321 Aug. 4, 2019

Aug. 4, 2019

我尝试在Ubuntu18.04（arm64）上运行./configur，但是它提示“configure: error: You need clang >= 5.0 to build Wine for arm64.”，我确定我已经安装了clang6.0。 I tried to run ./configure on my Ubuntu18.04（arm64），but it prints “configure: error: You need clang >= 5.0 to build Wine for arm64.”.I am sure that I've installed clang6.0. 有一些截图。 Some screenshots

2 1

[PATCH 5/5] start.exe: search PATH for the executable to launch
by Damjan Jovanovic Aug. 4, 2019

Aug. 4, 2019

We want to launch all executables through CreateProcess(), but need to provide the full path, as the searching CreateProcess() does internally when the application name is NULL is more limited: it only searches for .EXE files. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- programs/start/start.c | 182 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 177 insertions(+), 5 deletions(-)

1 0

[PATCH 4/5] start.exe: Launch all binaries through CreateProcess().
by Damjan Jovanovic Aug. 4, 2019

Aug. 4, 2019

This lets us pass them the title, priority classes, and other options unsupported by ShellExecuteEx(). Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- programs/start/start.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 3/5] start.exe: Pass the "show window" flags to CreateProcess() too
by Damjan Jovanovic Aug. 4, 2019

Aug. 4, 2019

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- programs/start/start.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 2/5] cmd.exe: if there is a title given through STARTUPINFO, use it
by Damjan Jovanovic Aug. 4, 2019

Aug. 4, 2019

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- programs/cmd/wcmdmain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[PATCH 0/5] start.exe/cmd.exe window title handling
by Damjan Jovanovic Aug. 4, 2019

Aug. 4, 2019

This patch series makes various improvements to launching processes through start.exe, and gets cmd.exe to use the window title it is given through STARTUPINFO, which some applications apparently need ( https://bugs.winehq.org/show_bug.cgi?id=40482)

1 0