October 2009 - Wine-commits

Hans Leidekker : sti: Return success from the IStillImageW:: UnregisterLaunchApplication stub.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: d95d7db7f698cda6e4e8fd5462c048c5003b195f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95d7db7f698cda6e4e8fd546… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 13:39:54 2009 +0200 sti: Return success from the IStillImageW::UnregisterLaunchApplication stub. --- dlls/sti/sti.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sti/sti.c b/dlls/sti/sti.c index 129627b..c88205d 100644 --- a/dlls/sti/sti.c +++ b/dlls/sti/sti.c @@ -128,7 +128,7 @@ static HRESULT WINAPI stillimagew_UnregisterLaunchApplication(IStillImageW *ifac { stillimage *This = impl_from_StillImageW(iface); FIXME("(%p, %s): stub\n", This, debugstr_w(pwszAppName)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI stillimagew_EnableHwNotifications(IStillImageW *iface, LPCWSTR pwszDeviceName,

1 0

Alexandre Julliard : user32: Get rid of the 16-bit heap support.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 796346f825e92759c957ffaba4ad24d1a9761a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=796346f825e92759c957ffaba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 14:32:21 2009 +0200 user32: Get rid of the 16-bit heap support. --- dlls/user32/user.exe.spec | 2 +- dlls/user32/user16.c | 15 ++++++++++++++ dlls/user32/user_main.c | 11 +--------- dlls/user32/user_private.h | 46 -------------------------------------------- 4 files changed, 17 insertions(+), 57 deletions(-) diff --git a/dlls/user32/user.exe.spec b/dlls/user32/user.exe.spec index 9a22d87..517ced8 100644 --- a/dlls/user32/user.exe.spec +++ b/dlls/user32/user.exe.spec @@ -351,7 +351,7 @@ 371 pascal -ret16 SetWindowPlacement(word ptr) SetWindowPlacement16 372 stub GetInternalIconHeader 373 pascal -ret16 SubtractRect(ptr ptr ptr) SubtractRect16 -#374 DllEntryPoint +374 pascal -ret16 DllEntryPoint(long word word word long word) 375 stub DrawTextEx 376 stub SetMessageExtraInfo 378 stub SetPropEx diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index 85b7212..5ca8837 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -56,6 +56,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(user); WORD WINAPI DestroyIcon32(HGLOBAL16, UINT16); +WORD USER_HeapSel = 0; /* USER heap selector */ struct gray_string_info { @@ -1206,6 +1207,20 @@ BOOL16 WINAPI SubtractRect16( LPRECT16 dest, const RECT16 *src1, /********************************************************************** + * DllEntryPoint (USER.374) + */ +BOOL WINAPI DllEntryPoint( DWORD reason, HINSTANCE16 inst, WORD ds, + WORD heap, DWORD reserved1, WORD reserved2 ) +{ + if (reason != DLL_PROCESS_ATTACH) return TRUE; + if (USER_HeapSel) return TRUE; /* already called */ + + USER_HeapSel = ds; + return TRUE; +} + + +/********************************************************************** * SetMenuContextHelpId (USER.384) */ BOOL16 WINAPI SetMenuContextHelpId16( HMENU16 hMenu, DWORD dwContextHelpID) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 7b7b885..516338c 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -36,7 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphics); #define DESKTOP_ALL_ACCESS 0x01ff -WORD USER_HeapSel = 0; /* USER heap selector */ HMODULE user32_module = 0; static SYSLEVEL USER_SysLevel; @@ -267,15 +266,7 @@ static void winstation_init(void) */ static BOOL process_attach(void) { - HINSTANCE16 instance; - - /* Create USER heap */ - if ((instance = LoadLibrary16( "USER.EXE" )) >= 32) USER_HeapSel = instance | 7; - else - { - USER_HeapSel = GlobalAlloc16( GMEM_FIXED, 65536 ); - LocalInit16( USER_HeapSel, 32, 65534 ); - } + LoadLibrary16( "user.exe" ); /* some Win9x dlls expect keyboard to be loaded */ if (GetVersion() & 0x80000000) LoadLibrary16( "keyboard.drv" ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index fa6118d..3dc1d83 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -29,55 +29,9 @@ #include "winreg.h" #include "winternl.h" #include "wine/windef16.h" -#include "wine/winbase16.h" extern WORD USER_HeapSel DECLSPEC_HIDDEN; -static inline HLOCAL16 LOCAL_Alloc( HANDLE16 ds, UINT16 flags, WORD size ) -{ - STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - HANDLE16 oldDS = stack16->ds; - HLOCAL16 ret; - - stack16->ds = ds; - ret = LocalAlloc16 (flags, size); - stack16->ds = oldDS; - return ret; -} - -static inline HLOCAL16 LOCAL_ReAlloc( HANDLE16 ds, HLOCAL16 handle, WORD size, UINT16 flags ) -{ - STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - HANDLE16 oldDS = stack16->ds; - HLOCAL16 ret; - - stack16->ds = ds; - ret = LocalReAlloc16 (handle, size, flags); - stack16->ds = oldDS; - return ret; -} - -static inline HLOCAL16 LOCAL_Free( HANDLE16 ds, HLOCAL16 handle ) -{ - STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - HANDLE16 oldDS = stack16->ds; - HLOCAL16 ret; - - stack16->ds = ds; - ret = LocalFree16 (handle); - stack16->ds = oldDS; - return ret; -} - -#define USER_HEAP_ALLOC(size) \ - ((HANDLE)(ULONG_PTR)LOCAL_Alloc( USER_HeapSel, LMEM_FIXED, (size) )) -#define USER_HEAP_REALLOC(handle,size) \ - ((HANDLE)(ULONG_PTR)LOCAL_ReAlloc( USER_HeapSel, LOWORD(handle), (size), LMEM_FIXED )) -#define USER_HEAP_FREE(handle) \ - LOCAL_Free( USER_HeapSel, LOWORD(handle) ) -#define USER_HEAP_LIN_ADDR(handle) \ - ((handle) ? MapSL(MAKESEGPTR(USER_HeapSel, LOWORD(handle))) : NULL) - #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr))

1 0

Alexandre Julliard : user32: Set last error in WIN_GetRectangles.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 5db3e7d43ed99ebcedc87c3e7da00e29def0cc2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db3e7d43ed99ebcedc87c3e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 15:51:12 2009 +0200 user32: Set last error in WIN_GetRectangles. --- dlls/user32/win.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index be40018..333b6b6 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -661,7 +661,11 @@ BOOL WIN_GetRectangles( HWND hwnd, RECT *rectWindow, RECT *rectClient ) WND *win = WIN_GetPtr( hwnd ); BOOL ret = TRUE; - if (!win) return FALSE; + if (!win) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } if (win == WND_DESKTOP) { RECT rect; @@ -684,7 +688,7 @@ BOOL WIN_GetRectangles( HWND hwnd, RECT *rectWindow, RECT *rectClient ) SERVER_START_REQ( get_window_rectangles ) { req->handle = wine_server_user_handle( hwnd ); - if ((ret = !wine_server_call( req ))) + if ((ret = !wine_server_call_err( req ))) { if (rectWindow) {

1 0

Hans Leidekker : hnetcfg: Add stub implementations of INetFwOpenPorts and INetFwOpenPort.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 535025c93d2a2575801bef0ec8b2ad94535d5f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=535025c93d2a2575801bef0ec… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 13:38:29 2009 +0200 hnetcfg: Add stub implementations of INetFwOpenPorts and INetFwOpenPort. --- dlls/hnetcfg/Makefile.in | 1 + dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/port.c | 544 ++++++++++++++++++++++++++++++++++++++++ dlls/hnetcfg/profile.c | 4 +- 4 files changed, 548 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=535025c93d2a2575801be…

1 0

Hans Leidekker : hnetcfg: Add stub implementations of INetFwServices and INetFwService.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 1e867f3647a56c83a2374ca2aff1e9a847a85a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e867f3647a56c83a2374ca2a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 13:38:57 2009 +0200 hnetcfg: Add stub implementations of INetFwServices and INetFwService. --- dlls/hnetcfg/Makefile.in | 3 +- dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/profile.c | 4 +- dlls/hnetcfg/service.c | 479 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 484 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e867f3647a56c83a2374…

1 0

Louis Lenders : include: Add definition of MilMatrix3x2D.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: be72cd213658996d86a7952c07cde055290d1b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be72cd213658996d86a7952c0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 11 23:02:27 2009 +0200 include: Add definition of MilMatrix3x2D. --- include/dwmapi.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/dwmapi.h b/include/dwmapi.h index 551138e..4fe51bc 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -31,6 +31,16 @@ extern "C" { DECLARE_HANDLE(HTHUMBNAIL); +typedef struct _MilMatrix3x2D +{ + DOUBLE S_11; + DOUBLE S_12; + DOUBLE S_21; + DOUBLE S_22; + DOUBLE DX; + DOUBLE DY; +} MilMatrix3x2D; + DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*);

1 0

Louis Lenders : dwmapi: Add stub for DwmGetGraphicsStreamTransformHint.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 42f0bbb33258ae9c60bb5d822abea5a4f9fc474c URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f0bbb33258ae9c60bb5d822… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 11 23:12:30 2009 +0200 dwmapi: Add stub for DwmGetGraphicsStreamTransformHint. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 27e0704..7c613d0 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -30,7 +30,7 @@ @ stdcall DwmGetColorizationColor(ptr long) @ stub DwmGetCompositionTimingInfo @ stdcall DwmGetGraphicsStreamClient(long ptr) -@ stub DwmGetGraphicsStreamTransformHint +@ stdcall DwmGetGraphicsStreamTransformHint(long ptr) @ stdcall DwmGetTransportAttributes(ptr ptr ptr) @ stub DwmGetWindowAttribute @ stdcall DwmIsCompositionEnabled(ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 40ecec7..6042028 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -149,3 +149,13 @@ HRESULT WINAPI DwmEnableMMCSS(BOOL enableMMCSS) return S_OK; } + +/********************************************************************** + * DwmGetGraphicsStreamTransformHint (DWMAPI.@) + */ +HRESULT WINAPI DwmGetGraphicsStreamTransformHint(UINT uIndex, MilMatrix3x2D *pTransform) +{ + FIXME("(%d, %p) stub\n", uIndex, pTransform); + + return E_NOTIMPL; +}

1 0

Jeff Zaroyko : wined3d: Fix prototype for set_texture_matrix.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: a1126242a729cde9bf7143b995d2f4776c24f6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1126242a729cde9bf7143b99… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sat Oct 10 18:30:47 2009 +1100 wined3d: Fix prototype for set_texture_matrix. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 87e752e..66d3865 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2405,7 +2405,7 @@ BOOL is_invalid_op(IWineD3DDeviceImpl *This, int stage, WINED3DTEXTUREOP op, void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords, - BOOL transformed, DWORD coordtype, BOOL ffp_can_disable_proj) DECLSPEC_HIDDEN; + BOOL transformed, WINED3DFORMAT coordtype, BOOL ffp_can_disable_proj) DECLSPEC_HIDDEN; void texture_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) DECLSPEC_HIDDEN; void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock,

1 0

Alexandre Julliard : server: Add support for allocating purely client-side user handles.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 9018e13c5e727e6f66d8bb0be969a6638ce5b695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9018e13c5e727e6f66d8bb0be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 14:25:01 2009 +0200 server: Add support for allocating purely client-side user handles. --- include/wine/server_protocol.h | 35 +++++++++++++++++++++++++++++++++-- server/protocol.def | 13 +++++++++++++ server/request.h | 8 ++++++++ server/trace.c | 20 ++++++++++++++++++++ server/user.c | 19 +++++++++++++++++++ server/user.h | 3 ++- 6 files changed, 95 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 7683e8a..d2b159a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -115,8 +115,8 @@ typedef union struct { int code; - client_ptr_t string; data_size_t length; + client_ptr_t string; } output_string; struct { @@ -4614,6 +4614,31 @@ struct set_window_layered_info_reply }; + +struct alloc_user_handle_request +{ + struct request_header __header; +}; +struct alloc_user_handle_reply +{ + struct reply_header __header; + user_handle_t handle; + char __pad_12[4]; +}; + + + +struct free_user_handle_request +{ + struct request_header __header; + user_handle_t handle; +}; +struct free_user_handle_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -4854,6 +4879,8 @@ enum request REQ_add_fd_completion, REQ_get_window_layered_info, REQ_set_window_layered_info, + REQ_alloc_user_handle, + REQ_free_user_handle, REQ_NB_REQUESTS }; @@ -5099,6 +5126,8 @@ union generic_request struct add_fd_completion_request add_fd_completion_request; struct get_window_layered_info_request get_window_layered_info_request; struct set_window_layered_info_request set_window_layered_info_request; + struct alloc_user_handle_request alloc_user_handle_request; + struct free_user_handle_request free_user_handle_request; }; union generic_reply { @@ -5342,8 +5371,10 @@ union generic_reply struct add_fd_completion_reply add_fd_completion_reply; struct get_window_layered_info_reply get_window_layered_info_reply; struct set_window_layered_info_reply set_window_layered_info_reply; + struct alloc_user_handle_reply alloc_user_handle_reply; + struct free_user_handle_reply free_user_handle_reply; }; -#define SERVER_PROTOCOL_VERSION 391 +#define SERVER_PROTOCOL_VERSION 392 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index d7b31f4..a0e1702 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3224,3 +3224,16 @@ enum message_type unsigned int alpha; /* alpha (0..255) */ unsigned int flags; /* LWA_* flags */ @END + + +/* Allocate an arbitrary user handle */ +(a)REQ(alloc_user_handle) +(a)REPLY + user_handle_t handle; /* allocated handle */ +(a)END + + +/* Free an arbitrary user handle */ +(a)REQ(free_user_handle) + user_handle_t handle; /* handle to free*/ +(a)END diff --git a/server/request.h b/server/request.h index 02c7984..87b6a75 100644 --- a/server/request.h +++ b/server/request.h @@ -349,6 +349,8 @@ DECL_HANDLER(set_completion_info); DECL_HANDLER(add_fd_completion); DECL_HANDLER(get_window_layered_info); DECL_HANDLER(set_window_layered_info); +DECL_HANDLER(alloc_user_handle); +DECL_HANDLER(free_user_handle); #ifdef WANT_REQUEST_HANDLERS @@ -593,6 +595,8 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_add_fd_completion, (req_handler)req_get_window_layered_info, (req_handler)req_set_window_layered_info, + (req_handler)req_alloc_user_handle, + (req_handler)req_free_user_handle, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -1892,6 +1896,10 @@ C_ASSERT( FIELD_OFFSET(struct set_window_layered_info_request, color_key) == 16 C_ASSERT( FIELD_OFFSET(struct set_window_layered_info_request, alpha) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_window_layered_info_request, flags) == 24 ); C_ASSERT( sizeof(struct set_window_layered_info_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct alloc_user_handle_reply, handle) == 8 ); +C_ASSERT( sizeof(struct alloc_user_handle_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct free_user_handle_request, handle) == 12 ); +C_ASSERT( sizeof(struct free_user_handle_request) == 16 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index 10c731c..b7dec85 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3780,6 +3780,20 @@ static void dump_set_window_layered_info_request( const struct set_window_layere fprintf( stderr, ", flags=%08x", req->flags ); } +static void dump_alloc_user_handle_request( const struct alloc_user_handle_request *req ) +{ +} + +static void dump_alloc_user_handle_reply( const struct alloc_user_handle_reply *req ) +{ + fprintf( stderr, " handle=%08x", req->handle ); +} + +static void dump_free_user_handle_request( const struct free_user_handle_request *req ) +{ + fprintf( stderr, " handle=%08x", req->handle ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -4019,6 +4033,8 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_add_fd_completion_request, (dump_func)dump_get_window_layered_info_request, (dump_func)dump_set_window_layered_info_request, + (dump_func)dump_alloc_user_handle_request, + (dump_func)dump_free_user_handle_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4260,6 +4276,8 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_get_window_layered_info_reply, NULL, + (dump_func)dump_alloc_user_handle_reply, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4501,6 +4519,8 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "add_fd_completion", "get_window_layered_info", "set_window_layered_info", + "alloc_user_handle", + "free_user_handle", }; static const struct diff --git a/server/user.c b/server/user.c index 6be1c8f..2515799 100644 --- a/server/user.c +++ b/server/user.c @@ -20,6 +20,7 @@ #include "thread.h" #include "user.h" +#include "request.h" struct user_handle { @@ -164,3 +165,21 @@ void *next_user_handle( user_handle_t *handle, enum user_object type ) } return NULL; } + +/* allocate an arbitrary user handle */ +DECL_HANDLER(alloc_user_handle) +{ + reply->handle = alloc_user_handle( NULL, USER_CLIENT ); +} + + +/* free an arbitrary user handle */ +DECL_HANDLER(free_user_handle) +{ + struct user_handle *entry; + + if ((entry = handle_to_entry( req->handle )) && entry->type == USER_CLIENT) + free_user_entry( entry ); + else + set_error( STATUS_INVALID_HANDLE ); +} diff --git a/server/user.h b/server/user.h index 166d20b..bf1e23c 100644 --- a/server/user.h +++ b/server/user.h @@ -35,7 +35,8 @@ struct clipboard; enum user_object { USER_WINDOW = 1, - USER_HOOK + USER_HOOK, + USER_CLIENT /* arbitrary client handle */ }; #define DESKTOP_ATOM ((atom_t)32769)

1 0

Alexandre Julliard : user32: Add functions for manipulating client-side user handles.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: d996f7e334d3274465b75cacf02695b4314040ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d996f7e334d3274465b75cacf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 12 14:27:55 2009 +0200 user32: Add functions for manipulating client-side user handles. --- dlls/user32/user_private.h | 19 ++++++++++ dlls/user32/win.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 1ff6ef4..1020064 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -170,6 +170,25 @@ extern void USER_unload_driver(void) DECLSPEC_HIDDEN; struct received_message_info; struct hook16_queue_info; +enum user_obj_type +{ + USER_WINDOW = 1, /* window */ + USER_DWP /* DeferWindowPos structure */ +}; + +struct user_object +{ + HANDLE handle; + enum user_obj_type type; +}; + +#define OBJ_OTHER_PROCESS ((void *)1) /* returned by get_user_handle_ptr on unknown handles */ + +HANDLE alloc_user_handle( struct user_object *ptr, enum user_obj_type type ) DECLSPEC_HIDDEN; +void *get_user_handle_ptr( HANDLE handle, enum user_obj_type type ) DECLSPEC_HIDDEN; +void release_user_handle_ptr( void *ptr ) DECLSPEC_HIDDEN; +void *free_user_handle( HANDLE handle, enum user_obj_type type ) DECLSPEC_HIDDEN; + /* type of message-sending functions that need special WM_CHAR handling */ enum wm_char_mapping { diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 44b15b1..28ea841 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -91,6 +91,89 @@ static inline void set_win_data( void *ptr, LONG_PTR val, UINT size ) static void *user_handles[NB_USER_HANDLES]; /*********************************************************************** + * alloc_user_handle + */ +HANDLE alloc_user_handle( struct user_object *ptr, enum user_obj_type type ) +{ + HANDLE handle = 0; + + SERVER_START_REQ( alloc_user_handle ) + { + if (!wine_server_call_err( req )) handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + + if (handle) + { + UINT index = USER_HANDLE_TO_INDEX( handle ); + + assert( index < NB_USER_HANDLES ); + ptr->handle = handle; + ptr->type = type; + user_handles[index] = ptr; + } + return handle; +} + + +/*********************************************************************** + * get_user_handle_ptr + */ +void *get_user_handle_ptr( HANDLE handle, enum user_obj_type type ) +{ + struct user_object *ptr; + WORD index = USER_HANDLE_TO_INDEX( handle ); + + if (index >= NB_USER_HANDLES) return NULL; + + USER_Lock(); + if ((ptr = user_handles[index])) + { + if (ptr->type == type && + ((UINT)(UINT_PTR)ptr->handle == (UINT)(UINT_PTR)handle || + !HIWORD(handle) || HIWORD(handle) == 0xffff)) + return ptr; + ptr = NULL; + } + else ptr = OBJ_OTHER_PROCESS; + USER_Unlock(); + return ptr; +} + + +/*********************************************************************** + * release_user_handle_ptr + */ +void release_user_handle_ptr( void *ptr ) +{ + USER_Unlock(); +} + + +/*********************************************************************** + * free_user_handle + */ +void *free_user_handle( HANDLE handle, enum user_obj_type type ) +{ + struct user_object *ptr; + WORD index = USER_HANDLE_TO_INDEX( handle ); + + if ((ptr = get_user_handle_ptr( handle, type )) && ptr != OBJ_OTHER_PROCESS) + { + SERVER_START_REQ( free_user_handle ) + { + req->handle = wine_server_user_handle( handle ); + if (!wine_server_call( req )) user_handles[index] = NULL; + else ptr = NULL; + } + SERVER_END_REQ; + release_user_handle_ptr( ptr ); + } + return ptr; +} + + +/*********************************************************************** * create_window_handle * * Create a window handle with the server.

1 0