June 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : xmllite/writer: Implement WriteFullEndElement().
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: bfceaa4f39d106eaefbf2ac20b59a3975efb3345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfceaa4f39d106eaefbf2ac20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 14:13:43 2014 +0400 xmllite/writer: Implement WriteFullEndElement(). --- dlls/xmllite/writer.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 9b07785..e6548cd 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -675,10 +675,21 @@ static HRESULT WINAPI xmlwriter_WriteEntityRef(IXmlWriter *iface, LPCWSTR pwszNa static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); + struct element *element; - FIXME("%p\n", This); + TRACE("%p\n", This); - return E_NOTIMPL; + element = pop_element(This); + if (!element) + return WR_E_INVALIDACTION; + + /* write full end tag */ + write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); + write_output_buffer(This->output, element->qname, element->len); + write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + This->starttagopen = FALSE; + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteName(IXmlWriter *iface, LPCWSTR pwszName)

1 0

Grazvydas Ignotas : msvcrt: Change internal buffer size to 4k.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 40067dd0110f0d7d3e354a89c892a67f4e3ecdc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40067dd0110f0d7d3e354a89c… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat Jun 14 02:23:56 2014 +0300 msvcrt: Change internal buffer size to 4k. --- dlls/msvcrt/file.c | 6 ++++-- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 178f164..c1d9d6e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -81,6 +81,8 @@ static char utf16_bom[2] = { 0xff, 0xfe }; #define MSVCRT_MAX_FILES 2048 #define MSVCRT_FD_BLOCK_SIZE 32 +#define MSVCRT_INTERNAL_BUFSIZ 4096 + /* ioinfo structure size is different in msvcrXX.dll's */ typedef struct { HANDLE handle; @@ -619,9 +621,9 @@ static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) && MSVCRT__isatty(file->_file)) return FALSE; - file->_base = MSVCRT_calloc(MSVCRT_BUFSIZ,1); + file->_base = MSVCRT_calloc(MSVCRT_INTERNAL_BUFSIZ,1); if(file->_base) { - file->_bufsiz = MSVCRT_BUFSIZ; + file->_bufsiz = MSVCRT_INTERNAL_BUFSIZ; file->_flag |= MSVCRT__IOMYBUF; } else { file->_base = (char*)(&file->_charbuf); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 00e1f90..c98adf4 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2269,7 +2269,7 @@ static void test_write_flush(void) ok(file != NULL, "unable to create test file\n"); iobuf[0] = 0; fwrite(iobuf, 1, 1, file); /* needed for wine to init _bufsiz */ - todo_wine ok(file->_bufsiz == 4096, "incorrect default buffer size: %d", file->_bufsiz); + ok(file->_bufsiz == 4096, "incorrect default buffer size: %d", file->_bufsiz); test_write_flush_size(file, file->_bufsiz); setvbuf(file, iobuf, _IOFBF, sizeof(iobuf)); test_write_flush_size(file, sizeof(iobuf));

1 0

Grazvydas Ignotas : msvcrt: Free old buffer properly in setvbuf.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 9614283996933feac38163e89dc6ebb3d5254e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9614283996933feac38163e89… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat Jun 14 02:23:54 2014 +0300 msvcrt: Free old buffer properly in setvbuf. --- dlls/msvcrt/file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7ebf6d2..178f164 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4465,7 +4465,10 @@ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t s { MSVCRT__lock_file(file); if(file->_bufsiz) { - MSVCRT_free(file->_base); + if(file->_flag & MSVCRT__IOMYBUF) + MSVCRT_free(file->_base); + file->_flag &= ~MSVCRT__IOMYBUF; + file->_base = file->_ptr = NULL; file->_bufsiz = 0; file->_cnt = 0; }

1 0

Alexandre Julliard : gdi32/tests: Silence some noisy traces.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: ec3f8a76d58acc914bf77acdb5448420d0ccc9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3f8a76d58acc914bf77acdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 17 10:58:51 2014 +0200 gdi32/tests: Silence some noisy traces. --- dlls/gdi32/tests/metafile.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 54b5973..1b0d34b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -84,9 +84,6 @@ static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, LOGFONTA device_lf; INT ret; - trace("hdc %p, emr->iType %d, emr->nSize %d, param %p\n", - hdc, emr->iType, emr->nSize, (void *)param); - if(!hdc) return 1; PlayEnhMetaFileRecord(hdc, handle_table, emr, n_objs); @@ -299,10 +296,6 @@ static int CALLBACK eto_scale_enum_proc(HDC hdc, HANDLETABLE *handle_table, if (emr->iType == EMR_EXTTEXTOUTW) { const EMREXTTEXTOUTW *pExtTextOutW = (const EMREXTTEXTOUTW *)emr; - trace("gm %d, mm %d, scale %f, %f, expected %f, %f\n", - test->graphics_mode, test->map_mode, - pExtTextOutW->exScale, pExtTextOutW->eyScale, - test->ex_scale, test->ey_scale); ok(fabs(test->ex_scale - pExtTextOutW->exScale) < 0.001, "Got exScale %f, expected %f\n", pExtTextOutW->exScale, test->ex_scale); ok(fabs(test->ey_scale - pExtTextOutW->eyScale) < 0.001, @@ -488,7 +481,6 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, trace("hdc %p, emr->iType %d, emr->nSize %d, param %p\n", hdc, emr->iType, emr->nSize, (void *)param); - trace("BEFORE:\n"); SetLastError(0xdeadbeef); ret = GetWorldTransform(hdc, &xform); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -610,7 +602,6 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, break; } - trace("AFTER:\n"); SetLastError(0xdeadbeef); ret = GetWorldTransform(hdc, &xform); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -3222,11 +3213,8 @@ static void test_GetWinMetaFileBits(void) for(mode = MM_MIN; mode <= MM_MAX; mode++) { RECT *rc; - trace("mode %d\n", mode); - for(rc = frames; rc->right - rc->left > 0; rc++) { - trace("frame %d,%d - %d,%d\n", rc->left, rc->top, rc->right, rc->bottom); getwinmetafilebits(mode, 1, rc); getwinmetafilebits(mode, 2, rc); }

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::scroll implementation.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 0b30276e2feb93931b575a6b39c79ce6dabe639e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b30276e2feb93931b575a6b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 17 12:43:48 2014 +0200 mshtml: Added IHTMLWindow2::scroll implementation. --- dlls/mshtml/htmlwindow.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1333608..fab227e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1294,8 +1294,17 @@ static HRESULT WINAPI HTMLWindow2_blur(IHTMLWindow2 *iface) static HRESULT WINAPI HTMLWindow2_scroll(IHTMLWindow2 *iface, LONG x, LONG y) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%d %d)\n", This, x, y); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d %d)\n", This, x, y); + + nsres = nsIDOMWindow_Scroll(This->outer_window->nswindow, x, y); + if(NS_FAILED(nsres)) { + ERR("ScrollBy failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_clientInformation(IHTMLWindow2 *iface, IOmNavigator **p)

1 0

Alexandre Julliard : user32: Properly block sent messages while waiting for a reply with SMTO_BLOCK.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 82bee5ceda12ec30603d7f87034abd0454580bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=82bee5ceda12ec30603d7f870… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 17 15:14:47 2014 +0200 user32: Properly block sent messages while waiting for a reply with SMTO_BLOCK. --- dlls/user32/message.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 3167a2f..fd82498 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3011,6 +3011,7 @@ static void wait_message_reply( UINT flags ) { struct user_thread_info *thread_info = get_user_thread_info(); HANDLE server_queue = get_server_queue_handle(); + unsigned int wake_mask = QS_SMRESULT | ((flags & SMTO_BLOCK) ? 0 : QS_SENDMESSAGE); for (;;) { @@ -3018,11 +3019,10 @@ static void wait_message_reply( UINT flags ) SERVER_START_REQ( set_queue_mask ) { - req->wake_mask = QS_SMRESULT | ((flags & SMTO_BLOCK) ? 0 : QS_SENDMESSAGE); - req->changed_mask = req->wake_mask; + req->wake_mask = wake_mask; + req->changed_mask = wake_mask; req->skip_wait = 1; - if (!wine_server_call( req )) - wake_bits = reply->wake_bits; + if (!wine_server_call( req )) wake_bits = reply->wake_bits & wake_mask; } SERVER_END_REQ; @@ -3036,7 +3036,7 @@ static void wait_message_reply( UINT flags ) continue; } - wow_handlers.wait_message( 1, &server_queue, INFINITE, QS_SENDMESSAGE, 0 ); + wow_handlers.wait_message( 1, &server_queue, INFINITE, wake_mask, 0 ); } }

1 0

Piotr Caban : msvcrt: Use size_t to store indexes in qsort.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 8436b58ee7e3ceced8835b1deebc60193aca0636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8436b58ee7e3ceced8835b1de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 17 12:48:40 2014 +0200 msvcrt: Use size_t to store indexes in qsort. It also avoids potential overflow while computing median position (found by Frédéric Delanoy). --- dlls/msvcrt/misc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 36d0608..c07005a 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -262,8 +262,9 @@ static void small_sort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, static void quick_sort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, int (CDECL *compar)(void *, const void *, const void *), void *context) { - int stack_lo[8*sizeof(MSVCRT_size_t)], stack_hi[8*sizeof(MSVCRT_size_t)], stack_pos; - int beg, end, lo, hi, med; + MSVCRT_size_t stack_lo[8*sizeof(MSVCRT_size_t)], stack_hi[8*sizeof(MSVCRT_size_t)]; + MSVCRT_size_t beg, end, lo, hi, med; + int stack_pos; stack_pos = 0; stack_lo[stack_pos] = 0; @@ -281,7 +282,7 @@ static void quick_sort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, lo = beg; hi = end; - med = (hi+lo+1)/2; + med = lo + (hi-lo+1)/2; if(compar(context, X(lo), X(med)) > 0) swap(X(lo), X(med), size); if(compar(context, X(lo), X(hi)) > 0)

1 0

Grazvydas Ignotas : msvcrt/tests: Add a test for fwrite flushing behavior.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 147be95a68727eed1f021319ea05903c5451e3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147be95a68727eed1f021319e… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat Jun 14 02:23:55 2014 +0300 msvcrt/tests: Add a test for fwrite flushing behavior. --- dlls/msvcrt/tests/file.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index f6a1624..00e1f90 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2219,6 +2219,65 @@ static void test__open_osfhandle(void) CloseHandle(tmp); } +static void test_write_flush_size(FILE *file, size_t bufsize) +{ + char *inbuffer; + char *outbuffer; + size_t size; + int fd; + + fd = fileno(file); + inbuffer = calloc(bufsize + 1, 1); + outbuffer = calloc(bufsize + 1, 1); + _snprintf(outbuffer, bufsize + 1, "0,1,2,3,4,5,6,7,8,9"); + + for (size = bufsize + 1; size >= bufsize - 1; size--) { + rewind(file); + fwrite(outbuffer, 1, size, file); + /* lseek() below intentionally redirects the write in fflush() to detect + * if fwrite() has already flushed the whole buffer or not. + */ + lseek(fd, 1, SEEK_SET); + fflush(file); + fseek(file, 0, SEEK_SET); + ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); + if (size == bufsize) + todo_wine ok(memcmp(outbuffer, inbuffer, bufsize) == 0, "missing flush by %d byte write\n", size); + else + ok(memcmp(outbuffer, inbuffer, bufsize) != 0, "unexpected flush by %d byte write\n", size); + } + rewind(file); + fwrite(outbuffer, 1, bufsize / 2, file); + fwrite(outbuffer + bufsize / 2, 1, bufsize / 2, file); + lseek(fd, 1, SEEK_SET); + fflush(file); + fseek(file, 0, SEEK_SET); + ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); + ok(memcmp(outbuffer, inbuffer, bufsize) != 0, "unexpected flush by %d/2 byte double write\n", bufsize); + free(inbuffer); + free(outbuffer); +} + +static void test_write_flush(void) +{ + char iobuf[1024]; + char *tempf; + FILE *file; + + tempf = _tempnam(".","wne"); + file = fopen(tempf, "wb+"); + ok(file != NULL, "unable to create test file\n"); + iobuf[0] = 0; + fwrite(iobuf, 1, 1, file); /* needed for wine to init _bufsiz */ + todo_wine ok(file->_bufsiz == 4096, "incorrect default buffer size: %d", file->_bufsiz); + test_write_flush_size(file, file->_bufsiz); + setvbuf(file, iobuf, _IOFBF, sizeof(iobuf)); + test_write_flush_size(file, sizeof(iobuf)); + fclose(file); + unlink(tempf); + free(tempf); +} + START_TEST(file) { int arg_c; @@ -2284,6 +2343,7 @@ START_TEST(file) test_stdin(); test_mktemp(); test__open_osfhandle(); + test_write_flush(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 93c225a72d6b6ee77282225fd7d1b0ee3599df00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c225a72d6b6ee77282225fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 17 14:56:31 2014 +0400 po: Update Russian translation. --- po/ru.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index f6de2db..5ca9842 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6595,10 +6595,8 @@ msgid "This network connection does not exist.\n" msgstr "Указанное сетевое соединение не существует.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Соединение отвергнуто.\n" +msgstr "Соединение закрыто удалённым узлом.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Alexandre Julliard : user32/tests: Silence some noisy traces.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: ae6efdd45dca4d6c9f0f00b0c9e1186a40957dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6efdd45dca4d6c9f0f00b0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 17 10:58:55 2014 +0200 user32/tests: Silence some noisy traces. --- dlls/user32/tests/menu.c | 4 ++-- dlls/user32/tests/win.c | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 593292d..eaa93a5 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -172,7 +172,7 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, case WM_MEASUREITEM: { MEASUREITEMSTRUCT* pmis = (MEASUREITEMSTRUCT*)lparam; - if( winetest_debug) + if (winetest_debug > 1) trace("WM_MEASUREITEM received data %lx size %dx%d\n", pmis->itemData, pmis->itemWidth, pmis->itemHeight); ok( !wparam, "wrong wparam %lx\n", wparam ); @@ -191,7 +191,7 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, SIZE sz; int i; pdis = (DRAWITEMSTRUCT *) lparam; - if( winetest_debug) { + if (winetest_debug > 1) { RECT rc; GetMenuItemRect( hwnd, (HMENU)pdis->hwndItem, pdis->itemData ,&rc); trace("WM_DRAWITEM received hwnd %p hmenu %p itemdata %ld item %d rc %d,%d-%d,%d itemrc: %d,%d-%d,%d\n", diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5bdfed6..bf9bb2c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1643,12 +1643,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_1(HWND hwnd, UINT msg, WPARAM wparam, L style = GetWindowLongA(hwnd, GWL_STYLE); exstyle = GetWindowLongA(hwnd, GWL_EXSTYLE); - GetWindowRect(client, &rc); - trace("MDI client %p window size = (%d x %d)\n", client, rc.right-rc.left, rc.bottom-rc.top); GetClientRect(client, &rc); - trace("MDI client %p client size = (%d x %d)\n", client, rc.right, rc.bottom); - trace("screen size: %d x %d\n", GetSystemMetrics(SM_CXSCREEN), - GetSystemMetrics(SM_CYSCREEN)); GetClientRect(client, &rc); if ((style & WS_CAPTION) == WS_CAPTION) @@ -6276,7 +6271,6 @@ static LRESULT CALLBACK fullscreen_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPAR case WM_NCCREATE: { CREATESTRUCTA *cs = (CREATESTRUCTA *)lp; - trace("WM_NCCREATE: rect %d,%d-%d,%d\n", cs->x, cs->y, cs->cx, cs->cy); ok(cs->x == mi.rcMonitor.left && cs->y == mi.rcMonitor.top && cs->cx == mi.rcMonitor.right && cs->cy == mi.rcMonitor.bottom, "expected %d,%d-%d,%d, got %d,%d-%d,%d\n", @@ -6287,7 +6281,6 @@ static LRESULT CALLBACK fullscreen_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPAR case WM_GETMINMAXINFO: { MINMAXINFO *minmax = (MINMAXINFO *)lp; - dump_minmax_info(minmax); ok(minmax->ptMaxPosition.x <= mi.rcMonitor.left, "%d <= %d\n", minmax->ptMaxPosition.x, mi.rcMonitor.left); ok(minmax->ptMaxPosition.y <= mi.rcMonitor.top, "%d <= %d\n", minmax->ptMaxPosition.y, mi.rcMonitor.top); ok(minmax->ptMaxSize.x >= mi.rcMonitor.right, "%d >= %d\n", minmax->ptMaxSize.x, mi.rcMonitor.right);

1 0