December 2009 - Wine-commits

Alexandre Julliard : user32: Don' t pass the 16-bit instance through to 32-bit MessageBoxIndirectA.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: d51a6b673c22ad31321822bcb1c9a9ed0675eca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51a6b673c22ad31321822bcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 17:11:53 2009 +0100 user32: Don't pass the 16-bit instance through to 32-bit MessageBoxIndirectA. --- dlls/user.exe16/window.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index c746a1f..244924f 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -23,6 +23,9 @@ #include "user_private.h" #include "wine/list.h" #include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(win); /* size of buffer needed to store an atom string */ #define ATOM_BUFFER_SIZE 256 @@ -2099,17 +2102,37 @@ INT16 WINAPI SetWindowRgn16( HWND16 hwnd, HRGN16 hrgn, BOOL16 redraw ) */ INT16 WINAPI MessageBoxIndirect16( LPMSGBOXPARAMS16 msgbox ) { + char caption[256], text[256]; MSGBOXPARAMSA msgbox32; msgbox32.cbSize = msgbox->cbSize; msgbox32.hwndOwner = WIN_Handle32( msgbox->hwndOwner ); - msgbox32.hInstance = HINSTANCE_32(msgbox->hInstance); - msgbox32.lpszText = MapSL(msgbox->lpszText); - msgbox32.lpszCaption = MapSL(msgbox->lpszCaption); + msgbox32.hInstance = 0; msgbox32.dwStyle = msgbox->dwStyle; - msgbox32.lpszIcon = MapSL(msgbox->lpszIcon); + msgbox32.lpszIcon = NULL; msgbox32.dwContextHelpId = msgbox->dwContextHelpId; msgbox32.lpfnMsgBoxCallback = msgbox->lpfnMsgBoxCallback; msgbox32.dwLanguageId = msgbox->dwLanguageId; + + if (!HIWORD(msgbox->lpszCaption)) + { + LoadString16( msgbox->hInstance, LOWORD(msgbox->lpszCaption), caption, sizeof(caption) ); + msgbox32.lpszCaption = caption; + } + else msgbox32.lpszCaption = MapSL(msgbox->lpszCaption); + + if (!HIWORD(msgbox->lpszText)) + { + LoadString16( msgbox->hInstance, LOWORD(msgbox->lpszText), text, sizeof(text) ); + msgbox32.lpszText = text; + } + else msgbox32.lpszText = MapSL(msgbox->lpszText); + + if ((msgbox->dwStyle & MB_ICONMASK) == MB_USERICON) + { + FIXME( "user icon %s not supported\n", debugstr_a( MapSL(msgbox->lpszIcon) )); + msgbox32.dwStyle &= ~MB_USERICON; + } + return MessageBoxIndirectA( &msgbox32 ); }

1 0

Alexandre Julliard : configure: Re-generate with autoconf 2.65.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: fa8c4f7633ab64e2c5ee0c305d7ffc7105bb8325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8c4f7633ab64e2c5ee0c305… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 11:43:02 2009 +0100 configure: Re-generate with autoconf 2.65. --- configure | 179 ++++++++++++++++++++++++++++++--------------------- include/config.h.in | 52 ++++++++-------- 2 files changed, 131 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa8c4f7633ab64e2c5ee0…

1 0

Vincent Povirk : gdiplus: Add a trace for values of new ImageAttributes objects.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: e68c866956735b0fbf082fe488dfe6568a0aefa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68c866956735b0fbf082fe48… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:21:30 2009 -0600 gdiplus: Add a trace for values of new ImageAttributes objects. --- dlls/gdiplus/imageattributes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 6bfd23e..f74b6db 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -47,14 +47,14 @@ GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imagea GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr) { - TRACE("(%p)\n", imageattr); - if(!imageattr) return InvalidParameter; *imageattr = GdipAlloc(sizeof(GpImageAttributes)); if(!*imageattr) return OutOfMemory; + TRACE("<-- %p\n", *imageattr); + return Ok; }

1 0

Vincent Povirk : gdiplus: Add traces for values of newly-created pens.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: 7cb42df39b93ba19efcfe0b5522883f57f0e7d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb42df39b93ba19efcfe0b55… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:24:51 2009 -0600 gdiplus: Add traces for values of newly-created pens. --- dlls/gdiplus/pen.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 4a68a27..6299d67 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -101,6 +101,8 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) GdipCloneCustomLineCap(pen->customend, &(*clonepen)->customend); GdipCloneBrush(pen->brush, &(*clonepen)->brush); + TRACE("<-- %p\n", *clonepen); + return Ok; } @@ -154,6 +156,8 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush *brush, REAL width, GpUnit unit, *pen = gp_pen; + TRACE("<-- %p\n", *pen); + return Ok; }

1 0

Vincent Povirk : gdiplus: Add a trace for values of new string format objects.
by Alexandre Julliard 28 Dec '09

28 Dec '09

Module: wine Branch: master Commit: d46eda2b29bdc997a40f588fbb4f61cf0571c14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46eda2b29bdc997a40f588fb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:26:03 2009 -0600 gdiplus: Add a trace for values of new string format objects. --- dlls/gdiplus/stringformat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 6e85008..392f11f 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -55,6 +55,8 @@ GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, (*format)->firsttab = 0.0; (*format)->tabs = NULL; + TRACE("<-- %p\n", *format); + return Ok; }

1 0

Eric Pouech : dbghelp: Add support for loading dwarf debug information out of PE images.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: bc38d3eaac21b717effec9b6aabfee64bad5a01f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc38d3eaac21b717effec9b6a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Dec 23 22:05:25 2009 +0100 dbghelp: Add support for loading dwarf debug information out of PE images. --- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/pe_module.c | 102 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 81 insertions(+), 23 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 702bca2..3399aeb 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -369,7 +369,7 @@ int elf_is_in_thunk_area(unsigned long addr, { unsigned i; - for (i = 0; thunks[i].symname; i++) + if (thunks) for (i = 0; thunks[i].symname; i++) { if (addr >= thunks[i].rva_start && addr < thunks[i].rva_end) return i; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 03e9c86..5cce6a3 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -98,6 +98,17 @@ static BOOL pe_load_symbol_table(struct module* module, IMAGE_NT_HEADERS* nth, v return TRUE; } +static inline void* pe_get_sect(IMAGE_NT_HEADERS* nth, void* mapping, + IMAGE_SECTION_HEADER* sect) +{ + return (sect) ? RtlImageRvaToVa(nth, mapping, sect->VirtualAddress, NULL) : NULL; +} + +static inline DWORD pe_get_sect_size(IMAGE_SECTION_HEADER* sect) +{ + return (sect) ? sect->SizeOfRawData : 0; +} + /****************************************************************** * pe_load_stabs * @@ -108,39 +119,85 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module, void* mapping, IMAGE_NT_HEADERS* nth) { IMAGE_SECTION_HEADER* section; - int i, stabsize = 0, stabstrsize = 0; - unsigned int stabs = 0, stabstr = 0; - BOOL ret = FALSE; + IMAGE_SECTION_HEADER* sect_stabs = NULL; + IMAGE_SECTION_HEADER* sect_stabstr = NULL; + int i; + BOOL ret; section = (IMAGE_SECTION_HEADER*) ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++) { - if (!strcasecmp((const char*)section->Name, ".stab")) - { - stabs = section->VirtualAddress; - stabsize = section->SizeOfRawData; - } - else if (!strncasecmp((const char*)section->Name, ".stabstr", 8)) - { - stabstr = section->VirtualAddress; - stabstrsize = section->SizeOfRawData; - } + if (!strcasecmp((const char*)section->Name, ".stab")) sect_stabs = section; + else if (!strncasecmp((const char*)section->Name, ".stabstr", 8)) sect_stabstr = section; } - - if (stabstrsize && stabsize) + if (sect_stabs && sect_stabstr) { - ret = stabs_parse(module, - module->module.BaseOfImage - nth->OptionalHeader.ImageBase, - RtlImageRvaToVa(nth, mapping, stabs, NULL), - stabsize, - RtlImageRvaToVa(nth, mapping, stabstr, NULL), - stabstrsize, + ret = stabs_parse(module, + module->module.BaseOfImage - nth->OptionalHeader.ImageBase, + pe_get_sect(nth, mapping, sect_stabs), pe_get_sect_size(sect_stabs), + pe_get_sect(nth, mapping, sect_stabstr), pe_get_sect_size(sect_stabstr), NULL, NULL); if (ret) pe_load_symbol_table(module, nth, mapping); } - TRACE("%s the STABS debug info\n", ret ? "successfully loaded" : "failed to load"); + + return ret; +} + +/****************************************************************** + * pe_load_dwarf + * + * look for dwarf information in PE header (it's also a way for the mingw compiler + * to provide its debugging information) + */ +static BOOL pe_load_dwarf(const struct process* pcs, struct module* module, + void* mapping, IMAGE_NT_HEADERS* nth) +{ + IMAGE_SECTION_HEADER* section; + IMAGE_SECTION_HEADER* sect_debuginfo = NULL; + IMAGE_SECTION_HEADER* sect_debugstr = NULL; + IMAGE_SECTION_HEADER* sect_debugabbrev = NULL; + IMAGE_SECTION_HEADER* sect_debugline = NULL; + IMAGE_SECTION_HEADER* sect_debugloc = NULL; + int i; + const char* strtable; + const char* sectname; + BOOL ret; + + if (nth->FileHeader.PointerToSymbolTable && nth->FileHeader.NumberOfSymbols) + /* FIXME: no way to get strtable size */ + strtable = (const char*)mapping + nth->FileHeader.PointerToSymbolTable + + nth->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + else strtable = NULL; + + section = (IMAGE_SECTION_HEADER*) + ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++) + { + sectname = (const char*)section->Name; + /* long section names start with a '/' (at least on MinGW32) */ + if (*sectname == '/' && strtable) + sectname = strtable + atoi(sectname + 1); + if (!strcasecmp(sectname, ".debug_info")) sect_debuginfo = section; + else if (!strcasecmp(sectname, ".debug_str")) sect_debugstr = section; + else if (!strcasecmp(sectname, ".debug_abbrev")) sect_debugabbrev = section; + else if (!strcasecmp(sectname, ".debug_line")) sect_debugline = section; + else if (!strcasecmp(sectname, ".debug_loc")) sect_debugloc = section; + } + if (sect_debuginfo) + { + ret = dwarf2_parse(module, + module->module.BaseOfImage - nth->OptionalHeader.ImageBase, + NULL, /* FIXME: some thunks to deal with ? */ + pe_get_sect(nth, mapping, sect_debuginfo), pe_get_sect_size(sect_debuginfo), + pe_get_sect(nth, mapping, sect_debugabbrev), pe_get_sect_size(sect_debugabbrev), + pe_get_sect(nth, mapping, sect_debugstr), pe_get_sect_size(sect_debugstr), + pe_get_sect(nth, mapping, sect_debugline), pe_get_sect_size(sect_debugline), + pe_get_sect(nth, mapping, sect_debugloc), pe_get_sect_size(sect_debugloc)); + } + TRACE("%s the DWARF debug info\n", ret ? "successfully loaded" : "failed to load"); + return ret; } @@ -349,6 +406,7 @@ BOOL pe_load_debug_info(const struct process* pcs, struct module* module) if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) { ret = pe_load_stabs(pcs, module, mapping, nth) || + pe_load_dwarf(pcs, module, mapping, nth) || pe_load_msc_debug_info(pcs, module, mapping, nth); /* if we still have no debug info (we could only get SymExport at this * point), then do the SymExport except if we have an ELF container,

1 0

Alexandre Julliard : winmm: Avoid using ReleaseThunkLock from 32-bit code.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 18a7655234728efbf0ba32d7aae2fdf790c9b475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a7655234728efbf0ba32d7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 12:29:24 2009 +0100 winmm: Avoid using ReleaseThunkLock from 32-bit code. --- dlls/winmm/winmm.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 4f3ace1..f5e2af1 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1713,11 +1713,7 @@ the_end: static BOOL MMSYSTEM_MidiStream_PostMessage(WINE_MIDIStream* lpMidiStrm, WORD msg, DWORD pmt1, DWORD pmt2) { if (PostThreadMessageA(lpMidiStrm->dwThreadID, msg, pmt1, pmt2)) { - DWORD count; - - ReleaseThunkLock(&count); - WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); - RestoreThunkLock(count); + MsgWaitForMultipleObjects( 1, &lpMidiStrm->hEvent, FALSE, INFINITE, 0 ); } else { WARN("bad PostThreadMessageA\n"); return FALSE; @@ -1796,17 +1792,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, SetThreadPriority(lpMidiStrm->hThread, THREAD_PRIORITY_TIME_CRITICAL); /* wait for thread to have started, and for its queue to be created */ - { - DWORD count; - - /* (Release|Restore)ThunkLock() is needed when this method is called from 16 bit code, - * (meaning the Win16Lock is set), so that it's released and the 32 bit thread running - * MMSYSTEM_MidiStreamPlayer can acquire Win16Lock to create its queue. - */ - ReleaseThunkLock(&count); - WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); - RestoreThunkLock(count); - } + WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); TRACE("=> (%u/%d) hMidi=%p ret=%d lpMidiStrm=%p\n", *lpuDeviceID, lpwm->mld.uDeviceID, *lphMidiStrm, ret, lpMidiStrm);

1 0

Alexandre Julliard : winex11: Only check for fs register corruption on i386 .
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 10e12c81831891ac3f1de7b31b46641aa30c0973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e12c81831891ac3f1de7b31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 12:58:51 2009 +0100 winex11: Only check for fs register corruption on i386. --- dlls/winex11.drv/opengl.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 38f1dad..5bd0255 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -310,6 +310,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) vis = pglXChooseVisual(gdi_display, screen, attribList); if (vis) { +#ifdef __i386__ WORD old_fs = wine_get_fs(); /* Create a GLX Context. Without one we can't query GL information */ ctx = pglXCreateContext(gdi_display, vis, None, GL_TRUE); @@ -321,6 +322,9 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) ERR( "You need to set the \"UseFastTls\" option to \"2\" in your X config file.\n" ); return FALSE; } +#else + ctx = pglXCreateContext(gdi_display, vis, None, GL_TRUE); +#endif } if (ctx) {

1 0

Andrew Nguyen : ntdll: Use the HKCU\Volatile Environment key when generating the initial process environment .
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 542feda6b883cd289996862a868c0c610a5cf808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542feda6b883cd289996862a8… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 23 11:31:46 2009 -0600 ntdll: Use the HKCU\Volatile Environment key when generating the initial process environment. --- dlls/kernel32/process.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 08ac255..45488aa 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -417,6 +417,7 @@ static BOOL set_registry_environment(void) 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', 'E','n','v','i','r','o','n','m','e','n','t',0}; static const WCHAR envW[] = {'E','n','v','i','r','o','n','m','e','n','t',0}; + static const WCHAR volatile_envW[] = {'V','o','l','a','t','i','l','e',' ','E','n','v','i','r','o','n','m','e','n','t',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; @@ -449,6 +450,15 @@ static BOOL set_registry_environment(void) set_registry_variables( hkey, REG_EXPAND_SZ ); NtClose( hkey ); } + + RtlInitUnicodeString( &nameW, volatile_envW ); + if (NtOpenKey( &hkey, KEY_READ, &attr ) == STATUS_SUCCESS) + { + set_registry_variables( hkey, REG_SZ ); + set_registry_variables( hkey, REG_EXPAND_SZ ); + NtClose( hkey ); + } + NtClose( attr.RootDirectory ); return ret; }

1 0

Andrew Nguyen : kernel32: Ignore empty environment values from registry.
by Alexandre Julliard 24 Dec '09

24 Dec '09

Module: wine Branch: master Commit: 9294882b947a509021db47410a752c73e57dee31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9294882b947a509021db47410… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 23 11:31:52 2009 -0600 kernel32: Ignore empty environment values from registry. --- dlls/kernel32/process.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 45488aa..eb39f5c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -378,6 +378,7 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) env_value.Length = env_value.MaximumLength = info->DataLength; if (env_value.Length && !env_value.Buffer[env_value.Length/sizeof(WCHAR)-1]) env_value.Length -= sizeof(WCHAR); /* don't count terminating null if any */ + if (!env_value.Length) continue; if (info->Type == REG_EXPAND_SZ) { WCHAR buf_expanded[1024];

1 0