March 2007 - Wine-commits - list.winehq.org

Keith Stevens : comctl32: trackbar: Correctly set lSetMin and lSelMax.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: de608991eacc944d63ae45bb418813e7f9af09cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=de608991eacc944d63ae45bb4… Author: Keith Stevens <fozziethebeat(a)gmail.com> Date: Thu Mar 15 22:04:45 2007 -0700 comctl32: trackbar: Correctly set lSetMin and lSelMax. Modify the behavior when the messages TBM_SETSEL, TBM_SETSELSTART, and TBM_SETSELEND are sent and TBS_ENABLESELRANGE is not set. When the style TBS_ENABLESELRANGE is not set, Windows observed behavior is to set the Selection Start and End values to 0, rather than leave them unchanged. --- dlls/comctl32/tests/trackbar.c | 16 ++++------------ dlls/comctl32/trackbar.c | 13 ++++++++++--- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index bb2ccdb..3cecd88 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -902,16 +902,12 @@ static void test_ignore_selection(HWND hWndTrackbar){ /* test TBM_SETSEL ensure that it is ignored */ SendMessage(hWndTrackbar, TBM_SETSEL, TRUE, MAKELONG(0,10)); r = SendMessage(hWndTrackbar, TBM_GETSELEND, 0,0); - todo_wine{ - expect(0, r); - } + expect(0, r); r = SendMessage(hWndTrackbar, TBM_GETSELSTART, 0,0); expect(0, r); SendMessage(hWndTrackbar, TBM_SETSEL, FALSE, MAKELONG(0,10)); r = SendMessage(hWndTrackbar, TBM_GETSELEND, 0,0); - todo_wine{ - expect(0, r); - } + expect(0, r); r = SendMessage(hWndTrackbar, TBM_GETSELSTART, 0,0); expect(0, r); @@ -921,9 +917,7 @@ static void test_ignore_selection(HWND hWndTrackbar){ expect(0, r); SendMessage(hWndTrackbar, TBM_SETSELEND, TRUE, 10); r = SendMessage(hWndTrackbar, TBM_GETSELEND, 0,0); - todo_wine{ - expect(0,r); - } + expect(0,r); SendMessage(hWndTrackbar, TBM_SETSELEND, FALSE, 0); r = SendMessage(hWndTrackbar, TBM_GETSELEND, 0,0); expect(0, r); @@ -934,9 +928,7 @@ static void test_ignore_selection(HWND hWndTrackbar){ expect(0, r); SendMessage(hWndTrackbar, TBM_SETSELSTART, TRUE, 10); r = SendMessage(hWndTrackbar, TBM_GETSELSTART, 0,0); - todo_wine{ - expect(0,r); - } + expect(0,r); SendMessage(hWndTrackbar, TBM_SETSELSTART, FALSE, 0); r = SendMessage(hWndTrackbar, TBM_GETSELSTART, 0,0); expect(0, r); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index b61e64d..d718e00 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1216,8 +1216,11 @@ TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin) inline static LRESULT TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel) { - if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) + if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){ + infoPtr->lSelMin = 0; + infoPtr->lSelMax = 0; return 0; + } infoPtr->lSelMin = (SHORT)LOWORD(lSel); infoPtr->lSelMax = (SHORT)HIWORD(lSel); @@ -1237,8 +1240,10 @@ TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel) inline static LRESULT TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd) { - if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) + if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){ + infoPtr->lSelMax = 0; return 0; + } infoPtr->lSelMax = lEnd; infoPtr->flags |= TB_SELECTIONCHANGED; @@ -1255,8 +1260,10 @@ TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd) inline static LRESULT TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart) { - if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE) + if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)){ + infoPtr->lSelMin = 0; return 0; + } infoPtr->lSelMin = lStart; infoPtr->flags |=TB_SELECTIONCHANGED;

1 0

Keith Stevens : comctl32: trackbar: Return the correct number of tics for TBM_GETNUMTICS.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 3a58b51aa380b0e87fbcf5843976d92a62988372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a58b51aa380b0e87fbcf5843… Author: Keith Stevens <fozziethebeat(a)gmail.com> Date: Thu Mar 15 22:11:14 2007 -0700 comctl32: trackbar: Return the correct number of tics for TBM_GETNUMTICS. --- dlls/comctl32/tests/trackbar.c | 10 ++++------ dlls/comctl32/trackbar.c | 5 ++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 3cecd88..db3910b 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -775,12 +775,10 @@ static void test_tic_settings(HWND hWndTrackbar){ SendMessage(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(0, 10)); SendMessage(hWndTrackbar, TBM_SETTICFREQ, 2, 0); r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); - todo_wine{ - expect(6, r); - SendMessage(hWndTrackbar, TBM_SETTICFREQ, 5, 0); - r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); - expect(3, r); - } + expect(6, r); + SendMessage(hWndTrackbar, TBM_SETTICFREQ, 5, 0); + r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); + expect(3, r); SendMessage(hWndTrackbar, TBM_SETTICFREQ, 15, 0); r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); expect(2, r); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index d718e00..9858d58 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1042,7 +1042,10 @@ TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr) if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS) return 0; - return infoPtr->uNumTics + 2; + if(infoPtr->uNumTics == 0) + return 2; + else + return infoPtr->uNumTics + 1; }

1 0

Kanit Therdsteerasukdi : comctl32: datetime: Test for out of range dates in DTM_SETSYSTEMTIME only when flag=GDT_VALID.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 7cc0b970b6d1aad9df4481e960073fbe17168c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc0b970b6d1aad9df4481e96… Author: Kanit Therdsteerasukdi <therdste(a)ucla.edu> Date: Thu Mar 15 14:26:59 2007 -0700 comctl32: datetime: Test for out of range dates in DTM_SETSYSTEMTIME only when flag=GDT_VALID. --- dlls/comctl32/datetime.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index c495666..d092308 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -160,18 +160,18 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, SYSTEMTIME *lprgSysT lprgSysTimeArray->wYear, lprgSysTimeArray->wMonth, lprgSysTimeArray->wDay, lprgSysTimeArray->wHour, lprgSysTimeArray->wMinute, lprgSysTimeArray->wSecond); - if (lprgSysTimeArray->wYear < 1601 || lprgSysTimeArray->wYear > 30827 || - lprgSysTimeArray->wMonth < 1 || lprgSysTimeArray->wMonth > 12 || - lprgSysTimeArray->wDayOfWeek > 6 || - lprgSysTimeArray->wDay < 1 || lprgSysTimeArray->wDay > 31 || - lprgSysTimeArray->wHour > 23 || - lprgSysTimeArray->wMinute > 59 || - lprgSysTimeArray->wSecond > 59 || - lprgSysTimeArray->wMilliseconds > 999 - ) - return 0; - if (flag == GDT_VALID) { + if (lprgSysTimeArray->wYear < 1601 || lprgSysTimeArray->wYear > 30827 || + lprgSysTimeArray->wMonth < 1 || lprgSysTimeArray->wMonth > 12 || + lprgSysTimeArray->wDayOfWeek > 6 || + lprgSysTimeArray->wDay < 1 || lprgSysTimeArray->wDay > 31 || + lprgSysTimeArray->wHour > 23 || + lprgSysTimeArray->wMinute > 59 || + lprgSysTimeArray->wSecond > 59 || + lprgSysTimeArray->wMilliseconds > 999 + ) + return 0; + infoPtr->dateValid = TRUE; MONTHCAL_CopyTime (lprgSysTimeArray, &infoPtr->date); SendMessageW (infoPtr->hMonthCal, MCM_SETCURSEL, 0, (LPARAM)(&infoPtr->date));

1 0

Detlef Riekenberg : localspl: Add a comment, why we do not implement AddPort for XcvDataPort.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 6630439f86520e3d279b2e8bdb8719487d3d0e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6630439f86520e3d279b2e8bd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 15 23:03:33 2007 +0100 localspl: Add a comment, why we do not implement AddPort for XcvDataPort. --- dlls/localspl/localmon.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index c98611d..7e13ace 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -459,6 +459,9 @@ DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInput TRACE("(%p, %s, %p, %d, %p, %d, %p)\n", hXcv, debugstr_w(pszDataName), pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); + /* Native localspl.dll crashes on w2k and xp, when XcvDataPort is called + with "AddPort" as command. We do not need to implement this */ + if (!lstrcmpW(pszDataName, cmd_ConfigureLPTPortCommandOKW)) { TRACE("InputData (%d): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData)); res = RegCreateKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_WindowsW, &hroot);

1 0

Paul Vriens : advapi32/tests: RegQueryValueW is not always implemented.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 6598aa502821a1c2fe638f9e2dd3ac20c887a146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6598aa502821a1c2fe638f9e2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 16 08:34:01 2007 +0100 advapi32/tests: RegQueryValueW is not always implemented. --- dlls/advapi32/tests/registry.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 7e689e7..f67364a 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -830,6 +830,11 @@ static void test_reg_query_value(void) valW[0] = '\0'; size = 0; ret = RegQueryValueW(subkey, NULL, valW, &size); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("RegQueryValueW is not implemented\n"); + goto cleanup; + } ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(lstrlenW(valW) == 0, "Expected valW to be untouched\n"); @@ -863,6 +868,7 @@ static void test_reg_query_value(void) ok(!lstrcmpW(valW, expected), "Got wrong value\n"); ok(size == sizeof(expected), "Got wrong size: %d\n", size); +cleanup: RegDeleteKeyA(subkey, ""); }

1 0

Farshad Agah : comctl32: monthcal message sequence test cases.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 4c73411047c721f724cc2bdbf9782a9a368c3557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c73411047c721f724cc2bdbf… Author: Farshad Agah <f_agah(a)yahoo.com> Date: Fri Mar 16 00:32:49 2007 -0700 comctl32: monthcal message sequence test cases. --- dlls/comctl32/tests/monthcal.c | 396 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 390 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c73411047c721f724cc2…

1 0

Peter Oberndorfer : dbghelp: Initialize the elf_section_map in case of failures in elf_find_section.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 7bbb21205005f9b14ca7f58a126b512cb8941420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bbb21205005f9b14ca7f58a1… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Thu Mar 15 21:57:04 2007 +0100 dbghelp: Initialize the elf_section_map in case of failures in elf_find_section. Make sidx signed so sidx < 0 comparisons work. (most of the patch written by Eric Pouech) --- dlls/dbghelp/elf_module.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 62a1ee8..b1b6b74 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -119,7 +119,7 @@ struct elf_file_map struct elf_section_map { struct elf_file_map* fmap; - unsigned sidx; + long sidx; }; struct symtab_elt @@ -178,8 +178,7 @@ static BOOL elf_find_section(struct elf_file_map* fmap, const char* name, if (fmap->shstrtab == ELF_NO_MAP) { struct elf_section_map hdr_esm = {fmap, fmap->elfhdr.e_shstrndx}; - fmap->shstrtab = elf_map_section(&hdr_esm); - if (fmap->shstrtab == ELF_NO_MAP) return FALSE; + if ((fmap->shstrtab = elf_map_section(&hdr_esm)) == ELF_NO_MAP) break; } for (i = 0; i < fmap->elfhdr.e_shnum; i++) { @@ -193,6 +192,8 @@ static BOOL elf_find_section(struct elf_file_map* fmap, const char* name, } fmap = fmap->alternate; } + esm->fmap = NULL; + esm->sidx = -1; return FALSE; }

1 0

Peter Oberndorfer : dbghelp: Fix up load_offset to work in case the load offset is different for real binary and debug link file .
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 25203bd87e2e5851ee5e26a7a576a4083cf976f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25203bd87e2e5851ee5e26a7a… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Thu Mar 15 21:57:06 2007 +0100 dbghelp: Fix up load_offset to work in case the load offset is different for real binary and debug link file. --- dlls/dbghelp/elf_module.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b1b6b74..b8ed892 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1060,6 +1060,13 @@ static BOOL elf_load_debug_info_from_map(struct module* module, const BYTE* dw2_debug_line; const BYTE* dw2_debug_loclist; + /* debug info might have a different base address than .so file + * when elf file is prelinked after splitting off debug info + * adjust symbol base addresses accordingly + */ + unsigned long load_offset = module->elf_info->elf_addr + + fmap->elf_start - debug_sect.fmap->elf_start; + TRACE("Loading Dwarf2 information for %s\n", debugstr_w(module->module.ModuleName)); elf_find_section(fmap, ".debug_str", SHT_NULL, &debug_str_sect); @@ -1075,7 +1082,7 @@ static BOOL elf_load_debug_info_from_map(struct module* module, if (dw2_debug != ELF_NO_MAP && dw2_debug_abbrev != ELF_NO_MAP && dw2_debug_str != ELF_NO_MAP) { /* OK, now just parse dwarf2 debug infos. */ - lret = dwarf2_parse(module, module->elf_info->elf_addr, thunks, + lret = dwarf2_parse(module, load_offset, thunks, dw2_debug, elf_get_map_size(&debug_sect), dw2_debug_abbrev, elf_get_map_size(&debug_abbrev_sect), dw2_debug_str, elf_get_map_size(&debug_str_sect),

1 0

Peter Oberndorfer : dbghelp: Use elf load_offset passed to dwarf2_parse to relocate addresses.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: debcf7fa321849129553b96af6fced4ec5537f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=debcf7fa321849129553b96af… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Thu Mar 15 22:01:06 2007 +0100 dbghelp: Use elf load_offset passed to dwarf2_parse to relocate addresses. This is needed, because symbol addresses in dwarf2 debug info are already relocated. --- dlls/dbghelp/dwarf.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 3f2f5c7..1219522 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -178,6 +178,7 @@ typedef struct dwarf2_parse_context_s const struct elf_thunk_area*thunks; struct sparse_array abbrev_table; struct sparse_array debug_info_table; + unsigned long load_offset; unsigned long ref_offset; unsigned char word_size; } dwarf2_parse_context_t; @@ -1301,7 +1302,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, ext.u.uvalue = 0; symt_new_global_variable(subpgm->ctx->module, subpgm->compiland, name.u.string, !ext.u.uvalue, - subpgm->ctx->module->module.BaseOfImage + loc.offset, + subpgm->ctx->load_offset + loc.offset, 0, param_type); break; default: @@ -1384,7 +1385,7 @@ static void dwarf2_parse_subprogram_label(dwarf2_subprogram_t* subpgm, name.u.string = NULL; loc.kind = loc_absolute; - loc.offset = subpgm->ctx->module->module.BaseOfImage + low_pc.u.uvalue, + loc.offset = subpgm->ctx->load_offset + low_pc.u.uvalue; symt_add_function_point(subpgm->ctx->module, subpgm->func, SymTagLabel, &loc, name.u.string); } @@ -1407,7 +1408,7 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_high_pc, &high_pc)) high_pc.u.uvalue = 0; block = symt_open_func_block(subpgm->ctx->module, subpgm->func, parent_block, - subpgm->ctx->module->module.BaseOfImage + low_pc.u.uvalue - subpgm->func->address, + subpgm->ctx->load_offset + low_pc.u.uvalue - subpgm->func->address, high_pc.u.uvalue - low_pc.u.uvalue); if (di->abbrev->have_child) /** any interest to not have child ? */ @@ -1460,7 +1461,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, high_pc.u.uvalue = 0; block = symt_open_func_block(subpgm->ctx->module, subpgm->func, parent_block, - subpgm->ctx->module->module.BaseOfImage + low_pc.u.uvalue - subpgm->func->address, + subpgm->ctx->load_offset + low_pc.u.uvalue - subpgm->func->address, high_pc.u.uvalue - low_pc.u.uvalue); if (di->abbrev->have_child) /** any interest to not have child ? */ @@ -1547,7 +1548,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, * (not the case for stabs), we just drop Wine's thunks here... * Actual thunks will be created in elf_module from the symbol table */ - if (elf_is_in_thunk_area(ctx->module->module.BaseOfImage + low_pc.u.uvalue, + if (elf_is_in_thunk_area(ctx->load_offset + low_pc.u.uvalue, ctx->thunks) >= 0) return NULL; if (!dwarf2_find_attribute(ctx, di, DW_AT_declaration, &is_decl)) @@ -1561,7 +1562,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, if (!is_decl.u.uvalue) { subpgm.func = symt_new_function(ctx->module, compiland, name.u.string, - ctx->module->module.BaseOfImage + low_pc.u.uvalue, + ctx->load_offset + low_pc.u.uvalue, high_pc.u.uvalue - low_pc.u.uvalue, &sig_type->symt); di->symt = &subpgm.func->symt; @@ -1908,7 +1909,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, end_sequence = TRUE; break; case DW_LNE_set_address: - address = ctx->module->module.BaseOfImage + dwarf2_parse_addr(&traverse); + address = ctx->load_offset + dwarf2_parse_addr(&traverse); break; case DW_LNE_define_file: FIXME("not handled %s\n", traverse.data); @@ -1938,7 +1939,8 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, const dwarf2_comp_unit_t* comp_unit, struct module* module, const struct elf_thunk_area* thunks, - const unsigned char* comp_unit_cursor) + const unsigned char* comp_unit_cursor, + unsigned long load_offset) { dwarf2_parse_context_t ctx; dwarf2_traverse_context_t traverse; @@ -1966,6 +1968,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, ctx.module = module; ctx.word_size = comp_unit->word_size; ctx.thunks = thunks; + ctx.load_offset = load_offset; ctx.ref_offset = comp_unit_cursor - sections[section_debug].address; traverse.start_data = comp_unit_cursor + sizeof(dwarf2_comp_unit_stream_t); @@ -1999,7 +2002,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, if (!dwarf2_find_attribute(&ctx, di, DW_AT_low_pc, &low_pc)) low_pc.u.uvalue = 0; di->symt = &symt_new_compiland(module, - module->module.BaseOfImage + low_pc.u.uvalue, + ctx.load_offset + low_pc.u.uvalue, source_new(module, comp_dir.u.string, name.u.string))->symt; if (di->abbrev->have_child) @@ -2208,7 +2211,7 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, comp_unit.word_size = *(unsigned char*) comp_unit_stream->word_size; dwarf2_parse_compilation_unit(section, &comp_unit, module, - thunks, comp_unit_cursor); + thunks, comp_unit_cursor, load_offset); comp_unit_cursor += comp_unit.length + sizeof(unsigned); } module->module.SymType = SymDia;

1 0

H. Verbeet : d3d9: Add a LockRect test for DXTn formats.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 1283772a26aa388288f2af5cd1b58710d6e4365f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1283772a26aa388288f2af5cd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Mar 15 23:27:58 2007 +0100 d3d9: Add a LockRect test for DXTn formats. --- dlls/d3d9/tests/surface.c | 58 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 42ebf2d..7063a2a 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Henri Verbeet + * Copyright 2006-2007 Henri Verbeet * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -172,6 +172,61 @@ static void test_surface_alignment(IDirect3DDevice9 *device_ptr) } } +/* Since the DXT formats are based on 4x4 blocks, locking works slightly + * different than with regular formats. This patch verifies we return the + * correct memory offsets */ +static void test_lockrect_offset(IDirect3DDevice9 *device) +{ + IDirect3DSurface9 *surface = 0; + const RECT rect = {60, 60, 68, 68}; + D3DLOCKED_RECT locked_rect; + unsigned int expected_offset; + unsigned int offset; + unsigned int i; + BYTE *base; + HRESULT hr; + + const struct { + D3DFORMAT fmt; + const char *name; + unsigned int block_width; + unsigned int block_height; + unsigned int block_size; + } dxt_formats[] = { + {D3DFMT_DXT1, "D3DFMT_DXT1", 4, 4, 8}, + {D3DFMT_DXT2, "D3DFMT_DXT2", 4, 4, 16}, + {D3DFMT_DXT3, "D3DFMT_DXT3", 4, 4, 16}, + {D3DFMT_DXT4, "D3DFMT_DXT4", 4, 4, 16}, + {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, 16}, + }; + + for (i = 0; i < (sizeof(dxt_formats) / sizeof(*dxt_formats)); ++i) { + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, dxt_formats[i].fmt, D3DPOOL_SCRATCH, &surface, 0); + ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (%08x)\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "LockRect failed (%08x)\n", hr); + + base = locked_rect.pBits; + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (%08x)\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); + ok(SUCCEEDED(hr), "LockRect failed (%08x)\n", hr); + + offset = (BYTE *)locked_rect.pBits - base; + expected_offset = (rect.top / dxt_formats[i].block_height) * locked_rect.Pitch + + (rect.left / dxt_formats[i].block_width) * dxt_formats[i].block_size; + todo_wine ok(offset == expected_offset, "Got offset %u, expected offset %u for format %s\n", offset, expected_offset, dxt_formats[i].name); + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (%08x)\n", hr); + + IDirect3DSurface9_Release(surface); + } +} + START_TEST(surface) { HMODULE d3d9_handle; @@ -189,4 +244,5 @@ START_TEST(surface) test_surface_get_container(device_ptr); test_surface_alignment(device_ptr); + test_lockrect_offset(device_ptr); }

1 0