September 2008 - Wine-Commits

Jeremy Newman : WWN
by Jeremy Newman Sept. 4, 2008

Sept. 4, 2008

Module: website Branch: master Commit: 4878377cc77bea178fe0305ea418779e78790fb8 URL: http://source.winehq.org/git/website.git/?a=commit;h=4878377cc77bea178fe030… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Sep 4 13:29:10 2008 -0500 WWN --- wwn/en/wn20080827_351.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wwn/en/wn20080827_351.xml b/wwn/en/wn20080827_351.xml index 13141a1..7d10533 100644 --- a/wwn/en/wn20080827_351.xml +++ b/wwn/en/wn20080827_351.xml @@ -5,7 +5,7 @@ <author contact="http://www.bluesata.com">Zachary Goldberg</author> <issue num="351" date="08/26/2008" /> -<intro> This is the 351 issue of the Wine Weekly News publication. +<intro> This is the 351 issue of the World Wine News publication. Its main goal is to update the community on the status of the patchwatcher and other major august developments. If this issue also helps to spread peace in the world the editor will be very content. It also serves to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> </intro> <stats posts="509" size="764" contrib="113" multiples="63" lastweek="28">

1 0

Zachary Goldberg : Typo Fixes
by Jeremy Newman Sept. 4, 2008

Sept. 4, 2008

Module: website Branch: master Commit: 3f7e13efaebaceeb2ee743adeda72835412d011e URL: http://source.winehq.org/git/website.git/?a=commit;h=3f7e13efaebaceeb2ee743… Author: Zachary Goldberg <zgold550(a)gmail.com> Date: Thu Sep 4 13:26:55 2008 -0500 Typo Fixes --- wwn/en/wn20080827_351.xml | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/wwn/en/wn20080827_351.xml b/wwn/en/wn20080827_351.xml index f79ee96..13141a1 100644 --- a/wwn/en/wn20080827_351.xml +++ b/wwn/en/wn20080827_351.xml @@ -5,7 +5,7 @@ <author contact="http://www.bluesata.com">Zachary Goldberg</author> <issue num="351" date="08/26/2008" /> -<intro> This is the 351 issue of the World Wine News publication. +<intro> This is the 351 issue of the Wine Weekly News publication. Its main goal is to update the community on the status of the patchwatcher and other major august developments. If this issue also helps to spread peace in the world the editor will be very content. It also serves to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> </intro> <stats posts="509" size="764" contrib="113" multiples="63" lastweek="28"> @@ -151,7 +151,7 @@ Alexandre Julliard was out on vacation for a week or so in early August and so w In other news, <a href="http://www.thinkgos.com/gos.php">gOS</a>, the 'good' OS, has announced their most recent beta which includes Wine 1.0 built in. We mentioned building up to 1.0 that we suspected that more and more packagers would incorporate Wine into their products and it seems to be coming to pass. -Dan Kegel sent in a link to a <a href="http://www.linuxjournal.com/node/1007221/results">Linux Journal survey</a> of what linux users use to run their windows applications. As of this publication it looks like Wine is in the lead with approximately 40% of the vote, followed by virtualbox, 'none' and vmware each with 15-20%. +Dan Kegel sent in a link to a <a href="http://www.linuxjournal.com/node/1007221/results">Linux Journal survey</a> of what Linux users use to run their windows applications. As of this publication it looks like Wine is in the lead with approximately 40% of the vote, followed by VirtualBox, 'none' and VMWare each with 15-20%. @@ -228,7 +228,7 @@ template every time a new patch is being built. </quote> -Dan agreed about the security issues, but mentioned that it might be difficult to do. Ambroz offered his assistance as hes familiar with OS architecture. A few days later Ambroz delivered a version 1 patch for patchwatcher to use chroots: +Dan agreed about the security issues, but mentioned that it might be difficult to do. Ambroz offered his assistance as he's familiar with OS architecture. A few days later Ambroz delivered a version 1 patch for patchwatcher to use a chroot: <quote> @@ -252,7 +252,7 @@ continuous building. </quote> -Aside from security concerns there were also concerns about performance, and if it would be possible to simply keep up with the mailing list. In the end it was decided that we would wait and see if its a problem, if so maybe consider using Dan Kegel's parallel test suite patches. +Aside from security concerns there were also concerns about performance, and if it would be possible to simply keep up with the mailing list. In the end it was decided that we would wait and see if it's a problem, if so maybe consider using Dan Kegel's parallel test suite patches. About a week after Dan's original thread he began another one, this time with information about the patchwatcher's online results. @@ -273,7 +273,7 @@ for the next week or so while I work out the kinks. Much praise followed, along with a tiny bit of bikeshed painting about the colors on the site. There also seems to be desire for a way to signal to patchwatcher to ignore the patch. -Finally there remained two issues with the patchwatcher. Patch series's and character set corruptions (from mail clients, from the patchwatcher itself). As of 8/22, exactly 20 days from the introduction of patch watcher Dan proclaims the patchwatcher to be mostly satisfactory: +Finally there remained two issues with the patchwatcher. Patch series and character set corruptions (from mail clients, from the patchwatcher itself). As of 8/22, exactly 20 days from the introduction of patch watcher Dan proclaims the patchwatcher to be mostly satisfactory: <quote> @@ -310,7 +310,7 @@ of Google - so thanks go to them and of course to Dan. You can find the code at <a href="http://repo.or.cz/w/wine/dibeng-hd.git">http://repo.or.cz/w/wine/dibeng-hd.git</a> What's supported ------------------ +--------------- - All dib section depths (including BI_BITFIELD support). - Single pixel solid and dashed pens. - The 16 rop2s. @@ -320,7 +320,7 @@ What's supported - An extensive test suite for all of the above. What needs to be done -------------------- +---------------- - Blitting (eg BitBlt, StretchBlt and StretchDIBits) - I have some hacks for these in my tree. - ExtTextOut @@ -474,7 +474,7 @@ Vitaliy </quote> -A couple devs. wrote in with the notion that its likely a Kernel bug, Dmitry Timoshkov writes in definitively: +A couple devs. wrote in with the notion that it's likely a Kernel bug, Dmitry Timoshkov writes in definitively: <quote> @@ -491,7 +491,7 @@ bug, and should be reported appropriately. > <topic>Development Process</topic> -Dan Kegel pointed out an interesting guide over in linux land about development and community which he felt might be a good role model to have for Wine. +Dan Kegel pointed out an interesting guide over in Linux land about development and community which he felt might be a good role model to have for Wine. <quote> @@ -515,10 +515,10 @@ Discussion following seemed to be positive on the idea of creating such a guide. > <topic>Spore</topic> -So single applications don't usually get much WWN coverage but Spore has been so outstandingly high profile in the gaming world that this may be interesting to many a reader. The <a href="http://appdb.winehq.org/objectManager.php?sClass=version&iId=12558">appdb</a> entry for spore indicates that gamers have had some success with the game. A <a href="http://bugs.winehq.org/show_bug.cgi?id=13988"> very interesting bug</a> was filed with some details on some fixes that are in progress. +So single applications don't usually get much WWN coverage but Spore has been so outstandingly high profile in the gaming world that this may be interesting to many a reader. The <a href="http://appdb.winehq.org/objectManager.php?sClass=version&iId=12558">AppDB</a> entry for Spore indicates that gamers have had some success with the game. A <a href="http://bugs.winehq.org/show_bug.cgi?id=13988"> very interesting bug</a> was filed with some details on some fixes that are in progress. -A patch was submitted to wine-patches but rejected by Stefan Dösinger due to needing some tests. The discussion is slightly technical but not so much that its unreadable. I think its at just the right level to be interesting reading. Andrew Fenn: +A patch was submitted to wine-patches but rejected by Stefan Dösinger due to a lack of conformance tests. The discussion is slightly technical but not so much that its unreadable. I think its at just the right level to be interesting reading. Andrew Fenn: <quote> @@ -724,13 +724,6 @@ start working on it again until mid-september (exams, other projects abbandoned due to GSoC, etc), and then my progress will be much slower. -My project didn't go bad, but I was only able to complete around 40% -of what I expected to do in the begining, it turned out to be bigger -than I thought. I'll try to finish it, but I probably won't be able to -start working on it again until mid-september (exams, other projects -abbandoned due to GSoC, etc), and then my progress will be much -slower. - I really enjoyed this SoC, I was able to update my skills and learn to work in a big project. Thanks to kblin and to all the people who reviewed my code and bothered to suggest improvements :)

1 0

Maarten Lankhorst : winealsa.drv/dsound: Handle underruns better.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 6e90756307bfd5aa6ce2207f9419dabd26f46ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e90756307bfd5aa6ce2207f9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Sep 4 12:07:37 2008 +0200 winealsa.drv/dsound: Handle underruns better. --- dlls/dsound/mixer.c | 50 +++++++++++++++++++++-------------------- dlls/winealsa.drv/dsoutput.c | 4 +++ dlls/winealsa.drv/waveout.c | 3 -- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 7fe9423..3c13e8f 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -826,8 +826,32 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) mixplaypos = DSOUND_bufpos_to_mixpos(device, device->playpos); mixplaypos2 = DSOUND_bufpos_to_mixpos(device, playpos); - /* wipe out just-played sound data */ - if (playpos < device->playpos) { + + /* calc maximum prebuff */ + prebuff_max = (device->prebuf * device->fraglen); + if (!device->hwbuf && playpos + prebuff_max >= device->helfrags * device->fraglen) + prebuff_max += device->buflen - device->helfrags * device->fraglen; + + /* check how close we are to an underrun. It occurs when the writepos overtakes the mixpos */ + prebuff_left = DSOUND_BufPtrDiff(device->buflen, device->mixpos, playpos); + writelead = DSOUND_BufPtrDiff(device->buflen, writepos, playpos); + + /* check for underrun. underrun occurs when the write position passes the mix position + * also wipe out just-played sound data */ + if((prebuff_left > prebuff_max) || (device->state == STATE_STOPPED) || (device->state == STATE_STARTING)){ + if (device->state == STATE_STOPPING || device->state == STATE_PLAYING) + WARN("Probable buffer underrun\n"); + else TRACE("Buffer starting or buffer underrun\n"); + + /* recover mixing for all buffers */ + recover = TRUE; + + /* reset mix position to write position */ + device->mixpos = writepos; + + ZeroMemory(device->mix_buffer, device->mix_buffer_len); + ZeroMemory(device->buffer, device->buflen); + } else if (playpos < device->playpos) { buf1 = device->buffer + device->playpos; buf2 = device->buffer; size1 = device->buflen - device->playpos; @@ -861,34 +885,12 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) } device->playpos = playpos; - /* calc maximum prebuff */ - prebuff_max = (device->prebuf * device->fraglen); - if (!device->hwbuf && playpos + prebuff_max >= device->helfrags * device->fraglen) - prebuff_max += device->buflen - device->helfrags * device->fraglen; - - /* check how close we are to an underrun. It occurs when the writepos overtakes the mixpos */ - prebuff_left = DSOUND_BufPtrDiff(device->buflen, device->mixpos, playpos); - writelead = DSOUND_BufPtrDiff(device->buflen, writepos, playpos); - /* find the maximum we can prebuffer from current write position */ maxq = (writelead < prebuff_max) ? (prebuff_max - writelead) : 0; TRACE("prebuff_left = %d, prebuff_max = %dx%d=%d, writelead=%d\n", prebuff_left, device->prebuf, device->fraglen, prebuff_max, writelead); - /* check for underrun. underrun occurs when the write position passes the mix position */ - if((prebuff_left > prebuff_max) || (device->state == STATE_STOPPED) || (device->state == STATE_STARTING)){ - if (device->state == STATE_STOPPING || device->state == STATE_PLAYING) - WARN("Probable buffer underrun\n"); - else TRACE("Buffer starting or buffer underrun\n"); - - /* recover mixing for all buffers */ - recover = TRUE; - - /* reset mix position to write position */ - device->mixpos = writepos; - } - /* Do we risk an 'underrun' if we don't advance pointer? */ if (writelead/device->fraglen <= ds_snd_queue_min || recover) mustlock = TRUE; diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 4043ccf..15cff5f 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -329,6 +329,8 @@ static HRESULT WINAPI IDsDriverBufferImpl_Lock(PIDSDRIVERBUFFER iface, TRACE("Hit mmap_pos, locking data!\n"); snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &putin); } + else + WARN("mmap_pos (%lu) != writepos (%lu) not locking data!\n", This->mmap_pos, writepos); LeaveCriticalSection(&This->pcm_crst); /* **** */ @@ -551,7 +553,9 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, if (used < 0) { + This->mmap_pos += -used; snd_pcm_forward(This->pcm, -used); + This->mmap_pos %= This->mmap_buflen_frames; used = 0; } diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 9dae6f4..8149a4a 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -575,7 +575,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) unsigned int period_time = 20000; snd_pcm_uframes_t buffer_size; snd_pcm_uframes_t period_size; - snd_pcm_uframes_t boundary; int flags; int err=0; int dir=0; @@ -758,13 +757,11 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) err = snd_pcm_hw_params_get_buffer_size(hw_params, &buffer_size); snd_pcm_sw_params_current(pcm, sw_params); - snd_pcm_sw_params_get_boundary(sw_params, &boundary); EXIT_ON_ERROR( snd_pcm_sw_params_set_start_threshold(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set start threshold"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence size"); EXIT_ON_ERROR( snd_pcm_sw_params_set_avail_min(pcm, sw_params, period_size), MMSYSERR_ERROR, "unable to set avail min"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence threshold"); - EXIT_ON_ERROR( snd_pcm_sw_params_set_stop_threshold(pcm, sw_params, boundary), MMSYSERR_ERROR, "unable to set stop threshold"); EXIT_ON_ERROR( snd_pcm_sw_params(pcm, sw_params), MMSYSERR_ERROR, "unable to set sw params for playback"); #undef EXIT_ON_ERROR

1 0

Alexandre Julliard : xcopy.exe: Get rid of remaining uses of Unicode macros .
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 09874bf78af41ecc3c1ffee4679e3eb491497ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09874bf78af41ecc3c1ffee46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 4 14:08:19 2008 +0200 xcopy.exe: Get rid of remaining uses of Unicode macros. --- programs/xcopy/Makefile.in | 2 +- programs/xcopy/xcopy.c | 56 ++++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09874bf78af41ecc3c1ff…

1 0

Eric Pouech : dbghelp: SymFindFileInPath doesn' t check for the parameters passed when looking in a directory, whatever the dbghelp's options.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 07baf6908054f8020c968ce5ad6acbec5d737741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07baf6908054f8020c968ce5a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Aug 29 21:50:59 2008 +0200 dbghelp: SymFindFileInPath doesn't check for the parameters passed when looking in a directory, whatever the dbghelp's options. --- dlls/dbghelp/path.c | 124 +-------------------------------------------------- 1 files changed, 1 insertions(+), 123 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 8d926cc..3ae4921 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -329,18 +329,6 @@ BOOL WINAPI EnumDirTree(HANDLE hProcess, PCSTR root, PCSTR file, struct sffip { - enum module_type kind; - /* pe: id -> DWORD:timestamp - * two -> size of image (from PE header) - * pdb: id -> PDB signature - * I think either DWORD:timestamp or GUID:guid depending on PDB version - * two -> PDB age ??? - * elf: id -> DWORD:CRC 32 of ELF image (Wine only) - */ - PVOID id; - DWORD two; - DWORD three; - DWORD flags; PFINDFILEINPATHCALLBACKW cb; void* user; }; @@ -353,113 +341,8 @@ struct sffip static BOOL CALLBACK sffip_cb(PCWSTR buffer, PVOID user) { struct sffip* s = (struct sffip*)user; - DWORD size, checksum; - - /* FIXME: should check that id/two/three match the file pointed - * by buffer - */ - switch (s->kind) - { - case DMT_PE: - { - HANDLE hFile, hMap; - void* mapping; - DWORD timestamp; - timestamp = ~(DWORD_PTR)s->id; - size = ~s->two; - hFile = CreateFileW(buffer, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) return FALSE; - if ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != NULL) - { - if ((mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL) - { - IMAGE_NT_HEADERS* nth = RtlImageNtHeader(mapping); - timestamp = nth->FileHeader.TimeDateStamp; - size = nth->OptionalHeader.SizeOfImage; - UnmapViewOfFile(mapping); - } - CloseHandle(hMap); - } - CloseHandle(hFile); - if (timestamp != (DWORD_PTR)s->id || size != s->two) - { - WARN("Found %s, but wrong size or timestamp\n", debugstr_w(buffer)); - return FALSE; - } - } - break; - case DMT_ELF: - if (elf_fetch_file_info(buffer, 0, &size, &checksum)) - { - if (checksum != (DWORD_PTR)s->id) - { - WARN("Found %s, but wrong checksums: %08x %08lx\n", - debugstr_w(buffer), checksum, (DWORD_PTR)s->id); - return FALSE; - } - } - else - { - WARN("Couldn't read %s\n", debugstr_w(buffer)); - return FALSE; - } - break; - case DMT_PDB: - { - struct pdb_lookup pdb_lookup; - char fn[MAX_PATH]; - - WideCharToMultiByte(CP_ACP, 0, buffer, -1, fn, MAX_PATH, NULL, NULL); - pdb_lookup.filename = fn; - - if (!pdb_fetch_file_info(&pdb_lookup)) return FALSE; - switch (pdb_lookup.kind) - { - case PDB_JG: - if (s->flags & SSRVOPT_GUIDPTR) - { - WARN("Found %s, but wrong PDB version\n", debugstr_w(buffer)); - return FALSE; - } - if (pdb_lookup.u.jg.timestamp != (DWORD_PTR)s->id) - { - WARN("Found %s, but wrong signature: %08x %08lx\n", - debugstr_w(buffer), pdb_lookup.u.jg.timestamp, (DWORD_PTR)s->id); - return FALSE; - } - break; - case PDB_DS: - if (!(s->flags & SSRVOPT_GUIDPTR)) - { - WARN("Found %s, but wrong PDB version\n", debugstr_w(buffer)); - return FALSE; - } - if (memcmp(&pdb_lookup.u.ds.guid, (GUID*)s->id, sizeof(GUID))) - { - WARN("Found %s, but wrong GUID: %s %s\n", - debugstr_w(buffer), debugstr_guid(&pdb_lookup.u.ds.guid), - debugstr_guid((GUID*)s->id)); - return FALSE; - } - break; - } - if (pdb_lookup.age != s->two) - { - WARN("Found %s, but wrong age: %08x %08x\n", - debugstr_w(buffer), pdb_lookup.age, s->two); - return FALSE; - } - } - break; - case DMT_DBG: - FIXME("NIY\n"); - break; - default: - FIXME("What the heck??\n"); - return FALSE; - } + if (!s->cb) return TRUE; /* yes, EnumDirTree/do_search and SymFindFileInPath callbacks use the opposite * convention to stop/continue enumeration. sigh. */ @@ -488,15 +371,10 @@ BOOL WINAPI SymFindFileInPathW(HANDLE hProcess, PCWSTR searchPath, PCWSTR full_p if (!pcs) return FALSE; if (!searchPath) searchPath = pcs->search_path; - s.id = id; - s.two = two; - s.three = three; - s.flags = flags; s.cb = cb; s.user = user; filename = file_nameW(full_path); - s.kind = module_get_type_by_name(filename); /* first check full path to file */ if (sffip_cb(full_path, &s))

1 0

Alexandre Julliard : reg.exe: Get rid of remaining uses of Unicode macros.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 90685fcf03ebb71083ccd613de677d2f47d7a2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90685fcf03ebb71083ccd613d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 4 14:08:12 2008 +0200 reg.exe: Get rid of remaining uses of Unicode macros. --- programs/reg/Makefile.in | 1 - programs/reg/reg.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 3dc79fe..17e8f81 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -6,7 +6,6 @@ VPATH = @srcdir@ MODULE = reg.exe APPMODE = -mconsole -municode IMPORTS = advapi32 user32 kernel32 -EXTRADEFS = -DUNICODE C_SRCS = reg.c diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 32b533f..043872c 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -27,7 +27,7 @@ static int reg_printfW(const WCHAR *msg, ...) WCHAR msg_buffer[8192]; va_start(va_args, msg); - wvsprintf(msg_buffer, msg, va_args); + wvsprintfW(msg_buffer, msg, va_args); va_end(va_args); wlen = lstrlenW(msg_buffer); @@ -57,7 +57,7 @@ static int reg_message(int msg, ...) va_list va_args; WCHAR msg_buffer[8192]; - LoadString(GetModuleHandle(NULL), msg, msg_buffer, + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR)); va_start(va_args, msg); reg_printfW(msg_buffer, va_args);

1 0

Eric Pouech : winedbg: Search default debuggee dir for symbol information.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 6986975816c977e621bf76745dc9c4a0f43eebef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6986975816c977e621bf76745… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Aug 30 08:44:48 2008 +0200 winedbg: Search default debuggee dir for symbol information. --- programs/winedbg/debugger.h | 1 + programs/winedbg/gdbproxy.c | 2 +- programs/winedbg/tgt_active.c | 2 +- programs/winedbg/tgt_minidump.c | 2 +- programs/winedbg/tgt_module.c | 2 +- programs/winedbg/winedbg.c | 39 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 44 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 3fb650d..a8a3fc3 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -446,6 +446,7 @@ extern void dbg_del_process(struct dbg_process* p); struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, HANDLE h, void* teb); extern struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid); extern void dbg_del_thread(struct dbg_thread* t); +extern BOOL dbg_init(HANDLE hProc, const char* in, BOOL invade); extern BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE* imh_mod); /* gdbproxy.c */ diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 2fbec04..dc80a84 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -505,7 +505,7 @@ static void handle_debug_event(struct gdb_context* gdbctx, DEBUG_EVENT* de) de->u.CreateProcessInfo.nDebugInfoSize); /* de->u.CreateProcessInfo.lpStartAddress; */ - if (!SymInitialize(gdbctx->process->handle, NULL, TRUE)) + if (!dbg_init(gdbctx->process->handle, buffer, TRUE)) fprintf(stderr, "Couldn't initiate DbgHelp\n"); if (gdbctx->trace & GDBPXY_TRC_WIN32_EVENT) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 5fba6fa..75f22ad 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -509,7 +509,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) de->u.CreateProcessInfo.nDebugInfoSize); dbg_set_process_name(dbg_curr_process, buffer); - if (!SymInitialize(dbg_curr_process->handle, NULL, FALSE)) + if (!dbg_init(dbg_curr_process->handle, buffer, FALSE)) dbg_printf("Couldn't initiate DbgHelp\n"); if (!SymLoadModule(dbg_curr_process->handle, de->u.CreateProcessInfo.hFile, buffer, NULL, (unsigned long)de->u.CreateProcessInfo.lpBaseOfImage, 0)) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 87f34a2..8d623dc 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -304,7 +304,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) dbg_curr_process->pio_data = data; dbg_set_process_name(dbg_curr_process, exec_name); - SymInitialize(hProc, NULL, FALSE); + dbg_init(hProc, NULL, FALSE); if (MiniDumpReadDumpStream(data->mapping, ThreadListStream, &dir, &stream, &size)) { diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index ced9d85..044e312 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -55,7 +55,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) SymSetOptions((opts & ~(SYMOPT_UNDNAME|SYMOPT_DEFERRED_LOADS)) | SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | 0x40000000); - if (!SymInitialize(hDummy, NULL, FALSE)) + if (!dbg_init(hDummy, NULL, FALSE)) return start_error_init; if (!SymLoadModule(hDummy, NULL, name, NULL, 0, 0)) { diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 26f422f..5cbc68f 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -346,6 +346,45 @@ void dbg_del_process(struct dbg_process* p) HeapFree(GetProcessHeap(), 0, p); } +/****************************************************************** + * dbg_init + * + * Initializes the dbghelp library, and also sets the application directory + * as a place holder for symbol searches. + */ +BOOL dbg_init(HANDLE hProc, const char* in, BOOL invade) +{ + BOOL ret; + + ret = SymInitialize(hProc, NULL, invade); + if (ret && in) + { + const char* last; + + for (last = in + strlen(in) - 1; last >= in; last--) + { + if (*last == '/' || *last == '\\') + { + char* tmp; + tmp = HeapAlloc(GetProcessHeap(), 0, 1024 + 1 + (last - in) + 1); + if (tmp && SymGetSearchPath(hProc, tmp, 1024)) + { + char* x = tmp + strlen(tmp); + + *x++ = ';'; + memcpy(x, in, last - in); + x[last - in] = '\0'; + ret = SymSetSearchPath(hProc, tmp); + } + else ret = FALSE; + HeapFree(GetProcessHeap(), 0, tmp); + break; + } + } + } + return ret; +} + struct mod_loader_info { HANDLE handle;

1 0

Eric Pouech : dbghelp: Improve the symbol loader.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: d6001153875351481b1bb8e825b313fd1a8c8503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6001153875351481b1bb8e82… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Aug 29 21:50:46 2008 +0200 dbghelp: Improve the symbol loader. When looking for a PDB file, no longer use SymFindFileInPath as it doesn't actually check the signatures, but use an internal function instead. --- dlls/dbghelp/dbghelp_private.h | 4 + dlls/dbghelp/msc.c | 23 +---- dlls/dbghelp/path.c | 205 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 212 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6001153875351481b1bb…

1 0

Eric Pouech : dbghelp: Improve the symbol loader for .DBG files.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 2994e9885001f0a117526837a8c71a42de5b4b23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2994e9885001f0a117526837a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Aug 29 21:50:53 2008 +0200 dbghelp: Improve the symbol loader for .DBG files. When looking for a .DBG file, first look for a .DBG file matching all attributes, then for a .DBG partially matching the attributes. --- dlls/dbghelp/dbghelp_private.h | 3 +- dlls/dbghelp/module.c | 4 +++ dlls/dbghelp/path.c | 35 +++++++++++++++++++++++- dlls/dbghelp/pe_module.c | 58 ++++++++++++--------------------------- 4 files changed, 58 insertions(+), 42 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index ec221be..26c3a3d 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -303,7 +303,8 @@ enum module_type DMT_UNKNOWN, /* for lookup, not actually used for a module */ DMT_ELF, /* a real ELF shared module */ DMT_PE, /* a native or builtin PE module */ - DMT_PDB, /* PDB file */ + DMT_PDB, /* .PDB file */ + DMT_DBG, /* .DBG file */ }; struct process; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index a53e6b5..ddc6d3d 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -36,6 +36,7 @@ const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'}; const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'}; static const WCHAR S_DotSoW[] = {'.','s','o','\0'}; static const WCHAR S_DotPdbW[] = {'.','p','d','b','\0'}; +static const WCHAR S_DotDbgW[] = {'.','d','b','g','\0'}; const WCHAR S_WinePThreadW[] = {'w','i','n','e','-','p','t','h','r','e','a','d','\0'}; const WCHAR S_WineKThreadW[] = {'w','i','n','e','-','k','t','h','r','e','a','d','\0'}; const WCHAR S_SlashW[] = {'/','\0'}; @@ -424,6 +425,9 @@ enum module_type module_get_type_by_name(const WCHAR* name) if (len > 4 && !strncmpiW(name + len - 4, S_DotPdbW, 4)) return DMT_PDB; + if (len > 4 && !strncmpiW(name + len - 4, S_DotDbgW, 4)) + return DMT_DBG; + /* wine-[kp]thread is also an ELF module */ if (((len > 12 && name[len - 13] == '/') || len == 12) && (!strncmpiW(name + len - 12, S_WinePThreadW, 12) || diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 8f06062..8d926cc 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -453,6 +453,9 @@ static BOOL CALLBACK sffip_cb(PCWSTR buffer, PVOID user) } } break; + case DMT_DBG: + FIXME("NIY\n"); + break; default: FIXME("What the heck??\n"); return FALSE; @@ -581,7 +584,7 @@ struct module_find static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) { struct module_find* mf = (struct module_find*)user; - DWORD size, checksum; + DWORD size, checksum, timestamp; unsigned matched = 0; /* the matching weights: @@ -685,6 +688,36 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) } } break; + case DMT_DBG: + { + HANDLE hFile, hMap; + void* mapping; + + timestamp = ~mf->dw1; + hFile = CreateFileW(buffer, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) return FALSE; + if ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != NULL) + { + if ((mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL) + { + const IMAGE_SEPARATE_DEBUG_HEADER* hdr; + hdr = (const IMAGE_SEPARATE_DEBUG_HEADER*)mapping; + + if (hdr->Signature == IMAGE_SEPARATE_DEBUG_SIGNATURE) + { + matched++; + timestamp = hdr->TimeDateStamp; + } + UnmapViewOfFile(mapping); + } + CloseHandle(hMap); + } + CloseHandle(hFile); + if (timestamp == mf->dw1) matched++; + else WARN("Found %s, but wrong timestamp\n", debugstr_w(buffer)); + } + break; default: FIXME("What the heck??\n"); return FALSE; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 283962c..7b62529 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -79,12 +79,6 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module, return ret; } -static BOOL CALLBACK dbg_match(const char* file, void* user) -{ - /* accept first file */ - return FALSE; -} - /****************************************************************** * pe_load_dbg_file * @@ -96,51 +90,35 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, char tmp[MAX_PATH]; HANDLE hFile = INVALID_HANDLE_VALUE, hMap = 0; const BYTE* dbg_mapping = NULL; - const IMAGE_SEPARATE_DEBUG_HEADER* hdr; - const IMAGE_DEBUG_DIRECTORY* dbg; BOOL ret = FALSE; - WINE_TRACE("Processing DBG file %s\n", debugstr_a(dbg_name)); + TRACE("Processing DBG file %s\n", debugstr_a(dbg_name)); - if (SymFindFileInPath(pcs->handle, NULL, dbg_name, NULL, 0, 0, 0, tmp, dbg_match, NULL) && + if (path_find_symbol_file(pcs, dbg_name, NULL, timestamp, 0, tmp) && (hFile = CreateFileA(tmp, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE && ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != 0) && ((dbg_mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL)) { + const IMAGE_SEPARATE_DEBUG_HEADER* hdr; + const IMAGE_SECTION_HEADER* sectp; + const IMAGE_DEBUG_DIRECTORY* dbg; + hdr = (const IMAGE_SEPARATE_DEBUG_HEADER*)dbg_mapping; - if (hdr->TimeDateStamp != timestamp) - { - WINE_ERR("Warning - %s has incorrect internal timestamp\n", - debugstr_a(dbg_name)); - /* - * Well, sometimes this happens to DBG files which ARE REALLY the - * right .DBG files but nonetheless this check fails. Anyway, - * WINDBG (debugger for Windows by Microsoft) loads debug symbols - * which have incorrect timestamps. - */ - } - if (hdr->Signature == IMAGE_SEPARATE_DEBUG_SIGNATURE) - { - /* section headers come immediately after debug header */ - const IMAGE_SECTION_HEADER *sectp = - (const IMAGE_SECTION_HEADER*)(hdr + 1); - /* and after that and the exported names comes the debug directory */ - dbg = (const IMAGE_DEBUG_DIRECTORY*) - (dbg_mapping + sizeof(*hdr) + - hdr->NumberOfSections * sizeof(IMAGE_SECTION_HEADER) + - hdr->ExportedNamesSize); - - - ret = pe_load_debug_directory(pcs, module, dbg_mapping, sectp, - hdr->NumberOfSections, dbg, - hdr->DebugDirectorySize / sizeof(*dbg)); - } - else - ERR("Wrong signature in .DBG file %s\n", debugstr_a(tmp)); + /* section headers come immediately after debug header */ + sectp = (const IMAGE_SECTION_HEADER*)(hdr + 1); + /* and after that and the exported names comes the debug directory */ + dbg = (const IMAGE_DEBUG_DIRECTORY*) + (dbg_mapping + sizeof(*hdr) + + hdr->NumberOfSections * sizeof(IMAGE_SECTION_HEADER) + + hdr->ExportedNamesSize); + + ret = pe_load_debug_directory(pcs, module, dbg_mapping, sectp, + hdr->NumberOfSections, dbg, + hdr->DebugDirectorySize / sizeof(*dbg)); } else - WINE_ERR("-Unable to peruse .DBG file %s (%s)\n", debugstr_a(dbg_name), debugstr_a(tmp)); + ERR("Couldn't find .DBG file %s (%s)\n", debugstr_a(dbg_name), debugstr_a(tmp)); if (dbg_mapping) UnmapViewOfFile(dbg_mapping); if (hMap) CloseHandle(hMap);

1 0

Vincent Povirk : shell32: Move SHAppBarMessage implementation from shell32 to explorer.
by Alexandre Julliard Sept. 4, 2008

Sept. 4, 2008

Module: wine Branch: master Commit: 3cce9ad9c6ff25de8c5f3efc2f5394f24beef32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cce9ad9c6ff25de8c5f3efc2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 2 13:58:01 2008 -0500 shell32: Move SHAppBarMessage implementation from shell32 to explorer. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/appbar.c | 122 ++++++++++++++++++++++++ dlls/shell32/shell32_main.c | 55 ----------- programs/explorer/Makefile.in | 1 + programs/explorer/appbar.c | 169 ++++++++++++++++++++++++++++++++++ programs/explorer/desktop.c | 1 + programs/explorer/explorer_private.h | 1 + 7 files changed, 295 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cce9ad9c6ff25de8c5f3…

1 0