wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Thomas Mullaly : urlmon: Implemented validation of the host name component of a IUriBuilder.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 63723845c4529b12b4c161450937212c92cb33cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=63723845c4529b12b4c161450… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 20 22:45:57 2010 -0400 urlmon: Implemented validation of the host name component of a IUriBuilder. --- dlls/urlmon/tests/uri.c | 61 +++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 89 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 128 insertions(+), 22 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b2e265e..a32f889 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4823,7 +4823,6 @@ static const uri_builder_test uri_builder_tests[] = { { {FALSE}, }, - {TRUE,TRUE,999999,S_OK,FALSE}, 0,S_OK,TRUE, 0,S_OK,TRUE, @@ -5236,6 +5235,66 @@ static const uri_builder_test uri_builder_tests[] = { 0,INET_E_INVALID_URL,FALSE, 0,INET_E_INVALID_URL,FALSE, 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"winehq.org/test",NULL,Uri_PROPERTY_HOST,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"winehq.org?test",NULL,Uri_PROPERTY_HOST,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"winehq.org#test",NULL,Uri_PROPERTY_HOST,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + /* Hostname is allowed to contain a ':' (even for known scheme types). */ + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"winehq.org:test",NULL,Uri_PROPERTY_HOST,S_OK,FALSE}, + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://winehq.org:test/",S_OK}, + {"winehq.org:test",S_OK}, + {"http://winehq.org:test/",S_OK}, + {"winehq.org:test",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"winehq.org:test",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://winehq.org:test/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index eaf8c83..c6570d6 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -26,9 +26,12 @@ #define UINT_MAX 0xffffffff #define USHORT_MAX 0xffff -#define ALLOW_NULL_TERM_SCHEME 0x1 -#define ALLOW_NULL_TERM_USER_NAME 0x2 -#define ALLOW_NULL_TERM_PASSWORD 0x4 +#define ALLOW_NULL_TERM_SCHEME 0x01 +#define ALLOW_NULL_TERM_USER_NAME 0x02 +#define ALLOW_NULL_TERM_PASSWORD 0x04 +#define ALLOW_BRACKETLESS_IP_LITERAL 0x08 +#define SKIP_IP_FUTURE_CHECK 0x10 +#define IGNORE_PORT_DELIMITER 0x20 WINE_DEFAULT_DEBUG_CHANNEL(urlmon); @@ -1516,11 +1519,11 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) * * A reg-name CAN be empty. */ -static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { +static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { const BOOL has_start_bracket = **ptr == '['; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; BOOL inside_brackets = has_start_bracket; - BOOL ignore_col = FALSE; + BOOL ignore_col = extras & IGNORE_PORT_DELIMITER; /* We have to be careful with file schemes. */ if(data->scheme_type == URL_SCHEME_FILE) { @@ -1554,7 +1557,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { if(data->scheme_type != URL_SCHEME_UNKNOWN) { *ptr = data->host; data->host = NULL; - TRACE("(%p %p %x): Expected valid port\n", ptr, data, flags); + TRACE("(%p %p %x %x): Expected valid port\n", ptr, data, flags, extras); return FALSE; } else /* Windows gives up on trying to parse a port when it @@ -1585,8 +1588,8 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { if(has_start_bracket) { /* Make sure the last character of the host wasn't a ']'. */ if(*(*ptr-1) == ']') { - TRACE("(%p %p %x): Expected an IP literal inside of the host\n", - ptr, data, flags); + TRACE("(%p %p %x %x): Expected an IP literal inside of the host\n", + ptr, data, flags, extras); *ptr = data->host; data->host = NULL; return FALSE; @@ -1603,7 +1606,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { else data->host_type = Uri_HOST_DNS; - TRACE("(%p %p %x): Parsed reg-name. host=%s len=%d\n", ptr, data, flags, + TRACE("(%p %p %x %x): Parsed reg-name. host=%s len=%d\n", ptr, data, flags, extras, debugstr_wn(data->host, data->host_len), data->host_len); return TRUE; } @@ -1816,27 +1819,33 @@ static BOOL parse_ipvfuture(const WCHAR **ptr, parse_data *data, DWORD flags) { } /* IP-literal = "[" ( IPv6address / IPvFuture ) "]" */ -static BOOL parse_ip_literal(const WCHAR **ptr, parse_data *data, DWORD flags) { +static BOOL parse_ip_literal(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { data->host = *ptr; - if(**ptr != '[') { + if(**ptr != '[' && !(extras & ALLOW_BRACKETLESS_IP_LITERAL)) { data->host = NULL; return FALSE; - } + } else if(**ptr == '[') + ++(*ptr); - ++(*ptr); if(!parse_ipv6address(ptr, data, flags)) { - if(!parse_ipvfuture(ptr, data, flags)) { + if(extras & SKIP_IP_FUTURE_CHECK || !parse_ipvfuture(ptr, data, flags)) { *ptr = data->host; data->host = NULL; return FALSE; } } - if(**ptr != ']') { + if(**ptr != ']' && !(extras & ALLOW_BRACKETLESS_IP_LITERAL)) { *ptr = data->host; data->host = NULL; return FALSE; + } else if(!**ptr && extras & ALLOW_BRACKETLESS_IP_LITERAL) { + /* The IP literal didn't contain brackets and was followed by + * a NULL terminator, so no reason to even check the port. + */ + data->host_len = *ptr - data->host; + return TRUE; } ++(*ptr); @@ -1860,12 +1869,12 @@ static BOOL parse_ip_literal(const WCHAR **ptr, parse_data *data, DWORD flags) { * * host = IP-literal / IPv4address / reg-name */ -static BOOL parse_host(const WCHAR **ptr, parse_data *data, DWORD flags) { - if(!parse_ip_literal(ptr, data, flags)) { +static BOOL parse_host(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { + if(!parse_ip_literal(ptr, data, flags, extras)) { if(!parse_ipv4address(ptr, data, flags)) { - if(!parse_reg_name(ptr, data, flags)) { - TRACE("(%p %p %x): Malformed URI, Unknown host type.\n", - ptr, data, flags); + if(!parse_reg_name(ptr, data, flags, extras)) { + TRACE("(%p %p %x %x): Malformed URI, Unknown host type.\n", + ptr, data, flags, extras); return FALSE; } } @@ -1884,7 +1893,7 @@ static BOOL parse_authority(const WCHAR **ptr, parse_data *data, DWORD flags) { /* Parsing the port will happen during one of the host parsing * routines (if the URI has a port). */ - if(!parse_host(ptr, data, flags)) + if(!parse_host(ptr, data, flags, 0)) return FALSE; return TRUE; @@ -3651,6 +3660,37 @@ static HRESULT validate_userinfo(const UriBuilder *builder, parse_data *data, DW return S_OK; } +static HRESULT validate_host(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->host) { + ptr = builder->host; + expected_len = builder->host_len; + } else if(!(builder->modified_props & Uri_HAS_HOST) && builder->uri && builder->uri->host_start > -1) { + ptr = builder->uri->canon_uri + builder->uri->host_start; + expected_len = builder->uri->host_len; + } else + ptr = NULL; + + if(ptr) { + DWORD extras = ALLOW_BRACKETLESS_IP_LITERAL|IGNORE_PORT_DELIMITER|SKIP_IP_FUTURE_CHECK; + pptr = &ptr; + + if(parse_host(pptr, data, flags, extras) && data->host_len == expected_len) + TRACE("(%p %p %x): Found valid host name %s len=%d type=%d.\n", builder, data, flags, + debugstr_wn(data->host, data->host_len), data->host_len, data->host_type); + else { + TRACE("(%p %p %x): Invalid host name found %s expected_len=%d.\n", builder, data, flags, + debugstr_wn(ptr, expected_len), expected_len); + return INET_E_INVALID_URL; + } + } + + return S_OK; +} + static HRESULT validate_components(const UriBuilder *builder, parse_data *data, DWORD flags) { HRESULT hr; @@ -3676,6 +3716,13 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, if(FAILED(hr)) return hr; + hr = validate_host(builder, data, flags); + if(FAILED(hr)) + return hr; + + /* The URI is opaque if it doesn't have an authority component. */ + data->is_opaque = !data->username && !data->password && !data->host; + return E_NOTIMPL; }

1 0

Aurimas Fišeras : inetcpl.cpl: Update Lithuanian translation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: fb161e216f7aa2bc1727a773330e9430e0ea4fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb161e216f7aa2bc1727a7733… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Sep 27 20:20:25 2010 +0300 inetcpl.cpl: Update Lithuanian translation. --- dlls/inetcpl.cpl/cpl_Lt.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Lt.rc b/dlls/inetcpl.cpl/cpl_Lt.rc index bce5403..f180133 100644 --- a/dlls/inetcpl.cpl/cpl_Lt.rc +++ b/dlls/inetcpl.cpl/cpl_Lt.rc @@ -31,3 +31,18 @@ BEGIN IDS_CPL_NAME "Interneto nuostatos" IDS_CPL_INFO "Konfigūruokite Wine interneto naršyklės ir susijusias nuostatas" END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Turinys" +BEGIN + + GROUPBOX " Liudijimai ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Liudijimai yra naudojami jūsų tapatumo nustatymui ir liudijimo įstaigų bei publikuotojų tapatumui nustatyti.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Liudijimai...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Publikuotojai... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Aurimas Fišeras : ipconfig: Update Lithuanian translation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: bca78f5f86f73e176e6ea9e03510c9ab2532c628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca78f5f86f73e176e6ea9e03… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Sep 27 20:13:04 2010 +0300 ipconfig: Update Lithuanian translation. --- programs/ipconfig/Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Lt.rc b/programs/ipconfig/Lt.rc index 3afefa1..03e4e31 100644 --- a/programs/ipconfig/Lt.rc +++ b/programs/ipconfig/Lt.rc @@ -47,4 +47,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP įjungta" STRING_YES, "Taip" STRING_NO, "Ne" + STRING_DEFAULT_GATEWAY, "Numatytasis šliuzas" }

1 0

Alexandre Julliard : server: Pass the rectangle in client coordinates for update_window_zorder.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 6ee4521886822178366c0278c5321022d21f5672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee4521886822178366c0278c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 21:12:49 2010 +0200 server: Pass the rectangle in client coordinates for update_window_zorder. --- dlls/winex11.drv/event.c | 17 ++++++----------- dlls/winex11.drv/mouse.c | 45 +++++++++++++++------------------------------ server/protocol.def | 2 +- server/window.c | 8 +++++--- 4 files changed, 27 insertions(+), 45 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 8fc955a..a1e0d7f 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -731,19 +731,16 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) if (!(data = X11DRV_get_win_data( hwnd ))) return; + rect.left = event->x; + rect.top = event->y; + rect.right = event->x + event->width; + rect.bottom = event->y + event->height; if (event->window == data->whole_window) { - rect.left = data->whole_rect.left + event->x; - rect.top = data->whole_rect.top + event->y; + OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, + data->whole_rect.top - data->client_rect.top ); flags |= RDW_FRAME; } - else - { - rect.left = data->client_rect.left + event->x; - rect.top = data->client_rect.top + event->y; - } - rect.right = rect.left + event->width; - rect.bottom = rect.top + event->height; if (event->window != root_window) { @@ -758,8 +755,6 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) } SERVER_END_REQ; - /* make position relative to client area instead of parent */ - OffsetRect( &rect, -data->client_rect.left, -data->client_rect.top ); flags |= RDW_ALLCHILDREN; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 922df65..b725823 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -120,29 +120,6 @@ void X11DRV_Xcursor_Init(void) /*********************************************************************** - * get_coords - * - * get the coordinates of a mouse event - */ -static inline void get_coords( HWND hwnd, Window window, int x, int y, POINT *pt ) -{ - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - - if (!data) return; - - if (window == data->client_window) - { - pt->x = x + data->client_rect.left; - pt->y = y + data->client_rect.top; - } - else - { - pt->x = x + data->whole_rect.left; - pt->y = y + data->whole_rect.top; - } -} - -/*********************************************************************** * clip_point_to_rect * * Clip point to the provided rectangle @@ -241,25 +218,33 @@ void set_window_cursor( HWND hwnd, HCURSOR handle ) */ static void update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned int state, POINT *pt ) { - struct x11drv_thread_data *data = x11drv_thread_data(); + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + + if (!data) return; - get_coords( hwnd, window, x, y, pt ); + if (window == data->whole_window) + { + x += data->whole_rect.left - data->client_rect.left; + y += data->whole_rect.top - data->client_rect.top; + } + pt->x = x + data->client_rect.left; + pt->y = y + data->client_rect.top; cursor_window = hwnd; /* update the wine server Z-order */ - if (window != data->grab_window && + if (window != x11drv_thread_data()->grab_window && /* ignore event if a button is pressed, since the mouse is then grabbed too */ !(state & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask))) { SERVER_START_REQ( update_window_zorder ) { req->window = wine_server_user_handle( hwnd ); - req->rect.left = pt->x; - req->rect.top = pt->y; - req->rect.right = pt->x + 1; - req->rect.bottom = pt->y + 1; + req->rect.left = x; + req->rect.top = y; + req->rect.right = x + 1; + req->rect.bottom = y + 1; wine_server_call( req ); } SERVER_END_REQ; diff --git a/server/protocol.def b/server/protocol.def index ccc87fe..21cae9c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2441,7 +2441,7 @@ enum coords_relative /* Update the z order of a window so that a given rectangle is fully visible */ @REQ(update_window_zorder) user_handle_t window; /* handle to the window */ - rectangle_t rect; /* rectangle that must be visible */ + rectangle_t rect; /* rectangle that must be visible (in client coords) */ @END diff --git a/server/window.c b/server/window.c index e3dc47a..8900751 100644 --- a/server/window.c +++ b/server/window.c @@ -2423,18 +2423,20 @@ DECL_HANDLER(get_update_region) /* update the z order of a window so that a given rectangle is fully visible */ DECL_HANDLER(update_window_zorder) { - rectangle_t tmp; + rectangle_t tmp, rect = req->rect; struct window *ptr, *win = get_window( req->window ); if (!win || !win->parent || !is_visible( win )) return; /* nothing to do */ + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->client_rect, &rect ); + offset_rect( &rect, win->client_rect.left, win->client_rect.top ); LIST_FOR_EACH_ENTRY( ptr, &win->parent->children, struct window, entry ) { if (ptr == win) break; if (!(ptr->style & WS_VISIBLE)) continue; if (ptr->ex_style & WS_EX_TRANSPARENT) continue; - if (!intersect_rect( &tmp, &ptr->visible_rect, &req->rect )) continue; - if (ptr->win_region && !rect_in_region( ptr->win_region, &req->rect )) continue; + if (!intersect_rect( &tmp, &ptr->visible_rect, &rect )) continue; + if (ptr->win_region && !rect_in_region( ptr->win_region, &rect )) continue; /* found a window obscuring the rectangle, now move win above this one */ /* making sure to not violate the topmost rule */ if (!(ptr->ex_style & WS_EX_TOPMOST) || (win->ex_style & WS_EX_TOPMOST))

1 0

Alexandre Julliard : server: Mirror the window region for RTL windows in get/ set_window_region and redraw_window.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: d56ac06260daaa82cfcf7a15d3fe10de574be6d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56ac06260daaa82cfcf7a15d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 20:46:41 2010 +0200 server: Mirror the window region for RTL windows in get/set_window_region and redraw_window. --- server/protocol.def | 6 +++--- server/region.c | 23 +++++++++++++++++++++++ server/user.h | 10 ++++++++++ server/window.c | 31 ++++++++++++++++++------------- 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/server/protocol.def b/server/protocol.def index 687fe6c..ccc87fe 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2405,7 +2405,7 @@ enum coords_relative user_handle_t window; /* handle to the window */ @REPLY data_size_t total_size; /* total size of the resulting region */ - VARARG(region,rectangles); /* list of rectangles for the region */ + VARARG(region,rectangles); /* list of rectangles for the region (in window coords) */ @END @@ -2413,7 +2413,7 @@ enum coords_relative @REQ(set_window_region) user_handle_t window; /* handle to the window */ int redraw; /* redraw the window? */ - VARARG(region,rectangles); /* list of rectangles for the region */ + VARARG(region,rectangles); /* list of rectangles for the region (in window coords) */ @END @@ -2449,7 +2449,7 @@ enum coords_relative @REQ(redraw_window) user_handle_t window; /* handle to the window */ unsigned int flags; /* RDW_* flags */ - VARARG(region,rectangles); /* list of rectangles for the region */ + VARARG(region,rectangles); /* list of rectangles for the region (in window coords) */ @END diff --git a/server/region.c b/server/region.c index 2efbd30..8b85c34 100644 --- a/server/region.c +++ b/server/region.c @@ -711,6 +711,29 @@ void offset_region( struct region *region, int x, int y ) region->extents.bottom += y; } +/* mirror a region relative to a window client rect */ +void mirror_region( const rectangle_t *client_rect, struct region *region ) +{ + int start, end, i, j; + + for (start = 0; start < region->num_rects; start = end + 1) + { + for (end = start; end < region->num_rects - 1; end++) + if (region->rects[end + 1].top != region->rects[end].top) break; + for (i = start, j = end; i < j; i++, j--) + { + rectangle_t rect = region->rects[j]; + region->rects[i] = region->rects[j]; + region->rects[j] = rect; + mirror_rect( client_rect, &region->rects[j] ); + mirror_rect( client_rect, &region->rects[i] ); + } + if (i == j) mirror_rect( client_rect, &region->rects[i] ); + } + mirror_rect( client_rect, &region->extents ); +} + + /* make a copy of a region; returns dst or NULL on error */ struct region *copy_region( struct region *dst, const struct region *src ) { diff --git a/server/user.h b/server/user.h index 1f0d909..6ac0398 100644 --- a/server/user.h +++ b/server/user.h @@ -114,6 +114,7 @@ extern rectangle_t *get_region_data_and_free( struct region *region, data_size_t extern int is_region_empty( const struct region *region ); extern void get_region_extents( const struct region *region, rectangle_t *rect ); extern void offset_region( struct region *region, int x, int y ); +extern void mirror_region( const rectangle_t *client_rect, struct region *region ); extern struct region *copy_region( struct region *dst, const struct region *src ); extern struct region *intersect_region( struct region *dst, const struct region *src1, const struct region *src2 ); @@ -164,4 +165,13 @@ extern void set_process_default_desktop( struct process *process, struct desktop extern void close_process_desktop( struct process *process ); extern void close_thread_desktop( struct thread *thread ); +/* mirror a rectangle respective to the window client area */ +static inline void mirror_rect( const rectangle_t *client_rect, rectangle_t *rect ) +{ + int width = client_rect->right - client_rect->left; + int tmp = rect->left; + rect->left = width - rect->right; + rect->right = width - tmp; +} + #endif /* __WINE_SERVER_USER_H */ diff --git a/server/window.c b/server/window.c index bb66a39..e3dc47a 100644 --- a/server/window.c +++ b/server/window.c @@ -905,16 +905,6 @@ static inline void offset_rect( rectangle_t *rect, int offset_x, int offset_y ) } -/* mirror a rectangle respective to the window client area */ -static inline void mirror_rect( const rectangle_t *window_rect, rectangle_t *rect ) -{ - int width = window_rect->right - window_rect->left; - int tmp = rect->left; - rect->left = width - rect->right; - rect->right = width - tmp; -} - - /* set the region to the client rect clipped by the window rect, in parent-relative coordinates */ static void set_region_client_rect( struct region *region, struct window *win ) { @@ -2314,15 +2304,28 @@ DECL_HANDLER(get_visible_region) /* get the window region */ DECL_HANDLER(get_window_region) { + rectangle_t *data; struct window *win = get_window( req->window ); if (!win) return; + if (!win->win_region) return; - if (win->win_region) + if (win->ex_style & WS_EX_LAYOUTRTL) { - rectangle_t *data = get_region_data( win->win_region, get_reply_max_size(), &reply->total_size ); - if (data) set_reply_data_ptr( data, reply->total_size ); + struct region *region = create_empty_region(); + + if (!region) return; + if (!copy_region( region, win->win_region )) + { + free_region( region ); + return; + } + mirror_region( &win->window_rect, region ); + data = get_region_data_and_free( region, get_reply_max_size(), &reply->total_size ); } + else data = get_region_data( win->win_region, get_reply_max_size(), &reply->total_size ); + + if (data) set_reply_data_ptr( data, reply->total_size ); } @@ -2338,6 +2341,7 @@ DECL_HANDLER(set_window_region) { if (!(region = create_region_from_req_data( get_req_data(), get_req_data_size() ))) return; + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_region( &win->window_rect, region ); } set_window_region( win, region, req->redraw ); } @@ -2458,6 +2462,7 @@ DECL_HANDLER(redraw_window) { if (!(region = create_region_from_req_data( get_req_data(), get_req_data_size() ))) return; + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_region( &win->client_rect, region ); } }

1 0

Alexandre Julliard : user32: Free the window region once it has been set.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 2f6d41de46e077f991ac5bc12cec440edf8f6625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f6d41de46e077f991ac5bc12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 21:06:43 2010 +0200 user32: Free the window region once it has been set. --- dlls/user32/winpos.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 17730f2..ca3b8e0 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -221,6 +221,7 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw ) if (!bRedraw) swp_flags |= SWP_NOREDRAW; SetWindowPos( hwnd, 0, 0, 0, 0, 0, swp_flags ); invalidate_dce( hwnd, NULL ); + if (hrgn) DeleteObject( hrgn ); } return ret; }

1 0

Alexandre Julliard : winex11: Mirror the window region for RTL windows.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 5594c4eba8c3027a7ba485820e9d7b694e888011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5594c4eba8c3027a7ba485820… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 21:06:38 2010 +0200 winex11: Mirror the window region for RTL windows. --- dlls/winex11.drv/window.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ec9bec2..68084d0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -474,8 +474,10 @@ static void sync_window_region( Display *display, struct x11drv_win_data *data, } else { - RGNDATA *pRegionData = X11DRV_GetRegionData( hrgn, 0 ); - if (pRegionData) + RGNDATA *pRegionData; + + if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) MirrorRgn( data->hwnd, hrgn ); + if ((pRegionData = X11DRV_GetRegionData( hrgn, 0 ))) { wine_tsx11_lock(); XShapeCombineRectangles( display, data->whole_window, ShapeBounding,

1 0

Alexandre Julliard : gdi32: Implement MirrorRgn.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 97611dca8b2690a4e0cc4df73a481ee899e2e99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97611dca8b2690a4e0cc4df73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 20:45:56 2010 +0200 gdi32: Implement MirrorRgn. --- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/region.c | 21 +++++++++++++++++++++ dlls/user32/tests/win.c | 20 ++++++++++++++++++-- include/wingdi.h | 1 + 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2855206..4901e13 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -363,7 +363,7 @@ @ stub LoadImageColorMatcherA @ stub LoadImageColorMatcherW @ stdcall MaskBlt(long long long long long long long long long long long long) -# @ stub MirrorRgn +@ stdcall MirrorRgn(long long) @ stdcall ModifyWorldTransform(long ptr long) @ stdcall MoveToEx(long long long ptr) @ stdcall NamedEscape(long wstr long long ptr long ptr) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 1f281c4..b37211f 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1516,6 +1516,27 @@ INT mirror_region( HRGN dst, HRGN src, INT width ) } /*********************************************************************** + * MirrorRgn (GDI32.@) + */ +BOOL WINAPI MirrorRgn( HWND hwnd, HRGN hrgn ) +{ + static const WCHAR user32W[] = {'u','s','e','r','3','2','.','d','l','l',0}; + static BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); + RECT rect; + + /* yes, a HWND in gdi32, don't ask */ + if (!pGetWindowRect) + { + HMODULE user32 = GetModuleHandleW(user32W); + if (!user32) return FALSE; + if (!(pGetWindowRect = (void *)GetProcAddress( user32, "GetWindowRect" ))) return FALSE; + } + pGetWindowRect( hwnd, &rect ); + return mirror_region( hrgn, hrgn, rect.right - rect.left ) != ERROR; +} + + +/*********************************************************************** * REGION_Coalesce * * Attempt to merge the rects in the current band with those in the diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f34025f..f1f590c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -58,6 +58,7 @@ static BOOL (WINAPI *pGetProcessDefaultLayout)( DWORD *layout ); static BOOL (WINAPI *pSetProcessDefaultLayout)( DWORD layout ); static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); +static BOOL (WINAPI *pMirrorRgn)(HWND hwnd, HRGN hrgn); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -6126,7 +6127,7 @@ static void test_winregion(void) { HWND hwnd; RECT r; - int ret; + int ret, width; HRGN hrgn; if (!pGetWindowRgnBox) @@ -6159,7 +6160,21 @@ static void test_winregion(void) ok( r.left == 2 && r.top == 3 && r.right == 10 && r.bottom == 15, "Expected (2,3,10,15), got (%d,%d,%d,%d)\n", r.left, r.top, r.right, r.bottom); - DeleteObject(hrgn); + if (pMirrorRgn) + { + hrgn = CreateRectRgn(2, 3, 10, 15); + ret = pMirrorRgn( hwnd, hrgn ); + ok( ret == TRUE, "MirrorRgn failed %u\n", ret ); + r.left = r.top = r.right = r.bottom = 0; + GetWindowRect( hwnd, &r ); + width = r.right - r.left; + r.left = r.top = r.right = r.bottom = 0; + ret = GetRgnBox( hrgn, &r ); + ok( ret == SIMPLEREGION, "GetRgnBox failed %u\n", ret ); + ok( r.left == width - 10 && r.top == 3 && r.right == width - 2 && r.bottom == 15, + "Wrong rectangle (%d,%d,%d,%d) for width %d\n", r.left, r.top, r.right, r.bottom, width ); + } + else win_skip( "MirrorRgn not supported\n" ); } DestroyWindow(hwnd); } @@ -6220,6 +6235,7 @@ START_TEST(win) pSetProcessDefaultLayout = (void *)GetProcAddress( user32, "SetProcessDefaultLayout" ); pGetLayout = (void *)GetProcAddress( gdi32, "GetLayout" ); pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); + pMirrorRgn = (void *)GetProcAddress( gdi32, "MirrorRgn" ); if (!RegisterWindowClasses()) assert(0); diff --git a/include/wingdi.h b/include/wingdi.h index fa68c23..e10bbe9 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3601,6 +3601,7 @@ WINGDIAPI BOOL WINAPI LineDDA(INT,INT,INT,INT,LINEDDAPROC,LPARAM); WINGDIAPI BOOL WINAPI LineTo(HDC,INT,INT); WINGDIAPI BOOL WINAPI LPtoDP(HDC,LPPOINT,INT); WINGDIAPI BOOL WINAPI MaskBlt(HDC,INT,INT,INT,INT,HDC,INT,INT,HBITMAP,INT,INT,DWORD); +WINGDIAPI BOOL WINAPI MirrorRgn(HWND,HRGN); WINGDIAPI BOOL WINAPI ModifyWorldTransform(HDC,const XFORM *, DWORD); WINGDIAPI BOOL WINAPI MoveToEx(HDC,INT,INT,LPPOINT); WINGDIAPI INT WINAPI OffsetClipRgn(HDC,INT,INT);

1 0

Detlef Riekenberg : inetcpl: German translation for the content property sheet.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 440cf085e4c126f522088559b9ac7936a4309d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=440cf085e4c126f522088559b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Sep 27 13:08:39 2010 +0200 inetcpl: German translation for the content property sheet. --- dlls/inetcpl.cpl/cpl_De.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_De.rc b/dlls/inetcpl.cpl/cpl_De.rc index 397f0cd..a5280a2 100644 --- a/dlls/inetcpl.cpl/cpl_De.rc +++ b/dlls/inetcpl.cpl/cpl_De.rc @@ -30,3 +30,18 @@ BEGIN IDS_CPL_NAME "Internet Einstellungen" IDS_CPL_INFO "Wine Internet Browser und zugehörige Einstellungen anpassen." END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Inhalte" +BEGIN + + GROUPBOX " Zertifikate ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Zertifikate werden benutzt, um sich persönlich, Zertifizierungsstellen und Herausgeber von Zertifikaten zu identifizieren.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Zertifikate...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Herausgeber... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Detlef Riekenberg : inetcpl: Add content property sheet.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: afe36a89faf740e83426277a974ff03e43abbf4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe36a89faf740e83426277a9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Sep 27 13:08:38 2010 +0200 inetcpl: Add content property sheet. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/content.c | 28 ++++++++++++++++++- dlls/inetcpl.cpl/cpl_En.rc | 17 ++++++++++- dlls/inetcpl.cpl/inetcpl.c | 63 +++++++++++++++++++++++++++++++++++++++++- dlls/inetcpl.cpl/inetcpl.h | 13 ++++++++ 5 files changed, 119 insertions(+), 3 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index c8a7543..12eb694 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -1,4 +1,5 @@ MODULE = inetcpl.cpl +IMPORTS = comctl32 user32 DELAYIMPORTS = cryptui C_SRCS = \ diff --git a/dlls/inetcpl.cpl/content.c b/dlls/inetcpl.cpl/content.c index 4cc0d75..10f2201 100644 --- a/dlls/inetcpl.cpl/content.c +++ b/dlls/inetcpl.cpl/content.c @@ -27,6 +27,7 @@ #include <winuser.h> #include <cryptuiapi.h> +#include "inetcpl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); @@ -57,7 +58,7 @@ static BOOL display_cert_manager(HWND parent, DWORD flags) * Launch a dialog to manage personal certificates * * PARAMS - * hWnd [I] Handle for the parrent window + * parent [I] Handle for the parent window * * RETURNS * Failure: FALSE @@ -71,3 +72,28 @@ BOOL WINAPI LaunchSiteCertDialog(HWND parent) { return display_cert_manager(parent, 0); } + +/********************************************************************* + * content_dlgproc [internal] + * + */ +INT_PTR CALLBACK content_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + + TRACE("(%p, 0x%08x/%d, 0x%lx, 0x%lx)\n", hwnd, msg, msg, wparam, lparam); + + if (msg == WM_COMMAND) + { + switch (LOWORD(wparam)) + { + case IDC_CERT: + display_cert_manager(hwnd, 0); + break; + + case IDC_CERT_PUBLISHER: + display_cert_manager(hwnd, CRYPTUI_CERT_MGR_PUBLISHER_TAB); + break; + } + } + return FALSE; +} diff --git a/dlls/inetcpl.cpl/cpl_En.rc b/dlls/inetcpl.cpl/cpl_En.rc index 9b2161f..651755d 100644 --- a/dlls/inetcpl.cpl/cpl_En.rc +++ b/dlls/inetcpl.cpl/cpl_En.rc @@ -1,5 +1,5 @@ /* - * Internet control panel applet + * English resources for the Internet control panel applet * * Copyright 2010 Detlef Riekenberg * @@ -28,3 +28,18 @@ BEGIN IDS_CPL_NAME "Internet Settings" IDS_CPL_INFO "Configure Wine Internet Browser and related settings" END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Content" +BEGIN + + GROUPBOX " Certificates ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Certificates are used for your personal identification and to identify certificate authorities and publishers.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Certificates...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Publishers... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index 5f14464..80decfb 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -24,6 +24,10 @@ #include <stdarg.h> #include <windef.h> #include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <commctrl.h> +#include <commdlg.h> #include <cpl.h> #include "wine/debug.h" @@ -33,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); +HMODULE hcpl; + /********************************************************************* * DllMain (inetcpl.@) */ @@ -47,10 +53,65 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); + hcpl = hdll; } return TRUE; } +/****************************************************************************** + * propsheet_callback [internal] + * + */ +static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam) +{ + + TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam); + switch (msg) + { + case PSCB_INITIALIZED: + SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM) LoadIconW(hcpl, MAKEINTRESOURCEW(ICO_MAIN))); + break; + } + return 0; +} + +/****************************************************************************** + * display_cpl_sheets [internal] + * + * Build and display the dialog with all control panel propertysheets + * + */ +static void display_cpl_sheets(HWND parent) +{ + PROPSHEETPAGEW psp[NUM_PROPERTY_PAGES]; + PROPSHEETHEADERW psh; + DWORD id = 0; + + ZeroMemory(&psh, sizeof(psh)); + ZeroMemory(psp, sizeof(psp)); + + /* Fill out all PROPSHEETPAGE */ + psp[id].dwSize = sizeof (PROPSHEETPAGEW); + psp[id].hInstance = hcpl; + psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONTENT); + psp[id].pfnDlgProc = content_dlgproc; + id++; + + /* Fill out the PROPSHEETHEADER */ + psh.dwSize = sizeof (PROPSHEETHEADERW); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; + psh.hwndParent = parent; + psh.hInstance = hcpl; + psh.u.pszIcon = MAKEINTRESOURCEW(ICO_MAIN); + psh.pszCaption = MAKEINTRESOURCEW(IDS_CPL_NAME); + psh.nPages = id; + psh.u3.ppsp = psp; + psh.pfnCallback = propsheet_callback; + + /* display the dialog */ + PropertySheetW(&psh); +} + /********************************************************************* * CPlApplet (inetcpl.@) * @@ -90,7 +151,7 @@ LONG CALLBACK CPlApplet(HWND hWnd, UINT command, LPARAM lParam1, LPARAM lParam2) } case CPL_DBLCLK: - FIXME("not implemented yet\n"); + display_cpl_sheets(hWnd); break; } diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index 4fe97f4..e1477ff 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -22,9 +22,22 @@ #include <windef.h> #include <winuser.h> + +extern HMODULE hcpl; +INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; + +#define NUM_PROPERTY_PAGES 8 + /* icons */ #define ICO_MAIN 100 /* strings */ #define IDS_CPL_NAME 1 #define IDS_CPL_INFO 2 + +/* dialogs */ +#define IDC_STATIC -1 + +#define IDD_CONTENT 4000 +#define IDC_CERT 4100 +#define IDC_CERT_PUBLISHER 4101

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010