February 2010 - Wine-commits

Alexandre Julliard : advapi32/tests: Fix the ReadEventLog error checking.
by Alexandre Julliard 19 Feb '10

19 Feb '10

Module: wine Branch: master Commit: 71fa5a36b156c7637591724316e93696700a52a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fa5a36b156c763759172431… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 11:36:12 2010 +0100 advapi32/tests: Fix the ReadEventLog error checking. --- dlls/advapi32/tests/eventlog.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 3907873..ff3f658 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -767,22 +767,28 @@ static void test_readwrite(void) { win_skip("Win7 fails when using incorrect event types\n"); ret = ReportEvent(handle, 0, 0, 0, NULL, 0, 0, NULL, NULL); + ok(ret, "Expected success : %d\n", GetLastError()); } else { void *buf; - DWORD read, needed; + DWORD read, needed = 0; EVENTLOGRECORD *record; + ok(ret, "Expected success : %d\n", GetLastError()); + /* Needed to catch earlier Vista (with no ServicePack for example) */ buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); - if (ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, - 0, buf, sizeof(EVENTLOGRECORD), &read, &needed)) + if (!(ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, sizeof(EVENTLOGRECORD), &read, &needed)) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) { buf = HeapReAlloc(GetProcessHeap(), 0, buf, needed); - ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, - 0, buf, needed, &read, &needed); - + ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, needed, &read, &needed); + } + if (ret) + { record = (EVENTLOGRECORD *)buf; /* Vista and W2K8 return EVENTLOG_SUCCESS, Windows versions before return @@ -793,7 +799,6 @@ static void test_readwrite(void) } HeapFree(GetProcessHeap(), 0, buf); } - ok(ret, "Expected success : %d\n", GetLastError()); /* This will clear the eventlog. The record numbering for new * events however differs on Vista SP1+. Before Vista the first

1 0

Huw Davies : fonts: Tidy up some of the extended Latin glyphs in the 9 ppem strike of Tahoma.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 35c704177971570090acc56e2df57f8b223988d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c704177971570090acc56e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 18 14:31:52 2010 +0000 fonts: Tidy up some of the extended Latin glyphs in the 9 ppem strike of Tahoma. --- fonts/tahoma.sfd | 382 +++++++++++++++++++++++++++--------------------------- fonts/tahoma.ttf | Bin 89124 -> 89148 bytes 2 files changed, 191 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35c704177971570090acc…

1 0

Vitaly Perov : mshtml: Silence IExternalConnection in htmldoc_qi FIXME.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: cffd28f74d97b7832e2ab20117c200ea3e5ccd20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cffd28f74d97b7832e2ab2011… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Thu Feb 18 18:31:01 2010 +0300 mshtml: Silence IExternalConnection in htmldoc_qi FIXME. --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/tests/htmldoc.c | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 935ec00..93aea06 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1773,6 +1773,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IMarshal, riid)) { TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv); *ppv = NULL; + }else if(IsEqualGUID(&IID_IExternalConnection, riid)) { + TRACE("(%p)->(IID_IExternalConnection %p) returning NULL\n", This, ppv); + *ppv = NULL; }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { TRACE("(%p)->(IID_IObjectWithSite %p)\n", This, ppv); *ppv = OBJSITE(This); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d49a6ff..adc318a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4309,6 +4309,11 @@ static void test_QueryInterface(IHTMLDocument2 *doc) hres = IUnknown_QueryInterface(doc, &IID_IMarshal, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); + + qi = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(doc, &IID_IExternalConnection, (void**)&qi); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); } static void init_test(enum load_state_t ls) {

1 0

Paul Vriens : cmd: Remove some unneeded extension checking.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: f468055408aac43a17524beff430183ba769ce2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f468055408aac43a17524beff… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Feb 18 17:09:04 2010 +0100 cmd: Remove some unneeded extension checking. --- programs/cmd/batch.c | 30 +++++------------------------- 1 files changed, 5 insertions(+), 25 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 28744d4..585ea5e 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -47,35 +47,15 @@ extern DWORD errorlevel; void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HANDLE pgmHandle) { -#define WCMD_BATCH_EXT_SIZE 5 - HANDLE h = INVALID_HANDLE_VALUE; - WCHAR string[MAXSTRING]; - static const WCHAR extension_batch[][WCMD_BATCH_EXT_SIZE] = {{'.','b','a','t','\0'}, - {'.','c','m','d','\0'}}; - static const WCHAR extension_exe[WCMD_BATCH_EXT_SIZE] = {'.','e','x','e','\0'}; - unsigned int i; BATCH_CONTEXT *prev_context; if (startLabel == NULL) { - for(i=0; (i<sizeof(extension_batch)/(WCMD_BATCH_EXT_SIZE * sizeof(WCHAR))) && - (h == INVALID_HANDLE_VALUE); i++) { - strcpyW (string, file); - CharLowerW (string); - if (strstrW (string, extension_batch[i]) == NULL) strcatW (string, extension_batch[i]); - h = CreateFileW (string, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - } + h = CreateFileW (file, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { - strcpyW (string, file); - CharLowerW (string); - if (strstrW (string, extension_exe) == NULL) strcatW (string, extension_exe); - if (GetFileAttributesW (string) != INVALID_FILE_ATTRIBUTES) { - WCMD_run_program (command, 0); - } else { - SetLastError (ERROR_FILE_NOT_FOUND); - WCMD_print_error (); - } + SetLastError (ERROR_FILE_NOT_FOUND); + WCMD_print_error (); return; } } else { @@ -91,7 +71,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN prev_context = context; context = LocalAlloc (LMEM_FIXED, sizeof (BATCH_CONTEXT)); context -> h = h; - context->batchfileW = WCMD_strdupW(string); + context->batchfileW = WCMD_strdupW(file); context -> command = command; memset(context -> shift_count, 0x00, sizeof(context -> shift_count)); context -> prev_context = prev_context;

1 0

Jacek Caban : urlmon.idl: Added some missing declarations.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: cce35e2e7afaf324d2ac3b9786d50ae56d33a5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce35e2e7afaf324d2ac3b978… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 18 17:16:03 2010 +0100 urlmon.idl: Added some missing declarations. --- include/urlmon.idl | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 828cbd2..d16a3b5 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1646,6 +1646,62 @@ interface IUri : IUnknown [out] BOOL *pfEqual); } +cpp_quote("HRESULT WINAPI CreateUri(LPCWSTR,DWORD,DWORD_PTR,IUri**);") +cpp_quote("HRESULT WINAPI CreateUriWithFragment(LPCWSTR,LPCWSTR,DWORD,DWORD_PTR,IUri**);") +cpp_quote("HRESULT WINAPI CreateUriFromMultiByteString(LPCSTR,DWORD,DWORD,DWORD,DWORD_PTR,IUri**);") + +cpp_quote("#define Uri_HAS_ABSOLUTE_URI (1 << Uri_PROPERTY_ABSOLUTE_URI)") +cpp_quote("#define Uri_HAS_AUTHORITY (1 << Uri_PROPERTY_AUTHORITY)") +cpp_quote("#define Uri_HAS_DISPLAY_URI (1 << Uri_PROPERTY_DISPLAY_URI)") +cpp_quote("#define Uri_HAS_DOMAIN (1 << Uri_PROPERTY_DOMAIN)") +cpp_quote("#define Uri_HAS_EXTENSION (1 << Uri_PROPERTY_EXTENSION)") +cpp_quote("#define Uri_HAS_FRAGMENT (1 << Uri_PROPERTY_FRAGMENT)") +cpp_quote("#define Uri_HAS_HOST (1 << Uri_PROPERTY_HOST)") +cpp_quote("#define Uri_HAS_PASSWORD (1 << Uri_PROPERTY_PASSWORD)") +cpp_quote("#define Uri_HAS_PATH (1 << Uri_PROPERTY_PATH)") +cpp_quote("#define Uri_HAS_QUERY (1 << Uri_PROPERTY_QUERY)") +cpp_quote("#define Uri_HAS_RAW_URI (1 << Uri_PROPERTY_RAW_URI)") +cpp_quote("#define Uri_HAS_SCHEME_NAME (1 << Uri_PROPERTY_SCHEME_NAME)") +cpp_quote("#define Uri_HAS_USER_NAME (1 << Uri_PROPERTY_USER_NAME)") +cpp_quote("#define Uri_HAS_PATH_AND_QUERY (1 << Uri_PROPERTY_PATH_AND_QUERY)") +cpp_quote("#define Uri_HAS_USER_INFO (1 << Uri_PROPERTY_USER_INFO)") +cpp_quote("#define Uri_HAS_HOST_TYPE (1 << Uri_PROPERTY_HOST_TYPE)") +cpp_quote("#define Uri_HAS_PORT (1 << Uri_PROPERTY_PORT)") +cpp_quote("#define Uri_HAS_SCHEME (1 << Uri_PROPERTY_SCHEME)") +cpp_quote("#define Uri_HAS_ZONE (1 << Uri_PROPERTY_ZONE)") + +cpp_quote("#define Uri_CREATE_ALLOW_RELATIVE 0x0001") +cpp_quote("#define Uri_CREATE_ALLOW_IMPLICIT_WILDCARD_SCHEME 0x0002") +cpp_quote("#define Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME 0x0004") +cpp_quote("#define Uri_CREATE_NOFRAG 0x0008") +cpp_quote("#define Uri_CREATE_NO_CANONICALIZE 0x0010") +cpp_quote("#define Uri_CREATE_CANONICALIZE 0x0100") +cpp_quote("#define Uri_CREATE_FILE_USE_DOS_PATH 0x0020") +cpp_quote("#define Uri_CREATE_DECODE_EXTRA_INFO 0x0040") +cpp_quote("#define Uri_CREATE_NO_DECODE_EXTRA_INFO 0x0080") +cpp_quote("#define Uri_CREATE_CRACK_UNKNOWN_SCHEMES 0x0200") +cpp_quote("#define Uri_CREATE_NO_CRACK_UNKNOWN_SCHEMES 0x0400") +cpp_quote("#define Uri_CREATE_PRE_PROCESS_HTML_URI 0x0800") +cpp_quote("#define Uri_CREATE_NO_PRE_PROCESS_HTML_URI 0x1000") +cpp_quote("#define Uri_CREATE_IE_SETTINGS 0x2000") +cpp_quote("#define Uri_CREATE_NO_IE_SETTINGS 0x4000") +cpp_quote("#define Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS 0x8000") + +cpp_quote("#define Uri_DISPLAY_NO_FRAGMENT 0x00000001") +cpp_quote("#define Uri_PUNYCODE_IDN_HOST 0x00000002") +cpp_quote("#define Uri_DISPLAY_IDN_HOST 0x00000004") + +cpp_quote("#define Uri_ENCODING_USER_INFO_AND_PATH_IS_PERCENT_ENCODED_UTF8 0x00000001") +cpp_quote("#define Uri_ENCODING_USER_INFO_AND_PATH_IS_CP 0x00000002") +cpp_quote("#define Uri_ENCODING_HOST_IS_IDN 0x00000004") +cpp_quote("#define Uri_ENCODING_HOST_IS_PERCENT_ENCODED_UTF8 0x00000008") +cpp_quote("#define Uri_ENCODING_HOST_IS_PERCENT_ENCODED_CP 0x00000010") +cpp_quote("#define Uri_ENCODING_QUERY_AND_FRAGMENT_IS_PERCENT_ENCODED_UTF8 0x00000020") +cpp_quote("#define Uri_ENCODING_QUERY_AND_FRAGMENT_IS_CP 0x00000040") +cpp_quote("#define Uri_ENCODING_RFC (Uri_ENCODING_USER_INFO_AND_PATH_IS_PERCENT_ENCODED_UTF8|Uri_ENCODING_HOST_IS_PERCENT_ENCODED_UTF8|Uri_ENCODING_QUERY_AND_FRAGMENT_IS_PERCENT_ENCODED_UTF8)") + +cpp_quote("#define UriBuilder_USE_ORIGINAL_FLAGS 0x00000001") + /***************************************************************************** * IUriContainer interface */ @@ -1740,6 +1796,8 @@ cpp_quote("#define INET_E_DEFAULT_ACTION INET_E_USE_DEFAULT_PROTOCOLH cpp_quote("HRESULT WINAPI CoGetClassObjectFromURL(REFCLSID, LPCWSTR, DWORD, DWORD, LPCWSTR, LPBINDCTX, DWORD, LPVOID, REFIID, LPVOID*);") cpp_quote("HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk);") +cpp_quote("HRESULT WINAPI CreateURLMonikerEx(IMoniker*,LPCWSTR,IMoniker**,DWORD);") +cpp_quote("HRESULT WINAPI CreateURLMonikerEx2(IMoniker*,IUri*,IMoniker**,DWORD);") cpp_quote("HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pbsc, IBindStatusCallback **ppbsc, DWORD dwReserved);") cpp_quote("HRESULT WINAPI CompareSecurityIds(BYTE*,DWORD,BYTE*,DWORD,DWORD);") cpp_quote("HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN,LPCSTR,LPCSTR,DWORD,LPBINDSTATUSCALLBACK);")

1 0

Alexandre Julliard : ntdll: Properly handle empty but present ACLs in self-relative descriptors.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 8543c32442d79c33b59b8f6a96c849f6ba5f13df URL: http://source.winehq.org/git/wine.git/?a=commit;h=8543c32442d79c33b59b8f6a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 12:57:33 2010 +0100 ntdll: Properly handle empty but present ACLs in self-relative descriptors. --- dlls/ntdll/sec.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 64efdb5..6784848 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -478,12 +478,12 @@ NTSTATUS WINAPI RtlCopySecurityDescriptor(PSECURITY_DESCRIPTOR pSourceSD, PSECUR length = RtlLengthSid( Group ); RtlCopySid(length, SELF_RELATIVE_FIELD( dst, Group ), Group); } - if (src->Control & SE_SACL_PRESENT) + if ((src->Control & SE_SACL_PRESENT) && src->Sacl) { Sacl = (PACL)SELF_RELATIVE_FIELD( src, Sacl ); copy_acl(Sacl->AclSize, (PACL)SELF_RELATIVE_FIELD( dst, Sacl ), Sacl); } - if (src->Control & SE_DACL_PRESENT) + if ((src->Control & SE_DACL_PRESENT) && src->Dacl) { Dacl = (PACL)SELF_RELATIVE_FIELD( src, Dacl ); copy_acl(Dacl->AclSize, (PACL)SELF_RELATIVE_FIELD( dst, Dacl ), Dacl); @@ -604,7 +604,7 @@ NTSTATUS WINAPI RtlGetDaclSecurityDescriptor( if ( (*lpbDaclPresent = (SE_DACL_PRESENT & lpsd->Control) ? 1 : 0) ) { - if ( SE_SELF_RELATIVE & lpsd->Control) + if ((SE_SELF_RELATIVE & lpsd->Control) && lpsd->Dacl) *pDacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Dacl ); else *pDacl = lpsd->Dacl; @@ -673,7 +673,7 @@ NTSTATUS WINAPI RtlGetSaclSecurityDescriptor( if ( (*lpbSaclPresent = (SE_SACL_PRESENT & lpsd->Control) ? 1 : 0) ) { - if (SE_SELF_RELATIVE & lpsd->Control) + if ((SE_SELF_RELATIVE & lpsd->Control) && lpsd->Sacl) *pSacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Sacl ); else *pSacl = lpsd->Sacl; @@ -944,14 +944,14 @@ NTSTATUS WINAPI RtlSelfRelativeToAbsoluteSD( status = STATUS_BUFFER_TOO_SMALL; } - if (pRel->Control & SE_DACL_PRESENT && + if ((pRel->Control & SE_DACL_PRESENT) && pRel->Dacl && *lpdwDaclSize < ((PACL)SELF_RELATIVE_FIELD(pRel,Dacl))->AclSize) { *lpdwDaclSize = ((PACL)SELF_RELATIVE_FIELD(pRel,Dacl))->AclSize; status = STATUS_BUFFER_TOO_SMALL; } - if (pRel->Control & SE_SACL_PRESENT && + if ((pRel->Control & SE_SACL_PRESENT) && pRel->Sacl && *lpdwSaclSize < ((PACL)SELF_RELATIVE_FIELD(pRel,Sacl))->AclSize) { *lpdwSaclSize = ((PACL)SELF_RELATIVE_FIELD(pRel,Sacl))->AclSize; @@ -983,7 +983,7 @@ NTSTATUS WINAPI RtlSelfRelativeToAbsoluteSD( pAbs->Owner = NULL; pAbs->Group = NULL; - if (pRel->Control & SE_SACL_PRESENT) + if ((pRel->Control & SE_SACL_PRESENT) && pRel->Sacl) { PACL pAcl = (PACL)SELF_RELATIVE_FIELD( pRel, Sacl ); @@ -991,7 +991,7 @@ NTSTATUS WINAPI RtlSelfRelativeToAbsoluteSD( pAbs->Sacl = pSacl; } - if (pRel->Control & SE_DACL_PRESENT) + if ((pRel->Control & SE_DACL_PRESENT) && pRel->Dacl) { PACL pAcl = (PACL)SELF_RELATIVE_FIELD( pRel, Dacl ); memcpy(pDacl, pAcl, pAcl->AclSize);

1 0

Alexandre Julliard : advapi32: Implemented RegDeleteKeyExA/W.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 9b7d1041fc198d62145ddedcda174c7fc515eb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7d1041fc198d62145ddedcd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 13:12:31 2010 +0100 advapi32: Implemented RegDeleteKeyExA/W. --- dlls/advapi32/advapi32.spec | 2 + dlls/advapi32/registry.c | 66 ++++++++++++++++++++++++++++--------------- include/winreg.h | 3 ++ 3 files changed, 48 insertions(+), 23 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 806cecf..892e84a 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -472,6 +472,8 @@ @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyW(long wstr ptr) @ stdcall RegDeleteKeyA(long str) +@ stdcall RegDeleteKeyExA(long str long long) +@ stdcall RegDeleteKeyExW(long wstr long long) @ stdcall RegDeleteKeyW(long wstr) @ stdcall RegDeleteTreeA(long str) @ stdcall RegDeleteTreeW(long wstr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index b9cb8c5..faae2b1 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -931,11 +931,9 @@ LSTATUS WINAPI RegCloseKey( HKEY hkey ) /****************************************************************************** - * RegDeleteKeyW [ADVAPI32.@] - * - * See RegDeleteKeyA. + * RegDeleteKeyExW [ADVAPI32.@] */ -LSTATUS WINAPI RegDeleteKeyW( HKEY hkey, LPCWSTR name ) +LSTATUS WINAPI RegDeleteKeyExW( HKEY hkey, LPCWSTR name, REGSAM access, DWORD reserved ) { DWORD ret; HKEY tmp; @@ -944,7 +942,8 @@ LSTATUS WINAPI RegDeleteKeyW( HKEY hkey, LPCWSTR name ) if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; - if (!(ret = RegOpenKeyExW( hkey, name, 0, DELETE, &tmp ))) + access &= KEY_WOW64_64KEY | KEY_WOW64_32KEY; + if (!(ret = RegOpenKeyExW( hkey, name, 0, access | DELETE, &tmp ))) { ret = RtlNtStatusToDosError( NtDeleteKey( tmp ) ); RegCloseKey( tmp ); @@ -955,24 +954,20 @@ LSTATUS WINAPI RegDeleteKeyW( HKEY hkey, LPCWSTR name ) /****************************************************************************** - * RegDeleteKeyA [ADVAPI32.@] - * - * Delete a registry key. - * - * PARAMS - * hkey [I] Handle to parent key containing the key to delete - * name [I] Name of the key user hkey to delete - * - * NOTES - * - * MSDN is wrong when it says that hkey must be opened with the DELETE access - * right. In reality, it opens a new handle with DELETE access. + * RegDeleteKeyW [ADVAPI32.@] * - * RETURNS - * Success: ERROR_SUCCESS - * Failure: Error code + * See RegDeleteKeyA. */ -LSTATUS WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name ) +LSTATUS WINAPI RegDeleteKeyW( HKEY hkey, LPCWSTR name ) +{ + return RegDeleteKeyExW( hkey, name, 0, 0 ); +} + + +/****************************************************************************** + * RegDeleteKeyExA [ADVAPI32.@] + */ +LSTATUS WINAPI RegDeleteKeyExA( HKEY hkey, LPCSTR name, REGSAM access, DWORD reserved ) { DWORD ret; HKEY tmp; @@ -981,7 +976,8 @@ LSTATUS WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name ) if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; - if (!(ret = RegOpenKeyExA( hkey, name, 0, DELETE, &tmp ))) + access &= KEY_WOW64_64KEY | KEY_WOW64_32KEY; + if (!(ret = RegOpenKeyExA( hkey, name, 0, access | DELETE, &tmp ))) { if (!is_version_nt()) /* win95 does recursive key deletes */ { @@ -989,7 +985,7 @@ LSTATUS WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name ) while(!RegEnumKeyA(tmp, 0, name, sizeof(name))) { - if(RegDeleteKeyA(tmp, name)) /* recurse */ + if(RegDeleteKeyExA(tmp, name, access, reserved)) /* recurse */ break; } } @@ -1001,6 +997,30 @@ LSTATUS WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name ) } +/****************************************************************************** + * RegDeleteKeyA [ADVAPI32.@] + * + * Delete a registry key. + * + * PARAMS + * hkey [I] Handle to parent key containing the key to delete + * name [I] Name of the key user hkey to delete + * + * NOTES + * + * MSDN is wrong when it says that hkey must be opened with the DELETE access + * right. In reality, it opens a new handle with DELETE access. + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: Error code + */ +LSTATUS WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name ) +{ + return RegDeleteKeyExA( hkey, name, 0, 0 ); +} + + /****************************************************************************** * RegSetValueExW [ADVAPI32.@] diff --git a/include/winreg.h b/include/winreg.h index e532459..145a026 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -104,6 +104,9 @@ WINADVAPI LSTATUS WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSA WINADVAPI LSTATUS WINAPI RegDeleteKeyA(HKEY,LPCSTR); WINADVAPI LSTATUS WINAPI RegDeleteKeyW(HKEY,LPCWSTR); #define RegDeleteKey WINELIB_NAME_AW(RegDeleteKey) +WINADVAPI LSTATUS WINAPI RegDeleteKeyExA(HKEY,LPCSTR,REGSAM,DWORD); +WINADVAPI LSTATUS WINAPI RegDeleteKeyExW(HKEY,LPCWSTR,REGSAM,DWORD); +#define RegDeleteKeyEx WINELIB_NAME_AW(RegDeleteKeyEx) WINADVAPI LSTATUS WINAPI RegDeleteKeyValueA(HKEY,LPCSTR,LPCSTR); WINADVAPI LSTATUS WINAPI RegDeleteKeyValueW(HKEY,LPCWSTR,LPCWSTR); #define RegDeleteKeyValue WINELIB_NAME_AW(RegDeleteKeyValue)

1 0

Alexandre Julliard : advapi32/tests: Avoid crashing if ReadEventLogA fails.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 4f6d085073cab7ff60f1d31d881c778c8d5cc692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6d085073cab7ff60f1d31d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 14:06:10 2010 +0100 advapi32/tests: Avoid crashing if ReadEventLogA fails. --- dlls/advapi32/tests/eventlog.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index c0f516a..3907873 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -776,21 +776,21 @@ static void test_readwrite(void) /* Needed to catch earlier Vista (with no ServicePack for example) */ buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); - ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, - 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); - - buf = HeapReAlloc(GetProcessHeap(), 0, buf, needed); - ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, - 0, buf, needed, &read, &needed); - - record = (EVENTLOGRECORD *)buf; + if (ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, sizeof(EVENTLOGRECORD), &read, &needed)) + { + buf = HeapReAlloc(GetProcessHeap(), 0, buf, needed); + ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, needed, &read, &needed); - /* Vista and W2K8 return EVENTLOG_SUCCESS, Windows versions before return - * the written eventtype (0x20 in this case). - */ - if (record->EventType == EVENTLOG_SUCCESS) - on_vista = TRUE; + record = (EVENTLOGRECORD *)buf; + /* Vista and W2K8 return EVENTLOG_SUCCESS, Windows versions before return + * the written eventtype (0x20 in this case). + */ + if (record->EventType == EVENTLOG_SUCCESS) + on_vista = TRUE; + } HeapFree(GetProcessHeap(), 0, buf); } ok(ret, "Expected success : %d\n", GetLastError());

1 0

Gabriele Moabiti : comdlg32: Open should try to browse directory first.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: c65a3e81f76bc1c124a262d7a9db96db35c3913f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65a3e81f76bc1c124a262d7a… Author: Gabriele Moabiti <gabmoa(a)yahoo.it> Date: Mon Feb 15 14:48:11 2010 +0100 comdlg32: Open should try to browse directory first. --- dlls/comdlg32/filedlg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 5e8f75e..58b57cc 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1989,15 +1989,15 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) TRACE("hwnd=%p\n", hwnd); + /* try to browse the selected item */ + if(BrowseSelectedFolder(hwnd)) + return FALSE; + /* get the files from the edit control */ nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed); - /* try if the user selected a folder in the shellview */ if(nFileCount == 0) - { - BrowseSelectedFolder(hwnd); return FALSE; - } if(nFileCount > 1) {

1 0

Hans Leidekker : msi: Implement MsiSetMode.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: a11882fc0f379c68f14f37d4d0fcc852623e1fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11882fc0f379c68f14f37d4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 18 12:46:58 2010 +0100 msi: Implement MsiSetMode. --- dlls/msi/install.c | 48 +++++++++++++++++++++++++++++++++++++++++- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 8 +++++++ dlls/msi/tests/automation.c | 15 +++++++++++++ 4 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index b1d741a..7a71867 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -719,8 +719,52 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) */ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) { - FIXME("%d %d %d\n", hInstall, iRunMode, fState); - return ERROR_SUCCESS; + MSIPACKAGE *package; + UINT r; + + TRACE("%d %d %d\n", hInstall, iRunMode, fState); + + package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); + if (!package) + { + HRESULT hr; + IWineMsiRemotePackage *remote_package; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ); + if (!remote_package) + return FALSE; + + hr = IWineMsiRemotePackage_SetMode( remote_package, iRunMode, fState ); + IWineMsiRemotePackage_Release( remote_package ); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } + + switch (iRunMode) + { + case MSIRUNMODE_REBOOTATEND: + package->need_reboot = 1; + r = ERROR_SUCCESS; + break; + + case MSIRUNMODE_REBOOTNOW: + FIXME("unimplemented run mode\n"); + r = ERROR_FUNCTION_FAILED; + break; + + default: + r = ERROR_ACCESS_DENIED; + } + + return r; } /*********************************************************************** diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 8e49368..25210fe 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -63,6 +63,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetTargetPath( [in] BSTR folder, [in] BSTR value ); HRESULT GetSourcePath( [in] BSTR folder, [out] BSTR *value, [out] DWORD *size ); HRESULT GetMode( [in] MSIRUNMODE mode, [out] BOOL *ret ); + HRESULT SetMode( [in] MSIRUNMODE mode, [in] BOOL state ); HRESULT GetFeatureState( [in] BSTR feature, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); HRESULT SetFeatureState( [in] BSTR feature, [in] INSTALLSTATE state ); HRESULT GetComponentState( [in] BSTR component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 53804e2..ad6d4c6 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2104,6 +2104,13 @@ static HRESULT WINAPI mrp_GetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode return S_OK; } +static HRESULT WINAPI mrp_SetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode, BOOL state ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiSetMode(This->package, mode, state); + return HRESULT_FROM_WIN32(r); +} + static HRESULT WINAPI mrp_GetFeatureState( IWineMsiRemotePackage *iface, BSTR feature, INSTALLSTATE *installed, INSTALLSTATE *action ) { @@ -2196,6 +2203,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_SetTargetPath, mrp_GetSourcePath, mrp_GetMode, + mrp_SetMode, mrp_GetFeatureState, mrp_SetFeatureState, mrp_GetComponentState, diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 8a0eede..cab6cb7 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1865,6 +1865,10 @@ static void test_Session(IDispatch *pSession) ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); todo_wine ok(!bool, "Reboot at end session mode is %d\n", bool); + hr = Session_ModeGet(pSession, MSIRUNMODE_MAINTENANCE, &bool); + ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); + todo_wine ok(!bool, "Maintenance mode is %d\n", bool); + /* Session::Mode, put */ hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); @@ -1874,6 +1878,17 @@ static void test_Session(IDispatch *pSession) hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); + todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &bool); + ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); + ok(bool, "Reboot now mode is %d, expected 1\n", bool); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ + todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + + hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE); + ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr); + /* Session::Database, get */ hr = Session_Database(pSession, &pDatabase); ok(hr == S_OK, "Session_Database failed, hresult 0x%08x\n", hr);

1 0