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

Sebastian Lackner : shell32: Return NULL-terminated list of arguments in CommandLineToArgvW.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: d892239f5ab913b1418bff63652c09528bac936e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d892239f5ab913b1418bff636… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 7 22:43:01 2014 +0200 shell32: Return NULL-terminated list of arguments in CommandLineToArgvW. --- dlls/shell32/shell32_main.c | 15 +++++++++------ dlls/shell32/tests/shlexec.c | 4 ++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 679ebec..3bf442e 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -101,11 +101,11 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) /* Return the path to the executable */ DWORD len, deslen=MAX_PATH, size; - size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); + size = sizeof(LPWSTR)*2 + deslen*sizeof(WCHAR); for (;;) { if (!(argv = LocalAlloc(LMEM_FIXED, size))) return NULL; - len = GetModuleFileNameW(0, (LPWSTR)(argv+1), deslen); + len = GetModuleFileNameW(0, (LPWSTR)(argv+2), deslen); if (!len) { LocalFree(argv); @@ -113,10 +113,11 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) } if (len < deslen) break; deslen*=2; - size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); + size = sizeof(LPWSTR)*2 + deslen*sizeof(WCHAR); LocalFree( argv ); } - argv[0]=(LPWSTR)(argv+1); + argv[0]=(LPWSTR)(argv+2); + argv[1]=NULL; *numargs=1; return argv; @@ -194,10 +195,10 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) * with it. This way the caller can make a single LocalFree() call to free * both, as per MSDN. */ - argv=LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR)); + argv=LocalAlloc(LMEM_FIXED, (argc+1)*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR)); if (!argv) return NULL; - cmdline=(LPWSTR)(argv+argc); + cmdline=(LPWSTR)(argv+argc+1); strcpyW(cmdline, lpCmdline); /* --- Then split and copy the arguments */ @@ -235,6 +236,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) if (!*s) { /* There are no parameters so we are all done */ + argv[argc]=NULL; *numargs=argc; return argv; } @@ -306,6 +308,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) } } *d='\0'; + argv[argc]=NULL; *numargs=argc; return argv; diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 7f07c70..f81794e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1159,6 +1159,8 @@ static BOOL test_one_cmdline(const cmdline_tests_t* test) win_skip("CommandLineToArgvW not implemented, skipping\n"); return FALSE; } + ok(!argsW[cl2a_count] || broken(argsW[cl2a_count] != NULL) /* before Vista */, + "expected NULL-terminated list of commandline arguments\n"); count = 0; while (test->args[count]) @@ -1218,6 +1220,8 @@ static void test_commandline2argv(void) *strW = 0; args = CommandLineToArgvW(strW, &numargs); ok(numargs == 1, "expected 1 args, got %d\n", numargs); + ok(!args || (!args[numargs] || broken(args[numargs] != NULL) /* before Vista */), + "expected NULL-terminated list of commandline arguments\n"); if (numargs == 1) { GetModuleFileNameW(NULL, strW, sizeof(strW)/sizeof(*strW));

1 0

Joris van der Wel : server: Setting a security descriptor should not replace an existing owner or group with a default , if only a DACL is being set.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: 0a4c7860f82074f7c81d6378075e63848b00b98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4c7860f82074f7c81d63780… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Mon Jul 7 22:12:52 2014 +0200 server: Setting a security descriptor should not replace an existing owner or group with a default, if only a DACL is being set. --- dlls/advapi32/tests/security.c | 60 ++++++++++++++++++++++++++++++++++++++++++ server/object.c | 22 +++++++++++++--- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f3ccc8e..b1dc3fe 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -234,6 +234,42 @@ static SECURITY_DESCRIPTOR* test_get_security_descriptor(HANDLE handle, int line return sd; } +static void test_owner_equal(HANDLE Handle, PSID expected, int line) +{ + BOOL res; + SECURITY_DESCRIPTOR *queriedSD = NULL; + PSID owner; + BOOL owner_defaulted; + + queriedSD = test_get_security_descriptor( Handle, line ); + + res = GetSecurityDescriptorOwner(queriedSD, &owner, &owner_defaulted); + ok_(__FILE__, line)(res, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + + ok_(__FILE__, line)(EqualSid(owner, expected), "Owner SIDs are not equal\n"); + ok_(__FILE__, line)(!owner_defaulted, "Defaulted is true\n"); + + HeapFree(GetProcessHeap(), 0, queriedSD); +} + +static void test_group_equal(HANDLE Handle, PSID expected, int line) +{ + BOOL res; + SECURITY_DESCRIPTOR *queriedSD = NULL; + PSID group; + BOOL group_defaulted; + + queriedSD = test_get_security_descriptor( Handle, line ); + + res = GetSecurityDescriptorGroup(queriedSD, &group, &group_defaulted); + ok_(__FILE__, line)(res, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + + ok_(__FILE__, line)(EqualSid(group, expected), "Group SIDs are not equal\n"); + ok_(__FILE__, line)(!group_defaulted, "Defaulted is true\n"); + + HeapFree(GetProcessHeap(), 0, queriedSD); +} + static void test_sid(void) { struct sidRef refs[] = { @@ -2504,6 +2540,8 @@ static void test_process_security(void) SECURITY_ATTRIBUTES psa; HANDLE token, event; DWORD size; + SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; + PSID EveryoneSid = NULL; Acl = HeapAlloc(GetProcessHeap(), 0, 256); res = InitializeAcl(Acl, 256, ACL_REVISION); @@ -2515,6 +2553,9 @@ static void test_process_security(void) } ok(res, "InitializeAcl failed with error %d\n", GetLastError()); + res = AllocateAndInitializeSid( &SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &EveryoneSid); + ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + /* get owner from the token we might be running as a user not admin */ res = OpenProcessToken( GetCurrentProcess(), MAXIMUM_ALLOWED, &token ); ok(res, "OpenProcessToken failed with error %d\n", GetLastError()); @@ -2581,12 +2622,31 @@ static void test_process_security(void) res = SetSecurityDescriptorOwner(SecurityDescriptor, AdminSid, FALSE); ok(res, "SetSecurityDescriptorOwner failed with error %d\n", GetLastError()); CHECK_SET_SECURITY( event, OWNER_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_owner_equal( event, AdminSid, __LINE__ ); + + res = SetSecurityDescriptorGroup(SecurityDescriptor, EveryoneSid, FALSE); + ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + CHECK_SET_SECURITY( event, GROUP_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_group_equal( event, EveryoneSid, __LINE__ ); + + res = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); + ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); + /* setting a dacl should not change the owner or group */ + test_owner_equal( event, AdminSid, __LINE__ ); + test_group_equal( event, EveryoneSid, __LINE__ ); + + /* Test again with a different SID in case the previous SID also happens to + * be the one that is incorrectly replacing the group. */ res = SetSecurityDescriptorGroup(SecurityDescriptor, UsersSid, FALSE); ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); CHECK_SET_SECURITY( event, GROUP_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_group_equal( event, UsersSid, __LINE__ ); + res = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_group_equal( event, UsersSid, __LINE__ ); sprintf(buffer, "%s tests/security.c test", myARGV[0]); memset(&startup, 0, sizeof(startup)); diff --git a/server/object.c b/server/object.c index 021c741..11ef0ce 100644 --- a/server/object.c +++ b/server/object.c @@ -436,18 +436,32 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, new_sd.control = sd->control & ~SE_SELF_RELATIVE; - owner = sd_get_owner( sd ); - if (set_info & OWNER_SECURITY_INFORMATION && owner) + if (set_info & OWNER_SECURITY_INFORMATION && sd->owner_len) + { + owner = sd_get_owner( sd ); new_sd.owner_len = sd->owner_len; + } + else if (obj->sd && obj->sd->owner_len) + { + owner = sd_get_owner( obj->sd ); + new_sd.owner_len = obj->sd->owner_len; + } else { owner = token_get_user( current->process->token ); new_sd.owner_len = security_sid_len( owner ); } - group = sd_get_group( sd ); - if (set_info & GROUP_SECURITY_INFORMATION && group) + if (set_info & GROUP_SECURITY_INFORMATION && sd->group_len) + { + group = sd_get_group( sd ); new_sd.group_len = sd->group_len; + } + else if (obj->sd && obj->sd->group_len) + { + group = sd_get_group( obj->sd ); + new_sd.group_len = obj->sd->group_len; + } else { group = token_get_primary_group( current->process->token );

1 0

Huw Davies : comctl32: Don' t use the RECT from the custom draw structure when referring to the button alone.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: d130ba09fa3912e9dcd262950d89a743a5daa398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d130ba09fa3912e9dcd262950… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 8 13:53:50 2014 +0100 comctl32: Don't use the RECT from the custom draw structure when referring to the button alone. --- dlls/comctl32/toolbar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index e716bab..c90c4bb 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -748,10 +748,10 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, INT left, I /* draws a blank frame for a toolbar button */ static void -TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, const NMTBCUSTOMDRAW *tbcd, DWORD dwItemCDFlag) +TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, const NMTBCUSTOMDRAW *tbcd, const RECT *rect, DWORD dwItemCDFlag) { HDC hdc = tbcd->nmcd.hdc; - RECT rc = tbcd->nmcd.rc; + RECT rc = *rect; /* if the state is disabled or indeterminate then the button * cannot have an interactive look like pressed or hot */ BOOL non_interactive_state = (tbcd->nmcd.uItemState & CDIS_DISABLED) || @@ -1021,10 +1021,10 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) stateId = TS_HOT; - DrawThemeBackground (theme, hdc, partId, stateId, &tbcd.nmcd.rc, NULL); + DrawThemeBackground (theme, hdc, partId, stateId, &rc, NULL); } else - TOOLBAR_DrawFrame(infoPtr, &tbcd, dwItemCDFlag); + TOOLBAR_DrawFrame(infoPtr, &tbcd, &rc, dwItemCDFlag); if (drawSepDropDownArrow) {

1 0

Austin English : rpcrt4: Add a stub for RpcSsDontSerializeContext.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: b4e006720aee0448a22ea0bdbd5fd9c2d5fcb70b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e006720aee0448a22ea0bdb… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 7 19:54:21 2014 -0700 rpcrt4: Add a stub for RpcSsDontSerializeContext. --- dlls/rpcrt4/ndr_contexthandle.c | 8 ++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index cab0fc5..43e0ce7 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -157,6 +157,14 @@ void WINAPI RpcSsDestroyClientContext(void **ContextHandle) RpcRaiseException(status); } +/*********************************************************************** + * RpcSsDontSerializeContext [RPCRT4.@] + */ + void WINAPI RpcSsDontSerializeContext(void) +{ + FIXME("stub\n"); +} + static UINT ndr_update_context_handle(NDR_CCONTEXT *CContext, RPC_BINDING_HANDLE hBinding, const ndr_context_handle *chi) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 33c1af5..00fe7c4 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -471,7 +471,7 @@ @ stub RpcSsContextLockShared # wxp @ stdcall RpcSsDestroyClientContext(ptr) @ stub RpcSsDisableAllocate -@ stub RpcSsDontSerializeContext +@ stdcall RpcSsDontSerializeContext() @ stub RpcSsEnableAllocate @ stub RpcSsFree @ stub RpcSsGetContextBinding

1 0

Aric Stewart : tools: Generate the Unicode Bidi Bracketing table.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: 2a12c6a7d49c1bc0539065430a92465a259a1165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a12c6a7d49c1bc0539065430… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 30 09:01:33 2014 -0500 tools: Generate the Unicode Bidi Bracketing table. --- dlls/usp10/Makefile.in | 1 + dlls/usp10/bracket.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 44 ++++++++++++++++++++ 3 files changed, 151 insertions(+) diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 1b8238a..21541f1 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = advapi32 user32 gdi32 C_SRCS = \ bidi.c \ + bracket.c \ breaking.c \ indic.c \ indicsyllable.c \ diff --git a/dlls/usp10/bracket.c b/dlls/usp10/bracket.c new file mode 100644 index 0000000..20df6fa --- /dev/null +++ b/dlls/usp10/bracket.c @@ -0,0 +1,106 @@ +/* Unicode Bidirectional Bracket table */ +/* generated from http://www.unicode.org/Public/7.0.0/ucd/BidiBrackets.txt */ +/* DO NOT EDIT!! */ + +const unsigned short bidi_bracket_table[768] = +{ + /* level 1 offsets */ + 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0120, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0130, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0140, 0x0110, 0x0110, 0x0150, 0x0110, 0x0110, 0x0110, 0x0160, + 0x0110, 0x0170, 0x0110, 0x0110, 0x0110, 0x0110, 0x0180, 0x0110, + 0x0190, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x01a0, 0x01b0, + /* level 2 offsets */ + 0x01c0, 0x01c0, 0x01d0, 0x01c0, 0x01c0, 0x01e0, 0x01c0, 0x01e0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01f0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x0200, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x0210, 0x01c0, 0x01c0, 0x0220, + 0x0220, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x0230, 0x01c0, 0x0240, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x0250, 0x0260, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x0210, 0x01c0, 0x0270, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x0280, 0x0290, 0x01c0, 0x01c0, 0x01c0, 0x0230, 0x01c0, 0x02a0, + 0x01c0, 0x01c0, 0x02b0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x0250, 0x02c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x02d0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01d0, 0x01c0, 0x01c0, 0x01e0, 0x01c0, 0x02e0, 0x02f0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + /* values */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0002, 0x0000, 0x01fd, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, + 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, + 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, + 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, + 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0003, 0x0101, 0x00fe, + 0x01fc, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, + 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, + 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x01fe, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0001, 0x01fe, + 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0002, 0x0000, 0x01fd, 0x0000, 0x0001, + 0x01fe, 0x0000, 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +}; diff --git a/tools/make_unicode b/tools/make_unicode index e0f92b5..be81ec7 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -131,6 +131,12 @@ my %ctype = "defin" => 0x0200 ); +my %bracket_types = +( + "o" => 0x0000, + "c" => 0x0001, +); + my %indic_types = ( "Other" => 0x0000, @@ -1322,6 +1328,43 @@ sub dump_mirroring($) save_file($filename); } +################################################################ +# dump the Bidi Brackets +sub dump_bracket($) +{ + my $filename = shift; + my @bracket_table = (0) x 65536;; + + my $INPUT = open_data_file( $UNIDATA, "BidiBrackets.txt" ); + while (<$INPUT>) + { + next if /^\#/; # skip comments + next if /^\s*$/; # skip empty lines + next if /\x1a/; # skip ^Z + if (/^\s*([0-9a-fA-F]+)\s*;\s*([0-9a-fA-F]+);\s*([con])/) + { + my $type = $3; + die "unknown bracket $type" unless defined $bracket_types{$type}; + die "characters too distant $1 and $2" if abs(hex($2) - hex($1)) >= 256; + $bracket_table[hex $1] = (hex($2) - hex($1)) % 255; + $bracket_table[hex $1] += $bracket_types{$type} << 8; + next; + } + die "malformed line $_"; + } + close $INPUT; + + open OUTPUT,">$filename.new" or die "Cannot create $filename"; + print "Building $filename\n"; + print OUTPUT "/* Unicode Bidirectional Bracket table */\n"; + print OUTPUT "/* generated from $UNIDATA/BidiBrackets.txt */\n"; + print OUTPUT "/* DO NOT EDIT!! */\n\n"; + + dump_two_level_mapping( "bidi_bracket_table", @bracket_table); + + close OUTPUT; + save_file($filename); +} ################################################################ # dump the Arabic shaping table @@ -2228,6 +2271,7 @@ DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); DUMP_COMPOSE_TABLES( "libs/wine/compose.c" ); DUMP_CTYPE_TABLES( "libs/wine/wctype.c" ); dump_mirroring( "dlls/usp10/mirror.c" ); +dump_bracket( "dlls/usp10/bracket.c" ); dump_shaping( "dlls/usp10/shaping.c" ); dump_linebreak( "dlls/usp10/linebreak.c" ); dump_indic( "dlls/usp10/indicsyllable.c" );

1 0

Alexandre Julliard : tools: Don't include wine/unicode.h if not necessary.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: 18d410dec1b3fe4b74d448a200194987790c816c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d410dec1b3fe4b74d448a20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 8 16:59:36 2014 +0200 tools: Don't include wine/unicode.h if not necessary. --- dlls/gdi32/vertical.c | 2 -- dlls/kernel32/nameprep.c | 4 +--- dlls/usp10/indicsyllable.c | 2 -- dlls/usp10/linebreak.c | 2 -- dlls/usp10/shaping.c | 2 -- dlls/wineps.drv/vertical.c | 2 -- tools/make_unicode | 7 +------ 7 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/vertical.c b/dlls/gdi32/vertical.c index 9430e2c..67f0d0a 100644 --- a/dlls/gdi32/vertical.c +++ b/dlls/gdi32/vertical.c @@ -2,8 +2,6 @@ /* generated from http://www.unicode.org/Public/vertical/revision-11/VerticalOrientation-11.t… */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short vertical_orientation_table[1536] = { /* level 1 offsets */ diff --git a/dlls/kernel32/nameprep.c b/dlls/kernel32/nameprep.c index a293dac..cb6eb61 100644 --- a/dlls/kernel32/nameprep.c +++ b/dlls/kernel32/nameprep.c @@ -2,8 +2,6 @@ /* generated from http://www.rfc-editor.org/rfc/rfc3454.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short nameprep_char_type[4432] = { /* level 1 offsets */ @@ -564,7 +562,7 @@ const unsigned short nameprep_char_type[4432] = 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002 }; -const WCHAR nameprep_mapping[5856] = +const unsigned short nameprep_mapping[5856] = { /* index */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0100, 0x0100, diff --git a/dlls/usp10/indicsyllable.c b/dlls/usp10/indicsyllable.c index 91ab8ed..821a10f 100644 --- a/dlls/usp10/indicsyllable.c +++ b/dlls/usp10/indicsyllable.c @@ -3,8 +3,6 @@ /* and from http://www.unicode.org/Public/7.0.0/ucd/IndicMatraCategory.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short indic_syllabic_table[2864] = { /* level 1 offsets */ diff --git a/dlls/usp10/linebreak.c b/dlls/usp10/linebreak.c index 89655f3..a0452c9 100644 --- a/dlls/usp10/linebreak.c +++ b/dlls/usp10/linebreak.c @@ -2,8 +2,6 @@ /* generated from http://www.unicode.org/Public/7.0.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short wine_linebreak_table[7232] = { /* level 1 offsets */ diff --git a/dlls/usp10/shaping.c b/dlls/usp10/shaping.c index fdbed9f..12b290c 100644 --- a/dlls/usp10/shaping.c +++ b/dlls/usp10/shaping.c @@ -2,8 +2,6 @@ /* generated from http://www.unicode.org/Public/7.0.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short wine_shaping_table[2864] = { /* level 1 offsets */ diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c index 9430e2c..67f0d0a 100644 --- a/dlls/wineps.drv/vertical.c +++ b/dlls/wineps.drv/vertical.c @@ -2,8 +2,6 @@ /* generated from http://www.unicode.org/Public/vertical/revision-11/VerticalOrientation-11.t… */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short vertical_orientation_table[1536] = { /* level 1 offsets */ diff --git a/tools/make_unicode b/tools/make_unicode index 0300905..e0f92b5 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1234,7 +1234,6 @@ sub dump_indic($) print OUTPUT "/* generated from $UNIDATA/IndicSyllabicCategory.txt */\n"; print OUTPUT "/* and from $UNIDATA/IndicMatraCategory.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; dump_two_level_mapping( "indic_syllabic_table", @indic_table); @@ -1282,7 +1281,6 @@ sub dump_linebreak($) print OUTPUT "/* Unicode Line Break Properties */\n"; print OUTPUT "/* generated from $UNIDATA/LineBreak.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; dump_two_level_mapping( "wine_linebreak_table", @break_table); @@ -1358,7 +1356,6 @@ sub dump_shaping($) print OUTPUT "/* Unicode Arabic shaping */\n"; print OUTPUT "/* generated from $UNIDATA/ArabicShaping.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; dump_two_level_mapping( "wine_shaping_table", @joining_table ); @@ -1419,7 +1416,6 @@ sub dump_vertical($) print OUTPUT "/* Unicode Vertical Orientation */\n"; print OUTPUT "/* generated from $VERTICALDATA/VerticalOrientation-11.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; dump_two_level_mapping( "vertical_orientation_table", @vertical_table); @@ -1755,7 +1751,6 @@ sub dump_nameprep($) print OUTPUT "/* Nameprep algorithm related data */\n"; print OUTPUT "/* generated from $RFCS/$STRINGPREP */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; dump_two_level_mapping( "nameprep_char_type", @flags_table ); @@ -1793,7 +1788,7 @@ sub dump_nameprep($) } # dump the main index - printf OUTPUT "const WCHAR nameprep_mapping[%d] =\n", $total; + printf OUTPUT "const unsigned short nameprep_mapping[%d] =\n", $total; printf OUTPUT "{\n /* index */\n"; printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @filled_idx ); printf OUTPUT ",\n /* null sub-index */\n%s", DUMP_ARRAY( "0x%04x", 0, ($null_offset) x 16 );

1 0

Austin English : kernel32: Initialize return value in CreateSemaphoreExW.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: 149d60318fac6314726f256c1cca1e8c4806202b URL: http://source.winehq.org/git/wine.git/?a=commit;h=149d60318fac6314726f256c1… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 7 20:08:39 2014 -0700 kernel32: Initialize return value in CreateSemaphoreExW. --- dlls/kernel32/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d363e1f..d9f69c3 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -777,7 +777,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExA( SECURITY_ATTRIBUTES *sa, LON HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExW( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, LPCWSTR name, DWORD flags, DWORD access ) { - HANDLE ret; + HANDLE ret = 0; UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; NTSTATUS status;

1 0

Huw Davies : comctl32: The RECT in the custom draw structure should be the entire item' s size. This includes any separated dropdown arrow.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: 6af0d44166e4fad8078a0311b3632a19856d390e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af0d44166e4fad8078a0311b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 8 13:53:51 2014 +0100 comctl32: The RECT in the custom draw structure should be the entire item's size. This includes any separated dropdown arrow. --- dlls/comctl32/toolbar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c90c4bb..a1b7966 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -954,7 +954,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, tbcd.rcText.bottom = rcText.bottom - rc.top; tbcd.nmcd.uItemState = TOOLBAR_TranslateState(btnPtr); tbcd.nmcd.hdc = hdc; - tbcd.nmcd.rc = rc; + tbcd.nmcd.rc = btnPtr->rect; tbcd.hbrMonoDither = COMCTL32_hPattern55AABrush; /* FIXME: what are these used for? */ @@ -972,7 +972,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, ntfret = TOOLBAR_SendNotify(&tbcd.nmcd.hdr, infoPtr, NM_CUSTOMDRAW); /* reset these fields so the user can't alter the behaviour like native */ tbcd.nmcd.hdc = hdc; - tbcd.nmcd.rc = rc; + tbcd.nmcd.rc = btnPtr->rect; dwItemCustDraw = ntfret & 0xffff; dwItemCDFlag = ntfret & 0xffff0000;

1 0

Bruno Jesus : winspool: Fix a leak in DocumentPropertiesA (valgrind).
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: daaa4c40d46e08e2bb3ab5ddb5889bdc6e782594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daaa4c40d46e08e2bb3ab5ddb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jul 7 21:12:25 2014 -0300 winspool: Fix a leak in DocumentPropertiesA (valgrind). --- dlls/winspool.drv/info.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bfb22cb..73323f8 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2361,7 +2361,7 @@ LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter, LPSTR pDeviceName, LPDEVMODEA pDevModeOutput, LPDEVMODEA pDevModeInput,DWORD fMode ) { - LPSTR lpName = pDeviceName; + LPSTR lpName = pDeviceName, dupname = NULL; static CHAR port[] = "LPT1:"; LONG ret; @@ -2376,7 +2376,7 @@ LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter, SetLastError(ERROR_INVALID_HANDLE); return -1; } - lpName = strdupWtoA(lpNameW); + lpName = dupname = strdupWtoA(lpNameW); } if (!GDI_CallExtDeviceMode16) @@ -2385,14 +2385,15 @@ LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter, (LPCSTR)102 ); if (!GDI_CallExtDeviceMode16) { ERR("No CallExtDeviceMode16?\n"); - return -1; + ret = -1; + goto end; } } ret = GDI_CallExtDeviceMode16(hWnd, pDevModeOutput, lpName, port, pDevModeInput, NULL, fMode); - if(!pDeviceName) - HeapFree(GetProcessHeap(),0,lpName); +end: + HeapFree(GetProcessHeap(), 0, dupname); return ret; }

1 0

Ken Thomases : dbghelp: If the caller didn' t provide a module load address use the segment start address.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: 1f2680f5f39f14c3160d689a5237e365334938d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2680f5f39f14c3160d689a5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 7 15:35:44 2014 -0500 dbghelp: If the caller didn't provide a module load address use the segment start address. --- dlls/dbghelp/macho_module.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index c6270c8..ebea4fd 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1020,6 +1020,8 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, struct module_format* modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct macho_module_info)); if (!modfmt) goto leave; + if (!load_addr) + load_addr = fmap.segs_start; macho_info->module = module_new(pcs, filename, DMT_MACHO, FALSE, load_addr, fmap.segs_size, 0, calc_crc32(fmap.fd)); if (!macho_info->module)

1 0