March 2006 - Wine-commits - list.winehq.org

Ulrich Czekalla : commdlg: Properly set and retrieve colour value from combo box .
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: a6431c3868f798fcf1d1f75d0e019e2cd5facefd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6431c3868f798fcf1d1f75… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Mon Mar 27 11:33:56 2006 -0500 commdlg: Properly set and retrieve colour value from combo box . --- dlls/commdlg/fontdlg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c index b85bcae..a80e3c1 100644 --- a/dlls/commdlg/fontdlg.c +++ b/dlls/commdlg/fontdlg.c @@ -632,9 +632,9 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPAR memcpy(name, strColorName, sizeof(strColorName)); } j=SendDlgItemMessageW(hDlg, cmb4, CB_ADDSTRING, 0, (LPARAM)name); - SendDlgItemMessageW(hDlg, cmb4, CB_SETITEMDATA, j, textcolors[j]); + SendDlgItemMessageW(hDlg, cmb4, CB_SETITEMDATA, j, textcolors[i]); /* look for a fitting value in color combobox */ - if (textcolors[j]==lpcf->rgbColors) + if (textcolors[i]==lpcf->rgbColors) SendDlgItemMessageW(hDlg,cmb4, CB_SETCURSEL,j,0); } } @@ -994,7 +994,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM { WINDOWINFO wininfo; - lpcf->rgbColors=textcolors[i]; + lpcf->rgbColors = SendDlgItemMessageW(hDlg, cmb4, CB_GETITEMDATA, i, 0); wininfo.cbSize=sizeof(wininfo); if( GetWindowInfo( GetDlgItem( hDlg, stc5), &wininfo ) )

1 0

Huw Davies : riched20: Take a ref on text host.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: d6ce9db80fa044b424046e2f3ed09d6fff88a025 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d6ce9db80fa044b424046e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 27 14:10:37 2006 +0100 riched20: Take a ref on text host. --- dlls/riched20/txtsrv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 6bb0b9d..65dc54d 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -79,6 +79,7 @@ HRESULT WINAPI CreateTextServices(IUnkno return E_OUTOFMEMORY; InitializeCriticalSection(&ITextImpl->csTxtSrv); ITextImpl->ref = 1; + ITextHost_AddRef(pITextHost); ITextImpl->pMyHost = pITextHost; ITextImpl->lpVtbl = &textservices_Vtbl;

1 0

Robert Shearman : shell32: Adding a systray item with an invalid icon handle is allowed.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: e8fe7004c7385f1df3335401300691926c6e0d80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8fe7004c7385f1df333540… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Mar 27 16:55:37 2006 +0100 shell32: Adding a systray item with an invalid icon handle is allowed. --- dlls/shell32/systray.c | 12 +++++++++--- programs/explorer/systray.c | 8 +------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index a99912f..32213cb 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -99,21 +99,26 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMe LONG cbColourBits; if (!GetIconInfo(nid->hIcon, &iconinfo)) - return FALSE; + goto noicon; if (!GetObjectW(iconinfo.hbmMask, sizeof(bmMask), &bmMask) || !GetObjectW(iconinfo.hbmColor, sizeof(bmColour), &bmColour)) { DeleteObject(iconinfo.hbmMask); DeleteObject(iconinfo.hbmColor); - return FALSE; + goto noicon; } cbMaskBits = (bmMask.bmPlanes * bmMask.bmWidth * bmMask.bmHeight * bmMask.bmBitsPixel) / 8; cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel) / 8; cds.cbData = sizeof(*nid) + 2*sizeof(BITMAP) + cbMaskBits + cbColourBits; buffer = HeapAlloc(GetProcessHeap(), 0, cds.cbData); - if (!buffer) return FALSE; + if (!buffer) + { + DeleteObject(iconinfo.hbmMask); + DeleteObject(iconinfo.hbmColor); + return FALSE; + } cds.lpData = buffer; memcpy(buffer, nid, sizeof(*nid)); @@ -132,6 +137,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMe } else { +noicon: cds.cbData = sizeof(*nid); cds.lpData = nid; } diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index adf8460..00036ff 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -259,7 +259,7 @@ static void handle_incoming(HWND hwndSou /* FIXME: if statement only needed because we don't support interprocess * icon handles */ - if (nid.uFlags & NIF_ICON) + if ((nid.uFlags & NIF_ICON) && (cds->cbData >= sizeof(nid) + 2 * sizeof(BITMAP))) { LONG cbMaskBits; LONG cbColourBits; @@ -269,12 +269,6 @@ static void handle_incoming(HWND hwndSou buffer += sizeof(nid); - if (cds->cbData < sizeof(nid) + 2 * sizeof(BITMAP)) - { - WINE_ERR("buffer underflow\n"); - return; - } - memcpy(&bmMask, buffer, sizeof(bmMask)); buffer += sizeof(bmMask); memcpy(&bmColour, buffer, sizeof(bmColour));

1 0

Alexandre Julliard : x11drv: Get rid of the using_wine_desktop flag.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 6bb18e24e9e3c17e514cc899a59d7237676ccedb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6bb18e24e9e3c17e514cc89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 15:33:43 2006 +0200 x11drv: Get rid of the using_wine_desktop flag. --- dlls/x11drv/window.c | 9 +++++---- dlls/x11drv/x11drv.h | 1 - dlls/x11drv/x11drv_main.c | 2 -- dlls/x11drv/xrandr.c | 2 +- dlls/x11drv/xvidmode.c | 8 ++++---- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index 5cac2ed..e8c376d 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -119,9 +119,10 @@ BOOL X11DRV_is_window_rect_mapped( const * * Fill the window attributes structure for an X window. */ -static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttributes *attr ) +static int get_window_attributes( Display *display, struct x11drv_win_data *data, + XSetWindowAttributes *attr ) { - if (!data->managed && !using_wine_desktop && is_window_managed( data->hwnd )) + if (!data->managed && (root_window == DefaultRootWindow( display )) && is_window_managed( data->hwnd )) { data->managed = TRUE; SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); @@ -142,7 +143,7 @@ static int get_window_attributes( struct void X11DRV_sync_window_style( Display *display, struct x11drv_win_data *data ) { XSetWindowAttributes attr; - int mask = get_window_attributes( data, &attr ); + int mask = get_window_attributes( display, data, &attr ); wine_tsx11_lock(); if (data->whole_window != DefaultRootWindow(display)) @@ -654,7 +655,7 @@ static Window create_whole_window( Displ if (!(cx = rect.right - rect.left)) cx = 1; if (!(cy = rect.bottom - rect.top)) cy = 1; - mask = get_window_attributes( data, &attr ); + mask = get_window_attributes( display, data, &attr ); /* set the attributes that don't change over the lifetime of the window */ attr.bit_gravity = NorthWestGravity; diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h index 98c0e93..5976c7e 100644 --- a/dlls/x11drv/x11drv.h +++ b/dlls/x11drv/x11drv.h @@ -262,7 +262,6 @@ extern int client_side_with_render; extern int client_side_antialias_with_core; extern int client_side_antialias_with_render; extern int using_client_side_fonts; -extern int using_wine_desktop; extern void X11DRV_XRender_Init(void); extern void X11DRV_XRender_Finalize(void); extern BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE*, HFONT); diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c index 55226d4..757eff7 100644 --- a/dlls/x11drv/x11drv_main.c +++ b/dlls/x11drv/x11drv_main.c @@ -82,7 +82,6 @@ int client_side_with_core = 1; int client_side_with_render = 1; int client_side_antialias_with_core = 1; int client_side_antialias_with_render = 1; -int using_wine_desktop = 0; int copy_default_colors = 128; int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; @@ -424,7 +423,6 @@ static BOOL process_attach(void) if (desktop_geometry) { root_window = X11DRV_create_desktop( desktop_vi, desktop_geometry ); - using_wine_desktop = 1; } if(desktop_vi) XFree(desktop_vi); diff --git a/dlls/x11drv/xrandr.c b/dlls/x11drv/xrandr.c index 96b5a7a..fbe4350 100644 --- a/dlls/x11drv/xrandr.c +++ b/dlls/x11drv/xrandr.c @@ -254,7 +254,7 @@ void X11DRV_XRandR_Init(void) if (xrandr_major) return; /* already initialized? */ if (!usexrandr) return; /* disabled in config */ - if (using_wine_desktop) return; /* not compatible with desktop mode */ + if (root_window != DefaultRootWindow( gdi_display )) return; if (!load_xrandr()) return; /* can't load the Xrandr library */ /* see if Xrandr is available */ diff --git a/dlls/x11drv/xvidmode.c b/dlls/x11drv/xvidmode.c index 20af410..c32bd59 100644 --- a/dlls/x11drv/xvidmode.c +++ b/dlls/x11drv/xvidmode.c @@ -172,14 +172,14 @@ void X11DRV_XF86VM_Init(void) #endif /* X_XF86VidModeSetGammaRamp */ /* retrieve modes */ - if (!using_wine_desktop) ok = XF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes); + if (root_window == DefaultRootWindow( gdi_display )) + ok = XF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes); + else + ok = FALSE; /* In desktop mode, do not switch resolution... But still use the Gamma ramp stuff */ } wine_tsx11_unlock(); if (!ok) return; - /* In desktop mode, do not switch resolution... But still use the Gamma ramp stuff */ - if (using_wine_desktop) return; - TRACE("XVidMode modes: count=%d\n", nmodes); real_xf86vm_mode_count = nmodes;

1 0

Alexandre Julliard : ntdll: Limit header_size to the file size.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 18d7980fd8557199d2162ab14c963b9b51f3cb5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18d7980fd8557199d2162ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 21:29:46 2006 +0200 ntdll: Limit header_size to the file size. --- dlls/ntdll/virtual.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d17c58d..17f9081 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -868,7 +868,8 @@ static NTSTATUS map_image( HANDLE hmappi goto error; } status = STATUS_INVALID_IMAGE_FORMAT; /* generic error */ - if (header_size > st.st_size) goto error; + if (!st.st_size) goto error; + header_size = min( header_size, st.st_size ); if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ, removable ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr;

1 0

Mike McCormack : user32: Send a fake mouse movement event after releasing capture.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 4ce100aa64ed7d95c32250aef42c02c1d053f9a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ce100aa64ed7d95c32250a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Mar 27 21:23:17 2006 +0900 user32: Send a fake mouse movement event after releasing capture. --- dlls/user/input.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user/input.c b/dlls/user/input.c index 63f7ca6..a4312d5 100644 --- a/dlls/user/input.c +++ b/dlls/user/input.c @@ -195,6 +195,10 @@ BOOL WINAPI ReleaseCapture(void) SERVER_END_REQ; if (previous) SendMessageW( previous, WM_CAPTURECHANGED, 0, 0 ); + + /* Somebody may have missed some mouse movements */ + mouse_event( MOUSEEVENTF_MOVE, 0, 0, 0, 0 ); + return ret; }

1 0

Louis. Lenders : shell32: Add an uncompressed AVI displaying the word searching.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 5094cfa6eb2f8f9d17cbca0e9ed06884212e8998 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5094cfa6eb2f8f9d17cbca0… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Mar 25 11:21:55 2006 +0000 shell32: Add an uncompressed AVI displaying the word searching. --- dlls/shell32/.gitignore | 1 dlls/shell32/Makefile.in | 1 dlls/shell32/shres.rc | 1285 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 2 4 files changed, 1289 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5094cfa6eb2f8f9d17c…

1 0

Alexandre Julliard : server: Store window properties in the global atom table instead of
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 641e9e382f8b8ae04296eb94673066e5e5566170 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=641e9e382f8b8ae04296eb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 12:50:26 2006 +0200 server: Store window properties in the global atom table instead of the per-winstation table. --- server/window.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/server/window.c b/server/window.c index 6b876af..24db2c9 100644 --- a/server/window.c +++ b/server/window.c @@ -226,7 +226,7 @@ static void set_property( struct window } /* need to add an entry */ - if (!grab_global_atom( win->desktop->winstation, atom )) return; + if (!grab_global_atom( NULL, atom )) return; if (free == -1) { /* no free entry */ @@ -237,7 +237,7 @@ static void set_property( struct window sizeof(*new_props) * (win->prop_alloc + 16) ))) { set_error( STATUS_NO_MEMORY ); - release_global_atom( win->desktop->winstation, atom ); + release_global_atom( NULL, atom ); return; } win->prop_alloc += 16; @@ -260,7 +260,7 @@ static obj_handle_t remove_property( str if (win->properties[i].type == PROP_TYPE_FREE) continue; if (win->properties[i].atom == atom) { - release_global_atom( win->desktop->winstation, atom ); + release_global_atom( NULL, atom ); win->properties[i].type = PROP_TYPE_FREE; return win->properties[i].handle; } @@ -292,7 +292,7 @@ inline static void destroy_properties( s for (i = 0; i < win->prop_inuse; i++) { if (win->properties[i].type == PROP_TYPE_FREE) continue; - release_global_atom( win->desktop->winstation, win->properties[i].atom ); + release_global_atom( NULL, win->properties[i].atom ); } free( win->properties ); } @@ -1966,12 +1966,11 @@ DECL_HANDLER(set_window_property) if (get_req_data_size()) { - atom_t atom = add_global_atom( win->desktop->winstation, - get_req_data(), get_req_data_size() / sizeof(WCHAR) ); + atom_t atom = add_global_atom( NULL, get_req_data(), get_req_data_size() / sizeof(WCHAR) ); if (atom) { set_property( win, atom, req->handle, PROP_TYPE_STRING ); - release_global_atom( win->desktop->winstation, atom ); + release_global_atom( NULL, atom ); } } else set_property( win, req->atom, req->handle, PROP_TYPE_ATOM ); @@ -1986,7 +1985,7 @@ DECL_HANDLER(remove_window_property) if (win) { atom_t atom = req->atom; - if (get_req_data_size()) atom = find_global_atom( win->desktop->winstation, get_req_data(), + if (get_req_data_size()) atom = find_global_atom( NULL, get_req_data(), get_req_data_size() / sizeof(WCHAR) ); if (atom) reply->handle = remove_property( win, atom ); } @@ -2001,7 +2000,7 @@ DECL_HANDLER(get_window_property) if (win) { atom_t atom = req->atom; - if (get_req_data_size()) atom = find_global_atom( win->desktop->winstation, get_req_data(), + if (get_req_data_size()) atom = find_global_atom( NULL, get_req_data(), get_req_data_size() / sizeof(WCHAR) ); if (atom) reply->handle = get_property( win, atom ); }

1 0

Alexandre Julliard : server: Connect to the window station and desktop specified by startup info.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 90af5a0d178991dc1ed79899d9b764a6352133f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90af5a0d178991dc1ed7989… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 12:57:17 2006 +0200 server: Connect to the window station and desktop specified by startup info. If window station and desktop aren't inherited from the parent, don't connect to them from the server, but from the USER init code where we can get the proper values from the startup info structure. --- dlls/user/user_main.c | 47 ++++++++++++++++++++++ server/process.c | 6 +-- server/user.h | 5 +- server/window.c | 1 server/winstation.c | 106 +++++++++++++++++++++++++++---------------------- 5 files changed, 111 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=90af5a0d178991dc1ed…

1 0

James Hawkins : advpack: Define S_ASYNCHRONOUS in advpub.h.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: e4b31800ab84d0ea28bc66363ae70bcf19f7a166 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4b31800ab84d0ea28bc663… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 26 21:40:26 2006 -0600 advpack: Define S_ASYNCHRONOUS in advpub.h. --- dlls/advpack/tests/install.c | 12 ++++-------- include/advpub.h | 4 ++++ include/urlmon.idl | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 6d0daae..4810868 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -21,7 +21,6 @@ #include <stdio.h> #include <windows.h> #include <advpub.h> -#include <urlmon.h> #include "wine/test.h" /* function pointers */ @@ -67,7 +66,7 @@ static void test_RunSetupCommand() /* try a bad directory */ hexe = (HANDLE)0xdeadbeef; - hr = pRunSetupCommand(NULL, "winver.exe", "Install", "windows\\system32", "Title", &hexe, 0, NULL); + hr = pRunSetupCommand(NULL, "winve.exe", "Install", "", "Title", &hexe, 0, NULL); todo_wine { ok(hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY), @@ -89,12 +88,9 @@ static void test_RunSetupCommand() /* run winver.exe */ hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); - todo_wine - { - ok(hr == S_ASYNCHRONOUS, "Expected S_ASYNCHRONOUS, got %ld\n", hr); - ok(hexe != NULL, "Expected hexe to be non-NULL\n"); - ok(TerminateProcess(hexe, 0), "Expected TerminateProcess to succeed\n"); - } + ok(hr == S_ASYNCHRONOUS, "Expected S_ASYNCHRONOUS, got %ld\n", hr); + ok(hexe != NULL, "Expected hexe to be non-NULL\n"); + ok(TerminateProcess(hexe, 0), "Expected TerminateProcess to succeed\n"); } START_TEST(install) diff --git a/include/advpub.h b/include/advpub.h index 442e8e2..6b38ffe 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -25,6 +25,10 @@ extern "C" { #endif +#ifndef S_ASYNCHRONOUS +#define S_ASYNCHRONOUS _HRESULT_TYPEDEF_(0x401E8L) +#endif + typedef struct _CabInfoA { LPSTR pszCab; diff --git a/include/urlmon.idl b/include/urlmon.idl index 96f665b..37fddf0 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1146,7 +1146,9 @@ cpp_quote("DEFINE_GUID(CLSID_MkProtocol, cpp_quote("#define MK_S_ASYNCHRONOUS 0x000401E8") +cpp_quote("#ifndef S_ASYNCHRONOUS") cpp_quote("#define S_ASYNCHRONOUS MK_S_ASYNCHRONOUS") +cpp_quote("#endif") cpp_quote("#define INET_E_ERROR_FIRST 0x800C0002") cpp_quote("#define INET_E_INVALID_URL 0x800C0002")

1 0