December 2007 - Wine-commits

Lionel Debroux : msi: Fix memory leaks (found by Smatch).
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: fe444f0217452b1ca008835535d93b59e0e4d334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe444f0217452b1ca00883553… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sun Dec 9 19:54:14 2007 +0100 msi: Fix memory leaks (found by Smatch). --- dlls/msi/database.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index f4ed1d7..a690ee4 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -552,7 +552,7 @@ static LPWSTR msi_build_insertsql_columns(LPWSTR *columns_data, LPWSTR *types, D static LPWSTR msi_build_insertsql_data(LPWSTR **records, LPWSTR *types, DWORD num_columns, DWORD irec) { - LPWSTR columns; + LPWSTR columns, temp_columns; DWORD sql_size = 1, i; WCHAR expanded[128]; @@ -578,6 +578,7 @@ static LPWSTR msi_build_insertsql_data(LPWSTR **records, LPWSTR *types, DWORD nu lstrcpyW(expanded, empty); break; default: + HeapFree( GetProcessHeap(), 0, columns ); return NULL; } @@ -585,9 +586,13 @@ static LPWSTR msi_build_insertsql_data(LPWSTR **records, LPWSTR *types, DWORD nu expanded[lstrlenW(expanded) - 2] = '\0'; sql_size += lstrlenW(expanded); - columns = msi_realloc(columns, sql_size * sizeof(WCHAR)); - if (!columns) + temp_columns = msi_realloc(columns, sql_size * sizeof(WCHAR)); + if (!temp_columns) + { + HeapFree( GetProcessHeap(), 0, columns); return NULL; + } + columns = temp_columns; lstrcatW(columns, expanded); } @@ -654,6 +659,7 @@ UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) LPWSTR *columns, *types, *labels; LPWSTR path, ptr, data; LPWSTR **records; + LPWSTR **temp_records; static const WCHAR backslash[] = {'\\',0}; @@ -680,7 +686,10 @@ UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) records = msi_alloc(sizeof(LPWSTR *)); if (!records) - return ERROR_OUTOFMEMORY; + { + r = ERROR_OUTOFMEMORY; + goto done; + } /* read in the table records */ while (*ptr) @@ -688,9 +697,13 @@ UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) msi_parse_line( &ptr, &records[num_records], NULL ); num_records++; - records = msi_realloc(records, (num_records + 1) * sizeof(LPWSTR *)); - if (!records) - return ERROR_OUTOFMEMORY; + temp_records = msi_realloc(records, (num_records + 1) * sizeof(LPWSTR *)); + if (!temp_records) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + records = temp_records; } r = msi_add_table_to_db( db, columns, types, labels, num_labels, num_columns );

1 0

Lionel Debroux : winhelp: Fix memory leaks (found by Smatch).
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 14bed07c99843f2d196fd6b3481492f3a28c7adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=14bed07c99843f2d196fd6b34… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sun Dec 9 09:47:42 2007 +0100 winhelp: Fix memory leaks (found by Smatch). --- programs/winhelp/hlpfile.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index ff041ec..3a9717a 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1613,7 +1613,12 @@ static BOOL HLPFILE_UncompressLZ77_Phrases(HLPFILE* hlpfile) phrases.offsets = HeapAlloc(GetProcessHeap(), 0, sizeof(unsigned) * (num + 1)); phrases.buffer = HeapAlloc(GetProcessHeap(), 0, dec_size); - if (!phrases.offsets || !phrases.buffer) return FALSE; + if (!phrases.offsets || !phrases.buffer) + { + HeapFree(GetProcessHeap(), 0, phrases.offsets); + HeapFree(GetProcessHeap(), 0, phrases.buffer); + return FALSE; + } for (i = 0; i <= num; i++) phrases.offsets[i] = GET_USHORT(buf, head_size + 2 * i) - 2 * num - 2; @@ -1672,7 +1677,12 @@ static BOOL HLPFILE_Uncompress_Phrases40(HLPFILE* hlpfile) phrases.offsets = HeapAlloc(GetProcessHeap(), 0, sizeof(unsigned) * (num + 1)); phrases.buffer = HeapAlloc(GetProcessHeap(), 0, dec_size); - if (!phrases.offsets || !phrases.buffer) return FALSE; + if (!phrases.offsets || !phrases.buffer) + { + HeapFree(GetProcessHeap(), 0, phrases.offsets); + HeapFree(GetProcessHeap(), 0, phrases.buffer); + return FALSE; + } #define getbit() (ptr += (mask < 0), mask = mask*2 + (mask<=0), (*ptr & mask) != 0)

1 0

Vitaly Lipatov : winecfg: Updated Russian translation.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: b3caf3685867aebf9211c180038fcd943923cc41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3caf3685867aebf9211c1800… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Dec 9 15:53:54 2007 +0300 winecfg: Updated Russian translation. --- programs/winecfg/Ru.rc | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 94ddec9..6163efa 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -50,7 +50,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " �� ",IDC_STATIC, 8,4,244,240 - LTEXT "Wine �� Windows �� . �� , �� .", + LTEXT "Wine �� Windows �� . �� , �� , �� .", IDC_STATIC,15,20,227,60 CONTROL "��",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,65,230,134 @@ -85,7 +85,7 @@ BEGIN COMBOBOX IDC_D3D_VSHADER_MODE,120,197,125,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "�� Pixel Shader (�� )",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,216,230,10 - GROUPBOX " Screen Resolution ",IDC_STATIC,8,242,244,25 + GROUPBOX " �� ",IDC_STATIC,8,242,244,25 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,250,187,15 EDITTEXT IDC_RES_DPIEDIT,204,250,23,13,ES_NUMBER|WS_TABSTOP LTEXT "dpi",IDC_STATIC,235,252,10,8 @@ -96,7 +96,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " �� DLL ",IDC_STATIC,8,4,244,240 - LTEXT "�� builtin (�� Wine) �� native (�� Windows �� )." + LTEXT "�� , �� (DLL) ��: �� Wine �� (�� Windows)." ,IDC_STATIC,16,16,220,32 LTEXT "�� :",IDC_STATIC,16,58,160,8 COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE @@ -107,16 +107,16 @@ BEGIN PUSHBUTTON "&��",IDC_DLLS_REMOVEDLL,164,114,82,14 END -IDD_LOADORDER DIALOG DISCARDABLE 80, 90, 130, 92 +IDD_LOADORDER DIALOG DISCARDABLE 80, 90, 150, 92 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "�� " FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " �� ",IDC_STATIC,8,4,115,66 + GROUPBOX " �� ",IDC_STATIC,8,4,135,66 CONTROL "&�� (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,105,10 - CONTROL "&�� (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,105,10 - CONTROL "�&�� ",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,105,10 - CONTROL "��&�� ",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,105,10 + CONTROL "�&�� (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,105,10 + CONTROL "�&��, �� ",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,115,10 + CONTROL "��&��, �� ",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,115,10 CONTROL "&��",IDC_RAD_DISABLE,"Button", BS_AUTORADIOBUTTON,16,54,105,10 DEFPUSHBUTTON "OK",IDOK,8,74,45,14,WS_GROUP PUSHBUTTON "��",IDCANCEL,57,74,45,14,WS_GROUP @@ -166,7 +166,7 @@ BEGIN GROUPBOX " �� ",IDC_STATIC,8,4,244,195 LTEXT "�� : ",IDC_STATIC,15,20,227,30 CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 - PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,50,59,14 + PUSHBUTTON "&�� ",IDC_AUDIO_TEST,170,50,59,14 PUSHBUTTON "�� ",IDC_AUDIO_CONTROL_PANEL,170,70,80,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "�� : ",IDC_STATIC,15,215,90,10 @@ -212,7 +212,7 @@ BEGIN IDS_TAB_APPLICATIONS "��" IDS_TAB_DLLS "��" IDS_TAB_DRIVES "��" - IDS_CHOOSE_PATH "�� ." + IDS_CHOOSE_PATH "�� :" IDS_HIDE_ADVANCED "�� " IDS_SHOW_ADVANCED "�� " IDS_NOTHEME "(�� )" @@ -224,7 +224,7 @@ BEGIN IDS_WINECFG_TITLE_APP "�� Wine �� %s" IDS_THEMEFILE "�� " IDS_THEMEFILE_SELECT "�� " - IDS_AUDIO_MISSING "�� .\n\n�� . �� , �� .\n\n�� ." + IDS_AUDIO_MISSING "�� .\n\n�� . �� .\n\n�� ." IDS_SHELL_FOLDER "�� " IDS_LINKS_TO "�� " END @@ -233,10 +233,10 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DLL_WARNING "�� .\n�� ?" IDS_DLL_WARNING_CAPTION "��: �� " - IDS_DLL_NATIVE "��" + IDS_DLL_NATIVE "��" IDS_DLL_BUILTIN "��" - IDS_DLL_NATIVE_BUILTIN "��, ��" - IDS_DLL_BUILTIN_NATIVE "��, ��" + IDS_DLL_NATIVE_BUILTIN "��, ��" + IDS_DLL_BUILTIN_NATIVE "��, ��" IDS_DLL_DISABLED "��" IDS_DEFAULT_SETTINGS "�� " IDS_EXECUTABLE_FILTER "�� Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0" @@ -252,14 +252,14 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_DRIVE_UNKNOWN "��" - IDS_DRIVE_FIXED "�� " + IDS_DRIVE_UNKNOWN "��" + IDS_DRIVE_FIXED "Ƹ�� " IDS_DRIVE_REMOTE "�� " IDS_DRIVE_REMOVABLE "��" IDS_DRIVE_CDROM "CD-ROM" IDS_DRIVE_LETTERS_EXCEEDED "�� .\n\n� �� - �� A �� Z, � � �� 26 ��." IDS_SYSTEM_DRIVE_LABEL "�� " - IDS_CONFIRM_DELETE_C "�� C?\n\n�� Windows �� C. �� , �� !" + IDS_CONFIRM_DELETE_C "�� C?\n\n�� Windows-�� C. �� , �� !" IDS_COL_DRIVELETTER "��" IDS_COL_DRIVEMAPPING "��" IDS_NO_DRIVE_C "�� C.\n\n�� !\n" @@ -308,5 +308,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "�� - ��" IDC_SYSPARAMS_INACTIVE_TITLE "�� " IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "�� - ��" - IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" + IDC_SYSPARAMS_MSGBOX_TEXT "�� - ��" END

1 0

Maarten Lankhorst : winealsa: Remove fixed fixme.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 6e87f3741b758ab810e3ea966f21ea2344c59672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e87f3741b758ab810e3ea966… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Wed Dec 12 23:45:35 2007 +0100 winealsa: Remove fixed fixme. --- dlls/winealsa.drv/wavein.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 277fa8c..2c574f1 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -164,9 +164,6 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) for (;;) { /* wait for dwSleepTime or an event in thread's queue */ - /* FIXME: could improve wait time depending on queue state, - * ie, number of queued fragments - */ if (wwi->lpQueuePtr != NULL && wwi->state == WINE_WS_PLAYING) { DWORD frames;

1 0

Maarten Lankhorst : winealsa: Add control 'Digital' as alias for microphone .
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: f75600dd1de81e016a44dee37391bc5bb051c7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75600dd1de81e016a44dee37… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Wed Dec 12 23:47:21 2007 +0100 winealsa: Add control 'Digital' as alias for microphone. --- dlls/winealsa.drv/mixer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 42ccd50..6b13610 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -209,6 +209,7 @@ static const struct mixerlinetype { { "CD", MIXERLINE_COMPONENTTYPE_SRC_COMPACTDISC, }, { "Line", MIXERLINE_COMPONENTTYPE_SRC_LINE, }, { "Phone", MIXERLINE_COMPONENTTYPE_SRC_TELEPHONE, }, + { "Digital", MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE, }, }; /* Map name to MIXERLINE_COMPONENTTYPE_XXX */

1 0

Stefan Dösinger : winex11: Remove an unused variable.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 211f4295797259437287d8256c84b7ac7c8dfcf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211f4295797259437287d8256… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 7 18:01:25 2007 +0100 winex11: Remove an unused variable. --- dlls/winex11.drv/settings.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 4fb01ad..ac6f4ad 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -266,10 +266,6 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW { static const WCHAR dev_name[CCHDEVICENAME] = { 'W','i','n','e',' ','X','1','1',' ','d','r','i','v','e','r',0 }; - DWORD dwBpp; - - dwBpp = screen_depth; - if (dwBpp == 24) dwBpp = 32; devmode->dmSize = sizeof(DEVMODEW); devmode->dmSpecVersion = MAKEWORD(1,4);

1 0

Stefan Dösinger : gdi32: Test the bit depth of compatible bitmaps explicitly.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: f2547427c070bbc6430a866da93da57180efdbad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2547427c070bbc6430a866da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 7 20:27:57 2007 +0100 gdi32: Test the bit depth of compatible bitmaps explicitly. --- dlls/gdi32/tests/bitmap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 7183e31..a895f34 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -182,7 +182,8 @@ static void test_createdibitmap(void) /* Now select a polychrome bitmap into the dc and we expect screen_depth bitmaps again */ - hbm_colour = CreateCompatibleBitmap(hdc, 1, 1); + hbm_colour = CreateCompatibleBitmap(hdc, bmih.biWidth, bmih.biHeight); + test_bitmap_info(hbm_colour, screen_depth, &bmih); hbm_old = SelectObject(hdcmem, hbm_colour); /* First try 32 bits */

1 0

Alexandre Julliard : wordpad: Fix invalid pointer usage.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: c7278c21bd52de4ffb8f725f976777fae95bde07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7278c21bd52de4ffb8f725f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 12 22:32:38 2007 +0100 wordpad: Fix invalid pointer usage. --- programs/wordpad/registry.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index f959b6d..196e7d1 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -99,9 +99,8 @@ void registry_read_winrect(RECT* rc) HKEY hKey; DWORD size = sizeof(RECT); - ZeroMemory(&rc, sizeof(RECT)); if(registry_get_handle(&hKey, 0, (LPWSTR)key_options) != ERROR_SUCCESS || - RegQueryValueExW(hKey, var_framerect, 0, NULL, (LPBYTE)&rc, &size) != + RegQueryValueExW(hKey, var_framerect, 0, NULL, (LPBYTE)rc, &size) != ERROR_SUCCESS || size != sizeof(RECT)) { rc->top = 0;

1 0

Hans Leidekker : usp10: Do glyph translation for truetype fonts only.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 25e836e83ce986daacea2d11912c7404e0aea321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e836e83ce986daacea2d119… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Dec 12 19:11:28 2007 +0100 usp10: Do glyph translation for truetype fonts only. --- dlls/usp10/usp10.c | 85 ++++++++++++++++++++++++++------------------------- 1 files changed, 43 insertions(+), 42 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ecb9cdc..28b0f90 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -145,9 +145,8 @@ static const SCRIPT_PROPERTIES *script_props[] = typedef struct { HDC hdc; - LONG height; - WCHAR default_char; LOGFONTW lf; + TEXTMETRICW tm; } ScriptCache; typedef struct { @@ -200,23 +199,23 @@ static HDC get_cache_hdc(SCRIPT_CACHE *psc) static WCHAR get_cache_default_char(SCRIPT_CACHE *psc) { - return ((ScriptCache *)*psc)->default_char; + return ((ScriptCache *)*psc)->tm.tmDefaultChar; } static LONG get_cache_height(SCRIPT_CACHE *psc) { - return ((ScriptCache *)*psc)->height; + return ((ScriptCache *)*psc)->tm.tmHeight; } -static HRESULT init_script_cache(const HDC hdc, ScriptCache *sc) +static BYTE get_cache_pitch_family(SCRIPT_CACHE *psc) { - TEXTMETRICW metric; + return ((ScriptCache *)*psc)->tm.tmPitchAndFamily; +} - if (!GetTextMetricsW(hdc, &metric)) return E_INVALIDARG; +static HRESULT init_script_cache(const HDC hdc, ScriptCache *sc) +{ + if (!GetTextMetricsW(hdc, &sc->tm)) return E_INVALIDARG; if (!GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(LOGFONTW), &sc->lf)) return E_INVALIDARG; - - sc->height = metric.tmHeight; - sc->default_char = metric.tmDefaultChar; sc->hdc = hdc; return S_OK; } @@ -1260,15 +1259,16 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, hfont = select_cached_font(psc); - if (!psa->fNoGlyphIndex) { /* Glyph translate */ - if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0))) - return S_FALSE; + if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) + { + GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0); } - else { - for (cnt = 0; cnt < cChars; cnt++) { /* no translate so set up */ - pwOutGlyphs[cnt] = pwcChars[cnt]; /* copy in to out and */ - } + else + { + TRACE("no glyph translation\n"); + for (cnt = 0; cnt < cChars; cnt++) pwOutGlyphs[cnt] = pwcChars[cnt]; } + if (psva) { /* set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ @@ -1311,10 +1311,10 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int cGlyphs, const SCRIPT_VISATTR *psva, SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ) { - int wcnt; HRESULT hr; LPABC lpABC; HFONT hfont; + unsigned int i; TRACE("(%p, %p, %p, %s, %d, %p, %p, %p)\n", hdc, psc, pwGlyphs, debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance); @@ -1328,38 +1328,39 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, * has been converted to glyphs and we still need to translate back to the original chars * to get the correct ABC widths. */ - if (!(lpABC = heap_alloc_zero(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; - if (pABC) - memset(pABC, 0, sizeof(ABC)); + if (!(lpABC = heap_alloc_zero(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; + if (pABC) memset(pABC, 0, sizeof(ABC)); - /* FIXME: set pGoffset to more reasonable values */ - if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *)pwGlyphs, lpABC)) + if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) { - WARN("Could not get ABC values\n"); - for (wcnt = 0; wcnt < cGlyphs; wcnt++) - { - if (pGoffset) pGoffset[wcnt].du = pGoffset[wcnt].dv = 0; - if (piAdvance) piAdvance[wcnt] = 0; - } + GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *)pwGlyphs, lpABC); } else { - for (wcnt = 0; wcnt < cGlyphs; wcnt++) /* add up the char lengths */ + INT width; + for (i = 0; i < cGlyphs; i++) { - TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d wcnt=%d\n", - pwGlyphs[wcnt], lpABC[wcnt].abcA, lpABC[wcnt].abcB, lpABC[wcnt].abcC, wcnt); + GetCharWidth32W(get_cache_hdc(psc), pwGlyphs[i], pwGlyphs[i], &width); + lpABC[i].abcB = width; + } + } - if (pABC) - { - pABC->abcA += lpABC[wcnt].abcA; - pABC->abcB += lpABC[wcnt].abcB; - pABC->abcC += lpABC[wcnt].abcC; - } - if (pGoffset) pGoffset[wcnt].du = pGoffset[wcnt].dv = 0; - if (piAdvance) piAdvance[wcnt] = lpABC[wcnt].abcA + lpABC[wcnt].abcB + lpABC[wcnt].abcC; + for (i = 0; i < cGlyphs; i++) + { + TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d index=%d\n", + pwGlyphs[i], lpABC[i].abcA, lpABC[i].abcB, lpABC[i].abcC, i); + + if (pABC) + { + pABC->abcA += lpABC[i].abcA; + pABC->abcB += lpABC[i].abcB; + pABC->abcC += lpABC[i].abcC; } + /* FIXME: set to more reasonable values */ + if (pGoffset) pGoffset[i].du = pGoffset[i].dv = 0; + if (piAdvance) piAdvance[i] = lpABC[i].abcA + lpABC[i].abcB + lpABC[i].abcC; } - if (pABC) TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); + if (pABC) TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); heap_free(lpABC); unselect_cached_font(psc, hfont); @@ -1620,7 +1621,7 @@ const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) if (!analysis->sz) { if (!(analysis->sz = heap_alloc(sizeof(SIZE)))) return NULL; - analysis->sz->cy = analysis->sc->height; + analysis->sz->cy = analysis->sc->tm.tmHeight; analysis->sz->cx = 0; for (i = 0; i < analysis->numItems; i++)

1 0

Kirill K. Smirnov : winhelp: Export enum and search B+ tree functions.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: af21361dbff5b21b7b8354a1a1af532184840da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af21361dbff5b21b7b8354a1a… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Dec 13 00:57:45 2007 +0300 winhelp: Export enum and search B+ tree functions. --- programs/winhelp/hlpfile.c | 66 +++++++++++++++++++++++++++++++++---------- programs/winhelp/hlpfile.h | 26 +++++++++++++++++ 2 files changed, 76 insertions(+), 16 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 2aafaf6..88cfabb 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -76,18 +76,6 @@ static struct HLPFILE_LINK* link; } attributes; -/* - * Compare function type for HLPFILE_BPTreeSearch function. - * - * PARAMS - * p [I] pointer to testing block (key + data) - * key [I] pointer to key value to look for - * leaf [I] whether this function called for index of leaf page - * next [O] pointer to pointer to next block - */ -typedef int (*HLPFILE_BPTreeCompare)(void *p, const void *key, - int leaf, void **next); - static BOOL HLPFILE_DoReadHlpFile(HLPFILE*, LPCSTR); static BOOL HLPFILE_ReadFileToBuffer(HFILE); static BOOL HLPFILE_FindSubFile(LPCSTR name, BYTE**, BYTE**); @@ -106,8 +94,6 @@ static BOOL HLPFILE_Uncompress3(char*, const char*, const BYTE*, const BYTE*); static void HLPFILE_UncompressRLE(const BYTE* src, const BYTE* end, BYTE** dst, unsigned dstsz); static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile); -static void* HLPFILE_BPTreeSearch(BYTE*, const void*, HLPFILE_BPTreeCompare); - /*********************************************************************** * * HLPFILE_PageByNumber @@ -1924,8 +1910,8 @@ static void HLPFILE_UncompressRLE(const BYTE* src, const BYTE* end, BYTE** dst, * Pointer to block identified by key, or NULL if failure. * */ -static void* HLPFILE_BPTreeSearch(BYTE* buf, const void* key, - HLPFILE_BPTreeCompare comp) +void* HLPFILE_BPTreeSearch(BYTE* buf, const void* key, + HLPFILE_BPTreeCompare comp) { unsigned magic; unsigned page_size; @@ -1970,6 +1956,54 @@ static void* HLPFILE_BPTreeSearch(BYTE* buf, const void* key, return NULL; } +/************************************************************************** + * HLPFILE_BPTreeEnum + * + * Enumerates elements in B+ tree. + * + * PARAMS + * buf [I] pointer to the embedded file structured as a B+ tree + * cb [I] compare function + * cookie [IO] cookie for cb function + */ +void HLPFILE_BPTreeEnum(BYTE* buf, HLPFILE_BPTreeCallback cb, void* cookie) +{ + unsigned magic; + unsigned page_size; + unsigned cur_page; + unsigned level; + BYTE *pages, *ptr, *newptr; + int i, entries; + + magic = GET_USHORT(buf, 9); + if (magic != 0x293B) + { + WINE_ERR("Invalid magic in B+ tree: 0x%x\n", magic); + return; + } + page_size = GET_USHORT(buf, 9+4); + cur_page = GET_USHORT(buf, 9+26); + level = GET_USHORT(buf, 9+32); + pages = buf + 9 + 38; + while (--level > 0) + { + ptr = pages + cur_page*page_size; + cur_page = GET_USHORT(ptr, 4); + } + while (cur_page != 0xFFFF) + { + ptr = pages + cur_page*page_size; + entries = GET_SHORT(ptr, 2); + ptr += 8; + for (i = 0; i < entries; i++) + { + cb(ptr, (void **)&newptr, cookie); + ptr = newptr; + } + cur_page = GET_USHORT(pages+cur_page*page_size, 6); + } +} + /*********************************************************************** * diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index c7e643e..8c9e201 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -3,6 +3,7 @@ * * Copyright 1996 Ulrich Schmid * 2002 Eric Pouech + * 2007 Kirill K. Smirnov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -150,6 +151,28 @@ typedef struct tagHlpFileFile HLPFILE_WINDOWINFO* windows; } HLPFILE; +/* + * Compare function type for HLPFILE_BPTreeSearch function. + * + * PARAMS + * p [I] pointer to testing block (key + data) + * key [I] pointer to key value to look for + * leaf [I] whether this function called for index of leaf page + * next [O] pointer to pointer to next block + */ +typedef int (*HLPFILE_BPTreeCompare)(void *p, const void *key, + int leaf, void **next); + +/* + * Callback function type for HLPFILE_BPTreeEnum function. + * + * PARAMS + * p [I] pointer to data block + * next [O] pointer to pointer to next block + * cookie [IO] cookie data + */ +typedef void (*HLPFILE_BPTreeCallback)(void *p, void **next, void *cookie); + HLPFILE* HLPFILE_ReadHlpFile(LPCSTR lpszPath); HLPFILE_PAGE* HLPFILE_Contents(HLPFILE* hlpfile); HLPFILE_PAGE* HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash); @@ -158,3 +181,6 @@ HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset); LONG HLPFILE_Hash(LPCSTR lpszContext); void HLPFILE_FreeLink(HLPFILE_LINK* link); void HLPFILE_FreeHlpFile(HLPFILE*); + +void* HLPFILE_BPTreeSearch(BYTE*, const void*, HLPFILE_BPTreeCompare); +void HLPFILE_BPTreeEnum(BYTE*, HLPFILE_BPTreeCallback cb, void *cookie);

1 0