December 2009 - Wine-commits

Nikolay Sivov : comctl32/updown: Don't update buddy text if it's the same.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 750ce6be35c44052f453d26aac44b4fe636472f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750ce6be35c44052f453d26aa… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 22 21:58:27 2009 +0300 comctl32/updown: Don't update buddy text if it's the same. --- dlls/comctl32/tests/updown.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/comctl32/updown.c | 6 +++++- 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index dacc460..fef53bf 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -59,6 +59,9 @@ #define EDIT_SEQ_INDEX 1 #define UPDOWN_SEQ_INDEX 2 +#define UPDOWN_ID 0 +#define BUDDY_ID 1 + static HWND parent_wnd, g_edit; static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); @@ -156,6 +159,11 @@ static const struct message test_updown_unicode_seq[] = { { 0 } }; +static const struct message test_updown_pos_nochange_seq[] = { + { WM_GETTEXT, sent|id, 0, 0, BUDDY_ID }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -233,6 +241,7 @@ static LRESULT WINAPI edit_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = BUDDY_ID; add_message(sequences, EDIT_SEQ_INDEX, &msg); defwndproc_counter++; @@ -274,6 +283,7 @@ static LRESULT WINAPI updown_subclass_proc(HWND hwnd, UINT message, WPARAM wPara if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = UPDOWN_ID; add_message(sequences, UPDOWN_SEQ_INDEX, &msg); defwndproc_counter++; @@ -360,6 +370,19 @@ static void test_updown_pos(void) ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_pos_seq , "test updown pos", FALSE); DestroyWindow(updown); + + /* there's no attempt to update buddy Edit if text didn't change */ + SetWindowTextA(g_edit, "50"); + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT, g_edit); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + r = SendMessage(updown, UDM_SETPOS, 0, 50); + expect(50,r); + ok_sequence(sequences, EDIT_SEQ_INDEX, test_updown_pos_nochange_seq, + "test updown pos, no change", FALSE); + + DestroyWindow(updown); } static void test_updown_pos32(void) @@ -434,6 +457,19 @@ static void test_updown_pos32(void) ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_pos32_seq, "test updown pos32", FALSE); DestroyWindow(updown); + + /* there's no attempt to update buddy Edit if text didn't change */ + SetWindowTextA(g_edit, "50"); + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT, g_edit); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + r = SendMessage(updown, UDM_SETPOS32, 0, 50); + expect(50,r); + ok_sequence(sequences, EDIT_SEQ_INDEX, test_updown_pos_nochange_seq, + "test updown pos, no change", FALSE); + + DestroyWindow(updown); } static void test_updown_buddy(void) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 127bb40..776d72e 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -310,7 +310,7 @@ static BOOL UPDOWN_GetBuddyInt (UPDOWN_INFO *infoPtr) static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) { WCHAR fmt[3] = { '%', 'd', '\0' }; - WCHAR txt[20]; + WCHAR txt[20], txt_old[20] = { 0 }; int len; if (!((infoPtr->Flags & FLAG_BUDDYINT) && IsWindow(infoPtr->Buddy))) @@ -345,6 +345,10 @@ static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) *dst = 0; } + /* if nothing changed exit earlier */ + GetWindowTextW(infoPtr->Buddy, txt_old, sizeof(txt_old)/sizeof(WCHAR)); + if (lstrcmpiW(txt_old, txt) == 0) return 0; + return SetWindowTextW(infoPtr->Buddy, txt); }

1 0

Nikolay Sivov : comctl32/updown: Don't change control z-order, this breaks auto buddy binding.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 9ef90f480aac68e296c9d42be3ca03a2bd684af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef90f480aac68e296c9d42be… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 22 22:01:31 2009 +0300 comctl32/updown: Don't change control z-order, this breaks auto buddy binding. --- dlls/comctl32/updown.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 776d72e..e87df87 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -868,13 +868,13 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L SetWindowLongW (hwnd, GWL_STYLE, infoPtr->dwStyle & ~WS_BORDER); if (!(infoPtr->dwStyle & UDS_HORZ)) SetWindowPos (hwnd, NULL, 0, 0, DEFAULT_WIDTH, pcs->cy, - SWP_NOOWNERZORDER | SWP_NOMOVE); + SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOMOVE); /* Do we pick the buddy win ourselves? */ if (infoPtr->dwStyle & UDS_AUTOBUDDY) UPDOWN_SetBuddy (infoPtr, GetWindow (hwnd, GW_HWNDPREV)); - OpenThemeData (hwnd, themeClass); + OpenThemeData (hwnd, themeClass); TRACE("UpDown Ctrl creation, hwnd=%p\n", hwnd); }

1 0

Nikolay Sivov : comctl32/tests: Explicitly create rebar for each test, cleanup main function a bit.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 80ed866ff43249fd5728309327c418a640b77c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ed866ff43249fd572830932… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 23 01:41:07 2009 +0300 comctl32/tests: Explicitly create rebar for each test, cleanup main function a bit. --- dlls/comctl32/tests/rebar.c | 163 +++++++++++++++++++++++++++++------------- 1 files changed, 112 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80ed866ff43249fd57283…

1 0

Nikolay Sivov : comctl32/rebar: Fix default just inserted band colors.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 7fa3778d8cd14712ed37eb2ca5293609a97d64f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa3778d8cd14712ed37eb2ca… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 23 02:18:06 2009 +0300 comctl32/rebar: Fix default just inserted band colors. --- dlls/comctl32/rebar.c | 6 ++++-- dlls/comctl32/tests/rebar.c | 21 +++++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index dd385af..90e79d5 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2409,8 +2409,10 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, INT iIndex, LPREBARBANDINFOW lprbbi, BOOL /* initialize band */ memset(lpBand, 0, sizeof(lpBand)); - lpBand->clrFore = infoPtr->clrText; - lpBand->clrBack = infoPtr->clrBk; + lpBand->clrFore = infoPtr->clrText == CLR_NONE ? infoPtr->clrBtnText : + infoPtr->clrText; + lpBand->clrBack = infoPtr->clrBk == CLR_NONE ? infoPtr->clrBtnFace : + infoPtr->clrBk; lpBand->iImage = -1; REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand); diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index df5a93d..e2021d1 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -764,8 +764,8 @@ static void expect_band_content(HWND hRebar, UINT uBand, INT fStyle, COLORREF cl rb.cch = MAX_PATH; ok(SendMessageA(hRebar, RB_GETBANDINFOA, uBand, (LPARAM)&rb), "RB_GETBANDINFO failed\n"); expect_eq(rb.fStyle, fStyle, int, "%x"); - todo_wine expect_eq(rb.clrFore, clrFore, COLORREF, "%x"); - todo_wine expect_eq(rb.clrBack, clrBack, unsigned, "%x"); + expect_eq(rb.clrFore, clrFore, COLORREF, "%x"); + expect_eq(rb.clrBack, clrBack, COLORREF, "%x"); expect_eq(strcmp(rb.lpText, lpText), 0, int, "%d"); expect_eq(rb.iImage, iImage, int, "%x"); expect_eq(rb.hwndChild, hwndChild, HWND, "%p"); @@ -850,6 +850,7 @@ static void test_colors(void) COLORREF clr; BOOL ret; HWND hRebar; + REBARBANDINFOA bi; hRebar = create_rebar_control(); @@ -871,6 +872,22 @@ static void test_colors(void) else skip("RB_GETCOLORSCHEME not supported\n"); + /* check default band colors */ + add_band_w(hRebar, "", 0, 10, 10); + bi.cbSize = REBARBANDINFOA_V6_SIZE; + bi.fMask = RBBIM_COLORS; + bi.clrFore = bi.clrBack = 0xc0ffe; + ret = SendMessage(hRebar, RB_GETBANDINFO, 0, (LPARAM)&bi); + ok(ret, "RB_GETBANDINFO failed\n"); + compare(bi.clrFore, RGB(0, 0, 0), "%x"); + compare(bi.clrBack, GetSysColor(COLOR_3DFACE), "%x"); + + SendMessage(hRebar, RB_SETTEXTCOLOR, 0, RGB(255, 0, 0)); + bi.clrFore = bi.clrBack = 0xc0ffe; + ret = SendMessage(hRebar, RB_GETBANDINFO, 0, (LPARAM)&bi); + ok(ret, "RB_GETBANDINFO failed\n"); + compare(bi.clrFore, RGB(0, 0, 0), "%x"); + DestroyWindow(hRebar); }

1 0

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

23 Dec '09

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 23 Dec '09

23 Dec '09

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

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

23 Dec '09

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: Avoid accessing the window structure directly in Get/SetWindowLong16.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 388814dfa975f8c57b199ed6870f58489be58acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=388814dfa975f8c57b199ed68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 15:25:15 2009 +0100 user32: Avoid accessing the window structure directly in Get/SetWindowLong16. --- dlls/user32/wnd16.c | 69 +++++++++++++++++--------------------------------- 1 files changed, 24 insertions(+), 45 deletions(-) diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index dfcd71f..b4741ff 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -821,44 +821,36 @@ WORD WINAPI SetWindowWord16( HWND16 hwnd, INT16 offset, WORD newval ) /********************************************************************** * GetWindowLong (USER.135) */ -LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) +LONG WINAPI GetWindowLong16( HWND16 hwnd16, INT16 offset ) { - WND *wndPtr; + HWND hwnd = WIN_Handle32( hwnd16 ); LONG_PTR retvalue; BOOL is_winproc = (offset == GWLP_WNDPROC); if (offset >= 0) { - if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) + int cbWndExtra = GetClassLongA( hwnd, GCL_CBWNDEXTRA ); + + if (offset > (int)(cbWndExtra - sizeof(LONG))) { - if (offset > (int)(wndPtr->cbWndExtra - sizeof(LONG))) + /* + * Some programs try to access last element from 16 bit + * code using illegal offset value. Hopefully this is + * what those programs really expect. + */ + if (cbWndExtra >= 4 && offset == cbWndExtra - sizeof(WORD)) { - /* - * Some programs try to access last element from 16 bit - * code using illegal offset value. Hopefully this is - * what those programs really expect. - */ - if (wndPtr->cbWndExtra >= 4 && offset == wndPtr->cbWndExtra - sizeof(WORD)) - { - offset = wndPtr->cbWndExtra - sizeof(LONG); - } - else - { - WIN_ReleasePtr( wndPtr ); - SetLastError( ERROR_INVALID_INDEX ); - return 0; - } + offset = cbWndExtra - sizeof(LONG); + } + else + { + SetLastError( ERROR_INVALID_INDEX ); + return 0; } - is_winproc = ((offset == DWLP_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG)); - WIN_ReleasePtr( wndPtr ); } + else if (offset == DWLP_DLGPROC) is_winproc = (DIALOG_get_info( hwnd, FALSE ) != NULL); } - retvalue = GetWindowLongA( WIN_Handle32(hwnd), offset ); + retvalue = GetWindowLongA( hwnd, offset ); if (is_winproc) retvalue = (LONG_PTR)WINPROC_GetProc16( (WNDPROC)retvalue, FALSE ); return retvalue; } @@ -867,33 +859,20 @@ LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) /********************************************************************** * SetWindowLong (USER.136) */ -LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval ) +LONG WINAPI SetWindowLong16( HWND16 hwnd16, INT16 offset, LONG newval ) { - WND *wndPtr; + HWND hwnd = WIN_Handle32( hwnd16 ); BOOL is_winproc = (offset == GWLP_WNDPROC); - if (offset == DWLP_DLGPROC) - { - if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) - { - is_winproc = ((wndPtr->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && - (wndPtr->flags & WIN_ISDIALOG)); - WIN_ReleasePtr( wndPtr ); - } - } + if (offset == DWLP_DLGPROC) is_winproc = (DIALOG_get_info( hwnd, FALSE ) != NULL); if (is_winproc) { WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval ); - WNDPROC old_proc = (WNDPROC)SetWindowLongPtrA( WIN_Handle32(hwnd), offset, (LONG_PTR)new_proc ); + WNDPROC old_proc = (WNDPROC)SetWindowLongPtrA( hwnd, offset, (LONG_PTR)new_proc ); return (LONG)WINPROC_GetProc16( old_proc, FALSE ); } - else return SetWindowLongA( WIN_Handle32(hwnd), offset, newval ); + else return SetWindowLongA( hwnd, offset, newval ); }

1 0

Eric Pouech : dbghelp: Create a cpu backend to store CPU dependent code, and use it for the i386 stack implementation.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 7230659ce924327be9caae74df01d0a084095235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7230659ce924327be9caae74d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 22 14:21:07 2009 +0100 dbghelp: Create a cpu backend to store CPU dependent code, and use it for the i386 stack implementation. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/cpu_i386.c | 348 ++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp.c | 22 ++ dlls/dbghelp/dbghelp_private.h | 39 ++++ dlls/dbghelp/stack.c | 456 +++++----------------------------------- 5 files changed, 467 insertions(+), 399 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7230659ce924327be9caa…

1 0

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

23 Dec '09

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