wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Frédéric Delanoy : Assorted spelling/ grammar fixes.
by Alexandre Julliard 27 Mar '15

27 Mar '15

Module: wine Branch: master Commit: f6a341c74747b891d8c03c06975b357322d72a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a341c74747b891d8c03c069… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 27 14:19:47 2015 +0100 Assorted spelling/grammar fixes. --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- dlls/ieframe/tests/webbrowser.c | 2 +- dlls/kernel32/locale.c | 4 ++-- dlls/msi/tests/db.c | 2 +- dlls/user32/sysparams.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++-- programs/winedbg/winedbg.man.in | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 8fdbef7..efb00b2 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2057,7 +2057,7 @@ static void test_window_style(void) ret = SetForegroundWindow(window); ok(ret, "Failed to set foreground window.\n"); - /* Windows 7 (but not Vista and XP) show the window when it receives focus. Hide it again, + /* Windows 7 (but not Vista and XP) shows the window when it receives focus. Hide it again, * the next tests expect this. */ ShowWindow(window, SW_HIDE); @@ -2217,7 +2217,7 @@ static void test_coop_level_mode_set(void) {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not - * produe the same result in Wine yet. Ignore the difference for now. + * produce the same result in Wine yet. Ignore the difference for now. * {WM_ACTIVATE, TRUE, 0x200000 | WA_ACTIVE}, */ {WM_WINDOWPOSCHANGED, FALSE, 0}, {WM_MOVE, FALSE, 0}, diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 6b5a48b..5f59f06 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2246,7 +2246,7 @@ static void test_window_style(void) ret = SetForegroundWindow(window); ok(ret, "Failed to set foreground window.\n"); - /* Windows 7 (but not Vista and XP) show the window when it receives focus. Hide it again, + /* Windows 7 (but not Vista and XP) shows the window when it receives focus. Hide it again, * the next tests expect this. */ ShowWindow(window, SW_HIDE); @@ -2417,7 +2417,7 @@ static void test_coop_level_mode_set(void) {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not - * produe the same result in Wine yet. Ignore the difference for now. + * produce the same result in Wine yet. Ignore the difference for now. * {WM_ACTIVATE, TRUE, 0x200000 | WA_ACTIVE}, */ {WM_WINDOWPOSCHANGED, FALSE, 0}, {WM_MOVE, FALSE, 0}, diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1879424..70ca117 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2433,7 +2433,7 @@ static void test_window_style(void) ret = SetForegroundWindow(window); ok(ret, "Failed to set foreground window.\n"); - /* Windows 7 (but not Vista and XP) show the window when it receives focus. Hide it again, + /* Windows 7 (but not Vista and XP) shows the window when it receives focus. Hide it again, * the next tests expect this. */ ShowWindow(window, SW_HIDE); @@ -2604,7 +2604,7 @@ static void test_coop_level_mode_set(void) {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not - * produe the same result in Wine yet. Ignore the difference for now. + * produce the same result in Wine yet. Ignore the difference for now. * {WM_ACTIVATE, TRUE, 0x200000 | WA_ACTIVE}, */ {WM_WINDOWPOSCHANGED, FALSE, 0}, {WM_MOVE, FALSE, 0}, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f3cd495..21ba3390 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2111,7 +2111,7 @@ static void test_window_style(void) ret = SetForegroundWindow(window); ok(ret, "Failed to set foreground window.\n"); - /* Windows 7 (but not Vista and XP) show the window when it receives focus. Hide it again, + /* Windows 7 (but not Vista and XP) shows the window when it receives focus. Hide it again, * the next tests expect this. */ ShowWindow(window, SW_HIDE); @@ -2281,7 +2281,7 @@ static void test_coop_level_mode_set(void) {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not - * produe the same result in Wine yet. Ignore the difference for now. + * produce the same result in Wine yet. Ignore the difference for now. * {WM_ACTIVATE, TRUE, 0x200000 | WA_ACTIVE}, */ {WM_WINDOWPOSCHANGED, FALSE, 0}, {WM_MOVE, FALSE, 0}, diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3dae2b6..b19ae7c 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2085,7 +2085,7 @@ static void test_EnumVerbs(IWebBrowser2 *wb) ok(!fetched, "fetched = %d\n", fetched); /* Although fetched==0, an element is returned. */ expect_oleverb(verbs, OLEIVERB_PRIMARY); - /* The first argument is ignorred and always one element is returned. */ + /* The first argument is ignored and always one element is returned. */ ok(verbs[1].lVerb == 0xdeadbeef, "verbs[1].lVerb = %x\n", verbs[1].lVerb); test_next_oleverb(enum_verbs, OLEIVERB_INPLACEACTIVATE); diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index f20fe5b..afc5b9d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2274,8 +2274,8 @@ static int utf7_wcstombs(const WCHAR *src, int srclen, char *dst, int dstlen) if (offset) { - /* Windows won't create a padded base64 character if there's not room for the - sign too - * this is probably a bug in Windows */ + /* Windows won't create a padded base64 character if there's no room for the - sign + * as well ; this is probably a bug in Windows */ if (dstlen > 0 && dest_index + 1 >= dstlen) return -1; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index d629e1c..60e5c82 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2770,7 +2770,7 @@ static void test_markers(void) DeleteFileA(msifile); } -#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2k */ +#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2000 */ static void test_handle_limit(void) { int i; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 9944119..79396ae 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -722,7 +722,7 @@ static BOOL get_twips_entry( union sysparam_all_entry *entry, UINT int_param, vo if (load_entry( &entry->hdr, buf, sizeof(buf) )) { int val = atoiW( buf ); - /* Dimension are quoted as being "twips" values if negative and pixels if positive. + /* Dimensions are quoted as being "twips" values if negative and pixels if positive. * One inch is 1440 twips. * See for example * Technical Reference to the Windows 2000 Registry -> diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3a60ddb..638a767 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3574,7 +3574,7 @@ static void test_select(void) /* select() works in 3 distinct states: * - to check if a connection attempt ended with success or error; * - to check if a pending connection is waiting for acceptance; - * - to check for data to read, avaliability for write and OOB data + * - to check for data to read, availability for write and OOB data * * The tests below ensure that all conditions are tested. */ @@ -7327,7 +7327,7 @@ static void test_sioAddressListChange(void) goto end; } - /* Wait for address changes, request that the user connect/disconnect an interface */ + /* Wait for address changes, request that the user connects/disconnects an interface */ memset(&overlapped, 0, sizeof(overlapped)); overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index b5beba2..d6e5dc9 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -70,7 +70,7 @@ When in \fBgdb\fR proxy mode, the following options are available: .PP .IP \fB--no-start\fR \fBgdb\fR will not be automatically -started. Relevant information for starting \fBgdb\fR are printed on +started. Relevant information for starting \fBgdb\fR is printed on screen. This is somehow useful when not directly using \fBgdb\fR but some graphical front-ends, like \fBddd\fR or \fBkgbd\fR. .IP \fB--with-xterm\fR

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLWritePrivateProfileStringA /W.
by Alexandre Julliard 27 Mar '15

27 Mar '15

Module: wine Branch: master Commit: 67acce4aa6e5fa9327fe4dd82a7bddfa7a90e1d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67acce4aa6e5fa9327fe4dd82… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 4 16:26:28 2015 +1100 odbccp32: Implement SQLWritePrivateProfileStringA/W. --- dlls/odbccp32/odbccp32.c | 85 ++++++++++++++++++++++++++++++++++++++--- dlls/odbccp32/tests/Makefile.in | 2 +- dlls/odbccp32/tests/misc.c | 60 +++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+), 7 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 0483f1e..fa720c4 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -56,6 +56,7 @@ static const WCHAR odbc_error_invalid_buff_len[] = {'I','n','v','a','l','i','d', static const WCHAR odbc_error_component_not_found[] = {'C','o','m','p','o','n','e','n','t',' ','n','o','t',' ','f','o','u','n','d',0}; static const WCHAR odbc_error_out_of_mem[] = {'O','u','t',' ','o','f',' ','m','e','m','o','r','y',0}; static const WCHAR odbc_error_invalid_param_sequence[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','e','q','u','e','n','c','e',0}; +static const WCHAR odbc_error_invalid_param_string[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','t','r','i','n','g',0}; /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) @@ -74,6 +75,33 @@ static void clear_errors(void) num_errors = 0; } +static inline void * heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + + BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { clear_errors(); @@ -965,17 +993,62 @@ BOOL WINAPI SQLWriteFileDSN(LPCSTR lpszFileName, LPCSTR lpszAppName, BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, LPCWSTR lpszString, LPCWSTR lpszFilename) { + LONG ret; + HKEY hkey; + WCHAR softwareodbc[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; + clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s %s %s %s\n", debugstr_w(lpszSection), debugstr_w(lpszEntry), + debugstr_w(lpszString), debugstr_w(lpszFilename)); + + if(!lpszFilename || !*lpszFilename) + { + push_error(ODBC_ERROR_INVALID_STR, odbc_error_invalid_param_string); + return FALSE; + } + + if ((ret = RegCreateKeyW(HKEY_CURRENT_USER, softwareodbc, &hkey)) == ERROR_SUCCESS) + { + HKEY hkeyfilename; + + if ((ret = RegCreateKeyW(hkey, lpszFilename, &hkeyfilename)) == ERROR_SUCCESS) + { + HKEY hkey_section; + + if ((ret = RegCreateKeyW(hkeyfilename, lpszSection, &hkey_section)) == ERROR_SUCCESS) + { + ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)lpszString, (lstrlenW(lpszString)+1)*sizeof(WCHAR)); + RegCloseKey(hkey_section); + } + + RegCloseKey(hkeyfilename); + } + + RegCloseKey(hkey); + } + + return ret == ERROR_SUCCESS; } BOOL WINAPI SQLWritePrivateProfileString(LPCSTR lpszSection, LPCSTR lpszEntry, LPCSTR lpszString, LPCSTR lpszFilename) { + BOOL ret; + WCHAR *sect, *entry, *string, *file; clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%s %s %s %s\n", lpszSection, lpszEntry, lpszString, lpszFilename); + + sect = heap_strdupAtoW(lpszSection); + entry = heap_strdupAtoW(lpszEntry); + string = heap_strdupAtoW(lpszString); + file = heap_strdupAtoW(lpszFilename); + + ret = SQLWritePrivateProfileStringW(sect, entry, string, file); + + heap_free(sect); + heap_free(entry); + heap_free(string); + heap_free(file); + + return ret; } diff --git a/dlls/odbccp32/tests/Makefile.in b/dlls/odbccp32/tests/Makefile.in index f6d7842..912f511 100644 --- a/dlls/odbccp32/tests/Makefile.in +++ b/dlls/odbccp32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = odbccp32.dll -IMPORTS = odbccp32 +IMPORTS = odbccp32 advapi32 C_SRCS = \ misc.c diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index cfe9532..f1f3f00 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "odbcinst.h" static void test_SQLConfigMode(void) @@ -129,9 +130,68 @@ static void test_SQLInstallDriverManager(void) ok(path_out != 0xcafe, "Expected path_out to show the correct amount of bytes\n"); } +static void test_SQLWritePrivateProfileString(void) +{ + static const WCHAR odbc_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','.','I','N','I','\\','w','i','n','e','o','d','b','c',0}; + static const WCHAR abcd_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I','\\','w','i','n','e','o','d','b','c',0}; + static const WCHAR abcdini_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I',0 }; + BOOL ret; + LONG reg_ret; + DWORD error_code; + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", ""); + ok(!ret, "SQLWritePrivateProfileString passed\n"); + SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(error_code == ODBC_ERROR_INVALID_STR, "SQLInstallerErrorW ret: %d\n", error_code); + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", NULL); + ok(!ret, "SQLWritePrivateProfileString passed\n"); + SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(error_code == ODBC_ERROR_INVALID_STR, "SQLInstallerErrorW ret: %d\n", error_code); + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", "odbc.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + if(ret) + { + HKEY hkey; + + reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, odbc_key, 0, KEY_READ, &hkey); + ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if(reg_ret == ERROR_SUCCESS) + { + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, odbc_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + + RegCloseKey(hkey); + } + } + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", "abcd.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + if(ret) + { + HKEY hkey; + + reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, abcd_key, 0, KEY_READ, &hkey); + ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if(reg_ret == ERROR_SUCCESS) + { + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcd_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + + RegCloseKey(hkey); + } + + /* Cleanup key */ + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcdini_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + } +} + START_TEST(misc) { test_SQLConfigMode(); test_SQLInstallerError(); test_SQLInstallDriverManager(); + test_SQLWritePrivateProfileString(); }

1 0

Hugh McMaster : netstat: Fix incorrect comment.
by Alexandre Julliard 27 Mar '15

27 Mar '15

Module: wine Branch: master Commit: ef41e8205a9b25838e47e4535e73435220c35c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef41e8205a9b25838e47e4535… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 26 22:32:43 2015 +1100 netstat: Fix incorrect comment. --- programs/netstat/netstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 90516da..6112497 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -86,7 +86,7 @@ static int __cdecl NETSTAT_wprintf(const WCHAR *format, ...) /* * Allocate buffer to use when writing to console * Note: Not freed - memory will be allocated once and released when - * xcopy ends + * netstat ends */ if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0,

1 0

André Hentschel : ntdll: Get available CPU info from FreeBSD on ARM.
by Alexandre Julliard 27 Mar '15

27 Mar '15

Module: wine Branch: master Commit: 472340052ada5a65e5dbeff73444dfa2494d892c URL: http://source.winehq.org/git/wine.git/?a=commit;h=472340052ada5a65e5dbeff73… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 26 23:17:53 2015 +0100 ntdll: Get available CPU info from FreeBSD on ARM. --- dlls/ntdll/nt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a0de705..3601c0f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1123,6 +1123,19 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) } fclose(f); } +#elif defined(__FreeBSD__) + size_t valsize; + char buf[8]; + int value; + + valsize = sizeof(buf); + if (!sysctlbyname("hw.machine_arch", &buf, &valsize, NULL, 0) && + sscanf(buf, "armv%i", &value) == 1) + info->Level = value; + + valsize = sizeof(value); + if (!sysctlbyname("hw.floatingpoint", &value, &valsize, NULL, 0)) + user_shared_data->ProcessorFeatures[PF_ARM_VFP_32_REGISTERS_AVAILABLE] = value; #else FIXME("CPU Feature detection not implemented.\n"); #endif

1 0

André Hentschel : ntdll: Fix CPU level on ARM.
by Alexandre Julliard 27 Mar '15

27 Mar '15

Module: wine Branch: master Commit: 2b5deddc05c0483e400e286e496268ca589b3a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5deddc05c0483e400e286e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 26 23:17:14 2015 +0100 ntdll: Fix CPU level on ARM. --- dlls/ntdll/nt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 73d9383..a0de705 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1100,10 +1100,10 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) while (isspace(*value)) value++; if ((s = strchr(value,'\n'))) *s='\0'; - if (!strcasecmp(line, "CPU part")) + if (!strcasecmp(line, "CPU architecture")) { if (isdigit(value[0])) - info->Level = strtol(value, NULL, 16); + info->Level = atoi(value); continue; } if (!strcasecmp(line, "CPU revision"))

1 0

André Hentschel : ntdll: Add support for FreeBSD on ARM.
by Alexandre Julliard 27 Mar '15

27 Mar '15

Module: wine Branch: master Commit: a29ca210e636ba623e0eac372049b293c8d925a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29ca210e636ba623e0eac372… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 26 23:16:49 2015 +0100 ntdll: Add support for FreeBSD on ARM. --- dlls/ntdll/signal_arm.c | 59 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 53a2663..bdb27af 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -2,7 +2,7 @@ * ARM signal handling routines * * Copyright 2002 Marcus Meissner, SuSE Linux AG - * Copyright 2010, 2011 André Hentschel + * Copyright 2010-2013, 2015 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -96,9 +96,21 @@ typedef struct ucontext /* Exceptions */ # define ERROR_sig(context) REG_sig(error_code, context) -# define FAULT_sig(context) REG_sig(fault_address, context) # define TRAP_sig(context) REG_sig(trap_no, context) +#elif defined(__FreeBSD__) + +/* All Registers access - only for local access */ +# define REGn_sig(reg_num, context) ((context)->uc_mcontext.__gregs[reg_num]) + +/* Special Registers access */ +# define SP_sig(context) REGn_sig(_REG_SP, context) /* Stack pointer */ +# define LR_sig(context) REGn_sig(_REG_LR, context) /* Link register */ +# define PC_sig(context) REGn_sig(_REG_PC, context) /* Program counter */ +# define CPSR_sig(context) REGn_sig(_REG_CPSR, context) /* Current State Register */ +# define IP_sig(context) REGn_sig(_REG_R12, context) /* Intra-Procedure-call scratch register */ +# define FP_sig(context) REGn_sig(_REG_FP, context) /* Frame pointer */ + #endif /* linux */ enum arm_trap_code @@ -123,6 +135,35 @@ struct UNWIND_INFO WORD unknown2 : 4; }; + +/*********************************************************************** + * get_trap_code + * + * Get the trap code for a signal. + */ +static inline enum arm_trap_code get_trap_code( const ucontext_t *sigcontext ) +{ +#ifdef TRAP_sig + return TRAP_sig(sigcontext); +#else + return TRAP_ARM_UNKNOWN; /* unknown trap code */ +#endif +} + +/*********************************************************************** + * get_error_code + * + * Get the error code for a signal. + */ +static inline WORD get_error_code( const ucontext_t *sigcontext ) +{ +#ifdef ERROR_sig + return ERROR_sig(sigcontext); +#else + return 0; +#endif +} + /*********************************************************************** * dispatch_signal */ @@ -587,7 +628,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) ucontext_t *context = ucontext; /* check for page fault inside the thread stack */ - if (TRAP_sig(context) == TRAP_ARM_PAGEFLT && + if (get_trap_code(context) == TRAP_ARM_PAGEFLT && (char *)info->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && (char *)info->si_addr < (char *)NtCurrentTeb()->Tib.StackBase && virtual_handle_stack_fault( info->si_addr )) @@ -604,7 +645,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec = setup_exception( context, raise_segv_exception ); if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; - switch(TRAP_sig(context)) + switch(get_trap_code(context)) { case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; @@ -612,14 +653,20 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case TRAP_ARM_PAGEFLT: /* Page fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; - rec->ExceptionInformation[0] = (ERROR_sig(context) & 0x800) != 0; + rec->ExceptionInformation[0] = (get_error_code(context) & 0x800) != 0; rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; break; case TRAP_ARM_ALIGNFLT: /* Alignment check exception */ rec->ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; break; + case TRAP_ARM_UNKNOWN: /* Unknown fault code */ + rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + rec->NumberParameters = 2; + rec->ExceptionInformation[0] = 0; + rec->ExceptionInformation[1] = 0xffffffff; + break; default: - ERR("Got unexpected trap %ld\n", TRAP_sig(context)); + ERR("Got unexpected trap %d\n", get_trap_code(context)); rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; }

1 0

Piotr Caban : advapi32: Add DACL inheritance support in SetSecurityInfo.
by Alexandre Julliard 27 Mar '15

27 Mar '15

Module: wine Branch: master Commit: f974d726720eff4fcd7371bca95e6cdcc4b4a848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f974d726720eff4fcd7371bca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 27 11:12:04 2015 +0100 advapi32: Add DACL inheritance support in SetSecurityInfo. --- dlls/advapi32/security.c | 130 ++++++++++++++++++++++++++++++++++++++++- dlls/advapi32/tests/security.c | 23 ++++---- 2 files changed, 139 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e8cdcc5..71a8c92 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4052,6 +4052,8 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, } break; case SE_FILE_OBJECT: + if (SecurityInfo & DACL_SECURITY_INFORMATION) + access |= READ_CONTROL; if (!(err = get_security_file( pObjectName, access, &handle ))) { err = SetSecurityInfo( handle, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl ); @@ -5729,6 +5731,7 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, PSID psidGroup, PACL pDacl, PACL pSacl) { SECURITY_DESCRIPTOR sd; + PACL dacl = pDacl; NTSTATUS status; if (!InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION)) @@ -5739,7 +5742,130 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, if (SecurityInfo & GROUP_SECURITY_INFORMATION) SetSecurityDescriptorGroup(&sd, psidGroup, FALSE); if (SecurityInfo & DACL_SECURITY_INFORMATION) - SetSecurityDescriptorDacl(&sd, TRUE, pDacl, FALSE); + { + if (ObjectType == SE_FILE_OBJECT) + { + SECURITY_DESCRIPTOR_CONTROL control; + PSECURITY_DESCRIPTOR psd; + OBJECT_NAME_INFORMATION *name_info; + DWORD size, rev; + + status = NtQuerySecurityObject(handle, SecurityInfo, NULL, 0, &size); + if (status != STATUS_BUFFER_TOO_SMALL) + return RtlNtStatusToDosError(status); + + psd = heap_alloc(size); + if (!psd) + return ERROR_NOT_ENOUGH_MEMORY; + + status = NtQuerySecurityObject(handle, SecurityInfo, psd, size, &size); + if (status) + { + heap_free(psd); + return RtlNtStatusToDosError(status); + } + + status = RtlGetControlSecurityDescriptor(psd, &control, &rev); + heap_free(psd); + if (status) + return RtlNtStatusToDosError(status); + /* TODO: copy some control flags to new sd */ + + /* inherit parent directory DACL */ + if (!(control & SE_DACL_PROTECTED)) + { + status = NtQueryObject(handle, ObjectNameInformation, NULL, 0, &size); + if (status != STATUS_INFO_LENGTH_MISMATCH) + return RtlNtStatusToDosError(status); + + name_info = heap_alloc(size); + if (!name_info) + return ERROR_NOT_ENOUGH_MEMORY; + + status = NtQueryObject(handle, ObjectNameInformation, name_info, size, NULL); + if (status) + { + heap_free(name_info); + return RtlNtStatusToDosError(status); + } + + for (name_info->Name.Length-=2; name_info->Name.Length>0; name_info->Name.Length-=2) + if (name_info->Name.Buffer[name_info->Name.Length/2-1]=='\\' || + name_info->Name.Buffer[name_info->Name.Length/2-1]=='/') + break; + if (name_info->Name.Length) + { + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + HANDLE parent; + PSECURITY_DESCRIPTOR parent_sd; + ACL *parent_dacl; + DWORD err = ERROR_ACCESS_DENIED; + + name_info->Name.Buffer[name_info->Name.Length/2] = 0; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = 0; + attr.ObjectName = &name_info->Name; + attr.SecurityDescriptor = NULL; + status = NtOpenFile(&parent, READ_CONTROL, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, + FILE_OPEN_FOR_BACKUP_INTENT); + heap_free(name_info); + if (!status) + { + err = GetSecurityInfo(parent, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &parent_dacl, NULL, &parent_sd); + CloseHandle(parent); + } + + if (!err) + { + int i; + + dacl = heap_alloc_zero(pDacl->AclSize+parent_dacl->AclSize); + if (!dacl) + { + LocalFree(parent_sd); + return ERROR_NOT_ENOUGH_MEMORY; + } + memcpy(dacl, pDacl, pDacl->AclSize); + dacl->AclSize = pDacl->AclSize+parent_dacl->AclSize; + + for (i=0; i<parent_dacl->AceCount; i++) + { + ACE_HEADER *ace; + + if (!GetAce(parent_dacl, i, (void*)&ace)) + continue; + if (!(ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE))) + continue; + if ((ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) != + (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) + { + FIXME("unsupported flags: %x\n", ace->AceFlags); + continue; + } + + if (ace->AceFlags & NO_PROPAGATE_INHERIT_ACE) + ace->AceFlags &= ~(OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE|NO_PROPAGATE_INHERIT_ACE); + ace->AceFlags &= ~INHERIT_ONLY_ACE; + ace->AceFlags |= INHERITED_ACE; + + if(!AddAce(dacl, ACL_REVISION, MAXDWORD, ace, ace->AceSize)) + WARN("error adding inherited ACE\n"); + } + LocalFree(parent_sd); + } + } + else + heap_free(name_info); + } + } + + SetSecurityDescriptorDacl(&sd, TRUE, dacl, FALSE); + } if (SecurityInfo & SACL_SECURITY_INFORMATION) SetSecurityDescriptorSacl(&sd, TRUE, pSacl, FALSE); @@ -5753,6 +5879,8 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, status = NtSetSecurityObject(handle, SecurityInfo, &sd); break; } + if (dacl != pDacl) + heap_free(dacl); return RtlNtStatusToDosError(status); } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6d3f9ac..15c3b1d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3417,25 +3417,22 @@ static void test_GetNamedSecurityInfoA(void) error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL, &pDacl, NULL, &pSD); - todo_wine ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); - if (!error) + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + if (acl_size.AceCount > 0) { - bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); - ok(bret, "GetAclInformation failed\n"); - if (acl_size.AceCount > 0) - { - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Failed to get ACE.\n"); - ok(((ACE_HEADER *)ace)->AceFlags & INHERITED_ACE, - "ACE has unexpected flags: 0x%x\n", ((ACE_HEADER *)ace)->AceFlags); - } - LocalFree(pSD); + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get ACE.\n"); + todo_wine ok(((ACE_HEADER *)ace)->AceFlags & INHERITED_ACE, + "ACE has unexpected flags: 0x%x\n", ((ACE_HEADER *)ace)->AceFlags); } + LocalFree(pSD); h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - todo_wine ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); CloseHandle(h); /* NtSetSecurityObject doesn't inherit DACL entries */

1 0

Piotr Caban : advapi32/tests: Add test for mapping DACL to permission.
by Alexandre Julliard 27 Mar '15

27 Mar '15

Module: wine Branch: master Commit: a4b12eb9f937202848b229ed15f2c7d1823b41da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b12eb9f937202848b229ed1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 27 11:11:54 2015 +0100 advapi32/tests: Add test for mapping DACL to permission. This test shows that first DACL entry that allows or denies access should be used. The logic inside server for translating DACL to permission is not matching it (always scans all DACL entries, deny entries have bigger priority). --- dlls/advapi32/tests/security.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index dbe52b0..6d3f9ac 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3405,7 +3405,6 @@ static void test_GetNamedSecurityInfoA(void) "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } LocalFree(pSD); - HeapFree(GetProcessHeap(), 0, user); /* show that setting empty DACL is not removing all file permissions */ pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); @@ -3442,7 +3441,7 @@ static void test_GetNamedSecurityInfoA(void) /* NtSetSecurityObject doesn't inherit DACL entries */ pSD = sd+sizeof(void*)-((ULONG_PTR)sd)%sizeof(void*); InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); - pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + pDacl = HeapAlloc(GetProcessHeap(), 0, 100); bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); @@ -3473,7 +3472,39 @@ static void test_GetNamedSecurityInfoA(void) NULL, OPEN_EXISTING, 0, NULL); ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); CloseHandle(h); + + /* test if DACL is properly mapped to permission */ + bret = InitializeAcl(pDacl, 100, ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessDeniedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); + ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + todo_wine ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + bret = InitializeAcl(pDacl, 100, ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessDeniedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); + ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, pDacl); + HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); /* Test querying the ownership of a built-in registry key */

1 0

Piotr Caban : advapi32: Add SetNamedSecurityInfo test with empty DACL.
by Alexandre Julliard 27 Mar '15

27 Mar '15

Module: wine Branch: master Commit: 02c4f5bd275d70d1dcb48bf95775efa376b50c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c4f5bd275d70d1dcb48bf95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 27 11:11:48 2015 +0100 advapi32: Add SetNamedSecurityInfo test with empty DACL. --- dlls/advapi32/tests/security.c | 79 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e3c1659..dbe52b0 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -147,6 +147,7 @@ static BOOL (WINAPI *pCreateRestrictedToken)(HANDLE, DWORD, DWORD, PSID_AND_ATTR PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE); static BOOL (WINAPI *pGetAclInformation)(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); static BOOL (WINAPI *pGetAce)(PACL,DWORD,LPVOID*); +static NTSTATUS (WINAPI *pNtSetSecurityObject)(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); static HMODULE hmod; static int myARGC; @@ -173,6 +174,7 @@ static void init(void) hntdll = GetModuleHandleA("ntdll.dll"); pNtQueryObject = (void *)GetProcAddress( hntdll, "NtQueryObject" ); pNtAccessCheck = (void *)GetProcAddress( hntdll, "NtAccessCheck" ); + pNtSetSecurityObject = (void *)GetProcAddress(hntdll, "NtSetSecurityObject"); hmod = GetModuleHandleA("advapi32.dll"); pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx"); @@ -3229,7 +3231,7 @@ static void test_GetNamedSecurityInfoA(void) char invalid_path[] = "/an invalid file path"; int users_ace_id = -1, admins_ace_id = -1, i; char software_key[] = "MACHINE\\Software"; - char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + char sd[SECURITY_DESCRIPTOR_MIN_LENGTH+sizeof(void*)]; SECURITY_DESCRIPTOR_CONTROL control; ACL_SIZE_INFORMATION acl_size; CHAR windows_dir[MAX_PATH]; @@ -3241,11 +3243,12 @@ static void test_GetNamedSecurityInfoA(void) BOOL owner_defaulted; BOOL group_defaulted; BOOL dacl_defaulted; - HANDLE token, hTemp; + HANDLE token, hTemp, h; PSID owner, group; BOOL dacl_present; PACL pDacl; BYTE flags; + NTSTATUS status; if (!pSetNamedSecurityInfoA || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) { @@ -3350,8 +3353,8 @@ static void test_GetNamedSecurityInfoA(void) bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); ok(bret, "Failed to add ACL to security desciptor.\n"); GetTempFileNameA(".", "foo", 0, tmpfile); - hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, - FILE_FLAG_DELETE_ON_CLOSE, NULL); + hTemp = CreateFileA(tmpfile, WRITE_DAC|GENERIC_WRITE, FILE_SHARE_DELETE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); SetLastError(0xdeadbeef); error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL, pDacl, NULL); @@ -3403,6 +3406,74 @@ static void test_GetNamedSecurityInfoA(void) } LocalFree(pSD); HeapFree(GetProcessHeap(), 0, user); + + /* show that setting empty DACL is not removing all file permissions */ + pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, pDacl, NULL); + ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error); + HeapFree(GetProcessHeap(), 0, pDacl); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, &pSD); + todo_wine ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + if (!error) + { + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get ACE.\n"); + ok(((ACE_HEADER *)ace)->AceFlags & INHERITED_ACE, + "ACE has unexpected flags: 0x%x\n", ((ACE_HEADER *)ace)->AceFlags); + } + LocalFree(pSD); + } + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + todo_wine ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + + /* NtSetSecurityObject doesn't inherit DACL entries */ + pSD = sd+sizeof(void*)-((ULONG_PTR)sd)%sizeof(void*); + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); + ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + + pSetSecurityDescriptorControl(pSD, SE_DACL_AUTO_INHERIT_REQ, SE_DACL_AUTO_INHERIT_REQ); + status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); + ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + + pSetSecurityDescriptorControl(pSD, SE_DACL_AUTO_INHERIT_REQ|SE_DACL_AUTO_INHERITED, + SE_DACL_AUTO_INHERIT_REQ|SE_DACL_AUTO_INHERITED); + status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); + ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + HeapFree(GetProcessHeap(), 0, pDacl); CloseHandle(hTemp); /* Test querying the ownership of a built-in registry key */

1 0

Piotr Caban : server: Make directory DACL entries inheritable.
by Alexandre Julliard 27 Mar '15

27 Mar '15

Module: wine Branch: master Commit: 3eb448cf33b6b6635bac4e06ea7fddd190e26450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb448cf33b6b6635bac4e06e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 27 11:11:40 2015 +0100 server: Make directory DACL entries inheritable. --- dlls/advapi32/tests/security.c | 12 ++++++------ server/file.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 04a88ae..e3c1659 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3192,9 +3192,9 @@ static void test_CreateDirectoryA(void) ok(bret, "Failed to get Current User ACE.\n"); bret = EqualSid(&ace->SidStart, user_sid); todo_wine ok(bret, "Current User ACE != Current User SID.\n"); - todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Current User ACE has unexpected flags (0x%x != 0x03)\n", - ((ACE_HEADER *)ace)->AceFlags); + ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), + "Current User ACE has unexpected flags (0x%x != 0x03)\n", + ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } @@ -3204,9 +3204,9 @@ static void test_CreateDirectoryA(void) ok(bret, "Failed to get Administators Group ACE.\n"); bret = EqualSid(&ace->SidStart, admin_sid); todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); - todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", - ((ACE_HEADER *)ace)->AceFlags); + ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), + "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", + ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } diff --git a/server/file.c b/server/file.c index abda2c3..f565f5a 100644 --- a/server/file.c +++ b/server/file.c @@ -367,7 +367,7 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1); current_ace = &aaa->Header; aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; - aaa->Header.AceFlags = 0; + aaa->Header.AceFlags = (mode & S_IFDIR) ? OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE : 0; aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + security_sid_len( local_system_sid ); aaa->Mask = FILE_ALL_ACCESS; sid = (SID *)&aaa->SidStart; @@ -379,7 +379,7 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID aaa = (ACCESS_ALLOWED_ACE *)ace_next( current_ace ); current_ace = &aaa->Header; aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; - aaa->Header.AceFlags = 0; + aaa->Header.AceFlags = (mode & S_IFDIR) ? OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE : 0; aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + security_sid_len( user ); aaa->Mask = WRITE_DAC | WRITE_OWNER; if (mode & S_IRUSR) @@ -397,7 +397,7 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID ACCESS_DENIED_ACE *ada = (ACCESS_DENIED_ACE *)ace_next( current_ace ); current_ace = &ada->Header; ada->Header.AceType = ACCESS_DENIED_ACE_TYPE; - ada->Header.AceFlags = 0; + ada->Header.AceFlags = (mode & S_IFDIR) ? OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE : 0; ada->Header.AceSize = FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + security_sid_len( user ); ada->Mask = 0; if (!(mode & S_IRUSR) && (mode & (S_IRGRP|S_IROTH))) @@ -414,7 +414,7 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID aaa = (ACCESS_ALLOWED_ACE *)ace_next( current_ace ); current_ace = &aaa->Header; aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; - aaa->Header.AceFlags = 0; + aaa->Header.AceFlags = (mode & S_IFDIR) ? OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE : 0; aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + security_sid_len( world_sid ); aaa->Mask = 0; if (mode & S_IROTH)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015