November 2017 - Wine-Commits

Alexandre Julliard : make_makefiles: Ignore files that have been deleted in the index.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: bfc863474791af182ea7162e22ff52ec1ae30699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc863474791af182ea7162e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 19:39:59 2017 +0100 make_makefiles: Ignore files that have been deleted in the index. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_makefiles | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/make_makefiles b/tools/make_makefiles index 8411ecb..f57a7e2 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -542,6 +542,7 @@ my $git_dir = $ENV{GIT_DIR} || ".git"; die "needs to be run from a git checkout" unless -d $git_dir; my @all_files = split /\0/, `git ls-files -c -z`; +map { $ignored_source_files{$_} = 1; } split /\0/, `git ls-files -d -z`; @makefiles = map { (my $ret = $_) =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files; foreach my $file (sort @makefiles)

1 0

Rafał Harabień : winex11.drv: Preserve last error in x11drv_thread_data().
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 5c2526a08681c8992d60e7eb462d7aac12a25784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2526a08681c8992d60e7eb4… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Thu Nov 16 22:30:17 2017 +0100 winex11.drv: Preserve last error in x11drv_thread_data(). Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 1 + dlls/user32/menu.c | 1 + dlls/user32/tests/input.c | 11 ++++++++++- dlls/user32/tests/win.c | 8 ++++++++ dlls/winex11.drv/x11drv.h | 5 ++++- 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c2aad8d..46220b0 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -283,6 +283,7 @@ static BOOL DIALOG_CreateControls32( HWND hwnd, LPCSTR template, const DLG_TEMPL WARN("control %s %s creation failed\n", debugstr_w(info.className), debugstr_w(info.windowName)); if (dlgTemplate->style & DS_NOFAILCREATE) continue; + SetLastError(0); return FALSE; } diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index a5f2317..38deaef 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3518,6 +3518,7 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, SendMessageW( hWnd, WM_UNINITMENUPOPUP, (WPARAM)hMenu, MAKELPARAM(0, IS_SYSTEM_MENU(menu)) ); } + SetLastError(0); } return ret; diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f2576d..793590e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1928,8 +1928,17 @@ static void test_Input_mouse(void) DWORD thread_id; POINT pt, pt_org; MSG msg; + BOOL ret; - GetCursorPos(&pt_org); + SetLastError(0xdeadbeef); + ret = GetCursorPos(NULL); + ok(!ret, "GetCursorPos succeed\n"); + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_NOACCESS, "error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetCursorPos(&pt_org); + ok(ret, "GetCursorPos failed\n"); + ok(GetLastError() == 0xdeadbeef, "error %u\n", GetLastError()); button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b529284..6e72cbc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6261,6 +6261,14 @@ static void test_CreateWindow(void) ok( rc.bottom <= expected_cy, "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); + /* invalid class */ + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, "INVALID_CLASS", NULL, WS_CHILD, 10, 10, 100, 100, parent, 0, 0, NULL); + ok(hwnd == 0, "CreateWindowEx succeeded\n"); + ok(GetLastError() == ERROR_CLASS_DOES_NOT_EXIST || GetLastError() == ERROR_CANNOT_FIND_WND_CLASS, + "invalid error %u\n", GetLastError()); + DestroyWindow(hwnd); + if (pGetLayout && pSetLayout) { HDC hdc = GetDC( parent ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 721c082..938ff22 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -345,7 +345,10 @@ extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - return TlsGetValue( thread_data_tls_index ); + DWORD err = GetLastError(); /* TlsGetValue always resets last error */ + struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + SetLastError( err ); + return data; } /* retrieve the thread display, or NULL if not created yet */

1 0

Hans Leidekker : advapi32; Remove unused foward declarations.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: cd8165a488bf334bf0f77796c2eb8c49852e0c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8165a488bf334bf0f77796c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 17 15:56:56 2017 +0100 advapi32; Remove unused foward declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ae9d6bd..bd15a02 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -48,16 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); -static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, - PACL pAcl, LPDWORD cBytes); -static BYTE ParseAceStringFlags(LPCWSTR* StringAcl); -static BYTE ParseAceStringType(LPCWSTR* StringAcl); -static DWORD ParseAceStringRights(LPCWSTR* StringAcl); -static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( - LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, - LPDWORD cBytes); -static DWORD ParseAclStringFlags(LPCWSTR* StringAcl); typedef struct _ACEFLAG {

1 0

Martin Storsjo : ucrtbase: Always return the full string length in __stdio_common_vs[w] printf for a NULL buffer.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: ee32799d61c03266f327ec3af9dc3309de7163ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee32799d61c03266f327ec3af… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Nov 17 12:39:39 2017 +0200 ucrtbase: Always return the full string length in __stdio_common_vs[w]printf for a NULL buffer. If the target is a NULL buffer (with a zero length), we should always return the full size the format would have needed, even if UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR isn't specified. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 4 ++++ dlls/ucrtbase/tests/printf.c | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 88f52e0..0c54800 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -764,6 +764,8 @@ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MS &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); puts_clbk_str_a(&ctx, 1, &nullbyte); + if(!str) + return ret; if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { @@ -1282,6 +1284,8 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); puts_clbk_str_w(&ctx, 1, &nullbyte); + if(!str) + return ret; if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 77fb560..0e38003 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -215,6 +215,10 @@ static void test_snprintf (void) ok (vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, "abcd") == 4, "Failure to snprintf to NULL\n"); + ok (vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, "abcd") == 4, + "Failure to snprintf to NULL\n"); + ok (vsprintf_wrapper (0, NULL, 0, "abcd") == 4, + "Failure to snprintf to NULL\n"); } static int WINAPIV vswprintf_wrapper(unsigned __int64 options, wchar_t *str, @@ -289,6 +293,13 @@ static void test_swprintf (void) ok (buffer[valid] == '\0', "\"%s\": Missing null termination (ret %d) - is %d\n", narrow_fmt, n, buffer[valid]); } + + ok (vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); + ok (vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); + ok (vswprintf_wrapper (0, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); } static int WINAPIV vfprintf_wrapper(FILE *file,

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 29a0537d91c2a0a042a686cb62c967350958f755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a0537d91c2a0a042a686cb6… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 17 14:30:43 2017 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 68 ++++++++++++++++------------------------------------------------ 1 file changed, 17 insertions(+), 51 deletions(-) diff --git a/po/de.po b/po/de.po index 48497f4..8e8fe3d 100644 --- a/po/de.po +++ b/po/de.po @@ -1,20 +1,18 @@ # German translations for Wine # -# Marcus Meissner <marcus(a)jet.franken.de>, 2017. msgid "" 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-10-28 15:22+0100\n" -"Last-Translator: Marcus Meissner <marcus(a)jet.franken.de>\n" -"Language-Team: German <kde-i18n-de(a)kde.org>\n" +"PO-Revision-Date: 2017-11-17 14:31+0100\n" +"Last-Translator: Julian Rüger\n" +"Language-Team: German\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -10667,6 +10665,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"MKLINK legt einen symbolischen Link an.\n" +"\n" +"Syntax: MKLINK [Optionen] Linkname Ziel\n" +"\n" +"Optionen:\n" +"/d Symlink auf ein Verzeichnis anlegen.\n" +"/h Einen Hardlink anlegen.\n" +"/j Einen Verzeichnisknoten anlegen.\n" +"'Linkname' entspricht dem Dateinamen des neuen Symlinks.\n" +"'Ziel' ist der Pfad, auf den 'Linkname' verweisen wird.\n" #: cmd.rc:312 msgid "" @@ -10677,47 +10685,6 @@ msgstr "" "der Shell zurück, von der CMD gestartet wurde.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10776,6 +10743,7 @@ msgstr "" "FTYPE\t\tZeigt oder ändert den Öffnen-Befehl für eine Dateierweiterung\n" "HELP\t\tZeigt detaillierte Informationen zu einen Thema\n" "MD (MKDIR)\tErzeugt ein Unterverzeichnis\n" +"MKLINK\t\tLegt einen symbolischen Link an\n" "MORE\t\tZeigt die Ausgabe seitenweise an\n" "MOVE\t\tBewegt eine oder mehrere Dateien oder einen Verzeichnisbaum\n" "PATH\t\tSetzt oder zeigt den Suchpfad an\n" @@ -12267,7 +12235,7 @@ msgstr "(Wert nicht gesetzt)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "REG IMPORT file.reg\n" +msgstr "REG IMPORT datei.reg\n" #: reg.rc:67 msgid "reg: The file '%1' was not found.\n" @@ -15069,10 +15037,8 @@ msgid "Expert" msgstr "Experten" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Ergebnis" +msgstr "Ergebnisse zurücksetzen" #: winemine.rc:80 msgid "Congratulations!" @@ -15100,7 +15066,7 @@ msgstr "Minen" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Sämtliche Ergebnisse werden entfernt. Sind Sie sicher?" #: winemine.rc:30 msgid "WineMine"

1 0

Alexandre Julliard : ntdll: Fall back to read() on noexec filesystems also for non-image mappings.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 2e364d25cc51656cfc9c512905cc12fee41bcd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e364d25cc51656cfc9c51290… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 11:54:51 2017 +0100 ntdll: Fall back to read() on noexec filesystems also for non-image mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1c62e57..9cec872 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1164,18 +1164,29 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) goto done; - if ((errno == EPERM) && (prot & PROT_EXEC)) - ERR( "failed to set %08x protection on file map, noexec filesystem?\n", prot ); - - /* mmap() failed; if this is because the file offset is not */ - /* page-aligned (EINVAL), or because the underlying filesystem */ - /* does not support mmap() (ENOEXEC,ENODEV), we do it by hand. */ - if ((errno != ENOEXEC) && (errno != EINVAL) && (errno != ENODEV)) return FILE_GetNtStatus(); - if (flags & MAP_SHARED) /* we cannot fake shared mappings */ - { - if (errno == EINVAL) return STATUS_INVALID_PARAMETER; - ERR( "shared writable mmap not supported, broken filesystem?\n" ); - return STATUS_NOT_SUPPORTED; + switch (errno) + { + case EINVAL: /* file offset is not page-aligned, fall back to read() */ + if (flags & MAP_SHARED) return STATUS_INVALID_PARAMETER; + break; + case ENOEXEC: + case ENODEV: /* filesystem doesn't support mmap(), fall back to read() */ + if (flags & MAP_SHARED) + { + ERR( "shared writable mmap not supported, broken filesystem?\n" ); + return STATUS_NOT_SUPPORTED; + } + break; + case EPERM: /* noexec filesystem, fall back to read() */ + if (flags & MAP_SHARED) + { + if (prot & PROT_EXEC) ERR( "failed to set PROT_EXEC on file map, noexec filesystem?\n" ); + return STATUS_ACCESS_DENIED; + } + if (prot & PROT_EXEC) WARN( "failed to set PROT_EXEC on file map, noexec filesystem?\n" ); + break; + default: + return FILE_GetNtStatus(); } }

1 0

Jacek Caban : mshtml: Merge olewnd.c into oleobj.c.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: e1c211eaee7450e240b937d3c95307b374b1ea9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c211eaee7450e240b937d3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 17:46:20 2017 +0100 mshtml: Merge olewnd.c into oleobj.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/oleobj.c | 246 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/olewnd.c | 286 ------------------------------------------- 5 files changed, 246 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1c211eaee7450e240b93…

1 0

Hans Leidekker : advapi32: Add traces to ConvertStringSecurityDescriptorToSecurityDescriptorA/W.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: f947546927ecb053905471d7ad1d5cb5ae3c41c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f947546927ecb053905471d7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 17 15:56:57 2017 +0100 advapi32: Add traces to ConvertStringSecurityDescriptorToSecurityDescriptorA/W. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index bd15a02..a762d5a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4793,6 +4793,9 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA( BOOL ret; LPWSTR StringSecurityDescriptorW; + TRACE("%s, %u, %p, %p\n", debugstr_a(StringSecurityDescriptor), StringSDRevision, + SecurityDescriptor, SecurityDescriptorSize); + if(!StringSecurityDescriptor) return FALSE; @@ -4818,7 +4821,8 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( SECURITY_DESCRIPTOR* psd; BOOL bret = FALSE; - TRACE("%s\n", debugstr_w(StringSecurityDescriptor)); + TRACE("%s, %u, %p, %p\n", debugstr_w(StringSecurityDescriptor), StringSDRevision, + SecurityDescriptor, SecurityDescriptorSize); if (GetVersion() & 0x80000000) {

1 0

Hans Leidekker : advapi32: Fix parsing empty DACL/ SACL security descriptor strings.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 1d03ba7611644807af38be40af46e1b22d1dd9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d03ba7611644807af38be40a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 17 15:56:58 2017 +0100 advapi32: Fix parsing empty DACL/SACL security descriptor strings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 4 ++-- dlls/advapi32/tests/security.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a762d5a..7281e01 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4314,7 +4314,7 @@ static DWORD ParseAclStringFlags(LPCWSTR* StringAcl) DWORD flags = 0; LPCWSTR szAcl = *StringAcl; - while (*szAcl != '(') + while (*szAcl && *szAcl != '(') { if (*szAcl == 'P') { @@ -4625,7 +4625,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, pAcl->AclRevision = ACL_REVISION; pAcl->Sbz1 = 0; pAcl->AclSize = length; - pAcl->AceCount = acecount++; + pAcl->AceCount = acecount; pAcl->Sbz2 = 0; } return TRUE; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 08d3705..e86fe21 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4101,6 +4101,8 @@ static void test_ConvertStringSecurityDescriptor(void) PSECURITY_DESCRIPTOR pSD; static const WCHAR Blank[] = { 0 }; unsigned int i; + ULONG size; + ACL *acl; static const struct { const char *sidstring; @@ -4211,6 +4213,33 @@ static void test_ConvertStringSecurityDescriptor(void) ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_DATATYPE) /* win2k */, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %u\n", GetLastError()); if (ret) LocalFree(pSD); + + /* empty DACL */ + size = 0; + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA("D:", SDDL_REVISION_1, &pSD, &size); + ok(ret, "unexpected error %u\n", GetLastError()); + ok(size == sizeof(SECURITY_DESCRIPTOR_RELATIVE) + sizeof(ACL), "got %u\n", size); + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(acl->AclRevision == ACL_REVISION, "got %u\n", acl->AclRevision); + ok(!acl->Sbz1, "got %u\n", acl->Sbz1); + ok(acl->AclSize == sizeof(*acl), "got %u\n", acl->AclSize); + ok(!acl->AceCount, "got %u\n", acl->AceCount); + ok(!acl->Sbz2, "got %u\n", acl->Sbz2); + LocalFree(pSD); + + /* empty SACL */ + size = 0; + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA("S:", SDDL_REVISION_1, &pSD, &size); + ok(ret, "unexpected error %u\n", GetLastError()); + ok(size == sizeof(SECURITY_DESCRIPTOR_RELATIVE) + sizeof(ACL), "got %u\n", size); + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(!acl->Sbz1, "got %u\n", acl->Sbz1); + ok(acl->AclSize == sizeof(*acl), "got %u\n", acl->AclSize); + ok(!acl->AceCount, "got %u\n", acl->AceCount); + ok(!acl->Sbz2, "got %u\n", acl->Sbz2); + LocalFree(pSD); } static void test_ConvertSecurityDescriptorToString(void)

1 0

Alexandre Julliard : ntdll: Also check for EACCES to detect noexec failures.
by Alexandre Julliard Nov. 17, 2017

Nov. 17, 2017

Module: wine Branch: master Commit: 03993b456c386cf2f26afe267da83d04302ac984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03993b456c386cf2f26afe267… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 11:54:57 2017 +0100 ntdll: Also check for EACCES to detect noexec failures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9cec872..ab27077 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1177,6 +1177,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start return STATUS_NOT_SUPPORTED; } break; + case EACCES: case EPERM: /* noexec filesystem, fall back to read() */ if (flags & MAP_SHARED) { @@ -1334,6 +1335,7 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) switch (errno) { case EPERM: + case EACCES: WARN( "noexec file system, falling back to read\n" ); break; case ENOEXEC:

1 0