wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Alexandre Julliard : winecfg: Offer a few more dlls in the load order drop-down list.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: 7776faf3a7f17b4328d6d9511a00d729b704e605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7776faf3a7f17b4328d6d9511… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 27 16:05:30 2009 +0100 winecfg: Offer a few more dlls in the load order drop-down list. --- programs/winecfg/libraries.c | 73 ++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 30 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 6abe04d..37cc12b 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -55,13 +55,15 @@ static const char * const builtin_only[] = "gdi32", "glu32", "icmp", + "gphoto2.ds", "iphlpapi", "kernel32", + "mountmgr.sys", "mswsock", "ntdll", + "ntoskrnl.exe", "opengl32", - "stdole2.tlb", - "stdole32.tlb", + "sane.ds", "twain_32", "unicows", "user32", @@ -205,10 +207,35 @@ static int compare_dll( const void *ptr1, const void *ptr2 ) /* check if dll is recommended as builtin only */ static inline int is_builtin_only( const char *name ) { + const char *ext = strrchr( name, '.' ); + + if (ext) + { + if (!strcmp( ext, ".vxd" ) || + !strcmp( ext, ".drv" ) || + !strcmp( ext, ".tlb" )) + return TRUE; + } return bsearch( &name, builtin_only, sizeof(builtin_only)/sizeof(builtin_only[0]), sizeof(builtin_only[0]), compare_dll ) != NULL; } +/* check if dll should be offered in the drop-down list */ +static int show_dll_in_list( const char *name ) +{ + const char *ext = strrchr( name, '.' ); + + if (ext) + { + /* skip 16-bit dlls */ + if (strlen(ext) > 2 && !strcmp( ext + strlen(ext) - 2, "16" )) return FALSE; + /* skip exes */ + if (!strcmp( ext, ".exe" )) return FALSE; + } + /* skip dlls that should always be builtin */ + return !is_builtin_only( name ); +} + static void set_controls_from_selection(HWND dialog) { /* FIXME: display/update some information about the selected dll (purpose, recommended loadorder) maybe? */ @@ -232,28 +259,6 @@ static void clear_settings(HWND dialog) } } -/* check if a given dll is 16-bit */ -static int is_16bit_dll( const char *dir, const char *name ) -{ - char buffer[64]; - int res; - size_t len = strlen(dir) + strlen(name) + 2; - char *path = HeapAlloc( GetProcessHeap(), 0, len ); - - strcpy( path, dir ); - strcat( path, "/" ); - strcat( path, name ); - res = readlink( path, buffer, sizeof(buffer) ); - HeapFree( GetProcessHeap(), 0, path ); - - if (res == -1) return 0; /* not a symlink */ - if (res < 4 || res >= sizeof(buffer)) return 0; - buffer[res] = 0; - if (strchr( buffer, '/' )) return 0; /* contains a path, not valid */ - if (strcmp( buffer + res - 3, ".so" )) return 0; /* does not end in .so, not valid */ - return 1; -} - /* load the list of available libraries from a given dir */ static void load_library_list_from_dir( HWND dialog, const char *dir_path, int check_subdirs ) { @@ -270,23 +275,31 @@ static void load_library_list_from_dir( HWND dialog, const char *dir_path, int c { size_t len = strlen(de->d_name); if (len > sizeof(name)) continue; - if (len > 7 && !strcmp( de->d_name + len - 7, ".dll.so")) + if (len > 3 && !strcmp( de->d_name + len - 3, ".so")) { - if (is_16bit_dll( dir_path, de->d_name )) continue; /* 16-bit dlls can't be configured */ - len -= 7; + len -= 3; + if (len > 4 && !strcmp( de->d_name + len - 4, ".dll.so")) len -= 4; memcpy( name, de->d_name, len ); name[len] = 0; - /* skip dlls that should always be builtin */ - if (is_builtin_only( name )) continue; + if (!show_dll_in_list( name )) continue; SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)name ); } else if (check_subdirs) { struct stat st; - if (is_builtin_only( de->d_name )) continue; + if (!show_dll_in_list( de->d_name )) continue; sprintf( buffer, "%s/%s/%s.dll.so", dir_path, de->d_name, de->d_name ); if (!stat( buffer, &st )) + { + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)de->d_name ); + continue; + } + sprintf( buffer, "%s/%s/%s.so", dir_path, de->d_name, de->d_name ); + if (!stat( buffer, &st )) + { SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)de->d_name ); + continue; + } } } closedir( dir );

1 0

Aric Stewart : msctf: Use ITfCategoryMgr:: FindClosestCategory to set catid when enuming language profiles.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: 4fb6c01453494122671df56a2d48ad9b9722b4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb6c01453494122671df56a2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 23 14:22:38 2009 -0600 msctf: Use ITfCategoryMgr::FindClosestCategory to set catid when enuming language profiles. --- dlls/msctf/inputprocessor.c | 18 +++++++++++++++++- dlls/msctf/tests/inputprocessor.c | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index de39af9..7df5575 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -72,6 +72,7 @@ typedef struct tagEnumTfLanguageProfiles { DWORD lang_index; LANGID langid; + ITfCategoryMgr *catmgr; } EnumTfLanguageProfiles; static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut); @@ -670,6 +671,7 @@ static void EnumTfLanguageProfiles_Destructor(EnumTfLanguageProfiles *This) RegCloseKey(This->tipkey); if (This->langkey) RegCloseKey(This->langkey); + ITfCategoryMgr_Release(This->catmgr); HeapFree(GetProcessHeap(),0,This); } @@ -746,6 +748,9 @@ static INT next_LanguageProfile(EnumTfLanguageProfiles *This, CLSID clsid, TF_LA if (tflp) { + static const GUID * tipcats[3] = { &GUID_TFCAT_TIP_KEYBOARD, + &GUID_TFCAT_TIP_SPEECH, + &GUID_TFCAT_TIP_HANDWRITING }; res = CLSIDFromString(profileid, &profile); if (FAILED(res)) return 0; @@ -754,7 +759,10 @@ static INT next_LanguageProfile(EnumTfLanguageProfiles *This, CLSID clsid, TF_LA /* FIXME */ tflp->fActive = FALSE; tflp->guidProfile = profile; - /* FIXME set catid */ + if (ITfCategoryMgr_FindClosestCategory(This->catmgr, &clsid, + &tflp->catid, tipcats, 3) != S_OK) + ITfCategoryMgr_FindClosestCategory(This->catmgr, &clsid, + &tflp->catid, NULL, 0); } return 1; @@ -865,6 +873,7 @@ static const IEnumTfLanguageProfilesVtbl IEnumTfLanguageProfiles_Vtbl ={ static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguageProfiles **ppOut) { + HRESULT hr; EnumTfLanguageProfiles *This; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(EnumTfLanguageProfiles)); @@ -875,6 +884,13 @@ static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguage This->refCount = 1; This->langid = langid; + hr = CategoryMgr_Constructor(NULL,(IUnknown**)&This->catmgr); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(),0,This); + return hr; + } + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szwSystemTIPKey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &This->tipkey, NULL) != ERROR_SUCCESS) return E_FAIL; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 2d32413..d689034 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -115,7 +115,7 @@ static void test_EnumLanguageProfiles(void) { found = TRUE; ok(profile.langid == gLangid, "LangId Incorrect\n"); - todo_wine ok(IsEqualGUID(&profile.catid,&GUID_TFCAT_TIP_KEYBOARD), "CatId Incorrect\n"); + ok(IsEqualGUID(&profile.catid,&GUID_TFCAT_TIP_KEYBOARD), "CatId Incorrect\n"); ok(IsEqualGUID(&profile.guidProfile,&CLSID_FakeService), "guidProfile Incorrect\n"); } }

1 0

Aric Stewart : msctf: Implement ITfCategoryMgr::FindClosestCategory.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: d26473564a35103a3953db272118448bdbca8319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26473564a35103a3953db272… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 23 14:22:30 2009 -0600 msctf: Implement ITfCategoryMgr::FindClosestCategory. --- dlls/msctf/categorymgr.c | 62 +++++++++++++++++++++++++++++++++++- dlls/msctf/tests/inputprocessor.c | 24 ++++++++++++++ 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c index 2358072..648352a 100644 --- a/dlls/msctf/categorymgr.c +++ b/dlls/msctf/categorymgr.c @@ -168,9 +168,67 @@ static HRESULT WINAPI CategoryMgr_EnumItemsInCategory ( ITfCategoryMgr *iface, static HRESULT WINAPI CategoryMgr_FindClosestCategory ( ITfCategoryMgr *iface, REFGUID rguid, GUID *pcatid, const GUID **ppcatidList, ULONG ulCount) { + static const WCHAR fmt[] = { '%','s','\\','%','s','\\','C','a','t','e','g','o','r','y','\\','I','t','e','m','\\','%','s',0}; + + WCHAR fullkey[110]; + WCHAR buf[39]; + HKEY key; + HRESULT hr = S_FALSE; + INT index = 0; CategoryMgr *This = (CategoryMgr*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p)\n",This); + + if (!pcatid || (ulCount && ppcatidList == NULL)) + return E_INVALIDARG; + + StringFromGUID2(rguid, buf, 39); + sprintfW(fullkey,fmt,szwSystemTIPKey,buf,buf); + *pcatid = GUID_NULL; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,fullkey, 0, KEY_READ, &key ) != + ERROR_SUCCESS) + return S_FALSE; + + while (1) + { + HRESULT hr2; + ULONG res; + GUID guid; + WCHAR catid[39]; + DWORD cName; + + cName = 39; + res = RegEnumKeyExW(key, index, catid, &cName, NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; + index ++; + + hr2 = CLSIDFromString(catid, &guid); + if (FAILED(hr2)) continue; + + if (ulCount) + { + int j; + BOOL found = FALSE; + for (j = 0; j < ulCount; j++) + if (IsEqualGUID(&guid, ppcatidList[j])) + { + found = TRUE; + *pcatid = guid; + hr = S_OK; + break; + } + if (found) break; + } + else + { + *pcatid = guid; + hr = S_OK; + break; + } + } + + return hr; } static HRESULT WINAPI CategoryMgr_RegisterGUIDDescription ( diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index b7e2695..2d32413 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -128,6 +128,8 @@ static void test_RegisterCategory(void) HRESULT hr; hr = ITfCategoryMgr_RegisterCategory(g_cm, &CLSID_FakeService, &GUID_TFCAT_TIP_KEYBOARD, &CLSID_FakeService); ok(SUCCEEDED(hr),"ITfCategoryMgr_RegisterCategory failed\n"); + hr = ITfCategoryMgr_RegisterCategory(g_cm, &CLSID_FakeService, &GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, &CLSID_FakeService); + ok(SUCCEEDED(hr),"ITfCategoryMgr_RegisterCategory failed\n"); } static void test_UnregisterCategory(void) @@ -135,6 +137,27 @@ static void test_UnregisterCategory(void) HRESULT hr; hr = ITfCategoryMgr_UnregisterCategory(g_cm, &CLSID_FakeService, &GUID_TFCAT_TIP_KEYBOARD, &CLSID_FakeService); todo_wine ok(SUCCEEDED(hr),"ITfCategoryMgr_UnregisterCategory failed\n"); + hr = ITfCategoryMgr_UnregisterCategory(g_cm, &CLSID_FakeService, &GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, &CLSID_FakeService); + todo_wine ok(SUCCEEDED(hr),"ITfCategoryMgr_UnregisterCategory failed\n"); +} + +static void test_FindClosestCategory(void) +{ + GUID output; + HRESULT hr; + const GUID *list[3] = {&GUID_TFCAT_TIP_SPEECH, &GUID_TFCAT_TIP_KEYBOARD, &GUID_TFCAT_TIP_HANDWRITING}; + + hr = ITfCategoryMgr_FindClosestCategory(g_cm, &CLSID_FakeService, &output, NULL, 0); + ok(SUCCEEDED(hr),"ITfCategoryMgr_FindClosestCategory failed (%x)\n",hr); + ok(IsEqualGUID(&output,&GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER),"Wrong GUID\n"); + + hr = ITfCategoryMgr_FindClosestCategory(g_cm, &CLSID_FakeService, &output, list, 1); + ok(SUCCEEDED(hr),"ITfCategoryMgr_FindClosestCategory failed (%x)\n",hr); + ok(IsEqualGUID(&output,&GUID_NULL),"Wrong GUID\n"); + + hr = ITfCategoryMgr_FindClosestCategory(g_cm, &CLSID_FakeService, &output, list, 3); + ok(SUCCEEDED(hr),"ITfCategoryMgr_FindClosestCategory failed (%x)\n",hr); + ok(IsEqualGUID(&output,&GUID_TFCAT_TIP_KEYBOARD),"Wrong GUID\n"); } START_TEST(inputprocessor) @@ -146,6 +169,7 @@ START_TEST(inputprocessor) test_RegisterCategory(); test_EnumInputProcessorInfo(); test_EnumLanguageProfiles(); + test_FindClosestCategory(); test_UnregisterCategory(); test_Unregister(); }

1 0

Alistair Leslie-Hughes : mshtml: Show IPersistHistory interface is supported.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: b30aa168f7034e5d5c73ca4ce64bcf015e58f223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30aa168f7034e5d5c73ca4ce… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 26 21:39:36 2009 +1100 mshtml: Show IPersistHistory interface is supported. --- dlls/mshtml/htmldoc.c | 4 ++++ dlls/mshtml/tests/htmldoc.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a6aa73f..ea99445 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "perhist.h" #include "wine/debug.h" @@ -132,6 +133,9 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID }else if(IsEqualGUID(&IID_ISupportErrorInfo, riid)) { TRACE("(%p)->(IID_ISupportErrorInfo %p)\n", This, ppvObject); *ppvObject = SUPPERRINFO(This); + }else if(IsEqualGUID(&IID_IPersistHistory, riid)) { + FIXME("(%p)->(IID_IPersistHistory currently not supported %p)\n", This, ppvObject); + *ppvObject = NULL; }else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppvObject); return E_NOINTERFACE; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index e4ae144..daac740 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -36,6 +36,7 @@ #include "dispex.h" #include "idispids.h" #include "shlguid.h" +#include "perhist.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(IID_IProxyManager,0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); @@ -4160,6 +4161,26 @@ static void test_HTMLDoc_ISupportErrorInfo(void) ok(ref == 0, "ref=%d, expected 0\n", ref); } +static void test_IPersistHistory(void) +{ + HRESULT hres; + IUnknown *unk; + LONG ref; + IPersistHistory *phist; + + hres = create_document(&unk); + if(FAILED(hres)) + return; + + hres = IUnknown_QueryInterface(unk, &IID_IPersistHistory, (void**)&phist); + todo_wine ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); + if(hres == S_OK) + IPersistHistory_Release(phist); + + ref = IUnknown_Release(unk); + ok(ref == 0, "ref=%d, expected 0\n", ref); +} + START_TEST(htmldoc) { gecko_installer_workaround(TRUE); @@ -4177,6 +4198,7 @@ START_TEST(htmldoc) test_editing_mode(TRUE); } test_HTMLDoc_ISupportErrorInfo(); + test_IPersistHistory(); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Alistair Leslie-Hughes : uuid: Add IID_PersistHistory GUID.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: 2a64b73829fd7b75c5992b55d22a072d9b1845c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a64b73829fd7b75c5992b55d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 27 20:09:52 2009 +1100 uuid: Add IID_PersistHistory GUID. --- dlls/uuid/uuid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index c2cdf06..36dd205 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -74,6 +74,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "dimm.h" #include "isguids.h" #include "objsafe.h" +#include "perhist.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

Rein Klazes : user32: In SetMenuInfo() implement the MIM_APPLYTOSUBMENUS. Also set last error if called with invalid parameters with tests.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: 471e949cff2c23df9943f4ebc3e4292be30cb914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=471e949cff2c23df9943f4ebc… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Feb 27 09:17:58 2009 +0100 user32: In SetMenuInfo() implement the MIM_APPLYTOSUBMENUS. Also set last error if called with invalid parameters with tests. --- dlls/user32/menu.c | 57 ++++++++++------- dlls/user32/tests/menu.c | 162 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 195 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=471e949cff2c23df9943f…

1 0

Igor Tarasov : comctl32: Make REBAR_StyleChanged respect wParam.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: 08bd265f5293d8bc82fdfc957b41f05cb1c1d016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08bd265f5293d8bc82fdfc957… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Fri Feb 27 06:30:03 2009 +0400 comctl32: Make REBAR_StyleChanged respect wParam. --- dlls/comctl32/rebar.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 89ac420..089da39 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3469,19 +3469,19 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT -REBAR_StyleChanged (REBAR_INFO *infoPtr, LPARAM lParam) +REBAR_StyleChanged (REBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpStyle) { - STYLESTRUCT *ss = (STYLESTRUCT *)lParam; - TRACE("current style=%08x, styleOld=%08x, style being set to=%08x\n", - infoPtr->dwStyle, ss->styleOld, ss->styleNew); - infoPtr->orgStyle = infoPtr->dwStyle = ss->styleNew; - if (GetWindowTheme (infoPtr->hwndSelf)) - infoPtr->dwStyle &= ~WS_BORDER; - /* maybe it should be COMMON_STYLES like in toolbar */ - if ((ss->styleNew ^ ss->styleOld) & CCS_VERT) - REBAR_Layout(infoPtr); - + infoPtr->dwStyle, lpStyle->styleOld, lpStyle->styleNew); + if (nType == GWL_STYLE) + { + infoPtr->orgStyle = infoPtr->dwStyle = lpStyle->styleNew; + if (GetWindowTheme (infoPtr->hwndSelf)) + infoPtr->dwStyle &= ~WS_BORDER; + /* maybe it should be COMMON_STYLES like in toolbar */ + if ((lpStyle->styleNew ^ lpStyle->styleOld) & CCS_VERT) + REBAR_Layout(infoPtr); + } return FALSE; } @@ -3715,7 +3715,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return REBAR_Size (infoPtr, wParam, lParam); case WM_STYLECHANGED: - return REBAR_StyleChanged (infoPtr, lParam); + return REBAR_StyleChanged (infoPtr, wParam, (LPSTYLESTRUCT)lParam); case WM_THEMECHANGED: return theme_changed (infoPtr);

1 0

Vincent Povirk : kernel32/tests: Fix overlapped named pipe test.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: 311d260ac1ae089ea26a9668b3723dce6e583af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=311d260ac1ae089ea26a9668b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 19 16:49:55 2009 -0600 kernel32/tests: Fix overlapped named pipe test. The overlapped named pipe test calls GetOverlappedResult after all operations in which it passes an overlapped structure, but it seems we only get one when the functions fail with ERROR_IO_PENDING. I've modified the test to account for that, and it seems to pass consistently on Windows and Wine. --- dlls/kernel32/tests/pipe.c | 80 +++++++++++++++++++++++++++---------------- 1 files changed, 50 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 3adf417..48d9e14 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -541,7 +541,7 @@ static DWORD CALLBACK serverThreadMain3(LPVOID arg) OVERLAPPED oOverlap; int letWFSOEwait = (i & 2); int letGORwait = (i & 1); - DWORD err; + DWORD err; memset(&oOverlap, 0, sizeof(oOverlap)); oOverlap.hEvent = hEvent; @@ -550,51 +550,74 @@ static DWORD CALLBACK serverThreadMain3(LPVOID arg) trace("Server calling overlapped ConnectNamedPipe...\n"); success = ConnectNamedPipe(hnp, &oOverlap); err = GetLastError(); - ok(success || err == ERROR_IO_PENDING - || err == ERROR_PIPE_CONNECTED, "overlapped ConnectNamedPipe\n"); + ok(!success && (err == ERROR_IO_PENDING || err == ERROR_PIPE_CONNECTED), "overlapped ConnectNamedPipe\n"); trace("overlapped ConnectNamedPipe returned.\n"); - if (!success && (err == ERROR_IO_PENDING) && letWFSOEwait) - ok(WaitForSingleObjectEx(hEvent, INFINITE, TRUE) == 0, "wait ConnectNamedPipe\n"); - success = GetOverlappedResult(hnp, &oOverlap, &dummy, letGORwait); - if (!letGORwait && !letWFSOEwait && !success) { - ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); - success = GetOverlappedResult(hnp, &oOverlap, &dummy, TRUE); - } - ok(success, "GetOverlappedResult ConnectNamedPipe\n"); + if (!success && (err == ERROR_IO_PENDING)) { + if (letWFSOEwait) + { + DWORD ret; + do { + ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); + } while (ret == WAIT_IO_COMPLETION); + ok(ret == 0, "wait ConnectNamedPipe returned %x\n", ret); + } + success = GetOverlappedResult(hnp, &oOverlap, &dummy, letGORwait); + if (!letGORwait && !letWFSOEwait && !success) { + ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); + success = GetOverlappedResult(hnp, &oOverlap, &dummy, TRUE); + } + } + ok(success || (err == ERROR_PIPE_CONNECTED), "GetOverlappedResult ConnectNamedPipe\n"); trace("overlapped ConnectNamedPipe operation complete.\n"); /* Echo bytes once */ memset(buf, 0, sizeof(buf)); trace("Server reading...\n"); - success = ReadFile(hnp, buf, sizeof(buf), NULL, &oOverlap); + success = ReadFile(hnp, buf, sizeof(buf), &readden, &oOverlap); trace("Server ReadFile returned...\n"); err = GetLastError(); ok(success || err == ERROR_IO_PENDING, "overlapped ReadFile\n"); trace("overlapped ReadFile returned.\n"); - if (!success && (err == ERROR_IO_PENDING) && letWFSOEwait) - ok(WaitForSingleObjectEx(hEvent, INFINITE, TRUE) == 0, "wait ReadFile\n"); - success = GetOverlappedResult(hnp, &oOverlap, &readden, letGORwait); - if (!letGORwait && !letWFSOEwait && !success) { - ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); - success = GetOverlappedResult(hnp, &oOverlap, &readden, TRUE); - } + if (!success && (err == ERROR_IO_PENDING)) { + if (letWFSOEwait) + { + DWORD ret; + do { + ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); + } while (ret == WAIT_IO_COMPLETION); + ok(ret == 0, "wait ReadFile returned %x\n", ret); + } + success = GetOverlappedResult(hnp, &oOverlap, &readden, letGORwait); + if (!letGORwait && !letWFSOEwait && !success) { + ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); + success = GetOverlappedResult(hnp, &oOverlap, &readden, TRUE); + } + } trace("Server done reading.\n"); ok(success, "overlapped ReadFile\n"); trace("Server writing...\n"); - success = WriteFile(hnp, buf, readden, NULL, &oOverlap); + success = WriteFile(hnp, buf, readden, &written, &oOverlap); trace("Server WriteFile returned...\n"); err = GetLastError(); ok(success || err == ERROR_IO_PENDING, "overlapped WriteFile\n"); trace("overlapped WriteFile returned.\n"); - if (!success && (err == ERROR_IO_PENDING) && letWFSOEwait) - ok(WaitForSingleObjectEx(hEvent, INFINITE, TRUE) == 0, "wait WriteFile\n"); - success = GetOverlappedResult(hnp, &oOverlap, &written, letGORwait); - if (!letGORwait && !letWFSOEwait && !success) { - ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); - success = GetOverlappedResult(hnp, &oOverlap, &written, TRUE); - } + if (!success && (err == ERROR_IO_PENDING)) { + if (letWFSOEwait) + { + DWORD ret; + do { + ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); + } while (ret == WAIT_IO_COMPLETION); + ok(ret == 0, "wait WriteFile returned %x\n", ret); + } + success = GetOverlappedResult(hnp, &oOverlap, &written, letGORwait); + if (!letGORwait && !letWFSOEwait && !success) { + ok(GetLastError() == ERROR_IO_INCOMPLETE, "GetOverlappedResult\n"); + success = GetOverlappedResult(hnp, &oOverlap, &written, TRUE); + } + } trace("Server done writing.\n"); ok(success, "overlapped WriteFile\n"); ok(written == readden, "write file len\n"); @@ -683,13 +706,10 @@ static void test_NamedPipe_2(void) ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); exercizeServer(PIPENAME "serverThreadMain2", serverThread); - if( 0 ) /* overlapped pipe server doesn't work yet - it randomly fails */ - { /* Try server #3 */ serverThread = CreateThread(NULL, 0, serverThreadMain3, 0, 0, &serverThreadId); ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); exercizeServer(PIPENAME "serverThreadMain3", serverThread); - } ok(SetEvent( alarm_event ), "SetEvent\n"); CloseHandle( alarm_event );

1 0

Vincent Povirk : kernel32/tests: Remove a redundant check for ERROR_CALL_NOT_IMPLEMENTED.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: 545b6989f28ceb6ab167ab8e8411f73cf228a46f URL: http://source.winehq.org/git/wine.git/?a=commit;h=545b6989f28ceb6ab167ab8e8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 24 15:02:57 2009 -0600 kernel32/tests: Remove a redundant check for ERROR_CALL_NOT_IMPLEMENTED. --- dlls/kernel32/tests/pipe.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index ee10974..3adf417 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -62,13 +62,6 @@ static void test_CreateNamedPipe(int pipemode) /* nInBufSize */ 1024, /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, /* lpSecurityAttrib */ NULL); - - if (hnp == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - /* Is this the right way to notify user of skipped tests? */ - ok(hnp == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, - "CreateNamedPipe not supported on this platform, skipping tests.\n"); - return; - } ok(hnp == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_NAME, "CreateNamedPipe should fail if name doesn't start with \\\\.\\pipe\n");

1 0

Dmitry Timoshkov : gdi32: Revert an unrelated part of 028617b90ba586bdb30723c700eea888c159ada7.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: b3e65ba399fbf876dcb94157f47a50cf479d6aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e65ba399fbf876dcb94157f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Feb 27 17:57:39 2009 +0800 gdi32: Revert an unrelated part of 028617b90ba586bdb30723c700eea888c159ada7. It was not a very nice idea to break bitmap fonts which request a custom width (therefore a transformation) in a patch that pretended to do something unrelated. --- dlls/gdi32/freetype.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6ca35c3..54bb999 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4606,9 +4606,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, } if(ft_face->glyph->format != ft_glyph_format_outline && - (needsTransform || format == GGO_NATIVE || format == GGO_BEZIER || - format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP || - format == GGO_GRAY8_BITMAP)) + (format == GGO_NATIVE || format == GGO_BEZIER || + format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP || + format == GGO_GRAY8_BITMAP)) { TRACE("loaded a bitmap\n"); LeaveCriticalSection( &freetype_cs );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2009