wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Aric Stewart : msctf: Implement ITfInputProcessorProfiles:: AddLanguageProfile.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 3680bdccc24fa75b895f4519f79a96f49ac920a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3680bdccc24fa75b895f4519f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 3 13:17:50 2009 -0600 msctf: Implement ITfInputProcessorProfiles::AddLanguageProfile. --- dlls/msctf/inputprocessor.c | 45 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 7ece851..893a88f 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -130,9 +130,50 @@ static HRESULT WINAPI InputProcessorProfiles_AddLanguageProfile( ULONG cchDesc, const WCHAR *pchIconFile, ULONG cchFile, ULONG uIconIndex) { + HKEY tipkey,fmtkey; + WCHAR buf[39]; + WCHAR fullkey[100]; + ULONG res; + + static const WCHAR fmt[] = {'%','s','\\','%','s',0}; + static const WCHAR fmt2[] = {'%','s','\\','0','x','%','0','8','x','\\','%','s',0}; + static const WCHAR lngp[] = {'L','a','n','g','u','a','g','e','P','r','o','f','i','l','e',0}; + static const WCHAR desc[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR icnf[] = {'I','c','o','n','F','i','l','e',0}; + static const WCHAR icni[] = {'I','c','o','n','I','n','d','e','x',0}; + InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %s %x %s %s %s %i\n",This,debugstr_guid(rclsid), langid, + debugstr_guid(guidProfile), debugstr_wn(pchDesc,cchDesc), + debugstr_wn(pchIconFile,cchFile),uIconIndex); + + StringFromGUID2(rclsid, buf, 39); + sprintfW(fullkey,fmt,szwSystemTIPKey,buf); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,fullkey, 0, KEY_READ | KEY_WRITE, + &tipkey ) != ERROR_SUCCESS) + return E_FAIL; + + StringFromGUID2(guidProfile, buf, 39); + sprintfW(fullkey,fmt2,lngp,langid,buf); + + res = RegCreateKeyExW(tipkey,fullkey, 0, NULL, 0, KEY_READ | KEY_WRITE, + NULL, &fmtkey, NULL); + + if (!res) + { + RegSetValueExW(fmtkey, desc, 0, REG_SZ, (LPBYTE)pchDesc, cchDesc * sizeof(WCHAR)); + RegSetValueExW(fmtkey, icnf, 0, REG_SZ, (LPBYTE)pchIconFile, cchFile * sizeof(WCHAR)); + RegSetValueExW(fmtkey, icni, 0, REG_DWORD, (LPBYTE)&uIconIndex, sizeof(DWORD)); + RegCloseKey(fmtkey); + } + RegCloseKey(tipkey); + + if (!res) + return S_OK; + else + return E_FAIL; } static HRESULT WINAPI InputProcessorProfiles_RemoveLanguageProfile(

1 0

Aric Stewart : msctf: Implement ITfInputProcessorProfiles::Register.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 649d12b1702a5bf17d169d83ef221468b49453e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=649d12b1702a5bf17d169d83e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 3 13:17:41 2009 -0600 msctf: Implement ITfInputProcessorProfiles::Register. --- dlls/msctf/inputprocessor.c | 19 +++++++++++++++++-- dlls/msctf/msctf.c | 2 ++ dlls/msctf/msctf_internal.h | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index b501b47..7ece851 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -97,8 +97,23 @@ static HRESULT WINAPI InputProcessorProfiles_Register( ITfInputProcessorProfiles *iface, REFCLSID rclsid) { InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + HKEY tipkey; + WCHAR buf[39]; + static const WCHAR fmt[] = {'%','s','\\','%','s',0}; + WCHAR fullkey[68]; + + TRACE("(%p) %s\n",This,debugstr_guid(rclsid)); + + StringFromGUID2(rclsid, buf, 39); + sprintfW(fullkey,fmt,szwSystemTIPKey,buf); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE,fullkey, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &tipkey, NULL) != ERROR_SUCCESS) + return E_FAIL; + + RegCloseKey(tipkey); + + return S_OK; } static HRESULT WINAPI InputProcessorProfiles_Unregister( diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 224ce99..e34a9c8 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -45,6 +45,8 @@ static HINSTANCE MSCTF_hinstance; 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}; + typedef HRESULT (*LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); static const struct { diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 1cb4924..cea1723 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -27,4 +27,5 @@ extern HRESULT DocumentMgr_Constructor(ITfDocumentMgr **ppOut); extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **ppOut, TfEditCookie *pecTextStore); extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); +extern const WCHAR szwSystemTIPKey[]; #endif /* __WINE_MSCTF_I_H */

1 0

Aric Stewart : msctf: Implement InputProcessorProfiles::GetCurrentLanguage.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: fd92f871a32e1575784761cdac40bb0fd280c407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd92f871a32e1575784761cda… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 3 13:17:19 2009 -0600 msctf: Implement InputProcessorProfiles::GetCurrentLanguage. --- dlls/msctf/inputprocessor.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index ca77964..b501b47 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); typedef struct tagInputProcessorProfiles { const ITfInputProcessorProfilesVtbl *InputProcessorProfilesVtbl; LONG refCount; + + LANGID currentLanguage; } InputProcessorProfiles; static void InputProcessorProfiles_Destructor(InputProcessorProfiles *This) @@ -184,8 +186,14 @@ static HRESULT WINAPI InputProcessorProfiles_GetCurrentLanguage( ITfInputProcessorProfiles *iface, LANGID *plangid) { InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) 0x%x\n",This,This->currentLanguage); + + if (!plangid) + return E_INVALIDARG; + + *plangid = This->currentLanguage; + + return S_OK; } static HRESULT WINAPI InputProcessorProfiles_ChangeCurrentLanguage( @@ -288,6 +296,7 @@ HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut This->InputProcessorProfilesVtbl= &InputProcessorProfiles_InputProcessorProfilesVtbl; This->refCount = 1; + This->currentLanguage = GetUserDefaultLCID(); TRACE("returning %p\n", This); *ppOut = (IUnknown *)This;

1 0

Aric Stewart : msctf: Add stub implementation of ITfInputProcessorProfiles.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 6c842a86bb630ec83f30802925312b6d98dab208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c842a86bb630ec83f3080292… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 3 13:17:04 2009 -0600 msctf: Add stub implementation of ITfInputProcessorProfiles. --- dlls/msctf/Makefile.in | 1 + dlls/msctf/inputprocessor.c | 295 +++++++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf.c | 1 + dlls/msctf/msctf_internal.h | 1 + dlls/msctf/regsvr.c | 7 + dlls/uuid/uuid.c | 1 + include/msctf.idl | 100 +++++++++++++++ 7 files changed, 406 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c842a86bb630ec83f308…

1 0

Alexandre Julliard : include: Define LANGID in wtypes.idl.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 4e29ceeb77c4eb3a7d66dd1217d0fb375505ee4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e29ceeb77c4eb3a7d66dd121… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 4 15:06:25 2009 +0100 include: Define LANGID in wtypes.idl. --- dlls/msi/msiserver.idl | 1 - include/dimm.idl | 2 -- include/mlang.idl | 5 ----- include/wtypes.idl | 1 + 4 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index ac442db..2189fc4 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -29,7 +29,6 @@ typedef int INSTALLMESSAGE; typedef int MSICONDITION; typedef int MSIRUNMODE; typedef int INSTALLSTATE; -typedef WORD LANGID; cpp_quote("#endif") [ diff --git a/include/dimm.idl b/include/dimm.idl index 07e04b2..851ec90 100644 --- a/include/dimm.idl +++ b/include/dimm.idl @@ -24,8 +24,6 @@ cpp_quote("#include <imm.h>") cpp_quote("#if 0") -typedef WORD LANGID; - typedef struct { LPSTR lpReading; LPSTR lpWord; diff --git a/include/mlang.idl b/include/mlang.idl index bcc0917..ca89711 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -22,11 +22,6 @@ import "unknwn.idl"; interface IStream; -/* FIXME: LANGID is defined in winnt.h and mlang.h in the platform SDK */ -cpp_quote("#ifndef _WINNT_") -typedef WORD LANGID; -cpp_quote("#endif") - cpp_quote("#define CPIOD_PEEK 0x40000000") cpp_quote("#define CPIOD_FORCE_PROMPT 0x80000000") diff --git a/include/wtypes.idl b/include/wtypes.idl index 8378012..c817d08 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -87,6 +87,7 @@ typedef LONG_PTR LRESULT; typedef LONG HRESULT; typedef DWORD LCID; +typedef USHORT LANGID; typedef unsigned __int64 DWORDLONG; typedef __int64 LONGLONG;

1 0

Paul Vriens : winetest: Make sure we can test .NET dlls on Windows.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: aa20ee6b45cc5258749fcbdcf08a615785771fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa20ee6b45cc5258749fcbdcf… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Feb 3 20:45:34 2009 +0100 winetest: Make sure we can test .NET dlls on Windows. --- programs/winetest/main.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index fc7a378..211ec2e 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -55,6 +55,10 @@ static char build_id[64]; static char *filters[64]; static unsigned int nb_filters = 0; +/* Needed to check for .NET dlls */ +static HMODULE hmscoree; +static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE *); + /* check if test is being filtered out */ static BOOL test_filtered_out( LPCSTR module, LPCSTR testname ) { @@ -494,6 +498,8 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, { const char *tempdir = (const char *)lParam; char dllname[MAX_PATH]; + char filename[MAX_PATH]; + WCHAR dllnameW[MAX_PATH]; HMODULE dll; DWORD err; @@ -505,15 +511,21 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, *strstr(dllname, testexe) = 0; dll = LoadLibraryExA(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (!dll && pLoadLibraryShim) + { + MultiByteToWideChar(CP_ACP, 0, dllname, -1, dllnameW, MAX_PATH); + if (FAILED( pLoadLibraryShim(dllnameW, NULL, NULL, &dll) )) dll = 0; + } if (!dll) { xprintf (" %s=dll is missing\n", dllname); return TRUE; } + GetModuleFileNameA(dll, filename, MAX_PATH); FreeLibrary(dll); if (!(err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ))) { - xprintf (" %s=%s\n", dllname, get_file_version(dllname)); + xprintf (" %s=%s\n", dllname, get_file_version(filename)); nr_of_tests += wine_tests[nr_of_files].subtest_count; nr_of_files++; } @@ -614,6 +626,12 @@ run_tests (char *logname) GetLastError ()); wine_tests = xmalloc (nr_of_files * sizeof wine_tests[0]); + /* Do this only once during extraction (and version checking) */ + hmscoree = LoadLibraryA("mscoree.dll"); + pLoadLibraryShim = NULL; + if (hmscoree) + pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); + report (R_STATUS, "Extracting tests"); report (R_PROGRESS, 0, nr_of_files); nr_of_files = 0; @@ -623,6 +641,8 @@ run_tests (char *logname) report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); + FreeLibrary(hmscoree); + xprintf ("Test output:\n" ); report (R_DELTA, 0, "Extracting: Done");

1 0

Detlef Riekenberg : comctl32/tests: Make the test dpi and theme aware by using SM_CYSIZE.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: f78f4d89b70c31db0a5b95c623d500bd057926f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78f4d89b70c31db0a5b95c62… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 4 00:35:57 2009 +0100 comctl32/tests: Make the test dpi and theme aware by using SM_CYSIZE. --- dlls/comctl32/tests/status.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 8b8facf..f47d3ea 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -40,6 +40,7 @@ static WNDPROC g_status_wndproc; static RECT g_rcCreated; static HWND g_hMainWnd; static int g_wmsize_count = 0; +static DWORD g_height; static HWND create_status_control(DWORD style, DWORD exstyle) { @@ -113,10 +114,16 @@ static int CALLBACK check_height_font_enumproc(ENUMLOGFONTEX *enumlf, NEWTEXTMET { HWND hwndStatus = (HWND)lParam; HDC hdc = GetDC(NULL); - static const int sizes[] = {8, 9, 10, 12, 16, 22, 28, 36, 48, 72}; - int i; + static const int sizes[] = { 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, + 20, 22, 28, 36, 48, 72}; + DWORD i; + DWORD y; + LPSTR facename = (CHAR *)enumlf->elfFullName; + + /* on win9x, enumlf->elfFullName is only valid for truetype fonts */ + if (type != TRUETYPE_FONTTYPE) + facename = enumlf->elfLogFont.lfFaceName; - trace("Font %s\n", enumlf->elfFullName); for (i = 0; i < sizeof(sizes)/sizeof(sizes[0]); i++) { HFONT hFont; @@ -132,7 +139,11 @@ static int CALLBACK check_height_font_enumproc(ENUMLOGFONTEX *enumlf, NEWTEXTMET GetClientRect(hwndStatus, &rcCtrl); GetTextMetrics(hdc, &tm); - expect(max(tm.tmHeight + (tm.tmInternalLeading ? tm.tmInternalLeading : 2) + 4, 20), rcCtrl.bottom); + y = tm.tmHeight + (tm.tmInternalLeading ? tm.tmInternalLeading : 2) + 4; + + ok( rcCtrl.bottom == max(y, g_height), + "got %d (expected %d) for %s #%d\n", + rcCtrl.bottom, max(y, g_height), facename, sizes[i]); SelectObject(hdc, hOldFont); SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hCtrlFont, TRUE); @@ -213,7 +224,11 @@ static void test_height(void) ZeroMemory(&lf, sizeof(lf)); SendMessage(hwndStatus, SB_SETMINHEIGHT, 0, 0); hdc = GetDC(NULL); - trace("dpi=%d\n", GetDeviceCaps(hdc, LOGPIXELSY)); + + g_height = GetSystemMetrics(SM_CYSIZE) + 2; + if (g_height & 1) g_height--; /* The height is always even */ + + trace("dpi=%d (min height: %d)\n", GetDeviceCaps(hdc, LOGPIXELSY), g_height); EnumFontFamiliesEx(hdc, &lf, (FONTENUMPROC)check_height_family_enumproc, (LPARAM)hwndStatus, 0); ReleaseDC(NULL, hdc);

1 0

Alistair Leslie-Hughes : shdocvw: Correct OnAmbientPropertyChange regression.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: a14a75b85ebe1a7d15f9a313f9d79a9571037d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14a75b85ebe1a7d15f9a313f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 4 11:51:59 2009 +1100 shdocvw: Correct OnAmbientPropertyChange regression. --- dlls/shdocvw/oleobject.c | 6 +++--- dlls/shdocvw/tests/webbrowser.c | 25 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index cd5e605..a38d03d 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -719,9 +719,9 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS switch(dispID) { case DISPID_UNKNOWN: - /* Unknown means multiple properties changed, so check them all. */ - on_offlineconnected_change(This); - on_silent_change(This); + /* Unknown means multiple properties changed, so check them all. + * BUT the Webbrowser OleControl object doesnt appear to do this. + */ return S_OK; case DISPID_AMBIENT_OFFLINEIFNOTCONNECTED: return on_offlineconnected_change(This); diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 27cd353..64c5bab 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -69,6 +69,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + DEFINE_EXPECT(GetContainer); DEFINE_EXPECT(Site_GetWindow); DEFINE_EXPECT(ShowObject); @@ -1787,15 +1790,19 @@ static void test_ambient_unknown(IWebBrowser2 *wb, IOleControl *control, BOOL is hres = IOleControl_OnAmbientPropertyChange(control, DISPID_UNKNOWN); ok(hres == S_OK, "OnAmbientPropertyChange failed %08x\n", hres); - if(is_clientsite) - { - CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); - CHECK_CALLED(Invoke_AMBIENT_SILENT); - todo_wine CHECK_CALLED(Invoke_AMBIENT_USERMODE); - todo_wine CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); - todo_wine CHECK_CALLED(Invoke_AMBIENT_USERAGENT); - todo_wine CHECK_CALLED(Invoke_AMBIENT_PALETTE); - } + CHECK_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_EXPECT(Invoke_AMBIENT_SILENT); + CHECK_EXPECT(Invoke_AMBIENT_USERMODE); + CHECK_EXPECT(Invoke_AMBIENT_DLCONTROL); + CHECK_EXPECT(Invoke_AMBIENT_USERAGENT); + CHECK_EXPECT(Invoke_AMBIENT_PALETTE); + + CLEAR_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CLEAR_CALLED(Invoke_AMBIENT_SILENT); + CLEAR_CALLED(Invoke_AMBIENT_USERMODE); + CLEAR_CALLED(Invoke_AMBIENT_DLCONTROL); + CLEAR_CALLED(Invoke_AMBIENT_USERAGENT); + CLEAR_CALLED(Invoke_AMBIENT_PALETTE); } static void test_wb_funcs(IUnknown *unk, BOOL is_clientsite)

1 0

Alexandre Julliard : dbghelp: Moved SymEnumLines to symbol. c to reuse the regex support.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 601a1364b95ff1e72a9e1fbc08feb14fce9db2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=601a1364b95ff1e72a9e1fbc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 4 13:13:08 2009 +0100 dbghelp: Moved SymEnumLines to symbol.c to reuse the regex support. --- dlls/dbghelp/source.c | 113 ------------------------------------------------- dlls/dbghelp/symbol.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 113 deletions(-) diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index 8eef337..dd8fc6e 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -26,9 +26,6 @@ #include "dbghelp_private.h" #include "wine/debug.h" -#ifdef HAVE_REGEX_H -# include <regex.h> -#endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); @@ -154,116 +151,6 @@ BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, PCSTR Mask, return TRUE; } -static inline void re_append(char** mask, unsigned* len, char ch) -{ - *mask = HeapReAlloc(GetProcessHeap(), 0, *mask, ++(*len)); - (*mask)[*len - 2] = ch; -} - -static BOOL compile_regex(regex_t* re, const char* srcfile) -{ - char* mask; - unsigned len = 1; - - mask = HeapAlloc(GetProcessHeap(), 0, 1); - re_append(&mask, &len, '^'); - if (!srcfile || !*srcfile) re_append(&mask, &len, '*'); - else while (*srcfile) - { - switch (*srcfile) - { - case '\\': - case '/': - re_append(&mask, &len, '['); - re_append(&mask, &len, '\\'); - re_append(&mask, &len, '\\'); - re_append(&mask, &len, '/'); - re_append(&mask, &len, ']'); - break; - case '.': - re_append(&mask, &len, '\\'); - re_append(&mask, &len, '.'); - break; - default: - re_append(&mask, &len, *srcfile); - break; - } - srcfile++; - } - re_append(&mask, &len, '$'); - mask[len - 1] = '\0'; - len = regcomp(re, mask, REG_NOSUB); - HeapFree(GetProcessHeap(), 0, mask); - if (len) - { - FIXME("Couldn't compile %s\n", mask); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - return TRUE; -} - -/****************************************************************** - * SymEnumLines (DBGHELP.@) - * - */ -BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, - PCSTR srcfile, PSYM_ENUMLINES_CALLBACK cb, PVOID user) -{ - struct module_pair pair; - struct hash_table_iter hti; - struct symt_ht* sym; - regex_t re; - struct line_info* dli; - void* ptr; - SRCCODEINFO sci; - const char* file; - - if (!cb) return FALSE; - if (!(dbghelp_options & SYMOPT_LOAD_LINES)) return TRUE; - - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - if (compiland) FIXME("Unsupported yet (filtering on compiland %s)\n", compiland); - pair.requested = module_find_by_addr(pair.pcs, base, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; - if (!compile_regex(&re, srcfile)) return FALSE; - - sci.SizeOfStruct = sizeof(sci); - sci.ModBase = base; - - hash_table_iter_init(&pair.effective->ht_symbols, &hti, NULL); - while ((ptr = hash_table_iter_up(&hti))) - { - unsigned int i; - - sym = GET_ENTRY(ptr, struct symt_ht, hash_elt); - if (sym->symt.tag != SymTagFunction) continue; - - sci.FileName[0] = '\0'; - for (i=0; i<vector_length(&((struct symt_function*)sym)->vlines); i++) - { - dli = vector_at(&((struct symt_function*)sym)->vlines, i); - if (dli->is_source_file) - { - file = source_get(pair.effective, dli->u.source_file); - if (regexec(&re, file, 0, NULL, 0) != 0) file = ""; - strcpy(sci.FileName, file); - } - else if (sci.FileName[0]) - { - sci.Key = dli; - sci.Obj[0] = '\0'; /* FIXME */ - sci.LineNumber = dli->line_number; - sci.Address = dli->u.pc_offset; - if (!cb(&sci, user)) break; - } - } - } - regfree(&re); - return TRUE; -} - /****************************************************************** * SymGetSourceFileToken (DBGHELP.@) * diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 304e075..9e66f00 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -123,6 +123,48 @@ static void compile_regex(const char* str, int numchar, regex_t* re, BOOL _case) HeapFree(GetProcessHeap(), 0, mask); } +static BOOL compile_file_regex(regex_t* re, const char* srcfile) +{ + char *mask, *p; + BOOL ret; + + p = mask = HeapAlloc(GetProcessHeap(), 0, 5 * strlen(srcfile) + 4); + *p++ = '^'; + if (!srcfile || !*srcfile) *p++ = '*'; + else while (*srcfile) + { + switch (*srcfile) + { + case '\\': + case '/': + *p++ = '['; + *p++ = '\\'; + *p++ = '\\'; + *p++ = '/'; + *p++ = ']'; + break; + case '.': + *p++ = '\\'; + *p++ = '.'; + break; + default: + *p++ = *srcfile; + break; + } + srcfile++; + } + *p++ = '$'; + *p = 0; + ret = !regcomp(re, mask, REG_NOSUB); + HeapFree(GetProcessHeap(), 0, mask); + if (!ret) + { + FIXME("Couldn't compile %s\n", mask); + SetLastError(ERROR_INVALID_PARAMETER); + } + return ret; +} + static int match_regexp( const regex_t *re, const char *str ) { return !regexec( re, str, 0, NULL, 0 ); @@ -148,6 +190,12 @@ static void compile_regex(const char* str, int numchar, regex_t* re, BOOL _case) re->icase = _case; } +static BOOL compile_file_regex(regex_t* re, const char* srcfile) +{ + compile_regex( srcfile, -1, re, FALSE ); + return TRUE; +} + static int match_regexp( const regex_t *re, const char *str ) { if (re->icase) return !lstrcmpiA( re->str, str ); @@ -1797,3 +1845,64 @@ BOOL WINAPI SymSetScopeFromAddr(HANDLE hProcess, ULONG64 addr) if (!(pcs = process_find_by_handle(hProcess))) return FALSE; return TRUE; } + +/****************************************************************** + * SymEnumLines (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, + PCSTR srcfile, PSYM_ENUMLINES_CALLBACK cb, PVOID user) +{ + struct module_pair pair; + struct hash_table_iter hti; + struct symt_ht* sym; + regex_t re; + struct line_info* dli; + void* ptr; + SRCCODEINFO sci; + const char* file; + + if (!cb) return FALSE; + if (!(dbghelp_options & SYMOPT_LOAD_LINES)) return TRUE; + + pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; + if (compiland) FIXME("Unsupported yet (filtering on compiland %s)\n", compiland); + pair.requested = module_find_by_addr(pair.pcs, base, DMT_UNKNOWN); + if (!module_get_debug(&pair)) return FALSE; + if (!compile_file_regex(&re, srcfile)) return FALSE; + + sci.SizeOfStruct = sizeof(sci); + sci.ModBase = base; + + hash_table_iter_init(&pair.effective->ht_symbols, &hti, NULL); + while ((ptr = hash_table_iter_up(&hti))) + { + unsigned int i; + + sym = GET_ENTRY(ptr, struct symt_ht, hash_elt); + if (sym->symt.tag != SymTagFunction) continue; + + sci.FileName[0] = '\0'; + for (i=0; i<vector_length(&((struct symt_function*)sym)->vlines); i++) + { + dli = vector_at(&((struct symt_function*)sym)->vlines, i); + if (dli->is_source_file) + { + file = source_get(pair.effective, dli->u.source_file); + if (!match_regexp(&re, file)) file = ""; + strcpy(sci.FileName, file); + } + else if (sci.FileName[0]) + { + sci.Key = dli; + sci.Obj[0] = '\0'; /* FIXME */ + sci.LineNumber = dli->line_number; + sci.Address = dli->u.pc_offset; + if (!cb(&sci, user)) break; + } + } + } + regfree(&re); + return TRUE; +}

1 0

Alexandre Julliard : dbghelp: Fix pool allocation routines to be able to support arbitrary sizes.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: ae7490d362e684eb52d15c4351697bfe0b0510e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7490d362e684eb52d15c435… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 4 12:27:36 2009 +0100 dbghelp: Fix pool allocation routines to be able to support arbitrary sizes. Also move full arenas to a separate list to avoid searching through them again and again. --- dlls/dbghelp/dbghelp_private.h | 10 +++-- dlls/dbghelp/storage.c | 71 ++++++++++++++++++++++++--------------- 2 files changed, 50 insertions(+), 31 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 880aed9..77fb47e 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -29,6 +29,7 @@ #include "objbase.h" #include "oaidl.h" #include "winnls.h" +#include "wine/list.h" #include "wine/unicode.h" #include "cvconst.h" @@ -37,13 +38,14 @@ struct pool /* poor's man */ { - struct pool_arena* first; - unsigned arena_size; + struct list arena_list; + struct list arena_full; + size_t arena_size; }; -void pool_init(struct pool* a, unsigned arena_size); +void pool_init(struct pool* a, size_t arena_size); void pool_destroy(struct pool* a); -void* pool_alloc(struct pool* a, unsigned len); +void* pool_alloc(struct pool* a, size_t len); char* pool_strdup(struct pool* a, const char* str); struct vector diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index ec8a37d..23a45e1 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -34,14 +34,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); struct pool_arena { - struct pool_arena* next; - char* current; + struct list entry; + char *current; + char *end; }; -void pool_init(struct pool* a, unsigned arena_size) +void pool_init(struct pool* a, size_t arena_size) { + list_init( &a->arena_list ); + list_init( &a->arena_full ); a->arena_size = arena_size; - a->first = NULL; } void pool_destroy(struct pool* pool) @@ -50,58 +52,73 @@ void pool_destroy(struct pool* pool) struct pool_arena* next; #ifdef USE_STATS - unsigned alloc, used, num; - + size_t alloc, used, num; + alloc = used = num = 0; - arena = pool->first; - while (arena) + LIST_FOR_EACH_ENTRY( arena, &pool->arena_list, struct pool_arena, entry ) + { + alloc += arena->end - (char *)arena; + used += arena->current - (char*)arena; + num++; + } + LIST_FOR_EACH_ENTRY( arena, &pool->arena_full, struct pool_arena, entry ) { - alloc += pool->arena_size; + alloc += arena->end - (char *)arena; used += arena->current - (char*)arena; num++; - arena = arena->next; } if (alloc == 0) alloc = 1; /* avoid division by zero */ - FIXME("STATS: pool %p has allocated %u kbytes, used %u kbytes in %u arenas,\n" - "\t\t\t\tnon-allocation ratio: %.2f%%\n", - pool, alloc >> 10, used >> 10, num, 100.0 - (float)used / (float)alloc * 100.0); + FIXME("STATS: pool %p has allocated %u kbytes, used %u kbytes in %u arenas, non-allocation ratio: %.2f%%\n", + pool, (unsigned)(alloc >> 10), (unsigned)(used >> 10), (unsigned)num, + 100.0 - (float)used / (float)alloc * 100.0); #endif - arena = pool->first; - while (arena) + LIST_FOR_EACH_ENTRY_SAFE( arena, next, &pool->arena_list, struct pool_arena, entry ) { - next = arena->next; + list_remove( &arena->entry ); + HeapFree(GetProcessHeap(), 0, arena); + } + LIST_FOR_EACH_ENTRY_SAFE( arena, next, &pool->arena_full, struct pool_arena, entry ) + { + list_remove( &arena->entry ); HeapFree(GetProcessHeap(), 0, arena); - arena = next; } - pool_init(pool, 0); } -void* pool_alloc(struct pool* pool, unsigned len) +void* pool_alloc(struct pool* pool, size_t len) { struct pool_arena* arena; void* ret; + size_t size; len = (len + 3) & ~3; /* round up size on DWORD boundary */ - assert(sizeof(struct pool_arena) + len <= pool->arena_size && len); - for (arena = pool->first; arena; arena = arena->next) + LIST_FOR_EACH_ENTRY( arena, &pool->arena_list, struct pool_arena, entry ) { - if ((char*)arena + pool->arena_size - arena->current >= len) + if (arena->end - arena->current >= len) { ret = arena->current; arena->current += len; + if (arena->current + 16 >= arena->end) + { + list_remove( &arena->entry ); + list_add_tail( &pool->arena_full, &arena->entry ); + } return ret; } } - arena = HeapAlloc(GetProcessHeap(), 0, pool->arena_size); - if (!arena) {ERR("OOM\n");return NULL;} + size = max( pool->arena_size, len + sizeof(struct pool_arena) ); + arena = HeapAlloc(GetProcessHeap(), 0, size); + if (!arena) {ERR("OOM for %u\n", size);return NULL;} - ret = (char*)arena + sizeof(*arena); - arena->next = pool->first; - pool->first = arena; + ret = arena + 1; arena->current = (char*)ret + len; + arena->end = (char *)arena + size; + if (arena->current + 16 >= arena->end) + list_add_tail( &pool->arena_full, &arena->entry ); + else + list_add_head( &pool->arena_list, &arena->entry ); return ret; }

1 0

← Newer
1
...
81
82
83
84
85
86
87
...
97
Older →

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