December 2017 - Wine-Commits

Julian Rüger : German translation for release 3.0-rc1
by Jeremy Newman Dec. 18, 2017

Dec. 18, 2017

Module: website Branch: master Commit: f0f36f09df34ed1bf3ef8984544ddbe389cf565c URL: http://source.winehq.org/git/website.git/?a=commit;h=f0f36f09df34ed1bf3ef89… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 15 16:22:10 2017 +0100 German translation for release 3.0-rc1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017120801.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/news/de/2017120801.xml b/news/de/2017120801.xml new file mode 100644 index 0000000..fe1c0ce --- /dev/null +++ b/news/de/2017120801.xml @@ -0,0 +1,21 @@ +<news> +<date>8. Dezember 2017</date> +<title>Wine 3.0-rc1 freigegeben</title> +<body> + Die Entwicklungsversion 3.0-rc1 von Wine ist jetzt verfügbar. + Dies ist der erste Release Candidate des bevorstehenden Wine 3.0. Hiermit beginnt der Code-freeze. Es gab viele Änderungen in letzter Minute, daher bitten wir Sie, dieses Release ausführlich zu testen. Damit helfen Sie uns, Wine 3.0 so gut wie möglich zu machen. + <a href="{$root}/announce/3.0-rc1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Direct3D 11 ist auf AMD- und Intel-Grafik nun standardmäßig aktiviert.</li> + <li>AES-Verschlüsselung unter macOS.</li> + <li>Implementierung des Taskplaners.</li> + <li>Unterstützung der Exportfunktion des reg.exe-Werkzeugs.</li> + <li>Progman-DDE-Unterstützung.</li> + <li>Verbesserungen des Zwischenspeichers für OLE-Daten.</li> + <li>Weitere Event-Unterstützung in MSHTML.</li> + <li>Verbessertes Relay-Debugging.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : testbot: Task:: ChildPid is not used anymore so remove it.
by Alexandre Julliard Dec. 18, 2017

Dec. 18, 2017

Module: tools Branch: master Commit: 300a6da335592f7db58351ad7e42276eb4ae4fcb URL: http://source.winehq.org/git/tools.git/?a=commit;h=300a6da335592f7db58351ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 18 01:06:37 2017 +0100 testbot: Task::ChildPid is not used anymore so remove it. It was deprecated in favor of VM::ChildPid some time ago so it's now time to remove the database field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/ddl/update28.sql | 4 ++++ testbot/ddl/winetestbot.sql | 1 - testbot/doc/winetestbot-schema.dia | 23 ----------------------- testbot/lib/WineTestBot/Tasks.pm | 2 -- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/testbot/ddl/update28.sql b/testbot/ddl/update28.sql new file mode 100644 index 0000000..b9bb9d9 --- /dev/null +++ b/testbot/ddl/update28.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Tasks + DROP ChildPid; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index f8d590f..12c1b68 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -150,7 +150,6 @@ CREATE TABLE Tasks VMName VARCHAR(20) NOT NULL, Timeout INT(4) NOT NULL, CmdLineArg VARCHAR(256) NULL, - ChildPid INT(5) NULL, Started DATETIME NULL, Ended DATETIME NULL, TestFailures INT(6) NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index de91f9a..9092c41 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2177,29 +2177,6 @@ </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> - <dia:string>#ChildPid#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - <dia:string>#INT(5)#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - <dia:string>##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="true"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="default_value"> - <dia:string>##</dia:string> - </dia:attribute> - </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> <dia:string>#Started#</dia:string> </dia:attribute> <dia:attribute name="type"> diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index b3b6ae3..11f087f 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -223,8 +223,6 @@ BEGIN CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - # Note: ChildPid is not used anymore. - CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6),

1 0

Francois Gouget : testbot: Re-save the database diagram with the current dia.
by Alexandre Julliard Dec. 18, 2017

Dec. 18, 2017

Module: tools Branch: master Commit: 94fccb2edbed9be3e1296f52fc2c1615cf2904fc URL: http://source.winehq.org/git/tools.git/?a=commit;h=94fccb2edbed9be3e1296f52… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 18 01:04:53 2017 +0100 testbot: Re-save the database diagram with the current dia. The goal is to minimize the diff in coming changes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/winetestbot-schema.dia | 1082 ++++++++++++++++++++++-------------- 1 file changed, 657 insertions(+), 425 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=94fccb2edbed9be3e129…

1 0

Alexandre Julliard : Wine release 3.0-rc2
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: website Branch: master Commit: d7a76c419f5093df2057cbf07bc4669776973dc6 URL: http://source.winehq.org/git/website.git/?a=commit;h=d7a76c419f5093df2057cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 21:46:44 2017 +0100 Wine release 3.0-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017121501.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2017121501.xml b/news/en/2017121501.xml new file mode 100644 index 0000000..b3e603e --- /dev/null +++ b/news/en/2017121501.xml @@ -0,0 +1,12 @@ +<news> +<date>December 15, 2017</date> +<title>Wine 3.0-rc2 Released</title> +<body> + The Wine development release 3.0-rc2 is now available. + <a href="{$root}/announce/3.0-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Andrey Gusev : usp10: Fix a typo in an ERR() message.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: wine Branch: master Commit: acdbea2beeb7b3997c374948832457198b164908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acdbea2beeb7b3997c3749488… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Dec 14 18:21:10 2017 +0200 usp10: Fix a typo in an ERR() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 0351f4f..1fd9c4d 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2051,7 +2051,7 @@ static void GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A } if (!offset) { - ERR("Failed to find avalible ligature connection point\n"); + ERR("Failed to find available ligature connection point\n"); return; }

1 0

Nikolay Sivov : d2d1/tests: A test to show that DC is validated on BindDC( ).
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: wine Branch: master Commit: 0fa707160833360d5e58b41d851a12a29dfce5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa707160833360d5e58b41d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 15 19:47:58 2017 +0300 d2d1/tests: A test to show that DC is validated on BindDC(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index af023a1..9bd9e2b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4813,7 +4813,7 @@ static void test_dc_target(void) ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc, 0, 0); - ok(clr == RGB(255, 0, 0), "Got color %#x\n", clr); + ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); hdc2 = CreateCompatibleDC(NULL); ok(hdc2 != NULL, "Failed to create an HDC.\n"); @@ -4824,7 +4824,7 @@ static void test_dc_target(void) ok(hr == S_OK, "BindDC() returned %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); - ok(clr == 0, "Got color %#x\n", clr); + ok(clr == 0, "Unexpected color 0x%08x.\n", clr); set_color(&color, 0.0f, 1.0f, 0.0f, 1.0f); hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); @@ -4843,10 +4843,42 @@ static void test_dc_target(void) ID2D1SolidColorBrush_Release(brush); clr = GetPixel(hdc2, 0, 0); - ok(clr == RGB(0, 255, 0), "Got color %#x\n", clr); + ok(clr == RGB(0, 255, 0), "Unexpected color 0x%08x.\n", clr); clr = GetPixel(hdc2, 10, 0); - ok(clr == 0, "Got color %#x\n", clr); + ok(clr == 0, "Unexpected color 0x%08x.\n", clr); + + /* Invalid DC. */ + hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); +todo_wine + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); + + hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(0, 0, 255), "Unexpected color 0x%08x.\n", clr); DeleteDC(hdc); DeleteDC(hdc2);

1 0

Alexandre Julliard : ntdll: Reset the exit frame when switching back to it.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: wine Branch: master Commit: c2f34d1b24b50dafdf979420067b0b5badbe5b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f34d1b24b50dafdf9794200… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 12:36:16 2017 +0100 ntdll: Reset the exit frame when switching back to it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 32 ++++++++++++++++++-------------- dlls/ntdll/signal_x86_64.c | 31 +++++++++++++++++++------------ 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4be573e..07425e2 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -547,6 +547,7 @@ struct x86_thread_data }; C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct x86_thread_data, gs ) == 0x1d8 ); +C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct x86_thread_data, exit_frame ) == 0x1f4 ); #ifdef __HAVE_VM86 C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct x86_thread_data, vm86 ) == offsetof( TEB, GdiTebBatch ) + offsetof( struct ntdll_thread_data, __vm86 )); @@ -2849,7 +2850,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, - void *relay, void **exit_frame ); + void *relay ); __ASM_GLOBAL_FUNC( start_thread, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -2863,8 +2864,7 @@ __ASM_GLOBAL_FUNC( start_thread, "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") /* store exit frame */ - "movl 24(%ebp),%eax\n\t" - "movl %ebp,(%eax)\n\t" + "movl %ebp,%fs:0x1f4\n\t" /* x86_thread_data()->exit_frame */ /* build initial context on thread stack */ "movl %fs:4,%eax\n\t" /* NtCurrentTeb()->StackBase */ "leal -0x2dc(%eax),%esi\n\t" /* sizeof(context) + 16 */ @@ -2899,11 +2899,18 @@ __ASM_GLOBAL_FUNC( start_thread, "movl %esi,(%esp)\n\t" "call " __ASM_NAME("set_cpu_context") ) -extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int) ); __ASM_GLOBAL_FUNC( call_thread_exit_func, - "movl 4(%esp),%eax\n\t" + /* fetch exit frame */ + "movl %fs:0x1f4,%edx\n\t" /* x86_thread_data()->exit_frame */ + "testl %edx,%edx\n\t" + "jnz 1f\n\t" + "jmp *%ecx\n\t" + /* switch to exit frame stack */ + "1:\tmovl 4(%esp),%eax\n\t" "movl 8(%esp),%ecx\n\t" - "movl 12(%esp),%ebp\n\t" + "movl $0,%fs:0x1f4\n\t" + "movl %edx,%ebp\n\t" __ASM_CFI(".cfi_def_cfa %ebp,4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") @@ -2911,7 +2918,7 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") "leal -20(%ebp),%esp\n\t" "pushl %eax\n\t" - "call *%ecx" ); + "call *%ecx" ) extern void call_thread_entry(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_thread_entry, @@ -2970,7 +2977,7 @@ void DECLSPEC_HIDDEN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ) */ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) { - start_thread( entry, arg, suspend, call_thread_entry, &x86_thread_data()->exit_frame ); + start_thread( entry, arg, suspend, call_thread_entry ); } /********************************************************************** @@ -2983,8 +2990,7 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend */ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) { - start_thread( entry, NtCurrentTeb()->Peb, suspend, - kernel32_start_process, &x86_thread_data()->exit_frame ); + start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process ); } @@ -2993,8 +2999,7 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) */ void signal_exit_thread( int status ) { - if (!x86_thread_data()->exit_frame) exit_thread( status ); - call_thread_exit_func( status, exit_thread, x86_thread_data()->exit_frame ); + call_thread_exit_func( status, exit_thread ); } /*********************************************************************** @@ -3002,8 +3007,7 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { - if (!x86_thread_data()->exit_frame) exit( status ); - call_thread_exit_func( status, exit, x86_thread_data()->exit_frame ); + call_thread_exit_func( status, exit ); } /********************************************************************** diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1f76640..60da3f3 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -321,6 +321,7 @@ struct amd64_thread_data }; C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((TEB *)0)->SystemReserved2) ); +C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct amd64_thread_data, exit_frame ) == 0x330 ); static inline struct amd64_thread_data *amd64_thread_data(void) { @@ -4074,7 +4075,7 @@ static void WINAPI call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ) extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, - void *relay, void *stack, void **exit_frame ); + void *relay ); __ASM_GLOBAL_FUNC( start_thread, "subq $56,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") @@ -4091,8 +4092,10 @@ __ASM_GLOBAL_FUNC( start_thread, "movq %r15,8(%rsp)\n\t" __ASM_CFI(".cfi_rel_offset %r15,8\n\t") /* store exit frame */ - "movq %rsp,(%r9)\n\t" + "movq %gs:0x30,%rax\n\t" + "movq %rsp,0x330(%rax)\n\t" /* amd64_thread_data()->exit_frame */ /* build initial context on thread stack */ + "movq 8(%rax),%r8\n\t" /* NtCurrentTeb()->Tib.StackBase */ "leaq -0x500(%r8),%r10\n\t" /* sizeof(context) + 0x30 for function params */ "movq $0x001000b,0x30(%r10)\n\t" /* context->ContextFlags = CONTEXT_FULL */ "movw %cs,0x38(%r10)\n\t" /* context->SegCs */ @@ -4116,8 +4119,16 @@ __ASM_GLOBAL_FUNC( start_thread, "movq %rsp,%rdi\n\t" "call " __ASM_NAME("set_cpu_context") ) -extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int) ); __ASM_GLOBAL_FUNC( call_thread_exit_func, + /* fetch exit frame */ + "movq %gs:0x30,%rax\n\t" + "movq 0x330(%rax),%rdx\n\t" /* amd64_thread_data()->exit_frame */ + "testq %rdx,%rdx\n\t" + "jnz 1f\n\t" + "jmp *%rsi\n" + /* switch to exit frame stack */ + "1:\tmovq $0,0x330(%rax)\n\t" "movq %rdx,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") __ASM_CFI(".cfi_rel_offset %rbp,48\n\t") @@ -4126,7 +4137,7 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, __ASM_CFI(".cfi_rel_offset %r13,24\n\t") __ASM_CFI(".cfi_rel_offset %r14,16\n\t") __ASM_CFI(".cfi_rel_offset %r15,8\n\t") - "call *%rsi" ); + "call *%rsi" ) /*********************************************************************** @@ -4139,8 +4150,7 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, */ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) { - start_thread( entry, arg, suspend, call_thread_func, - NtCurrentTeb()->Tib.StackBase, &amd64_thread_data()->exit_frame ); + start_thread( entry, arg, suspend, call_thread_func ); } @@ -4154,8 +4164,7 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend */ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) { - start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process, - NtCurrentTeb()->Tib.StackBase, &amd64_thread_data()->exit_frame ); + start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process ); } @@ -4164,8 +4173,7 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) */ void signal_exit_thread( int status ) { - if (!amd64_thread_data()->exit_frame) exit_thread( status ); - call_thread_exit_func( status, exit_thread, amd64_thread_data()->exit_frame ); + call_thread_exit_func( status, exit_thread ); } /*********************************************************************** @@ -4173,8 +4181,7 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { - if (!amd64_thread_data()->exit_frame) exit( status ); - call_thread_exit_func( status, exit, amd64_thread_data()->exit_frame ); + call_thread_exit_func( status, exit ); } /**********************************************************************

1 0

Alexandre Julliard : libport: Add a replacement implementation for strnlen.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: wine Branch: master Commit: 9d36aad4571b288f5208d35425e1720c6f145376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d36aad4571b288f5208d3542… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 10:48:48 2017 +0100 libport: Add a replacement implementation for strnlen. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ include/wine/port.h | 5 +++++ libs/port/Makefile.in | 1 + libs/port/strnlen.c | 31 +++++++++++++++++++++++++++++++ 6 files changed, 42 insertions(+) diff --git a/configure b/configure index 95c367c..132499b 100755 --- a/configure +++ b/configure @@ -15747,6 +15747,7 @@ for ac_func in \ strdup \ strerror \ strncasecmp \ + strnlen \ strtold \ strtoll \ strtoull \ diff --git a/configure.ac b/configure.ac index 00413bc..62ad8db 100644 --- a/configure.ac +++ b/configure.ac @@ -2125,6 +2125,7 @@ AC_CHECK_FUNCS(\ strdup \ strerror \ strncasecmp \ + strnlen \ strtold \ strtoll \ strtoull \ diff --git a/include/config.h.in b/include/config.h.in index aff5f35..9224837 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -921,6 +921,9 @@ /* Define to 1 if you have the `strncasecmp' function. */ #undef HAVE_STRNCASECMP +/* Define to 1 if you have the `strnlen' function. */ +#undef HAVE_STRNLEN + /* Define to 1 if you have the <stropts.h> header file. */ #undef HAVE_STROPTS_H diff --git a/include/wine/port.h b/include/wine/port.h index addece0..fb7251e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -344,6 +344,10 @@ int strncasecmp(const char *str1, const char *str2, size_t n); # endif #endif /* !defined(HAVE_STRNCASECMP) */ +#ifndef HAVE_STRNLEN +size_t strnlen( const char *str, size_t maxlen ); +#endif /* !defined(HAVE_STRNLEN) */ + #ifndef HAVE_STRERROR const char *strerror(int err); #endif /* !defined(HAVE_STRERROR) */ @@ -538,6 +542,7 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa #define strcasecmp __WINE_NOT_PORTABLE(strcasecmp) #define strerror __WINE_NOT_PORTABLE(strerror) #define strncasecmp __WINE_NOT_PORTABLE(strncasecmp) +#define strnlen __WINE_NOT_PORTABLE(strnlen) #define usleep __WINE_NOT_PORTABLE(usleep) #endif /* NO_LIBWINE_PORT */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 7fefda1..c87b99de 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -102,6 +102,7 @@ C_SRCS = \ strcasecmp.c \ strerror.c \ strncasecmp.c \ + strnlen.c \ symlink.c \ usleep.c \ utf8.c \ diff --git a/libs/port/strnlen.c b/libs/port/strnlen.c new file mode 100644 index 0000000..ab6668d --- /dev/null +++ b/libs/port/strnlen.c @@ -0,0 +1,31 @@ +/* + * strnlen function + * + * Copyright 2017 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifndef HAVE_STRNLEN +size_t strnlen( const char *str, size_t maxlen ) +{ + const char *ptr = memchr( str, 0, maxlen ); + if (!ptr) return maxlen; + return ptr - str; +} +#endif /* HAVE_STRNLEN */

1 0

Tag wine-3.0-rc2 : Alexandre Julliard : Release 3.0-rc2
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: wine Branch: refs/tags/wine-3.0-rc2 Tag: 1d56ed2930814b664a62d4a746515b5721950595 URL: http://source.winehq.org/git/wine.git/?a=tag;h=1d56ed2930814b664a62d4a74651… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 21:43:56 2017 +0100 Release 3.0-rc2

1 0

Alexandre Julliard : Release 3.0-rc2.
by Alexandre Julliard Dec. 15, 2017

Dec. 15, 2017

Module: wine Branch: master Commit: f37da2c85561028e86e8bf74bebdc8edaa66dc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37da2c85561028e86e8bf74b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 21:43:56 2017 +0100 Release 3.0-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 560 +++++++++++++++----------------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 143 insertions(+), 437 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f37da2c85561028e86e8b…

1 0