December 2009 - Wine-commits

Henri Verbeet : dxgi: Implement IDXGIOutput::GetDisplayModeList().
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: f282db24083c4d4d0c91368266132383d24458ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f282db24083c4d4d0c9136826… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 20:32:10 2009 +0100 dxgi: Implement IDXGIOutput::GetDisplayModeList(). --- dlls/dxgi/output.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 5b83427..eee6e55 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -117,10 +117,54 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput *iface, DXGI_OU static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *desc) { - FIXME("iface %p, format %s, flags %#x, mode_count %p, desc %p stub!\n", + struct dxgi_output *This = (struct dxgi_output *)iface; + WINED3DFORMAT wined3d_format; + IWineD3D *wined3d; + UINT i; + + TRACE("iface %p, format %s, flags %#x, mode_count %p, desc %p.\n", iface, debug_dxgi_format(format), flags, mode_count, desc); - return E_NOTIMPL; + wined3d = IWineDXGIFactory_get_wined3d(This->adapter->parent); + wined3d_format = wined3dformat_from_dxgi_format(format); + + if (!desc) + { + EnterCriticalSection(&dxgi_cs); + *mode_count = IWineD3D_GetAdapterModeCount(wined3d, This->adapter->ordinal, wined3d_format); + IWineD3D_Release(wined3d); + LeaveCriticalSection(&dxgi_cs); + + return S_OK; + } + + EnterCriticalSection(&dxgi_cs); + for (i = 0; i < *mode_count; ++i) + { + WINED3DDISPLAYMODE mode; + HRESULT hr; + + hr = IWineD3D_EnumAdapterModes(wined3d, This->adapter->ordinal, wined3d_format, i, &mode); + if (FAILED(hr)) + { + WARN("EnumAdapterModes failed, hr %#x.\n", hr); + IWineD3D_Release(wined3d); + LeaveCriticalSection(&dxgi_cs); + return hr; + } + + desc[i].Width = mode.Width; + desc[i].Height = mode.Height; + desc[i].RefreshRate.Numerator = mode.RefreshRate; + desc[i].RefreshRate.Denominator = 1; + desc[i].Format = format; + desc[i].ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; /* FIXME */ + desc[i].Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ + } + IWineD3D_Release(wined3d); + LeaveCriticalSection(&dxgi_cs); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput *iface,

1 0

Jacek Caban : wininet: lpszUrlPath should be NULL for URLs in file:///... format.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 5e8e358a71746110b654ad0df893f7faa248a396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e8e358a71746110b654ad0df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 9 22:08:26 2009 +0100 wininet: lpszUrlPath should be NULL for URLs in file:///... format. --- dlls/wininet/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 8a3340c..ac845a8 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1550,7 +1550,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR } /* If the scheme is "file" and the host is just one letter, it's not a host */ - if(lpUC->nScheme==INTERNET_SCHEME_FILE && (lpszPort-lpszHost)==1) + if(lpUC->nScheme==INTERNET_SCHEME_FILE && lpszPort <= lpszHost+1) { lpszcp=lpszHost; SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength,

1 0

Jacek Caban : wininet: Make InternetCrackUrlA tests more generic and add more tests.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: d153344eaad550aec87ac1932de4b322498b19bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d153344eaad550aec87ac1932… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 9 22:08:48 2009 +0100 wininet: Make InternetCrackUrlA tests more generic and add more tests. --- dlls/wininet/tests/url.c | 152 ++++++++++++++++++++++++++++++---------------- 1 files changed, 99 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d153344eaad550aec87ac…

1 0

Jacek Caban : wininet: Set lpszUrlPath in InternetCrackUrlW if its length is 0.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 5b76702e84652832ba21ca22afb4544c5f6fb95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b76702e84652832ba21ca22a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 9 22:09:06 2009 +0100 wininet: Set lpszUrlPath in InternetCrackUrlW if its length is 0. --- dlls/wininet/internet.c | 2 +- dlls/wininet/tests/url.c | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ac845a8..d749e53 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1603,7 +1603,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR * <protocol>:[//<net_loc>][/path][;<params>][?<query>][#<fragment>] * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */ - if (lpszcp != 0 && lpszcp - lpszUrl < dwUrlLength && (!lpszParam || lpszcp < lpszParam)) + if (lpszcp != 0 && lpszcp - lpszUrl < dwUrlLength && (!lpszParam || lpszcp <= lpszParam)) { INT len; diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 527c2c7..7439cd3 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -94,6 +94,7 @@ typedef struct { INTERNET_SCHEME scheme; int host_off; int host_len; + int host_skip_broken; INTERNET_PORT port; int user_off; int user_len; @@ -107,15 +108,17 @@ typedef struct { static const crack_url_test_t crack_url_tests[] = { {"http://www.winehq.org/site/about#hi", - 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 80, -1, 0, -1, 0, 21, 11, 32, 3}, + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, -1, 80, -1, 0, -1, 0, 21, 11, 32, 3}, {"http://www.myserver.com/myscript.php?arg=1", - 0, 4, INTERNET_SCHEME_HTTP, 7, 16, 80, -1, 0, -1, 0, 23, 13, 36, 6}, + 0, 4, INTERNET_SCHEME_HTTP, 7, 16, -1, 80, -1, 0, -1, 0, 23, 13, 36, 6}, + {"http://www.winehq.org?test=123", + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 0, 21, 9}, {"file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", - 0, 4, INTERNET_SCHEME_FILE, -1, 0, 0, -1, 0, -1, 0, 7, 55, -1, 0}, + 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0}, {"fide:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", - 0, 4, INTERNET_SCHEME_UNKNOWN, 7, 0, 0, -1, 0, -1, 0, 7, 55, -1, 0}, + 0, 4, INTERNET_SCHEME_UNKNOWN, 7, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0}, {"file://C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", - 0, 4, INTERNET_SCHEME_FILE, -1, 0, 0, -1, 0, -1, 0, 7, 54, -1, 0}, + 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 54, -1, 0}, }; static void test_crack_url(const crack_url_test_t *test) @@ -143,6 +146,10 @@ static void test_crack_url(const crack_url_test_t *test) else ok(url.lpszHostName == test->url+test->host_off, "[%s] url.lpszHostName = %p, expected %p\n", test->url, url.lpszHostName, test->url+test->host_off); + if(test->host_skip_broken != -1 && url.dwHostNameLength == test->host_skip_broken) { + win_skip("skipping broken dwHostNameLength result\n"); + return; + } ok(url.dwHostNameLength == test->host_len, "[%s] url.lpszHostNameLength = %d, expected %d\n", test->url, url.dwHostNameLength, test->host_len);

1 0

Jacek Caban : urlmon: Include extra info in object name passed to HttpOpenRequest.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 90b1bcc1aefd27e7c8719ab7e906ecc9296bbb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b1bcc1aefd27e7c8719ab7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 9 22:09:22 2009 +0100 urlmon: Include extra info in object name passed to HttpOpenRequest. --- dlls/urlmon/http.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index bb81ec8..2e47b11 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -95,7 +95,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ memset(&url_comp, 0, sizeof(url_comp)); url_comp.dwStructSize = sizeof(url_comp); - url_comp.dwSchemeLength = url_comp.dwHostNameLength = url_comp.dwUrlPathLength = + url_comp.dwSchemeLength = url_comp.dwHostNameLength = url_comp.dwUrlPathLength = url_comp.dwExtraInfoLength = url_comp.dwUserNameLength = url_comp.dwPasswordLength = 1; if (!InternetCrackUrlW(url, 0, 0, &url_comp)) return MK_E_SYNTAX; @@ -124,7 +124,12 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ } accept_mimes[num] = 0; - path = heap_strndupW(url_comp.lpszUrlPath, url_comp.dwUrlPathLength); + path = heap_alloc((url_comp.dwUrlPathLength+url_comp.dwExtraInfoLength+1)*sizeof(WCHAR)); + if(url_comp.dwUrlPathLength) + memcpy(path, url_comp.lpszUrlPath, url_comp.dwUrlPathLength*sizeof(WCHAR)); + if(url_comp.dwExtraInfoLength) + memcpy(path+url_comp.dwUrlPathLength, url_comp.lpszExtraInfo, url_comp.dwExtraInfoLength*sizeof(WCHAR)); + path[url_comp.dwUrlPathLength+url_comp.dwExtraInfoLength] = 0; if(This->https) request_flags |= INTERNET_FLAG_SECURE; This->base.request = HttpOpenRequestW(This->base.connection,

1 0

Juan Lang : rsaenh: Fix memory leak reading stored keys.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: f9a475c808b3bbc4980f3225dfa2a7397df9f4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a475c808b3bbc4980f3225d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 9 14:43:05 2009 -0800 rsaenh: Fix memory leak reading stored keys. --- dlls/rsaenh/rsaenh.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 5c2b8b0..665bc40 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1380,12 +1380,18 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, cons (OBJECTHDR**)&pKeyContainer)) return (HCRYPTPROV)INVALID_HANDLE_VALUE; + /* read_key_value calls import_key, which calls import_private_key, + * which implicitly installs the key value into the appropriate key + * container key. Thus the ref count is incremented twice, once for + * the output key value, and once for the implicit install, and needs + * to be decremented to balance the two. + */ if (read_key_value(hKeyContainer, hKey, AT_KEYEXCHANGE, dwProtectFlags, &hCryptKey)) - pKeyContainer->hKeyExchangeKeyPair = hCryptKey; + release_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY); if (read_key_value(hKeyContainer, hKey, AT_SIGNATURE, dwProtectFlags, &hCryptKey)) - pKeyContainer->hSignatureKeyPair = hCryptKey; + release_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY); } return hKeyContainer;

1 0

Nikolay Sivov : comctl32/treeview: Use additional helper for item invalidation.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: e3c34f2d2953f47d1c5c070770d993d2d1161e1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c34f2d2953f47d1c5c07077… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 9 23:06:08 2009 +0300 comctl32/treeview: Use additional helper for item invalidation. --- dlls/comctl32/treeview.c | 54 ++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8752f86..46923fe 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2858,10 +2858,16 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, HDC hdc, const RECT *rc) TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); } +static inline void +TREEVIEW_InvalidateItem(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) +{ + if (item) InvalidateRect(infoPtr->hwnd, &item->rect, TRUE); +} + static void TREEVIEW_Invalidate(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) { - if (item != NULL) + if (item) InvalidateRect(infoPtr->hwnd, &item->rect, TRUE); else InvalidateRect(infoPtr->hwnd, NULL, TRUE); @@ -4026,7 +4032,6 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) HWND hwnd = infoPtr->hwnd; TVHITTESTINFO ht; BOOL bTrack, bDoLabelEdit; - HTREEITEM tempItem; /* If Edit control is active - kill it and return. * The best way to do it is to set focus to itself. @@ -4049,10 +4054,8 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) if(ht.hItem && (ht.flags & TVHT_ONITEM)) { infoPtr->focusedItem = ht.hItem; - InvalidateRect(hwnd, &ht.hItem->rect, TRUE); - - if(infoPtr->selectedItem) - InvalidateRect(hwnd, &(infoPtr->selectedItem->rect), TRUE); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); } bTrack = (ht.flags & TVHT_ONITEM) @@ -4086,13 +4089,11 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) if(infoPtr->focusedItem) { /* refresh the item that was focused */ - tempItem = infoPtr->focusedItem; - infoPtr->focusedItem = 0; - InvalidateRect(infoPtr->hwnd, &tempItem->rect, TRUE); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + infoPtr->focusedItem = NULL; /* refresh the selected item to return the filled background */ - if (infoPtr->selectedItem) - InvalidateRect(infoPtr->hwnd, &(infoPtr->selectedItem->rect), TRUE); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); } return 0; @@ -4312,7 +4313,6 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *infoPtr, INT action, HTREEITEM newSelect, INT cause) { TREEVIEW_ITEM *prevSelect; - RECT rcFocused; assert(newSelect == NULL || TREEVIEW_ValidItem(infoPtr, newSelect)); @@ -4322,12 +4322,8 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *infoPtr, INT action, HTREEITEM newSelect, /* reset and redraw focusedItem if focusedItem was set so we don't */ /* have to worry about the previously focused item when we set a new one */ - if(infoPtr->focusedItem) - { - rcFocused = (infoPtr->focusedItem)->rect; - infoPtr->focusedItem = 0; - InvalidateRect(infoPtr->hwnd, &rcFocused, TRUE); - } + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + infoPtr->focusedItem = NULL; switch (action) { @@ -4356,10 +4352,8 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *infoPtr, INT action, HTREEITEM newSelect, TREEVIEW_EnsureVisible(infoPtr, infoPtr->selectedItem, FALSE); - if (prevSelect) - TREEVIEW_Invalidate(infoPtr, prevSelect); - if (newSelect) - TREEVIEW_Invalidate(infoPtr, newSelect); + TREEVIEW_InvalidateItem(infoPtr, prevSelect); + TREEVIEW_InvalidateItem(infoPtr, newSelect); TREEVIEW_SendTreeviewNotify(infoPtr, TVN_SELCHANGEDW, @@ -5257,12 +5251,10 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) static LRESULT TREEVIEW_MouseLeave (TREEVIEW_INFO * infoPtr) { - if (infoPtr->hotItem) - { - /* remove hot effect from item */ - InvalidateRect(infoPtr->hwnd, &infoPtr->hotItem->rect, TRUE); - infoPtr->hotItem = NULL; - } + /* remove hot effect from item */ + TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); + infoPtr->hotItem = NULL; + return 0; } @@ -5302,12 +5294,10 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) if (item != infoPtr->hotItem) { /* redraw old hot item */ - if (infoPtr->hotItem) - InvalidateRect(infoPtr->hwnd, &infoPtr->hotItem->rect, TRUE); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); infoPtr->hotItem = item; /* redraw new hot item */ - if (infoPtr->hotItem) - InvalidateRect(infoPtr->hwnd, &infoPtr->hotItem->rect, TRUE); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); } return 0;

1 0

Vincent Povirk : ole32: Remove the ancestorStorage attribute.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 8b3ff9d179e71b1ab87427d5a14383b46b35f8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3ff9d179e71b1ab87427d5a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 30 17:22:58 2009 -0600 ole32: Remove the ancestorStorage attribute. --- dlls/ole32/storage32.c | 15 +-------------- dlls/ole32/storage32.h | 5 ----- 2 files changed, 1 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2812555..eaddcbf 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2459,12 +2459,6 @@ static HRESULT StorageImpl_Construct( This->base.ref = 1; This->base.create = create; - /* - * This is the top-level storage so initialize the ancestor pointer - * to this. - */ - This->base.ancestorStorage = This; - This->base.reverted = 0; This->hFile = hFile; @@ -3822,12 +3816,10 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( static void StorageInternalImpl_Invalidate( StorageInternalImpl *This ) { - if (This->base.ancestorStorage) + if (!This->base.reverted) { TRACE("Storage invalidated (stg=%p)\n", This); - This->base.ancestorStorage = NULL; - This->base.reverted = 1; This->parentStorage = NULL; @@ -4388,11 +4380,6 @@ static StorageInternalImpl* StorageInternalImpl_Construct( newStorage->base.baseVtbl = &StorageInternalImpl_BaseVtbl; newStorage->base.openFlags = (openFlags & ~STGM_CREATE); - /* - * Keep the ancestor storage pointer but do not nail a reference to it. - */ - newStorage->base.ancestorStorage = parentStorage->ancestorStorage; - newStorage->base.reverted = 0; newStorage->parentStorage = parentStorage; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index ff526bf..c68c6ea 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -214,11 +214,6 @@ struct StorageBaseImpl LONG ref; /* - * Ancestor storage (top level) - */ - StorageImpl* ancestorStorage; - - /* * TRUE if this object has been invalidated */ int reverted;

1 0

Eric Pouech : winedump: Rewrote a bit the COFF symbol table stuff.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 947f2456a930b28d69c29ff3c3037e0f6276d1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=947f2456a930b28d69c29ff3c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Dec 9 20:55:07 2009 +0100 winedump: Rewrote a bit the COFF symbol table stuff. --- tools/winedump/debug.c | 106 ++++++++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 52 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index be8150f..4f2cedf 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -512,70 +512,72 @@ static const char *get_coff_name( const IMAGE_SYMBOL *coff_sym, const char *coff return nampnt; } -void dump_coff(unsigned long coffbase, unsigned long len, const void* pmt) +static const char* storage_class(BYTE sc) +{ + static char tmp[7]; + switch (sc) + { + case IMAGE_SYM_CLASS_STATIC: return "static"; + case IMAGE_SYM_CLASS_EXTERNAL: return "extrnl"; + case IMAGE_SYM_CLASS_LABEL: return "label "; + } + sprintf(tmp, "#%d", sc); + return tmp; +} + +void dump_coff_symbol_table(const IMAGE_SYMBOL *coff_symbols, unsigned num_sym, + const IMAGE_SECTION_HEADER *sectHead) { - const IMAGE_COFF_SYMBOLS_HEADER *coff = PRD(coffbase, len); const IMAGE_SYMBOL *coff_sym; - const IMAGE_SYMBOL *coff_symbols = - (const IMAGE_SYMBOL *) ((const char *)coff + coff->LvaToFirstSymbol); - const char *coff_strtab = (const char *) (coff_symbols + coff->NumberOfSymbols); - const IMAGE_SECTION_HEADER *sectHead = pmt; + const char *coff_strtab = (const char *) (coff_symbols + num_sym); unsigned int i; const char *nampnt; int naux; - printf("\nDebug table: COFF format. modbase %p, coffbase %p\n", PRD(0, 0), coff); - printf(" ID | seg:offs [ abs ] | symbol/function name\n"); - for(i=0; i < coff->NumberOfSymbols; i++ ) + printf("\nDebug table: COFF format.\n"); + printf(" ID | seg:offs [ abs ] | Kind | symbol/function name\n"); + for (i=0; i < num_sym; i++) { - coff_sym = coff_symbols + i; - naux = coff_sym->NumberOfAuxSymbols; - - if( coff_sym->StorageClass == IMAGE_SYM_CLASS_FILE ) - { - printf("file %s\n", (const char *) (coff_sym + 1)); - i += naux; - continue; - } - - if( (coff_sym->StorageClass == IMAGE_SYM_CLASS_STATIC) - && (naux == 0) - && (coff_sym->SectionNumber == 1) ) - { - DWORD base = sectHead[coff_sym->SectionNumber - 1].VirtualAddress; - /* - * This is a normal static function when naux == 0. - * Just register it. The current file is the correct - * one in this instance. - */ - nampnt = get_coff_name( coff_sym, coff_strtab ); - - printf("%05d | %02d:%08x [%08x] | %s\n", i, coff_sym->SectionNumber - 1, coff_sym->Value - base, coff_sym->Value, nampnt); - i += naux; - continue; - } + coff_sym = coff_symbols + i; + naux = coff_sym->NumberOfAuxSymbols; - if( (coff_sym->StorageClass == IMAGE_SYM_CLASS_EXTERNAL) - && ISFCN(coff_sym->Type) - && (coff_sym->SectionNumber > 0) ) + switch (coff_sym->StorageClass) { - DWORD base = sectHead[coff_sym->SectionNumber - 1].VirtualAddress; - - nampnt = get_coff_name( coff_sym, coff_strtab ); + case IMAGE_SYM_CLASS_FILE: + printf("file %s\n", (const char *) (coff_sym + 1)); + break; + case IMAGE_SYM_CLASS_STATIC: + case IMAGE_SYM_CLASS_EXTERNAL: + case IMAGE_SYM_CLASS_LABEL: + if (coff_sym->SectionNumber > 0) + { + DWORD base = sectHead[coff_sym->SectionNumber - 1].VirtualAddress; + nampnt = get_coff_name( coff_sym, coff_strtab ); - /* FIXME: add code to find out the file this symbol belongs to, - * see winedbg */ - printf("%05d | %02d:%08x [%08x] | %s\n", i, coff_sym->SectionNumber - 1, coff_sym->Value - base, coff_sym->Value, nampnt); - i += naux; - continue; - } + printf("%05d | %02d:%08x [%08x] | %s | %s\n", + i, coff_sym->SectionNumber - 1, coff_sym->Value, + base + coff_sym->Value, + storage_class(coff_sym->StorageClass), nampnt); + } + break; + default: + printf("%05d | %s\n", i, storage_class(coff_sym->StorageClass)); + } + /* + * For now, skip past the aux entries. + */ + i += naux; + } +} - /* - * For now, skip past the aux entries. - */ - i += naux; +void dump_coff(unsigned long coffbase, unsigned long len, const void* pmt) +{ + const IMAGE_COFF_SYMBOLS_HEADER *coff = PRD(coffbase, len); + const IMAGE_SYMBOL *coff_symbols = + (const IMAGE_SYMBOL *) ((const char *)coff + coff->LvaToFirstSymbol); + const IMAGE_SECTION_HEADER *sectHead = pmt; - } + dump_coff_symbol_table(coff_symbols, coff->NumberOfSymbols, sectHead); } void dump_codeview(unsigned long base, unsigned long len)

1 0

Eric Pouech : winedump: Dump PE symbols table if any.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 2271a8d417fa5ac1c51d554811b5d420d92dfea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2271a8d417fa5ac1c51d55481… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Dec 9 20:55:18 2009 +0100 winedump: Dump PE symbols table if any. --- tools/winedump/main.c | 7 +++++++ tools/winedump/pe.c | 20 ++++++++++++++++++++ tools/winedump/winedump.h | 3 +++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index 3524a1e..d5f39b5 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -187,9 +187,15 @@ static void do_dumpall(const char *arg) { globals.do_dumpheader = 1; globals.do_dump_rawdata = 1; + globals.do_symbol_table = 1; globals.dumpsect = "ALL"; } +static void do_symtable(const char* arg) +{ + globals.do_symbol_table = 1; +} + struct my_option { const char *name; @@ -222,6 +228,7 @@ static const struct my_option option_table[] = { {"-f", DUMP, 0, do_dumphead, "-f Dumps file header information"}, {"-G", DUMP, 0, do_rawdebug, "-G Dumps raw debug information"}, {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls, clr)"}, + {"-t", DUMP, 0, do_symtable, "-t Dumps symbol table"}, {"-x", DUMP, 0, do_dumpall, "-x Dumps everything"}, {NULL, NONE, 0, NULL, NULL} }; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 9761215..a79593c 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1399,6 +1399,24 @@ static void dump_debug(void) dump_stabs(stabs, szstabs, stabstr, szstr); } +static void dump_symbol_table(void) +{ + const IMAGE_SYMBOL* sym; + int numsym; + const char* strtable; + + numsym = PE_nt_headers->FileHeader.NumberOfSymbols; + if (!PE_nt_headers->FileHeader.PointerToSymbolTable || !numsym) + return; + sym = (const IMAGE_SYMBOL*)PRD(PE_nt_headers->FileHeader.PointerToSymbolTable, + sizeof(*sym) * numsym); + if (!sym) return; + /* FIXME: no way to get strtable size */ + strtable = (const char*)&sym[numsym]; + + dump_coff_symbol_table(sym, numsym, IMAGE_FIRST_SECTION(PE_nt_headers)); +} + enum FileSig get_kind_exec(void) { const WORD* pw; @@ -1468,6 +1486,8 @@ void pe_dump(void) if (all || !strcmp(globals.dumpsect, "except")) dump_dir_exceptions(); } + if (globals.do_symbol_table) + dump_symbol_table(); if (globals.do_debug) dump_debug(); } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 15a8cdb..9ad20a5 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -123,6 +123,7 @@ typedef struct __globals int do_dumpheader; /* -f */ int do_dump_rawdata; /* -x */ int do_debug; /* -G == 1, -g == 2 */ + int do_symbol_table; /* -t */ /* Option arguments: spec mode */ int start_ordinal; /* -s */ @@ -263,6 +264,8 @@ void codeview_dump_linetab2(const char* linetab, DWORD size, const ch void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, unsigned szstr); void dump_codeview(unsigned long ptr, unsigned long len); void dump_coff(unsigned long coffbase, unsigned long len, const void* sect_map); +void dump_coff_symbol_table(const IMAGE_SYMBOL *coff_symbols, unsigned num_sym, + const IMAGE_SECTION_HEADER *sectHead); void dump_frame_pointer_omission(unsigned long base, unsigned long len); FILE *open_file (const char *name, const char *ext, const char *mode);

1 0