December 2009 - Wine-Commits

Alexandre Julliard : user32: Avoid accessing the window structure directly in DispatchMessage16.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 4e343b6f3a345912a2263fe18f5f520ae033007a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e343b6f3a345912a2263fe18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 15:24:53 2009 +0100 user32: Avoid accessing the window structure directly in DispatchMessage16. --- dlls/user32/msg16.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index b8421d4..710dfa0 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -1797,7 +1797,6 @@ BOOL16 WINAPI TranslateMessage16( const MSG16 *msg ) */ LONG WINAPI DispatchMessage16( const MSG16* msg ) { - WND * wndPtr; WNDPROC16 winproc; LONG retval; HWND hwnd = WIN_Handle32( msg->hwnd ); @@ -1810,20 +1809,11 @@ LONG WINAPI DispatchMessage16( const MSG16* msg ) msg->message, msg->wParam, GetTickCount() ); } - if (!(wndPtr = WIN_GetPtr( hwnd ))) + if (!(winproc = (WNDPROC16)GetWindowLong16( msg->hwnd, GWLP_WNDPROC ))) { - if (msg->hwnd) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } - if (wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) - { - if (IsWindow( hwnd )) SetLastError( ERROR_MESSAGE_SYNC_ONLY ); - else SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - winproc = WINPROC_GetProc16( wndPtr->winproc, wndPtr->flags & WIN_ISUNICODE ); - WIN_ReleasePtr( wndPtr ); - SPY_EnterMessage( SPY_DISPATCHMESSAGE16, hwnd, msg->message, msg->wParam, msg->lParam ); retval = CallWindowProc16( winproc, msg->hwnd, msg->message, msg->wParam, msg->lParam ); SPY_ExitMessage( SPY_RESULT_OK16, hwnd, msg->message, retval, msg->wParam, msg->lParam );

1 0

Alexandre Julliard : user32: Don' t cache 16-bit instance resources on the 32-bit side.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 2919c49d7ffbef6d1bf26727b0f425f4b4a46711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2919c49d7ffbef6d1bf26727b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 14:26:51 2009 +0100 user32: Don't cache 16-bit instance resources on the 32-bit side. --- dlls/user32/cursoricon.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2b2151a..188500a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1177,10 +1177,8 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, if (!hInstance) hInstance = user32_module; /* Load OEM cursor/icon */ - /* Normalize hInstance (must be uniquely represented for icon cache) */ - - if (!HIWORD( hInstance )) - hInstance = HINSTANCE_32(GetExePtr( HINSTANCE_16(hInstance) )); + /* don't cache 16-bit instances (FIXME: should never get 16-bit instances in the first place) */ + if (!HIWORD( hInstance )) loadflags &= ~LR_SHARED; /* Get directory resource ID */

1 0

Alexandre Julliard : user32: Get rid of support for extracting icons from builtin dlls.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 73cf431aac5856c758869088d6b784a6ba23f685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73cf431aac5856c758869088d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 14:27:22 2009 +0100 user32: Get rid of support for extracting icons from builtin dlls. We now have fake dll files for all dlls, the icons can be loaded from there. --- dlls/user32/exticon.c | 101 ------------------------------------------------- 1 files changed, 0 insertions(+), 101 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 1d30f25..a720cf3 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -233,81 +233,6 @@ static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG return 0; } -/****************************************************************************** - * struct extract_icons_state [internal] - * - * Used to carry params and state through the iterations of EnumResourceNames in ICO_ExtractIconExW - */ -struct extract_icons_state { - INT nBaseIndex; /* Zero based index or negated integer id of the first icon to extract. */ - UINT nIcons; /* Number of icons to extract. */ - UINT cxDesired; /* Desired horizontal size in pixels (Might be two sizes in HI/LOWORD). */ - UINT cyDesired; /* Desired vertical size in pixels (Might be two sizes in HI/LOWORD). */ - UINT fuLoad; /* Flags passed to LoadImage. */ - INT cIter; /* Iteration counter. */ - HICON *pahIcon; /* Pointer to an array where the icon handles will be stored. */ - UINT *paIconId; /* Pointer to an array where the icon identifiers will be stored. */ -}; - -/****************************************************************************** - * extract_icons_callback [internal] - * - * Callback function of type ENUMRESNAMEPROC for EnumResourceNames. Used in - * ICO_ExtractIconsExW. - */ -static BOOL CALLBACK extract_icons_callback(HMODULE hModule, LPCWSTR pwszType, LPWSTR pwszName, - LONG_PTR lParam) -{ - struct extract_icons_state *pState = (struct extract_icons_state *)lParam; - INT idCurrent = LOWORD(pwszName); - - /* If the handle array pointer is NULL, we just count the number of icons in the module. */ - if (!pState->pahIcon) { - pState->cIter++; - return TRUE; - } - - /* If we didn't already start extracting icons (cIter == 0), we look if the current - * icon is the one we should start with. That's the case if nBaseIndex is negative and - * it's absolute value matches the current icon's identifier. Or if nBaseIndex is positive - * and we already omitted the first nBaseIndex icons. */ - if (pState->cIter == 0) { - if (pState->nBaseIndex < 0) { - if (!IS_INTRESOURCE(pwszName) || idCurrent != -pState->nBaseIndex) { - return TRUE; - } - } else if (pState->nBaseIndex > 0) { - pState->nBaseIndex--; - return TRUE; - } - } - - if (pState->cIter < pState->nIcons) { - /* Load the current icon with the size given in the LOWORD of cx/cyDesired */ - pState->pahIcon[pState->cIter] = - LoadImageW(hModule, pwszName, IMAGE_ICON, LOWORD(pState->cxDesired), - LOWORD(pState->cyDesired), pState->fuLoad); - /* FIXME: The resource's identifier (that is not idCurrent, which is the - * identifier of the icon directory) should be stored in paIconId, but I don't - * know how to query for it. */ - if (pState->paIconId) pState->paIconId[pState->cIter] = 0; - pState->cIter++; - - /* If there is a second desired size given in the HIWORDs of cx/cyDesired, load too. - * There seems to be an off-by-one error here, since pState->cIter might now be equal - * to pState->nIcons, but this is in fact how it works on windows. */ - if (HIWORD(pState->cxDesired) && HIWORD(pState->cyDesired)) { - pState->pahIcon[pState->cIter] = - LoadImageW(hModule, pwszName, IMAGE_ICON, HIWORD(pState->cxDesired), - HIWORD(pState->cyDesired), pState->fuLoad); - if (pState->paIconId) pState->paIconId[pState->cIter] = 0; - pState->cIter++; - } - } - - return pState->cIter < pState->nIcons; -} - /************************************************************************* * ICO_ExtractIconExW [internal] * @@ -346,34 +271,8 @@ static UINT ICO_ExtractIconExW( dwSearchReturn = SearchPathW(NULL, lpszExeFileName, NULL, sizeof(szExePath) / sizeof(szExePath[0]), szExePath, NULL); if ((dwSearchReturn == 0) || (dwSearchReturn > sizeof(szExePath) / sizeof(szExePath[0]))) { - /* This is very wine specific: If the user tries to extract icons from system dlls, - * wine's builtin *.dll.so's will not be found (Even if they would be found it wouldn't - * work, since they are not in PE-format). Thus, if the SearchPath call fails, we try - * to load the file with LoadLibrary and extract the icons with LoadImage (via - * EnumResourceNames). - */ - struct extract_icons_state state; - HMODULE hDllSo = LoadLibraryW(lpszExeFileName); - - if (!hDllSo) { WARN("File %s not found or path too long\n", debugstr_w(lpszExeFileName)); return -1; - } - - state.nBaseIndex = nIconIndex; - state.nIcons = nIcons; - state.cxDesired = cxDesired; - state.cyDesired = cyDesired; - state.fuLoad = flags; - state.cIter = 0; - state.pahIcon = RetPtr; - state.paIconId = pIconId; - - EnumResourceNamesW(hDllSo, MAKEINTRESOURCEW(RT_GROUP_ICON), extract_icons_callback, - (LONG_PTR)&state); - FreeLibrary(hDllSo); - - return state.cIter; } hFile = CreateFileW(szExePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);

1 0

Eric Pouech : dbghelp: Hacked a StackWalk implementation for x86_64.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 54766cdac0fc27ed8e33225b88a2d3a0bc174f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54766cdac0fc27ed8e33225b8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 22 14:21:31 2009 +0100 dbghelp: Hacked a StackWalk implementation for x86_64. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/cpu_x86_64.c | 115 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp.c | 6 ++- 3 files changed, 120 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 57b9c57..d3a72a2 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -11,6 +11,7 @@ DELAYIMPORTS = version C_SRCS = \ coff.c \ cpu_i386.c \ + cpu_x86_64.c \ crc32.c \ dbghelp.c \ dwarf.c \ diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c new file mode 100644 index 0000000..5678678 --- /dev/null +++ b/dlls/dbghelp/cpu_x86_64.c @@ -0,0 +1,115 @@ +/* + * File cpu_x86_64.c + * + * Copyright (C) 2009-2009, Eric Pouech. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "dbghelp_private.h" +#include "wine/winbase16.h" +#include "winternl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); + +enum st_mode {stm_start, stm_64bit, stm_done}; + +/* indexes in Reserved array */ +#define __CurrentMode 0 +#define __CurrentSwitch 1 +#define __NextSwitch 2 + +#define curr_mode (frame->Reserved[__CurrentMode]) +#define curr_switch (frame->Reserved[__CurrentSwitch]) +#define next_switch (frame->Reserved[__NextSwitch]) + +static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame) +{ + /* sanity check */ + if (curr_mode >= stm_done) return FALSE; + assert(!csw->is32); + + TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s\n", + wine_dbgstr_addr(&frame->AddrPC), + wine_dbgstr_addr(&frame->AddrFrame), + wine_dbgstr_addr(&frame->AddrReturn), + wine_dbgstr_addr(&frame->AddrStack), + curr_mode == stm_start ? "start" : "64bit"); + + if (curr_mode == stm_start) + { + if ((frame->AddrPC.Mode == AddrModeFlat) && + (frame->AddrFrame.Mode != AddrModeFlat)) + { + WARN("Bad AddrPC.Mode / AddrFrame.Mode combination\n"); + goto done_err; + } + + /* Init done */ + curr_mode = stm_64bit; + curr_switch = 0; + frame->AddrReturn.Mode = frame->AddrStack.Mode = AddrModeFlat; + /* don't set up AddrStack on first call. Either the caller has set it up, or + * we will get it in the next frame + */ + memset(&frame->AddrBStore, 0, sizeof(frame->AddrBStore)); + } + else + { + if (frame->AddrReturn.Offset == 0) goto done_err; + frame->AddrPC = frame->AddrReturn; + } + + if (!sw_read_mem(csw, frame->AddrStack.Offset, + &frame->AddrReturn.Offset, sizeof(DWORD64))) + { + WARN("Cannot read new frame offset %s\n", + wine_dbgstr_longlong(frame->AddrFrame.Offset + sizeof(DWORD64))); + goto done_err; + } + /* FIXME: simplistic stuff... need to handle both dwarf & PE stack information */ + frame->AddrStack.Offset += sizeof(DWORD64); + memset(&frame->Params, 0, sizeof(frame->Params)); + + frame->Far = TRUE; + frame->Virtual = TRUE; + if (frame->AddrPC.Offset && sw_module_base(csw, frame->AddrPC.Offset)) + frame->FuncTableEntry = sw_table_access(csw, frame->AddrPC.Offset); + else + frame->FuncTableEntry = NULL; + + TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s FuncTable=%p\n", + wine_dbgstr_addr(&frame->AddrPC), + wine_dbgstr_addr(&frame->AddrFrame), + wine_dbgstr_addr(&frame->AddrReturn), + wine_dbgstr_addr(&frame->AddrStack), + curr_mode == stm_start ? "start" : "64bit", + frame->FuncTableEntry); + + return TRUE; +done_err: + curr_mode = stm_done; + return FALSE; +} + +struct cpu cpu_x86_64 = { + IMAGE_FILE_MACHINE_AMD64, + x86_64_stack_walk, +}; diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 47691b9..860d267 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -151,12 +151,14 @@ const char* wine_dbgstr_addr(const ADDRESS64* addr) } } -extern struct cpu cpu_i386; +extern struct cpu cpu_i386, cpu_x86_64; -static struct cpu* dbghelp_cpus[] = {&cpu_i386, NULL}; +static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, NULL}; struct cpu* dbghelp_current_cpu = #if defined(__i386__) &cpu_i386 +#elif defined(__x86_64__) + &cpu_x86_64 #else #error define support for you CPU #endif

1 0

Eric Pouech : dbghelp: Add a couple of helpers to struct cpu to help adding the stack to minidump .
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: ed96e740e9f3d378c0694d93dfd3b6cba3e087e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed96e740e9f3d378c0694d93d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 22 14:21:37 2009 +0100 dbghelp: Add a couple of helpers to struct cpu to help adding the stack to minidump. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/cpu_i386.c | 60 ++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/cpu_ppc.c | 63 ++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/cpu_x86_64.c | 18 +++++++++++ dlls/dbghelp/dbghelp_private.h | 7 ++++ dlls/dbghelp/minidump.c | 53 ++++++--------------------------- 6 files changed, 159 insertions(+), 43 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index d3a72a2..a3b1553 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -11,6 +11,7 @@ DELAYIMPORTS = version C_SRCS = \ coff.c \ cpu_i386.c \ + cpu_ppc.c \ cpu_x86_64.c \ crc32.c \ dbghelp.c \ diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index a3649ba..a83f0fa 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -29,6 +29,64 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); +#define STEP_FLAG 0x00000100 /* single step flag */ +#define V86_FLAG 0x00020000 + +#define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG) + +#ifdef __i386__ +static ADDRESS_MODE get_selector_type(HANDLE hThread, const CONTEXT* ctx, WORD sel) +{ + LDT_ENTRY le; + + if (IS_VM86_MODE(ctx)) return AddrModeReal; + /* null or system selector */ + if (!(sel & 4) || ((sel >> 3) < 17)) return AddrModeFlat; + if (hThread && GetThreadSelectorEntry(hThread, sel, &le)) + return le.HighWord.Bits.Default_Big ? AddrMode1632 : AddrMode1616; + /* selector doesn't exist */ + return -1; +} + +static unsigned i386_build_addr(HANDLE hThread, const CONTEXT* ctx, ADDRESS64* addr, + unsigned seg, unsigned long offset) +{ + addr->Mode = AddrModeFlat; + addr->Segment = seg; + addr->Offset = offset; + if (seg) + { + switch (addr->Mode = get_selector_type(hThread, ctx, seg)) + { + case AddrModeReal: + case AddrMode1616: + addr->Offset &= 0xffff; + break; + case AddrModeFlat: + case AddrMode1632: + break; + default: + return FALSE; + } + } + return TRUE; +} +#endif + +static unsigned i386_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) +{ +#ifdef __i386__ + switch (ca) + { + case cpu_addr_pc: return i386_build_addr(hThread, ctx, addr, ctx->SegCs, ctx->Eip); + case cpu_addr_stack: return i386_build_addr(hThread, ctx, addr, ctx->SegSs, ctx->Esp); + case cpu_addr_frame: return i386_build_addr(hThread, ctx, addr, ctx->SegSs, ctx->Ebp); + } +#endif + return FALSE; +} + enum st_mode {stm_start, stm_32bit, stm_16bit, stm_done}; /* indexes in Reserved array */ @@ -344,5 +402,7 @@ done_err: struct cpu cpu_i386 = { IMAGE_FILE_MACHINE_I386, + 4, + i386_get_addr, i386_stack_walk, }; diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c new file mode 100644 index 0000000..da440f8 --- /dev/null +++ b/dlls/dbghelp/cpu_ppc.c @@ -0,0 +1,63 @@ +/* + * File cpu_ppc.c + * + * Copyright (C) 2009-2009, Eric Pouech. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "dbghelp_private.h" +#include "wine/winbase16.h" +#include "winternl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); + +static unsigned ppc_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) +{ + switch (ca) + { +#if defined(__powerpc__) + case cpu_addr_pc: + addr->Mode = AddrModeFlat; + addr->Segment = 0; /* don't need segment */ + addr->Offset = ctx->Iar; + return TRUE; +#endif + default: + case cpu_addr_stack: + case cpu_addr_frame: + FIXME("not done\n"); + } + return FALSE; +} + +static BOOL ppc_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame) +{ + FIXME("not done\n"); + return FALSE; +} + +struct cpu cpu_ppc = { + IMAGE_FILE_MACHINE_POWERPC, + 4, + ppc_get_addr, + ppc_stack_walk, +}; diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 5678678..d7fb138 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -29,6 +29,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); +static unsigned x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) +{ + addr->Mode = AddrModeFlat; + switch (ca) + { +#ifdef __x86_64__ + case cpu_addr_pc: addr->Segment = ctx->SegCs; addr->Offset = ctx->Rip; return TRUE; + case cpu_addr_stack: addr->Segment = ctx->SegSs; addr->Offset = ctx->Rsp; return TRUE; + case cpu_addr_frame: addr->Segment = ctx->SegSs; addr->Offset = ctx->Rbp; return TRUE; +#endif + default: addr->Mode = -1; + return FALSE; + } +} + enum st_mode {stm_start, stm_64bit, stm_done}; /* indexes in Reserved array */ @@ -111,5 +127,7 @@ done_err: struct cpu cpu_x86_64 = { IMAGE_FILE_MACHINE_AMD64, + 8, + x86_64_get_addr, x86_64_stack_walk, }; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 69150e1..d2e2f1b 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -443,9 +443,16 @@ struct cpu_stack_walk } u; }; +enum cpu_addr {cpu_addr_pc, cpu_addr_stack, cpu_addr_frame}; struct cpu { DWORD machine; + DWORD word_size; + /* address manipulation */ + unsigned (*get_addr)(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr, ADDRESS64* addr); + + /* stack manipulation */ BOOL (*stack_walk)(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame); }; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 1dc7dc3..3cddb72 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -115,58 +115,25 @@ static void fetch_thread_stack(struct dump_context* dc, const void* teb_addr, const CONTEXT* ctx, MINIDUMP_MEMORY_DESCRIPTOR* mmd) { NT_TIB tib; + ADDRESS64 addr; - if (ReadProcessMemory(dc->hProcess, teb_addr, &tib, sizeof(tib), NULL)) + if (ReadProcessMemory(dc->hProcess, teb_addr, &tib, sizeof(tib), NULL) && + dbghelp_current_cpu && + dbghelp_current_cpu->get_addr(NULL /* FIXME */, ctx, cpu_addr_stack, &addr) && addr.Mode == AddrModeFlat) { -#ifdef __i386__ - /* limiting the stack dumping to the size actually used */ - if (ctx->Esp){ - - /* make sure ESP is within the established range of the stack. It could have - been clobbered by whatever caused the original exception. */ - if (ctx->Esp - 4 < (ULONG_PTR)tib.StackLimit || ctx->Esp - 4 > (ULONG_PTR)tib.StackBase) - mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - - else - mmd->StartOfMemoryRange = (ctx->Esp - 4); - } - - else - mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - -#elif defined(__powerpc__) - if (ctx->Iar){ - - /* make sure IAR is within the established range of the stack. It could have - been clobbered by whatever caused the original exception. */ - if (ctx->Iar - 4 < (ULONG_PTR)tib.StackLimit || ctx->Iar - 4 > (ULONG_PTR)tib.StackBase) - mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - - else - mmd->StartOfMemoryRange = (ctx->Iar - 4); - } - - else - mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - -#elif defined(__x86_64__) - if (ctx->Rsp){ - - /* make sure RSP is within the established range of the stack. It could have + if (addr.Offset) + { + addr.Offset -= dbghelp_current_cpu->word_size; + /* make sure stack pointer is within the established range of the stack. It could have been clobbered by whatever caused the original exception. */ - if (ctx->Rsp - 8 < (ULONG_PTR)tib.StackLimit || ctx->Rsp - 8 > (ULONG_PTR)tib.StackBase) + if (addr.Offset < (ULONG_PTR)tib.StackLimit || addr.Offset > (ULONG_PTR)tib.StackBase) mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; else - mmd->StartOfMemoryRange = (ctx->Rsp - 8); + mmd->StartOfMemoryRange = addr.Offset; } - else mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; - -#else -#error unsupported CPU -#endif mmd->Memory.DataSize = (ULONG_PTR)tib.StackBase - mmd->StartOfMemoryRange; } }

1 0

Alexandre Julliard : user32: Allocate user handles for cursors/ icons when we don't have 16-bit support.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: cecb3a993c156b7aef91f719beec4901597095cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecb3a993c156b7aef91f719b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:16:50 2009 +0100 user32: Allocate user handles for cursors/icons when we don't have 16-bit support. --- dlls/user32/user_private.h | 1 + dlls/user32/winproc.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 41379f0..c383b48 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -129,6 +129,7 @@ enum user_obj_type USER_WINDOW = 1, /* window */ USER_MENU, /* menu */ USER_ACCEL, /* accelerator */ + USER_ICON, /* icon or cursor */ USER_DWP /* DeferWindowPos structure */ }; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index bcb6853..354efe0 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1123,24 +1123,32 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM static HICON alloc_icon_handle( unsigned int size ) { - HGLOBAL16 handle = GlobalAlloc16( GMEM_MOVEABLE, size ); - FarSetOwner16( handle, 0 ); - return HICON_32( handle ); + struct user_object *obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) + size ); + if (!obj) return 0; + return alloc_user_handle( obj, USER_ICON ); } static struct tagCURSORICONINFO *get_icon_ptr( HICON handle ) { - return GlobalLock16( HICON_16(handle) ); + struct user_object *obj = get_user_handle_ptr( handle, USER_ICON ); + if (obj == OBJ_OTHER_PROCESS) + { + WARN( "cursor handle %p from other process\n", handle ); + obj = NULL; + } + return obj ? (struct tagCURSORICONINFO *)(obj + 1) : NULL; } static void release_icon_ptr( HICON handle, struct tagCURSORICONINFO *ptr ) { - GlobalUnlock16( HICON_16(handle) ); + release_user_handle_ptr( (struct user_object *)ptr - 1 ); } static int free_icon_handle( HICON handle ) { - return GlobalFree16( HICON_16(handle) ); + struct user_object *obj = free_user_handle( handle, USER_ICON ); + HeapFree( GetProcessHeap(), 0, obj ); + return !obj; }

1 0

Alexandre Julliard : user32: Reimplement MENU_FindSubMenu on the 16-bit side using only exported functions .
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 00e75f2b9eb117b95e9024c16fa916c3b3f7460d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e75f2b9eb117b95e9024c16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:00:12 2009 +0100 user32: Reimplement MENU_FindSubMenu on the 16-bit side using only exported functions. --- dlls/user32/controls.h | 1 - dlls/user32/menu.c | 2 +- dlls/user32/msg16.c | 22 ++++++++++++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index f9752ee..9392cbe 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -158,7 +158,6 @@ extern void MENU_TrackMouseMenuBar( HWND hwnd, INT ht, POINT pt ) DECLSPEC_HIDDE extern void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar ) DECLSPEC_HIDDEN; extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd, BOOL suppress_draw ) DECLSPEC_HIDDEN; -extern UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget ) DECLSPEC_HIDDEN; extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; /* nonclient area */ diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 9205146..0f083ff 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -656,7 +656,7 @@ static MENUITEM *MENU_FindItem( HMENU *hmenu, UINT *nPos, UINT wFlags ) * *hmenu in case it is found in another sub-menu. * If the submenu cannot be found, NO_SELECTED_ITEM is returned. */ -UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget ) +static UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget ) { POPUPMENU *menu; UINT i; diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index 0866875..672e4a2 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -587,6 +587,24 @@ static HANDLE16 convert_handle_32_to_16(UINT_PTR src, unsigned int flags) return dst; } +static int find_sub_menu( HMENU *hmenu, HMENU16 target ) +{ + int i, pos, count = GetMenuItemCount( *hmenu ); + + for (i = 0; i < count; i++) + { + HMENU sub = GetSubMenu( *hmenu, i ); + if (!sub) continue; + if (HMENU_16(sub) == target) return i; + if ((pos = find_sub_menu( &sub, target )) != -1) + { + *hmenu = sub; + return pos; + } + } + return -1; +} + /********************************************************************** * WINPROC_CallProc16To32A */ @@ -825,8 +843,8 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 if((LOWORD(lParam) & MF_POPUP) && (LOWORD(lParam) != 0xFFFF)) { HMENU hmenu = HMENU_32(HIWORD(lParam)); - UINT pos = MENU_FindSubMenu( &hmenu, HMENU_32(wParam) ); - if (pos == 0xffff) pos = 0; /* NO_SELECTED_ITEM */ + int pos = find_sub_menu( &hmenu, wParam ); + if (pos == -1) pos = 0; wParam = pos; } ret = callback( hwnd32, msg, MAKEWPARAM( wParam, LOWORD(lParam) ),

1 0

Alexandre Julliard : user32: Call the cursor/ icon handle allocation functions through the WoW handlers table.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: b36ca4860803aa076e138537347edaa872da9c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36ca4860803aa076e1385373… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:06:50 2009 +0100 user32: Call the cursor/icon handle allocation functions through the WoW handlers table. --- dlls/user32/controls.h | 4 ++ dlls/user32/cursoricon.c | 75 ++++++++++++++++----------------------------- dlls/user32/msg16.c | 33 +++++++++++++++++++- dlls/user32/winproc.c | 28 ++++++++++++++++- 4 files changed, 90 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b36ca4860803aa076e138…

1 0

Alexandre Julliard : user32: Don't assume global handles in CopyIcon.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 0f511f3c8e3105b00953648a8a072bfaada94ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f511f3c8e3105b00953648a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:13:49 2009 +0100 user32: Don't assume global handles in CopyIcon. --- dlls/user32/cursoricon.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 90f8356..2b2151a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1451,11 +1451,12 @@ HICON WINAPI CopyIcon( HICON hIcon ) { CURSORICONINFO *ptrOld, *ptrNew; int size; - HICON16 hOld = HICON_16(hIcon); HICON hNew; if (!(ptrOld = wow_handlers.get_icon_ptr( hIcon ))) return 0; - size = GlobalSize16( hOld ); + size = sizeof(CURSORICONINFO); + size += ptrOld->nHeight * get_bitmap_width_bytes( ptrOld->nWidth, 1 ); /* and bitmap */ + size += ptrOld->nHeight * ptrOld->nWidthBytes; /* xor bitmap */ hNew = wow_handlers.alloc_icon_handle( size ); ptrNew = wow_handlers.get_icon_ptr( hNew ); memcpy( ptrNew, ptrOld, size );

1 0

Alexandre Julliard : user32: Add wrapper functions for manipulation of cursor/icon handles.
by Alexandre Julliard Dec. 23, 2009

Dec. 23, 2009

Module: wine Branch: master Commit: 0280f058f9b2f9ec761e46efd10bcac950dd178e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0280f058f9b2f9ec761e46efd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 17:04:33 2009 +0100 user32: Add wrapper functions for manipulation of cursor/icon handles. --- dlls/user32/cursoricon.c | 110 ++++++++++++++++++++++++++++----------------- dlls/user32/user16.c | 53 +++++++++++++++------- 2 files changed, 105 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0280f058f9b2f9ec761e4…

1 0