February 2013 - Wine-Commits

Hans Leidekker : msiexec: Convert DoRegServer to Unicode.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 0800f29b25b1a4260bae82156f2832c4cafc232b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0800f29b25b1a4260bae82156… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 12 14:33:23 2013 +0100 msiexec: Convert DoRegServer to Unicode. --- programs/msiexec/msiexec.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 13a55c2..0944955 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -344,26 +344,25 @@ static DWORD DoDllUnregisterServer(LPCWSTR DllName) static DWORD DoRegServer(void) { + static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; + static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c',' ','/','V',0}; SC_HANDLE scm, service; - CHAR path[MAX_PATH+12]; - DWORD ret = 0; + WCHAR path[MAX_PATH+12]; + DWORD len, ret = 0; - scm = OpenSCManagerA(NULL, SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CREATE_SERVICE); - if (!scm) + if (!(scm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, SC_MANAGER_CREATE_SERVICE))) { fprintf(stderr, "Failed to open the service control manager.\n"); return 1; } - - GetSystemDirectoryA(path, MAX_PATH); - lstrcatA(path, "\\msiexec.exe /V"); - - service = CreateServiceA(scm, "MSIServer", "MSIServer", GENERIC_ALL, - SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, - SERVICE_ERROR_NORMAL, path, NULL, NULL, - NULL, NULL, NULL); - - if (service) CloseServiceHandle(service); + len = GetSystemDirectoryW(path, MAX_PATH); + lstrcpyW(path + len, msiexecW); + if ((service = CreateServiceW(scm, msiserverW, msiserverW, GENERIC_ALL, + SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, path, NULL, NULL, NULL, NULL, NULL))) + { + CloseServiceHandle(service); + } else if (GetLastError() != ERROR_SERVICE_EXISTS) { fprintf(stderr, "Failed to create MSI service\n");

1 0

Hans Leidekker : msiexec: Add /unregserver support.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 6cd2ffae0220fe0d16d48d4534d623e9d951f71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd2ffae0220fe0d16d48d453… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 12 14:32:45 2013 +0100 msiexec: Add /unregserver support. --- programs/msiexec/msiexec.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 9b378c6..13a55c2 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -373,6 +373,35 @@ static DWORD DoRegServer(void) return ret; } +static DWORD DoUnregServer(void) +{ + static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; + SC_HANDLE scm, service; + DWORD ret = 0; + + if (!(scm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, SC_MANAGER_CONNECT))) + { + fprintf(stderr, "Failed to open service control manager\n"); + return 1; + } + if ((service = OpenServiceW(scm, msiserverW, DELETE))) + { + if (!DeleteService(service)) + { + fprintf(stderr, "Failed to delete MSI service\n"); + ret = 1; + } + CloseServiceHandle(service); + } + else if (GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST) + { + fprintf(stderr, "Failed to open MSI service\n"); + ret = 1; + } + CloseServiceHandle(scm); + return ret; +} + static INT DoEmbedding( LPWSTR key ) { printf("Remote custom actions are not supported yet\n"); @@ -982,7 +1011,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } else if (FunctionUnregServer) { - WINE_FIXME( "/unregserver not implemented yet, ignoring\n" ); + ReturnCode = DoUnregServer(); } else if (FunctionServer) {

1 0

Alexandre Julliard : wininet: Don' t reset the available size after the async has been queued.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: dc82cf9d3873535698fe1b6d6f04c6ff6ec13b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc82cf9d3873535698fe1b6d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 10:19:26 2013 +0100 wininet: Don't reset the available size after the async has been queued. --- dlls/wininet/ftp.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f0a6257..1b67211 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1284,7 +1284,6 @@ static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, task = alloc_async_task(&file->hdr, FTPFILE_AsyncQueryDataAvailableProc, sizeof(*task)); INTERNET_AsyncCall(task); - *available = 0; return ERROR_IO_PENDING; } }

1 0

André Hentschel : make_xftmpl: Avoid comparing a char with EOF.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: a32199b3f3b755cd21b7135db05962a67ac318d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32199b3f3b755cd21b7135db… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 12 16:21:04 2013 +0100 make_xftmpl: Avoid comparing a char with EOF. --- tools/make_xftmpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index 85b373f..b5751ce 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -336,7 +336,7 @@ static BOOL parse_token(struct parser *parser) if (len + 1 < sizeof(buffer)) buffer[len++] = c; } - if (c == EOF) { + if (c != '"') { fprintf(stderr, "%s: Unterminated string (line %d).\n", program_name, parser->line_no); parser->error = TRUE;

1 0

Jacek Caban : mshtml: Use VT_ERROR as return type in DispCallFunc call.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 6b0e2c8fdff9dd316762e5f83ea5733f3eb8ae82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0e2c8fdff9dd316762e5f83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 14:36:48 2013 +0100 mshtml: Use VT_ERROR as return type in DispCallFunc call. --- dlls/mshtml/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ed799d2..38d9df4 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1066,7 +1066,7 @@ static HRESULT invoke_builtin_function(DispatchEx *This, func_info_t *func, DISP } V_VT(&vhres) = VT_ERROR; - hres = DispCallFunc(iface, func->call_vtbl_off*sizeof(void*), CC_STDCALL, VT_HRESULT, + hres = DispCallFunc(iface, func->call_vtbl_off*sizeof(void*), CC_STDCALL, VT_ERROR, func->argc + (func->prop_vt == VT_VOID ? 0 : 1), func->arg_types, arg_ptrs, &vhres); }

1 0

Francois Gouget : kernel32/tests: Reduce the size of the console buffer to speed up the tests.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: c2a5b04d01882668f433e74bcaf4ff1c11be4167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a5b04d01882668f433e74bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 11 15:36:15 2013 +0100 kernel32/tests: Reduce the size of the console buffer to speed up the tests. --- dlls/kernel32/tests/console.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b1907d7..df752f4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2608,6 +2608,18 @@ START_TEST(console) ok(ret, "Getting sb info\n"); if (!ret) return; + /* Reduce the size of the buffer to the visible area plus 3 lines to speed + * up the tests. + */ + trace("Visible area: %dx%d - %dx%d Buffer size: %dx%d\n", sbi.srWindow.Left, sbi.srWindow.Top, sbi.srWindow.Right, sbi.srWindow.Bottom, sbi.dwSize.X, sbi.dwSize.Y); + sbi.dwSize.Y = size = (sbi.srWindow.Bottom + 1) + 3; + ret = SetConsoleScreenBufferSize(hConOut, sbi.dwSize); + ok(ret, "Setting sb info\n"); + ret = GetConsoleScreenBufferInfo(hConOut, &sbi); + ok(ret, "Getting sb info\n"); + ok(sbi.dwSize.Y == size, "Unexpected buffer size: %d instead of %d\n", sbi.dwSize.Y, size); + if (!ret) return; + /* Non interactive tests */ testCursor(hConOut, sbi.dwSize); /* test parameters (FIXME: test functionality) */

1 0

Alexandre Julliard : server: Return the window paint flags in the get_visible_region request.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: bc602c3060692f3c6e9b1cca2a3eaa9299f4d6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc602c3060692f3c6e9b1cca2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 17:14:17 2013 +0100 server: Return the window paint flags in the get_visible_region request. --- include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 5 +++-- server/trace.c | 1 + server/window.c | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 99bcfae..8a8a0ed 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3415,8 +3415,10 @@ struct get_visible_region_reply user_handle_t top_win; rectangle_t top_rect; rectangle_t win_rect; + unsigned int paint_flags; data_size_t total_size; /* VARARG(region,rectangles); */ + char __pad_52[4]; }; @@ -5715,6 +5717,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 438 +#define SERVER_PROTOCOL_VERSION 439 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 4038e48..7bb679a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2460,6 +2460,7 @@ enum coords_relative user_handle_t top_win; /* top window to clip against */ rectangle_t top_rect; /* top window visible rect with screen coords */ rectangle_t win_rect; /* window rect in screen coords */ + unsigned int paint_flags; /* paint flags (from SET_WINPOS_* flags) */ data_size_t total_size; /* total size of the resulting region */ VARARG(region,rectangles); /* list of rectangles for the region (in screen coords) */ @END diff --git a/server/request.h b/server/request.h index f566e0d..b1b816f 100644 --- a/server/request.h +++ b/server/request.h @@ -1626,8 +1626,9 @@ C_ASSERT( sizeof(struct get_visible_region_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, top_win) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, top_rect) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, win_rect) == 28 ); -C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, total_size) == 44 ); -C_ASSERT( sizeof(struct get_visible_region_reply) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, paint_flags) == 44 ); +C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, total_size) == 48 ); +C_ASSERT( sizeof(struct get_visible_region_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_surface_region_request, window) == 12 ); C_ASSERT( sizeof(struct get_surface_region_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_surface_region_reply, visible_rect) == 8 ); diff --git a/server/trace.c b/server/trace.c index 41c5424..c7a13d8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2926,6 +2926,7 @@ static void dump_get_visible_region_reply( const struct get_visible_region_reply fprintf( stderr, " top_win=%08x", req->top_win ); dump_rectangle( ", top_rect=", &req->top_rect ); dump_rectangle( ", win_rect=", &req->win_rect ); + fprintf( stderr, ", paint_flags=%08x", req->paint_flags ); fprintf( stderr, ", total_size=%u", req->total_size ); dump_varargs_rectangles( ", region=", cur_size ); } diff --git a/server/window.c b/server/window.c index fbe522a..e141f93 100644 --- a/server/window.c +++ b/server/window.c @@ -2434,6 +2434,7 @@ DECL_HANDLER(get_visible_region) reply->win_rect.right = win->client_rect.right - win->client_rect.left; reply->win_rect.bottom = win->client_rect.bottom - win->client_rect.top; } + reply->paint_flags = win->paint_flags & PAINT_CLIENT_FLAGS; }

1 0

Alexandre Julliard : server: Also exclude the top-level client rectangle for windows that have a pixel format .
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: ca5746ad1a99fde06a7309cc47031cc898c6ee69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5746ad1a99fde06a7309cc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 15:41:20 2013 +0100 server: Also exclude the top-level client rectangle for windows that have a pixel format. --- dlls/winex11.drv/bitblt.c | 1 + server/window.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index e52fbc2..2fc7c94 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2029,6 +2029,7 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co } surface->gc = XCreateGC( gdi_display, window, 0, NULL ); + XSetSubwindowMode( gdi_display, surface->gc, IncludeInferiors ); surface->byteswap = image_needs_byteswap( surface->image, is_r8g8b8(vis), format->bits_per_pixel ); if (surface->byteswap || format->bits_per_pixel == 4 || format->bits_per_pixel == 8) diff --git a/server/window.c b/server/window.c index a460a7c..fbe522a 100644 --- a/server/window.c +++ b/server/window.c @@ -1084,6 +1084,9 @@ static struct region *get_surface_region( struct window *win ) set_region_rect( clip, &win->client_rect ); if (win->win_region && !intersect_window_region( clip, win )) goto error; + if ((win->paint_flags & PAINT_HAS_PIXEL_FORMAT) && !subtract_region( region, region, clip )) + goto error; + /* clip children */ if (!is_desktop_window(win)) @@ -2264,7 +2267,7 @@ DECL_HANDLER(set_window_pos) top = get_top_clipping_window( win ); if (is_visible( top ) && (top->paint_flags & PAINT_HAS_SURFACE) && - (top->paint_flags & PAINT_PIXEL_FORMAT_CHILD)) + (top->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD))) reply->surface_win = top->handle; }

1 0

Alexandre Julliard : winex11: Ignore color key and exposures when using the null surface.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: bdfab8cd88b895612f9eab17a569c18736c9ae34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfab8cd88b895612f9eab17a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 11:42:12 2013 +0100 winex11: Ignore color key and exposures when using the null surface. --- dlls/winex11.drv/bitblt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index e91ca75..e52fbc2 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2059,6 +2059,8 @@ void set_surface_color_key( struct window_surface *window_surface, COLORREF colo struct x11drv_window_surface *surface = get_x11_surface( window_surface ); COLORREF prev; + if (window_surface->funcs != &x11drv_surface_funcs) return; /* we may get the null surface */ + window_surface->funcs->lock( window_surface ); prev = surface->color_key; set_color_key( surface, color_key ); @@ -2074,6 +2076,8 @@ HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) struct x11drv_window_surface *surface = get_x11_surface( window_surface ); HRGN region = 0; + if (window_surface->funcs != &x11drv_surface_funcs) return 0; /* we may get the null surface */ + window_surface->funcs->lock( window_surface ); add_bounds_rect( &surface->bounds, rect ); if (surface->region)

1 0

Daniel Jelinski : comctl32/listview: Fix LVM_SETICONSPACING on 64bit machines.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 77874d7863dc92907452615823e8b038690ced5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77874d7863dc9290745261582… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Feb 4 20:57:58 2013 +0100 comctl32/listview: Fix LVM_SETICONSPACING on 64bit machines. --- dlls/comctl32/listview.c | 4 +++- dlls/comctl32/tests/listview.c | 21 ++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1274d15..a22b2da 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11468,7 +11468,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_SetHoverTime(infoPtr, (DWORD)lParam); case LVM_SETICONSPACING: - return LISTVIEW_SetIconSpacing(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); + if(lParam == -1) + return LISTVIEW_SetIconSpacing(infoPtr, -1, -1); + return LISTVIEW_SetIconSpacing(infoPtr, LOWORD(lParam), HIWORD(lParam)); case LVM_SETIMAGELIST: return (LRESULT)LISTVIEW_SetImageList(infoPtr, (INT)wParam, (HIMAGELIST)lParam); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 98ca495..fef3f60 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4654,11 +4654,26 @@ static void test_getitemspacing(void) ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); expect(100, LOWORD(ret)); - expect(0xFFFF, HIWORD(ret)); - ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); - expect(100, LOWORD(ret)); expect(0xFFFF, HIWORD(ret)); + + if (sizeof(void*) == 8) + { + /* NOTE: -1 is not treated the same as (DWORD)-1 by 64bit listview */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, (DWORD)-1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(0xFFFF, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + } + else + { + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + } ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); /* spacing + icon size returned */ expect(cx + 40, LOWORD(ret));

1 0