October 2013 - Wine-Commits

Dmitry Timoshkov : kernel32/tests: WaitCommEvent may sometimes return immediately on a busy system when write operation to a COM-port has already completed .
by Alexandre Julliard Oct. 25, 2013

Oct. 25, 2013

Module: wine Branch: master Commit: 53e727ef95587d8d64c1c80669a10bea068ba651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e727ef95587d8d64c1c8066… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 25 12:14:37 2013 +0900 kernel32/tests: WaitCommEvent may sometimes return immediately on a busy system when write operation to a COM-port has already completed. --- dlls/kernel32/tests/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 33b10ac..f780f75 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -939,7 +939,7 @@ static void test_waittxempty(void) evtmask = 0; SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); - ok(!res && GetLastError() == ERROR_IO_PENDING, "%d: WaitCommEvent error %d\n", i, GetLastError()); + ok((!res && GetLastError() == ERROR_IO_PENDING) || res /* busy system */, "%d: WaitCommEvent error %d\n", i, GetLastError()); res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); if (i == 0)

1 0

Dmitry Timoshkov : kernel32/tests: Accept the case when WriteFile is able to complete the request immediately for an overlapped COM-port write .
by Alexandre Julliard Oct. 25, 2013

Oct. 25, 2013

Module: wine Branch: master Commit: b46bd115bbd0dea1d17bc1de351e454b4f67f3f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46bd115bbd0dea1d17bc1de3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 25 12:14:24 2013 +0900 kernel32/tests: Accept the case when WriteFile is able to complete the request immediately for an overlapped COM-port write. The behaviour depends on the driver and hardware used. --- dlls/kernel32/tests/comm.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index cf1c0c2..844c86d 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -840,10 +840,9 @@ static void test_waittxempty(void) SetLastError(0xdeadbeef); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); after = GetTickCount(); -todo_wine - ok(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %d, error %d\n", res, GetLastError()); -todo_wine - ok(!bytes, "expected 0, got %u\n", bytes); + ok((!res && GetLastError() == ERROR_IO_PENDING) || (res && bytes == sizeof(tbuf)), + "WriteFile returned %d, written %u bytes, error %d\n", res, bytes, GetLastError()); + if (!res) ok(!bytes, "expected 0, got %u\n", bytes); ok(after - before < 30, "WriteFile took %d ms to write %d Bytes at %d Baud\n", after - before, bytes, baud); /* don't wait for WriteFile completion */ @@ -915,10 +914,9 @@ todo_wine before = GetTickCount(); SetLastError(0xdeadbeef); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); -todo_wine - ok(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %d, error %d\n", res, GetLastError()); -todo_wine - ok(!bytes, "expected 0, got %u\n", bytes); + ok((!res && GetLastError() == ERROR_IO_PENDING) || (res && bytes == sizeof(tbuf)), + "WriteFile returned %d, written %u bytes, error %d\n", res, bytes, GetLastError()); + if (!res) ok(!bytes, "expected 0, got %u\n", bytes); ClearCommError(hcom, &errors, &stat); ok(stat.cbInQue == 0, "InQueue should be empty, got %d bytes\n", stat.cbInQue); @@ -2089,8 +2087,7 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(hcom, 0, NULL, NULL, &iob, atz, sizeof(atz), &offset, NULL); -todo_wine - ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %#x\n", status); + ok(status == STATUS_PENDING || status == STATUS_SUCCESS, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); /* Under Windows checking IO_STATUS_BLOCK right after the call leads * to races, iob.Status is either -1 or STATUS_SUCCESS, which means * that it's set only when the operation completes.

1 0

Frédéric Delanoy : quartz/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 25, 2013

Oct. 25, 2013

Module: wine Branch: master Commit: 4b94239a3b6df4af6529afcb223b38c617eb8d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b94239a3b6df4af6529afcb2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 25 00:19:08 2013 +0200 quartz/tests: Use BOOL type where appropriate. --- dlls/quartz/tests/avisplitter.c | 2 +- dlls/quartz/tests/dsoundrender.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index ad01906..f9da610 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -57,7 +57,7 @@ static int count_threads(void) return threads; } -static int create_avisplitter(void) +static BOOL create_avisplitter(void) { HRESULT hr; diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index a3e4778..745a32f 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -39,7 +39,7 @@ static IUnknown *pDSRender = NULL; -static int create_dsound_renderer(void) +static BOOL create_dsound_renderer(void) { HRESULT hr;

1 0

Frédéric Delanoy : quartz: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 25, 2013

Oct. 25, 2013

Module: wine Branch: master Commit: ec5da171e684a10e7dc2abd8e354b31f4e1593e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5da171e684a10e7dc2abd8e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 25 00:19:07 2013 +0200 quartz: Use BOOL type where appropriate. --- dlls/quartz/avisplit.c | 10 +++++----- dlls/quartz/filtergraph.c | 2 +- dlls/quartz/videorenderer.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 3d67a18..6cd28da 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -64,7 +64,7 @@ typedef struct StreamData DWORD entries; AVISTDINDEX **stdindex; DWORD frames; - DWORD seek; + BOOL seek; /* Position, in index units */ DWORD pos, pos_next, index, index_next; @@ -448,7 +448,7 @@ static HRESULT AVISplitter_first_request(LPVOID iface) stream->index_next = stream->index; /* This was sent after stopped->paused or stopped->playing, so set seek */ - stream->seek = 1; + stream->seek = TRUE; /* There should be a packet queued from AVISplitter_next_request last time * It needs to be done now because this is the only way to ensure that every @@ -973,7 +973,7 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This) DWORD y; DWORD64 frames = 0; - stream->seek = 1; + stream->seek = TRUE; if (stream->stdindex) { @@ -1320,7 +1320,7 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) pin->dwSamplesProcessed = 0; stream->index = 0; stream->pos = 0; - stream->seek = 1; + stream->seek = TRUE; if (stream->stdindex) { DWORD y, z = 0; @@ -1396,7 +1396,7 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) stream->index = 0; } stream->preroll = preroll; - stream->seek = 1; + stream->seek = TRUE; } LeaveCriticalSection(&This->Parser.filter.csFilter); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 862a0c4..cca746b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -88,7 +88,7 @@ static int EventsQueue_Destroy(EventsQueue* omr) return TRUE; } -static int EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) +static BOOL EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) { EnterCriticalSection(&omr->msg_crst); if (omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size)) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 9afa7bf..4e8f359 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1031,7 +1031,7 @@ HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv) pVideoRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; pVideoRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; - pVideoRenderer->init = 0; + pVideoRenderer->init = FALSE; ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT));

1 0

Frédéric Delanoy : mscoree: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 25, 2013

Oct. 25, 2013

Module: wine Branch: master Commit: 38adec4ac558b4e49f285b9caeb75975e194d127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38adec4ac558b4e49f285b9ca… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 25 00:19:06 2013 +0200 mscoree: Use BOOL type where appropriate. --- dlls/mscoree/assembly.c | 6 +++--- dlls/mscoree/metahost.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index 13e7f03..7cfc359 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -63,7 +63,7 @@ typedef struct tagCLRTABLE struct tagASSEMBLY { - int is_mapped_file; + BOOL is_mapped_file; /* mapped files */ LPWSTR path; @@ -213,7 +213,7 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) if (!assembly) return E_OUTOFMEMORY; - assembly->is_mapped_file = 1; + assembly->is_mapped_file = TRUE; assembly->path = strdupW(file); if (!assembly->path) @@ -267,7 +267,7 @@ HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) if (!assembly) return E_OUTOFMEMORY; - assembly->is_mapped_file = 0; + assembly->is_mapped_file = FALSE; assembly->data = (BYTE*)hmodule; diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 4264f3a..7e99bbe 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -648,7 +648,7 @@ static BOOL get_mono_path(LPWSTR path) WCHAR base_path[MAX_PATH]; const char *unix_data_dir; WCHAR *dos_data_dir; - int build_tree=0; + BOOL build_tree = FALSE; static WCHAR* (CDECL *wine_get_dos_file_name)(const char*); /* First try c:\windows\mono */ @@ -664,7 +664,7 @@ static BOOL get_mono_path(LPWSTR path) if (!unix_data_dir) { unix_data_dir = wine_get_build_dir(); - build_tree = 1; + build_tree = TRUE; } if (unix_data_dir) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7b655b9..5b4a2c7 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -647,7 +647,7 @@ static void parse_msi_version_string(const char *version, int *parts) static BOOL install_wine_mono(void) { - BOOL is_wow64=0; + BOOL is_wow64 = FALSE; HMODULE hmsi; UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); char versionstringbuf[15];

1 0

Piotr Caban : msvcrt: Add __security_error_handler stub.
by Alexandre Julliard Oct. 25, 2013

Oct. 25, 2013

Module: wine Branch: master Commit: e3592d041a42f4e8365825ab3dab5c2addbe1fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3592d041a42f4e8365825ab3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 25 14:12:43 2013 +0200 msvcrt: Add __security_error_handler stub. --- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/except.c | 11 +++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 49b2dff..fbd4506 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -194,7 +194,7 @@ @ extern __pioinfo msvcrt.__pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs -@ stub __security_error_handler +@ cdecl __security_error_handler(long ptr) msvcrt.__security_error_handler @ cdecl __set_app_type(long) msvcrt.__set_app_type @ stub __set_buffer_overrun_handler @ extern __setlc_active msvcrt.__setlc_active diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index b0602b8..5f536c0 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -189,7 +189,7 @@ @ extern __pioinfo msvcrt.__pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs -@ stub __security_error_handler +@ cdecl __security_error_handler(long ptr) msvcrt.__security_error_handler @ cdecl __set_app_type(long) msvcrt.__set_app_type @ stub __set_buffer_overrun_handler @ extern __setlc_active msvcrt.__setlc_active diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index b77daa1..8cafba6 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -303,3 +303,14 @@ MSVCRT_security_error_handler CDECL _set_security_error_handler( security_error_handler = handler; return old; } + +/* __security_error_handler - not exported in native msvcrt */ +void CDECL __security_error_handler(int code, void *data) +{ + if(security_error_handler) + security_error_handler(code, data); + else + FIXME("(%d, %p) stub\n", code, data); + + MSVCRT__exit(3); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 43daf0f..5e57aae 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1528,6 +1528,7 @@ @ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _set_purecall_handler(ptr) @ cdecl _set_security_error_handler(ptr) +@ cdecl __security_error_handler(long ptr) @ cdecl -arch=i386 _statusfp2(ptr ptr) @ cdecl _wdupenv_s(ptr ptr wstr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output

1 0

André Hentschel : usp10/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 25, 2013

Oct. 25, 2013

Module: wine Branch: master Commit: f309e012828430ff11a30d157b09adab2049f741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f309e012828430ff11a30d157… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:29:43 2013 +0200 usp10/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/usp10/tests/Makefile.in | 1 - dlls/usp10/tests/usp10.c | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/tests/Makefile.in b/dlls/usp10/tests/Makefile.in index b2a7451..954a4a8 100644 --- a/dlls/usp10/tests/Makefile.in +++ b/dlls/usp10/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = usp10.dll IMPORTS = usp10 user32 gdi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ usp10.c diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 354bc23..22a4ab2 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -825,10 +825,9 @@ typedef struct tagRangeP { LOGFONTA lf; } fontEnumParam; -static int CALLBACK enumFontProc( const LOGFONT *lpelfe, const TEXTMETRIC *lpntme, - DWORD FontType, LPARAM lParam) +static int CALLBACK enumFontProc( const LOGFONTA *lpelfe, const TEXTMETRICA *lpntme, DWORD FontType, LPARAM lParam ) { - NEWTEXTMETRICEX *ntme = (NEWTEXTMETRICEX*)lpntme; + NEWTEXTMETRICEXA *ntme = (NEWTEXTMETRICEXA*)lpntme; fontEnumParam *rp = (fontEnumParam*) lParam; int idx = 0; DWORD i; @@ -850,7 +849,7 @@ static int CALLBACK enumFontProc( const LOGFONT *lpelfe, const TEXTMETRIC *lpntm if (ntme->ntmFontSig.fsUsb[idx] & mask) { - memcpy(&(rp->lf),lpelfe,sizeof(LOGFONT)); + memcpy(&(rp->lf),lpelfe,sizeof(LOGFONTA)); return 0; } return 1; @@ -862,7 +861,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co fontEnumParam lParam; lParam.range = range; - memset(&lParam.lf,0,sizeof(LOGFONT)); + memset(&lParam.lf,0,sizeof(LOGFONTA)); *hfont = NULL; if (recommended) @@ -881,7 +880,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co if (!*hfont) { - memset(&lParam.lf,0,sizeof(LOGFONT)); + memset(&lParam.lf,0,sizeof(LOGFONTA)); lParam.lf.lfCharSet = DEFAULT_CHARSET; if (!EnumFontFamiliesExA(hdc, &lParam.lf, enumFontProc, (LPARAM)&lParam, 0) && lParam.lf.lfFaceName[0]) @@ -1809,10 +1808,10 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) struct enum_font_data { int total; - ENUMLOGFONT elf[MAX_ENUM_FONTS]; + ENUMLOGFONTA elf[MAX_ENUM_FONTS]; }; -static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +static INT CALLBACK enum_bitmap_font_proc(const LOGFONTA *lf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { struct enum_font_data *efnd = (struct enum_font_data *)lParam; @@ -1820,7 +1819,7 @@ static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *n if (efnd->total < MAX_ENUM_FONTS) { - efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + efnd->elf[efnd->total++] = *(ENUMLOGFONTA*)lf; } else trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); @@ -1828,7 +1827,7 @@ static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *n return 1; } -static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +static INT CALLBACK enum_truetype_proc(const LOGFONTA *lf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { struct enum_font_data *efnd = (struct enum_font_data *)lParam; @@ -1836,7 +1835,7 @@ static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, if (efnd->total < MAX_ENUM_FONTS) { - efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + efnd->elf[efnd->total++] = *(ENUMLOGFONTA*)lf; } else trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); @@ -1850,7 +1849,7 @@ static void test_ScriptGetFontProperties(HDC hdc) SCRIPT_CACHE psc,old_psc; SCRIPT_FONTPROPERTIES sfp; HFONT font, oldfont; - LOGFONT lf; + LOGFONTA lf; struct enum_font_data efnd; TEXTMETRICA tmA; WORD gi[3]; @@ -1934,7 +1933,7 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); - font = CreateFontIndirect(&lf); + font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font); sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); @@ -1975,7 +1974,7 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); - font = CreateFontIndirect(&lf); + font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font); sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES);

1 0

Dmitry Timoshkov : server: Add support for pending write flag to the serial device.
by Alexandre Julliard Oct. 25, 2013

Oct. 25, 2013

Module: wine Branch: master Commit: 3b429e88ff44419b1479c433b9a094506583e8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b429e88ff44419b1479c433b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 25 12:14:42 2013 +0900 server: Add support for pending write flag to the serial device. --- dlls/kernel32/tests/comm.c | 1 - dlls/ntdll/file.c | 18 ++++++++++++++++++ dlls/ntdll/serial.c | 21 +++++++++++++-------- include/wine/server_protocol.h | 7 +++++-- server/protocol.def | 3 +++ server/request.h | 4 +++- server/serial.c | 11 +++++++++++ server/trace.c | 2 ++ 8 files changed, 55 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b429e88ff44419b1479c…

1 0

Dmitry Timoshkov : kernel32/tests: Increase the timeout for completion of write to a COM-port.
by Alexandre Julliard Oct. 25, 2013

Oct. 25, 2013

Module: wine Branch: master Commit: 0db996e14c337bb05198cb95cac9c05927b536da URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db996e14c337bb05198cb95c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 25 12:14:30 2013 +0900 kernel32/tests: Increase the timeout for completion of write to a COM-port. It's not enough for some hardware configurations. --- dlls/kernel32/tests/comm.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 844c86d..33b10ac 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -855,8 +855,7 @@ static void test_waittxempty(void) SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); ok(!res && GetLastError() == ERROR_IO_PENDING, "WaitCommEvent error %d\n", GetLastError()); - res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); -todo_wine + res = WaitForSingleObject(ovl_wait.hEvent, 1500); ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); if (res == WAIT_OBJECT_0) { @@ -878,16 +877,13 @@ todo_wine res = FALSE; } after = GetTickCount(); -todo_wine ok(res, "WaitCommEvent error %d\n", GetLastError()); -todo_wine ok(evtmask & EV_TXEMPTY, "WaitCommEvent: expected EV_TXEMPTY, got %#x\n", evtmask); CloseHandle(ovl_wait.hEvent); timediff = after - before; trace("WaitCommEvent for EV_TXEMPTY took %d ms (timeout %d)\n", timediff, TIMEOUT); -todo_wine - ok(timediff < 900, "WaitCommEvent used %d ms for waiting\n", timediff); + ok(timediff < 1200, "WaitCommEvent used %d ms for waiting\n", timediff); res = WaitForSingleObject(ovl_write.hEvent, 0); ok(res == WAIT_OBJECT_0, "WriteFile failed with a timeout\n");

1 0

Vincent Povirk : mscoree: Call Mono's System.Environment. Exit instead of duplicating it.
by Alexandre Julliard Oct. 25, 2013

Oct. 25, 2013

Module: wine Branch: master Commit: 5e81bad2395b17c7f4d3697ceb76f363ef38a940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e81bad2395b17c7f4d3697ce… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 24 16:01:11 2013 -0500 mscoree: Call Mono's System.Environment.Exit instead of duplicating it. --- dlls/mscoree/corruntimehost.c | 54 +++++++++++++++++++++++++++++++++++++++ dlls/mscoree/metahost.c | 55 ++++++++++----------------------------- dlls/mscoree/mscoree_main.c | 3 +- dlls/mscoree/mscoree_private.h | 6 +++- 4 files changed, 73 insertions(+), 45 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 4ae85b9..5cea669 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -214,6 +214,60 @@ static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *d return hr; } +void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) +{ + HRESULT hr; + void *args[2]; + MonoDomain *domain; + MonoAssembly *assembly; + MonoImage *image; + MonoClass *klass; + MonoMethod *method; + + hr = RuntimeHost_GetDefaultDomain(This, &domain); + if (FAILED(hr)) + { + ERR("Cannot get domain, hr=%x\n", hr); + return; + } + + mono_thread_attach(domain); + + assembly = mono_domain_assembly_open(domain, "mscorlib"); + if (!assembly) + { + ERR("Cannot load mscorlib\n"); + return; + } + + image = mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image\n"); + return; + } + + klass = mono_class_from_name(image, "System", "Environment"); + if (!klass) + { + ERR("Couldn't get class from image\n"); + return; + } + + method = mono_class_get_method_from_name(klass, "Exit", 0); + if (!method) + { + ERR("Couldn't get method from class\n"); + return; + } + + args[0] = &exitcode; + args[1] = NULL; + mono_runtime_invoke(method, NULL, args, NULL); + + ERR("Process should have exited\n"); +} + static inline RuntimeHost *impl_from_ICLRRuntimeHost( ICLRRuntimeHost *iface ) { return CONTAINING_RECORD(iface, RuntimeHost, ICLRRuntimeHost_iface); diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index de1d004..4264f3a 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -100,17 +100,12 @@ static void (CDECL *mono_profiler_install)(MonoProfiler *prof, MonoProfileFunc s MonoType* (CDECL *mono_reflection_type_from_name)(char *name, MonoImage *image); MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); -static void (CDECL *mono_runtime_quit)(void); -static void (CDECL *mono_runtime_set_shutting_down)(void); static void (CDECL *mono_set_dirs)(const char *assembly_dir, const char *config_dir); static void (CDECL *mono_set_verbose_level)(DWORD level); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); -static void (CDECL *mono_thread_pool_cleanup)(void); -static void (CDECL *mono_thread_suspend_all_other_threads)(void); -static void (CDECL *mono_threads_set_shutting_down)(void); void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); @@ -134,10 +129,6 @@ static void set_environment(LPCWSTR bin_path) SetEnvironmentVariableW(pathW, path_env); } -static void CDECL do_nothing(void) -{ -} - static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) { @@ -218,7 +209,6 @@ static HRESULT load_mono(CLRRuntimeInfo *This) LOAD_MONO_FUNCTION(mono_reflection_type_from_name); LOAD_MONO_FUNCTION(mono_runtime_invoke); LOAD_MONO_FUNCTION(mono_runtime_object_init); - LOAD_MONO_FUNCTION(mono_runtime_quit); LOAD_MONO_FUNCTION(mono_set_dirs); LOAD_MONO_FUNCTION(mono_set_verbose_level); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); @@ -237,10 +227,6 @@ static HRESULT load_mono(CLRRuntimeInfo *This) } while (0); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); - LOAD_OPT_MONO_FUNCTION(mono_runtime_set_shutting_down, do_nothing); - LOAD_OPT_MONO_FUNCTION(mono_thread_pool_cleanup, do_nothing); - LOAD_OPT_MONO_FUNCTION(mono_thread_suspend_all_other_threads, do_nothing); - LOAD_OPT_MONO_FUNCTION(mono_threads_set_shutting_down, do_nothing); #undef LOAD_OPT_MONO_FUNCTION @@ -306,31 +292,6 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * return hr; } -void unload_all_runtimes(void) -{ - int i; - HMODULE handle; - - /* If the only references to mscoree are through dll's that were loaded by - * Mono, shutting down the Mono runtime will free mscoree, so take a - * reference to prevent that from happening. */ - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)unload_all_runtimes, &handle); - - if (mono_handle && is_mono_started && !is_mono_shutdown) - { - /* Copied from Mono's ves_icall_System_Environment_Exit */ - mono_threads_set_shutting_down(); - mono_runtime_set_shutting_down(); - mono_thread_pool_cleanup(); - mono_thread_suspend_all_other_threads(); - mono_runtime_quit(); - } - - for (i=0; i<NUM_RUNTIMES; i++) - if (runtimes[i].loaded_runtime) - RuntimeHost_Destroy(runtimes[i].loaded_runtime); -} - void expect_no_runtimes(void) { if (mono_handle && is_mono_started && !is_mono_shutdown) @@ -1147,9 +1108,21 @@ static HRESULT WINAPI CLRMetaHost_QueryLegacyV2RuntimeBinding(ICLRMetaHost* ifac return E_NOTIMPL; } -static HRESULT WINAPI CLRMetaHost_ExitProcess(ICLRMetaHost* iface, INT32 iExitCode) +HRESULT WINAPI CLRMetaHost_ExitProcess(ICLRMetaHost* iface, INT32 iExitCode) { - FIXME("%i: stub\n", iExitCode); + TRACE("%i\n", iExitCode); + + EnterCriticalSection(&runtime_list_cs); + + if (is_mono_started && !is_mono_shutdown) + { + /* search for a runtime and call System.Environment.Exit() */ + int i; + + for (i=0; i<NUM_RUNTIMES; i++) + if (runtimes[i].loaded_runtime) + RuntimeHost_ExitProcess(runtimes[i].loaded_runtime, iExitCode); + } ExitProcess(iExitCode); } diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 2ca0ce7..7b655b9 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -249,8 +249,7 @@ __int32 WINAPI _CorExeMain2(PBYTE ptrMemory, DWORD cntMemory, LPWSTR imageName, void WINAPI CorExitProcess(int exitCode) { TRACE("(%x)\n", exitCode); - unload_all_runtimes(); - ExitProcess(exitCode); + CLRMetaHost_ExitProcess(0, exitCode); } VOID WINAPI _CorImageUnloading(PVOID imageBase) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 2a6d32e..820d081 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -162,12 +162,12 @@ extern void (CDECL *mono_thread_manage)(void); extern void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); /* loaded runtime interfaces */ -extern void unload_all_runtimes(void) DECLSPEC_HIDDEN; - extern void expect_no_runtimes(void) DECLSPEC_HIDDEN; extern HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, RuntimeHost** result) DECLSPEC_HIDDEN; +extern void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) DECLSPEC_HIDDEN; + extern HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, IUnknown **ppUnk) DECLSPEC_HIDDEN; @@ -177,6 +177,8 @@ extern HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name extern HRESULT RuntimeHost_Destroy(RuntimeHost *This) DECLSPEC_HIDDEN; +HRESULT WINAPI CLRMetaHost_ExitProcess(ICLRMetaHost* iface, INT32 iExitCode) DECLSPEC_HIDDEN; + HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) DECLSPEC_HIDDEN; extern HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) DECLSPEC_HIDDEN;

1 0