January 2013 - Wine-Commits

Jacek Caban : winhttp: Use schannel for HTTPS connection by defaul and get rid of OpenSSL dependency .
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 5b38dac7ac3f8b246624830f1559628cda3e1a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b38dac7ac3f8b246624830f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 15:50:35 2013 +0100 winhttp: Use schannel for HTTPS connection by defaul and get rid of OpenSSL dependency. --- dlls/winhttp/net.c | 485 ---------------------------------------- dlls/winhttp/winhttp_private.h | 1 - 2 files changed, 0 insertions(+), 486 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b38dac7ac3f8b2466248…

1 0

Jacek Caban : mshtml: Get rid of PRUint16 type.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: cef2907da7389d3f000c0fb43acb2146a0e6d543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef2907da7389d3f000c0fb43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 18:43:55 2013 +0100 mshtml: Get rid of PRUint16 type. --- dlls/mshtml/editor.c | 4 ++-- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmldoc3.c | 2 +- dlls/mshtml/htmlelemcol.c | 2 +- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsiface.idl | 3 +-- dlls/mshtml/txtrange.c | 6 +++--- 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 6fee9c7..ccbdd59 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -218,7 +218,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_ PRUint32 child_cnt, i; nsIDOMNode *child_node; nsIDOMNodeList *node_list; - PRUint16 node_type; + UINT16 node_type; nsIDOMElement_HasChildNodes(elem, &has_children); if(!has_children) @@ -266,7 +266,7 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) nsIDOMNode *node = NULL, *tmp_node; nsAString tag_str; LPCWSTR tag; - PRUint16 node_type; + UINT16 node_type; nsresult nsres; *ret = 0; diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a7b87a8..bfcf466 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -646,7 +646,7 @@ static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, if(eid == EVENTID_CLICK) { nsIDOMMouseEvent *mouse_event; - PRUint16 button; + UINT16 button; nsresult nsres; TRACE("CLICK\n"); diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index f5e2f54..e1efa7a 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -74,7 +74,7 @@ HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement * assert(nsres == NS_OK); if(nsnode && nselem) { - PRUint16 pos; + UINT16 pos; nsres = nsIDOMNode_CompareDocumentPosition(nsnode, (nsIDOMNode*)nselem, &pos); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 11cc5a5..39e259c 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -79,7 +79,7 @@ static void elem_vector_normalize(elem_vector_t *buf) static inline BOOL is_elem_node(nsIDOMNode *node) { - PRUint16 type=0; + UINT16 type=0; nsIDOMNode_GetNodeType(node, &type); diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 68a3942..f849d60 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -564,7 +564,7 @@ static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_button(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - PRUint16 button = 0; + UINT16 button = 0; TRACE("(%p)->(%p)\n", This, p); @@ -1049,7 +1049,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e BOOL prevent_default = FALSE; HTMLInnerWindow *window; HTMLDOMNode *node; - PRUint16 node_type; + UINT16 node_type; nsresult nsres; HRESULT hres; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 4269f6c..2c804b6 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -373,7 +373,7 @@ static HRESULT WINAPI HTMLDOMNode_Invoke(IHTMLDOMNode *iface, DISPID dispIdMembe static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, LONG *p) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - PRUint16 type = -1; + UINT16 type = -1; TRACE("(%p)->(%p)\n", This, p); @@ -1085,7 +1085,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNode **ret) { - PRUint16 node_type; + UINT16 node_type; HRESULT hres; nsIDOMNode_GetNodeType(nsnode, &node_type); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6086846..215bb38 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -914,7 +914,7 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo nsIDOMNodeList *node_list = NULL; cpp_bool has_children = FALSE; nsIContent *nscontent; - PRUint16 type; + UINT16 type; nsresult nsres; nsIDOMNode_HasChildNodes(nsnode, &has_children); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index b6692fb..31bd347 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -44,7 +44,6 @@ typedef nsIIDRef nsCIDRef; typedef WCHAR PRUnichar; typedef ULONG PRUint32; -typedef WORD PRUint16; typedef ULONGLONG PRUint64; /* @@ -57,7 +56,7 @@ typedef ULONGLONG PRUint64; #define int64_t INT64 #define uint8_t UINT8 -#define uint16_t PRUint16 +#define uint16_t UINT16 #define uint32_t PRUint32 #define uint64_t PRUint64 diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 085aa84..813fad7 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -54,7 +54,7 @@ typedef struct { } wstrbuf_t; typedef struct { - PRUint16 type; + UINT16 type; nsIDOMNode *node; PRUint32 off; nsAString str; @@ -116,9 +116,9 @@ static int string_to_nscmptype(LPCWSTR str) return -1; } -static PRUint16 get_node_type(nsIDOMNode *node) +static UINT16 get_node_type(nsIDOMNode *node) { - PRUint16 type = 0; + UINT16 type = 0; if(node) nsIDOMNode_GetNodeType(node, &type);

1 0

Jacek Caban : mshtml: Get rid of PRUint8 type.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 2d100f4e988342aee82b745672230a0998557669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d100f4e988342aee82b74567… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 18:43:39 2013 +0100 mshtml: Get rid of PRUint8 type. --- dlls/mshtml/nsiface.idl | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 8a359d9..b6692fb 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -45,7 +45,6 @@ typedef nsIIDRef nsCIDRef; typedef WCHAR PRUnichar; typedef ULONG PRUint32; typedef WORD PRUint16; -typedef BYTE PRUint8; typedef ULONGLONG PRUint64; /* @@ -57,7 +56,7 @@ typedef ULONGLONG PRUint64; #define int32_t LONG #define int64_t INT64 -#define uint8_t PRUint8 +#define uint8_t UINT8 #define uint16_t PRUint16 #define uint32_t PRUint32 #define uint64_t PRUint64

1 0

Jacek Caban : mshtml: Get rid of PRUint32 outside XPCOM C API.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 07e72de9a4ddaff75c05a351d7d84e96be619b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e72de9a4ddaff75c05a351d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 18:44:42 2013 +0100 mshtml: Get rid of PRUint32 outside XPCOM C API. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/editor.c | 4 ++-- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 4 ++-- dlls/mshtml/htmlelemcol.c | 6 +++--- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlimg.c | 4 ++-- dlls/mshtml/htmlnode.c | 6 +++--- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlstylesheet.c | 4 ++-- dlls/mshtml/htmltextnode.c | 2 +- dlls/mshtml/htmlwindow.c | 8 ++++---- dlls/mshtml/mshtml_private.h | 6 +++--- dlls/mshtml/navigate.c | 12 ++++++------ dlls/mshtml/nsembed.c | 20 +++++++++++--------- dlls/mshtml/nsiface.idl | 3 +-- dlls/mshtml/nsio.c | 30 +++++++++++++++--------------- dlls/mshtml/nsservice.c | 4 ++-- dlls/mshtml/propbag.c | 2 +- dlls/mshtml/script.c | 2 +- dlls/mshtml/txtrange.c | 4 ++-- 22 files changed, 66 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07e72de9a4ddaff75c05a…

1 0

Jacek Caban : winhttp: Test that the data is really read in test_secure_connection.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 0ebbd991c1fce7e3bf6648a4c995ae36b642c5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ebbd991c1fce7e3bf6648a4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 15:48:02 2013 +0100 winhttp: Test that the data is really read in test_secure_connection. --- dlls/winhttp/tests/winhttp.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 132551c..fd0db18 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -792,7 +792,7 @@ static void test_secure_connection(void) static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; HINTERNET ses, con, req; - DWORD size, status, policy, bitness; + DWORD size, status, policy, bitness, read_size; BOOL ret; CERT_CONTEXT *cert; WINHTTP_CERTIFICATE_INFO info; @@ -873,13 +873,16 @@ static void test_secure_connection(void) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); ok(!ret, "succeeded unexpectedly\n"); + read_size = 0; for (;;) { size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); if (!size) break; + read_size += size; } + ok(read_size > 2014, "read_size = %u\n", read_size); cleanup: WinHttpCloseHandle(req);

1 0

Jacek Caban : mshtml: Get rid of PRUint64 type.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 7867ce8560dd237b22c475e8983690927b2b7a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7867ce8560dd237b22c475e89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 18:44:56 2013 +0100 mshtml: Get rid of PRUint64 type. --- dlls/mshtml/navigate.c | 4 ++-- dlls/mshtml/nsiface.idl | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 72afc10..f0edca0 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -138,7 +138,7 @@ static nsresult NSAPI nsInputStream_Close(nsIInputStream *iface) return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsInputStream_Available(nsIInputStream *iface, PRUint64 *_retval) +static nsresult NSAPI nsInputStream_Available(nsIInputStream *iface, UINT64 *_retval) { nsProtocolStream *This = impl_from_nsIInputStream(iface); FIXME("(%p)->(%p)\n", This, _retval); @@ -1001,7 +1001,7 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) { - PRUint64 available = 0; + UINT64 available = 0; UINT32 data_len = 0; char *data, *post_data; nsresult nsres; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index d12b465..647566f 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -43,7 +43,6 @@ typedef REFIID nsIIDRef; typedef nsIIDRef nsCIDRef; typedef WCHAR PRUnichar; -typedef ULONGLONG PRUint64; /* * Mozilla uses stdint.h types for its headers. Following defines make this IDL file @@ -57,7 +56,7 @@ typedef ULONGLONG PRUint64; #define uint8_t UINT8 #define uint16_t UINT16 #define uint32_t UINT32 -#define uint64_t PRUint64 +#define uint64_t UINT64 typedef uint64_t DOMTimeStamp; typedef uint32_t nsLoadFlags;

1 0

Jacek Caban : mshtml: Get rid of PTInt64 type.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 9bd6b9e537847136e7588f21b9e6fc7e80b1fc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd6b9e537847136e7588f21b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 18:43:25 2013 +0100 mshtml: Get rid of PTInt64 type. --- dlls/mshtml/nsiface.idl | 3 +-- dlls/mshtml/nsio.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 8973701..8a359d9 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -46,7 +46,6 @@ typedef WCHAR PRUnichar; typedef ULONG PRUint32; typedef WORD PRUint16; typedef BYTE PRUint8; -typedef LONGLONG PRInt64; typedef ULONGLONG PRUint64; /* @@ -56,7 +55,7 @@ typedef ULONGLONG PRUint64; */ #define int16_t short #define int32_t LONG -#define int64_t PRInt64 +#define int64_t INT64 #define uint8_t PRUint8 #define uint16_t PRUint16 diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index af57750..9e35921 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1463,7 +1463,7 @@ static nsrefcnt NSAPI nsUploadChannel_Release(nsIUploadChannel *iface) } static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, - nsIInputStream *aStream, const nsACString *aContentType, PRInt64 aContentLength) + nsIInputStream *aStream, const nsACString *aContentType, INT64 aContentLength) { nsChannel *This = impl_from_nsIUploadChannel(iface); const char *content_type;

1 0

Ričardas Barkauskas : advapi32: Partially implement CreateProcessWithTokenW.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 1593bdf9a61c90a8bf7d6f6486156cd6129b9a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1593bdf9a61c90a8bf7d6f648… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Jan 22 23:53:55 2013 +0200 advapi32: Partially implement CreateProcessWithTokenW. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 38342dc..027d9d2 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -126,7 +126,7 @@ # @ stub CreateProcessAsUserSecure @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) @ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) -# @ stub CreateProcessWithTokenW +@ stdcall CreateProcessWithTokenW(long long wstr wstr long ptr wstr ptr ptr) @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) @ stdcall CreateServiceA(long str str long long long long str str ptr str str str) @ stdcall CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 8e2f39c..6da7331 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5275,6 +5275,20 @@ BOOL WINAPI CreateProcessWithLogonW( LPCWSTR lpUsername, LPCWSTR lpDomain, LPCWS return FALSE; } +BOOL WINAPI CreateProcessWithTokenW(HANDLE token, DWORD logon_flags, LPCWSTR application_name, LPWSTR command_line, + DWORD creation_flags, void *environment, LPCWSTR current_directory, STARTUPINFOW *startup_info, + PROCESS_INFORMATION *process_information ) +{ + FIXME("%p 0x%08x %s %s 0x%08x %p %s %p %p - semi-stub\n", token, + logon_flags, debugstr_w(application_name), debugstr_w(command_line), + creation_flags, environment, debugstr_w(current_directory), + startup_info, process_information); + + /* FIXME: check if handles should be inherited */ + return CreateProcessW( application_name, command_line, NULL, NULL, FALSE, creation_flags, environment, + current_directory, startup_info, process_information ); +} + /****************************************************************************** * DuplicateTokenEx [ADVAPI32.@] */

1 0

Alexandre Julliard : winex11: Store the client window in the window data again, now that it can be accessed from all threads.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 951415b602743af897371e077fb47f56f6461dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=951415b602743af897371e077… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 13:35:30 2013 +0100 winex11: Store the client window in the window data again, now that it can be accessed from all threads. --- dlls/winex11.drv/opengl.c | 38 ++++----------------- dlls/winex11.drv/window.c | 80 ++++++++++++++++++++++++++++++++++++++++++--- dlls/winex11.drv/x11drv.h | 2 + 3 files changed, 84 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=951415b602743af897371…

1 0

Alexandre Julliard : winex11: Handle Expose events on top-level client windows.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 8373f8b6f65e5570a3bbaba2424b71634452a448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8373f8b6f65e5570a3bbaba24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 19:09:29 2013 +0100 winex11: Handle Expose events on top-level client windows. --- dlls/winex11.drv/event.c | 23 +++++++++++++---------- dlls/winex11.drv/window.c | 5 +++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 90b2068..5e5b19e 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -829,21 +829,24 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) rect.right = event->x + event->width; rect.bottom = event->y + event->height; - if (data->surface) + if (event->window != data->client_window) { - surface_region = expose_surface( data->surface, &rect ); - if (!surface_region) flags = 0; - if (data->vis.visualid != default_visual.visualid) - data->surface->funcs->flush( data->surface ); - } + if (data->surface) + { + surface_region = expose_surface( data->surface, &rect ); + if (!surface_region) flags = 0; + else OffsetRgn( surface_region, data->whole_rect.left - data->client_rect.left, + data->whole_rect.top - data->client_rect.top ); - if (event->window != root_window) - { + if (data->vis.visualid != default_visual.visualid) + data->surface->funcs->flush( data->surface ); + } OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, data->whole_rect.top - data->client_rect.top ); - if (surface_region) OffsetRgn( surface_region, data->whole_rect.left - data->client_rect.left, - data->whole_rect.top - data->client_rect.top ); + } + if (event->window != root_window) + { if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) mirror_rect( &data->client_rect, &rect ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d45e9a1..7f97330 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1383,11 +1383,12 @@ Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *vi attr.bit_gravity = NorthWestGravity; attr.win_gravity = NorthWestGravity; attr.backing_store = NotUseful; + attr.event_mask = ExposureMask; data->client_window = XCreateWindow( data->display, data->whole_window, x, y, cx, cy, 0, default_visual.depth, InputOutput, visual->visual, - CWBitGravity | CWWinGravity | CWBackingStore | CWColormap, - &attr ); + CWBitGravity | CWWinGravity | CWBackingStore | + CWColormap | CWEventMask, &attr ); if (!data->client_window) return 0; XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd );

1 0