April 2009 - Wine-Commits - list.winehq.org

Christian Costa : mciqtz32: Remove all remaining tabs.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: ca0503d3e1223cbaaa56823819fb96d86bdb173b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0503d3e1223cbaaa5682381… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 21 23:32:09 2009 +0200 mciqtz32: Remove all remaining tabs. --- dlls/mciqtz32/mciqtz.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 0719c91..63b80f5 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -34,21 +34,21 @@ static DWORD MCIQTZ_mciClose(UINT, DWORD, LPMCI_GENERIC_PARMS); static DWORD MCIQTZ_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); /*======================================================================* - * MCI QTZ implementation * + * MCI QTZ implementation * *======================================================================*/ HINSTANCE MCIQTZ_hInstance = 0; /*********************************************************************** - * DllMain (MCIQTZ.0) + * DllMain (MCIQTZ.0) */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) { switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); - MCIQTZ_hInstance = hInstDLL; - break; + MCIQTZ_hInstance = hInstDLL; + break; } return TRUE; } @@ -415,11 +415,11 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS } /*======================================================================* - * MCI QTZ entry points * + * MCI QTZ entry points * *======================================================================*/ /************************************************************************** - * DriverProc (MCIQTZ.@) + * DriverProc (MCIQTZ.@) */ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2)

1 0

Aric Stewart : msctf/tests: Setup test framework for ITfThreadMgrEventSink.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 0cdb39fa2b5fda8d607f5c087d18834ad731d01c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cdb39fa2b5fda8d607f5c087… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 21 11:02:10 2009 -0500 msctf/tests: Setup test framework for ITfThreadMgrEventSink. --- dlls/msctf/tests/inputprocessor.c | 162 +++++++++++++++++++++++++++++++++++++ 1 files changed, 162 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 13b81c7..4fd61b5 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -34,8 +34,12 @@ static LANGID gLangid; static ITfCategoryMgr * g_cm = NULL; static ITfThreadMgr* g_tm = NULL; +static DWORD tmSinkCookie; +static DWORD tmSinkRefCount; + HRESULT RegisterTextService(REFCLSID rclsid); HRESULT UnregisterTextService(); +HRESULT ThreadMgrEventSink_Constructor(IUnknown **ppOut); DEFINE_GUID(CLSID_FakeService, 0xEDE1A7AD,0x66DE,0x47E0,0xB6,0x20,0x3E,0x92,0xF8,0x24,0x6B,0xF3); DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); @@ -194,6 +198,48 @@ static void test_Disable(void) ok(SUCCEEDED(hr),"Failed to disable text service\n"); } +static void test_ThreadMgrAdviseSinks(void) +{ + ITfSource *source = NULL; + HRESULT hr; + IUnknown *sink; + + hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfSource, (LPVOID*)&source); + ok(SUCCEEDED(hr),"Failed to get IID_ITfSource for ThreadMgr\n"); + if (!source) + return; + + ThreadMgrEventSink_Constructor(&sink); + + tmSinkRefCount = 1; + tmSinkCookie = 0; + hr = ITfSource_AdviseSink(source,&IID_ITfThreadMgrEventSink, sink, &tmSinkCookie); + ok(SUCCEEDED(hr),"Failed to Advise Sink\n"); + ok(tmSinkCookie!=0,"Failed to get sink cookie\n"); + + /* Advising the sink adds a ref, Relesing here lets the object be deleted + when unadvised */ + tmSinkRefCount = 2; + IUnknown_Release(sink); + ITfSource_Release(source); +} + +static void test_ThreadMgrUnadviseSinks(void) +{ + ITfSource *source = NULL; + HRESULT hr; + + hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfSource, (LPVOID*)&source); + ok(SUCCEEDED(hr),"Failed to get IID_ITfSource for ThreadMgr\n"); + if (!source) + return; + + tmSinkRefCount = 1; + hr = ITfSource_UnadviseSink(source, tmSinkCookie); + ok(SUCCEEDED(hr),"Failed to unadvise Sink\n"); + ITfSource_Release(source); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -203,9 +249,11 @@ START_TEST(inputprocessor) test_RegisterCategory(); test_EnumInputProcessorInfo(); test_Enable(); + test_ThreadMgrAdviseSinks(); test_EnumLanguageProfiles(); test_FindClosestCategory(); test_Disable(); + test_ThreadMgrUnadviseSinks(); test_UnregisterCategory(); test_Unregister(); } @@ -214,6 +262,120 @@ START_TEST(inputprocessor) cleanup(); } +/********************************************************************** + * ITfThreadMgrEventSink + **********************************************************************/ +typedef struct tagThreadMgrEventSink +{ + const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; + LONG refCount; +} ThreadMgrEventSink; + +static void ThreadMgrEventSink_Destructor(ThreadMgrEventSink *This) +{ + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgrEventSink *This = (ThreadMgrEventSink *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfThreadMgrEventSink)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI ThreadMgrEventSink_AddRef(ITfThreadMgrEventSink *iface) +{ + ThreadMgrEventSink *This = (ThreadMgrEventSink *)iface; + ok (tmSinkRefCount == This->refCount,"ThreadMgrEventSink refcount off %i vs %i\n",This->refCount,tmSinkRefCount); + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface) +{ + ThreadMgrEventSink *This = (ThreadMgrEventSink *)iface; + ULONG ret; + + ok (tmSinkRefCount == This->refCount,"ThreadMgrEventSink refcount off %i vs %i\n",This->refCount,tmSinkRefCount); + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + ThreadMgrEventSink_Destructor(This); + return ret; +} + +static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr(ITfThreadMgrEventSink *iface, +ITfDocumentMgr *pdim) +{ + trace("\n"); + return S_OK; +} + +static HRESULT WINAPI ThreadMgrEventSink_OnUninitDocumentMgr(ITfThreadMgrEventSink *iface, +ITfDocumentMgr *pdim) +{ + trace("\n"); + return S_OK; +} + +static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus(ITfThreadMgrEventSink *iface, +ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) +{ + trace("\n"); + return S_OK; +} + +static HRESULT WINAPI ThreadMgrEventSink_OnPushContext(ITfThreadMgrEventSink *iface, +ITfContext *pic) +{ + trace("\n"); + return S_OK; +} + +static HRESULT WINAPI ThreadMgrEventSink_OnPopContext(ITfThreadMgrEventSink *iface, +ITfContext *pic) +{ + trace("\n"); + return S_OK; +} + +static const ITfThreadMgrEventSinkVtbl ThreadMgrEventSink_ThreadMgrEventSinkVtbl = +{ + ThreadMgrEventSink_QueryInterface, + ThreadMgrEventSink_AddRef, + ThreadMgrEventSink_Release, + + ThreadMgrEventSink_OnInitDocumentMgr, + ThreadMgrEventSink_OnUninitDocumentMgr, + ThreadMgrEventSink_OnSetFocus, + ThreadMgrEventSink_OnPushContext, + ThreadMgrEventSink_OnPopContext +}; + +HRESULT ThreadMgrEventSink_Constructor(IUnknown **ppOut) +{ + ThreadMgrEventSink *This; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ThreadMgrEventSink)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->ThreadMgrEventSinkVtbl = &ThreadMgrEventSink_ThreadMgrEventSinkVtbl; + This->refCount = 1; + + *ppOut = (IUnknown *)This; + return S_OK; +} /********************************************************************************************

1 0

Aric Stewart : msctf: Helper functions for generating DWORD cookies.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 3280bfe6b71a6751c6bffdcdfd55970522ffd301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3280bfe6b71a6751c6bffdcdf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 21 10:47:48 2009 -0500 msctf: Helper functions for generating DWORD cookies. --- dlls/msctf/msctf.c | 98 +++++++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf_internal.h | 6 +++ 2 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index e77c749..fac0f9d 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -43,6 +43,17 @@ static LONG MSCTF_refCount; static HINSTANCE MSCTF_hinstance; +typedef struct +{ + DWORD id; + DWORD magic; + LPVOID data; +} CookieInternal; + +static CookieInternal *cookies; +static UINT id_last; +static UINT array_size; + DWORD tlsIndex = 0; const WCHAR szwSystemTIPKey[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','C','T','F','\\','T','I','P',0}; @@ -155,6 +166,93 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) } /************************************************************************* + * DWORD Cookie Management + */ +DWORD generate_Cookie(DWORD magic, LPVOID data) +{ + int i; + + /* try to reuse IDs if possible */ + for (i = 0; i < id_last; i++) + if (cookies[i].id == 0) break; + + if (i == array_size) + { + if (!array_size) + { + cookies = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(CookieInternal) * 10); + if (!cookies) + { + ERR("Out of memory, Unable to alloc cookies array\n"); + return 0; + } + array_size = 10; + } + else + { + CookieInternal *new_cookies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cookies, + sizeof(CookieInternal) * (array_size * 2)); + if (!new_cookies) + { + ERR("Out of memory, Unable to realloc cookies array\n"); + return 0; + } + cookies = new_cookies; + array_size *= 2; + } + } + + cookies[i].id = i + 1; /* a return of 0 is used for failure */ + cookies[i].magic = magic; + cookies[i].data = data; + + if (i == id_last) + id_last++; + + return cookies[i].id; +} + +DWORD get_Cookie_magic(DWORD id) +{ + UINT index = id - 1; + + if (index >= id_last) + return 0; + + if (cookies[index].id == 0) + return 0; + + return cookies[index].magic; +} + +LPVOID get_Cookie_data(DWORD id) +{ + UINT index = id - 1; + + if (index >= id_last) + return NULL; + + if (cookies[index].id == 0) + return NULL; + + return cookies[index].data; +} + +LPVOID remove_Cookie(DWORD id) +{ + UINT index = id - 1; + + if (index >= id_last) + return NULL; + + if (cookies[index].id == 0) + return NULL; + + cookies[index].id = 0; + return cookies[index].data; +} + +/************************************************************************* * MSCTF DllMain */ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 7a05b7b..06499f1 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -28,5 +28,11 @@ extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfConte extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); +/* cookie function */ +extern DWORD generate_Cookie(DWORD magic, LPVOID data); +extern DWORD get_Cookie_magic(DWORD id); +extern LPVOID get_Cookie_data(DWORD id); +extern LPVOID remove_Cookie(DWORD id); + extern const WCHAR szwSystemTIPKey[]; #endif /* __WINE_MSCTF_I_H */

1 0

Christian Costa : d3dxof: Accept longer string size.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 8dc455bc6388688eb317659896330d1529019d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc455bc6388688eb31765989… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 21 23:31:14 2009 +0200 d3dxof: Accept longer string size. --- dlls/d3dxof/parsing.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 1205e48..4a0ecaa 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -467,7 +467,7 @@ static BOOL is_integer(parse_buffer* buf) static BOOL is_string(parse_buffer* buf) { - char tmp[32]; + char tmp[100]; DWORD pos = 0; char c; BOOL ok = 0; @@ -475,7 +475,7 @@ static BOOL is_string(parse_buffer* buf) if (*buf->buffer != '"') return FALSE; - while (!is_separator(c = *(buf->buffer+pos+1)) && (pos < 31)) + while (!is_separator(c = *(buf->buffer+pos+1)) && (pos < 99)) { if (c == '"') {

1 0

Igor Tarasov : comctl32: TOOLBAR_SetImageList should recalculate toolbar only if it is necessary.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 3e235cc3632ee92cf4d02be695a194ff357e1ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e235cc3632ee92cf4d02be69… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Wed Apr 22 05:15:16 2009 +0500 comctl32: TOOLBAR_SetImageList should recalculate toolbar only if it is necessary. --- dlls/comctl32/tests/toolbar.c | 8 ++++++-- dlls/comctl32/toolbar.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 0c560b1..1946095 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -777,7 +777,7 @@ static TBBUTTON buttons3[] = { static void test_sizes(void) { HWND hToolbar = NULL; - HIMAGELIST himl; + HIMAGELIST himl, himl2; TBBUTTONINFO tbinfo; int style; int i; @@ -928,9 +928,13 @@ static void test_sizes(void) ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 21), "Unexpected button size\n"); SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 100), "Unexpected button size\n"); + /* But there are no update when we change imagelist, and image sizes are the same */ + himl2 = ImageList_LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_BITMAP_128x15), 20, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LRESULT)himl2) == (LRESULT)himl, "TB_SETIMAGELIST failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 100), "Unexpected button size\n"); SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(1, 1)); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 21), "Unexpected button size\n"); - ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, 0) == (LRESULT)himl, "TB_SETIMAGELIST failed\n"); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, 0) == (LRESULT)himl2, "TB_SETIMAGELIST failed\n"); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 7), "Unexpected button size\n"); SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(1, 1)); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(8, 7), "Unexpected button size\n"); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index cf54df7..1ba284c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4777,6 +4777,8 @@ TOOLBAR_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam) HIMAGELIST himlTemp; HIMAGELIST himl = (HIMAGELIST)lParam; INT oldButtonWidth = infoPtr->nButtonWidth; + INT oldBitmapWidth = infoPtr->nBitmapWidth; + INT oldBitmapHeight = infoPtr->nBitmapHeight; INT i, id = 0; if (infoPtr->iVersion >= 5) @@ -4795,9 +4797,12 @@ TOOLBAR_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam) infoPtr->nBitmapWidth = 1; infoPtr->nBitmapHeight = 1; } - TOOLBAR_CalcToolbar(hwnd); - if (infoPtr->nButtonWidth < oldButtonWidth) - TOOLBAR_SetButtonSize(hwnd, MAKELONG(oldButtonWidth, infoPtr->nButtonHeight)); + if ((oldBitmapWidth != infoPtr->nBitmapWidth) || (oldBitmapHeight != infoPtr->nBitmapHeight)) + { + TOOLBAR_CalcToolbar(hwnd); + if (infoPtr->nButtonWidth < oldButtonWidth) + TOOLBAR_SetButtonSize(hwnd, MAKELONG(oldButtonWidth, infoPtr->nButtonHeight)); + } TRACE("hwnd %p, new himl=%p, id = %d, count=%d, bitmap w=%d, h=%d\n", hwnd, infoPtr->himlDef, id, infoPtr->nNumBitmaps,

1 0

Aric Stewart : msctf/tests: Test DocumentMgr creation and Focus.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: e415782dd2ec9dc19ce7d72ce0a5581d8863e48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e415782dd2ec9dc19ce7d72ce… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 21 11:02:49 2009 -0500 msctf/tests: Test DocumentMgr creation and Focus. --- dlls/msctf/tests/inputprocessor.c | 48 ++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 62c93d7..fc4b83e 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -33,14 +33,22 @@ static ITfInputProcessorProfiles* g_ipp; static LANGID gLangid; static ITfCategoryMgr * g_cm = NULL; static ITfThreadMgr* g_tm = NULL; +static ITfDocumentMgr *g_dm = NULL; static TfClientId cid = 0; static TfClientId tid = 0; +#define SINK_UNEXPECTED 0 +#define SINK_EXPECTED 1 +#define SINK_FIRED 2 + static BOOL test_ShouldActivate = FALSE; static BOOL test_ShouldDeactivate = FALSE; static DWORD tmSinkCookie; static DWORD tmSinkRefCount; +static ITfDocumentMgr *test_CurrentFocus = NULL; +static ITfDocumentMgr *test_PrevFocus = NULL; +static INT test_OnSetFocus = SINK_UNEXPECTED; HRESULT RegisterTextService(REFCLSID rclsid); HRESULT UnregisterTextService(); @@ -255,15 +263,50 @@ static void test_Activate(void) static void test_startSession(void) { + HRESULT hr; + DWORD cnt; + ITfDocumentMgr *dmtest; + test_ShouldActivate = TRUE; ITfThreadMgr_Activate(g_tm,&cid); todo_wine ok(cid != tid,"TextService id mistakenly matches Client id\n"); + + hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&g_dm); + ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); + + hr = ITfThreadMgr_GetFocus(g_tm,&dmtest); + ok(SUCCEEDED(hr),"GetFocus Failed\n"); + ok(dmtest == NULL,"Initial focus not null\n"); + + test_CurrentFocus = g_dm; + test_PrevFocus = NULL; + test_OnSetFocus = SINK_EXPECTED; + hr = ITfThreadMgr_SetFocus(g_tm,g_dm); + ok(SUCCEEDED(hr),"SetFocus Failed\n"); + ok(test_OnSetFocus == SINK_FIRED, "OnSetFocus sink not called\n"); + test_OnSetFocus = SINK_UNEXPECTED; + + hr = ITfThreadMgr_GetFocus(g_tm,&dmtest); + ok(SUCCEEDED(hr),"GetFocus Failed\n"); + ok(g_dm == dmtest,"Expected DocumentMgr not focused\n"); + + cnt = ITfDocumentMgr_Release(g_dm); + ok(cnt == 2,"DocumentMgr refcount not expected (2 vs %i)\n",cnt); + + hr = ITfThreadMgr_GetFocus(g_tm,&dmtest); + ok(SUCCEEDED(hr),"GetFocus Failed\n"); + ok(g_dm == dmtest,"Expected DocumentMgr not focused\n"); } static void test_endSession(void) { test_ShouldDeactivate = TRUE; + test_CurrentFocus = NULL; + test_PrevFocus = g_dm; + test_OnSetFocus = SINK_EXPECTED; ITfThreadMgr_Deactivate(g_tm); + ok(test_OnSetFocus == SINK_FIRED, "OnSetFocus sink not called\n"); + test_OnSetFocus = SINK_UNEXPECTED; } START_TEST(inputprocessor) @@ -360,7 +403,10 @@ ITfDocumentMgr *pdim) static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus(ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) { - trace("\n"); + ok(test_OnSetFocus == SINK_EXPECTED, "Unexpected OnSetFocus sink\n"); + ok(pdimFocus == test_CurrentFocus,"Sink reports wrong focus\n"); + ok(pdimPrevFocus == test_PrevFocus,"Sink reports wrong previous focus\n"); + test_OnSetFocus = SINK_FIRED; return S_OK; }

1 0

Aric Stewart : msctf/tests: Test ITfContext Push, Pop, GetTop and GetBase.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 0f9ad9ada785add2048df36b3ebc53f7b949452f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9ad9ada785add2048df36b3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 21 11:03:01 2009 -0500 msctf/tests: Test ITfContext Push, Pop, GetTop and GetBase. --- dlls/msctf/tests/inputprocessor.c | 123 ++++++++++++++++++++++++++++++++++++- 1 files changed, 120 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index fc4b83e..7932901 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -49,6 +49,9 @@ static DWORD tmSinkRefCount; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; static INT test_OnSetFocus = SINK_UNEXPECTED; +static INT test_OnInitDocumentMgr = SINK_UNEXPECTED; +static INT test_OnPushContext = SINK_UNEXPECTED; +static INT test_OnPopContext = SINK_UNEXPECTED; HRESULT RegisterTextService(REFCLSID rclsid); HRESULT UnregisterTextService(); @@ -261,11 +264,19 @@ static void test_Activate(void) todo_wine ok(SUCCEEDED(hr),"Failed to Activate text service\n"); } +static int inline check_context_refcount(ITfContext *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + static void test_startSession(void) { HRESULT hr; DWORD cnt; + DWORD editCookie; ITfDocumentMgr *dmtest; + ITfContext *cxt,*cxt2,*cxt3,*cxtTest; test_ShouldActivate = TRUE; ITfThreadMgr_Activate(g_tm,&cid); @@ -296,6 +307,109 @@ static void test_startSession(void) hr = ITfThreadMgr_GetFocus(g_tm,&dmtest); ok(SUCCEEDED(hr),"GetFocus Failed\n"); ok(g_dm == dmtest,"Expected DocumentMgr not focused\n"); + + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, NULL, &cxt, &editCookie); + ok(SUCCEEDED(hr),"CreateContext Failed\n"); + + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, NULL, &cxt2, &editCookie); + ok(SUCCEEDED(hr),"CreateContext Failed\n"); + + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, NULL, &cxt3, &editCookie); + ok(SUCCEEDED(hr),"CreateContext Failed\n"); + + cnt = check_context_refcount(cxt); + test_OnPushContext = SINK_EXPECTED; + test_OnInitDocumentMgr = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt); + ok(SUCCEEDED(hr),"Push Failed\n"); + ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); + ok(test_OnPushContext == SINK_FIRED, "OnPushContext sink not fired\n"); + ok(test_OnInitDocumentMgr == SINK_FIRED, "OnInitDocumentMgr sink not fired\n"); + + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); + ok(SUCCEEDED(hr),"GetTop Failed\n"); + ok(cxtTest == cxt, "Wrong context on top\n"); + ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); + cnt = ITfContext_Release(cxtTest); + + hr = ITfDocumentMgr_GetBase(g_dm, &cxtTest); + ok(SUCCEEDED(hr),"GetBase Failed\n"); + ok(cxtTest == cxt, "Wrong context on Base\n"); + ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); + ITfContext_Release(cxtTest); + + check_context_refcount(cxt2); + test_OnPushContext = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt2); + ok(SUCCEEDED(hr),"Push Failed\n"); + ok(test_OnPushContext == SINK_FIRED, "OnPushContext sink not fired\n"); + + cnt = check_context_refcount(cxt2); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); + ok(SUCCEEDED(hr),"GetTop Failed\n"); + ok(cxtTest == cxt2, "Wrong context on top\n"); + ok(check_context_refcount(cxt2) > cnt, "Ref count did not increase\n"); + ITfContext_Release(cxtTest); + + cnt = check_context_refcount(cxt); + hr = ITfDocumentMgr_GetBase(g_dm, &cxtTest); + ok(SUCCEEDED(hr),"GetBase Failed\n"); + ok(cxtTest == cxt, "Wrong context on Base\n"); + ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); + ITfContext_Release(cxtTest); + + cnt = check_context_refcount(cxt3); + hr = ITfDocumentMgr_Push(g_dm, cxt3); + ok(!SUCCEEDED(hr),"Push Succeeded\n"); + ok(check_context_refcount(cxt3) == cnt, "Ref changed\n"); + + cnt = check_context_refcount(cxt2); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); + ok(SUCCEEDED(hr),"GetTop Failed\n"); + ok(cxtTest == cxt2, "Wrong context on top\n"); + ok(check_context_refcount(cxt2) > cnt, "Ref count did not increase\n"); + ITfContext_Release(cxtTest); + + cnt = check_context_refcount(cxt); + hr = ITfDocumentMgr_GetBase(g_dm, &cxtTest); + ok(SUCCEEDED(hr),"GetBase Failed\n"); + ok(cxtTest == cxt, "Wrong context on Base\n"); + ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); + ITfContext_Release(cxtTest); + + cnt = check_context_refcount(cxt2); + test_OnPopContext = SINK_EXPECTED; + hr = ITfDocumentMgr_Pop(g_dm, 0); + ok(SUCCEEDED(hr),"Pop Failed\n"); + ok(check_context_refcount(cxt2) < cnt, "Ref count did not decrease\n"); + ok(test_OnPopContext == SINK_FIRED, "OnPopContext sink not fired\n"); + + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); + ok(SUCCEEDED(hr),"GetTop Failed\n"); + ok(cxtTest == cxt, "Wrong context on top\n"); + ITfContext_Release(cxtTest); + + hr = ITfDocumentMgr_GetBase(g_dm, &cxtTest); + ok(SUCCEEDED(hr),"GetBase Failed\n"); + ok(cxtTest == cxt, "Wrong context on base\n"); + ITfContext_Release(cxtTest); + + hr = ITfDocumentMgr_Pop(g_dm, 0); + ok(!SUCCEEDED(hr),"Pop Succeeded\n"); + + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); + ok(SUCCEEDED(hr),"GetTop Failed\n"); + ok(cxtTest == cxt, "Wrong context on top\n"); + ITfContext_Release(cxtTest); + + hr = ITfDocumentMgr_GetBase(g_dm, &cxtTest); + ok(SUCCEEDED(hr),"GetBase Failed\n"); + ok(cxtTest == cxt, "Wrong context on base\n"); + ITfContext_Release(cxtTest); + + ITfContext_Release(cxt); + ITfContext_Release(cxt2); + ITfContext_Release(cxt3); } static void test_endSession(void) @@ -389,7 +503,8 @@ static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface) static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr(ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim) { - trace("\n"); + ok(test_OnInitDocumentMgr == SINK_EXPECTED, "Unexpected OnInitDocumentMgr sink\n"); + test_OnInitDocumentMgr = SINK_FIRED; return S_OK; } @@ -413,14 +528,16 @@ ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) static HRESULT WINAPI ThreadMgrEventSink_OnPushContext(ITfThreadMgrEventSink *iface, ITfContext *pic) { - trace("\n"); + ok(test_OnPushContext == SINK_EXPECTED, "Unexpected OnPushContext sink\n"); + test_OnPushContext = SINK_FIRED; return S_OK; } static HRESULT WINAPI ThreadMgrEventSink_OnPopContext(ITfThreadMgrEventSink *iface, ITfContext *pic) { - trace("\n"); + ok(test_OnPopContext == SINK_EXPECTED, "Unexpected OnPopContext sink\n"); + test_OnPopContext = SINK_FIRED; return S_OK; }

1 0

Aric Stewart : msctf/tests: Test activation and deactivation of a text service.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 94624ee307e46c952c73e192f9a6d168743cb008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94624ee307e46c952c73e192f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 21 11:02:24 2009 -0500 msctf/tests: Test activation and deactivation of a text service. --- dlls/msctf/tests/inputprocessor.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 4fd61b5..62c93d7 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -33,6 +33,11 @@ static ITfInputProcessorProfiles* g_ipp; static LANGID gLangid; static ITfCategoryMgr * g_cm = NULL; static ITfThreadMgr* g_tm = NULL; +static TfClientId cid = 0; +static TfClientId tid = 0; + +static BOOL test_ShouldActivate = FALSE; +static BOOL test_ShouldDeactivate = FALSE; static DWORD tmSinkCookie; static DWORD tmSinkRefCount; @@ -240,6 +245,27 @@ static void test_ThreadMgrUnadviseSinks(void) ITfSource_Release(source); } +static void test_Activate(void) +{ + HRESULT hr; + + hr = ITfInputProcessorProfiles_ActivateLanguageProfile(g_ipp,&CLSID_FakeService,gLangid,&CLSID_FakeService); + todo_wine ok(SUCCEEDED(hr),"Failed to Activate text service\n"); +} + +static void test_startSession(void) +{ + test_ShouldActivate = TRUE; + ITfThreadMgr_Activate(g_tm,&cid); + todo_wine ok(cid != tid,"TextService id mistakenly matches Client id\n"); +} + +static void test_endSession(void) +{ + test_ShouldDeactivate = TRUE; + ITfThreadMgr_Deactivate(g_tm); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -250,6 +276,9 @@ START_TEST(inputprocessor) test_EnumInputProcessorInfo(); test_Enable(); test_ThreadMgrAdviseSinks(); + test_Activate(); + test_startSession(); + test_endSession(); test_EnumLanguageProfiles(); test_FindClosestCategory(); test_Disable(); @@ -527,12 +556,15 @@ static HRESULT WINAPI TextService_Activate(ITfTextInputProcessor *iface, ITfThreadMgr *ptim, TfClientId id) { trace("TextService_Activate\n"); + ok(test_ShouldActivate,"Activation came unexpectedly\n"); + tid = id; return S_OK; } static HRESULT WINAPI TextService_Deactivate(ITfTextInputProcessor *iface) { trace("TextService_Deactivate\n"); + ok(test_ShouldDeactivate,"Deactivation came unexpectedly\n"); return S_OK; }

1 0

David Adam : d3d8: Add tests for IDirect3D8Device_Reset.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: 458902b5b21a4c8d2ae6a2d0ce4a17af83265038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458902b5b21a4c8d2ae6a2d0c… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Apr 21 15:22:29 2009 +0200 d3d8: Add tests for IDirect3D8Device_Reset. --- dlls/d3d8/tests/device.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index aa2b627..6f410fd 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1358,6 +1358,45 @@ static void test_depth_stencil_reset(void) ok(hr == D3DERR_NOTFOUND, "GetDepthStencilSurface returned 0x%08x, expected D3DERR_NOTFOUND\n", hr); ok(surface == NULL, "Depth stencil should be NULL\n"); + device = NULL; + IDirect3D8_GetAdapterDisplayMode( d3d8, D3DADAPTER_DEFAULT, &display_mode ); + + ZeroMemory( &present_parameters, sizeof(present_parameters) ); + present_parameters.Windowed = TRUE; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferFormat = display_mode.Format; + present_parameters.EnableAutoDepthStencil = FALSE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device ); + + if(FAILED(hr)) + { + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + goto cleanup; + } + + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3D_OK, "IDirect3DDevice8_TestCooperativeLevel after creation returned %#x\n", hr); + + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferWidth = 400; + present_parameters.BackBufferHeight = 300; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3DDevice8_Reset(device, &present_parameters); + todo_wine ok(hr == D3D_OK, "IDirect3DDevice8_Reset failed with 0x%08x\n", hr); + + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surface); + todo_wine ok(hr == D3D_OK, "GetDepthStencilSurface failed with 0x%08x\n", hr); + todo_wine ok(surface != NULL, "Depth stencil should not be NULL\n"); + if (surface) IDirect3DSurface8_Release(surface); + cleanup: if(d3d8) IDirect3D8_Release(d3d8); if(device) IDirect3D8_Release(device);

1 0

David Adam : d3d9: Add tests for IDirect3D9Device_Reset.
by Alexandre Julliard April 22, 2009

April 22, 2009

Module: wine Branch: master Commit: d993f85167fdbde73ddf6c44a898d2161e9bc707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d993f85167fdbde73ddf6c44a… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Apr 21 15:25:31 2009 +0200 d3d9: Add tests for IDirect3D9Device_Reset. --- dlls/d3d9/tests/device.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f254719..fe4318e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1049,6 +1049,45 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); ok(hr == D3DERR_DEVICENOTRESET, "IDirect3DDevice9_TestCooperativeLevel after a failed reset returned %#x\n", hr); + pDevice = NULL; + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = FALSE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + + if(FAILED(hr)) + { + skip("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr); + goto cleanup; + } + + hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after creation returned %#x\n", hr); + + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = TRUE; + d3dpp.BackBufferWidth = 400; + d3dpp.BackBufferHeight = 300; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); + todo_wine ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with 0x%08x\n", hr); + + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DDevice9_GetDepthStencilSurface(pDevice, &surface); + todo_wine ok(hr == D3D_OK, "GetDepthStencilSurface failed with 0x%08x\n", hr); + todo_wine ok(surface != NULL, "Depth stencil should not be NULL\n"); + if (surface) IDirect3DSurface9_Release(surface); + cleanup: HeapFree(GetProcessHeap(), 0, modes); if(pD3d) IDirect3D9_Release(pD3d);

1 0