July 2017 - Wine-Commits - list.winehq.org

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: 9d04fd1415245ad71027dd67435f7cb929b6376a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d04fd1415245ad71027dd674… Author: Kim Malmo <berencamlost(a)msn.com> Date: Wed Jul 19 21:45:21 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 82 +++++++++++++++++++------------------------------------------ 1 file changed, 25 insertions(+), 57 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 485409e..da19af3 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-27 16:00+0100\n" +"PO-Revision-Date: 2017-07-19 16:00+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -6892,25 +6892,23 @@ msgstr "Velg katalogen som inneholder %s" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Fatal feil: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Feil [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Advarsel [1]." #: msi.rc:74 msgid "Info [1]." -msgstr "" +msgstr "Info [1]." #: msi.rc:75 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disken er full.\n" +msgstr "{{Disken er full: }}" #: msi.rc:76 msgid "Action %s: [1]. [2]" @@ -6940,114 +6938,84 @@ msgid "" msgstr "" #: msi.rc:92 -#, fuzzy -#| msgid "No registry log space.\n" msgid "Allocating registry space" -msgstr "Ikke loggingsplass for registeret.\n" +msgstr "Tildeler registerplass" #: msi.rc:93 -#, fuzzy -#| msgid "Single-instance application.\n" msgid "Searching for installed applications" -msgstr "Programmet tillater bare én instans.\n" +msgstr "Leter etter installerte programmer" #: msi.rc:94 msgid "Binding executables" -msgstr "" +msgstr "Binder kjørbare" #: msi.rc:95 msi.rc:138 -#, fuzzy -#| msgid "Searching for %s" msgid "Searching for qualifying products" -msgstr "Søker etter %s" +msgstr "Søker etter kvalifiserte produkter" #: msi.rc:96 msi.rc:97 msi.rc:102 msgid "Computing space requirements" -msgstr "" +msgstr "Utregner plasskrav" #: msi.rc:98 -#, fuzzy -#| msgid "Target folder" msgid "Creating folders" -msgstr "Målmappe" +msgstr "Oppretter mapper" #: msi.rc:99 -#, fuzzy -#| msgid "Create Shor&tcut" msgid "Creating shortcuts" -msgstr "Lag s&narvei" +msgstr "Oppretter snarveier" #: msi.rc:100 -#, fuzzy -#| msgid "Exception in service.\n" msgid "Deleting services" -msgstr "Unntak i tjenesten.\n" +msgstr "Sletter tjenester" #: msi.rc:101 -#, fuzzy -#| msgid "Creation date" msgid "Creating duplicate files" -msgstr "Dato opprettet" +msgstr "Oppretter duplikate filer" #: msi.rc:103 -#, fuzzy -#| msgid "No associated application.\n" msgid "Searching for related applications" -msgstr "Intet tilordnet program.\n" +msgstr "Søker etter relaterte programmer" #: msi.rc:104 msgid "Copying network install files" -msgstr "" +msgstr "Kopierer nettverks-installasjonsfiler" #: msi.rc:105 -#, fuzzy -#| msgid "Copying Files..." msgid "Copying new files" -msgstr "Kopierer filer..." +msgstr "Kopierer nye filer" #: msi.rc:106 -#, fuzzy -#| msgid "Installation of component failed: %08x" msgid "Installing ODBC components" -msgstr "Klarte ikke installere komponenten: %08x" +msgstr "Installerer ODBC komponenter" #: msi.rc:107 -#, fuzzy -#| msgid "Installer service failed.\n" msgid "Installing new services" -msgstr "Installasjonstjenesten støtte på en feil.\n" +msgstr "Installerer nye tjenester" #: msi.rc:108 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Installing system catalog" -msgstr "Installer/Avinstaller" +msgstr "Installerer systemkatalog" #: msi.rc:109 -#, fuzzy -#| msgid "Wine Application Uninstaller" msgid "Validating install" -msgstr "Avinstaller programmer" +msgstr "Godkjenner installasjon" #: msi.rc:110 msgid "Evaluating launch conditions" -msgstr "" +msgstr "Evaluerer startbetingelser" #: msi.rc:111 msgid "Migrating feature states from related applications" msgstr "" #: msi.rc:112 -#, fuzzy -#| msgid "Icon files" msgid "Moving files" -msgstr "Ikonfiler" +msgstr "Flytter filer" #: msi.rc:113 -#, fuzzy -#| msgid "Version information" msgid "Publishing assembly information" -msgstr "Versjoninformasjon" +msgstr "Publiserer assembly informasjon" #: msi.rc:114 msgid "Unpublishing assembly information"

1 0

Alexandre Julliard : user32: Don' t exclude clipped children from the copied window bits since they may be up to date.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: bcbc84e21455e31dcac742d81d409581f451a506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcbc84e21455e31dcac742d81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 10:41:43 2017 +0200 user32: Don't exclude clipped children from the copied window bits since they may be up to date. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 2 +- include/wine/server_protocol.h | 19 ++++++++++--------- server/protocol.def | 17 +++++++++-------- server/window.c | 3 +++ 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 8448355..2130473 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -774,7 +774,7 @@ static void copy_bits_from_surface( HWND hwnd, struct window_surface *surface, char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; void *bits; - UINT flags = UPDATE_NOCHILDREN; + UINT flags = UPDATE_NOCHILDREN | UPDATE_CLIPCHILDREN; HRGN rgn = get_update_region( hwnd, &flags, NULL ); HDC hdc = GetDCEx( hwnd, rgn, DCX_CACHE | DCX_WINDOW | DCX_EXCLUDERGN ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 261391a..932a25c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3748,14 +3748,15 @@ struct get_update_region_reply /* VARARG(region,rectangles); */ char __pad_20[4]; }; -#define UPDATE_NONCLIENT 0x01 -#define UPDATE_ERASE 0x02 -#define UPDATE_PAINT 0x04 -#define UPDATE_INTERNALPAINT 0x08 -#define UPDATE_ALLCHILDREN 0x10 -#define UPDATE_NOCHILDREN 0x20 -#define UPDATE_NOREGION 0x40 -#define UPDATE_DELAYED_ERASE 0x80 +#define UPDATE_NONCLIENT 0x001 +#define UPDATE_ERASE 0x002 +#define UPDATE_PAINT 0x004 +#define UPDATE_INTERNALPAINT 0x008 +#define UPDATE_ALLCHILDREN 0x010 +#define UPDATE_NOCHILDREN 0x020 +#define UPDATE_NOREGION 0x040 +#define UPDATE_DELAYED_ERASE 0x080 +#define UPDATE_CLIPCHILDREN 0x100 @@ -6419,6 +6420,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 534 +#define SERVER_PROTOCOL_VERSION 535 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index b834c89..6a4d3fc 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2694,14 +2694,15 @@ enum coords_relative data_size_t total_size; /* total size of the resulting region */ VARARG(region,rectangles); /* list of rectangles for the region (in screen coords) */ @END -#define UPDATE_NONCLIENT 0x01 /* get region for repainting non-client area */ -#define UPDATE_ERASE 0x02 /* get region for erasing client area */ -#define UPDATE_PAINT 0x04 /* get region for painting client area */ -#define UPDATE_INTERNALPAINT 0x08 /* get region if internal paint is pending */ -#define UPDATE_ALLCHILDREN 0x10 /* force repaint of all children */ -#define UPDATE_NOCHILDREN 0x20 /* don't try to repaint any children */ -#define UPDATE_NOREGION 0x40 /* don't return a region, only the flags */ -#define UPDATE_DELAYED_ERASE 0x80 /* still needs erase after BeginPaint */ +#define UPDATE_NONCLIENT 0x001 /* get region for repainting non-client area */ +#define UPDATE_ERASE 0x002 /* get region for erasing client area */ +#define UPDATE_PAINT 0x004 /* get region for painting client area */ +#define UPDATE_INTERNALPAINT 0x008 /* get region if internal paint is pending */ +#define UPDATE_ALLCHILDREN 0x010 /* force repaint of all children */ +#define UPDATE_NOCHILDREN 0x020 /* don't try to repaint any children */ +#define UPDATE_NOREGION 0x040 /* don't return a region, only the flags */ +#define UPDATE_DELAYED_ERASE 0x080 /* still needs erase after BeginPaint */ +#define UPDATE_CLIPCHILDREN 0x100 /* remove clipped children from the update region */ /* Update the z order of a window so that a given rectangle is fully visible */ diff --git a/server/window.c b/server/window.c index 463c4f2..2f2aae4 100644 --- a/server/window.c +++ b/server/window.c @@ -2587,6 +2587,9 @@ DECL_HANDLER(get_update_region) free_region( region ); return; } + if ((flags & UPDATE_CLIPCHILDREN) && (win->style & WS_CLIPCHILDREN)) + clip_children( win, NULL, region, win->client_rect.left - win->window_rect.left, + win->client_rect.top - win->window_rect.top ); map_win_region_to_screen( win, region ); if (!(data = get_region_data_and_free( region, get_reply_max_size(), &reply->total_size ))) return;

1 0

Nikolay Sivov : d3drm/tests: Fix a leak in tests (Valgrind).
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: b3a6debd4f485c65c97a8ba37778d3ea90fc9578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a6debd4f485c65c97a8ba37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 19 14:39:51 2017 +0300 d3drm/tests: Fix a leak in tests (Valgrind). 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/d3drm/tests/d3drm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1ab81e4..5bd6e5e 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1504,6 +1504,8 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID "Expected callback = %p, context = %p. Got callback = %p, context = %p.\n", d3drm_corder[i].callback, d3drm_corder[i].context, corder[i].callback, corder[i].context); } + + IDirect3DRM_Release(d3drm); } static void test_object(void)

1 0

Alexandre Julliard : ntdll: Call NtRaiseException directly from RtlRaiseException on x86-64.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: ac6244b55ad49f856b321d55c2007e6807c0f138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6244b55ad49f856b321d55c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 13:00:10 2017 +0200 ntdll: Call NtRaiseException directly from RtlRaiseException on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 08881e7..0c9ef50 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4041,14 +4041,6 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL /*********************************************************************** * RtlRaiseException (NTDLL.@) */ -void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - NTSTATUS status; - - rec->ExceptionAddress = (void *)context->Rip; - status = raise_exception( rec, context, TRUE ); - if (status != STATUS_SUCCESS) raise_status( status, rec ); -} __ASM_GLOBAL_FUNC( RtlRaiseException, "movq %rcx,8(%rsp)\n\t" "sub $0x4f8,%rsp\n\t" @@ -4056,15 +4048,17 @@ __ASM_GLOBAL_FUNC( RtlRaiseException, "leaq 0x20(%rsp),%rcx\n\t" "call " __ASM_NAME("RtlCaptureContext") "\n\t" "leaq 0x20(%rsp),%rdx\n\t" /* context pointer */ - "movq 0x4f8(%rsp),%rax\n\t" /* return address */ - "movq %rax,0xf8(%rdx)\n\t" /* context->Rip */ "leaq 0x500(%rsp),%rax\n\t" /* orig stack pointer */ "movq %rax,0x98(%rdx)\n\t" /* context->Rsp */ "movq (%rax),%rcx\n\t" /* original first parameter */ "movq %rcx,0x80(%rdx)\n\t" /* context->Rcx */ - "call " __ASM_NAME("__regs_RtlRaiseException") "\n\t" - "leaq 0x20(%rsp),%rdi\n\t" /* context pointer */ - "call " __ASM_NAME("set_full_cpu_context") /* does not return */ ); + "movq 0x4f8(%rsp),%rax\n\t" /* return address */ + "movq %rax,0xf8(%rdx)\n\t" /* context->Rip */ + "movq %rax,0x10(%rcx)\n\t" /* rec->ExceptionAddress */ + "movl $1,%r8d\n\t" + "call " __ASM_NAME("NtRaiseException") "\n\t" + "movq %rax,%rcx\n\t" + "call " __ASM_NAME("RtlRaiseStatus") /* does not return */ ); /*************************************************************************

1 0

Alexandre Julliard : ntdll: Call NtRaiseException directly from RtlRaiseException on i386.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: a75e3f734d32bd98df9017f1a94819d2b6dca85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a75e3f734d32bd98df9017f1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 13:35:53 2017 +0200 ntdll: Call NtRaiseException directly from RtlRaiseException on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 2 +- .../api-ms-win-core-rtlsupport-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 4 +-- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_i386.c | 34 ++++++++++++++++------ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index d2966f5..2922b1c 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -8,7 +8,7 @@ @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader -@ stdcall -register RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -register RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind @ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx diff --git a/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec index 7ef9c6d..68f2e86 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec @@ -2,5 +2,5 @@ @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory @ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader -@ stdcall -register RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException @ stdcall -register RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7ba1978..dedbb93 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1285,7 +1285,7 @@ @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable -@ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext +@ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory @@ -1295,7 +1295,7 @@ @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader -@ stdcall -arch=arm -register RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -arch=arm -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9adf1ed..d7fdced 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -824,7 +824,7 @@ @ stdcall RtlQueryUnbiasedInterruptTime(ptr) @ stub RtlQueueApcWow64Thread @ stdcall RtlQueueWorkItem(ptr ptr long) -@ stdcall -register RtlRaiseException(ptr) +@ stdcall -norelay RtlRaiseException(ptr) @ stdcall RtlRaiseStatus(long) @ stdcall RtlRandom(ptr) @ stub RtlRandomEx diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 2301ba4..184e6da 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2708,15 +2708,31 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL /*********************************************************************** * RtlRaiseException (NTDLL.@) */ -void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - NTSTATUS status; - - rec->ExceptionAddress = (void *)context->Eip; - status = raise_exception( rec, context, TRUE ); - if (status != STATUS_SUCCESS) raise_status( status, rec ); -} -DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) +__ASM_STDCALL_FUNC( RtlRaiseException, 4, + "leal -0x2cc(%esp),%esp\n\t" /* sizeof(CONTEXT) */ + __ASM_CFI(".cfi_adjust_cfa_offset 0x2cc\n\t") + "pushl %esp\n\t" /* context */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "call " __ASM_NAME("RtlCaptureContext") __ASM_STDCALL(4) "\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "movl 0x2cc(%esp),%eax\n\t" /* return address */ + "movl 0x2d0(%esp),%ecx\n\t" /* rec */ + "movl %eax,0xb8(%esp)\n\t" /* context->Eip */ + "movl %eax,12(%ecx)\n\t" /* rec->ExceptionAddress */ + "leal 0x2d4(%esp),%eax\n\t" + "movl %eax,0xc4(%esp)\n\t" /* context->Esp */ + "movl %esp,%eax\n\t" + "pushl $1\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "pushl %eax\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "pushl %ecx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "call " __ASM_NAME("NtRaiseException") __ASM_STDCALL(12) "\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -12\n\t") + "pushl %eax\n\t" + "call " __ASM_NAME("RtlRaiseStatus") __ASM_STDCALL(4) "\n\t" + "ret $4" ) /* actually never returns */ /************************************************************************* diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ae2f335..1f60f61 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1134,7 +1134,7 @@ @ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) ntdll.RtlQueryAtomInAtomTable @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) ntdll.RtlQueryRegistryValues @ stdcall RtlQueryTimeZoneInformation(ptr) ntdll.RtlQueryTimeZoneInformation -@ stdcall -register RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException @ stdcall RtlRandom(ptr) ntdll.RtlRandom @ stub RtlRandomEx @ stub RtlRealPredecessor

1 0

Alexandre Julliard : ntdll: Remove the raise_exception helper function on x86-64.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: 1522280e68645b24c9f57f9cc30717c1a1e1530a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1522280e68645b24c9f57f9cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 13:25:04 2017 +0200 ntdll: Remove the raise_exception helper function on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0c9ef50..c1919e8 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2574,11 +2574,9 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex /******************************************************************* - * raise_exception - * - * Implementation of NtRaiseException. + * NtRaiseException (NTDLL.@) */ -static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) +NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) { NTSTATUS status; @@ -2614,17 +2612,15 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f context->R12, context->R13, context->R14, context->R15 ); } status = send_debug_event( rec, TRUE, context ); - if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) - return STATUS_SUCCESS; + if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) goto done; /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; - if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - return STATUS_SUCCESS; + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) goto done; - if ((status = call_stack_handlers( rec, context )) != STATUS_UNHANDLED_EXCEPTION) - return status; + if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) goto done; + if (status != STATUS_UNHANDLED_EXCEPTION) return status; } /* last chance exception */ @@ -2641,7 +2637,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); } - return STATUS_SUCCESS; + +done: + return NtSetContextThread( GetCurrentThread(), context ); } @@ -4027,17 +4025,6 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, } -/******************************************************************* - * NtRaiseException (NTDLL.@) - */ -NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) -{ - NTSTATUS status = raise_exception( rec, context, first_chance ); - if (status == STATUS_SUCCESS) NtSetContextThread( GetCurrentThread(), context ); - return status; -} - - /*********************************************************************** * RtlRaiseException (NTDLL.@) */

1 0

Alexandre Julliard : Wine release 2.0.2
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: website Branch: master Commit: b0a1cb3ea46fcb79600fa0c9f4b83b32b73994ad URL: http://source.winehq.org/git/website.git/?a=commit;h=b0a1cb3ea46fcb79600fa0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 19:11:40 2017 +0200 Wine release 2.0.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017072001.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2017072001.xml b/news/en/2017072001.xml new file mode 100644 index 0000000..d7a164c --- /dev/null +++ b/news/en/2017072001.xml @@ -0,0 +1,12 @@ +<news> +<date>July 20, 2017</date> +<title>Wine 2.0.2 Released</title> +<body> + The Wine maintenance release 2.0.2 is now available. + <a href="{$root}/announce/2.0.2">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.2.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

Michael Stefaniuc : Release 2.0.2
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 3b2fae0161aa15155cf76631a965ad0ad136b795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2fae0161aa15155cf76631a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 3 22:59:53 2017 +0200 Release 2.0.2 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 383 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 6 + VERSION | 2 +- configure | 18 +-- 4 files changed, 212 insertions(+), 197 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b2fae0161aa15155cf76…

1 0

Kimmo Myllyvirta : ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 5d41fd0bb4a16c05eba6b83f5630e2e311f0ec5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d41fd0bb4a16c05eba6b83f5… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Wed Jul 12 03:17:18 2017 +0000 ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 32334704e882eb225b4738a34d46c6407af12514) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 340551a..513cbfc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4944,6 +4944,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID { TRACE("-> got %s\n", guid_funcs[i].name); *(void **)out_buff = guid_funcs[i].func_ptr; + total = sizeof(void *); break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8df3f5c..d7e7fff 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7434,6 +7434,7 @@ static void test_ConnectEx(void) goto end; } + bytesReturned = 0xdeadbeef; iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); if (iret) { @@ -7441,6 +7442,8 @@ static void test_ConnectEx(void) goto end; } + ok(bytesReturned == sizeof(pConnectEx), "expected sizeof(pConnectEx), got %u\n", bytesReturned); + bret = pConnectEx(INVALID_SOCKET, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "ConnectEx on invalid socket " "returned %d + errno %d\n", bret, WSAGetLastError());

1 0

Alex Henrie : ddraw: Validate the "surface" pointer before creating the surface in CreateSurface().
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: d09cb43d6ae46cba5bbdb585f342eb788f81f802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09cb43d6ae46cba5bbdb585f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 16 15:12:15 2017 +0100 ddraw: Validate the "surface" pointer before creating the surface in CreateSurface(). And thereby avoid leaking the surface on the error path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 062f1ae7524ef0049bbb8579bd6d03e6eca0be16) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/ddraw.c | 128 +++++++++++++++++++++++++++-------------------------- 1 file changed, 66 insertions(+), 62 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 10bba4e..9091a1d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2802,6 +2802,18 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -2817,23 +2829,12 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface7_iface; - IDirectDraw7_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface7_iface; + IDirectDraw7_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; return hr; } @@ -2864,6 +2865,18 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -2879,23 +2892,12 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 4); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface4_iface; - IDirectDraw4_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface4_iface; + IDirectDraw4_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; return hr; } @@ -2927,6 +2929,18 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + DDSD_to_DDSD2(surface_desc, &surface_desc2); if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { @@ -2943,22 +2957,11 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 2); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; return hr; } @@ -2990,6 +2993,18 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, return DDERR_INVALIDPARAMS; } + __TRY + { + *surface = NULL; + } + __EXCEPT_PAGE_FAULT + { + WARN("Surface pointer %p is invalid.\n", surface); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + __ENDTRY; + if ((surface_desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)) == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER) || (surface_desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_FRONTBUFFER)) @@ -3003,22 +3018,11 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, DDSD_to_DDSD2(surface_desc, &surface_desc2); hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; - __TRY - { - if (FAILED(hr)) - { - *surface = NULL; - break; - } - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; - } - __EXCEPT_PAGE_FAULT - { - hr = E_INVALIDARG; - } - __ENDTRY; + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; return hr; }

1 0