January 2011 - Wine-commits

Eric Pouech : winedump: Dump segment info out of PDB files.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 2b010ad3665e34ce6a0263ee8d8ea6aab8a3d45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b010ad3665e34ce6a0263ee8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 17 21:53:42 2011 +0100 winedump: Dump segment info out of PDB files. --- tools/winedump/pdb.c | 53 +++++++++++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 22 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 9f90c89..3baee33 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -670,6 +670,35 @@ static void pdb_dump_fpo_ext(struct pdb_reader* reader, unsigned stream_idx) free(strbase); } +static void pdb_dump_segments(struct pdb_reader* reader, unsigned stream_idx) +{ + const char* segs; + DWORD size; + const char* ptr; + + if (stream_idx == (WORD)-1) return; + segs = reader->read_file(reader, stream_idx); + + if (segs) + { + size = pdb_get_file_size(reader, stream_idx); + for (ptr = segs; ptr < segs + size; ) + { + printf("Segment %s\n", ptr); + ptr += (strlen(ptr) + 1 + 3) & ~3; + printf("\tdword[0]: %08x\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[1]: %08x\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[2]: %08x\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[3]: %08x\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[4]: %08x\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[5]: %08x\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[6]: %08x\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[7]: %08x\n", *(DWORD*)ptr); ptr += 4; + } + free((char*)segs); + } else printf("nosdfsdffd\n"); +} + static const char pdb2[] = "Microsoft C/C++ program database 2.00"; static void pdb_jg_dump(void) @@ -755,28 +784,7 @@ static void pdb_jg_dump(void) } pdb_dump_types(&reader); pdb_dump_symbols(&reader, &sidx); -#if 0 - /* segments info, index is unknown */ - { - const void* segs = pdb_read_file(pdb, toc, 8); /* FIXME which index ??? */ - const void* ptr = segs; - - if (segs) while (ptr < segs + toc->file[8].size) - { - printf("Segment %s\n", (const char*)ptr); - ptr += (strlen(ptr) + 1 + 3) & ~3; - printf("\tdword[0]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[1]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[2]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[3]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[4]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[5]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[6]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[7]: %08lx\n", *(DWORD*)ptr); ptr += 4; - } - free(segs); - } -#endif + pdb_dump_segments(&reader, sidx.segments); } else printf("-Unable to get root\n"); @@ -921,6 +929,7 @@ static void pdb_ds_dump(void) pdb_dump_symbols(&reader, &sidx); pdb_dump_fpo(&reader, sidx.FPO); pdb_dump_fpo_ext(&reader, sidx.FPO_EXT); + pdb_dump_segments(&reader, sidx.segments); } else printf("-Unable to get root\n");

1 0

Eric Pouech : winedump: Also dump FPO data out of JG PDB files.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: a43b38fe0c1c4188a23020e4a7e379b0b2e212e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a43b38fe0c1c4188a23020e4a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 17 21:53:51 2011 +0100 winedump: Also dump FPO data out of JG PDB files. --- tools/winedump/pdb.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 3baee33..77d5643 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -784,6 +784,7 @@ static void pdb_jg_dump(void) } pdb_dump_types(&reader); pdb_dump_symbols(&reader, &sidx); + pdb_dump_fpo(&reader, sidx.FPO); pdb_dump_segments(&reader, sidx.segments); } else printf("-Unable to get root\n");

1 0

Eric Pouech : dbghelp: Add support for stream lookup by name in PDB files and use it for strings stream .
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 8595f6c6520a2ad686bb4d17e00e249c11916fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8595f6c6520a2ad686bb4d17e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 17 21:54:04 2011 +0100 dbghelp: Add support for stream lookup by name in PDB files and use it for strings stream. --- dlls/dbghelp/msc.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 72 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 8ffbb6a..50dd6e6 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -62,12 +62,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_msc); #define MAX_PATHNAME_LEN 1024 +struct pdb_stream_name +{ + const char* name; + unsigned index; +}; + struct pdb_file_info { enum pdb_kind kind; DWORD age; HANDLE hMap; const char* image; + struct pdb_stream_name* stream_dict; union { struct @@ -2159,21 +2166,73 @@ static void pdb_free_file(struct pdb_file_info* pdb_file) pdb_file->u.ds.toc = NULL; break; } + HeapFree(GetProcessHeap(), 0, pdb_file->stream_dict); +} + +static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) +{ + DWORD* pdw; + DWORD* ok_bits; + DWORD count, numok; + unsigned i, j; + char* cpstr; + + pdw = (DWORD*)(str + cb); + numok = *pdw++; + count = *pdw++; + + pdb_file->stream_dict = HeapAlloc(GetProcessHeap(), 0, (numok + 1) * sizeof(struct pdb_stream_name) + cb); + if (!pdb_file->stream_dict) return FALSE; + cpstr = (char*)(pdb_file->stream_dict + numok + 1); + memcpy(cpstr, str, cb); + + /* bitfield: first dword is len (in dword), then data */ + ok_bits = pdw; + pdw += *ok_bits++ + 1; + if (*pdw++ != 0) + { + FIXME("unexpected value\n"); + return -1; + } + + for (i = j = 0; i < count; i++) + { + if (ok_bits[i / 32] & (1 << (i % 32))) + { + if (j >= numok) break; + pdb_file->stream_dict[j].name = &cpstr[*pdw++]; + pdb_file->stream_dict[j].index = *pdw++; + j++; + } + } + /* add sentinel */ + pdb_file->stream_dict[numok].name = NULL; + return j == numok && i == count; +} + +static unsigned pdb_get_stream_by_name(const struct pdb_file_info* pdb_file, const char* name) +{ + struct pdb_stream_name* psn; + + for (psn = pdb_file->stream_dict; psn && psn->name; psn++) + { + if (!strcmp(psn->name, name)) return psn->index; + } + return -1; } static void* pdb_read_strings(const struct pdb_file_info* pdb_file) { + unsigned idx; void *ret; - /* FIXME: how to determine the correct file number? */ - /* 4 and 12 have been observed, there may be others */ - - ret = pdb_read_file( pdb_file, 4 ); - if (ret && *(const DWORD *)ret == 0xeffeeffe) return ret; - pdb_free( ret ); - ret = pdb_read_file( pdb_file, 12 ); - if (ret && *(const DWORD *)ret == 0xeffeeffe) return ret; - pdb_free( ret ); + idx = pdb_get_stream_by_name(pdb_file, "/names"); + if (idx != -1) + { + ret = pdb_read_file( pdb_file, idx ); + if (ret && *(const DWORD *)ret == 0xeffeeffe) return ret; + pdb_free( ret ); + } WARN("string table not found\n"); return NULL; } @@ -2411,6 +2470,8 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* pdb_lookup->filename, root->Age, pdb_lookup->age); TRACE("found JG for %s: age=%x timestamp=%x\n", pdb_lookup->filename, root->Age, root->TimeDateStamp); + pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); + pdb_free(root); } else if (!memcmp(image, PDB_DS_IDENT, sizeof(PDB_DS_IDENT))) @@ -2447,6 +2508,8 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* pdb_lookup->filename, root->Age, pdb_lookup->age); TRACE("found DS for %s: age=%x guid=%s\n", pdb_lookup->filename, root->Age, debugstr_guid(&root->guid)); + pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); + pdb_free(root); }

1 0

Eric Pouech : dbghelp: Get stream indexes out of PDB files ( instead of hardwired values).
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 711f71639dc064e05138d861b3387a7c2d238e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=711f71639dc064e05138d861b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 17 21:54:17 2011 +0100 dbghelp: Get stream indexes out of PDB files (instead of hardwired values). --- dlls/dbghelp/msc.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 50dd6e6..5fe3349 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -75,6 +75,7 @@ struct pdb_file_info HANDLE hMap; const char* image; struct pdb_stream_name* stream_dict; + unsigned fpoext_stream; union { struct @@ -2207,6 +2208,7 @@ static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha } /* add sentinel */ pdb_file->stream_dict[numok].name = NULL; + pdb_file->fpoext_stream = -1; return j == numok && i == count; } @@ -2646,7 +2648,8 @@ static BOOL pdb_process_internal(const struct process* pcs, BYTE* modimage; BYTE* file; int header_size = 0; - + PDB_STREAM_INDEXES* psi; + pdb_convert_symbols_header(&symbols, &header_size, symbols_image); switch (symbols.version) { @@ -2660,6 +2663,23 @@ static BOOL pdb_process_internal(const struct process* pcs, symbols.version, symbols.version); } + switch (symbols.stream_index_size) + { + case 0: + case sizeof(PDB_STREAM_INDEXES_OLD): + /* no fpo ext stream in this case */ + break; + case sizeof(PDB_STREAM_INDEXES): + psi = (PDB_STREAM_INDEXES*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + + symbols.module_size + symbols.offset_size + + symbols.hash_size + symbols.srcmodule_size + + symbols.pdbimport_size + symbols.unknown2_size); + pdb_file->fpoext_stream = psi->FPO_EXT; + break; + default: + FIXME("Unknown PDB_STREAM_INDEXES size (%d)\n", symbols.stream_index_size); + break; + } files_image = pdb_read_strings(pdb_file); if (files_image) files_size = *(const DWORD*)(files_image + 8); @@ -3070,8 +3090,8 @@ BOOL pdb_virtual_unwind(struct cpu_stack_walk* csw, DWORD_PTR ip, strbase = pdb_read_strings(&pdb_info->pdb_files[0]); if (!strbase) return FALSE; strsize = *(const DWORD*)(strbase + 8); - fpoext = pdb_read_file(&pdb_info->pdb_files[0], 10); - size = pdb_get_file_size(&pdb_info->pdb_files[0], 10); + fpoext = pdb_read_file(&pdb_info->pdb_files[0], pdb_info->pdb_files[0].fpoext_stream); + size = pdb_get_file_size(&pdb_info->pdb_files[0], pdb_info->pdb_files[0].fpoext_stream); if (fpoext && (size % sizeof(*fpoext)) == 0) { size /= sizeof(*fpoext);

1 0

Eric Pouech : dbghelp: When failing to look up for a PDB file, don' t keep a module format object around.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: e72d5d6de458b22faba37e874916a4787d168576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72d5d6de458b22faba37e874… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 17 21:57:46 2011 +0100 dbghelp: When failing to look up for a PDB file, don't keep a module format object around. --- dlls/dbghelp/msc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 5fe3349..91927b3 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2790,6 +2790,11 @@ static BOOL pdb_process_file(const struct process* pcs, msc_dbg->module->module.SourceIndexed = TRUE; msc_dbg->module->module.Publics = TRUE; } + else + { + msc_dbg->module->format_info[DFI_PDB] = NULL; + HeapFree(GetProcessHeap(), 0, modfmt); + } return ret; }

1 0

Owen Rudge : hhctrl.ocx: Implement Show/Hide functionality.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: deda1b2c4e7ca439f2cbafe7bd8b755851ee9dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=deda1b2c4e7ca439f2cbafe7b… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jan 17 22:26:40 2011 +0000 hhctrl.ocx: Implement Show/Hide functionality. --- dlls/hhctrl.ocx/help.c | 98 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 85 insertions(+), 13 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 31a7c1b..9d732a6 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -3,6 +3,7 @@ * * Copyright 2005 James Hawkins * Copyright 2007 Jacek Caban for CodeWeavers + * Copyright 2011 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); static LRESULT Help_OnSize(HWND hWnd); +static void ExpandContract(HHInfo *pHHInfo); /* Window type defaults */ @@ -264,10 +266,13 @@ static BOOL HH_AddSizeBar(HHInfo *pHHInfo) { HWND hWnd; HWND hwndParent = pHHInfo->WinType.hwndHelp; - DWORD dwStyles = WS_CHILDWINDOW | WS_VISIBLE | WS_OVERLAPPED; + DWORD dwStyles = WS_CHILDWINDOW | WS_OVERLAPPED; DWORD dwExStyles = WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR; RECT rc; + if (!pHHInfo->WinType.fNotExpanded) + dwStyles |= WS_VISIBLE; + SB_GetSizeBarRect(pHHInfo, &rc); hWnd = CreateWindowExW(dwExStyles, szSizeBarClass, szEmpty, dwStyles, @@ -646,6 +651,8 @@ static void TB_OnClick(HWND hWnd, DWORD dwID) break; case IDTB_EXPAND: case IDTB_CONTRACT: + ExpandContract(info); + break; case IDTB_SYNC: case IDTB_OPTIONS: case IDTB_BROWSE_FWD: @@ -671,12 +678,20 @@ static void TB_AddButton(TBBUTTON *pButtons, DWORD dwIndex, DWORD dwID) pButtons[dwIndex].iString = 0; } -static void TB_AddButtonsFromFlags(TBBUTTON *pButtons, DWORD dwButtonFlags, LPDWORD pdwNumButtons) +static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dwButtonFlags, LPDWORD pdwNumButtons) { *pdwNumButtons = 0; if (dwButtonFlags & HHWIN_BUTTON_EXPAND) + { TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_EXPAND); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_CONTRACT); + + if (pHHInfo->WinType.fNotExpanded) + pButtons[1].fsState |= TBSTATE_HIDDEN; + else + pButtons[0].fsState |= TBSTATE_HIDDEN; + } if (dwButtonFlags & HHWIN_BUTTON_BACK) TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_BACK); @@ -733,7 +748,7 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) else toolbarFlags = HHWIN_DEF_BUTTONS; - TB_AddButtonsFromFlags(buttons, toolbarFlags, &dwNumButtons); + TB_AddButtonsFromFlags(pHHInfo, buttons, toolbarFlags, &dwNumButtons); dwStyles = WS_CHILDWINDOW | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_WRAPABLE | TBSTYLE_TOOLTIPS | CCS_NODIVIDER; @@ -815,10 +830,13 @@ static BOOL HH_AddNavigationPane(HHInfo *info) { HWND hWnd, hwndTabCtrl; HWND hwndParent = info->WinType.hwndHelp; - DWORD dwStyles = WS_CHILDWINDOW | WS_VISIBLE; + DWORD dwStyles = WS_CHILDWINDOW; DWORD dwExStyles = WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR; RECT rc; + if (!info->WinType.fNotExpanded) + dwStyles |= WS_VISIBLE; + NP_GetNavigationRect(info, &rc); hWnd = CreateWindowExW(dwExStyles, szChildClass, szEmpty, dwStyles, @@ -829,7 +847,7 @@ static BOOL HH_AddNavigationPane(HHInfo *info) SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LONG_PTR)info); - hwndTabCtrl = CreateWindowExW(dwExStyles, WC_TABCONTROLW, szEmpty, dwStyles, + hwndTabCtrl = CreateWindowExW(dwExStyles, WC_TABCONTROLW, szEmpty, dwStyles | WS_VISIBLE, 0, TAB_TOP_PADDING, rc.right - TAB_RIGHT_PADDING, rc.bottom - TAB_TOP_PADDING, @@ -864,10 +882,16 @@ static void HP_GetHTMLRect(HHInfo *info, RECT *rc) GetClientRect(info->WinType.hwndHelp, &rectWND); GetClientRect(info->WinType.hwndToolBar, &rectTB); - GetClientRect(info->WinType.hwndNavigation, &rectNP); GetClientRect(info->hwndSizeBar, &rectSB); - rc->left = rectNP.right + rectSB.right; + if (info->WinType.fNotExpanded) + rc->left = 0; + else + { + GetClientRect(info->WinType.hwndNavigation, &rectNP); + rc->left = rectNP.right + rectSB.right; + } + rc->top = rectTB.bottom; rc->right = rectWND.right - rc->left; rc->bottom = rectWND.bottom - rectTB.bottom; @@ -1203,6 +1227,37 @@ static BOOL AddIndexPopup(HHInfo *info) /* Viewer Window */ +static void ExpandContract(HHInfo *pHHInfo) +{ + RECT r, nav; + + pHHInfo->WinType.fNotExpanded = !pHHInfo->WinType.fNotExpanded; + GetWindowRect(pHHInfo->WinType.hwndHelp, &r); + NP_GetNavigationRect(pHHInfo, &nav); + + /* hide/show both the nav bar and the size bar */ + if (pHHInfo->WinType.fNotExpanded) + { + ShowWindow(pHHInfo->WinType.hwndNavigation, SW_HIDE); + ShowWindow(pHHInfo->hwndSizeBar, SW_HIDE); + r.left = r.left + nav.right; + + SendMessageW(pHHInfo->WinType.hwndToolBar, TB_HIDEBUTTON, IDTB_EXPAND, MAKELPARAM(FALSE, 0)); + SendMessageW(pHHInfo->WinType.hwndToolBar, TB_HIDEBUTTON, IDTB_CONTRACT, MAKELPARAM(TRUE, 0)); + } + else + { + ShowWindow(pHHInfo->WinType.hwndNavigation, SW_SHOW); + ShowWindow(pHHInfo->hwndSizeBar, SW_SHOW); + r.left = r.left - nav.right; + + SendMessageW(pHHInfo->WinType.hwndToolBar, TB_HIDEBUTTON, IDTB_EXPAND, MAKELPARAM(TRUE, 0)); + SendMessageW(pHHInfo->WinType.hwndToolBar, TB_HIDEBUTTON, IDTB_CONTRACT, MAKELPARAM(FALSE, 0)); + } + + MoveWindow(pHHInfo->WinType.hwndHelp, r.left, r.top, r.right-r.left, r.bottom-r.top, TRUE); +} + static LRESULT Help_OnSize(HWND hWnd) { HHInfo *pHHInfo = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA); @@ -1212,13 +1267,17 @@ static LRESULT Help_OnSize(HWND hWnd) if (!pHHInfo) return 0; - NP_GetNavigationRect(pHHInfo, &rc); - SetWindowPos(pHHInfo->WinType.hwndNavigation, HWND_TOP, 0, 0, - rc.right, rc.bottom, SWP_NOMOVE); + if (!pHHInfo->WinType.fNotExpanded) + { + NP_GetNavigationRect(pHHInfo, &rc); + SetWindowPos(pHHInfo->WinType.hwndNavigation, HWND_TOP, 0, 0, + rc.right, rc.bottom, SWP_NOMOVE); - SB_GetSizeBarRect(pHHInfo, &rc); - SetWindowPos(pHHInfo->hwndSizeBar, HWND_TOP, rc.left, rc.top, - rc.right, rc.bottom, SWP_SHOWWINDOW); + SB_GetSizeBarRect(pHHInfo, &rc); + SetWindowPos(pHHInfo->hwndSizeBar, HWND_TOP, rc.left, rc.top, + rc.right, rc.bottom, SWP_SHOWWINDOW); + + } HP_GetHTMLRect(pHHInfo, &rc); SetWindowPos(pHHInfo->WinType.hwndHTML, HWND_TOP, rc.left, rc.top, @@ -1312,6 +1371,19 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) height = WINTYPE_DEFAULT_HEIGHT; } + if (info->WinType.fNotExpanded) + { + if (!(info->WinType.fsValidMembers & HHWIN_PARAM_NAV_WIDTH) && + info->WinType.iNavWidth == 0) + { + info->WinType.iNavWidth = WINTYPE_DEFAULT_NAVWIDTH; + } + + x += info->WinType.iNavWidth; + width -= info->WinType.iNavWidth; + } + + caption = info->WinType.pszCaption; if (!*caption) caption = info->pCHMInfo->defTitle;

1 0

Owen Rudge : hhctrl.ocx: Implement Sync button functionality.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 16b35e00edbbfbc1af92878f8aa5f54090ec6004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b35e00edbbfbc1af92878f8… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jan 17 22:26:46 2011 +0000 hhctrl.ocx: Implement Sync button functionality. --- dlls/hhctrl.ocx/content.c | 16 +++++++++++ dlls/hhctrl.ocx/help.c | 62 ++++++++++++++++++++++++++++++++++++++------ dlls/hhctrl.ocx/hhctrl.h | 1 + 3 files changed, 70 insertions(+), 9 deletions(-) diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index bfe25cf..2dad7c8 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -1,5 +1,6 @@ /* * Copyright 2007 Jacek Caban for CodeWeavers + * Copyright 2011 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -312,3 +313,18 @@ void ReleaseContent(HHInfo *info) { free_content_item(info->content); } + +void ActivateContentTopic(HWND hWnd, LPCWSTR filename, ContentItem *item) +{ + if (lstrcmpiW(item->local, filename) == 0) + { + SendMessageW(hWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM) item->id); + return; + } + + if (item->next) + ActivateContentTopic(hWnd, filename, item->next); + + if (item->child) + ActivateContentTopic(hWnd, filename, item->child); +} diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 9d732a6..3dcad10 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -111,21 +111,15 @@ BOOL NavigateToUrl(HHInfo *info, LPCWSTR surl) return ret; } -BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) +BOOL AppendFullPathURL(LPCWSTR file, LPWSTR buf, LPCWSTR index) { - WCHAR buf[INTERNET_MAX_URL_LENGTH]; - WCHAR full_path[MAX_PATH]; - LPWSTR ptr; - static const WCHAR url_format[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','%','s','%','s',0}; static const WCHAR slash[] = {'/',0}; static const WCHAR empty[] = {0}; + WCHAR full_path[MAX_PATH]; - TRACE("%p %s %s\n", info, debugstr_w(file), debugstr_w(index)); - - if (!info->web_browser) - return FALSE; + TRACE("%s %p %s\n", debugstr_w(file), buf, debugstr_w(index)); if(!GetFullPathNameW(file, sizeof(full_path)/sizeof(full_path[0]), full_path, NULL)) { WARN("GetFullPathName failed: %u\n", GetLastError()); @@ -133,6 +127,18 @@ BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) } wsprintfW(buf, url_format, full_path, (!index || index[0] == '/') ? empty : slash, index); + return TRUE; +} + +BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) +{ + WCHAR buf[INTERNET_MAX_URL_LENGTH]; + LPWSTR ptr; + + TRACE("%p %s %s\n", info, debugstr_w(file), debugstr_w(index)); + + if ((!info->web_browser) || !AppendFullPathURL(file, buf, index)) + return FALSE; /* FIXME: HACK */ if((ptr = strchrW(buf, '#'))) @@ -141,6 +147,42 @@ BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) return SUCCEEDED(navigate_url(info, buf)); } +static void DoSync(HHInfo *info) +{ + WCHAR buf[INTERNET_MAX_URL_LENGTH]; + HRESULT hres; + DWORD len; + BSTR url; + + hres = IWebBrowser2_get_LocationURL(info->web_browser, &url); + + if (FAILED(hres)) + { + WARN("get_LocationURL failed: %08x\n", hres); + return; + } + + /* If we're not currently viewing a page in the active .chm file, abort */ + if ((!AppendFullPathURL(info->pszFile, buf, NULL)) || (len = lstrlenW(buf) > lstrlenW(url))) + { + SysFreeString(url); + return; + } + + if (lstrcmpiW(buf, url) > 0) + { + static const WCHAR delimW[] = {':',':','/',0}; + const WCHAR *index; + + index = strstrW(url, delimW); + + if (index) + ActivateContentTopic(info->tabs[TAB_CONTENTS].hwnd, index + 3, info->content); /* skip over ::/ */ + } + + SysFreeString(url); +} + /* Size Bar */ #define SIZEBAR_WIDTH 4 @@ -654,6 +696,8 @@ static void TB_OnClick(HWND hWnd, DWORD dwID) ExpandContract(info); break; case IDTB_SYNC: + DoSync(info); + break; case IDTB_OPTIONS: case IDTB_BROWSE_FWD: case IDTB_BROWSE_BACK: diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 03a4807..c0ec009 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -169,6 +169,7 @@ void DoPageAction(HHInfo*,DWORD); void InitContent(HHInfo*); void ReleaseContent(HHInfo*); +void ActivateContentTopic(HWND,LPCWSTR,ContentItem *); void InitIndex(HHInfo*); void ReleaseIndex(HHInfo*);

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to context_resource_unloaded().
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 2ceb2a8cdd2c79b40b3d3a65ad5bb0d4b9d73965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ceb2a8cdd2c79b40b3d3a65a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 17 18:49:28 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to context_resource_unloaded(). --- dlls/wined3d/context.c | 3 ++- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c001577..40fd2e3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -711,7 +711,8 @@ static void context_detach_fbo_entry(struct wined3d_context *context, struct fbo entry->attached = FALSE; } -void context_resource_unloaded(IWineD3DDeviceImpl *device, IWineD3DResource *resource, WINED3DRESOURCETYPE type) +void context_resource_unloaded(struct IWineD3DDeviceImpl *device, + struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type) { switch (type) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 370861e..623706f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -125,8 +125,8 @@ void resource_cleanup(struct IWineD3DResourceImpl *resource) void resource_unload(IWineD3DResourceImpl *resource) { - context_resource_unloaded(resource->resource.device, (IWineD3DResource *)resource, - resource->resource.resourceType); + context_resource_unloaded(resource->resource.device, + resource, resource->resource.resourceType); } static struct private_data *resource_find_private_data(IWineD3DResourceImpl *This, REFGUID tag) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8dcb461..fb39dad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1230,8 +1230,8 @@ DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; -void context_resource_unloaded(IWineD3DDeviceImpl *device, - IWineD3DResource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; +void context_resource_unloaded(struct IWineD3DDeviceImpl *device, + struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to wined3d_rendertarget_view_init().
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: e42e5247dd3548936d938897d865efc885e479ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e42e5247dd3548936d938897d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 17 18:49:29 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to wined3d_rendertarget_view_init(). --- dlls/wined3d/device.c | 2 +- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a225e53..a099c90 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1088,7 +1088,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateRendertargetView(IWineD3DDevice * return E_OUTOFMEMORY; } - wined3d_rendertarget_view_init(object, resource, parent); + wined3d_rendertarget_view_init(object, (IWineD3DResourceImpl *)resource, parent); TRACE("Created render target view %p.\n", object); *rendertarget_view = (IWineD3DRendertargetView *)object; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e4e40fc..28dc401 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -107,11 +107,11 @@ static const struct IWineD3DRendertargetViewVtbl wined3d_rendertarget_view_vtbl }; void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, - IWineD3DResource *resource, void *parent) + struct IWineD3DResourceImpl *resource, void *parent) { view->vtbl = &wined3d_rendertarget_view_vtbl; view->refcount = 1; - IWineD3DResource_AddRef(resource); - view->resource = resource; + IWineD3DResource_AddRef((IWineD3DResource *)resource); + view->resource = (IWineD3DResource *)resource; view->parent = parent; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fb39dad..e53d1a1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2574,7 +2574,7 @@ struct wined3d_rendertarget_view }; void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, - IWineD3DResource *resource, void *parent) DECLSPEC_HIDDEN; + struct IWineD3DResourceImpl *resource, void *parent) DECLSPEC_HIDDEN; /***************************************************************************** * IWineD3DSwapChainImpl implementation structure (extends IUnknown)

1 0

Henri Verbeet : wined3d: Store an IWineD3DResourceImpl pointer in struct wined3d_rendertarget_view.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 098cdf4ae390f378357a6ce17f678ccbe5e7b210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098cdf4ae390f378357a6ce17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 17 18:49:30 2011 +0100 wined3d: Store an IWineD3DResourceImpl pointer in struct wined3d_rendertarget_view. --- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 28dc401..2b98de3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -65,7 +65,7 @@ static ULONG STDMETHODCALLTYPE rendertarget_view_Release(IWineD3DRendertargetVie if (!refcount) { - IWineD3DResource_Release(This->resource); + IWineD3DResource_Release((IWineD3DResource *)This->resource); HeapFree(GetProcessHeap(), 0, This); } @@ -88,8 +88,8 @@ static HRESULT STDMETHODCALLTYPE rendertarget_view_GetResource(IWineD3DRendertar { struct wined3d_rendertarget_view *This = (struct wined3d_rendertarget_view *)iface; - IWineD3DResource_AddRef(This->resource); - *resource = This->resource; + IWineD3DResource_AddRef((IWineD3DResource *)This->resource); + *resource = (IWineD3DResource *)This->resource; return WINED3D_OK; } @@ -112,6 +112,6 @@ void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, view->vtbl = &wined3d_rendertarget_view_vtbl; view->refcount = 1; IWineD3DResource_AddRef((IWineD3DResource *)resource); - view->resource = (IWineD3DResource *)resource; + view->resource = resource; view->parent = parent; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e53d1a1..65db699 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2569,7 +2569,7 @@ struct wined3d_rendertarget_view const struct IWineD3DRendertargetViewVtbl *vtbl; LONG refcount; - IWineD3DResource *resource; + struct IWineD3DResourceImpl *resource; void *parent; };

1 0