February 2010 - Wine-commits

Alexandre Julliard : kernel32: Do not load 16-bit krnl386.exe by default.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: a53ca1abdc284490861734eb3f2a8dacad896ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53ca1abdc284490861734eb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 17:44:43 2010 +0100 kernel32: Do not load 16-bit krnl386.exe by default. --- dlls/kernel32/kernel_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 28bb97d..cf73052 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -146,7 +146,6 @@ static BOOL process_attach( HMODULE module ) * TBD when not using wineserver handles for console handles */ - LoadLibraryA( "krnl386.exe16" ); return TRUE; }

1 0

Paul Vriens : ws2_32/tests: Fix test failures on Win9x/WinMe.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 45fc31e803d9688890142eb576549148fd421d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=45fc31e803d9688890142eb57… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 8 09:16:03 2010 +0100 ws2_32/tests: Fix test failures on Win9x/WinMe. --- dlls/ws2_32/tests/sock.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 72242c4..be846fa 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3281,7 +3281,8 @@ static void test_getpeername(void) ret = getpeername(sock, NULL, NULL); ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); - ok(WSAGetLastError() == WSAENOTCONN, + ok(WSAGetLastError() == WSAENOTCONN || + broken(WSAGetLastError() == WSAEFAULT), /* Win9x and WinMe */ "Expected WSAGetLastError() to return WSAENOTCONN, got %d\n", WSAGetLastError()); memset(&sa, 0, sizeof(sa)); @@ -3296,7 +3297,8 @@ static void test_getpeername(void) ret = getpeername(sock, NULL, NULL); ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); - ok(WSAGetLastError() == WSAENOTCONN, + ok(WSAGetLastError() == WSAENOTCONN || + broken(WSAGetLastError() == WSAEFAULT), /* Win9x and WinMe */ "Expected WSAGetLastError() to return WSAENOTCONN, got %d\n", WSAGetLastError()); ret = connect(sock, (struct sockaddr*)&sa, sizeof(sa));

1 0

Hans Leidekker : wininet: Don' t call libcrypto function after closing the library.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 8858fc9b667d6eb7b2faa8c4b45f450e508604f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8858fc9b667d6eb7b2faa8c4b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 8 09:20:58 2010 +0100 wininet: Don't call libcrypto function after closing the library. Spotted by Paul Vriens. --- dlls/wininet/netconnection.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 0e7b62a..c2560b5 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -160,6 +160,7 @@ MAKE_FUNCPTR(sk_value); #undef MAKE_FUNCPTR static CRITICAL_SECTION *ssl_locks; +static unsigned int num_ssl_locks; static unsigned long ssl_thread_id(void) { @@ -458,14 +459,14 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) pSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, netconn_secure_verify); pCRYPTO_set_id_callback(ssl_thread_id); - ssl_locks = HeapAlloc(GetProcessHeap(), 0, - pCRYPTO_num_locks() * sizeof(CRITICAL_SECTION)); + num_ssl_locks = pCRYPTO_num_locks(); + ssl_locks = HeapAlloc(GetProcessHeap(), 0, num_ssl_locks * sizeof(CRITICAL_SECTION)); if (!ssl_locks) { LeaveCriticalSection(&init_ssl_cs); return ERROR_OUTOFMEMORY; } - for (i = 0; i < pCRYPTO_num_locks(); i++) + for (i = 0; i < num_ssl_locks; i++) InitializeCriticalSection(&ssl_locks[i]); pCRYPTO_set_locking_callback(ssl_lock_callback); LeaveCriticalSection(&init_ssl_cs); @@ -494,7 +495,7 @@ void NETCON_unload(void) if (ssl_locks) { int i; - for (i = 0; i < pCRYPTO_num_locks(); i++) DeleteCriticalSection(&ssl_locks[i]); + for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection(&ssl_locks[i]); HeapFree(GetProcessHeap(), 0, ssl_locks); } #endif

1 0

Hans Leidekker : mscoree: Add stub implementations of DllRegisterServer and DllUnregisterServer.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: aa15fb8524cc8d27d22064c787dd0193230ecf85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa15fb8524cc8d27d22064c78… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 8 09:21:23 2010 +0100 mscoree: Add stub implementations of DllRegisterServer and DllUnregisterServer. --- dlls/mscoree/mscoree.spec | 4 ++-- dlls/mscoree/mscoree_main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 04b5e1c..9365f18 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -31,8 +31,8 @@ @ stub CreateDebuggingInterfaceFromVersion @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub EEDllGetClassObjectFromClass @ stub EEDllRegisterServer @ stub EEDllUnregisterServer diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 3071e7a..dcdc91a 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -345,6 +345,18 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return E_NOTIMPL; } +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("\n"); + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("\n"); + return S_OK; +} + HRESULT WINAPI DllCanUnloadNow(VOID) { return S_OK;

1 0

Detlef Riekenberg : shdocvw: Dump the commands in OleCommandTarget_QueryStatus.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: a0f53e7df8133df703fbae01cc26b063070c7437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f53e7df8133df703fbae01c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Feb 7 17:20:23 2010 +0100 shdocvw: Dump the commands in OleCommandTarget_QueryStatus. --- dlls/shdocvw/dochost.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 6c9d05c..e8982e4 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -410,8 +410,13 @@ static HRESULT WINAPI ClOleCommandTarget_QueryStatus(IOleCommandTarget *iface, const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) { DocHost *This = OLECMD_THIS(iface); + ULONG i= 0; FIXME("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); + while (prgCmds && (cCmds > i)) { + FIXME("command_%u: %u, 0x%x\n", i, prgCmds[i].cmdID, prgCmds[i].cmdf); + i++; + } return E_NOTIMPL; }

1 0

Erich Hoover : hhctrl.ocx: Fix HTML Help Index tab with alternative ' keyword' style.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 687a2aeae4f292f7fe64bcad711e6814272dad8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=687a2aeae4f292f7fe64bcad7… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Feb 7 10:07:56 2010 -0700 hhctrl.ocx: Fix HTML Help Index tab with alternative 'keyword' style. --- dlls/hhctrl.ocx/index.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index dd61fe3..52a414e 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -36,6 +36,12 @@ static void fill_index_tree(HWND hwnd, IndexItem *item) while(item) { TRACE("tree debug: %s\n", debugstr_w(item->keyword)); + if(!item->keyword) + { + FIXME("HTML Help index item has no keyword.\n"); + item = item->next; + continue; + } memset(&lvi, 0, sizeof(lvi)); lvi.iItem = index++; lvi.mask = LVIF_TEXT|LVIF_PARAM; @@ -79,6 +85,12 @@ static void parse_index_obj_node_param(IndexItem *item, const char *text) } if(!strncasecmp("keyword", ptr, len)) { param = &item->keyword; + }else if(!item->keyword && !strncasecmp("name", ptr, len)) { + /* Some HTML Help index files use an additional "name" parameter + * rather than the "keyword" parameter. In this case, the first + * occurance of the "name" parameter is the keyword. + */ + param = &item->keyword; }else if(!strncasecmp("name", ptr, len)) { item->itemFlags |= 0x01; param = &item->items[item->nItems-1].name;

1 0

Erich Hoover : hhctrl.ocx: Support HTML Help having indented Index tab items.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 4dc019a41fb1f02461412c6cf0e7e38b501fcc2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc019a41fb1f02461412c6cf… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Feb 7 10:08:18 2010 -0700 hhctrl.ocx: Support HTML Help having indented Index tab items. --- dlls/hhctrl.ocx/hhctrl.h | 1 + dlls/hhctrl.ocx/index.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index d0c1545..adff42d 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -79,6 +79,7 @@ typedef struct IndexItem { int nItems; int itemFlags; + int indentLevel; IndexSubItem *items; } IndexItem; diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index 52a414e..e9385c3 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -44,7 +44,8 @@ static void fill_index_tree(HWND hwnd, IndexItem *item) } memset(&lvi, 0, sizeof(lvi)); lvi.iItem = index++; - lvi.mask = LVIF_TEXT|LVIF_PARAM; + lvi.mask = LVIF_TEXT|LVIF_PARAM|LVIF_INDENT; + lvi.iIndent = item->indentLevel; lvi.cchTextMax = strlenW(item->keyword)+1; lvi.pszText = item->keyword; lvi.lParam = (LPARAM)item; @@ -205,11 +206,17 @@ static IndexItem *parse_li(HHInfo *info, stream_t *stream) * At this high-level stage we locate out each HTML list item tag. * Since there is no end-tag for the <LI> item, we must hope that * the <LI> entry is parsed correctly or tags might get lost. + * + * Within each entry it is also possible to encounter an additional + * <UL> tag. When this occurs the tag indicates that the topics + * contained within it are related to the parent <LI> topic and + * should be inset by an indent. */ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item) { stream_t stream; strbuf_t node, node_name; + int indent_level = -1; strbuf_init(&node); strbuf_init(&node_name); @@ -225,6 +232,11 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item) item->next = parse_li(info, &stream); item->next->merge = item->merge; item = item->next; + item->indentLevel = indent_level; + }else if(!strcasecmp(node_name.buf, "ul")) { + indent_level++; + }else if(!strcasecmp(node_name.buf, "/ul")) { + indent_level--; }else { WARN("Unhandled tag! %s\n", node_name.buf); }

1 0

Erich Hoover : hhctrl.ocx: Allow ListView navigation with the Return/ Enter key.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 6ab9812450f8b8fcf05dbd60dc566cea892d05e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab9812450f8b8fcf05dbd60d… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Feb 7 10:08:38 2010 -0700 hhctrl.ocx: Allow ListView navigation with the Return/Enter key. --- dlls/hhctrl.ocx/help.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index e8121e7..e115da1 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -487,8 +487,20 @@ static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LP case TVN_SELCHANGEDW: return OnTopicChange(info, (void*)((NMTREEVIEWW *)lParam)->itemNew.lParam); case NM_DBLCLK: - if(info->current_tab == TAB_INDEX) + if(info && info->current_tab == TAB_INDEX) return OnTopicChange(info, (void*)((NMITEMACTIVATE *)lParam)->lParam); + case NM_RETURN: + if(info && info->current_tab == TAB_INDEX) + { + HWND hwndList = info->tabs[TAB_INDEX].hwnd; + LVITEMW lvItem; + + lvItem.iItem = (int) SendMessageW(hwndList, LVM_GETSELECTIONMARK, 0, 0); + lvItem.mask = TVIF_PARAM; + ListView_GetItemW(hwndList, &lvItem); + OnTopicChange(info, (void*) lvItem.lParam); + } + return 0; } break; } @@ -910,7 +922,9 @@ static LRESULT CALLBACK PopupChild_WndProc(HWND hWnd, UINT message, WPARAM wPara { case WM_NOTIFY: { NMHDR *nmhdr = (NMHDR*)lParam; - if(nmhdr->code == NM_DBLCLK) { + switch(nmhdr->code) + { + case NM_DBLCLK: { HHInfo *info = (HHInfo*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); IndexSubItem *iter; @@ -923,6 +937,23 @@ static LRESULT CALLBACK PopupChild_WndProc(HWND hWnd, UINT message, WPARAM wPara ShowWindow(info->popup.hwndPopup, SW_HIDE); return 0; } + case NM_RETURN: { + HHInfo *info = (HHInfo*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + IndexSubItem *iter; + LVITEMW lvItem; + + if(info == 0) + return 0; + + lvItem.iItem = (int) SendMessageW(info->popup.hwndList, LVM_GETSELECTIONMARK, 0, 0); + lvItem.mask = TVIF_PARAM; + ListView_GetItemW(info->popup.hwndList, &lvItem); + iter = (IndexSubItem*) lvItem.lParam; + NavigateToChm(info, info->index->merge.chm_file, iter->local); + ShowWindow(info->popup.hwndPopup, SW_HIDE); + return 0; + } + } break; } default:

1 0

Erich Hoover : hhctrl.ocx: Add widgets for the Search tab.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 796c4dec7ff09c063e574bc9183df52a40ea6a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=796c4dec7ff09c063e574bc91… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Feb 7 10:09:04 2010 -0700 hhctrl.ocx: Add widgets for the Search tab. --- dlls/hhctrl.ocx/help.c | 125 +++++++++++++++++++++++++++++++++++++++++++-- dlls/hhctrl.ocx/hhctrl.h | 7 +++ 2 files changed, 126 insertions(+), 6 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index e115da1..7eca538 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -44,6 +44,7 @@ static LRESULT Help_OnSize(HWND hWnd); #define TAB_TOP_PADDING 8 #define TAB_RIGHT_PADDING 4 #define TAB_MARGIN 8 +#define EDIT_HEIGHT 20 static const WCHAR szEmpty[] = {0}; @@ -341,9 +342,6 @@ static void ResizeTabChild(HHInfo *info, int tab) SetWindowPos(hwnd, NULL, rect.left, rect.top, width, height, SWP_NOZORDER | SWP_NOACTIVATE); - /* Resize the tab widget column to perfectly fit the tab window and - * leave sufficient space for the scroll widget. - */ switch (tab) { case TAB_INDEX: { @@ -351,11 +349,33 @@ static void ResizeTabChild(HHInfo *info, int tab) int border_width = GetSystemMetrics(SM_CXBORDER); int edge_width = GetSystemMetrics(SM_CXEDGE); + /* Resize the tab widget column to perfectly fit the tab window and + * leave sufficient space for the scroll widget. + */ SendMessageW(info->tabs[TAB_INDEX].hwnd, LVM_SETCOLUMNWIDTH, 0, width-scroll_width-2*border_width-2*edge_width); break; } + case TAB_SEARCH: { + int scroll_width = GetSystemMetrics(SM_CXVSCROLL); + int border_width = GetSystemMetrics(SM_CXBORDER); + int edge_width = GetSystemMetrics(SM_CXEDGE); + int top_pos = 0; + + SetWindowPos(info->search.hwndEdit, NULL, 0, top_pos, width, + EDIT_HEIGHT, SWP_NOZORDER | SWP_NOACTIVATE); + top_pos += EDIT_HEIGHT + TAB_MARGIN; + SetWindowPos(info->search.hwndList, NULL, 0, top_pos, width, + height-top_pos, SWP_NOZORDER | SWP_NOACTIVATE); + /* Resize the tab widget column to perfectly fit the tab window and + * leave sufficient space for the scroll widget. + */ + SendMessageW(info->search.hwndList, LVM_SETCOLUMNWIDTH, 0, + width-scroll_width-2*border_width-2*edge_width); + + break; + } } } @@ -469,6 +489,22 @@ static LRESULT OnTopicChange(HHInfo *info, void *user_data) return 0; } +/* Capture the Enter/Return key and send it up to Child_WndProc as an NM_RETURN message */ +static LRESULT CALLBACK EditChild_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC editWndProc = (WNDPROC)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + + if(message == WM_KEYUP && wParam == VK_RETURN) + { + NMHDR nmhdr; + + nmhdr.hwndFrom = hWnd; + nmhdr.code = NM_RETURN; + SendMessageW(GetParent(GetParent(hWnd)), WM_NOTIFY, wParam, (LPARAM)&nmhdr); + } + return editWndProc(hWnd, message, wParam, lParam); +} + static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) @@ -490,8 +526,10 @@ static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LP if(info && info->current_tab == TAB_INDEX) return OnTopicChange(info, (void*)((NMITEMACTIVATE *)lParam)->lParam); case NM_RETURN: - if(info && info->current_tab == TAB_INDEX) - { + if(!info) + return 0; + switch(info->current_tab) { + case TAB_INDEX: { HWND hwndList = info->tabs[TAB_INDEX].hwnd; LVITEMW lvItem; @@ -499,8 +537,17 @@ static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LP lvItem.mask = TVIF_PARAM; ListView_GetItemW(hwndList, &lvItem); OnTopicChange(info, (void*) lvItem.lParam); + return 0; } - return 0; + case TAB_SEARCH: { + WCHAR needle[100]; + + GetWindowTextW(info->search.hwndEdit, needle, sizeof(needle)/sizeof(WCHAR)); + FIXME("Search for text: %s\n", debugstr_w(needle)); + return 0; + } + } + break; } break; } @@ -862,6 +909,69 @@ static BOOL AddIndexTab(HHInfo *info) return TRUE; } +static BOOL AddSearchTab(HHInfo *info) +{ + HWND hwndList, hwndEdit, hwndContainer; + char hidden_column[] = "Column"; + WNDPROC editWndProc; + LVCOLUMNA lvc; + + if(info->tabs[TAB_SEARCH].id == -1) + return TRUE; /* No "Search" tab */ + hwndContainer = CreateWindowExW(WS_EX_CONTROLPARENT, szChildClass, szEmpty, + WS_CHILD, 0, 0, 0, 0, info->WinType.hwndNavigation, + NULL, hhctrl_hinstance, NULL); + if(!hwndContainer) { + ERR("Could not create search window container control.\n"); + return FALSE; + } + hwndEdit = CreateWindowExW(WS_EX_CLIENTEDGE, WC_EDITW, szEmpty, WS_CHILD + | WS_VISIBLE | ES_LEFT | SS_NOTIFY, 0, 0, 0, 0, + hwndContainer, NULL, hhctrl_hinstance, NULL); + if(!hwndEdit) { + ERR("Could not create search ListView control.\n"); + return FALSE; + } + if(SendMessageW(hwndEdit, WM_SETFONT, (WPARAM) info->hFont, (LPARAM) FALSE) == -1) + { + ERR("Could not set font for edit control.\n"); + return FALSE; + } + editWndProc = (WNDPROC) SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR)EditChild_WndProc); + if(!editWndProc) { + ERR("Could not redirect messages for edit control.\n"); + return FALSE; + } + SetWindowLongPtrW(hwndEdit, GWLP_USERDATA, (LONG_PTR)editWndProc); + hwndList = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW, szEmpty, + WS_CHILD | WS_VISIBLE | WS_BORDER | LVS_SINGLESEL + | LVS_REPORT | LVS_NOCOLUMNHEADER, 0, 0, 0, 0, + hwndContainer, NULL, hhctrl_hinstance, NULL); + if(!hwndList) { + ERR("Could not create search ListView control.\n"); + return FALSE; + } + memset(&lvc, 0, sizeof(lvc)); + lvc.mask = LVCF_TEXT; + lvc.pszText = hidden_column; + if(SendMessageW(hwndList, LVM_INSERTCOLUMNA, 0, (LPARAM) &lvc) == -1) + { + ERR("Could not create ListView column\n"); + return FALSE; + } + + info->search.hwndEdit = hwndEdit; + info->search.hwndList = hwndList; + info->search.hwndContainer = hwndContainer; + info->tabs[TAB_SEARCH].hwnd = hwndContainer; + + SetWindowLongPtrW(hwndContainer, GWLP_USERDATA, (LONG_PTR)info); + + ResizeTabChild(info, TAB_SEARCH); + + return TRUE; +} + /* The Index tab's sub-topic popup */ static void ResizePopupChild(HHInfo *info) @@ -1232,6 +1342,9 @@ static BOOL CreateViewer(HHInfo *pHHInfo) if (!AddIndexPopup(pHHInfo)) return FALSE; + if (!AddSearchTab(pHHInfo)) + return FALSE; + InitContent(pHHInfo); InitIndex(pHHInfo); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index adff42d..dfc80b7 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -115,6 +115,12 @@ typedef struct { } IndexPopup; typedef struct { + HWND hwndEdit; + HWND hwndList; + HWND hwndContainer; +} SearchTab; + +typedef struct { IOleClientSite *client_site; IWebBrowser2 *web_browser; IOleObject *wb_object; @@ -137,6 +143,7 @@ typedef struct { ContentItem *content; IndexItem *index; IndexPopup popup; + SearchTab search; HWND hwndTabCtrl; HWND hwndSizeBar; HFONT hFont;

1 0

Erich Hoover : itss: Implement IStorageImpl_OpenStorage.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 6627b9029ebe0a29271faf6b0d36c6dbbd9c1fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6627b9029ebe0a29271faf6b0… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Feb 7 10:32:27 2010 -0700 itss: Implement IStorageImpl_OpenStorage. --- dlls/itss/chm_lib.c | 32 ++++++++++++++++++++++++++++++++ dlls/itss/chm_lib.h | 1 + dlls/itss/storage.c | 36 ++++++++++++++++++++++++++++++++++-- 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index a98c8ac..ada9be1 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -829,6 +829,38 @@ struct chmFile *chm_openW(const WCHAR *filename) return newHandle; } +/* Duplicate an ITS archive handle */ +struct chmFile *chm_dup(struct chmFile *oldHandle) +{ + struct chmFile *newHandle=NULL; + + newHandle = HeapAlloc(GetProcessHeap(), 0, sizeof(struct chmFile)); + memcpy(newHandle, oldHandle, sizeof(struct chmFile)); + + /* duplicate fd handle */ + DuplicateHandle(GetCurrentProcess(), oldHandle->fd, + GetCurrentProcess(), &(newHandle->fd), + 0, FALSE, DUPLICATE_SAME_ACCESS); + newHandle->lzx_state = NULL; + newHandle->cache_blocks = NULL; + newHandle->cache_block_indices = NULL; + newHandle->cache_num_blocks = 0; + + /* initialize mutexes, if needed */ + InitializeCriticalSection(&newHandle->mutex); + newHandle->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.mutex"); + InitializeCriticalSection(&newHandle->lzx_mutex); + newHandle->lzx_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.lzx_mutex"); + InitializeCriticalSection(&newHandle->cache_mutex); + newHandle->cache_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.cache_mutex"); + + /* initialize cache */ + chm_set_param(newHandle, CHM_PARAM_MAX_BLOCKS_CACHED, + CHM_MAX_BLOCKS_CACHED); + + return newHandle; +} + /* close an ITS archive */ void chm_close(struct chmFile *h) { diff --git a/dlls/itss/chm_lib.h b/dlls/itss/chm_lib.h index 0b3718c..fcd17b5 100644 --- a/dlls/itss/chm_lib.h +++ b/dlls/itss/chm_lib.h @@ -73,6 +73,7 @@ struct chmUnitInfo }; struct chmFile* chm_openW(const WCHAR *filename); +struct chmFile *chm_dup(struct chmFile *oldHandle); /* close an ITS archive */ void chm_close(struct chmFile *h); diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index de0acfa..fa92c4f 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -391,10 +391,42 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( IStorage** ppstg) { ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; + static const WCHAR szRoot[] = { '/', 0 }; + struct chmFile *chmfile; + WCHAR *path, *p; + DWORD len; - FIXME("%p %s %p %u %p %u %p\n", This, debugstr_w(pwcsName), + TRACE("%p %s %p %u %p %u %p\n", This, debugstr_w(pwcsName), pstgPriority, grfMode, snbExclude, reserved, ppstg); - return E_NOTIMPL; + + len = strlenW( This->dir ) + strlenW( pwcsName ) + 1; + path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + strcpyW( path, This->dir ); + + if( pwcsName[0] == '/' || pwcsName[0] == '\\' ) + { + p = &path[strlenW( path ) - 1]; + while( ( path <= p ) && ( *p == '/' ) ) + *p-- = 0; + } + strcatW( path, pwcsName ); + + for(p=path; *p; p++) { + if(*p == '\\') + *p = '/'; + } + + if(*--p == '/') + *p = 0; + + strcatW( path, szRoot ); + + TRACE("Resolving %s\n", debugstr_w(path)); + + chmfile = chm_dup( This->chmfile ); + if( !chmfile ) + return E_FAIL; + return ITSS_create_chm_storage(chmfile, path, ppstg); } static HRESULT WINAPI ITSS_IStorageImpl_CopyTo(

1 0