January 2013 - Wine-commits

Erich Hoover : advapi32: Support service objects in GetNamedSecurityInfo.
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: 08238b83b8282a60eef3b0fc5afcdb913505799e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08238b83b8282a60eef3b0fc5… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jan 30 12:59:12 2013 -0700 advapi32: Support service objects in GetNamedSecurityInfo. --- dlls/advapi32/advapi32_misc.h | 2 + dlls/advapi32/security.c | 53 +++++++++++++++++++++++++++----------- dlls/advapi32/service.c | 57 +++++++++++++++++++++++++---------------- 3 files changed, 75 insertions(+), 37 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index cb7f7ca..ace73f1 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -30,6 +30,8 @@ BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; +DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; +DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; /* heap allocation helpers */ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index d70fb63..f9727d7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -423,6 +423,19 @@ static inline DWORD get_security_file( LPWSTR full_file_name, DWORD access, HAND return RtlNtStatusToDosError( status ); } +/* helper function for SE_SERVICE objects in [Get|Set]NamedSecurityInfo */ +static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access, HANDLE *service ) +{ + SC_HANDLE manager = 0; + DWORD err; + + err = SERV_OpenSCManagerW( NULL, NULL, access, (SC_HANDLE *)&manager ); + if (err == ERROR_SUCCESS) + err = SERV_OpenServiceW( manager, full_service_name, access, (SC_HANDLE *)service ); + CloseServiceHandle( manager ); + return err; +} + #define WINE_SIZE_OF_WORLD_ACCESS_ACL (sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) + sizeof(sidWorld) - sizeof(DWORD)) static void GetWorldAccessACL(PACL pACL) @@ -5535,16 +5548,6 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, TRACE( "%s %d %d %p %p %p %p %p\n", debugstr_w(name), type, info, owner, group, dacl, sacl, descriptor ); - if (type != SE_FILE_OBJECT) - { - FIXME( "Object type %d is not currently supported.\n", type ); - if (owner) *owner = NULL; - if (group) *group = NULL; - if (dacl) *dacl = NULL; - if (sacl) *sacl = NULL; - if (descriptor) *descriptor = NULL; - return ERROR_SUCCESS; - } /* A NULL descriptor is allowed if any one of the other pointers is not NULL */ if (!name || !(owner||group||dacl||sacl||descriptor) ) return ERROR_INVALID_PARAMETER; @@ -5562,11 +5565,31 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, if (info & SACL_SECURITY_INFORMATION) access |= ACCESS_SYSTEM_SECURITY; - err = get_security_file( name, access, &handle); - if (err != ERROR_SUCCESS) - return err; - err = GetSecurityInfo( handle, type, info, owner, group, dacl, sacl, descriptor ); - CloseHandle( handle ); + switch (type) + { + case SE_SERVICE: + if (!(err = get_security_service( name, access, &handle))) + { + err = GetSecurityInfo( handle, type, info, owner, group, dacl, sacl, descriptor ); + CloseServiceHandle( handle ); + } + break; + case SE_FILE_OBJECT: + if (!(err = get_security_file( name, access, &handle))) + { + err = GetSecurityInfo( handle, type, info, owner, group, dacl, sacl, descriptor ); + CloseHandle( handle ); + } + break; + default: + FIXME( "Object type %d is not currently supported.\n", type ); + if (owner) *owner = NULL; + if (group) *group = NULL; + if (dacl) *dacl = NULL; + if (sacl) *sacl = NULL; + if (descriptor) *descriptor = NULL; + return ERROR_SUCCESS; + } return err; } diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 9a952e1..4c694b1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -777,18 +777,17 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, * * See OpenSCManagerA. */ -SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, - DWORD dwDesiredAccess ) +DWORD SERV_OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, + DWORD dwDesiredAccess, SC_HANDLE *handle ) { - SC_HANDLE handle = 0; - LONG r; + DWORD r; TRACE("(%s,%s,0x%08x)\n", debugstr_w(lpMachineName), debugstr_w(lpDatabaseName), dwDesiredAccess); __TRY { - r = svcctl_OpenSCManagerW(lpMachineName, lpDatabaseName, dwDesiredAccess, (SC_RPC_HANDLE *)&handle); + r = svcctl_OpenSCManagerW(lpMachineName, lpDatabaseName, dwDesiredAccess, (SC_RPC_HANDLE *)handle); } __EXCEPT(rpc_filter) { @@ -797,12 +796,21 @@ SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, __ENDTRY if (r!=ERROR_SUCCESS) - { - SetLastError( r ); - handle = 0; - } + *handle = 0; + + TRACE("returning %p\n", *handle); + return r; +} - TRACE("returning %p\n", handle); +SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, + DWORD dwDesiredAccess ) +{ + SC_HANDLE handle = 0; + DWORD r; + + r = SERV_OpenSCManagerW(lpMachineName, lpDatabaseName, dwDesiredAccess, &handle); + if (r!=ERROR_SUCCESS) + SetLastError(r); return handle; } @@ -921,23 +929,19 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, * * See OpenServiceA. */ -SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, - DWORD dwDesiredAccess) +DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, + DWORD dwDesiredAccess, SC_HANDLE *handle ) { - SC_HANDLE handle = 0; DWORD err; TRACE("%p %s %d\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); if (!hSCManager) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } + return ERROR_INVALID_HANDLE; __TRY { - err = svcctl_OpenServiceW(hSCManager, lpServiceName, dwDesiredAccess, (SC_RPC_HANDLE *)&handle); + err = svcctl_OpenServiceW(hSCManager, lpServiceName, dwDesiredAccess, (SC_RPC_HANDLE *)handle); } __EXCEPT(rpc_filter) { @@ -946,12 +950,21 @@ SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, __ENDTRY if (err != ERROR_SUCCESS) - { - SetLastError(err); handle = 0; - } - TRACE("returning %p\n",handle); + TRACE("returning %p\n", *handle); + return err; +} + +SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, + DWORD dwDesiredAccess) +{ + SC_HANDLE handle = 0; + DWORD err; + + err = SERV_OpenServiceW(hSCManager, lpServiceName, dwDesiredAccess, &handle); + if (err != ERROR_SUCCESS) + SetLastError(err); return handle; }

1 0

Erich Hoover : advapi32: Support service objects in SetNamedSecurityInfo.
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: 44593ba61294dd1d3c9874785c692ba35615ecb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44593ba61294dd1d3c9874785… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jan 30 12:59:15 2013 -0700 advapi32: Support service objects in SetNamedSecurityInfo. --- dlls/advapi32/security.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f9727d7..474c522 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4005,11 +4005,6 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, TRACE( "%s %d %d %p %p %p %p\n", debugstr_w(pObjectName), ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl); - if (ObjectType != SE_FILE_OBJECT) - { - FIXME( "Object type %d is not currently supported.\n", ObjectType ); - return ERROR_SUCCESS; - } if (!pObjectName) return ERROR_INVALID_PARAMETER; @@ -4020,11 +4015,26 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, if (SecurityInfo & SACL_SECURITY_INFORMATION) access |= ACCESS_SYSTEM_SECURITY; - err = get_security_file( pObjectName, access, &handle ); - if (err != ERROR_SUCCESS) - return err; - err = SetSecurityInfo( handle, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl ); - CloseHandle( handle ); + switch (ObjectType) + { + case SE_SERVICE: + if (!(err = get_security_service( pObjectName, access, &handle ))) + { + err = SetSecurityInfo( handle, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl ); + CloseServiceHandle( handle ); + } + break; + case SE_FILE_OBJECT: + if (!(err = get_security_file( pObjectName, access, &handle ))) + { + err = SetSecurityInfo( handle, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl ); + CloseHandle( handle ); + } + break; + default: + FIXME( "Object type %d is not currently supported.\n", ObjectType ); + return ERROR_SUCCESS; + } return err; }

1 0

Alex Henrie : advapi32: Destination length -1 means no limit.
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: 142afabb4113e4fb904117230ed4306aa5a2109e URL: http://source.winehq.org/git/wine.git/?a=commit;h=142afabb4113e4fb904117230… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 30 22:31:16 2013 -0700 advapi32: Destination length -1 means no limit. --- dlls/advapi32/crypt.c | 32 +++++++++++++++++++------------- dlls/advapi32/tests/crypt.c | 11 ++++++++++- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 5f44728..3eb4213 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -27,6 +27,7 @@ #include "config.h" #include "wine/port.h" +#include <limits.h> #include <time.h> #include <stdlib.h> #include <stdio.h> @@ -109,33 +110,38 @@ static inline PWSTR CRYPT_GetTypeKeyName(DWORD dwType, BOOL user) return keyname; } -/* CRYPT_UnicodeTOANSI +/* CRYPT_UnicodeToANSI * wstr - unicode string - * str - pointer to ANSI string - * strsize - size of buffer pointed to by str or -1 if we have to do the allocation + * str - pointer to ANSI string or pointer to null pointer if we have to do the allocation + * strsize - size of buffer pointed to by str * * returns TRUE if unsuccessful, FALSE otherwise. * if wstr is NULL, returns TRUE and sets str to NULL! Value of str should be checked after call */ static inline BOOL CRYPT_UnicodeToANSI(LPCWSTR wstr, LPSTR* str, int strsize) { - int count; - if (!wstr) { *str = NULL; return TRUE; } - count = WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL); - if (strsize == -1) - *str = CRYPT_Alloc(count * sizeof(CHAR)); - else - count = min( count, strsize ); + + if (!*str) + { + strsize = WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL); + *str = CRYPT_Alloc(strsize * sizeof(CHAR)); + } + else if (strsize < 0) + { + strsize = INT_MAX; /* windows will pretend that the buffer is infinitely long */ + } + if (*str) { - WideCharToMultiByte(CP_ACP, 0, wstr, -1, *str, count, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, wstr, -1, *str, strsize, NULL, NULL); return TRUE; } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -481,13 +487,13 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, goto error; } pProv->pVTable->dwProvType = dwProvType; - if(!CRYPT_UnicodeToANSI(provname, &provnameA, -1)) + if(!CRYPT_UnicodeToANSI(provname, &provnameA, 0)) { /* CRYPT_UnicodeToANSI calls SetLastError */ goto error; } pProv->pVTable->pszProvName = provnameA; - if(!CRYPT_UnicodeToANSI(pszContainer, &pszContainerA, -1)) + if(!CRYPT_UnicodeToANSI(pszContainer, &pszContainerA, 0)) { /* CRYPT_UnicodeToANSI calls SetLastError */ goto error; diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 4820d27..5f4d4e2 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -561,7 +561,16 @@ static void test_enum_providers(void) if (!(provider = LocalAlloc(LMEM_ZEROINIT, providerLen))) return; - providerLen = 0xdeadbeef; + providerLen = -1; + result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); + ok(result, "expected TRUE, got %d\n", result); + ok(type==dwType, "expected %d, got %d\n", dwType, type); + if (pszProvName) + ok(!strcmp(pszProvName, provider), "expected %s, got %s\n", pszProvName, provider); + ok(cbName==providerLen, "expected %d, got %d\n", cbName, providerLen); + + providerLen = -1000; + provider[0] = 0; result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); ok(result, "expected TRUE, got %d\n", result); ok(type==dwType, "expected %d, got %d\n", dwType, type);

1 0

Jacek Caban : ieframe: Use int resource ID for toolbar image.
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: 35f21ac8265430c0b7936efcead5352006ae50c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f21ac8265430c0b7936efce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 12:46:22 2013 +0100 ieframe: Use int resource ID for toolbar image. --- dlls/ieframe/iexplore.c | 3 +-- dlls/ieframe/resource.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 0643f16..c3d519a 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -439,7 +439,6 @@ static void create_rebar(HWND hwnd) REBARBANDINFOW bandinf; WCHAR addr[40]; HIMAGELIST imagelist; - WCHAR idb_ietoolbar[] = {'I','D','B','_','I','E','T','O','O','L','B','A','R',0}; SIZE toolbar_size; LoadStringW(ieframe_instance, IDS_ADDRESS, addr, sizeof(addr)/sizeof(addr[0])); @@ -457,7 +456,7 @@ static void create_rebar(HWND hwnd) hwndToolbar = CreateWindowExW(TBSTYLE_EX_MIXEDBUTTONS, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE | CCS_NORESIZE, 0, 0, 0, 0, hwndRebar, (HMENU)IDC_BROWSE_TOOLBAR, ieframe_instance, NULL); - imagelist = ImageList_LoadImageW(ieframe_instance, idb_ietoolbar, 32, 0, CLR_NONE, IMAGE_BITMAP, LR_CREATEDIBSECTION); + imagelist = ImageList_LoadImageW(ieframe_instance, MAKEINTRESOURCEW(IDB_IETOOLBAR), 32, 0, CLR_NONE, IMAGE_BITMAP, LR_CREATEDIBSECTION); SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, (LPARAM)imagelist); SendMessageW(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); diff --git a/dlls/ieframe/resource.h b/dlls/ieframe/resource.h index da24048..ae02b20 100644 --- a/dlls/ieframe/resource.h +++ b/dlls/ieframe/resource.h @@ -62,6 +62,8 @@ #define IDS_ADDRESS 1106 +#define IDB_IETOOLBAR 1400 + /* update status text in BINDSTATUS_* callback */ #define IDS_STATUSFMT_FIRST 4096 #define IDS_FINDINGRESOURCE (IDS_STATUSFMT_FIRST + 1)

1 0

Huw Davies : riched20: Rewrite the run splittable test to take a run parameter.
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: 29e54f07f7ad4857105f6d6efb78246db19bd3f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29e54f07f7ad4857105f6d6ef… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 31 13:47:57 2013 +0000 riched20: Rewrite the run splittable test to take a run parameter. --- dlls/riched20/editor.h | 1 - dlls/riched20/run.c | 20 +++++++++++++++++++- dlls/riched20/string.c | 15 --------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 94fb862..87dd288 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -105,7 +105,6 @@ void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN; void ME_AppendString(ME_String *s1, const ME_String *s2) DECLSPEC_HIDDEN; ME_String *ME_VSplitString(ME_String *orig, int nVPos) DECLSPEC_HIDDEN; int ME_IsWhitespaces(const ME_String *s) DECLSPEC_HIDDEN; -int ME_IsSplitable(const ME_String *s) DECLSPEC_HIDDEN; int ME_FindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; int ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code) DECLSPEC_HIDDEN; void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 390e114..384baaa 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -376,6 +376,24 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, return pDI; } +static BOOL run_is_splittable( const ME_Run *run ) +{ + WCHAR *str = get_text( run, 0 ), *p; + int i, len = run->strText->nLen; + BOOL found_ink = FALSE; + + for (i = 0, p = str; i < len; i++, p++) + { + if (ME_IsWSpace( *p )) + { + if (found_ink) return TRUE; + } + else + found_ink = TRUE; + } + return FALSE; +} + /****************************************************************************** * ME_UpdateRunFlags * @@ -393,7 +411,7 @@ void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) else run->nFlags &= ~MERF_HIDDEN; - if (ME_IsSplitable(strText)) + if (run_is_splittable( run )) run->nFlags |= MERF_SPLITTABLE; else run->nFlags &= ~MERF_SPLITTABLE; diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index db45d92..02f1480 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -121,21 +121,6 @@ int ME_IsWhitespaces(const ME_String *s) return 1; } -int ME_IsSplitable(const ME_String *s) -{ - WCHAR *pos = s->szData; - WCHAR ch; - while(ME_IsWSpace(*pos++)) - ; - pos--; - while((ch = *pos++) != 0) - { - if (ME_IsWSpace(ch)) - return 1; - } - return 0; -} - void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) { int end_ofs = nVChar + nChars;

1 0

Huw Davies : riched20: Rewrite the run whitespace test to take a run parameter.
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: 76cfe7dc5018ea9f8572ef0a5adce06c1c838784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76cfe7dc5018ea9f8572ef0a5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 31 13:47:58 2013 +0000 riched20: Rewrite the run whitespace test to take a run parameter. --- dlls/riched20/editor.h | 1 - dlls/riched20/run.c | 16 ++++++++++++++-- dlls/riched20/string.c | 13 ------------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 87dd288..f01494c 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -104,7 +104,6 @@ ME_String *ME_StrDup(const ME_String *s) DECLSPEC_HIDDEN; void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN; void ME_AppendString(ME_String *s1, const ME_String *s2) DECLSPEC_HIDDEN; ME_String *ME_VSplitString(ME_String *orig, int nVPos) DECLSPEC_HIDDEN; -int ME_IsWhitespaces(const ME_String *s) DECLSPEC_HIDDEN; int ME_FindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; int ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code) DECLSPEC_HIDDEN; void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 384baaa..ccee185 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -394,6 +394,17 @@ static BOOL run_is_splittable( const ME_Run *run ) return FALSE; } +static BOOL run_is_entirely_ws( const ME_Run *run ) +{ + WCHAR *str = get_text( run, 0 ), *p; + int i, len = run->strText->nLen; + + for (i = 0, p = str; i < len; i++, p++) + if (!ME_IsWSpace( *p )) return FALSE; + + return TRUE; +} + /****************************************************************************** * ME_UpdateRunFlags * @@ -416,8 +427,9 @@ void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) else run->nFlags &= ~MERF_SPLITTABLE; - if (!(run->nFlags & MERF_NOTEXT)) { - if (ME_IsWhitespaces(strText)) + if (!(run->nFlags & MERF_NOTEXT)) + { + if (run_is_entirely_ws( run )) run->nFlags |= MERF_WHITESPACE | MERF_STARTWHITE | MERF_ENDWHITE; else { diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 02f1480..87dcb67 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -108,19 +108,6 @@ ME_String *ME_VSplitString(ME_String *orig, int charidx) return s; } -int ME_IsWhitespaces(const ME_String *s) -{ - /* FIXME multibyte */ - WCHAR *pos = s->szData; - while(ME_IsWSpace(*pos++)) - ; - pos--; - if (*pos) - return 0; - else - return 1; -} - void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) { int end_ofs = nVChar + nChars;

1 0

Huw Davies : riched20: Use the get_text helper in a few more places.
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: f24ba125f68eb66866c59599528f890d5e790997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24ba125f68eb66866c595995… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 31 13:47:59 2013 +0000 riched20: Use the get_text helper in a few more places. --- dlls/riched20/run.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index ccee185..faef106 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -414,7 +414,6 @@ static BOOL run_is_entirely_ws( const ME_Run *run ) */ void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) { - ME_String *strText = run->strText; assert(run->nCharOfs >= 0); if (RUN_IS_HIDDEN(run) || run->nFlags & MERF_TABLESTART) @@ -435,12 +434,12 @@ void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) { run->nFlags &= ~MERF_WHITESPACE; - if (ME_IsWSpace(strText->szData[0])) + if (ME_IsWSpace( *get_text( run, 0 ) )) run->nFlags |= MERF_STARTWHITE; else run->nFlags &= ~MERF_STARTWHITE; - if (ME_IsWSpace(strText->szData[strText->nLen - 1])) + if (ME_IsWSpace( *get_text( run, run->strText->nLen - 1 ) )) run->nFlags |= MERF_ENDWHITE; else run->nFlags &= ~MERF_ENDWHITE;

1 0

Huw Davies : riched20: Add an explicit run length member and use it rather than accessing the string length .
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: 86f077b163fcfc2a1466ecd2b5d8596f4c6fc588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f077b163fcfc2a1466ecd2b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 31 13:48:00 2013 +0000 riched20: Add an explicit run length member and use it rather than accessing the string length. --- dlls/riched20/caret.c | 42 ++++++++++++++++++------------------ dlls/riched20/editor.c | 32 ++++++++++++++-------------- dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 4 +- dlls/riched20/para.c | 2 +- dlls/riched20/run.c | 53 +++++++++++++++++++++++------------------------ dlls/riched20/table.c | 4 +- dlls/riched20/undo.c | 2 +- dlls/riched20/wrap.c | 12 +++++----- dlls/riched20/writer.c | 6 ++-- 10 files changed, 79 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86f077b163fcfc2a1466e…

1 0

Hans Leidekker : msi: Don' t fail if the directory already exists in MsiCreateAndVerifyInstallerDirectory .
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: cafbad3feb33f3346dce441a6365239694feac55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cafbad3feb33f3346dce441a6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 31 15:10:04 2013 +0100 msi: Don't fail if the directory already exists in MsiCreateAndVerifyInstallerDirectory. --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index a8bd57c..5aba98d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3810,7 +3810,7 @@ UINT WINAPI MsiCreateAndVerifyInstallerDirectory(DWORD dwReserved) lstrcatW(path, installerW); - if (!CreateDirectoryW(path, NULL)) + if (!CreateDirectoryW(path, NULL) && GetLastError() != ERROR_ALREADY_EXISTS) return ERROR_FUNCTION_FAILED; return ERROR_SUCCESS;

1 0

Hans Leidekker : msi: Fix the return value of MsiGetFileVersion for some corner cases.
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: d4e9b2cd0f6f1d7510f1aa11ae536c87c5381492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e9b2cd0f6f1d7510f1aa11a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 31 15:10:45 2013 +0100 msi: Fix the return value of MsiGetFileVersion for some corner cases. --- dlls/msi/msi.c | 8 +++++--- dlls/msi/tests/msi.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 5aba98d..6a623e7 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3158,7 +3158,7 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, static const WCHAR szVersionResource[] = {'\\',0}; static const WCHAR szVersionFormat[] = {'%','d','.','%','d','.','%','d','.','%','d',0}; static const WCHAR szLangFormat[] = {'%','d',0}; - UINT ret = ERROR_SUCCESS; + UINT ret = ERROR_MORE_DATA; DWORD len, error; LPVOID version; VS_FIXEDFILEINFO *ffi; @@ -3169,6 +3169,7 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, { error = GetLastError(); if (error == ERROR_BAD_PATHNAME) return ERROR_FILE_NOT_FOUND; + if (error == ERROR_RESOURCE_DATA_NOT_FOUND) return ERROR_FILE_INVALID; return error; } if (!(version = msi_alloc( len ))) return ERROR_OUTOFMEMORY; @@ -3177,6 +3178,7 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, msi_free( version ); return GetLastError(); } + if (!verbuf && !verlen && !langbuf && !langlen) return ERROR_SUCCESS; if (verlen) { if (VerQueryValueW( version, szVersionResource, (LPVOID *)&ffi, &len ) && len > 0) @@ -3186,7 +3188,7 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, HIWORD(ffi->dwFileVersionLS), LOWORD(ffi->dwFileVersionLS) ); if (verbuf) lstrcpynW( verbuf, tmp, *verlen ); len = strlenW( tmp ); - if (len >= *verlen) ret = ERROR_MORE_DATA; + if (*verlen > len) ret = ERROR_SUCCESS; *verlen = len; } else @@ -3202,7 +3204,7 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, sprintfW( tmp, szLangFormat, *lang ); if (langbuf) lstrcpynW( langbuf, tmp, *langlen ); len = strlenW( tmp ); - if (len >= *langlen) ret = ERROR_MORE_DATA; + if (*langlen > len) ret = ERROR_SUCCESS; *langlen = len; } else diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index da6b446..028a7dc 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -2829,6 +2829,9 @@ static void test_MsiGetFileVersion(void) DWORD verchecksz, langchecksz; /* NULL szFilePath */ + r = MsiGetFileVersionA(NULL, NULL, NULL, NULL, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + versz = MAX_PATH; langsz = MAX_PATH; lstrcpyA(version, "version"); @@ -2844,6 +2847,9 @@ static void test_MsiGetFileVersion(void) ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz); /* empty szFilePath */ + r = MsiGetFileVersionA("", NULL, NULL, NULL, NULL); + ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); + versz = MAX_PATH; langsz = MAX_PATH; lstrcpyA(version, "version"); @@ -2941,6 +2947,9 @@ static void test_MsiGetFileVersion(void) create_file("ver.txt", "ver.txt", 20); /* file exists, no version information */ + r = MsiGetFileVersionA("ver.txt", NULL, NULL, NULL, NULL); + ok(r == ERROR_FILE_INVALID, "Expected ERROR_FILE_INVALID, got %d\n", r); + versz = MAX_PATH; langsz = MAX_PATH; lstrcpyA(version, "version"); @@ -3042,6 +3051,34 @@ static void test_MsiGetFileVersion(void) "Expected first character of %s, got %s\n", langcheck, lang); ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz); + /* pcchVersionBuf big enough, pcchLangBuf not big enough */ + versz = MAX_PATH; + langsz = 0; + lstrcpyA(version, "version"); + r = MsiGetFileVersionA(path, version, &versz, NULL, &langsz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); + ok(!lstrcmpA(version, vercheck), "Expected %s, got %s\n", vercheck, version); + ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %d >= %d\n", langsz, langchecksz); + + /* pcchVersionBuf not big enough, pcchLangBuf big enough */ + versz = 5; + langsz = MAX_PATH; + lstrcpyA(lang, "lang"); + r = MsiGetFileVersionA(path, NULL, &versz, lang, &langsz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); + ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %d >= %d\n", langsz, langchecksz); + ok(lstrcmpA(lang, "lang"), "lang buffer not modified\n"); + + /* NULL pcchVersionBuf and pcchLangBuf */ + r = MsiGetFileVersionA(path, version, NULL, lang, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + + /* All NULL except szFilePath */ + r = MsiGetFileVersionA(path, NULL, NULL, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + HeapFree(GetProcessHeap(), 0, vercheck); HeapFree(GetProcessHeap(), 0, langcheck); }

1 0