September 2008 - Wine-Commits

Rob Shearman : avifil32: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 7496db0fa83fb313e8a0f54a3c9110586af12094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7496db0fa83fb313e8a0f54a3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 13:01:37 2008 +0100 avifil32: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans. --- dlls/avifil32/editstream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index e69d036..de6f2e9 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -261,7 +261,7 @@ static LPVOID AVIFILE_ReadFrame(IAVIEditStreamImpl* const This, if (pg == NULL) return NULL; if (This->pg != NULL) { - if (IGetFrame_SetFormat(pg, This->lpFrame, NULL, 0, 0, -1, -1)) { + if (IGetFrame_SetFormat(pg, This->lpFrame, NULL, 0, 0, -1, -1) != S_OK) { AVIStreamGetFrameClose(pg); ERR(": IGetFrame_SetFormat failed\n"); return NULL; @@ -896,7 +896,7 @@ static LONG WINAPI IEditAVIStream_fnFindSample(IAVIStream*iface,LONG pos, /* map our position to a stream and position in it */ if (AVIFILE_FindStreamInTable(This, pos, &stream, &streamPos, - &streamNr, TRUE)) + &streamNr, TRUE) != S_OK) return -1; /* doesn't exist */ if (This->bDecompress) {

1 0

Rob Shearman : rpcrt4: Fix memory leaks of hdr in error paths in RPCRT4_io_thread.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: ffd37b0eeca1b20138d2f3b24402559a2f9f9919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd37b0eeca1b20138d2f3b24… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 12:57:56 2008 +0100 rpcrt4: Fix memory leaks of hdr in error paths in RPCRT4_io_thread. --- dlls/rpcrt4/rpc_server.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 7a3a5f6..d79e436 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -388,6 +388,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) packet = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcPacket)); if (!packet) { I_RpcFree(msg->Buffer); + RPCRT4_FreeHeader(hdr); HeapFree(GetProcessHeap(), 0, msg); break; } @@ -397,6 +398,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) if (!QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTELONGFUNCTION)) { ERR("couldn't queue work item for worker thread, error was %d\n", GetLastError()); I_RpcFree(msg->Buffer); + RPCRT4_FreeHeader(hdr); HeapFree(GetProcessHeap(), 0, msg); HeapFree(GetProcessHeap(), 0, packet); break;

1 0

Rob Shearman : rpcrt4: Fix memory leak of 0-byte buffer allocated during processing of bind packets .
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 34dd53425081f135ed6a3382778afd486df6e735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34dd53425081f135ed6a33827… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 12:58:39 2008 +0100 rpcrt4: Fix memory leak of 0-byte buffer allocated during processing of bind packets. In this case conn->server_binding will be NULL and consequently bind->Handle will be NULL, causing I_RpcFreeBuffer to fail. Therefore just use I_RpcFree to free the buffer as that is just what I_RpcFreeBuffer does under the hood anyway. --- dlls/rpcrt4/rpc_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index d79e436..f8efc67 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -352,7 +352,7 @@ static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSA } /* clean up */ - I_RpcFreeBuffer(msg); + I_RpcFree(msg->Buffer); RPCRT4_FreeHeader(hdr); HeapFree(GetProcessHeap(), 0, msg); }

1 0

Rob Shearman : rpcrt4: Don' t crash in NdrDllGetClassObject when a NULL pclsid is passed in.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: f12e445ce589975f8a5f8bb59c1f731ae6588b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12e445ce589975f8a5f8bb59… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 12:59:43 2008 +0100 rpcrt4: Don't crash in NdrDllGetClassObject when a NULL pclsid is passed in. Add tests for this. --- dlls/rpcrt4/cpsf.c | 2 +- dlls/rpcrt4/tests/cstub.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index 373c97a..80b4186 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -174,7 +174,7 @@ HRESULT WINAPI NdrDllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv, if(max_delegating_vtbl_size > 0) create_delegating_vtbl(max_delegating_vtbl_size); } - if (IsEqualGUID(rclsid, pclsid)) + if (pclsid && IsEqualGUID(rclsid, pclsid)) return IPSFactoryBuffer_QueryInterface((LPPSFACTORYBUFFER)pPSFactoryBuffer, iid, ppv); else { const ProxyFileInfo *info; diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 37b5985..29bcb27 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -432,6 +432,7 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) { IPSFactoryBuffer *ppsf = NULL; const CLSID PSDispatch = {0x20420, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46}}; + const CLSID CLSID_Unknown = {0x45678, 0x1234, 0x6666, {0xff, 0x67, 0x45, 0x98, 0x76, 0x12, 0x34, 0x56}}; HRESULT r; HMODULE hmod = LoadLibraryA("rpcrt4.dll"); void *CStd_QueryInterface = GetProcAddress(hmod, "CStdStubBuffer_QueryInterface"); @@ -446,6 +447,11 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) void *CStd_DebugServerRelease = GetProcAddress(hmod, "CStdStubBuffer_DebugServerRelease"); r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_Unknown, &PSFactoryBuffer); + ok(r == CLASS_E_CLASSNOTAVAILABLE, "NdrDllGetClassObject with unknown clsid should have returned CLASS_E_CLASSNOTAVAILABLE instead of 0x%x\n", r); + ok(ppsf == NULL, "NdrDllGetClassObject should have set ppsf to NULL on failure\n"); + + r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, &PSDispatch, &PSFactoryBuffer); ok(r == S_OK, "ret %08x\n", r); @@ -518,6 +524,13 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) #undef VTBL_TEST_ZERO ok(PSFactoryBuffer.RefCount == 1, "ref count %d\n", PSFactoryBuffer.RefCount); + IPSFactoryBuffer_Release(ppsf); + + r = NdrDllGetClassObject(&IID_if3, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + NULL, &PSFactoryBuffer); + ok(r == S_OK, "ret %08x\n", r); + ok(ppsf != NULL, "ppsf == NULL\n"); + return ppsf; }

1 0

Rob Shearman : rpcrt4: Free the memory for a registered interface that is in use and when WaitForCallsToComplete is 0 .
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 8cc3adea52cfefe4b230cf50041b597405060447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc3adea52cfefe4b230cf500… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 12:58:19 2008 +0100 rpcrt4: Free the memory for a registered interface that is in use and when WaitForCallsToComplete is 0. --- dlls/rpcrt4/rpc_server.c | 7 +++++-- dlls/rpcrt4/rpc_server.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index f93d264..7a3a5f6 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -147,10 +147,11 @@ static RpcServerInterface* RPCRT4_find_interface(UUID* object, static void RPCRT4_release_server_interface(RpcServerInterface *sif) { if (!InterlockedDecrement(&sif->CurrentCalls) && - sif->CallsCompletedEvent) { + sif->Delete) { /* sif must have been removed from server_interfaces before * CallsCompletedEvent is set */ - SetEvent(sif->CallsCompletedEvent); + if (sif->CallsCompletedEvent) + SetEvent(sif->CallsCompletedEvent); HeapFree(GetProcessHeap(), 0, sif); } } @@ -888,8 +889,10 @@ RPC_STATUS WINAPI RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid if ((!IfSpec || !memcmp(&If->InterfaceId, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER))) && UuidEqual(MgrTypeUuid, &cif->MgrTypeUuid, &status)) { list_remove(&cif->entry); + TRACE("unregistering cif %p\n", cif); if (cif->CurrentCalls) { completed = FALSE; + cif->Delete = TRUE; if (WaitForCallsToComplete) cif->CallsCompletedEvent = event = CreateEventW(NULL, FALSE, FALSE, NULL); } diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index eb32be6..f1804d3 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -73,6 +73,7 @@ typedef struct _RpcServerInterface /* set when unregistering interface to let the caller of * RpcServerUnregisterIf* know that all calls have finished */ HANDLE CallsCompletedEvent; + BOOL Delete; /* delete when the last call finishes */ } RpcServerInterface; void RPCRT4_new_client(RpcConnection* conn);

1 0

Rob Shearman : rpcrt4: Print error messages from RPC message functions when they are called in an invalid way .
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: be9909ad1d882d8a820ad032d0e982bc9041b2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be9909ad1d882d8a820ad032d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 12:59:02 2008 +0100 rpcrt4: Print error messages from RPC message functions when they are called in an invalid way. --- dlls/rpcrt4/rpc_message.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 48c7df0..a82f4be 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1005,7 +1005,10 @@ RPC_STATUS WINAPI I_RpcNegotiateTransferSyntax(PRPC_MESSAGE pMsg) TRACE("(%p)\n", pMsg); if (!bind || bind->server) + { + ERR("no binding\n"); return RPC_S_INVALID_BINDING; + } /* if we already have a connection, we don't need to negotiate again */ if (!pMsg->ReservedForRuntime) @@ -1065,7 +1068,10 @@ RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg) TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); if (!bind) + { + ERR("no binding\n"); return RPC_S_INVALID_BINDING; + } pMsg->Buffer = I_RpcAllocate(pMsg->BufferLength); TRACE("Buffer=%p\n", pMsg->Buffer); @@ -1118,7 +1124,11 @@ RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) TRACE("(%p) Buffer=%p\n", pMsg, pMsg->Buffer); - if (!bind) return RPC_S_INVALID_BINDING; + if (!bind) + { + ERR("no binding\n"); + return RPC_S_INVALID_BINDING; + } if (pMsg->ReservedForRuntime) {

1 0

Alexandre Julliard : winex11: Driver-side implementation of SetLayeredWindowAttributes.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: be3c3a52141e100075c11896ac96e50736411ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3c3a52141e100075c11896a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 12 15:54:02 2008 +0200 winex11: Driver-side implementation of SetLayeredWindowAttributes. Based on a patch by Rob Shearman. --- dlls/winex11.drv/window.c | 49 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 1 + dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0ba15e2..bd370f6 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -382,6 +382,28 @@ static void sync_window_region( Display *display, struct x11drv_win_data *data, /*********************************************************************** + * sync_window_opacity + */ +static void sync_window_opacity( Display *display, Window win, + COLORREF key, BYTE alpha, DWORD flags ) +{ + unsigned long opacity = 0xffffffff; + + if (flags & LWA_ALPHA) opacity = (0xffffffff / 0xff) * alpha; + + if (flags & LWA_COLORKEY) FIXME("LWA_COLORKEY not supported\n"); + + wine_tsx11_lock(); + if (opacity == 0xffffffff) + XDeleteProperty( display, win, x11drv_atom(_NET_WM_WINDOW_OPACITY) ); + else + XChangeProperty( display, win, x11drv_atom(_NET_WM_WINDOW_OPACITY), + XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&opacity, 1 ); + wine_tsx11_unlock(); +} + + +/*********************************************************************** * sync_window_text */ static void sync_window_text( Display *display, Window win, const WCHAR *text ) @@ -1340,6 +1362,9 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat int cx, cy, mask; XSetWindowAttributes attr; WCHAR text[1024]; + COLORREF key; + BYTE alpha; + DWORD layered_flags; if (!(cx = data->window_rect.right - data->window_rect.left)) cx = 1; if (!(cy = data->window_rect.bottom - data->window_rect.top)) cy = 1; @@ -1389,6 +1414,10 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat /* set the window region */ sync_window_region( display, data, (HRGN)1 ); + /* set the window opacity */ + if (!GetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0; + sync_window_opacity( display, data->whole_window, key, alpha, layered_flags ); + wine_tsx11_lock(); XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); @@ -1488,6 +1517,13 @@ void X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) wine_tsx11_unlock(); } } + + if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) + { + /* changing WS_EX_LAYERED resets attributes */ + if ((data = X11DRV_get_win_data( hwnd )) && data->whole_window) + sync_window_opacity( thread_display(), data->whole_window, 0, 0, 0 ); + } } @@ -2158,6 +2194,19 @@ int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) } +/*********************************************************************** + * SetLayeredWindowAttributes (X11DRV.@) + * + * Set transparency attributes for a layered window. + */ +void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) +{ + Window win = X11DRV_get_whole_window( hwnd ); + + if (win) sync_window_opacity( thread_display(), win, key, alpha, flags ); +} + + /********************************************************************** * X11DRV_WindowMessage (X11DRV.@) */ diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 39dcc8e..7cafaac 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -106,6 +106,7 @@ @ cdecl SetClipboardData(long long long long) X11DRV_SetClipboardData @ cdecl SetCapture(long long) X11DRV_SetCapture @ cdecl SetFocus(long) X11DRV_SetFocus +@ cdecl SetLayeredWindowAttributes(long long long long) X11DRV_SetLayeredWindowAttributes @ cdecl SetParent(long long long) X11DRV_SetParent @ cdecl SetWindowIcon(long long long) X11DRV_SetWindowIcon @ cdecl SetWindowRgn(long long long) X11DRV_SetWindowRgn diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7ed91b3..f35ae5a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -609,6 +609,7 @@ enum x11drv_atoms XATOM__NET_WM_STATE_MAXIMIZED_VERT, XATOM__NET_WM_STATE_SKIP_PAGER, XATOM__NET_WM_STATE_SKIP_TASKBAR, + XATOM__NET_WM_WINDOW_OPACITY, XATOM__NET_WM_WINDOW_TYPE, XATOM__NET_WM_WINDOW_TYPE_DIALOG, XATOM__NET_WM_WINDOW_TYPE_NORMAL, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2e19913..25a86f0 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -145,6 +145,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_WM_STATE_MAXIMIZED_VERT", "_NET_WM_STATE_SKIP_PAGER", "_NET_WM_STATE_SKIP_TASKBAR", + "_NET_WM_WINDOW_OPACITY", "_NET_WM_WINDOW_TYPE", "_NET_WM_WINDOW_TYPE_DIALOG", "_NET_WM_WINDOW_TYPE_NORMAL",

1 0

Alexandre Julliard : server: Implemented the server side of Get/ SetLayeredWindowAttributes.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 05b4181cac1f567f786a0ce7c182adb7e7355880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b4181cac1f567f786a0ce7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 12 15:30:47 2008 +0200 server: Implemented the server side of Get/SetLayeredWindowAttributes. --- dlls/user32/win.c | 41 +++++++++++++++++++++++++++++++------- include/wine/server_protocol.h | 38 +++++++++++++++++++++++++++++++++++- server/protocol.def | 19 ++++++++++++++++++ server/request.h | 4 +++ server/trace.c | 26 ++++++++++++++++++++++++ server/window.c | 42 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 161 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05b4181cac1f567f786a0…

1 0

Alexandre Julliard : user32: Notify the user driver about window extended style changes too.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 2f1121316868b79bfe01105b6a3814a17ec655d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1121316868b79bfe01105b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 12 14:55:07 2008 +0200 user32: Notify the user driver about window extended style changes too. --- dlls/user32/driver.c | 6 +++--- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 26 ++++++++++++++------------ dlls/winex11.drv/window.c | 15 +++++++-------- dlls/winex11.drv/winex11.drv.spec | 2 +- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index c4522eb..38e3c1b 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -388,7 +388,7 @@ static void nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) { } -static void nulldrv_SetWindowStyle( HWND hwnd, DWORD old_style ) +static void nulldrv_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { } @@ -723,9 +723,9 @@ static void loaderdrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) load_driver()->pSetWindowIcon( hwnd, type, icon ); } -static void loaderdrv_SetWindowStyle( HWND hwnd, DWORD old_style ) +static void loaderdrv_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { - load_driver()->pSetWindowStyle( hwnd, old_style ); + load_driver()->pSetWindowStyle( hwnd, offset, style ); } static void loaderdrv_SetWindowText( HWND hwnd, LPCWSTR text ) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 909686d..baf3475 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -153,7 +153,7 @@ typedef struct tagUSER_DRIVER { void (*pSetParent)(HWND,HWND,HWND); int (*pSetWindowRgn)(HWND,HRGN,BOOL); void (*pSetWindowIcon)(HWND,UINT,HICON); - void (*pSetWindowStyle)(HWND,DWORD); + void (*pSetWindowStyle)(HWND,INT,STYLESTRUCT*); void (*pSetWindowText)(HWND,LPCWSTR); UINT (*pShowWindow)(HWND,INT,RECT*,UINT); LRESULT (*pSysCommand)(HWND,WPARAM,LPARAM); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7756ab0..e1faae8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -536,7 +536,7 @@ HWND WIN_SetOwner( HWND hwnd, HWND owner ) ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) { BOOL ok; - ULONG new_style, old_style = 0; + STYLESTRUCT style; WND *win = WIN_GetPtr( hwnd ); if (!win || win == WND_DESKTOP) return 0; @@ -547,32 +547,33 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) set_bits, clear_bits, hwnd ); return 0; } - new_style = (win->dwStyle | set_bits) & ~clear_bits; - if (new_style == win->dwStyle) + style.styleOld = win->dwStyle; + style.styleNew = (win->dwStyle | set_bits) & ~clear_bits; + if (style.styleNew == style.styleOld) { WIN_ReleasePtr( win ); - return new_style; + return style.styleNew; } SERVER_START_REQ( set_window_info ) { req->handle = hwnd; req->flags = SET_WIN_STYLE; - req->style = new_style; + req->style = style.styleNew; req->extra_offset = -1; if ((ok = !wine_server_call( req ))) { - old_style = reply->old_style; - win->dwStyle = new_style; + style.styleOld = reply->old_style; + win->dwStyle = style.styleNew; } } SERVER_END_REQ; WIN_ReleasePtr( win ); if (ok) { - USER_Driver->pSetWindowStyle( hwnd, old_style ); - if ((old_style ^ new_style) & WS_VISIBLE) invalidate_dce( hwnd, NULL ); + USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); + if ((style.styleOld ^ style.styleNew) & WS_VISIBLE) invalidate_dce( hwnd, NULL ); } - return old_style; + return style.styleOld; } @@ -2131,10 +2132,11 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if (!ok) return 0; - if (offset == GWL_STYLE) USER_Driver->pSetWindowStyle( hwnd, retval ); - if (offset == GWL_STYLE || offset == GWL_EXSTYLE) + { + USER_Driver->pSetWindowStyle( hwnd, offset, &style ); SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style ); + } return retval; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 33adff4..0ba15e2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1455,16 +1455,15 @@ void X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) * * Update the X state of a window to reflect a style change */ -void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) +void X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { struct x11drv_win_data *data; - DWORD new_style, changed; + DWORD changed; if (hwnd == GetDesktopWindow()) return; - new_style = GetWindowLongW( hwnd, GWL_STYLE ); - changed = new_style ^ old_style; + changed = style->styleNew ^ style->styleOld; - if ((changed & WS_VISIBLE) && (new_style & WS_VISIBLE)) + if (offset == GWL_STYLE && (changed & WS_VISIBLE) && (style->styleNew & WS_VISIBLE)) { /* we don't unmap windows, that causes trouble with the window manager */ if (!(data = X11DRV_get_win_data( hwnd )) && @@ -1474,17 +1473,17 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) { Display *display = thread_display(); set_wm_hints( display, data ); - if (!data->mapped) map_window( display, data, new_style ); + if (!data->mapped) map_window( display, data, style->styleNew ); } } - if (changed & WS_DISABLED) + if (offset == GWL_STYLE && (changed & WS_DISABLED)) { data = X11DRV_get_win_data( hwnd ); if (data && data->wm_hints) { wine_tsx11_lock(); - data->wm_hints->input = !(new_style & WS_DISABLED); + data->wm_hints->input = !(style->styleNew & WS_DISABLED); XSetWMHints( thread_display(), data->whole_window, data->wm_hints ); wine_tsx11_unlock(); } diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index cacc5b9..39dcc8e 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -109,7 +109,7 @@ @ cdecl SetParent(long long long) X11DRV_SetParent @ cdecl SetWindowIcon(long long long) X11DRV_SetWindowIcon @ cdecl SetWindowRgn(long long long) X11DRV_SetWindowRgn -@ cdecl SetWindowStyle(ptr long) X11DRV_SetWindowStyle +@ cdecl SetWindowStyle(ptr long ptr) X11DRV_SetWindowStyle @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText @ cdecl ShowWindow(long long ptr long) X11DRV_ShowWindow @ cdecl SysCommand(long long long) X11DRV_SysCommand

1 0

Alexandre Julliard : user32/tests: Added some tests for Get/ SetLayeredWindowAttributes.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: d476761f912a3f217e6356119cf328cfad4de3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d476761f912a3f217e6356119… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 12 15:31:05 2008 +0200 user32/tests: Added some tests for Get/SetLayeredWindowAttributes. --- dlls/user32/tests/win.c | 92 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 89 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 1964e88..30bc973 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -47,6 +47,8 @@ void dump_region(HRGN hrgn); static HWND (WINAPI *pGetAncestor)(HWND,UINT); static BOOL (WINAPI *pGetWindowInfo)(HWND,WINDOWINFO*); static UINT (WINAPI *pGetWindowModuleFileNameA)(HWND,LPSTR,UINT); +static BOOL (WINAPI *pGetLayeredWindowAttributes)(HWND,COLORREF*,BYTE*,DWORD*); +static BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -4809,11 +4811,94 @@ static void test_hwnd_message(void) DestroyWindow(hwnd); } +static void test_layered_window(void) +{ + HWND hwnd; + COLORREF key = 0; + BYTE alpha = 0; + DWORD flags = 0; + BOOL ret; + + if (!pGetLayeredWindowAttributes || !pSetLayeredWindowAttributes) + { + win_skip( "layered windows not supported\n" ); + return; + } + hwnd = CreateWindowExA(0, "MainWindowClass", "message window", WS_CAPTION, + 100, 100, 200, 200, 0, 0, 0, NULL); + assert( hwnd ); + ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); + ok( !ret, "GetLayeredWindowAttributes should fail on non-layered window\n" ); + ret = pSetLayeredWindowAttributes( hwnd, 0, 0, LWA_ALPHA ); + ok( !ret, "SetLayeredWindowAttributes should fail on non-layered window\n" ); + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); + ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); + ok( !ret, "GetLayeredWindowAttributes should fail on layered but not initialized window\n" ); + ret = pSetLayeredWindowAttributes( hwnd, 0x123456, 44, LWA_ALPHA ); + ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); + ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); + ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" ); + ok( key == 0x123456, "wrong color key %x\n", key ); + ok( alpha == 44, "wrong alpha %u\n", alpha ); + ok( flags == LWA_ALPHA, "wrong flags %x\n", flags ); + + /* clearing WS_EX_LAYERED resets attributes */ + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED ); + ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); + ok( !ret, "GetLayeredWindowAttributes should fail on no longer layered window\n" ); + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); + ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); + ok( !ret, "GetLayeredWindowAttributes should fail on layered but not initialized window\n" ); + ret = pSetLayeredWindowAttributes( hwnd, 0x654321, 22, LWA_COLORKEY | LWA_ALPHA ); + ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); + ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); + ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" ); + ok( key == 0x654321, "wrong color key %x\n", key ); + ok( alpha == 22, "wrong alpha %u\n", alpha ); + ok( flags == (LWA_COLORKEY | LWA_ALPHA), "wrong flags %x\n", flags ); + + /* alpha not changed if LWA_ALPHA is not set */ + ret = pSetLayeredWindowAttributes( hwnd, 0x888888, 33, LWA_COLORKEY ); + ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); + alpha = 0; + ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); + ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" ); + ok( key == 0x888888, "wrong color key %x\n", key ); + ok( alpha == 22, "wrong alpha %u\n", alpha ); + ok( flags == LWA_COLORKEY, "wrong flags %x\n", flags ); + + /* color key always changed */ + ret = pSetLayeredWindowAttributes( hwnd, 0x999999, 44, 0 ); + ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); + alpha = 0; + ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); + ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" ); + ok( key == 0x999999, "wrong color key %x\n", key ); + ok( alpha == 22, "wrong alpha %u\n", alpha ); + ok( flags == 0, "wrong flags %x\n", flags ); + + /* default alpha is 0 */ + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED ); + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); + ret = pSetLayeredWindowAttributes( hwnd, 0x222222, 55, 0 ); + ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); + ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); + ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" ); + ok( key == 0x222222, "wrong color key %x\n", key ); + ok( alpha == 0, "wrong alpha %u\n", alpha ); + ok( flags == 0, "wrong flags %x\n", flags ); + + DestroyWindow( hwnd ); +} + START_TEST(win) { - pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); - pGetWindowInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetWindowInfo" ); - pGetWindowModuleFileNameA = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetWindowModuleFileNameA" ); + HMODULE user32 = GetModuleHandleA( "user32.dll" ); + pGetAncestor = (void *)GetProcAddress( user32, "GetAncestor" ); + pGetWindowInfo = (void *)GetProcAddress( user32, "GetWindowInfo" ); + pGetWindowModuleFileNameA = (void *)GetProcAddress( user32, "GetWindowModuleFileNameA" ); + pGetLayeredWindowAttributes = (void *)GetProcAddress( user32, "GetLayeredWindowAttributes" ); + pSetLayeredWindowAttributes = (void *)GetProcAddress( user32, "SetLayeredWindowAttributes" ); if (!RegisterWindowClasses()) assert(0); @@ -4878,6 +4963,7 @@ START_TEST(win) test_gettext(); test_GetUpdateRect(); test_Expose(); + test_layered_window(); /* add the tests above this line */ UnhookWindowsHookEx(hhook);

1 0