January 2006 - Wine-commits

Robert Shearman : rpcrt4: Don't release the interface pointer on failure.
by Alexandre Julliard 10 Jan '06

10 Jan '06

Module: wine Branch: refs/heads/master Commit: e298538459acf2d5c96f762a1f863f286b375891 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e298538459acf2d5c96f762… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 10 19:59:26 2006 +0100 rpcrt4: Don't release the interface pointer on failure. Don't release the interface pointer on failure since we are not the ones that allocated it. It is the caller's responsability to call NdrInterfacePointerFree, where the freeing is supposed to happen. --- dlls/rpcrt4/ndr_ole.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 0919f9f..5d7cccf 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -261,10 +261,8 @@ unsigned char * WINAPI NdrInterfacePoint pStubMsg->dwDestContext, pStubMsg->pvDestContext, MSHLFLAGS_NORMAL); IStream_Release(stream); - if (FAILED(hr)) { - IUnknown_Release((LPUNKNOWN)pMemory); + if (FAILED(hr)) RpcRaiseException(hr); - } } } return NULL;

1 0

Robert Shearman : kernel32: Return an error when unlocking a global with a zero lock count.
by Alexandre Julliard 10 Jan '06

10 Jan '06

Module: wine Branch: refs/heads/master Commit: cb7aa0306e0b7f6aa35090df7a8d08597b74c6e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb7aa0306e0b7f6aa35090d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 10 19:59:15 2006 +0100 kernel32: Return an error when unlocking a global with a zero lock count. Rename GLOBAL_LOCK_MAX to the public GMEM_LOCKCOUNT. --- dlls/kernel/heap.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index ac3b6b2..6c0b913 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -299,7 +299,6 @@ SIZE_T WINAPI HeapSize( HANDLE heap, DWO */ #define MAGIC_GLOBAL_USED 0x5342 -#define GLOBAL_LOCK_MAX 0xFF #define HANDLE_TO_INTERN(h) ((PGLOBAL32_INTERN)(((char *)(h))-2)) #define INTERN_TO_HANDLE(i) ((HGLOBAL) &((i)->Pointer)) #define POINTER_TO_HANDLE(p) (*(((HGLOBAL *)(p))-2)) @@ -416,8 +415,8 @@ LPVOID WINAPI GlobalLock( palloc = pintern->Pointer; if (!pintern->Pointer) SetLastError(ERROR_DISCARDED); - else if (pintern->LockCount < GLOBAL_LOCK_MAX) - pintern->LockCount++; + else if (pintern->LockCount < GMEM_LOCKCOUNT) + pintern->LockCount++; } else { @@ -461,11 +460,18 @@ BOOL WINAPI GlobalUnlock( pintern=HANDLE_TO_INTERN(hmem); if(pintern->Magic==MAGIC_GLOBAL_USED) { - if((pintern->LockCount<GLOBAL_LOCK_MAX)&&(pintern->LockCount>0)) + if(pintern->LockCount) + { pintern->LockCount--; - - locked = (pintern->LockCount != 0); - if (!locked) SetLastError(NO_ERROR); + locked = (pintern->LockCount != 0); + if (!locked) SetLastError(NO_ERROR); + } + else + { + WARN("%p not locked\n", hmem); + SetLastError(ERROR_NOT_LOCKED); + locked = FALSE; + } } else {

1 0

Huw Davies : msxml: It's valid to release an empty document.
by Alexandre Julliard 10 Jan '06

10 Jan '06

Module: wine Branch: refs/heads/master Commit: a48bb7b3de2f676eb8de4af7000102a165904c11 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a48bb7b3de2f676eb8de4af… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 10 19:58:42 2006 +0100 msxml: It's valid to release an empty document. --- dlls/msxml3/node.c | 4 ++-- dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ae96fa1..704e92e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -743,8 +743,8 @@ static ULONG WINAPI Internal_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - assert( This->node->doc ); - xmldoc_release( This->node->doc ); + if( This->node ) + xmldoc_release( This->node->doc ); HeapFree( GetProcessHeap(), 0, This ); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bb378c7..49c303b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -517,6 +517,13 @@ static void test_refs(void) CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); if( r != S_OK ) return; + ref = IXMLDOMDocument_Release(doc); + ok( ref == 0, "ref %ld\n", ref); + + r = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); + if( r != S_OK ) + return; str = SysAllocString( szComplete4 ); r = IXMLDOMDocument_loadXML( doc, str, &b );

1 0

Saulius Krasuckas : mscms: Enumerate registered standard colorspace profiles.
by Alexandre Julliard 10 Jan '06

10 Jan '06

Module: wine Branch: refs/heads/master Commit: ab113d7e5990bf55caffd54f8e26aece473a2bd9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab113d7e5990bf55caffd54… Author: Saulius Krasuckas <saulius.krasuckas(a)gmail.com> Date: Tue Jan 10 19:59:02 2006 +0100 mscms: Enumerate registered standard colorspace profiles. --- dlls/mscms/tests/profile.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 0797161..8fd572c 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -439,6 +439,59 @@ static void test_GetCountColorProfileEle } } +typedef struct colorspace_description_struct { + DWORD dwID; + char *szName; +} colorspace_descr; + +#define describe_colorspace(id) {id, #id} + +colorspace_descr known_colorspaces[] = { + describe_colorspace(SPACE_XYZ), + describe_colorspace(SPACE_Lab), + describe_colorspace(SPACE_Luv), + describe_colorspace(SPACE_YCbCr), + describe_colorspace(SPACE_Yxy), + describe_colorspace(SPACE_RGB), + describe_colorspace(SPACE_GRAY), + describe_colorspace(SPACE_HSV), + describe_colorspace(SPACE_HLS), + describe_colorspace(SPACE_CMYK), + describe_colorspace(SPACE_CMY), + describe_colorspace(SPACE_2_CHANNEL), + describe_colorspace(SPACE_3_CHANNEL), + describe_colorspace(SPACE_4_CHANNEL), + describe_colorspace(SPACE_5_CHANNEL), + describe_colorspace(SPACE_6_CHANNEL), + describe_colorspace(SPACE_7_CHANNEL), + describe_colorspace(SPACE_8_CHANNEL) +}; + +static void enum_registered_color_profiles(void) +{ + BOOL ret; + DWORD size, count, i, present; + CHAR profile[MAX_PATH]; + + size = sizeof(profile); + count = sizeof(known_colorspaces)/sizeof(known_colorspaces[0]); + + present = 0; + trace("\n"); + trace("Searching for registered standard colorspace profiles:\n"); + for (i=0; i<count; i++) + { + ret = pGetStandardColorSpaceProfileA(NULL, known_colorspaces[i].dwID, profile, &size); + if (ret) + { + present++; + trace(" found %s\n", known_colorspaces[i].szName); + } + } + trace("Total profiles found: %ld.\n", present); + trace("\n"); +} + #define fail_GSCSPA(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ do { \ size = dwSz; \ @@ -1116,6 +1169,8 @@ START_TEST(profile) test_GetCountColorProfileElements(); + enum_registered_color_profiles(); + test_GetStandardColorSpaceProfileA(); test_GetStandardColorSpaceProfileW();

1 0

Phil Krylov : comctl32: Fix emitting of NM_CUSTOMDRAW header notifications.
by Alexandre Julliard 10 Jan '06

10 Jan '06

Module: wine Branch: refs/heads/master Commit: 1b9fc2a170b17888e71fa229657d02240f37ffb5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b9fc2a170b17888e71fa22… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Tue Jan 10 19:58:24 2006 +0100 comctl32: Fix emitting of NM_CUSTOMDRAW header notifications. Emit NM_CUSTOMDRAW header notifications for all headers, not only ownerdrawn. Allow to change item text and background colors in an application's NM_CUSTOMDRAW handler. --- dlls/comctl32/header.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 4b533fc..5e1c4c8 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -166,6 +166,7 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT RECT r; INT oldBkMode, cxEdge = GetSystemMetrics(SM_CXEDGE); HTHEME theme = GetWindowTheme (hwnd); + NMCUSTOMDRAW nmcd; TRACE("DrawItem(iItem %d bHotTrack %d unicode flag %d)\n", iItem, bHotTrack, infoPtr->bUnicode); @@ -205,22 +206,24 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT r.left -= cxEdge; r.right += cxEdge; + /* Set the colors before sending NM_CUSTOMDRAW so that it can change them */ + SetTextColor (hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); + SetBkColor(hdc, GetSysColor(COLOR_3DFACE)); + + nmcd.hdr.hwndFrom = hwnd; + nmcd.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); + nmcd.hdr.code = NM_CUSTOMDRAW; + nmcd.dwDrawStage = CDDS_PREPAINT | CDDS_ITEM | CDDS_ITEMPOSTERASE; + nmcd.hdc = hdc; + nmcd.dwItemSpec = iItem; + nmcd.rc = r; + nmcd.uItemState = phdi->bDown ? CDIS_SELECTED : 0; + nmcd.lItemlParam = phdi->lParam; + + SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + if (phdi->fmt & HDF_OWNERDRAW) { DRAWITEMSTRUCT dis; - NMCUSTOMDRAW nmcd; - - nmcd.hdr.hwndFrom = hwnd; - nmcd.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - nmcd.hdr.code = NM_CUSTOMDRAW; - nmcd.dwDrawStage = CDDS_PREPAINT | CDDS_ITEM | CDDS_ITEMPOSTERASE; - nmcd.hdc = hdc; - nmcd.dwItemSpec = iItem; - nmcd.rc = r; - nmcd.uItemState = phdi->bDown ? CDIS_SELECTED : 0; - nmcd.lItemlParam = phdi->lParam; - - SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmcd.hdr.idFrom, (LPARAM)&nmcd); dis.CtlType = ODT_HEADER; dis.CtlID = GetWindowLongPtrW (hwnd, GWLP_ID); @@ -249,6 +252,14 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT rw = r.right - r.left; rh = r.bottom - r.top; + if (theme == NULL) { + HBRUSH hbr = CreateSolidBrush(GetBkColor(hdc)); + RECT rcBackground = r; + + rcBackground.right -= cxEdge; + FillRect(hdc, &rcBackground, hbr); + DeleteObject(hbr); + } if (phdi->fmt & HDF_STRING) { RECT textRect; @@ -344,7 +355,6 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT HDF_BITMAP_ON_RIGHT|HDF_IMAGE)))) /* no explicit format specified? */ && (phdi->pszText)) { oldBkMode = SetBkMode(hdc, TRANSPARENT); - SetTextColor (hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); r.left = tx; r.right = tx + tw; DrawTextW (hdc, phdi->pszText, -1,

1 0

Phil Krylov : riched20: Allow NUL characters.
by Alexandre Julliard 10 Jan '06

10 Jan '06

Module: wine Branch: refs/heads/master Commit: f5ebb75f08f5d417b38fe1ce84f13a6240611bdd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f5ebb75f08f5d417b38fe1c… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Tue Jan 10 19:58:00 2006 +0100 riched20: Allow NUL characters. --- dlls/riched20/string.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index c9057bf..6d23e2f 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -40,13 +40,13 @@ ME_String *ME_MakeString(LPCWSTR szText) ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) { ME_String *s = ALLOC_OBJ(ME_String); - int i; - for (i=0; i<nMaxChars && szText[i]; i++) - ; - s->nLen = i; + + s->nLen = nMaxChars; s->nBuffer = ME_GetOptimalBuffer(s->nLen+1); s->szData = ALLOC_N_OBJ(WCHAR, s->nBuffer); - lstrcpynW(s->szData, szText, s->nLen+1); + /* Native allows NUL chars */ + memmove(s->szData, szText, s->nLen * sizeof(WCHAR)); + s->szData[s->nLen] = 0; return s; }

1 0

Robert Shearman : kernel: Remove wine/server.h include from files where it is no longer needed.
by Alexandre Julliard 10 Jan '06

10 Jan '06

Module: wine Branch: refs/heads/master Commit: f61878b1d5e4488163a08529c19f656d21313b01 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f61878b1d5e4488163a0852… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 10 18:09:28 2006 +0100 kernel: Remove wine/server.h include from files where it is no longer needed. --- dlls/kernel/atom.c | 1 - dlls/kernel/atom16.c | 2 +- dlls/kernel/environ.c | 1 - dlls/kernel/file16.c | 1 - dlls/kernel/module.c | 1 - dlls/kernel/oldconfig.c | 1 - dlls/kernel/profile.c | 1 - dlls/kernel/task.c | 1 - dlls/kernel/toolhelp16.c | 5 +++-- 9 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/atom.c b/dlls/kernel/atom.c index 7dd1b66..510eb61 100644 --- a/dlls/kernel/atom.c +++ b/dlls/kernel/atom.c @@ -35,7 +35,6 @@ #include "wine/exception.h" #include "excpt.h" -#include "wine/server.h" #include "wine/unicode.h" #include "kernel_private.h" diff --git a/dlls/kernel/atom16.c b/dlls/kernel/atom16.c index 698ad14..9ea65b9 100644 --- a/dlls/kernel/atom16.c +++ b/dlls/kernel/atom16.c @@ -37,8 +37,8 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" -#include "wine/server.h" #include "wine/unicode.h" #include "wine/winbase16.h" #include "kernel_private.h" diff --git a/dlls/kernel/environ.c b/dlls/kernel/environ.c index 2d8f267..ecae8fe 100644 --- a/dlls/kernel/environ.c +++ b/dlls/kernel/environ.c @@ -31,7 +31,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/server.h" #include "wine/library.h" #include "winternl.h" #include "wine/unicode.h" diff --git a/dlls/kernel/file16.c b/dlls/kernel/file16.c index 6353cd8..0ac6fad 100644 --- a/dlls/kernel/file16.c +++ b/dlls/kernel/file16.c @@ -37,7 +37,6 @@ #include "winbase.h" #include "winternl.h" #include "wine/winbase16.h" -#include "wine/server.h" #include "kernel_private.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/kernel/module.c b/dlls/kernel/module.c index 4610adf..432cd69 100644 --- a/dlls/kernel/module.c +++ b/dlls/kernel/module.c @@ -43,7 +43,6 @@ #include "wine/exception.h" #include "wine/debug.h" #include "wine/unicode.h" -#include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(module); diff --git a/dlls/kernel/oldconfig.c b/dlls/kernel/oldconfig.c index 47e249f..6114ee4 100644 --- a/dlls/kernel/oldconfig.c +++ b/dlls/kernel/oldconfig.c @@ -49,7 +49,6 @@ #include "winioctl.h" #include "ntddscsi.h" #include "wine/library.h" -#include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" #include "kernel_private.h" diff --git a/dlls/kernel/profile.c b/dlls/kernel/profile.c index b704dd0..523357d 100644 --- a/dlls/kernel/profile.c +++ b/dlls/kernel/profile.c @@ -32,7 +32,6 @@ #include "winternl.h" #include "wine/winbase16.h" #include "wine/unicode.h" -#include "wine/server.h" #include "wine/library.h" #include "wine/debug.h" diff --git a/dlls/kernel/task.c b/dlls/kernel/task.c index 678e372..7265b73 100644 --- a/dlls/kernel/task.c +++ b/dlls/kernel/task.c @@ -39,7 +39,6 @@ #include "wine/winbase16.h" #include "thread.h" #include "winternl.h" -#include "wine/server.h" #include "toolhelp.h" #include "kernel_private.h" #include "kernel16_private.h" diff --git a/dlls/kernel/toolhelp16.c b/dlls/kernel/toolhelp16.c index 23b206a..58c1cf6 100644 --- a/dlls/kernel/toolhelp16.c +++ b/dlls/kernel/toolhelp16.c @@ -30,10 +30,11 @@ #include <assert.h> #include "windef.h" #include "winbase.h" -#include "wine/winbase16.h" +#include "winternl.h" #include "winerror.h" + +#include "wine/winbase16.h" #include "toolhelp.h" -#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(toolhelp);

1 0

Alexandre Julliard : ntdll: NtRaiseException doesn't need to be a register function.
by Alexandre Julliard 10 Jan '06

10 Jan '06

Module: wine Branch: refs/heads/master Commit: 90e38659291dc475f3340427580a170408289861 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90e38659291dc475f334042… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 17:51:22 2006 +0100 ntdll: NtRaiseException doesn't need to be a register function. Moved common code between NtRaiseException and RtlRaiseException to a separate raise_exception function. --- dlls/ntdll/exception.c | 199 ++++++++++++++++++++++++++---------------------- dlls/ntdll/ntdll.spec | 2 include/winternl.h | 2 3 files changed, 110 insertions(+), 93 deletions(-)

1 0

Alexandre Julliard : kernel: Implement FT_Exit directly in assembly to avoid the overhead
by Alexandre Julliard 10 Jan '06

10 Jan '06

Module: wine Branch: refs/heads/master Commit: 52bce47b1463d5da3b39fb5bf0f2d786b5ac5ed4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=52bce47b1463d5da3b39fb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 17:43:05 2006 +0100 kernel: Implement FT_Exit directly in assembly to avoid the overhead of register functions. --- dlls/kernel/kernel32.spec | 30 +++++++++++++++--------------- dlls/kernel/thunk.c | 36 ++++++++++-------------------------- 2 files changed, 25 insertions(+), 41 deletions(-) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index a467c5c..5524cd1 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -348,21 +348,21 @@ @ stub ExpungeConsoleCommandHistoryA @ stub ExpungeConsoleCommandHistoryW @ stub ExtendVirtualBuffer -@ stdcall -i386 -register FT_Exit0() -@ stdcall -i386 -register FT_Exit12() -@ stdcall -i386 -register FT_Exit16() -@ stdcall -i386 -register FT_Exit20() -@ stdcall -i386 -register FT_Exit24() -@ stdcall -i386 -register FT_Exit28() -@ stdcall -i386 -register FT_Exit32() -@ stdcall -i386 -register FT_Exit36() -@ stdcall -i386 -register FT_Exit40() -@ stdcall -i386 -register FT_Exit44() -@ stdcall -i386 -register FT_Exit48() -@ stdcall -i386 -register FT_Exit4() -@ stdcall -i386 -register FT_Exit52() -@ stdcall -i386 -register FT_Exit56() -@ stdcall -i386 -register FT_Exit8() +@ stdcall -i386 -norelay FT_Exit0() +@ stdcall -i386 -norelay FT_Exit12() +@ stdcall -i386 -norelay FT_Exit16() +@ stdcall -i386 -norelay FT_Exit20() +@ stdcall -i386 -norelay FT_Exit24() +@ stdcall -i386 -norelay FT_Exit28() +@ stdcall -i386 -norelay FT_Exit32() +@ stdcall -i386 -norelay FT_Exit36() +@ stdcall -i386 -norelay FT_Exit40() +@ stdcall -i386 -norelay FT_Exit44() +@ stdcall -i386 -norelay FT_Exit48() +@ stdcall -i386 -norelay FT_Exit4() +@ stdcall -i386 -norelay FT_Exit52() +@ stdcall -i386 -norelay FT_Exit56() +@ stdcall -i386 -norelay FT_Exit8() @ stdcall -i386 -register FT_Prolog() @ stdcall -i386 -register FT_Thunk() @ stdcall FatalAppExitA(long str) diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c index 863547a..c16df31 100644 --- a/dlls/kernel/thunk.c +++ b/dlls/kernel/thunk.c @@ -626,6 +626,8 @@ void WINAPI __regs_FT_Thunk( CONTEXT86 * DEFINE_REGS_ENTRYPOINT( FT_Thunk, 0, 0 ); #endif +#ifdef __i386__ + /*********************************************************************** * FT_Exit0 (KERNEL32.@) * FT_Exit4 (KERNEL32.@) @@ -651,33 +653,15 @@ DEFINE_REGS_ENTRYPOINT( FT_Thunk, 0, 0 ) * and perform a return to the CALLER of the thunk code (while removing * the given number of arguments from the caller's stack). */ -static inline void FT_Exit(CONTEXT86 *context) -{ - /* Return value is in EBX */ - context->Eax = context->Ebx; - - /* Restore EBX, ESI, and EDI registers */ - context->Ebx = *(DWORD *)(context->Ebp - 4); - context->Esi = *(DWORD *)(context->Ebp - 8); - context->Edi = *(DWORD *)(context->Ebp - 12); - - /* Clean up stack frame */ - context->Esp = context->Ebp; - context->Ebp = stack32_pop(context); - - /* Pop return address to CALLER of thunk code */ - context->Eip = stack32_pop(context); -} - -#ifdef DEFINE_REGS_ENTRYPOINT +#define FT_EXIT_RESTORE_REGS \ + "movl %ebx,%eax\n\t" \ + "movl -4(%ebp),%ebx\n\t" \ + "movl -8(%ebp),%esi\n\t" \ + "movl -12(%ebp),%edi\n\t" \ + "leave\n\t" #define DEFINE_FT_Exit(n) \ -void WINAPI __regs_FT_Exit ## n(CONTEXT86 *context) \ -{ \ - FT_Exit(context); \ - context->Esp += n; \ -} \ -DEFINE_REGS_ENTRYPOINT( FT_Exit ## n, 0, 0 ) + __ASM_GLOBAL_FUNC( FT_Exit ## n, FT_EXIT_RESTORE_REGS "ret $" #n ); DEFINE_FT_Exit(0); DEFINE_FT_Exit(4); @@ -695,7 +679,7 @@ DEFINE_FT_Exit(48); DEFINE_FT_Exit(52); DEFINE_FT_Exit(56); -#endif /* DEFINE_REGS_ENTRYPOINT */ +#endif /* __i386__ */ /***********************************************************************

1 0

Alexandre Julliard : kernel: Don't send a debugger event in UnhandledExceptionFilter,
by Alexandre Julliard 10 Jan '06

10 Jan '06

Module: wine Branch: refs/heads/master Commit: 8b84808bed1335ffdc86f9dabca1cd55b1920326 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b84808bed1335ffdc86f9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 17:44:39 2006 +0100 kernel: Don't send a debugger event in UnhandledExceptionFilter, leave that to the standard ntdll exception handling. --- dlls/kernel/except.c | 51 +------------------------------------------------- 1 files changed, 1 insertions(+), 50 deletions(-) diff --git a/dlls/kernel/except.c b/dlls/kernel/except.c index 1b33da5..1c97a2e 100644 --- a/dlls/kernel/except.c +++ b/dlls/kernel/except.c @@ -51,7 +51,6 @@ #include "wine/exception.h" #include "wine/library.h" #include "excpt.h" -#include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -175,38 +174,6 @@ static int format_exception_msg( const E } -/********************************************************************** - * send_debug_event - * - * Send an EXCEPTION_DEBUG_EVENT event to the debugger. - */ -static NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *context ) -{ - NTSTATUS ret; - HANDLE handle = 0; - - SERVER_START_REQ( queue_exception_event ) - { - req->first = first_chance; - wine_server_add_data( req, context, sizeof(*context) ); - wine_server_add_data( req, rec, sizeof(*rec) ); - if (!(ret = wine_server_call( req ))) handle = reply->handle; - } - SERVER_END_REQ; - if (ret) return ret; - - WaitForSingleObject( handle, INFINITE ); - - SERVER_START_REQ( get_exception_status ) - { - req->handle = handle; - wine_server_set_reply( req, context, sizeof(*context) ); - ret = wine_server_call( req ); - } - SERVER_END_REQ; - return ret; -} - /****************************************************************** * start_debugger * @@ -452,8 +419,6 @@ inline static BOOL check_resource_write( */ DWORD WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers) { - NTSTATUS status; - if (check_resource_write( epointers->ExceptionRecord )) return EXCEPTION_CONTINUE_EXECUTION; if (!NtCurrentTeb()->Peb->BeingDebugged) @@ -475,21 +440,7 @@ DWORD WINAPI UnhandledExceptionFilter(PE if (!start_debugger_atomic( epointers ) || !NtCurrentTeb()->Peb->BeingDebugged) return EXCEPTION_EXECUTE_HANDLER; } - - /* send a last chance event to the debugger */ - status = send_debug_event( epointers->ExceptionRecord, FALSE, epointers->ContextRecord ); - switch (status) - { - case DBG_CONTINUE: - return EXCEPTION_CONTINUE_EXECUTION; - case DBG_EXCEPTION_NOT_HANDLED: - TerminateProcess( GetCurrentProcess(), epointers->ExceptionRecord->ExceptionCode ); - break; /* not reached */ - default: - FIXME("Unhandled error on debug event: %lx\n", status); - break; - } - return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_SEARCH; }

1 0