wine-commits March 2007

wine-commits@winehq.org

3 participants
844 discussions

Farshad Agah : comctl32: monthcal: Correct the return value in MCM_SETFIRSTDAYOFWEEK.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 86ea6b582088ea347c712be333b85f41aadb1026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ea6b582088ea347c712be33… Author: Farshad Agah <f_agah(a)yahoo.com> Date: Fri Mar 16 00:34:36 2007 -0700 comctl32: monthcal: Correct the return value in MCM_SETFIRSTDAYOFWEEK. --- dlls/comctl32/monthcal.c | 20 +++++---- dlls/comctl32/tests/monthcal.c | 89 +++++++++++++++++++++++++++------------ 2 files changed, 73 insertions(+), 36 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ded5c5c..9f25689 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -897,19 +897,23 @@ static LRESULT MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, LPARAM lParam) { int prev = infoPtr->firstDay; + int localFirstDay; WCHAR buf[40]; TRACE("day %ld\n", lParam); - if((lParam >= 0) && (lParam < 7)) { - infoPtr->firstDay = (int)lParam; - } + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK, buf, countof(buf)); + TRACE("%s %d\n", debugstr_w(buf), strlenW(buf)); + + localFirstDay = atoiW(buf); + + if(lParam == -1) + infoPtr->firstDay = MAKELONG(localFirstDay, FALSE); + else if(lParam >= 7) + infoPtr->firstDay = MAKELONG(localFirstDay, TRUE); else - { - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK, buf, countof(buf)); - TRACE("%s %d\n", debugstr_w(buf), strlenW(buf)); - infoPtr->firstDay = (atoiW(buf)+1)%7; - } + infoPtr->firstDay = MAKELONG(lParam, TRUE); + return prev; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 5552ba9..47648a1 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -135,26 +135,56 @@ static const struct message monthcal_curr_date_seq[] = { static const struct message monthcal_first_day_seq[] = { { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, -5}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 1}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, -4}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 2}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, -3}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 3}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, -2}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 4}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, -1}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 1}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 2}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 5}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 3}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 4}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 5}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 6}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 7}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 8}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 9}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 10}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 11}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, { 0 } }; @@ -583,40 +613,43 @@ static void test_monthcal_currDate(HWND hwnd) static void test_monthcal_firstDay(HWND hwnd) { - int res, fday, i, temp; + int res, fday, i, prev; TCHAR b[128]; LCID lcid = LOCALE_USER_DEFAULT; flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Setter and Getters for first day of week */ - todo_wine { - /* check for locale first day */ - if(GetLocaleInfo(lcid, LOCALE_IFIRSTDAYOFWEEK, b, 128)){ - fday = atoi(b); - res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); - expect(fday, res); - res = SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, (LPARAM) 0); - expect(fday, res); - }else{ - skip("Cannot retrieve first day of the week\n"); - SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, (LPARAM) 0); - } + /* check for locale first day */ + if(GetLocaleInfo(lcid, LOCALE_IFIRSTDAYOFWEEK, b, 128)){ + fday = atoi(b); + res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); + expect(fday, res); + prev = fday; - /* check for days of the week*/ - for (i = 1, temp = 0x10000; i < 7; i++, temp++){ - res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); - expect(temp, res); + /* checking for the values that actually will be stored as */ + /* current first day when we set a new value */ + for (i = -5; i < 12; i++){ res = SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, (LPARAM) i); - expect(temp, res); + expect(prev, res); + res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); + prev = res; + + if (i == -1){ + expect(MAKELONG(fday, FALSE), res); + }else if (i >= 7){ + expect(MAKELONG(fday, TRUE), res); + }else{ + expect(MAKELONG(i, TRUE), res); + } } - /* check for returning to the original first day */ - res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); - todo_wine {expect(temp, res);} + ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_first_day_seq, "monthcal firstDay", FALSE); + + }else{ + skip("Cannot retrieve first day of the week\n"); } - ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_first_day_seq, "monthcal firstDay", FALSE); } static void test_monthcal_unicode(HWND hwnd)

1 0

Alessandro Pignotti : dplayx: DirectPlay should keep track of the user count.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 9d69d53335a18e6d9a6236689151c5a591ff09ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d69d53335a18e6d9a6236689… Author: Alessandro Pignotti <alex.pigna(a)inventati.org> Date: Thu Mar 15 17:10:25 2007 +0100 dplayx: DirectPlay should keep track of the user count. --- dlls/dplayx/dplay.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 46a4dc7..9889283 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1227,6 +1227,9 @@ lpPlayerData DP_CreatePlayer( IDirectPlay2Impl* This, LPDPID lpid, TRACE( "Created player id 0x%08x\n", *lpid ); + if( ~dwFlags & DPLAYI_PLAYER_SYSPLAYER ) + This->dp2->lpSessionDesc->dwCurrentPlayers++; + return lpPData; } @@ -1478,8 +1481,9 @@ static HRESULT WINAPI DP_IF_CreatePlayer */ } - /* FIXME: Should we be storing these dwFlags or the creation ones? */ - lpPData = DP_CreatePlayer( This, lpidPlayer, lpPlayerName, dwFlags, + /* We pass creation flags, so we can distinguish sysplayers and not count them in the current + player total */ + lpPData = DP_CreatePlayer( This, lpidPlayer, lpPlayerName, dwCreateFlags, hEvent, bAnsi ); if( lpPData == NULL )

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

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

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: 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

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

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

Rob Shearman : advapi32: Fix a failing test on Windows caused by the existence of one SID that always has no associated account .
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: c2b05d32f09b57cbfa6b3eeb2c4f6af67e3812fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b05d32f09b57cbfa6b3eeb2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 16 01:39:47 2007 +0000 advapi32: Fix a failing test on Windows caused by the existence of one SID that always has no associated account. --- dlls/advapi32/tests/security.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3e8459e..4de2476 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -896,8 +896,10 @@ static void test_token_attr(void) Name[0] = '\0'; Domain[0] = '\0'; ret = LookupAccountSid(NULL, Groups->Groups[i].Sid, Name, &NameLength, Domain, &DomainLength, &SidNameUse); - ok(ret, "LookupAccountSid(%s) failed with error %d\n", SidString, GetLastError()); - trace("\t%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); + if (ret) + trace("\t%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); + else + trace("\t%s, attr: 0x%08x LookupAccountSid failed with error %d\n", SidString, Groups->Groups[i].Attributes, GetLastError()); LocalFree(SidString); } HeapFree(GetProcessHeap(), 0, Groups);

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2007