wine-commits August 2007

wine-commits@winehq.org

3 participants
1085 discussions

Mikolaj Zalewski : winex11.drv: wintab: Copy also the button #0 state.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: ee2db299deb19c76a5ff9a5338b3640b490494e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2db299deb19c76a5ff9a533… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Aug 30 12:41:37 2007 -0700 winex11.drv: wintab: Copy also the button #0 state. --- dlls/winex11.drv/wintab.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index eece156..8846342 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -571,11 +571,11 @@ static void set_button_state(XID deviceid) { int loop2; XButtonState *button_state = (XButtonState*)class; - for (loop2 = 1; loop2 <= button_state->num_buttons; loop2++) + for (loop2 = 0; loop2 < button_state->num_buttons; loop2++) { if (button_state->buttons[loop2 / 8] & (1 << (loop2 % 8))) { - rc |= (1<<(loop2-1)); + rc |= (1<<loop2); } } }

1 0

Mikolaj Zalewski : user32: combo: CB_SETITEMHEIGHT should make the edit area 2px higher than the item ( with testcase).
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 71d77d98e276cb0036c409fee99eaab7391cae94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d77d98e276cb0036c409fee… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Aug 30 11:45:51 2007 -0700 user32: combo: CB_SETITEMHEIGHT should make the edit area 2px higher than the item (with testcase). --- dlls/user32/combo.c | 2 +- dlls/user32/tests/combo.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 084e612..1e801a3 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1640,7 +1640,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) { if( height < 32768 ) { - lphc->editHeight = height; + lphc->editHeight = height + 2; /* Is the 2 for 2*EDIT_CONTROL_PADDING? */ /* * Redo the layout of the control. diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 642c49d..f7cb467 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -69,6 +69,29 @@ static int is_font_installed(const char *name) return ret; } +static void test_setitemheight(DWORD style) +{ + HWND hCombo = build_combo(style); + RECT r; + int i; + + trace("Style %x\n", style); + GetClientRect(hCombo, &r); + expect_rect(r, 0, 0, 100, 24); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); + MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); + todo_wine expect_rect(r, 5, 5, 105, 105); + + for (i = 1; i < 30; i++) + { + SendMessage(hCombo, CB_SETITEMHEIGHT, -1, i); + GetClientRect(hCombo, &r); + expect_eq(r.bottom - r.top, i + 6, int, "%d"); + } + + DestroyWindow(hCombo); +} + static void test_setfont(DWORD style) { HWND hCombo = build_combo(style); @@ -224,6 +247,8 @@ START_TEST(combo) test_setfont(CBS_DROPDOWN); test_setfont(CBS_DROPDOWNLIST); + test_setitemheight(CBS_DROPDOWN); + test_setitemheight(CBS_DROPDOWNLIST); test_CBN_SELCHANGE(); DestroyWindow(hMainWnd);

1 0

Lionel Debroux : winex11.drv: Fix memory leak in create_cursor ( found by Smatch).
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: d99882a3843f55dabc30c7d390a310cd2a89b2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d99882a3843f55dabc30c7d39… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Fri Aug 31 08:16:36 2007 +0200 winex11.drv: Fix memory leak in create_cursor (found by Smatch). --- dlls/winex11.drv/mouse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 86dad89..febd1e3 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -763,6 +763,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) pixmapBits = XCreateBitmapFromData( display, root_window, (char *)pXorBits, xmax, ymax ); if (!pixmapBits) { + HeapFree( GetProcessHeap(), 0, bitMask32 ); XFreePixmap( display, pixmapAll ); XFreeGC( display, gc ); image->data = NULL;

1 0

Alexandre Julliard : programs: Remove other obsolete ChangeLog files.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 514b26d9e9bcb3e57db621355cc5e2dccc0e8bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=514b26d9e9bcb3e57db621355… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 31 12:23:40 2007 +0200 programs: Remove other obsolete ChangeLog files. --- programs/clock/ChangeLog | 46 ---------------------------- programs/progman/ChangeLog | 72 -------------------------------------------- programs/winhelp/ChangeLog | 54 --------------------------------- 3 files changed, 0 insertions(+), 172 deletions(-) diff --git a/programs/clock/ChangeLog b/programs/clock/ChangeLog deleted file mode 100644 index 60724e4..0000000 --- a/programs/clock/ChangeLog +++ /dev/null @@ -1,46 +0,0 @@ - *** This file is obsolete. Changes are listed in the main - *** ChangeLog now. Please do not edit. - -Sun Jul 5 20:10:53 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - * Moved "Always on top" menu into system menu (as in Windows) - This required minor changes in - [main.h] [clock.rc] [language.c] [??.rc] - -Fri Jun 12 22:47:56 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - * Fixed resource bug in UpdateWindowCaption() that caused wrong (old) - locale for the displayed date - * The digital clock now shows up (WINE-NLS-UNKNOWN means that there - is no locale rule for time string format in /ole/ole2nls.c) - -Thu May 28 20:42:13 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - * [language.c] - UpdateWindowCaption(), locale and date - UpdateMenuCheckmarks() - General code cleanup (removed obsolete printf's) - -Thu May 28 20:10:36 1998 Mikolaj Zalewski <mikolajz(a)ids.edu.pl> - * [main.c] [winclock.h] - Fixed destroyed background - -Mon May 25 14:30:32 1998 Henrik Olsen <henrik(a)iaeste.dk> - * [Da.rc] - Added Danish language support. - -Wed Mar 11 23:10:37 1998 Karl Backstr�m <karl_b(a)geocities.com> - * [main.c] - Started with the digital clock. - -Tue Feb 24 23:26:40 1998 Karl Backstr�m <karl_b(a)geocities.com> - * [language.c] [language.h] NEW - Moved language stuff here. - * [main.c] [winclock.c] [clock.rc] - Made the clock appear in the center. - Fixed problems with menues. - -Mon Feb 23 19:59:27 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - * [ChangeLog] [De.rc] [En.rc] [Sw.rc] [clock.rc] - [license.c] [license.h] [License_En.c] - [README] [TODO] - [main.c] [main.h] [winclock.c] [winclock.h] - - Originals by Marcel Baur diff --git a/programs/progman/ChangeLog b/programs/progman/ChangeLog deleted file mode 100644 index 166962a..0000000 --- a/programs/progman/ChangeLog +++ /dev/null @@ -1,72 +0,0 @@ - *** This file is obsolete. Changes are listed in the main - *** ChangeLog now. Please do not edit. - -Mon Jul 28 18:28:14 1997 Peter Schlaile <up9n(a)rz.uni-karlsruhe.de> - - * [grpfile.c] - Added checksum calculation [UNTESTED!]. - -Fri Jul 4 12:00:00 1997 Henrik Olsen <henrik(a)iaeste.dk> - - * [Da.rc] (new) - Added Danish language support. - -Tue Jun 3 07:34:26 1997 Marcel Baur <mbaur(a)g26.ethz.ch> - - * [Va.rc] (new) - Added Vallader (Rumantsch Ladin) language support. - -Wed Feb 12 00:58:37 1997 Elker Cavina <elker(a)mail.asianet.it> - - * [It.rc] (new) - Added Italian language support. - -Fri Jan 24 11:21:30 1997 Bang Jun-Young <bangjy(a)nownuri.nowcom.co.kr> - - * [Ko.rc] (new) - Added Korean language support. - -Mon Jul 22 20:30:11 1996 Jussi Tirkkonen <jt(a)modeemi.cs.tut.fi> - - * [Fi.rc] (new) - Added Finnish language support. - -Sun Jun 2 13:14:55 1996 Ulrich Schmid <uschmid(a)mail.hh.provi.de> - - * Program icons: repaint on WM_NCPAINT or WM_PAINTICON - -Sun Apr 14 20:09:19 1996 Pablo Saratxaga <srtxg(a)chanae.alphanet.ch> - - * [Fr.rc] (new) - Added French language support. - -Sun Mar 24 12:28:22 1996 Ulrich Schmid <uschmid(a)mail.hh.provi.de> - - * [Strings_En.c] [Strings_De.c] (deleted) - Use resources for stringtables. - - * [Xx.rc] - Added `WS_TABSTOP' - -Wed Mar 20 13:14:58 1996 Ulrich Schmid <uschmid(a)mail.hh.provi.de> - - * [winexec.c] (deleted) - Moved code to loader/modules.c - -Fri Mar 15 20:56:31 1996 Ulrich Schmid <uschmid(a)mail.hh.provi.de> - - * [main.c] - `Arrange icons' in group windows - - * [program.c] - No sysmenu for program windows - - * [string.c] - Update sysmenu after language change - -Wed Feb 28 19:21:55 1996 Ulrich Schmid <uschmid(a)mail.hh.provi.de> - - * [progman.h] [main.c] [group.c] [program.c] [dialog.c] - [grpfile.c] [string.c] [winexec.c] [license.h] [license.c] [Xx.rc] - [accel.rc] [En.rc] [Strings_En.c] [License_En.c] [De.rc] - [Strings_De.c] Original by Ulrich Schmid diff --git a/programs/winhelp/ChangeLog b/programs/winhelp/ChangeLog deleted file mode 100644 index a677738..0000000 --- a/programs/winhelp/ChangeLog +++ /dev/null @@ -1,54 +0,0 @@ - *** This file is obsolete. Changes are listed in the main - *** ChangeLog now. Please do not edit. - -Mon Mar 23 17:00:36 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - - * Added preliminary Print() dialog in [macro.c] - -Sun Jan 18 23:05:04 1998 Karl Backstr�m <karl_b(a)geocities.com> - - * [Sw.rc] - Added Swedish language support. - -Fri Jul 4 12:00:00 1997 Henrik Olsen <Henrik.Olsen(a)iaeste.dk> - - * [Da.rc] (new) - Added Danish language support. - -Tue Jun 3 07:47:42 1997 Marcel Baur <mbaur(a)g26.ethz.ch - - * [Va.rc] (new) - Added Vallader (Rumantsch Ladin) language support. - -Wed Feb 12 00:58:37 1997 Elker Cavina <elker(a)mail.asianet.it> - - * [It.rc] (new) - Added Italian language support. - -Fri Jan 24 11:27:37 1997 Bang Jun-Young <bangjy(a)nownuri.nowcom.co.kr> - - * [Ko.rc] (new) - Added Korean language support. - -Mon Jul 22 20:30:11 1996 Jussi Tirkkonen <jt(a)modeemi.cs.tut.fi> - - * [Fi.rc] (new) - Added Finnish language support. - -Sat May 18 11:06:02 1996 Pablo Saratxaga <srtxg(a)f2219.n293.z2.fidonet.org> - - * [Fr.rc] (new) - Added French language support. - -Thu May 16 19:24:19 1996 Ulrich Schmid <uschmid(a)mail.hh.provi.de> - - * [macro.lex.l] [macro.yacc.y] - Support older versions of Flex. - -Mon Apr 29 19:48:15 1996 Ulrich Schmid <uschmid(a)mail.hh.provi.de> - - * [winhelp.c] [winhelp.h] [hlpfile.c] [hlpfile.h] - [macro.c] [macro.h] [macro.lex.l] [macro.yacc.y] - [string.c] [En.rc] [De.rc] [Xx.rc] [hlp2sgml.c] - Original by Ulrich Schmid -

1 0

Dmitry Timoshkov : notepad: Get rid of ChangeLog file.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 6e1fb8cc15cd10284255bbbb523c6e5de617a328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e1fb8cc15cd10284255bbbb5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Aug 31 15:48:28 2007 +0900 notepad: Get rid of ChangeLog file. --- programs/notepad/ChangeLog | 56 -------------------------------------------- 1 files changed, 0 insertions(+), 56 deletions(-) diff --git a/programs/notepad/ChangeLog b/programs/notepad/ChangeLog deleted file mode 100644 index cd50462..0000000 --- a/programs/notepad/ChangeLog +++ /dev/null @@ -1,56 +0,0 @@ - *** This file is obsolete. Changes are listed in the main - *** ChangeLog now. Please do not edit. - -Fri Jun 12 23:29:44 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - - Fixed GetDateFormat()->GetTimeFormat() for locale time. - -Mon May 25 14:30:00 1998 Henrik Olsen <henrik(a)iaeste.dk> - * [Da.rc] - - Added Danish language support. - -Fri May 15 23:59:22 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - - Date/Time now uses locale-specific formats - - Language-specific window caption, displays file being edited. - - Started with parsing of command line settings - - Started with DoOpenFile, DoCloseFile, DoSaveFile logics - - Prompt user to save settings when closing a file - -> Introduced a new message box (not yet finished) - - Fixed minor features (missing IDS in main.h, ...) - -Sun Mar 29 20:29:41 1998 Laurent Buffler <laurent(a)bluewin.ch> - * [Fr.rc] - - Added French language support. - -Fri Feb 27 21:03:37 1998 Karl Backstr�m <karl_b(a)geocities.com> - - Fixed some minor features. - -Sat Feb 14 17:42:29 1998 Karl Backstr�m <karl_b(a)geocities.com> - * NEW [language.c] [language.h] - - Takes care of all language related stuff. - - A new [programs] in .winerc is in use. - -Tue Feb 10 23:34:08 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - - Fixed broken language menus - -Fri Feb 06 23.54.35 1998 Karl Backstr�m <karl_b(a)geocities.com> - * [main.c] [main.h] [notepad.rc] - - Fixed language support for menus. - * NEW [dialog.c] [dialog.h] - - Moved all menu and dialog related stuff here. - -Sun Jan 18 23:05:04 1998 Karl Backstr�m <karl_b(a)geocities.com> - * [Sw.rc] - - Added/updated Swedish language support. - -Tue Dec 23 23:35:04 1997 Marcel Baur <mbaur(a)g26.ethz.ch> - - Fixed lots of bugs w/ resources in *.rc - - moved [notepad.c] into [main.c] - - moved [notepad.h] into [main.h] - -Fri Dec 05 20:51:55 1997 Marcel Baur <mbaur(a)g26.ethz.ch> - * [notepad.c] [notepad.h] [notepad.rc] [En.rc] [De.rc] - [license.c] [license.h] [License_En.c] - [README] [TODO] [ChangeLog] - - Originals by Marcel Baur - -

1 0

Dmitry Timoshkov : notepad: We pass OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST to GetOpenFileName, so there is no point in testing file existence.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 4ea5fce0831ebbe188c88e03fbdda00e6481eecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea5fce0831ebbe188c88e03f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Aug 31 16:02:01 2007 +0900 notepad: We pass OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST to GetOpenFileName, so there is no point in testing file existence. --- programs/notepad/dialog.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 0a62c5e..c21c2d7 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -217,7 +217,7 @@ void DoOpenFile(LPCWSTR szFileName) OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) { - ShowLastError(); + AlertFileNotFound(szFileName); return; } @@ -318,12 +318,8 @@ VOID DIALOG_FileOpen(VOID) openfilename.lpstrDefExt = szDefaultExt; - if (GetOpenFileName(&openfilename)) { - if (FileExists(openfilename.lpstrFile)) - DoOpenFile(openfilename.lpstrFile); - else - AlertFileNotFound(openfilename.lpstrFile); - } + if (GetOpenFileName(&openfilename)) + DoOpenFile(openfilename.lpstrFile); }

1 0

Mikolaj Zalewski : winex11.drv: Support GdiAlphaBlend with blendfn. AlphaFormat == 0.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: ee747f3d70597a10af5984783efcb5eccf9e9f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee747f3d70597a10af5984783… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Aug 30 10:43:20 2007 -0700 winex11.drv: Support GdiAlphaBlend with blendfn.AlphaFormat == 0. --- dlls/winex11.drv/xrender.c | 39 +++++++++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 449c671..b659e21 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1524,7 +1524,7 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, XImage *image; GC gc; XGCValues gcv; - BYTE *dstbits, *data; + DWORD *dstbits, *data; int y, y2; POINT pts[2]; BOOL top_down = FALSE; @@ -1580,6 +1580,9 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, return FALSE; } + if ((blendfn.AlphaFormat & AC_SRC_ALPHA) && blendfn.SourceConstantAlpha != 0xff) + FIXME("Ignoring SourceConstantAlpha %d for AC_SRC_ALPHA\n", blendfn.SourceConstantAlpha); + if(dib.dsBm.bmBitsPixel != 32) { FIXME("not a 32 bpp dibsection\n"); return FALSE; @@ -1588,7 +1591,7 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, if(dib.dsBmih.biHeight < 0) { /* top-down dib */ top_down = TRUE; - dstbits += widthSrc * (heightSrc - 1) * 4; + dstbits += widthSrc * (heightSrc - 1); y2 = ySrc; y = y2 + heightSrc - 1; } @@ -1597,10 +1600,34 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, y = dib.dsBmih.biHeight - ySrc - 1; y2 = y - heightSrc + 1; } - for(; y >= y2; y--) { - memcpy(dstbits, (char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes + xSrc * 4, - widthSrc * 4); - dstbits += (top_down ? -1 : 1) * widthSrc * 4; + + if (blendfn.AlphaFormat & AC_SRC_ALPHA) + { + for(; y >= y2; y--) + { + memcpy(dstbits, (char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes + xSrc * 4, + widthSrc * 4); + dstbits += (top_down ? -1 : 1) * widthSrc; + } + } + else + { + DWORD source_alpha = (DWORD)blendfn.SourceConstantAlpha << 24; + int x; + + for(; y >= y2; y--) + { + DWORD *srcbits = (DWORD *)((char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes) + xSrc; + for (x = 0; x < widthSrc; x++) + { + DWORD argb = *srcbits++; + argb = (argb & 0xffffff) | source_alpha; + *dstbits++ = argb; + } + if (top_down) /* we traversed the row forward so we should go back by two rows */ + dstbits -= 2 * widthSrc; + } + } wine_tsx11_lock();

1 0

Francois Gouget : kernel32/tests: Add tests for DebugActiveProcessStop() and DebugSetProcessKillOnExit().
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 9dc6f6cf54d8f08a4e8df89be4baa2496b7d6735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc6f6cf54d8f08a4e8df89be… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 02:37:39 2007 +0200 kernel32/tests: Add tests for DebugActiveProcessStop() and DebugSetProcessKillOnExit(). --- dlls/kernel32/tests/debugger.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 4328232..ac5f2ce 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -32,6 +32,8 @@ static int myARGC; static char** myARGV; +static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); +static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); /* Copied from the process test */ static void get_file_name(char* buf) @@ -119,6 +121,10 @@ typedef struct DWORD debug_err; BOOL attach_rc; DWORD attach_err; + BOOL nokill_rc; + DWORD nokill_err; + BOOL detach_rc; + DWORD detach_err; } debugger_blackbox_t; static void doDebugger(int argc, char** argv) @@ -157,6 +163,24 @@ static void doDebugger(int argc, char** argv) WaitForSingleObject(start_event, INFINITE); } + if (strstr(myARGV[2], "nokill")) + { + blackbox.nokill_rc=pDebugSetProcessKillOnExit(FALSE); + if (!blackbox.nokill_rc) + blackbox.nokill_err=GetLastError(); + } + else + blackbox.nokill_rc=TRUE; + + if (strstr(myARGV[2], "detach")) + { + blackbox.detach_rc=pDebugActiveProcessStop(blackbox.pid); + if (!blackbox.detach_rc) + blackbox.detach_err=GetLastError(); + } + else + blackbox.detach_rc=TRUE; + save_blackbox(logfile, &blackbox, sizeof(blackbox)); trace("debugger: done debugging...\n"); SetEvent(done_event); @@ -234,6 +258,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ok(dbg_blackbox.pid == crash_blackbox.pid, "the child and debugged pids don't match: %d != %d\n", crash_blackbox.pid, dbg_blackbox.pid); ok(dbg_blackbox.debug_rc, "debugger: SetEvent(debug_event) failed err=%d\n", dbg_blackbox.debug_err); ok(dbg_blackbox.attach_rc, "DebugActiveProcess(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.attach_err); + ok(dbg_blackbox.nokill_rc, "DebugSetProcessKillOnExit(FALSE) failed err=%d\n", dbg_blackbox.nokill_err); + ok(dbg_blackbox.detach_rc, "DebugActiveProcessStop(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.detach_err); assert(DeleteFileA(dbglog) != 0); assert(DeleteFileA(childlog) != 0); @@ -327,6 +353,10 @@ static void test_ExitCode(void) crash_and_debug(hkey, test_exe, "dbg,none"); crash_and_debug(hkey, test_exe, "dbg,event,order"); crash_and_debug(hkey, test_exe, "dbg,attach,event,code2"); + if (pDebugSetProcessKillOnExit) + crash_and_debug(hkey, test_exe, "dbg,attach,event,nokill"); + if (pDebugActiveProcessStop) + crash_and_debug(hkey, test_exe, "dbg,attach,event,detach"); if (disposition == REG_CREATED_NEW_KEY) { @@ -355,9 +385,13 @@ static void test_ExitCode(void) START_TEST(debugger) { + HMODULE hdll; - myARGC=winetest_get_mainargs(&myARGV); + hdll=GetModuleHandle("kernel32.dll"); + pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); + pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); + myARGC=winetest_get_mainargs(&myARGV); if (myARGC >= 3 && strcmp(myARGV[2], "crash") == 0) { doCrash(myARGC, myARGV);

1 0

Francois Gouget : server: Fix the crashed process exit code when the debugger exits without detaching . Add a conformance test.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: b6aa247093affa7eb0e34a96dcd803597d4d5145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6aa247093affa7eb0e34a96d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 02:35:54 2007 +0200 server: Fix the crashed process exit code when the debugger exits without detaching. Add a conformance test. --- dlls/kernel32/tests/debugger.c | 51 ++++++++++++++++++++++++++++++--------- server/debugger.c | 2 +- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 19ab840..4328232 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -25,6 +25,10 @@ #include <winreg.h> #include "wine/test.h" +#ifndef STATUS_DEBUGGER_INACTIVE +#define STATUS_DEBUGGER_INACTIVE ((NTSTATUS) 0xC0000354) +#endif + static int myARGC; static char** myARGV; @@ -113,6 +117,8 @@ typedef struct DWORD pid; BOOL debug_rc; DWORD debug_err; + BOOL attach_rc; + DWORD attach_err; } debugger_blackbox_t; static void doDebugger(int argc, char** argv) @@ -124,8 +130,18 @@ static void doDebugger(int argc, char** argv) blackbox.argc=argc; logfile=(argc >= 4 ? argv[3] : NULL); blackbox.pid=(argc >= 5 ? atol(argv[4]) : 0); + + if (strstr(myARGV[2], "attach")) + { + blackbox.attach_rc=DebugActiveProcess(blackbox.pid); + if (!blackbox.attach_rc) + blackbox.attach_err=GetLastError(); + } + else + blackbox.attach_rc=TRUE; + debug_event=(argc >= 6 ? (HANDLE)atol(argv[5]) : NULL); - if (debug_event && strcmp(myARGV[2], "dbgnoevent") != 0) + if (debug_event && strstr(myARGV[2], "event")) { blackbox.debug_rc=SetEvent(debug_event); if (!blackbox.debug_rc) @@ -135,7 +151,7 @@ static void doDebugger(int argc, char** argv) blackbox.debug_rc=TRUE; get_events(logfile, &start_event, &done_event); - if (strcmp(myARGV[2], "dbgnoevent") != 0) + if (strstr(myARGV[2], "order")) { trace("debugger: waiting for the start signal...\n"); WaitForSingleObject(start_event, INFINITE); @@ -149,7 +165,7 @@ static void doDebugger(int argc, char** argv) ExitProcess(0xdeadbeef); } -static void crash_and_debug(HKEY hkey, const char* argv0, const char* debugger) +static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) { DWORD ret; HANDLE start_event, done_event; @@ -167,8 +183,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* debugger) get_file_name(dbglog); get_events(dbglog, &start_event, &done_event); - cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+10+strlen(debugger)+1+strlen(dbglog)+34+1); - sprintf(cmd, "%s debugger %s %s %%ld %%ld", argv0, debugger, dbglog); + cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+10+strlen(dbgtasks)+1+strlen(dbglog)+34+1); + sprintf(cmd, "%s debugger %s %s %%ld %%ld", argv0, dbgtasks, dbglog); ret=RegSetValueExA(hkey, "debugger", 0, REG_SZ, (BYTE*)cmd, strlen(cmd)+1); ok(ret == ERROR_SUCCESS, "unable to set AeDebug/debugger: ret=%d\n", ret); HeapFree(GetProcessHeap(), 0, cmd); @@ -190,11 +206,22 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* debugger) trace("waiting for child exit...\n"); ok(WaitForSingleObject(info.hProcess, 60000) == WAIT_OBJECT_0, "Timed out waiting for the child to crash\n"); ok(GetExitCodeProcess(info.hProcess, &exit_code), "GetExitCodeProcess failed: err=%d\n", GetLastError()); - ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08x\n", exit_code); + if (strstr(dbgtasks, "code2")) + { + /* If, after attaching to the debuggee, the debugger exits without + * detaching, then the debuggee gets a special exit code. + */ + ok(exit_code == 0xffffffff || /* Win 9x */ + exit_code == 0x80 || /* NT4 */ + exit_code == STATUS_DEBUGGER_INACTIVE, /* Win >= XP */ + "wrong exit code : %08x\n", exit_code); + } + else + ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08x instead of STATUS_ACCESS_VIOLATION\n", exit_code); CloseHandle(info.hProcess); /* ...before the debugger */ - if (strcmp(debugger, "dbgnoevent") != 0) + if (strstr(dbgtasks, "order")) ok(SetEvent(start_event), "SetEvent(start_event) failed\n"); trace("waiting for the debugger...\n"); @@ -206,6 +233,7 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* debugger) ok(dbg_blackbox.argc == 6, "wrong debugger argument count: %d\n", dbg_blackbox.argc); ok(dbg_blackbox.pid == crash_blackbox.pid, "the child and debugged pids don't match: %d != %d\n", crash_blackbox.pid, dbg_blackbox.pid); ok(dbg_blackbox.debug_rc, "debugger: SetEvent(debug_event) failed err=%d\n", dbg_blackbox.debug_err); + ok(dbg_blackbox.attach_rc, "DebugActiveProcess(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.attach_err); assert(DeleteFileA(dbglog) != 0); assert(DeleteFileA(childlog) != 0); @@ -296,8 +324,9 @@ static void test_ExitCode(void) strstr((char*)debugger_val, "winedbg --auto")) crash_and_winedbg(hkey, test_exe); - crash_and_debug(hkey, test_exe, "dbgevent"); - crash_and_debug(hkey, test_exe, "dbgnoevent"); + crash_and_debug(hkey, test_exe, "dbg,none"); + crash_and_debug(hkey, test_exe, "dbg,event,order"); + crash_and_debug(hkey, test_exe, "dbg,attach,event,code2"); if (disposition == REG_CREATED_NEW_KEY) { @@ -333,9 +362,7 @@ START_TEST(debugger) { doCrash(myARGC, myARGV); } - else if (myARGC >= 3 && - (strcmp(myARGV[2], "dbgevent") == 0 || - strcmp(myARGV[2], "dbgnoevent") == 0)) + else if (myARGC >= 3 && strncmp(myARGV[2], "dbg,", 4) == 0) { doDebugger(myARGC, myARGV); } diff --git a/server/debugger.c b/server/debugger.c index ee8ef10..4d0ac3d 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -542,7 +542,7 @@ void debug_exit_thread( struct thread *thread ) if (thread->debug_ctx->kill_on_exit) { /* kill all debugged processes */ - kill_debugged_processes( thread, thread->exit_code ); + kill_debugged_processes( thread, STATUS_DEBUGGER_INACTIVE ); } else {

1 0

Francois Gouget : winedbg: 'winedbg --auto' and 'winedbg --minidump' should detach when done so as to not mess up the crashed process exit code .
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 9271fcc86d668a3d25bad3f98dcb1cefc20da88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9271fcc86d668a3d25bad3f98… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 02:34:24 2007 +0200 winedbg: 'winedbg --auto' and 'winedbg --minidump' should detach when done so as to not mess up the crashed process exit code. --- dlls/kernel32/tests/debugger.c | 2 +- programs/winedbg/tgt_active.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 54aae65..19ab840 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -237,7 +237,7 @@ static void crash_and_winedbg(HKEY hkey, const char* argv0) trace("waiting for child exit...\n"); ok(WaitForSingleObject(info.hProcess, 60000) == WAIT_OBJECT_0, "Timed out waiting for the child to crash\n"); ok(GetExitCodeProcess(info.hProcess, &exit_code), "GetExitCodeProcess failed: err=%d\n", GetLastError()); - todo_wine ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08x\n", exit_code); + ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08x\n", exit_code); CloseHandle(info.hProcess); } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 348895d..42bc9d6 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -893,7 +893,7 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) if (ds != start_ok) return ds; hFile = parser_generate_command_file("echo Modules:", "info share", "echo Threads:", "info threads", - NULL); + "detach", NULL); } else if (!strcmp(argv[0], "--minidump")) { @@ -942,7 +942,7 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) /* FIXME: should generate unix name as well */ dbg_printf("Capturing program state in %s\n", tmp + 9); } - hFile = parser_generate_command_file(tmp, NULL); + hFile = parser_generate_command_file(tmp, "detach", NULL); } else return start_error_parse; if (hFile == INVALID_HANDLE_VALUE) return start_error_parse;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2007