December 2009 - Wine-commits

Paul Vriens : hlink/tests: Fix a test failure on Win9x/WinMe.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 62bb1eb2a4154f4045e8388c9798d490c8301c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62bb1eb2a4154f4045e8388c9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 24 12:31:59 2009 +0100 hlink/tests: Fix a test failure on Win9x/WinMe. --- dlls/hlink/tests/browse_ctx.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 637f3c8..e9806b8 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -24,6 +24,16 @@ #include "wine/test.h" +/* Win9x and WinMe don't have lstrcmpW */ +static int strcmp_ww(const WCHAR *str1, const WCHAR *str2) +{ + DWORD len1 = lstrlenW(str1); + DWORD len2 = lstrlenW(str2); + + if (len1 != len2) return 1; + return memcmp(str1, str2, len1 * sizeof(WCHAR)); +} + static void test_SetInitialHlink(void) { IHlinkBrowseContext *bc; @@ -55,7 +65,7 @@ static void test_SetInitialHlink(void) hres = IMoniker_GetDisplayName(found_moniker, bindctx, NULL, &found_name); ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); - ok(lstrcmpW(found_name, friend), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(friend), wine_dbgstr_w(found_name)); + ok(strcmp_ww(found_name, friend), "Found display name should not have been %s\n", wine_dbgstr_w(friend)); IBindCtx_Release(bindctx); IMoniker_Release(found_moniker);

1 0

Paul Vriens : mmdevapi/tests: Fix a test failure on Vista+ with no soundcard present.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 20a50f30c4ab57330436438ee42bbc5b491623fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a50f30c4ab57330436438ee… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 24 13:12:36 2009 +0100 mmdevapi/tests: Fix a test failure on Vista+ with no soundcard present. --- dlls/mmdevapi/tests/dependency.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c index 1568bed..0d60cb2 100644 --- a/dlls/mmdevapi/tests/dependency.c +++ b/dlls/mmdevapi/tests/dependency.c @@ -55,15 +55,18 @@ START_TEST(dependency) if (FAILED(hr)) { skip("mmdevapi not available: 0x%08x\n", hr); - return; + goto cleanup; } hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); - ok(hr == S_OK, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); if (hr != S_OK) { - skip("GetDefaultAudioEndpoint returns 0x%08x, skipping tests\n", hr); - return; + if (hr == E_NOTFOUND) + skip("No sound card available\n"); + else + skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + goto cleanup; } ok(!GetModuleHandle("dsound.dll"), "dsound.dll was already loaded!\n"); @@ -94,8 +97,14 @@ START_TEST(dependency) ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s", dump_guid(&clsid)); } } + +cleanup: if (bf) IUnknown_Release(bf); + if (dev) + IUnknown_Release(dev); + if (mme) + IUnknown_Release(mme); - IUnknown_Release(mme); + CoUninitialize(); }

1 0

Nikolay Sivov : comctl32/comboex: Fix silly typo in CBEM_SETITEM handler ( lParam wasn't set).
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 7deb2779007993a8031ce943486120d42d82c22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7deb2779007993a8031ce9434… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 23 23:08:32 2009 +0300 comctl32/comboex: Fix silly typo in CBEM_SETITEM handler (lParam wasn't set). --- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/tests/comboex.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index d423527..1609b90 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -806,7 +806,7 @@ static BOOL COMBOEX_SetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) if (cit->mask & CBEIF_INDENT) item->iIndent = cit->iIndent; if (cit->mask & CBEIF_LPARAM) - cit->lParam = cit->lParam; + item->lParam = cit->lParam; if (TRACE_ON(comboex)) COMBOEX_DumpItem (item); diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index f732af5..d6bbce1 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -29,6 +29,8 @@ #define EDITBOX_ID 0 +#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND hComboExParentWnd; @@ -491,10 +493,27 @@ static void test_get_set_item(void) item.pszText = textA; item.iItem = -1; ret = SendMessage(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); - ok(ret, "CBEM_SETITEMA failed\n"); + expect(TRUE, ret); ok_sequence(sequences, EDITBOX_SEQ_INDEX, test_setitem_edit_seq, "set item data for edit", FALSE); + /* get/set lParam */ + item.mask = CBEIF_LPARAM; + item.iItem = -1; + item.lParam = 0xdeadbeef; + ret = SendMessage(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + ok(item.lParam == 0, "Expected zero, got %ld\n", item.lParam); + + item.lParam = 0xdeadbeef; + ret = SendMessage(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + + item.lParam = 0; + ret = SendMessage(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + ok(item.lParam == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", item.lParam); + DestroyWindow(hComboEx); }

1 0

Nikolay Sivov : comctl32/comboex: Don' t invalidate all windows if Edit box isn't set up.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 7d748b6ba0f7da0f18e88de91e6117b8793af6c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d748b6ba0f7da0f18e88de91… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 23 23:32:21 2009 +0300 comctl32/comboex: Don't invalidate all windows if Edit box isn't set up. --- dlls/comctl32/comboex.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 1609b90..185f1e1 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1149,7 +1149,7 @@ static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam) */ ShowWindow (infoPtr->hwndEdit, SW_SHOW); InvalidateRect (infoPtr->hwndCombo, 0, TRUE); - InvalidateRect (infoPtr->hwndEdit, 0, TRUE); + if (infoPtr->hwndEdit) InvalidateRect (infoPtr->hwndEdit, 0, TRUE); cursel = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0); if (cursel == -1) { cmp_func_t cmptext = get_cmp_func(infoPtr); @@ -1164,8 +1164,7 @@ static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam) if ((cursel == n) || ((INT_PTR)item == CB_ERR)) { TRACE("failed to find match??? item=%p cursel=%d\n", item, cursel); - if (infoPtr->hwndEdit) - SetFocus(infoPtr->hwndEdit); + if (infoPtr->hwndEdit) SetFocus(infoPtr->hwndEdit); return 0; } } @@ -1174,8 +1173,7 @@ static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam) if ((INT_PTR)item == CB_ERR) { TRACE("failed to find match??? item=%p cursel=%d\n", item, cursel); - if (infoPtr->hwndEdit) - SetFocus(infoPtr->hwndEdit); + if (infoPtr->hwndEdit) SetFocus(infoPtr->hwndEdit); return 0; } } @@ -1271,8 +1269,7 @@ static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam) * after passing the command to the parent of the ComboEx. */ lret = SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); - if (infoPtr->hwndEdit) - SetFocus(infoPtr->hwndEdit); + if (infoPtr->hwndEdit) SetFocus(infoPtr->hwndEdit); return lret; } return 0; @@ -1374,8 +1371,7 @@ static LRESULT COMBOEX_DrawItem (const COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT con GetWindowRect (infoPtr->hwndSelf, &exrc); GetWindowRect (infoPtr->hwndCombo, &cbrc); edrc.left=edrc.top=edrc.right=edrc.bottom=-1; - if (infoPtr->hwndEdit) - GetWindowRect (infoPtr->hwndEdit, &edrc); + if (infoPtr->hwndEdit) GetWindowRect (infoPtr->hwndEdit, &edrc); TRACE("window rects ex=(%s), cb=(%s), ed=(%s)\n", wine_dbgstr_rect(&exrc), wine_dbgstr_rect(&cbrc), wine_dbgstr_rect(&edrc));

1 0

Nikolay Sivov : comctl32/comboex: Get rid of useless helper.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 253edf0fbbe64504fbcbf958c2a8d644eee2f11e URL: http://source.winehq.org/git/wine.git/?a=commit;h=253edf0fbbe64504fbcbf958c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 23 23:35:08 2009 +0300 comctl32/comboex: Get rid of useless helper. --- dlls/comctl32/comboex.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 185f1e1..813504c 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -484,13 +484,6 @@ static CBE_ITEMDATA * COMBOEX_FindItem(const COMBOEX_INFO *infoPtr, INT_PTR inde return item; } - -static inline BOOL COMBOEX_HasEdit(COMBOEX_INFO const *infoPtr) -{ - return infoPtr->hwndEdit ? TRUE : FALSE; -} - - /* *** CBEM_xxx message support *** */ static UINT COMBOEX_GetListboxText(const COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf) @@ -557,7 +550,7 @@ static BOOL COMBOEX_GetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) if ((index >= infoPtr->nb_items) || (index < -1)) return FALSE; /* if the item is the edit control and there is no edit control, skip */ - if ((index == -1) && !COMBOEX_HasEdit(infoPtr)) return FALSE; + if ((index == -1) && !infoPtr->hwndEdit) return FALSE; if (!(item = COMBOEX_FindItem(infoPtr, index))) return FALSE; @@ -604,8 +597,7 @@ static BOOL COMBOEX_GetItemA (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) static inline BOOL COMBOEX_HasEditChanged (COMBOEX_INFO const *infoPtr) { - return COMBOEX_HasEdit(infoPtr) && - (infoPtr->flags & WCBE_EDITHASCHANGED) == WCBE_EDITHASCHANGED; + return infoPtr->hwndEdit && (infoPtr->flags & WCBE_EDITHASCHANGED) == WCBE_EDITHASCHANGED; } @@ -778,7 +770,7 @@ static BOOL COMBOEX_SetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) if ((index >= infoPtr->nb_items) || (index < -1)) return FALSE; /* if the item is the edit control and there is no edit control, skip */ - if ((index == -1) && !COMBOEX_HasEdit(infoPtr)) return FALSE; + if ((index == -1) && !infoPtr->hwndEdit) return FALSE; if (!(item = COMBOEX_FindItem(infoPtr, index))) return FALSE;

1 0

Nikolay Sivov : comctl32/comboex: Move debugging traces that require additional code into TRACE_ON() condition.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 6398448974136abb443356166a7e7009e3a9879e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6398448974136abb443356166… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 24 00:00:46 2009 +0300 comctl32/comboex: Move debugging traces that require additional code into TRACE_ON() condition. --- dlls/comctl32/comboex.c | 53 +++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 813504c..14079b2 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -544,7 +544,7 @@ static BOOL COMBOEX_GetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) INT_PTR index = cit->iItem; CBE_ITEMDATA *item; - TRACE("(...)\n"); + TRACE("\n"); /* if item number requested does not exist then return failure */ if ((index >= infoPtr->nb_items) || (index < -1)) return FALSE; @@ -564,7 +564,7 @@ static BOOL COMBOEX_GetItemA (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) { COMBOBOXEXITEMW tmpcit; - TRACE("(...)\n"); + TRACE("\n"); tmpcit.mask = cit->mask; tmpcit.iItem = cit->iItem; @@ -747,7 +747,7 @@ static HIMAGELIST COMBOEX_SetImageList (COMBOEX_INFO *infoPtr, HIMAGELIST himl) { HIMAGELIST himlTemp = infoPtr->himl; - TRACE("(...)\n"); + TRACE("\n"); infoPtr->himl = himl; @@ -967,7 +967,7 @@ static LRESULT COMBOEX_Create (HWND hwnd, CREATESTRUCTA const *cs) static const WCHAR NIL[] = { 0 }; COMBOEX_INFO *infoPtr; LOGFONTW mylogfont; - RECT wnrc1, clrc1, cmbwrc; + RECT win_rect; INT i; /* allocate memory for info structure */ @@ -992,11 +992,13 @@ static LRESULT COMBOEX_Create (HWND hwnd, CREATESTRUCTA const *cs) SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); - /* create combo box */ - GetWindowRect(hwnd, &wnrc1); - GetClientRect(hwnd, &clrc1); - TRACE("EX window=(%s), client=(%s)\n", - wine_dbgstr_rect(&wnrc1), wine_dbgstr_rect(&clrc1)); + if (TRACE_ON(comboex)) { + RECT client, rect; + GetWindowRect(hwnd, &rect); + GetClientRect(hwnd, &client); + TRACE("EX window=(%s), client=(%s)\n", + wine_dbgstr_rect(&rect), wine_dbgstr_rect(&client)); + } /* Native version of ComboEx creates the ComboBox with DROPDOWNLIST */ /* specified. It then creates it's own version of the EDIT control */ @@ -1071,20 +1073,24 @@ static LRESULT COMBOEX_Create (HWND hwnd, CREATESTRUCTA const *cs) /* Above is fairly certain, below is much less certain. */ - GetWindowRect(hwnd, &wnrc1); - GetClientRect(hwnd, &clrc1); - GetWindowRect(infoPtr->hwndCombo, &cmbwrc); - TRACE("EX window=(%s) client=(%s) CB wnd=(%s)\n", - wine_dbgstr_rect(&wnrc1), wine_dbgstr_rect(&clrc1), - wine_dbgstr_rect(&cmbwrc)); - SetWindowPos(infoPtr->hwndCombo, HWND_TOP, - 0, 0, wnrc1.right-wnrc1.left, wnrc1.bottom-wnrc1.top, + GetWindowRect(hwnd, &win_rect); + + if (TRACE_ON(comboex)) { + RECT client, rect; + GetClientRect(hwnd, &client); + GetWindowRect(infoPtr->hwndCombo, &rect); + TRACE("EX window=(%s) client=(%s) CB wnd=(%s)\n", + wine_dbgstr_rect(&win_rect), wine_dbgstr_rect(&client), + wine_dbgstr_rect(&rect)); + } + SetWindowPos(infoPtr->hwndCombo, HWND_TOP, 0, 0, + win_rect.right - win_rect.left, win_rect.bottom - win_rect.top, SWP_NOACTIVATE | SWP_NOREDRAW); - GetWindowRect(infoPtr->hwndCombo, &cmbwrc); - TRACE("CB window=(%s)\n", wine_dbgstr_rect(&cmbwrc)); - SetWindowPos(hwnd, HWND_TOP, - 0, 0, cmbwrc.right-cmbwrc.left, cmbwrc.bottom-cmbwrc.top, + GetWindowRect(infoPtr->hwndCombo, &win_rect); + TRACE("CB window=(%s)\n", wine_dbgstr_rect(&win_rect)); + SetWindowPos(hwnd, HWND_TOP, 0, 0, + win_rect.right - win_rect.left, win_rect.bottom - win_rect.top, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE); COMBOEX_AdjustEditPos (infoPtr); @@ -1357,12 +1363,11 @@ static LRESULT COMBOEX_DrawItem (const COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT con (dis->itemAction == ODA_DRAWENTIRE)) { /* draw of edit control data */ - /* testing */ - { + if (TRACE_ON(comboex)) { RECT exrc, cbrc, edrc; GetWindowRect (infoPtr->hwndSelf, &exrc); GetWindowRect (infoPtr->hwndCombo, &cbrc); - edrc.left=edrc.top=edrc.right=edrc.bottom=-1; + edrc.left = edrc.top = edrc.right = edrc.bottom = -1; if (infoPtr->hwndEdit) GetWindowRect (infoPtr->hwndEdit, &edrc); TRACE("window rects ex=(%s), cb=(%s), ed=(%s)\n", wine_dbgstr_rect(&exrc), wine_dbgstr_rect(&cbrc),

1 0

Nikolay Sivov : comctl32/rebar: Avoid empty band range when changing layout .
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 02c06f0d6662d5490761c7c43418b34e91228e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c06f0d6662d5490761c7c43… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 24 00:54:29 2009 +0300 comctl32/rebar: Avoid empty band range when changing layout. --- dlls/comctl32/rebar.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 90e79d5..021bc16 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1377,7 +1377,8 @@ REBAR_Layout(REBAR_INFO *infoPtr) xMin += lpBand->cxMinBand; } - REBAR_LayoutRow(infoPtr, rowstart, infoPtr->uNumBands, adjcx, &row, &yPos); + if (rowstart < infoPtr->uNumBands) + REBAR_LayoutRow(infoPtr, rowstart, infoPtr->uNumBands, adjcx, &row, &yPos); if (!(infoPtr->dwStyle & RBS_VARHEIGHT)) yPos = REBAR_SetBandsHeight(infoPtr, first_visible(infoPtr), infoPtr->uNumBands, 0);

1 0

Eric Pouech : winedump: Add support for long section names ( at least used by MinGW).
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 1c238c77f7679fc2122c07f2e1a05ab0a40f8e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c238c77f7679fc2122c07f2e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Dec 23 22:05:44 2009 +0100 winedump: Add support for long section names (at least used by MinGW). --- tools/winedump/lib.c | 2 +- tools/winedump/pe.c | 22 ++++++++++++++++++---- tools/winedump/winedump.h | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index 85f305d..de5184a 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -88,7 +88,7 @@ static void dump_long_import(const void *base, const IMAGE_SECTION_HEADER *ish, for (i = 0; i < num_sect; i++) { if (globals.do_dumpheader) - dump_section(&ish[i]); + dump_section(&ish[i], NULL); if (globals.do_dump_rawdata) { diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index a79593c..1f9c5a7 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -371,10 +371,14 @@ static void dump_pe_header(void) dump_optional_header((const IMAGE_OPTIONAL_HEADER32*)&PE_nt_headers->OptionalHeader, PE_nt_headers->FileHeader.SizeOfOptionalHeader); } -void dump_section(const IMAGE_SECTION_HEADER *sectHead) +void dump_section(const IMAGE_SECTION_HEADER *sectHead, const char* strtable) { - printf(" %-8.8s VirtSize: 0x%08x VirtAddr: 0x%08x\n", - sectHead->Name, sectHead->Misc.VirtualSize, sectHead->VirtualAddress); + if (strtable && sectHead->Name[0] == '/') /* long section name */ + printf(" %.8s (%s)", sectHead->Name, strtable + atoi((const char*)sectHead->Name + 1)); + else + printf(" %-8.8s", sectHead->Name); + printf(" VirtSize: 0x%08x VirtAddr: 0x%08x\n", + sectHead->Misc.VirtualSize, sectHead->VirtualAddress); printf(" raw data offs: 0x%08x raw data size: 0x%08x\n", sectHead->PointerToRawData, sectHead->SizeOfRawData); printf(" relocation offs: 0x%08x relocations: 0x%08x\n", @@ -448,11 +452,21 @@ static void dump_sections(const void *base, const void* addr, unsigned num_sect) { const IMAGE_SECTION_HEADER* sectHead = addr; unsigned i; + const char* strtable; + + if (PE_nt_headers->FileHeader.PointerToSymbolTable && PE_nt_headers->FileHeader.NumberOfSymbols) + { + /* FIXME: no way to get strtable size */ + strtable = (const char*)base + + PE_nt_headers->FileHeader.PointerToSymbolTable + + PE_nt_headers->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + } + else strtable = NULL; printf("Section Table\n"); for (i = 0; i < num_sect; i++, sectHead++) { - dump_section(sectHead); + dump_section(sectHead, strtable); if (globals.do_dump_rawdata) { diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 9ad20a5..1f49369 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -234,7 +234,7 @@ const char* get_guid_str(const GUID* guid); const char* get_symbol_str(const char* symname); void dump_file_header(const IMAGE_FILE_HEADER *); void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *, UINT); -void dump_section(const IMAGE_SECTION_HEADER *); +void dump_section(const IMAGE_SECTION_HEADER *, const char* strtable); enum FileSig get_kind_exec(void); void dos_dump( void );

1 0

Jeremy White : winspool: Test for failure using correct size.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 09401dd4b14cd7164e767d025f4d52c85a8dcaad URL: http://source.winehq.org/git/wine.git/?a=commit;h=09401dd4b14cd7164e767d025… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Dec 23 11:21:17 2009 -0600 winspool: Test for failure using correct size. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8e4d714..a2dd798 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4447,7 +4447,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, if(pcbNeeded) *pcbNeeded = size + needed; TRACE("buffer space %d required %d\n", cbBuf, size + needed); - if(cbBuf >= needed) return TRUE; + if(cbBuf >= size + needed) return TRUE; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; }

1 0

Jeremy White : winspool: Correctly zero printer driver buffer on failure, with tests.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: b806e13001b6908e3aa1180a8a32c55431e79f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b806e13001b6908e3aa1180a8… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Dec 23 11:21:32 2009 -0600 winspool: Correctly zero printer driver buffer on failure, with tests. --- dlls/winspool.drv/info.c | 7 ++++++- dlls/winspool.drv/tests/info.c | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a2dd798..4993a78 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4388,6 +4388,8 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, TRACE("(%p,%s,%d,%p,%d,%p)\n",hPrinter,debugstr_w(pEnvironment), Level,pDriverInfo,cbBuf, pcbNeeded); + if (cbBuf > 0) + ZeroMemory(pDriverInfo, cbBuf); if (!(name = get_opened_printer_name(hPrinter))) { SetLastError(ERROR_INVALID_HANDLE); @@ -4465,8 +4467,11 @@ BOOL WINAPI GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, LPBYTE buf = NULL; if (cbBuf) + { + ZeroMemory(pDriverInfo, cbBuf); buf = HeapAlloc(GetProcessHeap(), 0, cbBuf); - + } + pwstrEnvW = asciitounicode(&pEnvW, pEnvironment); ret = GetPrinterDriverW(hPrinter, pwstrEnvW, Level, buf, cbBuf, pcbNeeded); diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 5ab0ccd..f3b2d78 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2414,6 +2414,14 @@ static void test_GetPrinterDriver(void) /* XP allocates memory for both ANSI and unicode names */ ok(filled >= calculated,"calculated %d != filled %d\n", calculated, filled); + + /* Obscure test - demonstrate that Windows zero fills the buffer, even on failure */ + if (di_2->pDataFile) + { + ret = GetPrinterDriver(hprn, NULL, level, buf, needed - 2, &filled); + ok(!ret, "level %d: GetPrinterDriver succeeded with less buffer than it should\n", level); + ok(di_2->pDataFile == NULL, "Even on failure, GetPrinterDriver clears the buffer to zeros\n"); + } } HeapFree(GetProcessHeap(), 0, buf);

1 0