April 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : widl: Support forward type declarations.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: cb32de6c1a01efba1145bab7f9cb8b8d5c43a589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb32de6c1a01efba1145bab7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 20:11:13 2011 +0100 widl: Support forward type declarations. (cherry picked from commit 7421bb0b61b708108a6005be541e1b1b293ca2de) --- tools/widl/parser.y | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index db071a7..39ebd7d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -381,8 +381,11 @@ statement: typedecl: enumdef + | tENUM aIDENTIFIER { $$ = type_new_enum($2, FALSE, NULL); } | structdef + | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, FALSE, NULL); } | uniondef + | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } | attributes enumdef { $$ = $2; $$->attrs = check_enum_attrs($1); } | attributes structdef { $$ = $2; $$->attrs = check_struct_attrs($1); } | attributes uniondef { $$ = $2; $$->attrs = check_union_attrs($1); }

1 0

Dmitry Timoshkov : winex11.drv: Associate the real DC transformation with cached font data.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: d25f3221c26a18fa718e2ef1b4dd69f3fdc0274a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25f3221c26a18fa718e2ef1b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 24 18:40:13 2011 +0800 winex11.drv: Associate the real DC transformation with cached font data. This matches what WineEngCreateFontInstance() does, and makes applications which set custom axes directions using different window/viewport extents display text correctly. (cherry picked from commit 3e850b5b1439032f0e396a91169442da8e4786c9) --- dlls/winex11.drv/xrender.c | 6 +++++- include/wingdi.h | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index f0ec1b1..fde0b91 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1066,7 +1066,11 @@ BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont) lfsz.lf.lfWidth = abs( lfsz.lf.lfWidth ); lfsz.devsize.cx = X11DRV_XWStoDS( physDev, lfsz.lf.lfWidth ); lfsz.devsize.cy = X11DRV_YWStoDS( physDev, lfsz.lf.lfHeight ); - GetWorldTransform( physDev->hdc, &lfsz.xform ); + + GetTransform( physDev->hdc, 0x204, &lfsz.xform ); + TRACE("font transform %f %f %f %f\n", lfsz.xform.eM11, lfsz.xform.eM12, + lfsz.xform.eM21, lfsz.xform.eM22); + /* Not used fields, would break hashing */ lfsz.xform.eDx = lfsz.xform.eDy = 0; diff --git a/include/wingdi.h b/include/wingdi.h index 53db856..d39bd42 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3588,6 +3588,7 @@ WINGDIAPI INT WINAPI GetTextFaceW(HDC,INT,LPWSTR); WINGDIAPI BOOL WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA); WINGDIAPI BOOL WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW); #define GetTextMetrics WINELIB_NAME_AW(GetTextMetrics) +WINGDIAPI BOOL WINAPI GetTransform(HDC,DWORD,XFORM*); WINGDIAPI BOOL WINAPI GetViewportExtEx(HDC,LPSIZE); WINGDIAPI BOOL WINAPI GetViewportOrgEx(HDC,LPPOINT); WINGDIAPI BOOL WINAPI GetWindowExtEx(HDC,LPSIZE);

1 0

Huw Davies : widl: Don't dereference if the referenced type is a user type.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 2238058eda8c85d5240cc51b6abbd492f6e8fc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2238058eda8c85d5240cc51b6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 3 11:53:30 2011 +0000 widl: Don't dereference if the referenced type is a user type. (cherry picked from commit d8d963a9c3701a6a899f4f1f6fd2f8fe3fca63da) --- tools/widl/typegen.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e3ea458..c4e51cd 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1485,8 +1485,12 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs if (out_attr && !in_attr && pointer_type == RPC_FC_RP) flags |= RPC_FC_P_ONSTACK; - if (is_ptr(type) && is_declptr(type_pointer_get_ref(type))) - flags |= RPC_FC_P_DEREF; + if (is_ptr(type)) + { + type_t *ref = type_pointer_get_ref(type); + if(is_declptr(ref) && !is_user_type(ref)) + flags |= RPC_FC_P_DEREF; + } print_file(file, 2, "0x%x, 0x%x,\t\t/* %s", pointer_type,

1 0

Huw Davies : widl: Initialise [out] only parameters if they are user types or interface pointers.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 4cfa6a46593863098fa68cf34015dc2ceae78ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cfa6a46593863098fa68cf34… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 2 12:16:29 2011 +0000 widl: Initialise [out] only parameters if they are user types or interface pointers. (cherry picked from commit 5ae2b0f219cb5aed2bdf32746a57a699a32767a2) --- tools/widl/typegen.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8541c5a..e3ea458 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4038,12 +4038,15 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char case TGT_ENUM: case TGT_POINTER: case TGT_RANGE: + case TGT_IFACE_POINTER: print_file(file, indent, "%s_W%u = 0;\n", local_var_prefix, i); break; + case TGT_USER_TYPE: + print_file(file, indent, "memset(&%s_W%u, 0, sizeof(%s_W%u));\n", + local_var_prefix, i, local_var_prefix, i); + break; case TGT_STRUCT: case TGT_UNION: - case TGT_USER_TYPE: - case TGT_IFACE_POINTER: case TGT_ARRAY: case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER:

1 0

Dmitry Timoshkov : winex11.drv: Make sure that default clipping region exists before calling ExcludeUpdateRgn ().
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 9d9570453a05f7bbaaf7a91a6f520e6a4af6ff9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9570453a05f7bbaaf7a91a6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 31 19:30:43 2011 +0800 winex11.drv: Make sure that default clipping region exists before calling ExcludeUpdateRgn(). (cherry picked from commit 38167e71d1ccff264d269c3bee7e1a448871829a) --- dlls/winex11.drv/window.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 18a86b2..ef515ee 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1600,7 +1600,7 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect RECT dst_rect = *new_rect; HDC hdc_src, hdc_dst; INT code; - HRGN rgn = 0; + HRGN rgn; HWND parent = 0; if (!data->whole_window) @@ -1619,6 +1619,9 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect hdc_src = hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE ); } + rgn = CreateRectRgnIndirect( &dst_rect ); + SelectClipRgn( hdc_dst, rgn ); + DeleteObject( rgn ); ExcludeUpdateRgn( hdc_dst, data->hwnd ); code = X11DRV_START_EXPOSURES; @@ -1631,6 +1634,7 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, hdc_src, src_rect.left, src_rect.top, SRCCOPY ); + rgn = 0; code = X11DRV_END_EXPOSURES; ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, sizeof(rgn), (LPSTR)&rgn );

1 0

Nicholas Niro : winex11.drv: Add proper initialization for border_pixel.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: d8a4de2f303c47de6b0134692af14d861a10bf13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a4de2f303c47de6b0134692… Author: Nicholas Niro <nik_89(a)neuroponic.com> Date: Mon Feb 14 23:28:18 2011 -0500 winex11.drv: Add proper initialization for border_pixel. (cherry picked from commit 7aff865e8e1890929c15bc91a39f4fb11a46d9eb) --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3869619..fec5cd9 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -311,6 +311,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) attr.override_redirect = True; attr.colormap = None; + attr.border_pixel = 0; wine_tsx11_lock(); @@ -337,7 +338,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) if (vis->visual != DefaultVisual( gdi_display, vis->screen )) attr.colormap = XCreateColormap( gdi_display, root, vis->visual, AllocNone ); if ((win = XCreateWindow( gdi_display, root, -1, -1, 1, 1, 0, vis->depth, InputOutput, - vis->visual, CWOverrideRedirect | CWColormap, &attr ))) + vis->visual, CWBorderPixel | CWOverrideRedirect | CWColormap, &attr ))) XMapWindow( gdi_display, win ); else win = root;

1 0

Alexandre Julliard : server: Create anonymous file mappings in the config directory if the server directory is mounted noexec .
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: a4a0226c54ba25c05d94a660bb014fe2e176c3d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a0226c54ba25c05d94a660b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 17:23:45 2011 +0100 server: Create anonymous file mappings in the config directory if the server directory is mounted noexec. (cherry picked from commit 8dbd06a1f8ab3f89e46be62e05a51f4b15f20b1c) --- server/mapping.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 1cf53b9..ca88ca3 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -26,6 +26,9 @@ #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> +#ifdef HAVE_SYS_MMAN_H +# include <sys/mman.h> +#endif #include <unistd.h> #include "ntstatus.h" @@ -161,13 +164,47 @@ static int grow_file( int unix_fd, file_pos_t new_size ) return 0; } +/* check if the current directory allows exec mappings */ +static int check_current_dir_for_exec(void) +{ + int fd; + char tmpfn[] = "anonmap.XXXXXX"; + void *ret = MAP_FAILED; + + fd = mkstemps( tmpfn, 0 ); + if (fd == -1) return 0; + if (grow_file( fd, 1 )) + { + ret = mmap( NULL, get_page_size(), PROT_READ | PROT_EXEC, MAP_PRIVATE, fd, 0 ); + if (ret != MAP_FAILED) munmap( ret, get_page_size() ); + } + close( fd ); + unlink( tmpfn ); + return (ret != MAP_FAILED); +} + /* create a temp file for anonymous mappings */ static int create_temp_file( file_pos_t size ) { - char tmpfn[16]; + static int temp_dir_fd = -1; + char tmpfn[] = "anonmap.XXXXXX"; int fd; - sprintf( tmpfn, "anonmap.XXXXXX" ); /* create it in the server directory */ + if (temp_dir_fd == -1) + { + temp_dir_fd = server_dir_fd; + if (!check_current_dir_for_exec()) + { + /* the server dir is noexec, try the config dir instead */ + fchdir( config_dir_fd ); + if (check_current_dir_for_exec()) + temp_dir_fd = config_dir_fd; + else /* neither works, fall back to server dir */ + fchdir( server_dir_fd ); + } + } + else if (temp_dir_fd != server_dir_fd) fchdir( temp_dir_fd ); + fd = mkstemps( tmpfn, 0 ); if (fd != -1) { @@ -179,6 +216,8 @@ static int create_temp_file( file_pos_t size ) unlink( tmpfn ); } else file_set_error(); + + if (temp_dir_fd != server_dir_fd) fchdir( server_dir_fd ); return fd; }

1 0

Alexandre Julliard : winebuild: Don't remove stdcall decorations on non-x86 .
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 26dcc7f1c8eed925df5b92be44482fad23f827ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=26dcc7f1c8eed925df5b92be4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 17:39:45 2011 +0100 winebuild: Don't remove stdcall decorations on non-x86. (cherry picked from commit a5decb5444b3f371528aa40a67e3734375748c09) --- tools/winebuild/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 75568d6..91e3c1f 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -587,6 +587,7 @@ int remove_stdcall_decoration( char *name ) { char *p, *end = strrchr( name, '@' ); if (!end || !end[1] || end == name) return -1; + if (target_cpu != CPU_x86) return -1; /* make sure all the rest is digits */ for (p = end + 1; *p; p++) if (!isdigit(*p)) return -1; *end = 0;

1 0

Ken Thomases : mountmgr: Balance volume references in add_volume().
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 33e5502034617e98a1db1c19e90597c740a7be3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e5502034617e98a1db1c19e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 31 17:07:16 2011 -0600 mountmgr: Balance volume references in add_volume(). (cherry picked from commit 8a38fbcacc5e4284038787296ea9ea57516a6004) --- dlls/mountmgr.sys/device.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 6c182e8..8709472 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -666,7 +666,11 @@ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_poin EnterCriticalSection( &device_section ); LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) - if (volume->udi && !strcmp( udi, volume->udi )) goto found; + if (volume->udi && !strcmp( udi, volume->udi )) + { + grab_volume( volume ); + goto found; + } /* udi not found, search for a non-dynamic volume */ if ((volume = find_matching_volume( udi, device, mount_point, type ))) set_volume_udi( volume, udi );

1 0

Ken Thomases : iphlpapi: Enable non-privileged ICMP (ping) on Mac OS X.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 85f3c4cdf8d149cbf617ebada31de523035abdb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f3c4cdf8d149cbf617ebada… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Feb 11 16:02:02 2011 -0600 iphlpapi: Enable non-privileged ICMP (ping) on Mac OS X. (cherry picked from commit d52f95cec83eb9da252df431fd93c4682ff4ec0c) --- dlls/iphlpapi/icmp.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index d8ee101..2b76041 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -153,6 +153,11 @@ HANDLE WINAPI IcmpCreateFile(VOID) icmp_t* icp; int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); + if (sid < 0) + { + /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ + sid=socket(AF_INET,SOCK_DGRAM,IPPROTO_ICMP); + } if (sid < 0) { ERR_(winediag)("Failed to use ICMP (network ping), this requires special permissions.\n"); SetLastError(ERROR_ACCESS_DENIED);

1 0