February 2010 - Wine-Commits

Paul Vriens : cmd/tests: Compare strings case-insensitive.
by Alexandre Julliard Feb. 19, 2010

Feb. 19, 2010

Module: wine Branch: master Commit: 2ef610176828d477641224790379ccfdf51035cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef610176828d477641224790… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 19 10:13:44 2010 +0100 cmd/tests: Compare strings case-insensitive. --- programs/cmd/tests/batch.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 0b4efda..ca40ada 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -110,7 +110,9 @@ static const char *compare_line(const char *out_line, const char *out_end, const if(exp_ptr+sizeof(pwd_cmd) <= exp_end && !memcmp(exp_ptr, pwd_cmd, sizeof(pwd_cmd))) { exp_ptr += sizeof(pwd_cmd); - if(out_end-out_ptr < workdir_len || memcmp(out_ptr, workdir, workdir_len)) + if(out_end-out_ptr < workdir_len + || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, out_ptr, workdir_len, + workdir, workdir_len) != CSTR_EQUAL)) return out_ptr; out_ptr += workdir_len; continue;

1 0

Jacek Caban : urlmon.idl: Added some missing declarations.
by Alexandre Julliard Feb. 18, 2010

Feb. 18, 2010

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

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

Feb. 18, 2010

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 Feb. 18, 2010

Feb. 18, 2010

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 Feb. 18, 2010

Feb. 18, 2010

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

Alexandre Julliard : advapi32: Implemented RegDeleteKeyExA/W.
by Alexandre Julliard Feb. 18, 2010

Feb. 18, 2010

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 Feb. 18, 2010

Feb. 18, 2010

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

Huw Davies : fonts: Add a 9 ppem bitmap strike to Tahoma Bold.
by Alexandre Julliard Feb. 18, 2010

Feb. 18, 2010

Module: wine Branch: master Commit: b10f8f254e7c424d80e503d00294de5ff880851f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b10f8f254e7c424d80e503d00… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 18 12:36:36 2010 +0000 fonts: Add a 9 ppem bitmap strike to Tahoma Bold. --- fonts/tahomabd.sfd | 1009 ++++++++++++++++++++++++++++++++++++++++++++++++---- fonts/tahomabd.ttf | Bin 80408 -> 86440 bytes 2 files changed, 937 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b10f8f254e7c424d80e50…

1 0

Dmitry Timoshkov : comctl32: Listview should accept both unicode and ansi notifications.
by Alexandre Julliard Feb. 18, 2010

Feb. 18, 2010

Module: wine Branch: master Commit: c1fd55d6c9b81ca2a3e1ae00b8078d83088ac56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fd55d6c9b81ca2a3e1ae00b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 18 20:46:27 2010 +0800 comctl32: Listview should accept both unicode and ansi notifications. Listview receives notifications not only from built-in header control, but also from custom or subclassed application controls, there is no need to assert(0) on application input, printing a FIXME is the maximum we can do on an unknown input. --- dlls/comctl32/listview.c | 18 +++++++++++++++--- dlls/comctl32/tests/listview.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cf06e09..2d39675 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -753,25 +753,37 @@ static int get_ansi_notification(UINT unicodeNotificationCode) { switch (unicodeNotificationCode) { + case LVN_BEGINLABELEDITA: case LVN_BEGINLABELEDITW: return LVN_BEGINLABELEDITA; + case LVN_ENDLABELEDITA: case LVN_ENDLABELEDITW: return LVN_ENDLABELEDITA; + case LVN_GETDISPINFOA: case LVN_GETDISPINFOW: return LVN_GETDISPINFOA; + case LVN_SETDISPINFOA: case LVN_SETDISPINFOW: return LVN_SETDISPINFOA; + case LVN_ODFINDITEMA: case LVN_ODFINDITEMW: return LVN_ODFINDITEMA; + case LVN_GETINFOTIPA: case LVN_GETINFOTIPW: return LVN_GETINFOTIPA; /* header forwards */ + case HDN_TRACKA: case HDN_TRACKW: return HDN_TRACKA; + case HDN_ENDTRACKA: case HDN_ENDTRACKW: return HDN_ENDTRACKA; case HDN_BEGINDRAG: return HDN_BEGINDRAG; case HDN_ENDDRAG: return HDN_ENDDRAG; + case HDN_ITEMCHANGINGA: case HDN_ITEMCHANGINGW: return HDN_ITEMCHANGINGA; + case HDN_ITEMCHANGEDA: case HDN_ITEMCHANGEDW: return HDN_ITEMCHANGEDA; + case HDN_ITEMCLICKA: case HDN_ITEMCLICKW: return HDN_ITEMCLICKA; + case HDN_DIVIDERDBLCLICKA: case HDN_DIVIDERDBLCLICKW: return HDN_DIVIDERDBLCLICKA; + default: break; } - ERR("unknown notification %x\n", unicodeNotificationCode); - assert(FALSE); - return 0; + FIXME("unknown notification %x\n", unicodeNotificationCode); + return unicodeNotificationCode; } /* forwards header notifications to listview parent */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9014f72..0a147b6 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4290,6 +4290,45 @@ static void test_destroynotify(void) ok_sequence(sequences, COMBINED_SEQ_INDEX, listview_destroy, "check destroy order", FALSE); } +static void test_header_notification(void) +{ + HWND list, header; + HDITEMA item; + NMHEADER nmh; + LVCOLUMNA col; + LRESULT ret; + + list = create_listview_control(LVS_REPORT); + ok(list != 0, "failed to create listview window\n"); + + memset(&col, 0, sizeof(col)); + col.mask = LVCF_WIDTH; + col.cx = 100; + ret = SendMessage(list, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); + ok(!ret, "expected 0, got %ld\n", ret); + + header = subclass_header(list); + + ret = SendMessage(header, HDM_GETITEMCOUNT, 0, 0); + ok(ret == 1, "expected header item count 1, got %ld\n", ret); + + ret = SendMessage(header, HDM_GETITEMA, 0, (LPARAM)&item); + ok(ret, "HDM_GETITEM failed\n"); + + nmh.hdr.hwndFrom = header; + nmh.hdr.idFrom = GetWindowLongPtr(header, GWLP_ID); + nmh.hdr.code = HDN_ITEMCHANGEDA; + nmh.iItem = 0; + nmh.iButton = 0; + item.mask = HDI_WIDTH; + item.cxy = 50; + nmh.pitem = &item; + ret = SendMessage(list, WM_NOTIFY, 0, (LPARAM)&nmh); + ok(!ret, "WM_NOTIFY/HDN_ITEMCHANGED failed\n"); + + DestroyWindow(list); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4318,6 +4357,7 @@ START_TEST(listview) g_is_below_5 = is_below_comctl_5(); + test_header_notification(); test_images(); test_checkboxes(); test_items();

1 0

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

Feb. 18, 2010

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