March 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32/tests: Add some tests for GetCursorInfo.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: 0be02116826ef9168fd33e0fd66b98cbd15bee0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be02116826ef9168fd33e0fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 11:27:55 2010 +0100 user32/tests: Add some tests for GetCursorInfo. --- dlls/user32/tests/cursoricon.c | 71 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index ceca35d..574d5cd 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -64,6 +64,8 @@ static HANDLE child_process; #define PROC_INIT (WM_USER+1) +static BOOL (WINAPI *pGetCursorInfo)(CURSORINFO *); + static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { BOOL ret; @@ -1374,12 +1376,24 @@ static void test_SetCursor(void) { static const BYTE bmp_bits[4096]; ICONINFO cursorInfo; - HCURSOR cursor, old_cursor; + HCURSOR cursor, old_cursor, global_cursor = 0; DWORD error, id, result; UINT display_bpp; HDC hdc; HANDLE thread; + CURSORINFO info; + if (pGetCursorInfo) + { + memset( &info, 0, sizeof(info) ); + info.cbSize = sizeof(info); + if (!pGetCursorInfo( &info )) + { + win_skip( "GetCursorInfo not working\n" ); + pGetCursorInfo = NULL; + } + else global_cursor = info.hCursor; + } cursor = GetCursor(); thread = CreateThread( NULL, 0, set_cursor_thread, 0, 0, &id ); WaitForSingleObject( thread, 1000 ); @@ -1400,6 +1414,14 @@ static void test_SetCursor(void) ok(cursor != NULL, "CreateIconIndirect returned %p\n", cursor); old_cursor = SetCursor( cursor ); + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + /* global cursor doesn't change since we don't have a window */ + ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ + "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + } thread = CreateThread( NULL, 0, set_cursor_thread, 0, 0, &id ); WaitForSingleObject( thread, 1000 ); GetExitCodeThread( thread, &result ); @@ -1425,6 +1447,13 @@ static void test_SetCursor(void) ok( result == (DWORD_PTR)old_cursor, "wrong thread cursor %x/%p\n", result, old_cursor ); todo_wine ok( GetCursor() == cursor, "wrong cursor %p/0\n", cursor ); + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ + "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + } SetCursor( old_cursor ); DestroyCursor( cursor ); @@ -1434,6 +1463,14 @@ static void test_SetCursor(void) ok( cursor == 0, "wrong cursor %p/0\n", cursor ); todo_wine ok( error == ERROR_INVALID_CURSOR_HANDLE || broken( error == 0xdeadbeef ), /* win9x */ "wrong error %u\n", error ); + + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ + "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + } } static HANDLE event_start, event_next; @@ -1461,6 +1498,15 @@ static void test_ShowCursor(void) int count; DWORD id, result; HANDLE thread; + CURSORINFO info; + + if (pGetCursorInfo) + { + memset( &info, 0, sizeof(info) ); + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + } event_start = CreateEvent( NULL, FALSE, FALSE, NULL ); event_next = CreateEvent( NULL, FALSE, FALSE, NULL ); @@ -1478,6 +1524,14 @@ static void test_ShowCursor(void) count = ShowCursor( FALSE ); ok( count == -2, "wrong count %d\n", count ); + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + /* global show count is not affected since we don't have a window */ + todo_wine ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + } + parent_id = 0; thread = CreateThread( NULL, 0, show_cursor_thread, NULL, 0, &id ); WaitForSingleObject( event_start, 1000 ); @@ -1524,10 +1578,24 @@ static void test_ShowCursor(void) count = ShowCursor( FALSE ); ok( count == -2, "wrong count %d\n", count ); + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + todo_wine ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + } + count = ShowCursor( TRUE ); ok( count == -1, "wrong count %d\n", count ); count = ShowCursor( TRUE ); ok( count == 0, "wrong count %d\n", count ); + + if (pGetCursorInfo) + { + info.cbSize = sizeof(info); + ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); + ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + } } @@ -1613,6 +1681,7 @@ static void test_DestroyCursor(void) START_TEST(cursoricon) { + pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); test_argc = winetest_get_mainargs(&test_argv); if (test_argc >= 3)

1 0

Alexandre Julliard : user32/tests: Add some tests for ShowCursor.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: d2ec02e06f8cef15d996795e6de95de4ec5e8e50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ec02e06f8cef15d996795e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 18 19:26:36 2010 +0100 user32/tests: Add some tests for ShowCursor. --- dlls/user32/tests/cursoricon.c | 95 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 1ebe665..ceca35d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1436,6 +1436,100 @@ static void test_SetCursor(void) "wrong error %u\n", error ); } +static HANDLE event_start, event_next; + +static DWORD CALLBACK show_cursor_thread( void *arg ) +{ + DWORD count = (DWORD_PTR)arg; + int ret; + + PeekMessage( 0, 0, 0, 0, PM_NOREMOVE ); /* create a msg queue */ + if (parent_id) + { + BOOL ret = AttachThreadInput( GetCurrentThreadId(), parent_id, TRUE ); + ok( ret, "AttachThreadInput failed\n" ); + } + if (!count) ret = ShowCursor( FALSE ); + else while (count--) ret = ShowCursor( TRUE ); + SetEvent( event_start ); + WaitForSingleObject( event_next, 2000 ); + return ret; +} + +static void test_ShowCursor(void) +{ + int count; + DWORD id, result; + HANDLE thread; + + event_start = CreateEvent( NULL, FALSE, FALSE, NULL ); + event_next = CreateEvent( NULL, FALSE, FALSE, NULL ); + + count = ShowCursor( TRUE ); + ok( count == 1, "wrong count %d\n", count ); + count = ShowCursor( TRUE ); + ok( count == 2, "wrong count %d\n", count ); + count = ShowCursor( FALSE ); + ok( count == 1, "wrong count %d\n", count ); + count = ShowCursor( FALSE ); + ok( count == 0, "wrong count %d\n", count ); + count = ShowCursor( FALSE ); + ok( count == -1, "wrong count %d\n", count ); + count = ShowCursor( FALSE ); + ok( count == -2, "wrong count %d\n", count ); + + parent_id = 0; + thread = CreateThread( NULL, 0, show_cursor_thread, NULL, 0, &id ); + WaitForSingleObject( event_start, 1000 ); + count = ShowCursor( FALSE ); + ok( count == -3, "wrong count %d\n", count ); + SetEvent( event_next ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == -1, "wrong thread count %d\n", result ); + count = ShowCursor( FALSE ); + ok( count == -4, "wrong count %d\n", count ); + + thread = CreateThread( NULL, 0, show_cursor_thread, (void *)1, 0, &id ); + WaitForSingleObject( event_start, 1000 ); + count = ShowCursor( TRUE ); + ok( count == -3, "wrong count %d\n", count ); + SetEvent( event_next ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + ok( result == 1, "wrong thread count %d\n", result ); + count = ShowCursor( TRUE ); + ok( count == -2, "wrong count %d\n", count ); + + parent_id = GetCurrentThreadId(); + thread = CreateThread( NULL, 0, show_cursor_thread, NULL, 0, &id ); + WaitForSingleObject( event_start, 1000 ); + count = ShowCursor( TRUE ); + todo_wine ok( count == -2, "wrong count %d\n", count ); + SetEvent( event_next ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + todo_wine ok( result == -3, "wrong thread count %d\n", result ); + count = ShowCursor( FALSE ); + ok( count == -2, "wrong count %d\n", count ); + + thread = CreateThread( NULL, 0, show_cursor_thread, (void *)3, 0, &id ); + WaitForSingleObject( event_start, 1000 ); + count = ShowCursor( TRUE ); + todo_wine ok( count == 2, "wrong count %d\n", count ); + SetEvent( event_next ); + WaitForSingleObject( thread, 1000 ); + GetExitCodeThread( thread, &result ); + todo_wine ok( result == 1, "wrong thread count %d\n", result ); + count = ShowCursor( FALSE ); + ok( count == -2, "wrong count %d\n", count ); + + count = ShowCursor( TRUE ); + ok( count == -1, "wrong count %d\n", count ); + count = ShowCursor( TRUE ); + ok( count == 0, "wrong count %d\n", count ); +} + static void test_DestroyCursor(void) { @@ -1548,6 +1642,7 @@ START_TEST(cursoricon) test_DrawIconEx(); test_DrawState(); test_SetCursor(); + test_ShowCursor(); test_DestroyCursor(); do_parent(); test_child_process();

1 0

Alexandre Julliard : gdiplus/tests: Create a window for graphics tests instead of painting over the desktop.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: be748e0d713d7874f3ff7e6cd036d02a59c4e156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be748e0d713d7874f3ff7e6cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 11:42:53 2010 +0100 gdiplus/tests: Create a window for graphics tests instead of painting over the desktop. --- dlls/gdiplus/tests/graphics.c | 140 +++++++++++++++++++---------------------- 1 files changed, 65 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be748e0d713d7874f3ff7…

1 0

André Hentschel : README.de: Sync german filesystem support section.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: a72b363ef468411295723dcd3bd8a07038b3c53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72b363ef468411295723dcd3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 18 18:41:55 2010 +0100 README.de: Sync german filesystem support section. --- documentation/README.de | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index ba265cd..9aa272b 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -68,8 +68,7 @@ Mac OS X Info: Sie benötigen mindestens Xcode 2.4 um richtig unter x86 kompilieren zu können. Unterstützte Dateisysteme: - Wine sollte auf den meisten Dateisystemen laufen. Jedoch wird Wine nicht - starten, wenn umsdos für das Verzeichnis /tmp benutzt wird. Ein paar + Wine sollte auf den meisten Dateisystemen laufen. Ein paar Kompatibilitäts-Probleme wurden auch gemeldet beim Dateizugriff über Samba. Ausserdem können wir, da NTFS derzeit nur sicher für Lesezugriffe genutzt werden kann, den Einsatz von NTFS nicht empfehlen; Windows-Programme

1 0

Alexandre Julliard : user32: Return fake global information in GetCursorInfo instead of thread-local values .
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: c83ea46e1aaf8f8ca130cfe70435daf388b57daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83ea46e1aaf8f8ca130cfe70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 11:31:26 2010 +0100 user32: Return fake global information in GetCursorInfo instead of thread-local values. --- dlls/user32/input.c | 4 ++-- dlls/user32/tests/cursoricon.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 22d236e..f14590d 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -208,8 +208,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) { if (!pci) return 0; - if (get_user_thread_info()->cursor_count >= 0) pci->flags = CURSOR_SHOWING; - else pci->flags = 0; + pci->hCursor = LoadCursorW( 0, (LPCWSTR)IDC_ARROW ); + pci->flags = CURSOR_SHOWING; GetCursorPos(&pci->ptScreenPos); return 1; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 574d5cd..650e5fc 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1529,7 +1529,7 @@ static void test_ShowCursor(void) info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); /* global show count is not affected since we don't have a window */ - todo_wine ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); } parent_id = 0; @@ -1582,7 +1582,7 @@ static void test_ShowCursor(void) { info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - todo_wine ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); } count = ShowCursor( TRUE );

1 0

Nikolay Sivov : shlwapi: Fix StrCpyNW to deal with null inputs better, and don't use lstrcpynW.
by Alexandre Julliard March 18, 2010

March 18, 2010

Module: wine Branch: master Commit: 93b3ba76f6874cef44fbf4a8aa62afbe0b86b97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b3ba76f6874cef44fbf4a8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 18:42:28 2010 +0300 shlwapi: Fix StrCpyNW to deal with null inputs better, and don't use lstrcpynW. --- dlls/shlwapi/string.c | 28 +++++++++++++++++++--------- dlls/shlwapi/tests/string.c | 27 +++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index cfb59ea..e00a925 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -507,22 +507,32 @@ LPWSTR WINAPI StrCpyW(LPWSTR lpszStr, LPCWSTR lpszSrc) * Copy a string to another string, up to a maximum number of characters. * * PARAMS - * lpszStr [O] Destination string - * lpszSrc [I] Source string - * iLen [I] Maximum number of chars to copy + * dst [O] Destination string + * src [I] Source string + * count [I] Maximum number of chars to copy * * RETURNS - * lpszStr. + * dst. */ -LPWSTR WINAPI StrCpyNW(LPWSTR lpszStr, LPCWSTR lpszSrc, int iLen) +LPWSTR WINAPI StrCpyNW(LPWSTR dst, LPCWSTR src, int count) { - TRACE("(%p,%s,%i)\n", lpszStr, debugstr_w(lpszSrc), iLen); + LPWSTR d = dst; + LPCWSTR s = src; - lstrcpynW(lpszStr, lpszSrc, iLen); - return lpszStr; -} + TRACE("(%p,%s,%i)\n", dst, debugstr_w(src), count); + if (s) + { + while ((count > 1) && *s) + { + count--; + *d++ = *s++; + } + } + if (count) *d = 0; + return dst; +} /************************************************************************* * SHLWAPI_StrStrHelperA diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 00f0b02..17c652d 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -863,6 +863,33 @@ static void test_StrXXX_overflows(void) else win_skip("StrCatBuffA() is not available\n"); +if (0) +{ + /* crashes on XP */ + StrCpyNW(wbuf, (LPCWSTR)0x1, 10); + StrCpyNW((LPWSTR)0x1, wstr1, 10); +} + + memset(wbuf, 0xbf, sizeof(wbuf)); + expect_eq(StrCpyNW(wbuf, (LPCWSTR)0x1, 1), wbuf, PWCHAR, "%p"); + expect_eq(wbuf[0], 0, WCHAR, "%x"); + expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); + + memset(wbuf, 0xbf, sizeof(wbuf)); + expect_eq(StrCpyNW(wbuf, 0, 10), wbuf, PWCHAR, "%p"); + expect_eq(wbuf[0], 0, WCHAR, "%x"); + expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); + + memset(wbuf, 0xbf, sizeof(wbuf)); + expect_eq(StrCpyNW(wbuf, 0, 0), wbuf, PWCHAR, "%p"); + expect_eq(wbuf[0], (WCHAR)0xbfbf, WCHAR, "%x"); + expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); + + memset(wbuf, 0xbf, sizeof(wbuf)); + expect_eq(StrCpyNW(wbuf, wstr1, 0), wbuf, PWCHAR, "%p"); + expect_eq(wbuf[0], (WCHAR)0xbfbf, WCHAR, "%x"); + expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); + memset(wbuf, 0xbf, sizeof(wbuf)); expect_eq(StrCpyNW(wbuf, wstr1, 10), wbuf, PWCHAR, "%p"); expect_eq(wbuf[9], 0, WCHAR, "%x");

1 0

Aric Stewart : msctf: Add stub for ITfDisplayAttributeMgr.
by Alexandre Julliard March 18, 2010

March 18, 2010

Module: wine Branch: master Commit: e669ffe6e52d6f5193dd3a71c372ca9bfc42a621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e669ffe6e52d6f5193dd3a71c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 18 10:39:00 2010 -0500 msctf: Add stub for ITfDisplayAttributeMgr. --- dlls/msctf/Makefile.in | 1 + dlls/msctf/displayattributemgr.c | 139 ++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf.c | 1 + dlls/msctf/msctf_internal.h | 1 + dlls/msctf/regsvr.c | 7 ++ dlls/uuid/uuid.c | 1 + include/msctf.idl | 2 +- 7 files changed, 151 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in index 2e52b09..bb1c35a 100644 --- a/dlls/msctf/Makefile.in +++ b/dlls/msctf/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ categorymgr.c \ compartmentmgr.c \ context.c \ + displayattributemgr.c \ documentmgr.c \ inputprocessor.c \ langbarmgr.c \ diff --git a/dlls/msctf/displayattributemgr.c b/dlls/msctf/displayattributemgr.c new file mode 100644 index 0000000..75248cd --- /dev/null +++ b/dlls/msctf/displayattributemgr.c @@ -0,0 +1,139 @@ +/* + * ITfDisplayAttributeMgr implementation + * + * Copyright 2010 CodeWeavers, Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "wine/debug.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "msctf.h" +#include "msctf_internal.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + +typedef struct tagDisplayAttributeMgr { + const ITfDisplayAttributeMgrVtbl *DisplayAttributeMgrVtbl; + + LONG refCount; + +} DisplayAttributeMgr; + +static void DisplayAttributeMgr_Destructor(DisplayAttributeMgr *This) +{ + TRACE("destroying %p\n", This); + + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI DisplayAttributeMgr_QueryInterface(ITfDisplayAttributeMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfDisplayAttributeMgr)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI DisplayAttributeMgr_AddRef(ITfDisplayAttributeMgr *iface) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI DisplayAttributeMgr_Release(ITfDisplayAttributeMgr *iface) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + DisplayAttributeMgr_Destructor(This); + return ret; +} + +/***************************************************** + * ITfDisplayAttributeMgr functions + *****************************************************/ + +static HRESULT WINAPI DisplayAttributeMgr_OnUpdateInfo(ITfDisplayAttributeMgr *iface) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayAttributeMgr_EnumDisplayAttributeInfo(ITfDisplayAttributeMgr *iface, IEnumTfDisplayAttributeInfo **ppEnum) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayAttributeMgr_GetDisplayAttributeInfo(ITfDisplayAttributeMgr *iface, REFGUID guid, ITfDisplayAttributeInfo **ppInfo, CLSID *pclsidOwner) +{ + DisplayAttributeMgr *This = (DisplayAttributeMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfDisplayAttributeMgrVtbl DisplayAttributeMgr_DisplayAttributeMgrVtbl = +{ + DisplayAttributeMgr_QueryInterface, + DisplayAttributeMgr_AddRef, + DisplayAttributeMgr_Release, + + DisplayAttributeMgr_OnUpdateInfo, + DisplayAttributeMgr_EnumDisplayAttributeInfo, + DisplayAttributeMgr_GetDisplayAttributeInfo +}; + +HRESULT DisplayAttributeMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + DisplayAttributeMgr *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(),0,sizeof(DisplayAttributeMgr)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->DisplayAttributeMgrVtbl= &DisplayAttributeMgr_DisplayAttributeMgrVtbl; + This->refCount = 1; + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + return S_OK; +} diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 62d1ff2..759fe7e 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -88,6 +88,7 @@ static const struct { {&CLSID_TF_InputProcessorProfiles, InputProcessorProfiles_Constructor}, {&CLSID_TF_CategoryMgr, CategoryMgr_Constructor}, {&CLSID_TF_LangBarMgr, LangBarMgr_Constructor}, + {&CLSID_TF_DisplayAttributeMgr, DisplayAttributeMgr_Constructor}, {NULL, NULL} }; diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 57423e9..9aaaad0 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -41,6 +41,7 @@ extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut); extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This); extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); +extern HRESULT DisplayAttributeMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager); extern HRESULT Context_Uninitialize(ITfContext *cxt); diff --git a/dlls/msctf/regsvr.c b/dlls/msctf/regsvr.c index 2af1f24..65ebb1d 100644 --- a/dlls/msctf/regsvr.c +++ b/dlls/msctf/regsvr.c @@ -469,6 +469,13 @@ static struct regsvr_coclass const coclass_list[] = { "msctf.dll", "Apartment" }, + { + &CLSID_TF_DisplayAttributeMgr, + "TF_DisplayAttributeMgr", + NULL, + "msctf.dll", + "Apartment" + }, { NULL } /* list terminator */ }; diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index e27dcac..5a1a255 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -121,6 +121,7 @@ DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9 DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); DEFINE_GUID(CLSID_TF_LangBarMgr, 0xebb08c45,0x6c4a,0x4fdc,0xae,0x53,0x4e,0xb8,0xc4,0xc7,0xdb,0x8e); +DEFINE_GUID(CLSID_TF_DisplayAttributeMgr, 0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53); DEFINE_GUID(CLSID_TaskbarList, 0x56fdf344,0xfd6d,0x11d0,0x95,0x8a,0x00,0x60,0x97,0xc9,0xa0,0x90); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); diff --git a/include/msctf.idl b/include/msctf.idl index fcb568e..2ed3866 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -44,7 +44,7 @@ cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") cpp_quote("EXTERN_C const CLSID CLSID_TF_LangBarMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;") -cpp_quote("DEFINE_GUID(CLSID_TF_DisplayAttributeMgr,0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53);") +cpp_quote("EXTERN_C const CLSID CLSID_TF_DisplayAttributeMgr;") /* GUIDs for Compartments */ cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_KEYBOARD_DISABLED;")

1 0

Julian Rüger : windowscodecs: Small spelling fixes.
by Alexandre Julliard March 18, 2010

March 18, 2010

Module: wine Branch: master Commit: c1660c9a2f773cfa487419df6bc10f97cb20e6a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1660c9a2f773cfa487419df6… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Mar 18 12:02:36 2010 +0100 windowscodecs: Small spelling fixes. --- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/pngformat.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 6f78821..017e604 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -570,7 +570,7 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) { - ERR("Trying to load JPEG picture, but JPEG supported not compiled in.\n"); + ERR("Trying to load JPEG picture, but JPEG support is not compiled in.\n"); return E_FAIL; } diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 22b37b0..5af680e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1320,13 +1320,13 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) { - ERR("Trying to load PNG picture, but PNG supported not compiled in.\n"); + ERR("Trying to load PNG picture, but PNG support is not compiled in.\n"); return E_FAIL; } HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) { - ERR("Trying to save PNG picture, but PNG supported not compiled in.\n"); + ERR("Trying to save PNG picture, but PNG support is not compiled in.\n"); return E_FAIL; }

1 0

Aric Stewart : winemp3.acm: Support mp3 decoding on Mac OS/ X Leopard systems.
by Alexandre Julliard March 18, 2010

March 18, 2010

Module: wine Branch: master Commit: 4430ab435d988a093d73c209c30bfc6e57c25051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4430ab435d988a093d73c209c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 17 10:58:32 2010 -0500 winemp3.acm: Support mp3 decoding on Mac OS/X Leopard systems. --- configure | 25 ++- configure.ac | 15 ++- dlls/winemp3.acm/Makefile.in | 2 +- dlls/winemp3.acm/mpegl3.c | 466 ++++++++++++++++++++++++++++++++---------- include/config.h.in | 13 ++ 5 files changed, 407 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4430ab435d988a093d73c…

1 0

Damjan Jovanovic : ntoskrnl.exe: Implement IoIsWdmVersionAvailable.
by Alexandre Julliard March 18, 2010

March 18, 2010

Module: wine Branch: master Commit: 555d8fe0534f16a66f5d7fb1a55a1ebdb236e812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=555d8fe0534f16a66f5d7fb1a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Mar 17 22:46:57 2010 +0200 ntoskrnl.exe: Implement IoIsWdmVersionAvailable. --- dlls/ntoskrnl.exe/ntoskrnl.c | 67 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0131d24..3513b01 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2,6 +2,7 @@ * ntoskrnl.exe implementation * * Copyright (C) 2007 Alexandre Julliard + * Copyright (C) 2010 Damjan Jovanovic * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -678,6 +679,72 @@ PCONFIGURATION_INFORMATION WINAPI IoGetConfigurationInformation(void) /*********************************************************************** + * IoIsWdmVersionAvailable (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoIsWdmVersionAvailable(UCHAR MajorVersion, UCHAR MinorVersion) +{ + DWORD version; + DWORD major; + DWORD minor; + + TRACE( "%d, 0x%X\n", MajorVersion, MinorVersion ); + + version = GetVersion(); + major = LOBYTE(version); + minor = HIBYTE(LOWORD(version)); + + if (MajorVersion == 6 && MinorVersion == 0) + { + /* Windows Vista, Windows Server 2008, Windows 7 */ + } + else if (MajorVersion == 1) + { + if (MinorVersion == 0x30) + { + /* Windows server 2003 */ + MajorVersion = 6; + MinorVersion = 0; + } + else if (MinorVersion == 0x20) + { + /* Windows XP */ + MajorVersion = 5; + MinorVersion = 1; + } + else if (MinorVersion == 0x10) + { + /* Windows 2000 */ + MajorVersion = 5; + MinorVersion = 0; + } + else if (MinorVersion == 0x05) + { + /* Windows ME */ + MajorVersion = 4; + MinorVersion = 0x5a; + } + else if (MinorVersion == 0x00) + { + /* Windows 98 */ + MajorVersion = 4; + MinorVersion = 0x0a; + } + else + { + FIXME( "unknown major %d minor 0x%X\n", MajorVersion, MinorVersion ); + return FALSE; + } + } + else + { + FIXME( "unknown major %d minor 0x%X\n", MajorVersion, MinorVersion ); + return FALSE; + } + return major > MajorVersion || (major == MajorVersion && minor >= MinorVersion); +} + + +/*********************************************************************** * IoQueryDeviceDescription (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE itype, PULONG bus, PCONFIGURATION_TYPE ctype, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 5e11bf9..0cbbbc6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -406,7 +406,7 @@ @ stub IoIsOperationSynchronous @ stub IoIsSystemThread @ stub IoIsValidNameGraftingBuffer -@ stub IoIsWdmVersionAvailable +@ stdcall IoIsWdmVersionAvailable(long long) @ stub IoMakeAssociatedIrp @ stub IoOpenDeviceInterfaceRegistryKey @ stub IoOpenDeviceRegistryKey

1 0