February 2007 - Wine-commits

Eric Pouech : msvcrt: Reset a signal to DFL before it's used.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: 9f309b32e65c3d6a6023c3185b37a52b1de4a7e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f309b32e65c3d6a6023c3185… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Feb 8 21:33:33 2007 +0100 msvcrt: Reset a signal to DFL before it's used. --- dlls/msvcrt/except.c | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index fd79926..1ee13da 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -429,6 +429,7 @@ static const struct static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { LONG ret = EXCEPTION_CONTINUE_SEARCH; + MSVCRT___sighandler_t handler; if (!except || !except->ExceptionRecord) return EXCEPTION_CONTINUE_SEARCH; @@ -436,10 +437,13 @@ static LONG WINAPI msvcrt_exception_filt switch (except->ExceptionRecord->ExceptionCode) { case EXCEPTION_ACCESS_VIOLATION: - if (sighandlers[MSVCRT_SIGSEGV]) + if ((handler = sighandlers[MSVCRT_SIGSEGV]) != MSVCRT_SIG_DFL) { - if (sighandlers[MSVCRT_SIGSEGV] != MSVCRT_SIG_IGN) - sighandlers[MSVCRT_SIGSEGV](MSVCRT_SIGSEGV); + if (handler != MSVCRT_SIG_IGN) + { + sighandlers[MSVCRT_SIGSEGV] = MSVCRT_SIG_DFL; + handler(MSVCRT_SIGSEGV); + } ret = EXCEPTION_CONTINUE_EXECUTION; } break; @@ -455,31 +459,36 @@ static LONG WINAPI msvcrt_exception_filt case EXCEPTION_FLT_OVERFLOW: case EXCEPTION_FLT_STACK_CHECK: case EXCEPTION_FLT_UNDERFLOW: - if (sighandlers[MSVCRT_SIGFPE]) + if ((handler = sighandlers[MSVCRT_SIGFPE]) != MSVCRT_SIG_DFL) { - if (sighandlers[MSVCRT_SIGFPE] != MSVCRT_SIG_IGN) + if (handler != MSVCRT_SIG_IGN) { int i, float_signal = _FPE_INVALID; - float_handler handler = (float_handler)sighandlers[MSVCRT_SIGFPE]; + sighandlers[MSVCRT_SIGFPE] = MSVCRT_SIG_DFL; for (i = 0; i < sizeof(float_exception_map) / - sizeof(float_exception_map[0]); i++) + sizeof(float_exception_map[0]); i++) + { if (float_exception_map[i].status == - except->ExceptionRecord->ExceptionCode) + except->ExceptionRecord->ExceptionCode) { float_signal = float_exception_map[i].signal; break; } - handler(MSVCRT_SIGFPE, float_signal); + } + ((float_handler)handler)(MSVCRT_SIGFPE, float_signal); } ret = EXCEPTION_CONTINUE_EXECUTION; } break; case EXCEPTION_ILLEGAL_INSTRUCTION: - if (sighandlers[MSVCRT_SIGILL]) + if ((handler = sighandlers[MSVCRT_SIGILL]) != MSVCRT_SIG_DFL) { - if (sighandlers[MSVCRT_SIGILL] != MSVCRT_SIG_IGN) - sighandlers[MSVCRT_SIGILL](MSVCRT_SIGILL); + if (handler != MSVCRT_SIG_IGN) + { + sighandlers[MSVCRT_SIGILL] = MSVCRT_SIG_DFL; + handler(MSVCRT_SIGILL); + } ret = EXCEPTION_CONTINUE_EXECUTION; } break;

1 0

Eric Pouech : msvcrt: Implemented the raise function.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: bb5a20c61aa93893134a97b16f52dbde0c19978d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5a20c61aa93893134a97b16… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Feb 8 21:33:39 2007 +0100 msvcrt: Implemented the raise function. --- dlls/msvcrt/except.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 1ee13da..51fd82d 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -544,6 +544,40 @@ MSVCRT___sighandler_t CDECL MSVCRT_signa } /********************************************************************* + * raise (MSVCRT.@) + */ +int CDECL MSVCRT_raise(int sig) +{ + MSVCRT___sighandler_t handler; + + TRACE("(%d)\n", sig); + + switch (sig) + { + case MSVCRT_SIGABRT: + case MSVCRT_SIGFPE: + case MSVCRT_SIGILL: + case MSVCRT_SIGSEGV: + case MSVCRT_SIGINT: + case MSVCRT_SIGTERM: + handler = sighandlers[sig]; + if (handler == MSVCRT_SIG_DFL) MSVCRT__exit(3); + if (handler != MSVCRT_SIG_IGN) + { + sighandlers[sig] = MSVCRT_SIG_DFL; + if (sig == MSVCRT_SIGFPE) + ((float_handler)handler)(sig, _FPE_EXPLICITGEN); + else + handler(sig); + } + break; + default: + return -1; + } + return 0; +} + +/********************************************************************* * _XcptFilter (MSVCRT.@) */ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9cdee2c..8c5b88e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -686,7 +686,7 @@ @ cdecl putwc(long ptr) MSVCRT_fputwc @ cdecl putwchar(long) _fputwchar @ cdecl qsort(ptr long long ptr) ntdll.qsort -@ stub raise #(long) +@ cdecl raise(long) MSVCRT_raise @ cdecl rand() MSVCRT_rand @ cdecl realloc(ptr long) MSVCRT_realloc @ cdecl remove(str) MSVCRT_remove

1 0

Eric Pouech : msvcrt: Use raise(SIGABRT) for abort() and assert().
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: f415b5ddeb5ecdaf808e69af7d22e43da1e0e254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f415b5ddeb5ecdaf808e69af7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Feb 8 21:33:45 2007 +0100 msvcrt: Use raise(SIGABRT) for abort() and assert(). --- dlls/msvcrt/exit.c | 4 ++++ dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index a5d5283..9badd72 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -155,6 +155,8 @@ void CDECL MSVCRT_abort(void) } else _cputs("\nabnormal program termination\n"); + MSVCRT_raise(MSVCRT_SIGABRT); + /* in case raise() returns */ MSVCRT__exit(3); } @@ -172,6 +174,8 @@ void CDECL MSVCRT__assert(const char* st } else _cprintf("Assertion failed: %s, file %s, line %d\n\n",str, file, line); + MSVCRT_raise(MSVCRT_SIGABRT); + /* in case raise() returns */ MSVCRT__exit(3); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index e7b037f..83a27fd 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -611,6 +611,7 @@ MSVCRT_FILE* MSVCRT__fdopen(int, const int MSVCRT_vsnprintf(char *str, unsigned int len, const char *format, va_list valist); int MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, unsigned int len, const MSVCRT_wchar_t *format, va_list valist ); +int MSVCRT_raise(int sig); #ifndef __WINE_MSVCRT_TEST int _write(int,const void*,unsigned int);

1 0

Paul Vriens : user32/listbox: Remove deadcode (Coverity).
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: 7100dd4b33746b86efd52b3091d27fb5d1bf981f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7100dd4b33746b86efd52b309… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Feb 9 07:55:40 2007 +0100 user32/listbox: Remove deadcode (Coverity). --- dlls/user32/listbox.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 2d1b9f3..bef0c8b 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -568,12 +568,12 @@ static void LISTBOX_PaintItem( LB_DESCR dis.hDC = hdc; dis.itemID = index; dis.itemState = 0; - if (item && item->selected) dis.itemState |= ODS_SELECTED; + if (item->selected) dis.itemState |= ODS_SELECTED; if (!ignoreFocus && (descr->focus_item == index) && (descr->caret_on) && (descr->in_focus)) dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; - dis.itemData = item ? item->data : 0; + dis.itemData = item->data; dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%d,%d-%d,%d\n", descr->self, index, item ? debugstr_w(item->str) : "", action,

1 0

Marcus Meissner : kernel32/tests: Fixed several uninitialized variables.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: beb603e90840fd2c25675d979e94807ce1c53561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb603e90840fd2c25675d979… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Feb 8 21:06:02 2007 +0100 kernel32/tests: Fixed several uninitialized variables. --- dlls/kernel32/tests/comm.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index a7403ff..9866521 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -689,7 +689,7 @@ static HANDLE test_OpenComm(BOOL doOverl static void test_GetModemStatus(HANDLE hcom) { - DWORD ModemStat; + DWORD ModemStat = 0; ok(GetCommModemStatus(hcom, &ModemStat), "GetCommModemStatus failed\n"); trace("GetCommModemStatus returned 0x%08x->%s%s%s%s\n", ModemStat, @@ -917,9 +917,10 @@ static void test_LoopbackRead(HANDLE hco static void test_LoopbackCtsRts(HANDLE hcom) { - DWORD ModemStat, defaultStat; + DWORD ModemStat = 0, defaultStat = 0; DCB dcb; + memset (&dcb, 0, sizeof (dcb)); ok(GetCommState(hcom, &dcb), "GetCommState failed\n"); if (dcb.fRtsControl == RTS_CONTROL_HANDSHAKE) { @@ -956,7 +957,7 @@ static void test_LoopbackCtsRts(HANDLE h static void test_LoopbackDtrDcd(HANDLE hcom) { - DWORD ModemStat, defaultStat; + DWORD ModemStat = 0, defaultStat = 0; DCB dcb; ok(GetCommState(hcom, &dcb), "GetCommState failed\n"); @@ -995,7 +996,7 @@ static void test_LoopbackDtrDcd(HANDLE h static void test_LoopbackDtrDsr(HANDLE hcom) { - DWORD ModemStat, defaultStat; + DWORD ModemStat = 0, defaultStat = 0; DCB dcb; ok(GetCommState(hcom, &dcb), "GetCommState failed\n"); @@ -1034,7 +1035,7 @@ static void test_LoopbackDtrDsr(HANDLE h static void test_LoopbackDtrRing(HANDLE hcom) { - DWORD ModemStat, defaultStat; + DWORD ModemStat = 0, defaultStat = 0; DCB dcb; ok(GetCommState(hcom, &dcb), "GetCommState failed\n"); @@ -1179,7 +1180,7 @@ static void test_WaitCts(HANDLE hcom) OVERLAPPED overlapped; HANDLE hComPortEvent; HANDLE alarmThread; - DWORD args[4], defaultStat; + DWORD args[4], defaultStat = 0; DWORD alarmThreadId, before, after, after1, diff, success, err, written, evtmask=0; ok(GetCommState(hcom, &dcb), "GetCommState failed\n"); @@ -1337,7 +1338,7 @@ static void test_WaitDsr(HANDLE hcom) OVERLAPPED overlapped; HANDLE hComPortEvent; HANDLE alarmThread; - DWORD args[3], defaultStat; + DWORD args[3], defaultStat = 0; DWORD alarmThreadId, before, after, after1, diff, success, err, written, evtmask=0; ok(GetCommState(hcom, &dcb), "GetCommState failed\n"); @@ -1482,7 +1483,7 @@ static void test_WaitDcd(HANDLE hcom) OVERLAPPED overlapped; HANDLE hComPortEvent; HANDLE alarmThread; - DWORD args[3], defaultStat; + DWORD args[3], defaultStat = 0; DWORD alarmThreadId, before, after, after1, diff, success, err, written, evtmask=0; ok(GetCommState(hcom, &dcb), "GetCommState failed\n");

1 0

Konstantin Kondratyuk : ntdll: Add Omsk time zone.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: 4f976741a49883122b9a74d94f39869d0880f663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f976741a49883122b9a74d94… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Thu Feb 8 17:13:13 2007 +0300 ntdll: Add Omsk time zone. --- dlls/ntdll/time.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 418cf2e..f34e43f 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -275,6 +275,12 @@ static const struct tagTZ_INFO TZ_INFO[] {"YEKST", {'U','r','a','l','s',' ','D','a','y','l','i','g','h','t', ' ','T','i','m','e',' ','(','S','u','m','m','e','r',')','\0'}, -360, 1}, + {"OMST", + {'O','m','s','k',' ','S','t','a','n','d','a','r','d', + ' ','T','i','m','e',' ','(','W','i','n','t','e','r',')','\0'}, -360, 0}, + {"OMSST", + {'O','m','s','k',' ','D','a','y','l','i','g','h','t', + ' ','T','i','m','e',' ','(','S','u','m','m','e','r',')','\0'}, -420, 1}, {"PKT", {'W','e','s','t',' ','A','s','i','a',' ','S','t','a','n','d','a','r','d', ' ','T','i','m','e','\0'}, -300, 0},

1 0

Paul Vriens : wininet/ftp.c: Fix some returned error codes.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: 1f5e5a2b75ae689b56a11d8577d908f7afb21ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5e5a2b75ae689b56a11d857… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Feb 8 17:27:57 2007 +0100 wininet/ftp.c: Fix some returned error codes. --- dlls/wininet/ftp.c | 17 ++++++++++++++--- dlls/wininet/tests/ftp.c | 2 -- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 4e99dae..1d9224b 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -507,12 +507,24 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNE BOOL r = FALSE; lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hConnect ); - if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) + if (!lpwfs) + { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (WH_HFTPSESSION != lpwfs->hdr.htype) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); goto lend; } + if (!lpszDirectory) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { @@ -531,8 +543,7 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNE r = FTP_FtpCreateDirectoryW(lpwfs, lpszDirectory); } lend: - if( lpwfs ) - WININET_Release( &lpwfs->hdr ); + WININET_Release( &lpwfs->hdr ); return r; } diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 3a5fa70..d5a4a6f 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -106,7 +106,6 @@ static void test_createdir(void) SetLastError(0xdeadbeef); bRet = FtpCreateDirectoryA(NULL, "new_directory_deadbeef"); ok ( bRet == FALSE, "Expected FtpCreateDirectoryA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); @@ -125,7 +124,6 @@ static void test_createdir(void) SetLastError(0xdeadbeef); bRet = FtpCreateDirectoryA(hFtp, NULL); ok ( bRet == FALSE, "Expected FtpCreateDirectoryA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());

1 0

Marcus Meissner : wmc: inputbuffer is a WCHAR array.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: c053bdb54acaf2f7a068a0d3eefe009f8448d0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c053bdb54acaf2f7a068a0d3e… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Feb 8 16:41:22 2007 +0100 wmc: inputbuffer is a WCHAR array. --- tools/wmc/mcl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 62cdf25..1c16fe3 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -187,7 +187,7 @@ static int fill_inputbuffer(void) if(!inputbuffer) { - inputbuffer = xmalloc(INPUTBUFFER_SIZE); + inputbuffer = xmalloc(INPUTBUFFER_SIZE*sizeof(WCHAR)); xlatebuffer = xmalloc(INPUTBUFFER_SIZE); }

1 0

Marcus Meissner : riched20: Removed more dead code.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: ddb5720118aa520a0ece3c6ee2ad87deeb233214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb5720118aa520a0ece3c6ee… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Feb 8 17:12:21 2007 +0100 riched20: Removed more dead code. --- dlls/riched20/row.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index a9acb79..3abff5f 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -29,7 +29,7 @@ ME_DisplayItem *ME_FindRowStart(ME_Conte ME_DisplayItem *para = ME_GetParagraph(item); ME_MustBeWrapped(c, para); if(nRelPos<=0) { /* if this or preceding row */ - while(nRelPos<=0) { + do { ME_DisplayItem *item2 = ME_FindItemBack(item, diStartRowOrParagraph); if (item2->type == diParagraph) { @@ -50,8 +50,7 @@ ME_DisplayItem *ME_FindRowStart(ME_Conte } assert(0 == "bug in FindItemBack(item, diStartRowOrParagraph)"); item = item2; - } - return item; + } while(1); } while(nRelPos>0) { /* if one of the next rows */ ME_DisplayItem *item2 = ME_FindItemFwd(item, diStartRowOrParagraph);

1 0

Marcus Meissner : ntdll: Initialize needs_close to FALSE.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: a4c47c9ec310385e0c1dbd736ccc45fe0f360ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c47c9ec310385e0c1dbd736… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Feb 8 20:20:34 2007 +0100 ntdll: Initialize needs_close to FALSE. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a9b9142..cf9d64d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1227,7 +1227,7 @@ NTSTATUS WINAPI NtQueryInformationFile( }; struct stat st; - int fd, needs_close; + int fd, needs_close = FALSE; TRACE("(%p,%p,%p,0x%08x,0x%08x)\n", hFile, io, ptr, len, class);

1 0