November 2010 - Wine-commits

Alexandre Goujon : cmd: Add a space at the end of the first echo' ed batch line.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 4cd2a0e54239973c4205a114d4b347647a2150a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd2a0e54239973c4205a114d… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Fri Nov 5 22:15:45 2010 +0100 cmd: Add a space at the end of the first echo'ed batch line. --- programs/cmd/tests/batch.c | 53 +++++++++++++++++++++++++++-- programs/cmd/tests/test_builtins.cmd | 20 ++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 40 +++++++++++++++++++++- programs/cmd/wcmdmain.c | 3 ++ 4 files changed, 108 insertions(+), 8 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index cc8c020..0f01dbf 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -25,6 +25,36 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; +/* Substitute escaped spaces with real ones */ +static const char* replace_escaped_spaces(const char *data, DWORD size, DWORD *new_size) +{ + static const char escaped_space[] = {'@','s','p','a','c','e','@','\0'}; + const char *a, *b; + char *new_data; + DWORD len_space = sizeof(escaped_space) -1; + + a = b = data; + *new_size = 0; + + new_data = HeapAlloc(GetProcessHeap(), 0, size*sizeof(char)); + ok(new_data != NULL, "HeapAlloc failed\n"); + if(!new_data) + return NULL; + + while( (b = strstr(a, escaped_space)) ) + { + strncpy(new_data + *new_size, a, b-a + 1); + *new_size += b-a + 1; + new_data[*new_size - 1] = ' '; + a = b + len_space; + } + + strncpy(new_data + *new_size, a, strlen(a) + 1); + *new_size += strlen(a); + + return new_data; +} + static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) { SECURITY_ATTRIBUTES sa = {sizeof(sa), 0, TRUE}; @@ -113,6 +143,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char pwd_cmd[] = {'@','p','w','d','@'}; static const char todo_space_cmd[] = {'@','t','o','d','o','_','s','p','a','c','e','@'}; + static const char space_cmd[] = {'@','s','p','a','c','e','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; while(exp_ptr < exp_end) { @@ -135,6 +166,13 @@ static const char *compare_line(const char *out_line, const char *out_end, const if(out_ptr < out_end && *out_ptr == ' ') out_ptr++; continue; + }else if(exp_ptr+sizeof(space_cmd) <= exp_end + && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { + exp_ptr += sizeof(space_cmd); + ok(*out_ptr == ' ', "expected space\n"); + if(out_ptr < out_end && *out_ptr == ' ') + out_ptr++; + continue; }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { exp_ptr = exp_end; @@ -199,11 +237,15 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, DWORD exp_size) { - const char *out_data; - DWORD out_size; + const char *out_data, *actual_cmd_data; + DWORD out_size, actual_cmd_size; - if(!run_cmd(cmd_data, cmd_size)) - return; + actual_cmd_data = replace_escaped_spaces(cmd_data, cmd_size, &actual_cmd_size); + if(!actual_cmd_size || !actual_cmd_data) + goto cleanup; + + if(!run_cmd(actual_cmd_data, actual_cmd_size)) + goto cleanup; out_size = map_file("test.out", &out_data); if(out_size) { @@ -212,6 +254,9 @@ static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, } DeleteFileA("test.out"); DeleteFileA("test.err"); + +cleanup: + HeapFree(GetProcessHeap(), 0, (LPVOID)actual_cmd_data); } static void run_from_file(char *file_name) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d9f5cf7..375b7a1 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1,7 +1,21 @@ echo Tests for cmd's builtin commands -(a)echo off -echo ------------ Testing 'echo' -------------- +(a)echo on +echo ------------ Testing 'echo' [ON] -------------- +echo word +echo 'singlequotedword' +echo "doublequotedword" +(a)echo at-echoed-word +echo "/?" +echo. +echo . +echo.word +echo .word +echo word(a)space@ +echo word(a)space@@space@ + +(a)echo off +echo ------------ Testing 'echo' [OFF] -------------- echo word echo 'singlequotedword' echo "doublequotedword" @@ -11,6 +25,8 @@ echo. echo . echo.word echo .word +echo word(a)space@ +echo word(a)space@@space@ echo ------------ Testing 'set' -------------- echo set "FOO=bar" should not include the quotes in the variable value diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8942cb3..dee2c5b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1,7 +1,41 @@ -(a)pwd@>echo Tests for cmd's builtin commands(a)todo_space@ +(a)pwd@>echo Tests for cmd's builtin commands(a)space@ Tests for cmd's builtin commands ------------- Testing 'echo' -------------- + +(a)pwd@>echo ------------ Testing 'echo' [ON] --------------(a)space@ +------------ Testing 'echo' [ON] -------------- + +(a)pwd@>echo word(a)space@ +word + +(a)pwd@>echo 'singlequotedword'@space@ +'singlequotedword' + +(a)pwd@>echo "doublequotedword"@space@ +"doublequotedword" +at-echoed-word + +(a)pwd@>echo "/?"@space@ +"/?" + +(a)pwd@>echo. + + +(a)pwd@>echo .(a)space@ +. + +(a)pwd@>echo.word +word + +(a)pwd@>echo .word(a)space@ +.word + +(a)pwd@>echo word(a)space@@space@ +word(a)space@ + +(a)pwd@>echo word(a)space@@space@@space@ +word(a)space@@space@ +------------ Testing 'echo' [OFF] -------------- word 'singlequotedword' "doublequotedword" @@ -11,6 +45,8 @@ at-echoed-word . word .word +word(a)space@ +word(a)space@@space@ ------------ Testing 'set' -------------- set "FOO=bar" should not include the quotes in the variable value bar diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b50512e..85f78b8 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1779,8 +1779,11 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); /* Show prompt before batch line IF echo is on and in batch program */ if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + const WCHAR spc[]={' ','\0'}; WCMD_show_prompt(); WCMD_output_asis(extraSpace); + /* I don't know why Windows puts a space here but it does */ + WCMD_output_asis(spc); WCMD_output_asis(newline); }

1 0

Alexandre Julliard : winex11: Add support for having a drawable associated to non-toplevel windows.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: abb559dd7a23788f55c82f6df13ecf089cbcda27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb559dd7a23788f55c82f6df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 15:46:07 2010 +0100 winex11: Add support for having a drawable associated to non-toplevel windows. --- dlls/winex11.drv/window.c | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1005ad2..2a0f53f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2110,6 +2110,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, { struct x11drv_escape_set_drawable escape; struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + HWND parent; escape.code = X11DRV_SET_DRAWABLE; escape.mode = IncludeInferiors; @@ -2118,6 +2119,15 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, escape.pixmap = 0; escape.gl_copy = FALSE; + escape.dc_rect.left = win_rect->left - top_rect->left; + escape.dc_rect.top = win_rect->top - top_rect->top; + escape.dc_rect.right = win_rect->right - top_rect->left; + escape.dc_rect.bottom = win_rect->bottom - top_rect->top; + escape.drawable_rect.left = top_rect->left; + escape.drawable_rect.top = top_rect->top; + escape.drawable_rect.right = top_rect->right; + escape.drawable_rect.bottom = top_rect->bottom; + if (top == hwnd) { escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop ); @@ -2134,7 +2144,19 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, } else { - escape.drawable = X11DRV_get_client_window( top ); + /* find the first ancestor that has a drawable */ + for (parent = hwnd; parent && parent != top; parent = GetAncestor( parent, GA_PARENT )) + if ((escape.drawable = X11DRV_get_client_window( parent ))) break; + + if (escape.drawable) + { + POINT pt = { 0, 0 }; + MapWindowPoints( top, parent, &pt, 1 ); + OffsetRect( &escape.dc_rect, pt.x, pt.y ); + OffsetRect( &escape.drawable_rect, -pt.x, -pt.y ); + } + else escape.drawable = X11DRV_get_client_window( top ); + escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop ); escape.gl_drawable = data ? data->gl_drawable : (Drawable)GetPropA( hwnd, gl_drawable_prop ); escape.pixmap = data ? data->pixmap : (Pixmap)GetPropA( hwnd, pixmap_prop ); @@ -2142,15 +2164,6 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, if (flags & DCX_CLIPCHILDREN) escape.mode = ClipByChildren; } - escape.dc_rect.left = win_rect->left - top_rect->left; - escape.dc_rect.top = win_rect->top - top_rect->top; - escape.dc_rect.right = win_rect->right - top_rect->left; - escape.dc_rect.bottom = win_rect->bottom - top_rect->top; - escape.drawable_rect.left = top_rect->left; - escape.drawable_rect.top = top_rect->top; - escape.drawable_rect.right = top_rect->right; - escape.drawable_rect.bottom = top_rect->bottom; - ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); }

1 0

Alexandre Julliard : winex11: Create Win32 windows corresponding to all the ancestors of embedded windows .
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 5d570706c6aca9acbff855c3ae497b35bdde4648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d570706c6aca9acbff855c3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 15:28:09 2010 +0100 winex11: Create Win32 windows corresponding to all the ancestors of embedded windows. This is needed to keep track of the embedded window position by handling ConfigureNotify received by ancestors. --- dlls/winex11.drv/event.c | 48 ++++++++++++++--- dlls/winex11.drv/window.c | 129 +++++++++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 166 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index aa38179..ae0875b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -800,7 +800,7 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) struct x11drv_win_data *data; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->mapped) return; + if (!data->mapped || data->embedded) return; if (!data->managed) { @@ -849,20 +849,47 @@ static void X11DRV_ReparentNotify( HWND hwnd, XEvent *xev ) { XReparentEvent *event = &xev->xreparent; struct x11drv_win_data *data; + HWND parent, old_parent; + DWORD style; if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->embedded) return; + + if (data->whole_window) + { + if (event->parent == root_window) + { + TRACE( "%p/%lx reparented to root\n", hwnd, data->whole_window ); + data->embedder = 0; + SendMessageW( hwnd, WM_CLOSE, 0, 0 ); + return; + } + data->embedder = event->parent; + } + + TRACE( "%p/%lx reparented to %lx\n", hwnd, data->whole_window, event->parent ); + + style = GetWindowLongW( hwnd, GWL_STYLE ); if (event->parent == root_window) { - TRACE( "%p/%lx reparented to root\n", hwnd, data->whole_window ); - data->embedder = 0; - SendMessageW( hwnd, WM_CLOSE, 0, 0 ); + parent = GetDesktopWindow(); + style = (style & ~WS_CHILD) | WS_POPUP; } else { - TRACE( "%p/%lx reparented to %lx\n", hwnd, data->whole_window, event->parent ); - data->embedder = event->parent; + if (!(parent = create_foreign_window( event->display, event->parent ))) return; + style = (style & ~WS_POPUP) | WS_CHILD; } + + ShowWindow( hwnd, SW_HIDE ); + old_parent = SetParent( hwnd, parent ); + SetWindowLongW( hwnd, GWL_STYLE, style ); + SetWindowPos( hwnd, HWND_TOP, event->x, event->y, 0, 0, + SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOCOPYBITS | + ((style & WS_VISIBLE) ? SWP_SHOWWINDOW : 0) ); + + /* make old parent destroy itself if it no longer has children */ + if (old_parent != GetDesktopWindow()) PostMessageW( old_parent, WM_CLOSE, 0, 0 ); } @@ -881,7 +908,10 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if (!hwnd) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->mapped || data->iconic || !data->managed) return; + if (!data->mapped || data->iconic) return; + if (data->whole_window && !data->managed) return; + /* ignore synthetic events on foreign windows */ + if (event->send_event && !data->whole_window) return; if (data->configure_serial && (long)(data->configure_serial - event->serial) > 0) { TRACE( "win %p/%lx event %d,%d,%dx%d ignoring old serial %lu/%lu\n", @@ -943,6 +973,8 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) cy = rect.bottom - rect.top; flags = SWP_NOACTIVATE | SWP_NOZORDER; + if (!data->whole_window) flags |= SWP_NOCOPYBITS; /* we can't copy bits of foreign windows */ + if (data->window_rect.left == x && data->window_rect.top == y) flags |= SWP_NOMOVE; else TRACE( "%p moving from (%d,%d) to (%d,%d)\n", @@ -973,7 +1005,7 @@ static void X11DRV_GravityNotify( HWND hwnd, XEvent *xev ) struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); RECT rect; - if (!data) return; + if (!data || data->whole_window) return; /* only handle this for foreign windows */ rect.left = event->x; rect.top = event->y; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 2a0f53f..446b71b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1892,9 +1892,16 @@ void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ) struct x11drv_win_data *data; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->embedded) FIXME( "window %p/%lx destroyed from the outside\n", hwnd, data->whole_window ); - destroy_whole_window( display, data, TRUE ); + + if (!data->whole_window) + { + wine_tsx11_lock(); + XDeleteContext( display, event->xdestroywindow.window, winContext ); + wine_tsx11_unlock(); + } + else destroy_whole_window( display, data, TRUE ); + if (data->embedded) SendMessageW( hwnd, WM_CLOSE, 0, 0 ); } @@ -2047,6 +2054,118 @@ struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ) } +/* window procedure for foreign windows */ +static LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + switch(msg) + { + case WM_PARENTNOTIFY: + if (LOWORD(wparam) == WM_DESTROY) + { + TRACE( "%p: got parent notify destroy for win %lx\n", hwnd, lparam ); + PostMessageW( hwnd, WM_CLOSE, 0, 0 ); /* so that we come back here once the child is gone */ + } + return 0; + case WM_CLOSE: + if (GetWindow( hwnd, GW_CHILD )) return 0; /* refuse to die if we still have children */ + break; + } + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + + +/*********************************************************************** + * create_foreign_window + * + * Create a foreign window for the specified X window and its ancestors + */ +HWND create_foreign_window( Display *display, Window xwin ) +{ + static const WCHAR classW[] = {'_','_','w','i','n','e','_','x','1','1','_','f','o','r','e','i','g','n','_','w','i','n','d','o','w',0}; + static BOOL class_registered; + struct x11drv_win_data *data; + HWND hwnd, parent; + Window xparent, xroot; + Window *xchildren; + unsigned int nchildren; + XWindowAttributes attr; + DWORD style = WS_CLIPCHILDREN; + + if (!class_registered) + { + WNDCLASSEXW class; + + memset( &class, 0, sizeof(class) ); + class.cbSize = sizeof(class); + class.lpfnWndProc = foreign_window_proc; + class.lpszClassName = classW; + if (!RegisterClassExW( &class ) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) + { + ERR( "Could not register foreign window class\n" ); + return FALSE; + } + class_registered = TRUE; + } + + wine_tsx11_lock(); + if (XFindContext( display, xwin, winContext, (char **)&hwnd )) hwnd = 0; + if (hwnd) /* already created */ + { + wine_tsx11_unlock(); + return hwnd; + } + + XSelectInput( display, xwin, StructureNotifyMask ); + if (!XGetWindowAttributes( display, xwin, &attr ) || + !XQueryTree( display, xwin, &xroot, &xparent, &xchildren, &nchildren )) + { + XSelectInput( display, xwin, 0 ); + wine_tsx11_unlock(); + return 0; + } + XFree( xchildren ); + wine_tsx11_unlock(); + + if (xparent == xroot) + { + parent = GetDesktopWindow(); + style |= WS_POPUP; + attr.x += virtual_screen_rect.left; + attr.y += virtual_screen_rect.top; + } + else + { + parent = create_foreign_window( display, xparent ); + style |= WS_CHILD; + } + + hwnd = CreateWindowW( classW, NULL, style, attr.x, attr.y, attr.width, attr.height, + parent, 0, 0, NULL ); + + if (!(data = alloc_win_data( display, hwnd ))) + { + DestroyWindow( hwnd ); + return 0; + } + SetRect( &data->window_rect, attr.x, attr.y, attr.x + attr.width, attr.y + attr.height ); + data->whole_rect = data->client_rect = data->window_rect; + data->whole_window = data->client_window = 0; + data->embedded = TRUE; + data->mapped = TRUE; + + wine_tsx11_lock(); + XSaveContext( display, xwin, winContext, (char *)data->hwnd ); + wine_tsx11_unlock(); + + ShowWindow( hwnd, SW_SHOW ); + + TRACE( "win %lx parent %p style %08x %s -> hwnd %p\n", + xwin, parent, style, wine_dbgstr_rect(&data->window_rect), hwnd ); + + return hwnd; +} + + /*********************************************************************** * X11DRV_get_whole_window * @@ -2234,6 +2353,7 @@ void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) if (!data) return; if (parent == old_parent) return; + if (data->embedded) return; if (parent != GetDesktopWindow()) /* a child window */ { @@ -2384,10 +2504,11 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (thread_data->current_event && thread_data->current_event->xany.window == data->whole_window) event_type = thread_data->current_event->type; - if (event_type != ConfigureNotify && event_type != PropertyNotify && event_type != GravityNotify) + if (event_type != ConfigureNotify && event_type != PropertyNotify && + event_type != GravityNotify && event_type != ReparentNotify) event_type = 0; /* ignore other events */ - if (data->mapped) + if (data->mapped && event_type != ReparentNotify) { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || (event_type != ConfigureNotify && diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4412f3e..f48b51f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -784,6 +784,7 @@ extern void update_user_time( Time time ); extern void update_net_wm_states( Display *display, struct x11drv_win_data *data ); extern void make_window_embedded( Display *display, struct x11drv_win_data *data ); extern void change_systray_owner( Display *display, Window systray_window ); +extern HWND create_foreign_window( Display *display, Window window ); static inline void mirror_rect( const RECT *window_rect, RECT *rect ) {

1 0

Bernhard Übelacker : comctl32: Test for window messages of a property sheet with custom dialog proc.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 43aa5f6b2e61d070121993d6f203c2ea195de3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=43aa5f6b2e61d070121993d6f… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Sat Nov 6 09:54:12 2010 +0100 comctl32: Test for window messages of a property sheet with custom dialog proc. --- dlls/comctl32/tests/msg.h | 4 +- dlls/comctl32/tests/propsheet.c | 228 +++++++++++++++++++++++++++++++++++++- dlls/comctl32/tests/resources.h | 1 + dlls/comctl32/tests/rsrc.rc | 7 ++ 4 files changed, 232 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43aa5f6b2e61d07012199…

1 0

Michael Stefaniuc : serialui: Don't cast zero.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 62409c42b12abc74899b6321e0a861b8fd5d7b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62409c42b12abc74899b6321e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 8 11:37:55 2010 +0100 serialui: Don't cast zero. --- dlls/serialui/confdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index d281c78..0409675 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -162,7 +162,7 @@ static void SERIALUI_AddConfItems(HWND hDlg, DWORD id, LPCPARAM2STR table, DWORD n = SendMessageA(hControl, CB_ADDSTRING, 0L, (LPARAM)table->data[i].name); if(dwVal == table->data[i].val) { - SendMessageA(hControl, CB_SETCURSEL, (WPARAM)n, (LPARAM)0); + SendMessageA(hControl, CB_SETCURSEL, n, 0); } } }

1 0

Marcus Meissner : ntdll: Check and fix PE header protections.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 2e7dc3578663f052b8ee1d39df4a2ad41ed02300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e7dc3578663f052b8ee1d39d… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Nov 8 03:34:27 2010 +0100 ntdll: Check and fix PE header protections. --- dlls/ntdll/tests/info.c | 11 +++++++++++ dlls/ntdll/virtual.c | 5 ++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index d228816..6345e08 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1079,6 +1079,17 @@ static void test_queryvirtualmemory(void) char stackbuf[42]; HMODULE module; + module = GetModuleHandle( "ntdll.dll" ); + trace("Check flags of the PE header of NTDLL.DLL at %p\n", module); + status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount); + ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module); + ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); + ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT); + ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READONLY); + ok (mbi.Type == MEM_IMAGE, "mbi.Type is 0x%x, expected 0x%x\n", mbi.Type, MEM_IMAGE); + trace("Check flags of a function entry in NTDLL.DLL at %p\n", pNtQueryVirtualMemory); module = GetModuleHandle( "ntdll.dll" ); status = pNtQueryVirtualMemory(NtCurrentProcess(), pNtQueryVirtualMemory, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ea1400e..7dff79f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1445,10 +1445,13 @@ NTSTATUS virtual_create_builtin_view( void *module ) if (status) return status; + /* The PE header is always read-only, no write, no execute. */ + view->prot[0] = VPROT_COMMITTED | VPROT_READ; + sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) { - DWORD flags = VPROT_SYSTEM | VPROT_IMAGE | VPROT_COMMITTED; + BYTE flags = VPROT_COMMITTED; if (sec[i].Characteristics & IMAGE_SCN_MEM_EXECUTE) flags |= VPROT_EXEC; if (sec[i].Characteristics & IMAGE_SCN_MEM_READ) flags |= VPROT_READ;

1 0

Eric Pouech : msvcrt: Implemented the _(w)getenv_s functions.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: b0c3dc35a8118bfbe9847d0b5024f9ad380adff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c3dc35a8118bfbe9847d0b5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 7 19:11:26 2010 +0100 msvcrt: Implemented the _(w)getenv_s functions. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/environ.c | 55 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 +- 5 files changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0356f07..0a608b5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1356,7 +1356,7 @@ @ cdecl _wgetdcwd(long wstr long) msvcrt._wgetdcwd @ stub _wgetdcwd_nolock @ cdecl _wgetenv(wstr) msvcrt._wgetenv -@ stub _wgetenv_s +@ cdecl _wgetenv_s(ptr ptr long wstr) msvcrt._wgetenv_s @ cdecl _wmakepath(ptr wstr wstr wstr wstr) msvcrt._wmakepath @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) msvcrt._wmakepath_s @ cdecl _wmkdir(wstr) msvcrt._wmkdir @@ -1483,7 +1483,7 @@ @ cdecl getc(ptr) msvcrt.getc @ cdecl getchar() msvcrt.getchar @ cdecl getenv(str) msvcrt.getenv -@ stub getenv_s +@ cdecl getenv_s(ptr ptr long str) msvcrt.getenv_s @ cdecl gets(str) msvcrt.gets @ stub gets_s @ cdecl getwc(ptr) msvcrt.getwc diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a1adb18..d29fad1 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1209,7 +1209,7 @@ @ cdecl _wgetdcwd(long wstr long) msvcrt._wgetdcwd @ stub _wgetdcwd_nolock @ cdecl _wgetenv(wstr) msvcrt._wgetenv -@ stub _wgetenv_s +@ cdecl _wgetenv_s(ptr ptr long wstr) msvcrt._wgetenv_s @ extern _winmajor msvcrt._winmajor @ extern _winminor msvcrt._winminor @ extern _winver msvcrt._winver @@ -1339,7 +1339,7 @@ @ cdecl getc(ptr) msvcrt.getc @ cdecl getchar() msvcrt.getchar @ cdecl getenv(str) msvcrt.getenv -@ stub getenv_s +@ cdecl getenv_s(ptr ptr long str) msvcrt.getenv_s @ cdecl gets(str) msvcrt.gets @ stub gets_s @ cdecl getwc(ptr) msvcrt.getwc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8ec604a..cc822da 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1196,7 +1196,7 @@ @ cdecl _wgetdcwd(long wstr long) msvcrt._wgetdcwd @ stub _wgetdcwd_nolock @ cdecl _wgetenv(wstr) msvcrt._wgetenv -@ stub _wgetenv_s +@ cdecl _wgetenv_s(ptr ptr long wstr) msvcrt._wgetenv_s @ cdecl _wmakepath(ptr wstr wstr wstr wstr) msvcrt._wmakepath @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) msvcrt._wmakepath_s @ cdecl _wmkdir(wstr) msvcrt._wmkdir diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 99efd4b..49e4885 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -261,3 +261,58 @@ int _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements, if (numberOfElements) *numberOfElements = sz; return 0; } + +/****************************************************************** + * getenv_s (MSVCRT.@) + */ +int getenv_s(MSVCRT_size_t *pReturnValue, char* buffer, MSVCRT_size_t numberOfElements, const char *varname) +{ + char* e; + + if (!MSVCRT_CHECK_PMT(pReturnValue != NULL) || + !MSVCRT_CHECK_PMT(!(buffer == NULL && numberOfElements > 0)) || + !MSVCRT_CHECK_PMT(varname != NULL)) + { + return *MSVCRT__errno() = MSVCRT_EINVAL; + } + if (!(e = MSVCRT_getenv(varname))) + { + *pReturnValue = 0; + return *MSVCRT__errno() = MSVCRT_EINVAL; + } + *pReturnValue = strlen(e) + 1; + if (numberOfElements < *pReturnValue) + { + return *MSVCRT__errno() = MSVCRT_ERANGE; + } + strcpy(buffer, e); + return 0; +} + +/****************************************************************** + * _wgetenv_s (MSVCRT.@) + */ +int _wgetenv_s(MSVCRT_size_t *pReturnValue, MSVCRT_wchar_t *buffer, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t *varname) +{ + MSVCRT_wchar_t* e; + + if (!MSVCRT_CHECK_PMT(pReturnValue != NULL) || + !MSVCRT_CHECK_PMT(!(buffer == NULL && numberOfElements > 0)) || + !MSVCRT_CHECK_PMT(varname != NULL)) + { + return *MSVCRT__errno() = MSVCRT_EINVAL; + } + if (!(e = _wgetenv(varname))) + { + *pReturnValue = 0; + return *MSVCRT__errno() = MSVCRT_EINVAL; + } + *pReturnValue = strlenW(e) + 1; + if (numberOfElements < *pReturnValue) + { + return *MSVCRT__errno() = MSVCRT_ERANGE; + } + strcpyW(buffer, e); + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 871023b..42c2469 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1128,7 +1128,7 @@ @ cdecl _wgetcwd(wstr long) @ cdecl _wgetdcwd(long wstr long) @ cdecl _wgetenv(wstr) -# stub _wgetenv_s +@ cdecl _wgetenv_s(ptr ptr long wstr) @ extern _winmajor MSVCRT__winmajor @ extern _winminor MSVCRT__winminor # stub _winput_s @@ -1273,7 +1273,7 @@ @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) MSVCRT_getenv -# stub getenv_s +@ cdecl getenv_s(ptr ptr long str) @ cdecl gets(str) MSVCRT_gets @ cdecl getwc(ptr) MSVCRT_getwc @ cdecl getwchar() MSVCRT_getwchar

1 0

Alexandre Julliard : msvcrt: Add some missing CDECLs.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: a56de4c30f969e130d44c555acc0d7f6b1b6c559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56de4c30f969e130d44c555a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 16:43:31 2010 +0100 msvcrt: Add some missing CDECLs. --- dlls/msvcrt/environ.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 49e4885..eac10f1 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -216,7 +216,7 @@ int CDECL _wputenv_s(const MSVCRT_wchar_t *name, const MSVCRT_wchar_t *value) /****************************************************************** * _dupenv_s (MSVCRT.@) */ -int _dupenv_s(char **buffer, MSVCRT_size_t *numberOfElements, const char *varname) +int CDECL _dupenv_s(char **buffer, MSVCRT_size_t *numberOfElements, const char *varname) { char* e; MSVCRT_size_t sz; @@ -240,8 +240,8 @@ int _dupenv_s(char **buffer, MSVCRT_size_t *numberOfElements, const char *varnam /****************************************************************** * _wdupenv_s (MSVCRT.@) */ -int _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements, - const MSVCRT_wchar_t *varname) +int CDECL _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements, + const MSVCRT_wchar_t *varname) { MSVCRT_wchar_t* e; MSVCRT_size_t sz; @@ -265,7 +265,7 @@ int _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements, /****************************************************************** * getenv_s (MSVCRT.@) */ -int getenv_s(MSVCRT_size_t *pReturnValue, char* buffer, MSVCRT_size_t numberOfElements, const char *varname) +int CDECL getenv_s(MSVCRT_size_t *pReturnValue, char* buffer, MSVCRT_size_t numberOfElements, const char *varname) { char* e; @@ -292,8 +292,8 @@ int getenv_s(MSVCRT_size_t *pReturnValue, char* buffer, MSVCRT_size_t numberOfEl /****************************************************************** * _wgetenv_s (MSVCRT.@) */ -int _wgetenv_s(MSVCRT_size_t *pReturnValue, MSVCRT_wchar_t *buffer, MSVCRT_size_t numberOfElements, - const MSVCRT_wchar_t *varname) +int CDECL _wgetenv_s(MSVCRT_size_t *pReturnValue, MSVCRT_wchar_t *buffer, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t *varname) { MSVCRT_wchar_t* e;

1 0

Eric Pouech : msvcrt: For internal msvcrt use, added ability to grow automatically the size of the buffer in printf core engine .
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 7d384d23f80926de887c4635e7b39835303b507a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d384d23f80926de887c4635e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 7 19:11:32 2010 +0100 msvcrt: For internal msvcrt use, added ability to grow automatically the size of the buffer in printf core engine. --- dlls/msvcrt/msvcrt.h | 18 ++++++++++++ dlls/msvcrt/wcs.c | 71 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 70 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 2e8263e..b14a326 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -861,4 +861,22 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ #define MSVCRT_CHECK_PMT(x) ((x) || (MSVCRT_INVALID_PMT(0),FALSE)) #endif +typedef struct pf_output_t +{ + int used; + int len; + BOOL unicode; + union { + LPWSTR W; + LPSTR A; + } buf; + union { + LPWSTR W; + LPSTR A; + } grow; +} pf_output; + +int pf_vsnprintf( pf_output *out, const WCHAR *format, + MSVCRT__locale_t locale, BOOL valid, __ms_va_list valist ); + #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 48831b2..922e9d3 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -361,17 +361,6 @@ double CDECL MSVCRT__wtof_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) return MSVCRT__wcstod_l(str, NULL, locale); } -typedef struct pf_output_t -{ - int used; - int len; - BOOL unicode; - union { - LPWSTR W; - LPSTR A; - } buf; -} pf_output; - typedef struct pf_flags_t { char Sign, LeftAlign, Alternate, PadZero; @@ -381,6 +370,36 @@ typedef struct pf_flags_t char Format; } pf_flags; +static inline BOOL pf_is_auto_grow(pf_output *out) +{ + return (out->unicode) ? !!out->grow.W : !!out->grow.A; +} + +static inline int pf_check_auto_grow(pf_output *out, unsigned delta) +{ + if (pf_is_auto_grow(out) && out->used + delta > out->len) + { + out->len = max(out->len * 2, out->used + delta); + if (out->unicode) + { + if (out->buf.W != out->grow.W) + out->buf.W = MSVCRT_realloc(out->buf.W, out->len * sizeof(WCHAR)); + else + out->buf.W = MSVCRT_malloc(out->len * sizeof(WCHAR)); + if (!out->buf.W) return -1; + } + else + { + if (out->buf.A != out->grow.A) + out->buf.A = MSVCRT_realloc(out->buf.A, out->len * sizeof(char)); + else + out->buf.A = MSVCRT_malloc(out->len * sizeof(char)); + if (!out->buf.A) return -1; + } + } + return 0; +} + /* * writes a string of characters to the output * returns -1 if the string doesn't fit in the output buffer @@ -388,14 +407,17 @@ typedef struct pf_flags_t */ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) { - int space = out->len - out->used; + int space; if( len < 0 ) len = strlenW( str ); if( out->unicode ) { - LPWSTR p = out->buf.W + out->used; + LPWSTR p; + if(pf_check_auto_grow(out, len) == -1) return -1; + space = out->len - out->used; + p = out->buf.W + out->used; if( space >= len ) { if (out->buf.W) memcpy( p, str, len*sizeof(WCHAR) ); @@ -409,8 +431,11 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) else { int n = WideCharToMultiByte( CP_ACP, 0, str, len, NULL, 0, NULL, NULL ); - LPSTR p = out->buf.A + out->used; + LPSTR p; + if(pf_check_auto_grow(out, n) == -1) return -1; + space = out->len - out->used; + p = out->buf.A + out->used; if( space >= n ) { if (out->buf.A) WideCharToMultiByte( CP_ACP, 0, str, len, p, n, NULL, NULL ); @@ -426,14 +451,17 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) { - int space = out->len - out->used; + int space; if( len < 0 ) len = strlen( str ); if( !out->unicode ) { - LPSTR p = out->buf.A + out->used; + LPSTR p; + if (pf_check_auto_grow(out, len) == -1) return -1; + p = out->buf.A + out->used; + space = out->len - out->used; if( space >= len ) { if (out->buf.A) memcpy( p, str, len ); @@ -447,8 +475,11 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) else { int n = MultiByteToWideChar( CP_ACP, 0, str, len, NULL, 0 ); - LPWSTR p = out->buf.W + out->used; + LPWSTR p; + if (pf_check_auto_grow(out, n) == -1) return -1; + p = out->buf.W + out->used; + space = out->len - out->used; if( space >= n ) { if (out->buf.W) MultiByteToWideChar( CP_ACP, 0, str, len, p, n ); @@ -723,8 +754,8 @@ static void pf_fixup_exponent( char *buf ) * * implements both A and W vsnprintf functions */ -static int pf_vsnprintf( pf_output *out, const WCHAR *format, - MSVCRT__locale_t locale, BOOL valid, __ms_va_list valist ) +int pf_vsnprintf( pf_output *out, const WCHAR *format, + MSVCRT__locale_t locale, BOOL valid, __ms_va_list valist ) { int r; LPCWSTR q, p = format; @@ -1000,6 +1031,7 @@ static inline int vsnprintf_internal( char *str, MSVCRT_size_t len, const char * out.unicode = FALSE; out.buf.A = str; + out.grow.A = NULL; out.used = 0; out.len = len; @@ -1146,6 +1178,7 @@ static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len, out.unicode = TRUE; out.buf.W = str; + out.grow.W = NULL; out.used = 0; out.len = len;

1 0

Eric Pouech : msvcrt: Implemented _vc(w)printf.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 1eaae093e294fff3174f616d44b686af1be99965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eaae093e294fff3174f616d4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 7 19:11:38 2010 +0100 msvcrt: Implemented _vc(w)printf. --- dlls/msvcr100/msvcr100.spec | 6 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 6 +- dlls/msvcr90/msvcr90.spec | 6 +- dlls/msvcrt/console.c | 95 ++++++++++++++++++++++++++++++++++--------- dlls/msvcrt/msvcrt.spec | 6 +- 7 files changed, 89 insertions(+), 34 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0a608b5..f172f7b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -564,7 +564,7 @@ @ cdecl _ctime64(ptr) msvcrt._ctime64 @ stub _ctime64_s @ cdecl _cwait(ptr long long) msvcrt._cwait -@ stub _cwprintf +@ varargs _cwprintf(wstr) msvcrt._cwprintf @ stub _cwprintf_l @ stub _cwprintf_p @ stub _cwprintf_p_l @@ -1216,13 +1216,13 @@ @ cdecl _unlock_file(ptr) msvcrt._unlock_file @ cdecl _utime32(str ptr) msvcrt._utime32 @ cdecl _utime64(str ptr) msvcrt._utime64 -@ stub _vcprintf +@ cdecl _vcprintf(str ptr) msvcrt._vcprintf @ stub _vcprintf_l @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s @ stub _vcprintf_s_l -@ stub _vcwprintf +@ cdecl _vcwprintf(wstr ptr) msvcrt._vcwprintf @ stub _vcwprintf_l @ stub _vcwprintf_p @ stub _vcwprintf_p_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 307ae09..eaaf4f1 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -267,7 +267,7 @@ @ cdecl _ctime64(ptr) msvcrt._ctime64 @ extern _ctype msvcrt._ctype @ cdecl _cwait(ptr long long) msvcrt._cwait -@ stub _cwprintf +@ varargs _cwprintf(str) msvcrt._cwprintf @ varargs _cwscanf(wstr) msvcrt._cwscanf @ extern _daylight msvcrt._daylight @ extern _dstbias msvcrt._dstbias diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index fc8491d..e4f1a20 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -261,7 +261,7 @@ @ varargs _cscanf(str) msvcrt._cscanf @ cdecl _ctime64(ptr) msvcrt._ctime64 @ cdecl _cwait(ptr long long) msvcrt._cwait -@ stub _cwprintf +@ varargs _cwprintf(wstr) msvcrt._cwprintf @ varargs _cwscanf(wstr) msvcrt._cwscanf @ extern _daylight msvcrt._daylight @ extern _dstbias msvcrt._dstbias diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d29fad1..f939329 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -403,7 +403,7 @@ @ cdecl _ctime64(ptr) msvcrt._ctime64 @ stub _ctime64_s @ cdecl _cwait(ptr long long) msvcrt._cwait -@ stub _cwprintf +@ varargs _cwprintf(wstr) msvcrt._cwprintf @ stub _cwprintf_l @ stub _cwprintf_p @ stub _cwprintf_p_l @@ -1069,13 +1069,13 @@ @ cdecl _unlock_file(ptr) msvcrt._unlock_file @ cdecl _utime32(str ptr) msvcrt._utime32 @ cdecl _utime64(str ptr) msvcrt._utime64 -@ stub _vcprintf +@ cdecl _vcprintf(str ptr) msvcrt._vcprintf @ stub _vcprintf_l @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s @ stub _vcprintf_s_l -@ stub _vcwprintf +@ cdecl _vcwprintf(wstr ptr) msvcrt._vcwprintf @ stub _vcwprintf_l @ stub _vcwprintf_p @ stub _vcwprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index cc822da..99e81fd 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -395,7 +395,7 @@ @ cdecl _ctime64(ptr) msvcrt._ctime64 @ stub _ctime64_s @ cdecl _cwait(ptr long long) msvcrt._cwait -@ stub _cwprintf +@ varargs _cwprintf(wstr) msvcrt._cwprintf @ stub _cwprintf_l @ stub _cwprintf_p @ stub _cwprintf_p_l @@ -1056,13 +1056,13 @@ @ cdecl _unlock_file(ptr) msvcrt._unlock_file @ cdecl _utime32(str ptr) msvcrt._utime32 @ cdecl _utime64(str ptr) msvcrt._utime64 -@ stub _vcprintf +@ cdecl _vcprintf(str ptr) msvcrt._vcprintf @ stub _vcprintf_l @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s @ stub _vcprintf_s_l -@ stub _vcwprintf +@ cdecl _vcwprintf(wstr ptr) msvcrt._vcwprintf @ stub _vcwprintf_l @ stub _vcwprintf_p @ stub _vcwprintf_p_l diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 0411eb8..e23ff3e 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -22,6 +22,7 @@ */ #include "msvcrt.h" +#include "winnls.h" #include "wincon.h" #include "mtdll.h" #include "wine/debug.h" @@ -299,35 +300,89 @@ int CDECL _kbhit(void) /********************************************************************* + * _vcprintf (MSVCRT.@) + */ +int CDECL _vcprintf(const char* format, __ms_va_list valist) +{ + char buf[2048]; + LPWSTR formatW = NULL; + DWORD sz; + pf_output out; + int retval; + + out.unicode = FALSE; + out.buf.A = out.grow.A = buf; + out.used = 0; + out.len = sizeof(buf); + + sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); + formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); + + if ((retval = pf_vsnprintf( &out, formatW, NULL, FALSE, valist )) > 0) + { + LOCK_CONSOLE; + retval = _cputs( out.buf.A ); + UNLOCK_CONSOLE; + } + HeapFree( GetProcessHeap(), 0, formatW ); + if (out.buf.A != buf) + MSVCRT_free (out.buf.A); + return retval; +} + +/********************************************************************* * _cprintf (MSVCRT.@) */ int CDECL _cprintf(const char* format, ...) { - char buf[2048], *mem = buf; - int written, resize = sizeof(buf), retval; + int retval; __ms_va_list valist; __ms_va_start( valist, format ); - /* There are two conventions for snprintf failing: - * Return -1 if we truncated, or - * Return the number of bytes that would have been written - * The code below handles both cases - */ - while ((written = MSVCRT_vsnprintf( mem, resize, format, valist )) == -1 || - written > resize) + retval = _vcprintf(format, valist); + __ms_va_end(valist); + + return retval; +} + + +/********************************************************************* + * _vcwprintf (MSVCRT.@) + */ +int CDECL _vcwprintf(const MSVCRT_wchar_t* format, __ms_va_list valist) +{ + MSVCRT_wchar_t buf[2048]; + pf_output out; + int retval; + + out.unicode = TRUE; + out.buf.W = out.grow.W = buf; + out.used = 0; + out.len = sizeof(buf) / sizeof(buf[0]); + + if ((retval = pf_vsnprintf( &out, format, NULL, FALSE, valist )) >= 0) { - resize = (written == -1 ? resize * 2 : written + 1); - if (mem != buf) - MSVCRT_free (mem); - if (!(mem = MSVCRT_malloc(resize))) - return MSVCRT_EOF; - __ms_va_start( valist, format ); + LOCK_CONSOLE; + retval = _cputws( out.buf.W ); + UNLOCK_CONSOLE; } + if (out.buf.W != buf) + MSVCRT_free (out.buf.W); + return retval; +} + +/********************************************************************* + * _cwprintf (MSVCRT.@) + */ +int CDECL _cwprintf(const MSVCRT_wchar_t* format, ...) +{ + int retval; + __ms_va_list valist; + + __ms_va_start( valist, format ); + retval = _vcwprintf(format, valist); __ms_va_end(valist); - LOCK_CONSOLE; - retval = _cputs( mem ); - UNLOCK_CONSOLE; - if (mem != buf) - MSVCRT_free (mem); + return retval; } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 42c2469..4a531f4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -361,7 +361,7 @@ # stub _ctime64_s @ extern _ctype MSVCRT__ctype @ cdecl _cwait(ptr long long) -# stub _cwprintf +@ varargs _cwprintf(wstr) # stub _cwprintf_l # stub _cwprintf_p # stub _cwprintf_p_l @@ -992,13 +992,13 @@ @ cdecl _unlock_file(ptr) MSVCRT__unlock_file @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) -# stub _vcprintf +@ cdecl _vcprintf(str ptr) # stub _vcprintf_l # stub _vcprintf_p # stub _vcprintf_p_l # stub _vcprintf_s # stub _vcprintf_s_l -# stub _vcwprintf +@ cdecl _vcwprintf(wstr ptr) # stub _vcwprintf_l # stub _vcwprintf_p # stub _vcwprintf_p_l

1 0