wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Hans Leidekker : msi/tests: Determine Wow64 mode just once.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 3d33fb93cc8508b494604a13dd77a8ffa30025d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d33fb93cc8508b494604a13d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 11 12:09:11 2010 +0200 msi/tests: Determine Wow64 mode just once. --- dlls/msi/tests/automation.c | 9 ++++- dlls/msi/tests/install.c | 74 ++++++++++++++++++------------------------- dlls/msi/tests/msi.c | 58 +++++++++++++--------------------- dlls/msi/tests/package.c | 18 +++++----- dlls/msi/tests/source.c | 23 ++++++------- 5 files changed, 80 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d33fb93cc8508b494604…

1 0

Jeff Latimer : iphlpapi: Use Windows rather than Unix values to determine family.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 2b6ab9eb860523e0b3b1507c6d915f9a68319573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6ab9eb860523e0b3b1507c6… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Mon Oct 11 19:56:07 2010 +1100 iphlpapi: Use Windows rather than Unix values to determine family. --- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 1329466..f14f337 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -723,7 +723,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD SOCKET_ADDRESS *v6addrs = NULL; PMIB_IPFORWARDTABLE routeTable = NULL; - if (family == AF_INET) + if (family == WS_AF_INET) { ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); @@ -733,9 +733,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD num_v4_gateways = count_v4_gateways(index, routeTable); } } - else if (family == AF_INET6) + else if (family == WS_AF_INET6) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); - else if (family == AF_UNSPEC) + else if (family == WS_AF_UNSPEC) { ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0);

1 0

Jeff Cook : winealsa.drv: Rewrite channel counting for additional readability and circumvention of a couple of crashes .
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 0b4c99cd7de02bf6c896f2e2bc87b49a03356b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4c99cd7de02bf6c896f2e2b… Author: Jeff Cook <jeff(a)deserettechnology.com> Date: Sun Oct 10 22:10:53 2010 -0600 winealsa.drv: Rewrite channel counting for additional readability and circumvention of a couple of crashes. --- dlls/winealsa.drv/mixer.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 6a7d14b..93c8927 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -491,7 +491,10 @@ static void ALSA_MixerInit(void) for (elem = snd_mixer_first_elem(mixdev[mixnum].mix); elem; elem = snd_mixer_elem_next(elem)) if (!strcasecmp(snd_mixer_selem_get_name(elem), "Master") && !mastelem) + { mastelem = elem; + ++(mixdev[mixnum].chans); + } else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Capture") && !captelem) captelem = elem; else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Mic") && !micelem && !mastelem && total_elems == 1) @@ -517,13 +520,12 @@ static void ALSA_MixerInit(void) headelem = elem; else if (!strcasecmp(snd_mixer_selem_get_name(elem), "PCM") && !pcmelem) pcmelem = elem; - else - ++(mixdev[mixnum].chans); + ++(mixdev[mixnum].chans); } } - /* Add master channel, uncounted channels and an extra for capture */ - mixdev[mixnum].chans += !!mastelem + !!headelem + !!pcmelem + 1; + /* Add dummy capture channel, wanted by Windows */ + mixdev[mixnum].chans += 1; /* If there is only 'Capture' and 'Master', this device is not worth it */ if (mixdev[mixnum].chans == 2)

1 0

Jeff Cook : winealsa.drv: Only set micelem as master if there are no other elems on this card.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: e96d3d538a33785b1ac4f505ab7643864a6d778c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96d3d538a33785b1ac4f505a… Author: Jeff Cook <jeff(a)deserettechnology.com> Date: Sun Oct 10 22:24:45 2010 -0600 winealsa.drv: Only set micelem as master if there are no other elems on this card. --- dlls/winealsa.drv/mixer.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index ffa0292..6a7d14b 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -431,7 +431,7 @@ static void ALSA_MixerInit(void) info = HeapAlloc( GetProcessHeap(), 0, snd_ctl_card_info_sizeof()); for (x = 0; x < MAX_MIXERS; ++x) { - int card, err, capcontrols = 0; + int card, err, capcontrols, total_elems = 0; char cardind[6], cardname[10]; snd_ctl_t *ctl; @@ -486,12 +486,15 @@ static void ALSA_MixerInit(void) /* First, lets see what's available.. * If there are multiple Master or Captures, all except 1 will be added as slaves */ + total_elems = snd_mixer_get_count(mixdev[mixnum].mix); + TRACE("Total elems: %d\n", total_elems); + for (elem = snd_mixer_first_elem(mixdev[mixnum].mix); elem; elem = snd_mixer_elem_next(elem)) if (!strcasecmp(snd_mixer_selem_get_name(elem), "Master") && !mastelem) mastelem = elem; else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Capture") && !captelem) captelem = elem; - else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Mic") && !micelem && !mastelem) + else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Mic") && !micelem && !mastelem && total_elems == 1) /* this is what snd-usb-audio mics look like; just a Mic control and that's it.*/ micelem = elem; else if (!blacklisted(elem))

1 0

James McKenzie : gdi32: Correct typo in comment.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: c3dfc7b834b0167415455ecebf76919a8476221b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3dfc7b834b0167415455eceb… Author: James McKenzie <jjmckenzie51(a)earthlink.net> Date: Sun Oct 10 18:44:36 2010 -0700 gdi32: Correct typo in comment. --- dlls/gdi32/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 133681c..b247722 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -318,7 +318,7 @@ HFONT WINAPI CreateFontIndirectExA( const ENUMLOGFONTEXDVA *penumexA ) } /*********************************************************************** - * CreateFontIndirectExA (GDI32.@) + * CreateFontIndirectExW (GDI32.@) */ HFONT WINAPI CreateFontIndirectExW( const ENUMLOGFONTEXDVW *penumex ) {

1 0

Louis Lenders : advapi32: Add stub for QueryTraceW.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 2ecb586005c0f57fce6948d99b0e1fbb01ed231f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecb586005c0f57fce6948d99… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 10 21:22:29 2010 +0200 advapi32: Add stub for QueryTraceW. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 7521294..0e27e74 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -459,7 +459,7 @@ @ stdcall QueryServiceStatus(long ptr) @ stdcall QueryServiceStatusEx (long long ptr long ptr) # @ stub QueryTraceA -# @ stub QueryTraceW +@ stdcall QueryTraceW(int64 wstr ptr) # @ stub QueryUsersOnEncryptedFile @ stdcall QueryWindows31FilesMigration(long) # @ stub ReadEncryptedFileRaw diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index d048eed..26be42e 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -817,3 +817,12 @@ ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID co FIXME("%s, %p, %p, %p\n", debugstr_guid(provider), callback, context, handle); return ERROR_CALL_NOT_IMPLEMENTED; } + +/****************************************************************************** + * QueryTraceW [ADVAPI32.@] + */ +ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) +{ + FIXME("%s %s %p: stub\n", wine_dbgstr_longlong(handle), debugstr_w(sessionname), properties); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Louis Lenders : user32/tests: Test FindWindowEx for empty window title.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 62b9df9031b08b17fb0e8fe4569da7137b4d4c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b9df9031b08b17fb0e8fe45… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 10 21:07:53 2010 +0200 user32/tests: Test FindWindowEx for empty window title. --- dlls/user32/tests/win.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 50c5be5..12f2e1c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6237,6 +6237,25 @@ static void test_rtl_layout(void) DestroyWindow( parent ); } +static void test_FindWindowEx(void) +{ + HWND found; + CHAR title[1]; + + title[0] = 0; + + found = FindWindowExA( 0, 0, "MainWindowClass", title ); + ok( found == NULL, "expected a NULL hwnd\n" ); + found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); + ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); + /* test behaviour with a window title that is an empty character */ + found = FindWindowExA( 0, 0, "Shell_TrayWnd", title ); +todo_wine + ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); + found = FindWindowExA( 0, 0, "Shell_TrayWnd", NULL ); + ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -6332,6 +6351,7 @@ START_TEST(win) test_Expose(); test_layered_window(); + test_FindWindowEx(); test_SetForegroundWindow(hwndMain); test_shell_window(); test_handles( hwndMain );

1 0

Eric Pouech : dbghelp: Proper support and definition for S_REGREL_V3.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 8d981b87f18cb53de2639d0ca32e544d6c09d4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d981b87f18cb53de2639d0ca… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 9 08:51:47 2010 +0200 dbghelp: Proper support and definition for S_REGREL_V3. --- dlls/dbghelp/msc.c | 14 +++++++------- include/wine/mscvpdb.h | 6 +++--- tools/winedump/msc.c | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index baab45d..90e832c 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1669,16 +1669,16 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root codeview_get_type(sym->stack_v3.symtype, FALSE), sym->stack_v3.name); break; - case S_BPREL_XXXX_V3: + case S_REGREL_V3: loc.kind = loc_regrel; - loc.reg = 0; /* FIXME */ - loc.offset = sym->stack_xxxx_v3.offset; - WARN("Supposed stack variable %s (%d)\n", sym->stack_xxxx_v3.name, sym->stack_xxxx_v3.unknown); + loc.reg = sym->regrel_v3.reg; + loc.offset = sym->regrel_v3.offset; symt_add_func_local(msc_dbg->module, curr_func, - sym->stack_xxxx_v3.offset > 0 ? DataIsParam : DataIsLocal, + /* FIXME this is wrong !!! */ + sym->regrel_v3.offset > 0 ? DataIsParam : DataIsLocal, &loc, block, - codeview_get_type(sym->stack_xxxx_v3.symtype, FALSE), - sym->stack_xxxx_v3.name); + codeview_get_type(sym->regrel_v3.symtype, FALSE), + sym->regrel_v3.name); break; case S_REGISTER_V1: diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index c9bdb4f..2d5b9c9 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1380,9 +1380,9 @@ union codeview_symbol short int id; /* Always S_BPREL_V3 */ int offset; /* Stack offset relative to BP */ unsigned int symtype; - unsigned short unknown; + unsigned short reg; char name[1]; - } stack_xxxx_v3; + } regrel_v3; struct { @@ -1646,7 +1646,7 @@ union codeview_symbol #define S_PUB_V3 0x110E #define S_LPROC_V3 0x110F #define S_GPROC_V3 0x1110 -#define S_BPREL_XXXX_V3 0x1111 /* not really understood, but looks like bprel... */ +#define S_REGREL_V3 0x1111 #define S_MSTOOL_V3 0x1116 /* compiler command line options and build information */ #define S_PUB_FUNC1_V3 0x1125 /* didn't get the difference between the two */ #define S_PUB_FUNC2_V3 0x1127 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index ccd4664..c917309 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1059,10 +1059,10 @@ int codeview_dump_symbols(const void* root, unsigned long size) sym->stack_v3.symtype, curr_func); break; - case S_BPREL_XXXX_V3: - printf("\tS-BP-relative XXXX V3: '%s' @%d type:%x unkn:%x (in %s)\n", - sym->stack_xxxx_v3.name, sym->stack_xxxx_v3.offset, - sym->stack_xxxx_v3.symtype, sym->stack_xxxx_v3.unknown, curr_func); + case S_REGREL_V3: + printf("\tS-Reg-relative V3: '%s' @%d type:%x reg:%x (in %s)\n", + sym->regrel_v3.name, sym->regrel_v3.offset, + sym->regrel_v3.symtype, sym->regrel_v3.reg, curr_func); break; case S_REGISTER_V1:

1 0

Eric Pouech : dbghelp: Ensure the stab_nlist structure is usable on 64bit systems.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: fac5abc551c58f7c16a5caea801eafe26a404099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac5abc551c58f7c16a5caea8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 9 08:51:41 2010 +0200 dbghelp: Ensure the stab_nlist structure is usable on 64bit systems. --- dlls/dbghelp/stabs.c | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 837e213..8ef177c 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -110,16 +110,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); struct stab_nlist { - union - { - char* n_name; - struct stab_nlist* n_next; - long n_strx; - } n_un; + unsigned n_strx; unsigned char n_type; char n_other; short n_desc; - unsigned long n_value; + unsigned n_value; }; static void stab_strcpy(char* dest, int sz, const char* source) @@ -1315,7 +1310,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, stabbuff[0] = '\0'; for (i = 0; i < nstab; i++, stab_ptr++) { - ptr = strs + stab_ptr->n_un.n_strx; + ptr = strs + stab_ptr->n_strx; if ((ptr > strs_end) || (ptr + strlen(ptr) > strs_end)) { WARN("Bad stabs string %p\n", ptr); @@ -1421,7 +1416,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, loc.reg = 0; /* FIXME */ loc.offset = stab_ptr->n_value; symt_add_func_local(module, curr_func, - (long)stab_ptr->n_value >= 0 ? DataIsParam : DataIsLocal, + (int)stab_ptr->n_value >= 0 ? DataIsParam : DataIsLocal, &loc, NULL, param_type, symname); symt_add_function_signature_parameter(module, (struct symt_function_signature*)curr_func->type, @@ -1471,7 +1466,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case 35: case 36: loc.reg = CV_REG_MM0 + stab_ptr->n_value - 29; break; default: - FIXME("Unknown register value (%lu)\n", stab_ptr->n_value); + FIXME("Unknown register value (%u)\n", stab_ptr->n_value); loc.reg = CV_REG_NONE; break; } @@ -1617,7 +1612,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case N_EXCL: if (stabs_add_include(stabs_find_include(ptr, stab_ptr->n_value)) < 0) { - ERR("Excluded header not found (%s,%ld)\n", ptr, stab_ptr->n_value); + ERR("Excluded header not found (%s,%d)\n", ptr, stab_ptr->n_value); module_reset_debug_info(module); ret = FALSE; goto done; @@ -1663,8 +1658,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, break; } stabbuff[0] = '\0'; - TRACE("0x%02x %lx %s\n", - stab_ptr->n_type, stab_ptr->n_value, debugstr_a(strs + stab_ptr->n_un.n_strx)); + TRACE("0x%02x %x %s\n", + stab_ptr->n_type, stab_ptr->n_value, debugstr_a(strs + stab_ptr->n_strx)); } module->module.SymType = SymDia; module->module.CVSig = 'S' | ('T' << 8) | ('A' << 16) | ('B' << 24);

1 0

Eric Pouech : dbghelp: Fix some relocation errors for debug formats out of ELF files.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 854379bbaa2ef25d92a9e3358c0f8b9047556d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=854379bbaa2ef25d92a9e3358… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 9 08:51:33 2010 +0200 dbghelp: Fix some relocation errors for debug formats out of ELF files. --- dlls/dbghelp/elf_module.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 8b03eaa..a0acb8f 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -636,7 +636,7 @@ static int elf_new_wine_thunks(struct module* module, const struct hash_table* h { if (ste->used) continue; - addr = module->format_info[DFI_ELF]->u.elf_info->elf_addr + ste->symp->st_value; + addr = module->reloc_delta + ste->symp->st_value; j = elf_is_in_thunk_area(ste->symp->st_value, thunks); if (j >= 0) /* thunk found */ @@ -728,7 +728,7 @@ static int elf_new_public_symbols(struct module* module, const struct hash_table while ((ste = hash_table_iter_up(&hti))) { symt_new_public(module, ste->compiland, ste->ht_elt.name, - module->format_info[DFI_ELF]->u.elf_info->elf_addr + ste->symp->st_value, + module->reloc_delta + ste->symp->st_value, ste->symp->st_size); } return TRUE; @@ -926,8 +926,7 @@ static BOOL elf_load_debug_info_from_map(struct module* module, image_unmap_section(&stab_sect); image_unmap_section(&stabstr_sect); } - lret = dwarf2_parse(module, module->format_info[DFI_ELF]->u.elf_info->elf_addr, - thunks, fmap); + lret = dwarf2_parse(module, module->reloc_delta, thunks, fmap); ret = ret || lret; } if (strstrW(module->module.ModuleName, S_ElfW) ||

1 0

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 October 2010