December 2007 - Wine-Commits

Lionel Debroux : msi: Fix missing alloc check.
by Alexandre Julliard Dec. 13, 2007

Dec. 13, 2007

Module: wine Branch: master Commit: 1bed47a3b3fbfdb89a5ea560227661b21cbcd03a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bed47a3b3fbfdb89a5ea5602… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sun Dec 9 20:14:47 2007 +0100 msi: Fix missing alloc check. --- dlls/msi/dialog.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index d0e91cd..fae8fcf 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -409,6 +409,9 @@ static msi_control *msi_dialog_create_window( msi_dialog *dialog, style |= WS_CHILD; control = msi_alloc( sizeof *control + strlenW(name)*sizeof(WCHAR) ); + if (!control) + return NULL; + strcpyW( control->name, name ); list_add_head( &dialog->controls, &control->entry ); control->handler = NULL;

1 0

Maarten Lankhorst : winealsa: Don't require a cswitch control for capture.
by Alexandre Julliard Dec. 13, 2007

Dec. 13, 2007

Module: wine Branch: master Commit: affd447db0c7cb9c4c056916ce930d0ffd9511aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=affd447db0c7cb9c4c056916c… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Wed Dec 12 23:48:04 2007 +0100 winealsa: Don't require a cswitch control for capture. --- dlls/winealsa.drv/mixer.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 6b13610..90b539e 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -233,8 +233,7 @@ static int blacklisted(snd_mixer_elem_t *elem) BOOL blisted = 0; if (!snd_mixer_selem_has_playback_volume(elem) && - (!snd_mixer_selem_has_capture_volume(elem) || - !snd_mixer_selem_has_capture_switch(elem))) + !snd_mixer_selem_has_capture_volume(elem)) blisted = 1; TRACE("%s: %x\n", name, blisted); @@ -382,7 +381,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ else if (!capt) continue; - if (capt && snd_mixer_selem_has_capture_switch(elem)) + if (capt && snd_mixer_selem_has_capture_volume(elem)) { (++mline)->component = comp; MultiByteToWideChar(CP_UNIXCP, 0, name, -1, mline->name, MAXPNAMELEN); @@ -473,7 +472,7 @@ static void ALSA_MixerInit(void) captelem = elem; else if (!blacklisted(elem)) { - if (snd_mixer_selem_has_capture_switch(elem)) + if (snd_mixer_selem_has_capture_volume(elem)) ++capcontrols; if (snd_mixer_selem_has_playback_volume(elem)) { @@ -1306,14 +1305,14 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags) return MMSYSERR_INVALPARAM; } - Ml->fdwLine = MIXERLINE_LINEF_ACTIVE; Ml->dwUser = 0; - + Ml->fdwLine = MIXERLINE_LINEF_DISCONNECTED; switch (qf) { case MIXER_GETLINEINFOF_COMPONENTTYPE: { Ml->dwLineID = 0xFFFF; + TRACE("Looking for componenttype %d/%x\n", Ml->dwComponentType, Ml->dwComponentType); for (idx = 0; idx < mmixer->chans; ++idx) if (mmixer->lines[idx].component == Ml->dwComponentType) { @@ -1383,6 +1382,8 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags) return MMSYSERR_INVALPARAM; } + Ml->fdwLine &= ~MIXERLINE_LINEF_DISCONNECTED; + Ml->fdwLine |= MIXERLINE_LINEF_ACTIVE; if (Ml->dwLineID >= mmixer->dests) Ml->fdwLine |= MIXERLINE_LINEF_SOURCE;

1 0

Vitaly Lipatov : winecfg: Updated Russian translation.
by Alexandre Julliard Dec. 13, 2007

Dec. 13, 2007

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 Dec. 13, 2007

Dec. 13, 2007

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 Dec. 13, 2007

Dec. 13, 2007

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 : gdi32: Test the bit depth of compatible bitmaps explicitly.
by Alexandre Julliard Dec. 13, 2007

Dec. 13, 2007

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

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

Dec. 13, 2007

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

Kirill K. Smirnov : winhelp: Display keywords index dialog box.
by Alexandre Julliard Dec. 13, 2007

Dec. 13, 2007

Module: wine Branch: master Commit: d72cfb73424ffbb21cd72c4e56e3336e7048419c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72cfb73424ffbb21cd72c4e5… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Dec 13 00:56:18 2007 +0300 winhelp: Display keywords index dialog box. --- programs/winhelp/En.rc | 10 +++ programs/winhelp/Ru.rc | 10 +++ programs/winhelp/macro.c | 2 +- programs/winhelp/rsrc.rc | 1 + programs/winhelp/winhelp.c | 146 ++++++++++++++++++++++++++++++++++++++++ programs/winhelp/winhelp.h | 2 + programs/winhelp/winhelp_res.h | 3 + 7 files changed, 173 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/En.rc b/programs/winhelp/En.rc index 8c4bac2..464b185 100644 --- a/programs/winhelp/En.rc +++ b/programs/winhelp/En.rc @@ -50,6 +50,16 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Cancel", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT { diff --git a/programs/winhelp/Ru.rc b/programs/winhelp/Ru.rc index c07a743..4767d06 100644 --- a/programs/winhelp/Ru.rc +++ b/programs/winhelp/Ru.rc @@ -49,6 +49,16 @@ MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "��" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&��", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT { diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index c658bf6..68863bf 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -523,7 +523,7 @@ void CALLBACK MACRO_Find(void) void CALLBACK MACRO_Finder(void) { - WINE_FIXME("()\n"); + WINHELP_CreateIndexWindow(); } void CALLBACK MACRO_FloatingMenu(void) diff --git a/programs/winhelp/rsrc.rc b/programs/winhelp/rsrc.rc index 3670d48..8109916 100644 --- a/programs/winhelp/rsrc.rc +++ b/programs/winhelp/rsrc.rc @@ -20,6 +20,7 @@ */ #include <windef.h> +#include <winuser.h> #include "winhelp.h" #include "winhelp_res.h" diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 83c6517..f769153 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -672,6 +672,20 @@ BOOL WINHELP_CreateHelpWindowByMap(HLPFILE* hlpfile, LONG lMap, /*********************************************************************** * + * WINHELP_CreateHelpWindowByOffset + */ +BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE* hlpfile, LONG lOffset, + HLPFILE_WINDOWINFO* wi, int nCmdShow) +{ + HLPFILE_PAGE* page = NULL; + + page = HLPFILE_PageByOffset(hlpfile, lOffset); + if (page) page->file->wRefCount++; + return WINHELP_CreateHelpWindow(page, wi, nCmdShow); +} + +/*********************************************************************** + * * WINHELP_MainWndProc */ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -1933,3 +1947,135 @@ WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW* win, WPARAM wParam, LPARAM return NULL; } + +/************************************************************************** + * cb_KWBTree + * + * HLPFILE_BPTreeCallback enumeration function for '|KWBTREE' internal file. + * + */ +static void cb_KWBTree(void *p, void **next, void *cookie) +{ + HWND hListWnd = (HWND)cookie; + + WINE_TRACE("Adding '%s' to search list\n", (char *)p); + SendMessage(hListWnd, LB_INSERTSTRING, -1, (LPARAM)p); + *next = (char*)p + strlen((char*)p) + 7; +} + +/************************************************************************** + * comp_KWBTREE + * + * HLPFILE_BPTreeCompare function for '|KWBTREE' internal file. + * + */ +static int comp_KWBTree(void *p, const void *key, + int leaf, void** next) +{ + WINE_TRACE("comparing key '%s' with '%s'\n", (char *)p, (char *)key); + *next = (char*)p+strlen(p)+1+(leaf?6:2); + /* unlike directory, index is case insensitive */ + return lstrcmpi(p, key); +} + +/************************************************************************** + * WINHELP_IndexDlgProc + * + * Index dialog callback function. + * + */ +INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static HLPFILE *file; + int sel; + ULONG offset = 1; + + switch (msg) + { + case WM_INITDIALOG: + file = (HLPFILE *)lParam; + HLPFILE_BPTreeEnum(file->kwbtree, cb_KWBTree, + GetDlgItem(hWnd, IDC_INDEXLIST)); + return TRUE; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + sel = SendDlgItemMessage(hWnd, IDC_INDEXLIST, LB_GETCURSEL, 0, 0); + if (sel != LB_ERR) + { + char buf[500]; /* enough */ + BYTE *p; + int count; + + SendDlgItemMessage(hWnd, IDC_INDEXLIST, LB_GETTEXT, + sel, (LPARAM)buf); + p = HLPFILE_BPTreeSearch(file->kwbtree, buf, comp_KWBTree); + if (p == NULL) + { + /* + * TODO: + * This may happen if help file uses other locale than + * system. We should honour charset provided in help file + * and use UNICODE, but for now current implementation is + * acceptable (almost all help files use ANSI). + */ + WINE_FIXME("item '%s' not found, locale mismatch???\n", buf); + return TRUE; + } + count = *(short*)((char *)p + strlen((char *)p) + 1); + if (count > 1) + { + MessageBox(hWnd, "count > 1 not supported yet", "Error", MB_OK | MB_ICONSTOP); + return TRUE; + } + offset = *(ULONG*)((char *)p + strlen((char *)p) + 3); + offset = *(long*)(file->kwdata + offset + 9); + if (offset == 0xFFFFFFFF) + { + MessageBox(hWnd, "macro keywords not supported yet", "Error", MB_OK | MB_ICONSTOP); + return TRUE; + } + } + /* Fall through */ + case IDCANCEL: + EndDialog(hWnd, offset); + return TRUE; + default: + break; + } + default: + break; + } + return FALSE; +} + +/************************************************************************** + * WINHELP_CreateIndexWindow + * + * Displays a dialog with keywords of current help file. + * + */ +BOOL WINHELP_CreateIndexWindow(void) +{ + int ret; + HLPFILE *hlpfile; + + if (Globals.active_win && Globals.active_win->page && Globals.active_win->page->file) + hlpfile = Globals.active_win->page->file; + else + return FALSE; + + if (hlpfile->kwbtree == NULL) + { + WINE_TRACE("No index provided\n"); + return FALSE; + } + + ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_INDEX), + Globals.active_win->hMainWnd, WINHELP_SearchDlgProc, + (LPARAM)hlpfile); + if (ret > 1) + WINHELP_CreateHelpWindowByOffset(hlpfile, ret, Globals.active_win->info, SW_NORMAL); + return TRUE; +} diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index 24eb10f..abe68ea 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -172,8 +172,10 @@ extern FARPROC Callbacks[]; BOOL WINHELP_CreateHelpWindowByHash(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_CreateHelpWindowByMap(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); +BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE*, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_GetOpenFileName(LPSTR, int); +BOOL WINHELP_CreateIndexWindow(void); INT WINHELP_MessageBoxIDS(UINT, UINT, WORD); INT WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD); HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile); diff --git a/programs/winhelp/winhelp_res.h b/programs/winhelp/winhelp_res.h index a6e46f1..14ec13f 100644 --- a/programs/winhelp/winhelp_res.h +++ b/programs/winhelp/winhelp_res.h @@ -30,3 +30,6 @@ #define STID_HELP_FILES_HLP 0x12C #define STID_DIALOG_TEST 0x12D #define STID_FILE_NOT_FOUND_s 0x12E + +#define IDD_INDEX 0x150 +#define IDC_INDEXLIST 0x151

1 0

Kirill K. Smirnov : winhelp: Read keywords.
by Alexandre Julliard Dec. 13, 2007

Dec. 13, 2007

Module: wine Branch: master Commit: 6a2ad1b4796285384e9555e1dccdf52be2749e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a2ad1b4796285384e9555e1d… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Dec 13 00:56:09 2007 +0300 winhelp: Read keywords. --- programs/winhelp/hlpfile.c | 35 +++++++++++++++++++++++++++++++++++ programs/winhelp/hlpfile.h | 2 ++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 88cfabb..ff041ec 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -86,6 +86,7 @@ static BOOL HLPFILE_UncompressLZ77_Phrases(HLPFILE*); static BOOL HLPFILE_Uncompress_Phrases40(HLPFILE*); static BOOL HLPFILE_Uncompress_Topic(HLPFILE*); static BOOL HLPFILE_GetContext(HLPFILE*); +static BOOL HLPFILE_GetKeywords(HLPFILE*); static BOOL HLPFILE_GetMap(HLPFILE*); static BOOL HLPFILE_AddPage(HLPFILE*, BYTE*, BYTE*, unsigned); static BOOL HLPFILE_AddParagraph(HLPFILE*, BYTE *, BYTE*, unsigned*); @@ -393,6 +394,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) ref = GET_UINT(buf, 0xc); } while (ref != 0xffffffff); + HLPFILE_GetKeywords(hlpfile); HLPFILE_GetMap(hlpfile); if (hlpfile->version <= 16) return TRUE; return HLPFILE_GetContext(hlpfile); @@ -2026,6 +2028,39 @@ static BOOL HLPFILE_GetContext(HLPFILE *hlpfile) /*********************************************************************** * + * HLPFILE_GetKeywords + */ +static BOOL HLPFILE_GetKeywords(HLPFILE *hlpfile) +{ + BYTE *cbuf, *cend; + unsigned clen; + + if (!HLPFILE_FindSubFile("|KWBTREE", &cbuf, &cend)) return FALSE; + clen = cend - cbuf; + hlpfile->kwbtree = HeapAlloc(GetProcessHeap(), 0, clen); + if (!hlpfile->kwbtree) return FALSE; + memcpy(hlpfile->kwbtree, cbuf, clen); + + if (!HLPFILE_FindSubFile("|KWDATA", &cbuf, &cend)) + { + WINE_ERR("corrupted help file: kwbtree present but kwdata absent\n"); + HeapFree(GetProcessHeap(), 0, hlpfile->kwbtree); + return FALSE; + } + clen = cend - cbuf; + hlpfile->kwdata = HeapAlloc(GetProcessHeap(), 0, clen); + if (!hlpfile->kwdata) + { + HeapFree(GetProcessHeap(), 0, hlpfile->kwdata); + return FALSE; + } + memcpy(hlpfile->kwdata, cbuf, clen); + + return TRUE; +} + +/*********************************************************************** + * * HLPFILE_GetMap */ static BOOL HLPFILE_GetMap(HLPFILE *hlpfile) diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 8c9e201..7e6e6e5 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -124,6 +124,8 @@ typedef struct tagHlpFileFile HLPFILE_PAGE* first_page; HLPFILE_MACRO* first_macro; BYTE* Context; + BYTE* kwbtree; + BYTE* kwdata; unsigned wMapLen; HLPFILE_MAP* Map; unsigned long contents_start;

1 0

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

Dec. 13, 2007

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