February 2013 - Wine-Commits

Alexandre Julliard : user32/tests: Define the required Windows version before including anything.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 3369c532028e2b8f156f16480d5be7639bc70cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3369c532028e2b8f156f16480… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 12:31:50 2013 +0100 user32/tests: Define the required Windows version before including anything. --- dlls/user32/tests/dialog.c | 4 ++-- dlls/user32/tests/sysparams.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 0ebab4c..145b20f 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -29,12 +29,12 @@ * normally be met. */ +#define WINVER 0x0600 /* For NONCLIENTMETRICS with padding */ + #include <assert.h> #include <stdio.h> #include <stdarg.h> -#define WINVER 0x0600 /* For NONCLIENTMETRICS with padding */ - #include "wine/test.h" #include "windef.h" #include "winbase.h" diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index ad43cb7..d4704fa 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -17,16 +17,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _WIN32_WINNT 0x0600 /* For SPI_GETMOUSEHOVERWIDTH and more */ +#define _WIN32_IE 0x0700 +#define WINVER 0x0600 /* For COLOR_MENUBAR, NONCLIENTMETRICS with padding */ + #include <assert.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 /* For SPI_GETMOUSEHOVERWIDTH and more */ -#define _WIN32_IE 0x0700 -#define WINVER 0x0600 /* For COLOR_MENUBAR, NONCLIENTMETRICS with padding */ - #include "wine/test.h" #include "windef.h" #include "winbase.h"

1 0

Dmitry Timoshkov : gdiplus: Avoid a devision by zero when a being added segment length is 0.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 22a7458a3f5fdd060bc6ae9c26e5b98adcd6bc44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a7458a3f5fdd060bc6ae9c2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 17:32:12 2013 +0800 gdiplus: Avoid a devision by zero when a being added segment length is 0. This sometimes happens after GdipAddPathLine + GdipWidenPath. --- dlls/gdiplus/graphicspath.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 1fbebba..f4d1a4b 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1702,6 +1702,13 @@ static void add_bevel_point(const GpPointF *endpoint, const GpPointF *nextpoint, REAL distance = pen->width/2.0; REAL bevel_dx, bevel_dy; + if (segment_length == 0.0) + { + *last_point = add_path_list_node(*last_point, endpoint->X, + endpoint->Y, PathPointTypeLine); + return; + } + if (right_side) { bevel_dx = -distance * segment_dy / segment_length;

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawLineI to GdipDrawLine.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 7cccd36c9ab047cfbbfc17daa224f6344b49abb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cccd36c9ab047cfbbfc17daa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 11:37:40 2013 +0800 gdiplus: Forward GdipDrawLineI to GdipDrawLine. --- dlls/gdiplus/graphics.c | 29 +---------------------------- 1 files changed, 1 insertions(+), 28 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 667ead3..bc8b7da 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3539,36 +3539,9 @@ GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics, GpPen *pen, REAL x1, GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2) { - INT save_state; - GpPointF pt[2]; - GpStatus retval; - TRACE("(%p, %p, %d, %d, %d, %d)\n", graphics, pen, x1, y1, x2, y2); - if(!pen || !graphics) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - pt[0].X = (REAL)x1; - pt[0].Y = (REAL)y1; - pt[1].X = (REAL)x2; - pt[1].Y = (REAL)y2; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, pt, 2, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawLine(graphics, pen, (REAL)x1, (REAL)y1, (REAL)x2, (REAL)y2); } GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST

1 0

Ken Thomases : include/wingdi.h: Add definitions for DEVMODE display fixed output flags and values.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: ef2b8a1e8e6afb3525991befc98cd2e9db251193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2b8a1e8e6afb3525991befc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:38 2013 -0600 include/wingdi.h: Add definitions for DEVMODE display fixed output flags and values. --- include/wingdi.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index ca98b3e..408a1b1 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3027,6 +3027,7 @@ DECL_WINELIB_TYPE_AW(LPDEVMODE) #define DM_DITHERTYPE __MSABI_LONG(0x04000000) #define DM_PANNINGWIDTH __MSABI_LONG(0x08000000) #define DM_PANNINGHEIGHT __MSABI_LONG(0x10000000) +#define DM_DISPLAYFIXEDOUTPUT __MSABI_LONG(0x20000000) #define DM_GRAYSCALE 1 #define DM_INTERLACED 2 @@ -3224,6 +3225,10 @@ DECL_WINELIB_TYPE_AW(LPDEVMODE) #define DMDO_180 2 #define DMDO_270 3 +#define DMDFO_DEFAULT 0 +#define DMDFO_STRETCH 1 +#define DMDFO_CENTER 2 + typedef struct { INT cbSize;

1 0

Ken Thomases : winemac: Use only on-screen windows for Cocoa parent ( Win32 owner) and ordering sibling.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 3799acb3ac8968353c3d8b2ce23f0834c970a098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3799acb3ac8968353c3d8b2ce… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:23 2013 -0600 winemac: Use only on-screen windows for Cocoa parent (Win32 owner) and ordering sibling. --- dlls/winemac.drv/window.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 7a7eda7..65f7955 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -303,10 +303,12 @@ static void release_win_data(struct macdrv_win_data *data) * * Return the Mac window associated with the full area of a window */ -static macdrv_window macdrv_get_cocoa_window(HWND hwnd) +static macdrv_window macdrv_get_cocoa_window(HWND hwnd, BOOL require_on_screen) { struct macdrv_win_data *data = get_win_data(hwnd); - macdrv_window ret = data ? data->cocoa_window : NULL; + macdrv_window ret = NULL; + if (data && (data->on_screen || !require_on_screen)) + ret = data->cocoa_window; release_win_data(data); return ret; } @@ -330,7 +332,7 @@ static void set_cocoa_window_properties(struct macdrv_win_data *data) ex_style = GetWindowLongW(data->hwnd, GWL_EXSTYLE); owner = GetWindow(data->hwnd, GW_OWNER); - owner_win = macdrv_get_cocoa_window(owner); + owner_win = macdrv_get_cocoa_window(owner, TRUE); macdrv_set_cocoa_parent_window(data->cocoa_window, owner_win); get_cocoa_window_features(data, style, ex_style, &wf); @@ -698,14 +700,14 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags) /* find window that this one must be after */ HWND prev = GetWindow(data->hwnd, GW_HWNDPREV); while (prev && !((GetWindowLongW(prev, GWL_STYLE) & WS_VISIBLE) && - (prev_window = macdrv_get_cocoa_window(prev)))) + (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) prev = GetWindow(prev, GW_HWNDPREV); if (!prev_window) { /* find window that this one must be before */ next = GetWindow(data->hwnd, GW_HWNDNEXT); while (next && !((GetWindowLongW(next, GWL_STYLE) & WS_VISIBLE) && - (next_window = macdrv_get_cocoa_window(next)))) + (next_window = macdrv_get_cocoa_window(next, TRUE)))) next = GetWindow(next, GW_HWNDNEXT); } @@ -988,7 +990,7 @@ void CDECL macdrv_SetWindowText(HWND hwnd, LPCWSTR text) TRACE("%p, %s\n", hwnd, debugstr_w(text)); - if ((win = macdrv_get_cocoa_window(hwnd))) + if ((win = macdrv_get_cocoa_window(hwnd, FALSE))) macdrv_set_cocoa_window_title(win, text, strlenW(text)); }

1 0

Ken Thomases : winemac: Don't set Cocoa window frame to be zero-sized.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: d74e90080ab1b8820d15b84ab3dce6fe9b4c0568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74e90080ab1b8820d15b84ab… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:19 2013 -0600 winemac: Don't set Cocoa window frame to be zero-sized. --- dlls/winemac.drv/cocoa_window.m | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 2247d32..d8ea9ed 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -429,14 +429,17 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self doOrderOut]; } - oldFrame = [self frame]; - frame = [self frameRectForContentRect:contentRect]; - if (!NSEqualRects(frame, oldFrame)) + if (!NSIsEmptyRect(contentRect)) { - if (NSEqualSizes(frame.size, oldFrame.size)) - [self setFrameOrigin:frame.origin]; - else - [self setFrame:frame display:YES]; + oldFrame = [self frame]; + frame = [self frameRectForContentRect:contentRect]; + if (!NSEqualRects(frame, oldFrame)) + { + if (NSEqualSizes(frame.size, oldFrame.size)) + [self setFrameOrigin:frame.origin]; + else + [self setFrame:frame display:YES]; + } } if (on_screen)

1 0

Andrew Talbot : msi: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 40f3a9fa590b1e4ab785509bb389efbe4f59e964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40f3a9fa590b1e4ab785509bb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 16 21:09:17 2013 +0000 msi: Avoid signed-unsigned integer comparisons. --- dlls/msi/package.c | 8 +++++--- dlls/msi/suminfo.c | 2 +- dlls/msi/where.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 385000c..bcda102 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -154,7 +154,6 @@ void msi_free_action_script( MSIPACKAGE *package, UINT script ) static void free_package_structures( MSIPACKAGE *package ) { - INT i; struct list *item, *cursor; LIST_FOR_EACH_SAFE( item, cursor, &package->features ) @@ -283,11 +282,14 @@ static void free_package_structures( MSIPACKAGE *package ) if (package->script) { + INT i; + UINT j; + for (i = 0; i < SCRIPT_MAX; i++) msi_free_action_script( package, i ); - for (i = 0; i < package->script->UniqueActionsCount; i++) - msi_free( package->script->UniqueActions[i] ); + for (j = 0; j < package->script->UniqueActionsCount; j++) + msi_free( package->script->UniqueActions[j] ); msi_free( package->script->UniqueActions ); msi_free( package->script ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index e0c99b8..363f683 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -922,7 +922,7 @@ static UINT parse_prop( LPCWSTR prop, LPCWSTR value, UINT *pid, INT *int_value, UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) { UINT r = ERROR_FUNCTION_FAILED; - DWORD i, j; + int i, j; MSISUMMARYINFO *si; si = MSI_GetSummaryInformationW( db->storage, num_records * (num_columns / 2) ); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 10c4b37..e3bc9b7 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -770,7 +770,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) JOINTABLE *table = wv->tables; UINT *rows; JOINTABLE **ordered_tables; - int i = 0; + UINT i = 0; TRACE("%p %p\n", wv, record); @@ -1052,7 +1052,7 @@ static UINT WHERE_sort(struct tagMSIVIEW *view, column_info *columns) column_info *column = columns; MSIORDERINFO *orderinfo; UINT r, count = 0; - int i; + UINT i; TRACE("%p %p\n", view, columns);

1 0

Alexandre Julliard : gdi32/tests: Define the required Windows version before including anything.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: eaf78eadf08b5057b0aeff0e76e71e1c3566b354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf78eadf08b5057b0aeff0e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 12:31:40 2013 +0100 gdi32/tests: Define the required Windows version before including anything. --- dlls/gdi32/tests/dc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index e47a091..5f19370 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -20,13 +20,13 @@ */ -#include <assert.h> -#include <stdio.h> - #define WINVER 0x0501 /* request latest DEVMODE */ #define NONAMELESSSTRUCT #define NONAMELESSUNION +#include <assert.h> +#include <stdio.h> + #include "wine/test.h" #include "winbase.h" #include "wingdi.h"

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawLinesI to GdipDrawLines.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 8ec2354b32ac2d807c453ad9620869afadd96184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec2354b32ac2d807c453ad96… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 11:38:06 2013 +0800 gdiplus: Forward GdipDrawLinesI to GdipDrawLines. --- dlls/gdiplus/graphics.c | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bc8b7da..b9aa912 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3576,25 +3576,12 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPoint *points, INT count) { - INT save_state; GpStatus retval; - GpPointF *ptf = NULL; + GpPointF *ptf; int i; TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); - if(!pen || !graphics || (count < 2)) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - ptf = GdipAlloc(count * sizeof(GpPointF)); if(!ptf) return OutOfMemory; @@ -3603,11 +3590,7 @@ GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST ptf[i].Y = (REAL) points[i].Y; } - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, ptf, count, TRUE); - - restore_dc(graphics, save_state); + retval = GdipDrawLines(graphics, pen, ptf, count); GdipFree(ptf); return retval;

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawLine to GdipDrawLines.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 0ed65a2d3aee55851eb7ebe3d57c66f330a22ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed65a2d3aee55851eb7ebe3d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 11:37:19 2013 +0800 gdiplus: Forward GdipDrawLine to GdipDrawLines. --- dlls/gdiplus/graphics.c | 23 +---------------------- 1 files changed, 1 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 659c46b..667ead3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3525,36 +3525,15 @@ GpStatus WINGDIPAPI GdipDrawImageRectI(GpGraphics *graphics, GpImage *image, GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2) { - INT save_state; GpPointF pt[2]; - GpStatus retval; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x1, y1, x2, y2); - if(!pen || !graphics) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2; pt[1].Y = y2; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, pt, 2, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawLines(graphics, pen, pt, 2); } GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1,

1 0

Andrew Talbot : msvcp90: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 51a79287c0dd7327e55796e26ed6fe10f8ea3f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a79287c0dd7327e55796e26… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 16 21:09:21 2013 +0000 msvcp90: Avoid signed-unsigned integer comparisons. --- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index eab867b..87ad06e 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2533,7 +2533,7 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); - int mode_idx; + unsigned int mode_idx; FILE *f = NULL; TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 8b3df21..bacf26c 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -195,7 +195,7 @@ unsigned short __cdecl wctype(const char *property) { "upper", _UPPER }, { "xdigit", _HEX } }; - int i; + unsigned int i; for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) if(!strcmp(property, properties[i].name))

1 0

Alexandre Julliard : rpcrt4/tests: Define the required Windows version before including anything.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 38e8f6d83f78e18a3bf9529c7af8ee629730d16c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e8f6d83f78e18a3bf9529c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 12:31:58 2013 +0100 rpcrt4/tests: Define the required Windows version before including anything. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ac3bacc..cc3e1d3 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - #define _WIN32_WINNT 0x0500 #define NTDDI_WIN2K 0x05000000 #define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ +#include <stdarg.h> + #include "wine/test.h" #include <windef.h> #include <winbase.h>

1 0

Dmitry Timoshkov : include/gdiplusenums.h: Add FlatnessDefault definition.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 9bcd1cdd3141dbfaa47432f92a309c4109080ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcd1cdd3141dbfaa47432f92… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 17:31:48 2013 +0800 include/gdiplusenums.h: Add FlatnessDefault definition. --- include/gdiplusenums.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index d0fc11b..c730a0c 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -704,6 +704,8 @@ enum EmfPlusRecordType { EmfPlusRecordTypeMin = EmfPlusRecordTypeHeader }; +#define FlatnessDefault 0.25f + #ifndef __cplusplus typedef enum Unit Unit;

1 0

Ken Thomases : winemac: Implement ChangeDisplaySettingsEx().
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: d26a6bf45120865e696c1f68e59f8c60f7eb0716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26a6bf45120865e696c1f68e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:49 2013 -0600 winemac: Implement ChangeDisplaySettingsEx(). --- dlls/winemac.drv/cocoa_app.h | 3 + dlls/winemac.drv/cocoa_app.m | 167 +++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 11 ++- dlls/winemac.drv/display.c | 241 ++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/macdrv_cocoa.h | 5 + dlls/winemac.drv/winemac.drv.spec | 1 + 7 files changed, 422 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d26a6bf45120865e696c1…

1 0

Ken Thomases : winemac: Implement EnumDisplaySettingsEx().
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 4f4ac0cafcf0a1db61939bd146d8f6d077b3be7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4ac0cafcf0a1db61939bd14… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:42 2013 -0600 winemac: Implement EnumDisplaySettingsEx(). --- dlls/winemac.drv/display.c | 221 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 222 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 2a96631..afa0646 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -23,10 +23,22 @@ #include "macdrv.h" #include "winuser.h" +#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(display); +static CFArrayRef modes; +static CRITICAL_SECTION modes_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &modes_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": modes_section") } +}; +static CRITICAL_SECTION modes_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + + static inline HMONITOR display_id_to_monitor(CGDirectDisplayID display_id) { return (HMONITOR)(UINT_PTR)display_id; @@ -38,6 +50,73 @@ static inline CGDirectDisplayID monitor_to_display_id(HMONITOR handle) } +static BOOL get_display_device_reg_key(char *key, unsigned len) +{ + static const char display_device_guid_prop[] = "__wine_display_device_guid"; + static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; + static const char display0[] = "}\\0000"; + ATOM guid_atom; + + assert(len >= sizeof(video_path) + sizeof(display0) + 40); + + guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); + if (!guid_atom) return FALSE; + + memcpy(key, video_path, sizeof(video_path)); + + if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) + return FALSE; + + strcat(key, display0); + + TRACE("display device key %s\n", wine_dbgstr_a(key)); + return TRUE; +} + + +static BOOL read_registry_settings(DEVMODEW *dm) +{ + char wine_mac_reg_key[128]; + HKEY hkey; + DWORD type, size; + BOOL ret = TRUE; + + dm->dmFields = 0; + + if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + return FALSE; + + if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + return FALSE; + +#define query_value(name, data) \ + size = sizeof(DWORD); \ + if (RegQueryValueExA(hkey, name, 0, &type, (LPBYTE)(data), &size) || \ + type != REG_DWORD || size != sizeof(DWORD)) \ + ret = FALSE + + query_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); + dm->dmFields |= DM_BITSPERPEL; + query_value("DefaultSettings.XResolution", &dm->dmPelsWidth); + dm->dmFields |= DM_PELSWIDTH; + query_value("DefaultSettings.YResolution", &dm->dmPelsHeight); + dm->dmFields |= DM_PELSHEIGHT; + query_value("DefaultSettings.VRefresh", &dm->dmDisplayFrequency); + dm->dmFields |= DM_DISPLAYFREQUENCY; + query_value("DefaultSettings.Flags", &dm->dmDisplayFlags); + dm->dmFields |= DM_DISPLAYFLAGS; + query_value("DefaultSettings.XPanning", &dm->dmPosition.x); + query_value("DefaultSettings.YPanning", &dm->dmPosition.y); + query_value("DefaultSettings.Orientation", &dm->dmDisplayOrientation); + query_value("DefaultSettings.FixedOutput", &dm->dmDisplayFixedOutput); + +#undef query_value + + RegCloseKey(hkey); + return ret; +} + + static int display_mode_bits_per_pixel(CGDisplayModeRef display_mode) { CFStringRef pixel_encoding; @@ -144,6 +223,148 @@ BOOL CDECL macdrv_EnumDisplayMonitors(HDC hdc, LPRECT rect, MONITORENUMPROC proc /*********************************************************************** + * EnumDisplaySettingsEx (MACDRV.@) + * + */ +BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, + LPDEVMODEW devmode, DWORD flags) +{ + static const WCHAR dev_name[CCHDEVICENAME] = + { 'W','i','n','e',' ','M','a','c',' ','d','r','i','v','e','r',0 }; + struct macdrv_display *displays = NULL; + int num_displays; + CGDisplayModeRef display_mode; + double rotation; + uint32_t io_flags; + + TRACE("%s, %u, %p + %hu, %08x\n", debugstr_w(devname), mode, devmode, devmode->dmSize, flags); + + memcpy(devmode->dmDeviceName, dev_name, sizeof(dev_name)); + devmode->dmSpecVersion = DM_SPECVERSION; + devmode->dmDriverVersion = DM_SPECVERSION; + devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); + devmode->dmDriverExtra = 0; + memset(&devmode->dmFields, 0, devmode->dmSize - FIELD_OFFSET(DEVMODEW, dmFields)); + + if (mode == ENUM_REGISTRY_SETTINGS) + { + TRACE("mode %d (registry) -- getting default mode\n", mode); + return read_registry_settings(devmode); + } + + if (macdrv_get_displays(&displays, &num_displays)) + goto failed; + + if (mode == ENUM_CURRENT_SETTINGS) + { + TRACE("mode %d (current) -- getting current mode\n", mode); + display_mode = CGDisplayCopyDisplayMode(displays[0].displayID); + } + else + { + EnterCriticalSection(&modes_section); + + if (mode == 0 || !modes) + { + if (modes) CFRelease(modes); + modes = CGDisplayCopyAllDisplayModes(displays[0].displayID, NULL); + } + + display_mode = NULL; + if (modes) + { + if (flags & EDS_RAWMODE) + { + if (mode < CFArrayGetCount(modes)) + display_mode = (CGDisplayModeRef)CFRetain(CFArrayGetValueAtIndex(modes, mode)); + } + else + { + DWORD count, i, safe_modes = 0; + count = CFArrayGetCount(modes); + for (i = 0; i < count; i++) + { + CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + io_flags = CGDisplayModeGetIOFlags(candidate); + if ((io_flags & kDisplayModeValidFlag) && + (io_flags & kDisplayModeSafeFlag)) + { + safe_modes++; + if (safe_modes > mode) + { + display_mode = (CGDisplayModeRef)CFRetain(candidate); + break; + } + } + } + } + } + + LeaveCriticalSection(&modes_section); + } + + if (!display_mode) + goto failed; + + /* We currently only report modes for the primary display, so it's at (0, 0). */ + devmode->dmPosition.x = 0; + devmode->dmPosition.y = 0; + devmode->dmFields |= DM_POSITION; + + rotation = CGDisplayRotation(displays[0].displayID); + devmode->dmDisplayOrientation = ((int)((rotation / 90) + 0.5)) % 4; + devmode->dmFields |= DM_DISPLAYORIENTATION; + + io_flags = CGDisplayModeGetIOFlags(display_mode); + if (io_flags & kDisplayModeStretchedFlag) + devmode->dmDisplayFixedOutput = DMDFO_STRETCH; + else + devmode->dmDisplayFixedOutput = DMDFO_CENTER; + devmode->dmFields |= DM_DISPLAYFIXEDOUTPUT; + + devmode->dmBitsPerPel = display_mode_bits_per_pixel(display_mode); + if (devmode->dmBitsPerPel) + devmode->dmFields |= DM_BITSPERPEL; + + devmode->dmPelsWidth = CGDisplayModeGetWidth(display_mode); + devmode->dmPelsHeight = CGDisplayModeGetHeight(display_mode); + devmode->dmFields |= DM_PELSWIDTH | DM_PELSHEIGHT; + + devmode->dmDisplayFlags = 0; + if (io_flags & kDisplayModeInterlacedFlag) + devmode->dmDisplayFlags |= DM_INTERLACED; + devmode->dmFields |= DM_DISPLAYFLAGS; + + devmode->dmDisplayFrequency = CGDisplayModeGetRefreshRate(display_mode); + if (!devmode->dmDisplayFrequency) + devmode->dmDisplayFrequency = 60; + devmode->dmFields |= DM_DISPLAYFREQUENCY; + + CFRelease(display_mode); + macdrv_free_displays(displays); + + TRACE("mode %d -- %dx%dx%dbpp @%d Hz", mode, + devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel, + devmode->dmDisplayFrequency); + if (devmode->dmDisplayOrientation) + TRACE(" rotated %u degrees", devmode->dmDisplayOrientation * 90); + if (devmode->dmDisplayFixedOutput == DMDFO_STRETCH) + TRACE(" stretched"); + if (devmode->dmDisplayFlags & DM_INTERLACED) + TRACE(" interlaced"); + TRACE("\n"); + + return TRUE; + +failed: + TRACE("mode %d -- not present\n", mode); + if (displays) macdrv_free_displays(displays); + SetLastError(ERROR_NO_MORE_FILES); + return FALSE; +} + + +/*********************************************************************** * GetMonitorInfo (MACDRV.@) */ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 57b1e5a..d841283 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -10,6 +10,7 @@ @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors +@ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx @ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText

1 0

Ken Thomases : winemac: Implement DISPLAYS_CHANGED event for when display configuration has changed .
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: bc75a9baffd889deef00a2acfdb19ae4bdce29ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc75a9baffd889deef00a2acf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:34 2013 -0600 winemac: Implement DISPLAYS_CHANGED event for when display configuration has changed. --- dlls/winemac.drv/cocoa_app.m | 15 +++++++++ dlls/winemac.drv/display.c | 65 ++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/event.c | 5 +++ dlls/winemac.drv/gdi.c | 10 +++++- dlls/winemac.drv/macdrv.h | 6 +++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 33 ++++++++++++++++++++ 7 files changed, 133 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2651cfc..479b4d0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -312,6 +312,20 @@ int macdrv_err_on; } } + - (void) sendDisplaysChanged + { + macdrv_event event; + WineEventQueue* queue; + + event.type = DISPLAYS_CHANGED; + event.window = NULL; + + [eventQueuesLock lock]; + for (queue in eventQueues) + [queue postEvent:&event]; + [eventQueuesLock unlock]; + } + /* * ---------- NSApplication method overrides ---------- @@ -340,6 +354,7 @@ int macdrv_err_on; - (void)applicationDidChangeScreenParameters:(NSNotification *)notification { primaryScreenHeightValid = FALSE; + [self sendDisplaysChanged]; } - (void)applicationDidResignActive:(NSNotification *)notification diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index a1bea38..2a96631 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -2,7 +2,7 @@ * MACDRV display settings * * Copyright 2003 Alexander James Pasadyn - * Copyright 2011, 2012 Ken Thomases for CodeWeavers Inc. + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +38,42 @@ static inline CGDirectDisplayID monitor_to_display_id(HMONITOR handle) } +static int display_mode_bits_per_pixel(CGDisplayModeRef display_mode) +{ + CFStringRef pixel_encoding; + int bits_per_pixel = 0; + + pixel_encoding = CGDisplayModeCopyPixelEncoding(display_mode); + if (pixel_encoding) + { + if (CFEqual(pixel_encoding, CFSTR(kIO32BitFloatPixels))) + bits_per_pixel = 128; + else if (CFEqual(pixel_encoding, CFSTR(kIO16BitFloatPixels))) + bits_per_pixel = 64; + else if (CFEqual(pixel_encoding, CFSTR(kIO64BitDirectPixels))) + bits_per_pixel = 64; + else if (CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels))) + bits_per_pixel = 30; + else if (CFEqual(pixel_encoding, CFSTR(IO32BitDirectPixels))) + bits_per_pixel = 32; + else if (CFEqual(pixel_encoding, CFSTR(IO16BitDirectPixels))) + bits_per_pixel = 16; + else if (CFEqual(pixel_encoding, CFSTR(IO8BitIndexedPixels))) + bits_per_pixel = 8; + else if (CFEqual(pixel_encoding, CFSTR(IO4BitIndexedPixels))) + bits_per_pixel = 4; + else if (CFEqual(pixel_encoding, CFSTR(IO2BitIndexedPixels))) + bits_per_pixel = 2; + else if (CFEqual(pixel_encoding, CFSTR(IO1BitIndexedPixels))) + bits_per_pixel = 1; + + CFRelease(pixel_encoding); + } + + return bits_per_pixel; +} + + /*********************************************************************** * EnumDisplayMonitors (MACDRV.@) */ @@ -156,3 +192,30 @@ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) macdrv_free_displays(displays); return (i < num_displays); } + + +/*********************************************************************** + * macdrv_displays_changed + * + * Handler for DISPLAYS_CHANGED events. + */ +void macdrv_displays_changed(const macdrv_event *event) +{ + HWND hwnd = GetDesktopWindow(); + + /* A system display change will get delivered to all GUI-attached threads, + so the desktop-window-owning thread will get it and all others should + ignore it. */ + if (GetWindowThreadProcessId(hwnd, NULL) == GetCurrentThreadId()) + { + CGDirectDisplayID mainDisplay = CGMainDisplayID(); + CGDisplayModeRef mode = CGDisplayCopyDisplayMode(mainDisplay); + size_t width = CGDisplayModeGetWidth(mode); + size_t height = CGDisplayModeGetHeight(mode); + int mode_bpp = display_mode_bits_per_pixel(mode); + + CGDisplayModeRelease(mode); + SendMessageW(hwnd, WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, + MAKELPARAM(width, height)); + } +} diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index f03fef4..b9131f7 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -33,6 +33,7 @@ static const char *dbgstr_event(int type) { static const char * const event_names[] = { "APP_DEACTIVATED", + "DISPLAYS_CHANGED", "KEY_PRESS", "KEY_RELEASE", "KEYBOARD_CHANGED", @@ -84,6 +85,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) if (mask & QS_POSTMESSAGE) { event_mask |= event_mask_for_type(APP_DEACTIVATED); + event_mask |= event_mask_for_type(DISPLAYS_CHANGED); event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_DID_MINIMIZE); event_mask |= event_mask_for_type(WINDOW_DID_UNMINIMIZE); @@ -116,6 +118,9 @@ void macdrv_handle_event(macdrv_event *event) case APP_DEACTIVATED: macdrv_app_deactivated(); break; + case DISPLAYS_CHANGED: + macdrv_displays_changed(event); + break; case KEY_PRESS: case KEY_RELEASE: macdrv_key_event(hwnd, event); diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 333cb0c..6ded900 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -2,7 +2,7 @@ * Mac graphics driver initialisation functions * * Copyright 1996 Alexandre Julliard - * Copyright 2011, 2012 Ken Thomases for CodeWeavers, Inc. + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -200,6 +200,14 @@ static void device_init(void) } +void macdrv_reset_device_metrics(void) +{ + EnterCriticalSection(&device_data_section); + device_data_valid = FALSE; + LeaveCriticalSection(&device_data_section); +} + + static MACDRV_PDEVICE *create_mac_physdev(void) { MACDRV_PDEVICE *physDev; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 8c4ce54..113cda1 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -68,6 +68,7 @@ static inline const char *wine_dbgstr_cgrect(CGRect cgrect) */ extern CGRect macdrv_get_desktop_rect(void) DECLSPEC_HIDDEN; +extern void macdrv_reset_device_metrics(void) DECLSPEC_HIDDEN; /************************************************************************** @@ -78,6 +79,9 @@ extern CGRect macdrv_get_desktop_rect(void) DECLSPEC_HIDDEN; enum macdrv_window_messages { WM_MACDRV_SET_WIN_REGION = 0x80001000, + WM_MACDRV_UPDATE_DESKTOP_RECT, + WM_MACDRV_RESET_DEVICE_METRICS, + WM_MACDRV_DISPLAYCHANGE, }; struct macdrv_thread_data @@ -142,4 +146,6 @@ extern void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_dat extern void macdrv_keyboard_changed(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_key_event(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_displays_changed(const macdrv_event *event) DECLSPEC_HIDDEN; + #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 23f0edf..5ffd7c7 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -126,6 +126,7 @@ extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDE /* event */ enum { APP_DEACTIVATED, + DISPLAYS_CHANGED, KEY_PRESS, KEY_RELEASE, KEYBOARD_CHANGED, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 65f7955..c7513f0 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1192,6 +1192,39 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) release_win_data(data); } return 0; + case WM_MACDRV_UPDATE_DESKTOP_RECT: + if (hwnd == GetDesktopWindow()) + { + CGRect new_desktop_rect; + RECT current_desktop_rect; + + macdrv_reset_device_metrics(); + new_desktop_rect = macdrv_get_desktop_rect(); + if (!GetWindowRect(hwnd, &current_desktop_rect) || + !CGRectEqualToRect(cgrect_from_rect(current_desktop_rect), new_desktop_rect)) + { + SendMessageTimeoutW(HWND_BROADCAST, WM_MACDRV_RESET_DEVICE_METRICS, 0, 0, + SMTO_ABORTIFHUNG, 2000, NULL); + SetWindowPos(hwnd, 0, CGRectGetMinX(new_desktop_rect), CGRectGetMinY(new_desktop_rect), + CGRectGetWidth(new_desktop_rect), CGRectGetHeight(new_desktop_rect), + SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE); + SendMessageTimeoutW(HWND_BROADCAST, WM_MACDRV_DISPLAYCHANGE, wp, lp, + SMTO_ABORTIFHUNG, 2000, NULL); + } + } + return 0; + case WM_MACDRV_RESET_DEVICE_METRICS: + macdrv_reset_device_metrics(); + return 0; + case WM_MACDRV_DISPLAYCHANGE: + if ((data = get_win_data(hwnd))) + { + if (data->cocoa_window && data->on_screen) + sync_window_position(data, SWP_NOZORDER | SWP_NOACTIVATE); + release_win_data(data); + } + SendMessageW(hwnd, WM_DISPLAYCHANGE, wp, lp); + return 0; } FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp);

1 0

Ken Thomases : winemac: Implement support for full-screen windows.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: be6af9a169cac983a0b51531097899cfd7312bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6af9a169cac983a0b515310… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:30 2013 -0600 winemac: Implement support for full-screen windows. --- dlls/winemac.drv/cocoa_app.m | 23 ++++++- dlls/winemac.drv/cocoa_window.h | 4 + dlls/winemac.drv/cocoa_window.m | 139 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 159 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be6af9a169cac983a0b51…

1 0

Ken Thomases : winemac: Track Cocoa windows in a z-ordered list.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: ba86e67792c7056580ce7fefe64d9671ea4f1334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba86e67792c7056580ce7fefe… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:27 2013 -0600 winemac: Track Cocoa windows in a z-ordered list. --- dlls/winemac.drv/cocoa_app.h | 7 ++++ dlls/winemac.drv/cocoa_app.m | 64 ++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.m | 39 +++++++++++++++++++++++ 3 files changed, 109 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 1166087..f215b11 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -46,10 +46,13 @@ CGFloat primaryScreenHeight; BOOL primaryScreenHeightValid; + + NSMutableArray* orderedWineWindows; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; @property (readonly, copy, nonatomic) NSEvent* lastFlagsChanged; +(a)property (readonly, nonatomic) NSArray* orderedWineWindows; - (void) transformProcessToForeground; @@ -63,6 +66,10 @@ - (void) keyboardSelectionDidChange; + - (void) wineWindow:(WineWindow*)window + ordered:(NSWindowOrderingMode)order + relativeTo:(WineWindow*)otherWindow; + @end void OnMainThread(dispatch_block_t block); diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index ae2353b..d26682e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -38,6 +38,7 @@ int macdrv_err_on; @implementation WineApplication @synthesize keyboardType, lastFlagsChanged; + @synthesize orderedWineWindows; - (id) init { @@ -48,8 +49,9 @@ int macdrv_err_on; eventQueuesLock = [[NSLock alloc] init]; keyWindows = [[NSMutableArray alloc] init]; + orderedWineWindows = [[NSMutableArray alloc] init]; - if (!eventQueues || !eventQueuesLock || !keyWindows) + if (!eventQueues || !eventQueuesLock || !keyWindows || !orderedWineWindows) { [self release]; return nil; @@ -60,6 +62,7 @@ int macdrv_err_on; - (void) dealloc { + [orderedWineWindows release]; [keyWindows release]; [eventQueues release]; [eventQueuesLock release]; @@ -251,6 +254,64 @@ int macdrv_err_on; return point; } + - (void) wineWindow:(WineWindow*)window + ordered:(NSWindowOrderingMode)order + relativeTo:(WineWindow*)otherWindow + { + NSUInteger index; + + switch (order) + { + case NSWindowAbove: + [window retain]; + [orderedWineWindows removeObjectIdenticalTo:window]; + if (otherWindow) + { + index = [orderedWineWindows indexOfObjectIdenticalTo:otherWindow]; + if (index == NSNotFound) + index = 0; + } + else + { + index = 0; + for (otherWindow in orderedWineWindows) + { + if ([otherWindow level] <= [window level]) + break; + index++; + } + } + [orderedWineWindows insertObject:window atIndex:index]; + [window release]; + break; + case NSWindowBelow: + [window retain]; + [orderedWineWindows removeObjectIdenticalTo:window]; + if (otherWindow) + { + index = [orderedWineWindows indexOfObjectIdenticalTo:otherWindow]; + if (index == NSNotFound) + index = [orderedWineWindows count]; + } + else + { + index = 0; + for (otherWindow in orderedWineWindows) + { + if ([otherWindow level] < [window level]) + break; + index++; + } + } + [orderedWineWindows insertObject:window atIndex:index]; + [window release]; + break; + case NSWindowOut: + default: + break; + } + } + /* * ---------- NSApplication method overrides ---------- @@ -307,6 +368,7 @@ int macdrv_err_on; usingBlock:^(NSNotification *note){ NSWindow* window = [note object]; [keyWindows removeObjectIdenticalTo:window]; + [orderedWineWindows removeObjectIdenticalTo:window]; }]; [nc addObserver:self diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d8ea9ed..b3ccb92 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -380,12 +380,19 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [NSApp transformProcessToForeground]; if (prev) + { [self orderWindow:NSWindowBelow relativeTo:[prev windowNumber]]; + [NSApp wineWindow:self ordered:NSWindowBelow relativeTo:prev]; + } else + { [self orderWindow:NSWindowAbove relativeTo:[next windowNumber]]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:next]; + } if (latentParentWindow) { [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; self.latentParentWindow = nil; } @@ -407,6 +414,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [latentParentWindow removeChildWindow:self]; forceNextMouseMoveAbsolute = TRUE; [self orderOut:nil]; + [NSApp wineWindow:self ordered:NSWindowOut relativeTo:nil]; [NSApp removeWindowsItem:self]; } @@ -467,7 +475,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [[self parentWindow] removeChildWindow:self]; self.latentParentWindow = nil; if ([self isVisible] && parent) + { [parent addChildWindow:self ordered:NSWindowAbove]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:parent]; + } else self.latentParentWindow = parent; } @@ -556,12 +567,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } [self orderFront:nil]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:nil]; causing_becomeKeyWindow = TRUE; [self makeKeyWindow]; causing_becomeKeyWindow = FALSE; if (latentParentWindow) { [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; self.latentParentWindow = nil; } if (![self isExcludedFromWindowsMenu]) @@ -700,6 +713,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { if ([event type] == NSLeftMouseDown) { + NSWindowButton windowButton; + BOOL broughtWindowForward = TRUE; + /* Since our windows generally claim they can't be made key, clicks in their title bars are swallowed by the theme frame stuff. So, we hook directly into the event stream and assume that any click @@ -707,6 +723,27 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) accept. */ if (![self isKeyWindow] && !self.disabled && !self.noActivate) [NSApp windowGotFocus:self]; + + /* Any left-click on our window anyplace other than the close or + minimize buttons will bring it forward. */ + for (windowButton = NSWindowCloseButton; + windowButton <= NSWindowMiniaturizeButton; + windowButton++) + { + NSButton* button = [[event window] standardWindowButton:windowButton]; + if (button) + { + NSPoint point = [button convertPoint:[event locationInWindow] fromView:nil]; + if ([button mouse:point inRect:[button bounds]]) + { + broughtWindowForward = FALSE; + break; + } + } + } + + if (broughtWindowForward) + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:nil]; } [super sendEvent:event]; @@ -908,6 +945,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } ignore_windowDeminiaturize = FALSE; + + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:nil]; } - (void)windowDidMove:(NSNotification *)notification

1 0

Piotr Caban : msvcp90: Prefer builtin version.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: cfec148b8baeb86ee9d775f9cf527b80e043f5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfec148b8baeb86ee9d775f9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 18 10:26:17 2013 +0100 msvcp90: Prefer builtin version. --- dlls/msvcp90/msvcp90_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index cb6377f..7a7aafe 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -84,8 +84,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: init_cxx_funcs(); init_lockit();

1 0

Ken Thomases : winemac: Discard old frame changed events when setting frame for off-screen windows , too.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 47352930d8a7caa74d658b8267f3a4add317cd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47352930d8a7caa74d658b826… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:16 2013 -0600 winemac: Discard old frame changed events when setting frame for off-screen windows, too. --- dlls/winemac.drv/cocoa_window.m | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4371110..2247d32 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -445,6 +445,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) event. The back end will ignore it if nothing actually changed. */ [self windowDidResize:nil]; } + else + { + /* The back end is establishing a new window size and position. It's + not interested in any stale events regarding those that may be sitting + in the queue. */ + [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_FRAME_CHANGED) + forWindow:self]; + } return on_screen; }

1 0

Carlo Bramini : windowsx.h: Fix HANDLE_WM_DISPLAYCHANGE macro.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 8fa295ed879b08ee42945b65abb8cee25def6af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa295ed879b08ee42945b65a… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Feb 17 12:13:10 2013 +0100 windowsx.h: Fix HANDLE_WM_DISPLAYCHANGE macro. --- include/windowsx.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/windowsx.h b/include/windowsx.h index 0f84622..fa27b49 100644 --- a/include/windowsx.h +++ b/include/windowsx.h @@ -1321,7 +1321,7 @@ extern "C" { /* void Cls_OnDisplayChange(HWND hwnd, UINT bitsPerPixel, UINT cxScreen, UINT cyScreen) */ #define HANDLE_WM_DISPLAYCHANGE(hwnd, wParam, lParam, fn) \ - ((fn)((hwnd), (UINT)(wParam), (UINT)LOWORD(lParam), (UINT)HIWORD(wParam)), 0L) + ((fn)((hwnd), (UINT)(wParam), (UINT)LOWORD(lParam), (UINT)HIWORD(lParam)), 0L) #define FORWARD_WM_DISPLAYCHANGE(hwnd, bitsPerPixel, cxScreen, cyScreen, fn) \ (void)(fn)((hwnd), WM_DISPLAYCHANGE, (WPARAM)(UINT)(bitsPerPixel), (LPARAM)MAKELPARAM((UINT)(cxScreen), (UINT)(cyScreen)))

1 0

Andrew Talbot : mshtml: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: a9200aa99d369fe50d84005aeb51131bee7afa87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9200aa99d369fe50d84005ae… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 16 21:09:13 2013 +0000 mshtml: Avoid signed-unsigned integer comparisons. --- dlls/mshtml/htmlbody.c | 3 ++- dlls/mshtml/htmlevent.c | 13 ++++++++----- dlls/mshtml/main.c | 2 +- dlls/mshtml/nsio.c | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e427fc0..f02264e 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -127,7 +127,8 @@ static int loose_hex_to_rgb(const WCHAR *hex) static HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) { - int i, rgb = -1; + unsigned int i; + int rgb = -1; static const WCHAR formatW[] = {'#','%','0','2','x','%','0','2','x','%','0','2','x',0}; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 98e592d..ea0201f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -929,7 +929,6 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; handler_vector_t *handler_vector = NULL; VARIANT v; - int i; HRESULT hres; if(event_target) @@ -966,6 +965,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, if(handler_vector && handler_vector->handler_cnt) { VARIANTARG arg; DISPPARAMS dp = {&arg, NULL, 1, 0}; + int i; V_VT(&arg) = VT_DISPATCH; V_DISPATCH(&arg) = (IDispatch*)event_obj; @@ -1009,16 +1009,18 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, for(cp = cp_container->cp_list; cp; cp = cp->next) { if(cp->sinks_size && is_cp_event(cp->data, event_info[eid].dispid)) { + unsigned int i; + for(i=0; doc->nsevent_listener && i < cp->sinks_size; i++) { if(!cp->sinks[i].disp) continue; V_VT(&v) = VT_EMPTY; - TRACE("cp %s [%d] >>>\n", debugstr_w(event_info[eid].name), i); + TRACE("cp %s [%u] >>>\n", debugstr_w(event_info[eid].name), i); hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, &v); if(hres == S_OK) { - TRACE("cp %s [%d] <<<\n", debugstr_w(event_info[eid].name), i); + TRACE("cp %s [%u] <<<\n", debugstr_w(event_info[eid].name), i); if(cancelable) { if(V_VT(&v) == VT_BOOL) { @@ -1030,7 +1032,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, } VariantClear(&v); }else { - WARN("cp %s [%d] <<< %08x\n", debugstr_w(event_info[eid].name), i, hres); + WARN("cp %s [%u] <<< %08x\n", debugstr_w(event_info[eid].name), i, hres); } } @@ -1558,7 +1560,8 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) void release_event_target(event_target_t *event_target) { - int i, j; + int i; + unsigned int j; for(i=0; i < EVENTID_LAST; i++) { if(event_target->event_table[i]) { diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8468f5c..503d738 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -67,7 +67,7 @@ static void thread_detach(void) static void free_strings(void) { - int i; + unsigned int i; for(i = 0; i < sizeof(status_strings)/sizeof(*status_strings); i++) heap_free(status_strings[i]); } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 96191f7..1e8f1bb 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3229,7 +3229,7 @@ static nsresult NSAPI nsIOService_GetProtocolFlags(nsIIOService *iface, const ch static BOOL is_gecko_special_uri(const char *spec) { static const char *special_schemes[] = {"chrome:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; - int i; + unsigned int i; for(i=0; i < sizeof(special_schemes)/sizeof(*special_schemes); i++) { if(!strncasecmp(spec, special_schemes[i], strlen(special_schemes[i])))

1 0

Marcus Meissner : ole32: Free *ppszProgID on error path (Coverity).
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 2dbb23c8109e5c82dfe4221a9b95c8c3d586d384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbb23c8109e5c82dfe4221a9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 16 17:46:04 2013 +0100 ole32: Free *ppszProgID on error path (Coverity). --- dlls/ole32/compobj.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index dc2a02b..17bd7a1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2033,8 +2033,11 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) *ppszProgID = CoTaskMemAlloc(progidlen * sizeof(WCHAR)); if (*ppszProgID) { - if (RegQueryValueW(hkey, NULL, *ppszProgID, &progidlen)) + if (RegQueryValueW(hkey, NULL, *ppszProgID, &progidlen)) { ret = REGDB_E_CLASSNOTREG; + CoTaskMemFree(*ppszProgID); + *ppszProgID = NULL; + } } else ret = E_OUTOFMEMORY;

1 0

Marcus Meissner : kernel32: Use the correct pointer size in atl thunk ( Coverity).
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: fc179497bdb7cf852f2dfd3cd89e681b15511a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc179497bdb7cf852f2dfd3cd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 16 17:45:31 2013 +0100 kernel32: Use the correct pointer size in atl thunk (Coverity). --- dlls/ntdll/signal_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 05ede34..0344a29 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1569,7 +1569,7 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) const struct atl_thunk *thunk = (const struct atl_thunk *)rec->ExceptionInformation[1]; BOOL ret = FALSE; - if (!virtual_is_valid_code_address( thunk, sizeof(thunk) )) return FALSE; + if (!virtual_is_valid_code_address( thunk, sizeof(*thunk) )) return FALSE; __TRY {

1 0

Piotr Caban : msvcr90: Prefer builtin version.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 5d88f780dd4bbbde0ff27075b58321d7347f6d4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d88f780dd4bbbde0ff27075b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 18 10:26:01 2013 +0100 msvcr90: Prefer builtin version. --- dlls/msvcr90/msvcr90.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 79475e8..de6d86e 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -31,9 +31,6 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); _set_printf_count_output(0);

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.24
by Jeremy Newman Feb. 18, 2013

Feb. 18, 2013

Module: website Branch: master Commit: c31b987e7af7091cbc7b0a3c48a7221f1c2ef7f7 URL: http://source.winehq.org/git/website.git/?a=commit;h=c31b987e7af7091cbc7b0a… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Feb 16 11:35:41 2013 +0800 Simplified Chinese translation for release 1.5.24 --- news/zh-cn/2013021501.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013021501.xml b/news/zh-cn/2013021501.xml new file mode 100644 index 0000000..ed83791 --- /dev/null +++ b/news/zh-cn/2013021501.xml @@ -0,0 +1,15 @@ +<news> +<date>二月 15, 2013</date> +<title>Wine 1.5.24 发布</title> +<body> + Wine 开发版 1.5.24 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.24">更新</a>： +<ul> + <li>Mac 后端驱动对键盘和鼠标滚轮的支持。</li> + <li>VB Script 对正则表达式的支持。</li> + <li>许多 RichEdit 代码的清理。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.24
by Jeremy Newman Feb. 18, 2013

Feb. 18, 2013

Module: website Branch: master Commit: 9cf04996b80c23d8f6e6e92547259bec3be07895 URL: http://source.winehq.org/git/website.git/?a=commit;h=9cf04996b80c23d8f6e6e9… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Feb 17 09:14:15 2013 +0100 Polish translation for release 1.5.24 --- news/pl/2013021501.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pl/2013021501.xml b/news/pl/2013021501.xml new file mode 100644 index 0000000..cde60e4 --- /dev/null +++ b/news/pl/2013021501.xml @@ -0,0 +1,15 @@ +<news> +<date>Luty 15, 2013</date> +<title>Wydano Wine 1.5.24</title> +<body> + Wydanie rozwojowe Wine 1.5.24 jest już dostępne. + <a href="{$root}/announce/1.5.24">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla klawiatury i rolki myszy w sterowniku Mac.</li> + <li>Wsparcie dla wyrażeń regularnych w VB Script.</li> + <li>Wiele porządków w kodzie RichEdit.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.24
by Jeremy Newman Feb. 18, 2013

Feb. 18, 2013

Module: website Branch: master Commit: a5defce31a1bdb5e4c91ec60471c303aa45b1803 URL: http://source.winehq.org/git/website.git/?a=commit;h=a5defce31a1bdb5e4c91ec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 15 23:11:32 2013 +0100 French translation for release 1.5.24 --- news/fr/2013021501.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/fr/2013021501.xml b/news/fr/2013021501.xml new file mode 100644 index 0000000..4e96df0 --- /dev/null +++ b/news/fr/2013021501.xml @@ -0,0 +1,14 @@ +<news> +<date>15 février 2013</date> +<title>Sortie de Wine 1.5.24</title> +<body> + La version de développement 1.5.24 de Wine est disponible. + <a href="{$root}/announce/1.5.24">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du clavier et de la molette de souris dans le pilote Mac.</li> + <li>Prise en charge des expressions rationnelles dans VB Script.</li> + <li>Un tas de nettoyages dans le code RichEdit.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.5.24 freigegeben
by Jeremy Newman Feb. 18, 2013

Feb. 18, 2013

Module: website Branch: master Commit: 8af3798b23f8cbc8a99da226d761aa09351a17f4 URL: http://source.winehq.org/git/website.git/?a=commit;h=8af3798b23f8cbc8a99da2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 15 22:28:51 2013 +0100 Wine 1.5.24 freigegeben --- news/de/2013021501.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2013021501.xml b/news/de/2013021501.xml new file mode 100644 index 0000000..c868ff6 --- /dev/null +++ b/news/de/2013021501.xml @@ -0,0 +1,15 @@ +<news> +<date>15. Februar 2013</date> +<title>Wine 1.5.24 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.24 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.24">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Tastatur und Mausrad Unterstützung im Mac Treiber.</li> + <li>Unterstützung für reguläre Ausdrücke in VB Script.</li> + <li>Viele Aufräumarbeiten am RichEdit Code.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.24
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: website Branch: master Commit: a9ac7e2d779df91bd7119467bc8374293a1aebcc URL: http://source.winehq.org/git/website.git/?a=commit;h=a9ac7e2d779df91bd71194… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:30:09 2013 +0100 Wine release 1.5.24 --- news/en/2013021501.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013021501.xml b/news/en/2013021501.xml new file mode 100644 index 0000000..c91f7dd --- /dev/null +++ b/news/en/2013021501.xml @@ -0,0 +1,15 @@ +<news> +<date>February 15, 2013</date> +<title>Wine 1.5.24 Released</title> +<body> + The Wine development release 1.5.24 is now available. + <a href="{$root}/announce/1.5.24">What's new</a> in this release: +<ul> + <li>Keyboard and mouse wheel support in the Mac driver.</li> + <li>Regular expression support in VB Script.</li> + <li>Many RichEdit code cleanups.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.24 : Alexandre Julliard : Release 1.5.24
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: refs/tags/wine-1.5.24 Tag: 9d9fff69a9641e739f497726875704023b93cc7e URL: http://source.winehq.org/git/wine.git/?a=tag;h=9d9fff69a9641e739f4977268757… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:21:18 2013 +0100 Release 1.5.24

1 0

Alexandre Julliard : Release 1.5.24.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: c41f6add0563252a5809c3c83cbb6a6e6f81c2d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41f6add0563252a5809c3c83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:21:05 2013 +0100 Release 1.5.24. --- ANNOUNCE | 727 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 335 insertions(+), 412 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c41f6add0563252a5809c…

1 0

Huw Davies : riched20: Use ME_PointFromChar to calculate the caret position .
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 1c0aaf7dd27b5ed00a5319e0e0506287bd02f606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c0aaf7dd27b5ed00a5319e0e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 15 16:13:41 2013 +0000 riched20: Use ME_PointFromChar to calculate the caret position. --- dlls/riched20/caret.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4986f6e..76c169b 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -205,7 +205,7 @@ ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, ME_DisplayItem *para = pCursor->pPara; ME_DisplayItem *pSizeRun = run; ME_Context c; - SIZE sz = {0, 0}; + int run_x; assert(height && x && y); assert(~para->member.para.nFlags & MEPF_REWRAP); @@ -235,18 +235,12 @@ ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, pSizeRun = run = tmp; assert(run); assert(run->type == diRun); - sz = ME_GetRunSize(&c, &para->member.para, - &run->member.run, run->member.run.len, - row->member.row.nLMargin); } } - if (pCursor->nOffset) { - sz = ME_GetRunSize(&c, &para->member.para, &run->member.run, - pCursor->nOffset, row->member.row.nLMargin); - } + run_x = ME_PointFromCharContext( &c, &run->member.run, pCursor->nOffset ); *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent; - *x = c.rcView.left + run->member.run.pt.x + sz.cx - editor->horz_si.nPos; + *x = c.rcView.left + run->member.run.pt.x + run_x - editor->horz_si.nPos; *y = c.rcView.top + para->member.para.pt.y + row->member.row.nBaseline + run->member.run.pt.y - pSizeRun->member.run.nAscent - editor->vert_si.nPos;

1 0

Huw Davies : riched20: Move the password string hack to just before it' s used.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 635614b5ea9881bb9b922549b3cfb5f9bceee02c URL: http://source.winehq.org/git/wine.git/?a=commit;h=635614b5ea9881bb9b922549b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 15 16:13:40 2013 +0000 riched20: Move the password string hack to just before it's used. --- dlls/riched20/paint.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 9937ec7..0ab4e2b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -314,11 +314,19 @@ static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, in } -static void draw_text( ME_Context *c, ME_Run *run, int x, int y, const WCHAR *text, BOOL selected, RECT *sel_rect ) +static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, RECT *sel_rect ) { COLORREF text_color = get_text_color( c, run->style, selected ); COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; COLORREF old_text, old_back; + const WCHAR *text = get_text( run, 0 ); + ME_String *masked = NULL; + + if (c->editor->cPasswordMask) + { + masked = ME_MakeStringR( c->editor->cPasswordMask, run->len ); + text = masked->szData; + } old_text = SetTextColor( c->hDC, text_color ); if (selected) old_back = SetBkColor( c->hDC, back_color ); @@ -330,11 +338,12 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, const WCHAR *te draw_underline( c, run, x, y, text_color ); + ME_DestroyString( masked ); return; } -static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, +static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; @@ -373,12 +382,12 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS hOldFont = ME_SelectStyleFont( c, run->style ); if (sel_rgn) ExtSelectClipRgn( hDC, sel_rgn, RGN_DIFF ); - draw_text( c, run, x, y - yOffset, szText, FALSE, NULL ); + draw_text( c, run, x, y - yOffset, FALSE, NULL ); if (sel_rgn) { ExtSelectClipRgn( hDC, clip, RGN_COPY ); ExtSelectClipRgn( hDC, sel_rgn, RGN_AND ); - draw_text( c, run, x, y - yOffset, szText, TRUE, &sel_rect ); + draw_text( c, run, x, y - yOffset, TRUE, &sel_rect ); ExtSelectClipRgn( hDC, clip, RGN_COPY ); if (clip) DeleteObject( clip ); DeleteObject( sel_rgn ); @@ -439,20 +448,9 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa ME_DrawOLE(c, x, y, run, para, (runofs >= nSelFrom) && (runofs < nSelTo)); else { - if (c->editor->cPasswordMask) - { - ME_String *szMasked = ME_MakeStringR(c->editor->cPasswordMask, run->len); - ME_DrawTextWithStyle(c, run, x, y, - szMasked->szData, nSelFrom - runofs, nSelTo - runofs, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); - ME_DestroyString(szMasked); - } - else - ME_DrawTextWithStyle(c, run, x, y, - get_text( run, 0 ), nSelFrom - runofs, nSelTo - runofs, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); + ME_DrawTextWithStyle(c, run, x, y, nSelFrom - runofs, nSelTo - runofs, + c->pt.y + para->pt.y + start->member.row.pt.y, + start->member.row.nHeight); } }

1 0

Hans Leidekker : msi: Don' t remove products if msidbUpgradeAttributesOnlyDetect is set.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: bfe5e58d3a3e3e829fa1dd5a08c874dc8744bc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe5e58d3a3e3e829fa1dd5a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 15 16:45:04 2013 +0100 msi: Don't remove products if msidbUpgradeAttributesOnlyDetect is set. --- dlls/msi/action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5abe040..d48ecdd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7260,12 +7260,14 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) {'m','s','i','e','x','e','c',' ','/','i',' ','%','s',' ','R','E','M','O','V','E','=','%','s',0}; MSIPACKAGE *package = param; const WCHAR *property = MSI_RecordGetString( rec, 7 ); + int attrs = MSI_RecordGetInteger( rec, 5 ); UINT len = sizeof(fmtW)/sizeof(fmtW[0]); WCHAR *product, *features, *cmd; STARTUPINFOW si; PROCESS_INFORMATION info; BOOL ret; + if (attrs & msidbUpgradeAttributesOnlyDetect) return ERROR_SUCCESS; if (!(product = msi_dup_property( package->db, property ))) return ERROR_SUCCESS; deformat_string( package, MSI_RecordGetString( rec, 6 ), &features );

1 0

Huw Davies : riched20: Move underline drawing to a common function.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 79278497d3095c4a0a6710c6065c169fefec067e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79278497d3095c4a0a6710c60… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 15 16:13:38 2013 +0000 riched20: Move underline drawing to a common function. --- dlls/riched20/paint.c | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index e4bd9e6..06026df 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -228,6 +228,22 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) return; } +static void draw_underline( ME_Context *c, ME_Run *run, int x, int y, COLORREF color ) +{ + HPEN pen; + + get_underline_pen( run->style, color, &pen ); + if (pen) + { + HPEN old_pen = SelectObject( c->hDC, pen ); + MoveToEx( c->hDC, x, y + 1, NULL ); + LineTo( c->hDC, x + run->nWidth, y + 1 ); + SelectObject( c->hDC, old_pen ); + DeleteObject( pen ); + } + return; +} + /********************************************************************* * draw_space * @@ -260,7 +276,6 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, COLORREF text_color = get_text_color( c, run->style, selected ); COLORREF old_text, old_back; HFONT old_font = NULL; - HPEN pen = NULL; int y_offset = calc_y_offset( c, run->style ); static const WCHAR space[1] = {' '}; @@ -274,15 +289,7 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, SetTextColor( hdc, old_text ); ME_UnselectStyleFont( c, run->style, old_font ); - get_underline_pen( run->style, text_color, &pen ); - if (pen) - { - HPEN old_pen = SelectObject( hdc, pen ); - MoveToEx( hdc, x, y - y_offset + 1, NULL ); - LineTo( hdc, x + run->nWidth, y - y_offset + 1 ); - SelectObject( hdc, old_pen ); - DeleteObject( pen ); - } + draw_underline( c, run, x, y - y_offset, text_color ); } else if (selected) { @@ -311,7 +318,6 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, const WCHAR *te COLORREF text_color = get_text_color( c, run->style, selected ); COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; COLORREF old_text, old_back; - HPEN pen; old_text = SetTextColor( c->hDC, text_color ); if (selected) old_back = SetBkColor( c->hDC, back_color ); @@ -321,15 +327,7 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, const WCHAR *te if (selected) SetBkColor( c->hDC, old_back ); SetTextColor( c->hDC, old_text ); - get_underline_pen( run->style, text_color, &pen ); - if (pen) - { - HPEN old_pen = SelectObject( c->hDC, pen ); - MoveToEx( c->hDC, x, y + 1, NULL ); - LineTo( c->hDC, x + run->nWidth, y + 1 ); - SelectObject( c->hDC, old_pen ); - DeleteObject( pen ); - } + draw_underline( c, run, x, y, text_color ); return; }

1 0

Francois Gouget : winetest: Trace the time it takes to run each test.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: f704803c96d0f789f947d2de6ad0189f59f5fa8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f704803c96d0f789f947d2de6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 15 11:16:49 2013 +0100 winetest: Trace the time it takes to run each test. --- programs/winetest/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 427b6b4..6c8e327 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -724,12 +724,13 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch else { int status; + DWORD start = GetTickCount(); char *cmd = strmake (NULL, "%s %s", test->exename, subtest); report (R_STEP, "Running: %s:%s", test->name, subtest); xprintf ("%s:%s start %s -\n", test->name, subtest, file); status = run_ex (cmd, out_file, tempdir, 120000); heap_free (cmd); - xprintf ("%s:%s done (%d)\n", test->name, subtest, status); + xprintf ("%s:%s done (%d) in %ds\n", test->name, subtest, status, (GetTickCount()-start)/1000); if (status) failures++; } if (failures) report (R_STATUS, "Running tests - %u failures", failures);

1 0

Piotr Caban : vbscript: Added IRegExp2::Pattern implementation.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 7246f7f3aa97ef5e0a6554846fe600d309bb61f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7246f7f3aa97ef5e0a6554846… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 15:10:53 2013 +0100 vbscript: Added IRegExp2::Pattern implementation. --- dlls/vbscript/vbregexp.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 1afe44b..ffd110d 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -84,6 +84,8 @@ typedef struct { IRegExp IRegExp_iface; LONG ref; + + WCHAR *pattern; } RegExp2; static inline RegExp2 *impl_from_IRegExp2(IRegExp2 *iface) @@ -135,6 +137,7 @@ static ULONG WINAPI RegExp2_Release(IRegExp2 *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + heap_free(This->pattern); heap_free(This); } @@ -186,15 +189,44 @@ static HRESULT WINAPI RegExp2_Invoke(IRegExp2 *iface, DISPID dispIdMember, static HRESULT WINAPI RegExp2_get_Pattern(IRegExp2 *iface, BSTR *pPattern) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%p)\n", This, pPattern); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pPattern); + + if(!pPattern) + return E_POINTER; + + if(!This->pattern) { + *pPattern = NULL; + return S_OK; + } + + *pPattern = SysAllocString(This->pattern); + return *pPattern ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI RegExp2_put_Pattern(IRegExp2 *iface, BSTR pattern) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_w(pattern)); - return E_NOTIMPL; + WCHAR *p; + DWORD size; + + TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(pattern)); + + if(!pattern) { + heap_free(This->pattern); + This->pattern = NULL; + return S_OK; + } + + size = (SysStringLen(pattern)+1) * sizeof(WCHAR); + p = heap_alloc(size); + if(!p) + return E_OUTOFMEMORY; + + heap_free(This->pattern); + This->pattern = p; + memcpy(p, pattern, size); + return S_OK; } static HRESULT WINAPI RegExp2_get_IgnoreCase(IRegExp2 *iface, VARIANT_BOOL *pIgnoreCase)

1 0

Huw Davies : riched20: Move the range clamping to the helper now that the range isn' t used later on.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: a4378f44aa162c6e7984d2fe41dcabc990dadbe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4378f44aa162c6e7984d2fe4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 15 16:13:39 2013 +0000 riched20: Move the range clamping to the helper now that the range isn't used later on. --- dlls/riched20/paint.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 06026df..9937ec7 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -304,7 +304,8 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, int cy, RECT *r ) { - + from = max( 0, from ); + to = min( run->len, to ); r->left = ME_PointFromCharContext( c, run, from ); r->top = 0; r->right = ME_PointFromCharContext( c, run, to ); @@ -349,8 +350,6 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS if (selected) { - nSelFrom = max( 0, nSelFrom ); - nSelTo = min( run->len, nSelTo ); get_selection_rect( c, run, nSelFrom, nSelTo, cy, &sel_rect ); OffsetRect( &sel_rect, x, ymin );

1 0

Piotr Caban : vbscript: Rename vbsheap to heap_pool.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: fb29bf7d2f04607b0a8e74b2b35f7aa2cda9ebdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb29bf7d2f04607b0a8e74b2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 15:11:13 2013 +0100 vbscript: Rename vbsheap to heap_pool. --- dlls/vbscript/compile.c | 8 ++++---- dlls/vbscript/interp.c | 12 ++++++------ dlls/vbscript/parse.h | 2 +- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/vbscript.c | 6 +++--- dlls/vbscript/vbscript.h | 12 ++++++------ dlls/vbscript/vbscript_main.c | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index d324284..58494b9 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -118,14 +118,14 @@ static void dump_code(compile_ctx_t *ctx) static inline void *compiler_alloc(vbscode_t *vbscode, size_t size) { - return vbsheap_alloc(&vbscode->heap, size); + return heap_pool_alloc(&vbscode->heap, size); } static inline void *compiler_alloc_zero(vbscode_t *vbscode, size_t size) { void *ret; - ret = vbsheap_alloc(&vbscode->heap, size); + ret = heap_pool_alloc(&vbscode->heap, size); if(ret) memset(ret, 0, size); return ret; @@ -1585,7 +1585,7 @@ void release_vbscode(vbscode_t *code) for(i=0; i < code->bstr_cnt; i++) SysFreeString(code->bstr_pool[i]); - vbsheap_free(&code->heap); + heap_pool_free(&code->heap); heap_free(code->bstr_pool); heap_free(code->source); @@ -1615,7 +1615,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ctx->instr_cnt = 1; ctx->instr_size = 32; - vbsheap_init(&ret->heap); + heap_pool_init(&ret->heap); ret->option_explicit = ctx->parser.option_explicit; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index eace041..b3f4244 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -37,7 +37,7 @@ typedef struct { VARIANT *vars; dynamic_var_t *dynamic_vars; - vbsheap_t heap; + heap_pool_t heap; BOOL resume_next; @@ -210,19 +210,19 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, BOOL is_const, VARIANT *val, BOOL own_val, VARIANT **out_var) { dynamic_var_t *new_var; - vbsheap_t *heap; + heap_pool_t *heap; WCHAR *str; unsigned size; HRESULT hres; heap = ctx->func->type == FUNC_GLOBAL ? &ctx->script->heap : &ctx->heap; - new_var = vbsheap_alloc(heap, sizeof(*new_var)); + new_var = heap_pool_alloc(heap, sizeof(*new_var)); if(!new_var) return E_OUTOFMEMORY; size = (strlenW(name)+1)*sizeof(WCHAR); - str = vbsheap_alloc(heap, size); + str = heap_pool_alloc(heap, size); if(!str) return E_OUTOFMEMORY; memcpy(str, name, size); @@ -1833,7 +1833,7 @@ static void release_exec(exec_ctx_t *ctx) VariantClear(ctx->vars+i); } - vbsheap_free(&ctx->heap); + heap_pool_free(&ctx->heap); heap_free(ctx->args); heap_free(ctx->vars); heap_free(ctx->stack); @@ -1852,7 +1852,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, IDispatch *this_obj, DI return E_FAIL; } - vbsheap_init(&exec.heap); + heap_pool_init(&exec.heap); if(func->arg_cnt) { VARIANT *v; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 74e0a8a..ba1a311 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -263,7 +263,7 @@ typedef struct { statement_t *stats_tail; class_decl_t *class_decls; - vbsheap_t heap; + heap_pool_t heap; } parser_ctx_t; HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index b71b92d..4b380ef 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -922,7 +922,7 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret; - ret = vbsheap_alloc(&ctx->heap, size); + ret = heap_pool_alloc(&ctx->heap, size); if(!ret) ctx->hres = E_OUTOFMEMORY; return ret; @@ -935,7 +935,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite ctx->code = ctx->ptr = code; ctx->end = ctx->code + strlenW(ctx->code); - vbsheap_init(&ctx->heap); + heap_pool_init(&ctx->heap); ctx->parse_complete = FALSE; ctx->hres = S_OK; @@ -961,5 +961,5 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite void parser_release(parser_ctx_t *ctx) { - vbsheap_free(&ctx->heap); + heap_pool_free(&ctx->heap); } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 1195f85..48dd18c 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -172,8 +172,8 @@ static void release_script(script_ctx_t *ctx) IDispatchEx_Release(&script_obj->IDispatchEx_iface); } - vbsheap_free(&ctx->heap); - vbsheap_init(&ctx->heap); + heap_pool_free(&ctx->heap); + heap_pool_init(&ctx->heap); } static void destroy_script(script_ctx_t *ctx) @@ -568,7 +568,7 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) return E_OUTOFMEMORY; ctx->safeopt = This->safeopt; - vbsheap_init(&ctx->heap); + heap_pool_init(&ctx->heap); list_init(&ctx->objects); list_init(&ctx->code_list); list_init(&ctx->named_items); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index e3d96d8..f499e4f 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -37,11 +37,11 @@ typedef struct { DWORD last_block; DWORD offset; struct list custom_blocks; -} vbsheap_t; +} heap_pool_t; -void vbsheap_init(vbsheap_t*) DECLSPEC_HIDDEN; -void *vbsheap_alloc(vbsheap_t*,size_t) __WINE_ALLOC_SIZE(2) DECLSPEC_HIDDEN; -void vbsheap_free(vbsheap_t*) DECLSPEC_HIDDEN; +void heap_pool_init(heap_pool_t*) DECLSPEC_HIDDEN; +void *heap_pool_alloc(heap_pool_t*,size_t) __WINE_ALLOC_SIZE(2) DECLSPEC_HIDDEN; +void heap_pool_free(heap_pool_t*) DECLSPEC_HIDDEN; typedef struct _function_t function_t; typedef struct _vbscode_t vbscode_t; @@ -177,7 +177,7 @@ struct _script_ctx_t { class_desc_t *classes; class_desc_t *procs; - vbsheap_t heap; + heap_pool_t heap; struct list objects; struct list code_list; @@ -320,7 +320,7 @@ struct _vbscode_t { BSTR *bstr_pool; unsigned bstr_pool_size; unsigned bstr_cnt; - vbsheap_t heap; + heap_pool_t heap; struct list entry; }; diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 9ff2a51..a06eb2c 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -133,13 +133,13 @@ static inline DWORD block_size(DWORD block) return MIN_BLOCK_SIZE << block; } -void vbsheap_init(vbsheap_t *heap) +void heap_pool_init(heap_pool_t *heap) { memset(heap, 0, sizeof(*heap)); list_init(&heap->custom_blocks); } -void *vbsheap_alloc(vbsheap_t *heap, size_t size) +void *heap_pool_alloc(heap_pool_t *heap, size_t size) { struct list *list; void *tmp; @@ -194,7 +194,7 @@ void *vbsheap_alloc(vbsheap_t *heap, size_t size) return list+1; } -void vbsheap_free(vbsheap_t *heap) +void heap_pool_free(heap_pool_t *heap) { struct list *iter; DWORD i;

1 0

Piotr Caban : vbscript: Added partial implementation of IDispatch methods in IRegExp2.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 08a16a28767923391b870132bd19dbb7cd94cf46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a16a28767923391b870132b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 15:10:27 2013 +0100 vbscript: Added partial implementation of IDispatch methods in IRegExp2. --- dlls/vbscript/vbregexp.c | 97 +++++++++++++++++++++++++++++++++++++--- dlls/vbscript/vbscript.h | 1 + dlls/vbscript/vbscript_main.c | 1 + 3 files changed, 91 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 2bf866b..1afe44b 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -23,6 +23,62 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +#define REGEXP_TID_LIST \ + XDIID(RegExp2) \ + XDIID(Match2) \ + XDIID(MatchCollection2) \ + XDIID(SubMatches) + +typedef enum { +#define XDIID(iface) iface ## _tid, +REGEXP_TID_LIST +#undef XDIID + REGEXP_LAST_tid +} regexp_tid_t; + +static REFIID tid_ids[] = { +#define XDIID(iface) &IID_I ## iface, +REGEXP_TID_LIST +#undef XDIID +}; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[REGEXP_LAST_tid]; + +static HRESULT init_regexp_typeinfo(regexp_tid_t tid) +{ + HRESULT hres; + + if(!typelib) { + static const WCHAR vbscript_dll3W[] = {'v','b','s','c','r','i','p','t','.','d','l','l','\\','3',0}; + ITypeLib *tl; + + hres = LoadTypeLib(vbscript_dll3W, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + } + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + return S_OK; +} + typedef struct { IRegExp2 IRegExp2_iface; IRegExp IRegExp_iface; @@ -78,8 +134,9 @@ static ULONG WINAPI RegExp2_Release(IRegExp2 *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { heap_free(This); + } return ref; } @@ -87,8 +144,11 @@ static ULONG WINAPI RegExp2_Release(IRegExp2 *iface) static HRESULT WINAPI RegExp2_GetTypeInfoCount(IRegExp2 *iface, UINT *pctinfo) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI RegExp2_GetTypeInfo(IRegExp2 *iface, @@ -103,9 +163,11 @@ static HRESULT WINAPI RegExp2_GetIDsOfNames(IRegExp2 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), + rgszNames, cNames, lcid, rgDispId); + + return ITypeInfo_GetIDsOfNames(typeinfos[RegExp2_tid], rgszNames, cNames, rgDispId); } static HRESULT WINAPI RegExp2_Invoke(IRegExp2 *iface, DISPID dispIdMember, @@ -113,9 +175,12 @@ static HRESULT WINAPI RegExp2_Invoke(IRegExp2 *iface, DISPID dispIdMember, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return ITypeInfo_Invoke(typeinfos[RegExp2_tid], iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI RegExp2_get_Pattern(IRegExp2 *iface, BSTR *pPattern) @@ -357,6 +422,10 @@ HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory *iface, IUnkno TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + hres = init_regexp_typeinfo(RegExp2_tid); + if(FAILED(hres)) + return hres; + ret = heap_alloc_zero(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -370,3 +439,15 @@ HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory *iface, IUnkno IRegExp2_Release(&ret->IRegExp2_iface); return hres; } + +void release_regexp_typelib(void) +{ + DWORD i; + + for(i=0; i<REGEXP_LAST_tid; i++) { + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + } + if(typelib) + ITypeLib_Release(typelib); +} diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 868a9f4..e3d96d8 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -342,6 +342,7 @@ TID_LIST } tid_t; HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; +void release_regexp_typelib(void) DECLSPEC_HIDDEN; #ifndef INT32_MIN #define INT32_MIN (-2147483647-1) diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index eefb7a5..9ff2a51 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -285,6 +285,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: release_typelib(); + release_regexp_typelib(); } return TRUE;

1 0

Piotr Caban : jscript: Move code operating on JSRegExp out of do_regexp_match_next function.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: deca5e1aca54e8ed3948a3c53604aa48ab176add URL: http://source.winehq.org/git/wine.git/?a=commit;h=deca5e1aca54e8ed3948a3c53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:59 2013 +0100 jscript: Move code operating on JSRegExp out of do_regexp_match_next function. --- dlls/jscript/regexp.c | 67 +++++++++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index db04e9b..ea25c64 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3202,6 +3202,42 @@ bad: return NULL; } +static HRESULT MatchRegExpNext(JSRegExp *jsregexp, const WCHAR *str, DWORD str_len, + const WCHAR **cp, heap_pool_t *pool, REMatchState **result, DWORD *matchlen) +{ + REMatchState *x, *res; + REGlobalData gData; + + gData.cpbegin = str; + gData.cpend = str+str_len; + gData.start = *cp-str; + gData.skipped = 0; + gData.pool = pool; + + x = InitMatch(NULL, &gData, jsregexp, gData.cpend - gData.cpbegin); + if(!x) { + WARN("InitMatch failed\n"); + return E_FAIL; + } + + x->cp = *cp; + res = MatchRegExp(&gData, x); + if(!gData.ok) { + WARN("MatchRegExp failed\n"); + return E_FAIL; + } + + *result = res; + if(!res) { + *matchlen = 0; + return S_FALSE; + } + + *matchlen = (res->cp-*cp) - gData.skipped; + *cp = res->cp; + return S_OK; +} + static void js_DestroyRegExp(JSRegExp *re) { @@ -3327,30 +3363,15 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D jsstr_t *str, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) { - REMatchState *x, *result; - REGlobalData gData; + REMatchState *result; DWORD matchlen; + HRESULT hres; - gData.cpbegin = str->str; - gData.cpend = str->str + jsstr_length(str); - gData.start = *cp-str->str; - gData.skipped = 0; - gData.pool = &ctx->tmp_heap; - - x = InitMatch(NULL, &gData, regexp->jsregexp, gData.cpend - gData.cpbegin); - if(!x) { - WARN("InitMatch failed\n"); - return E_FAIL; - } - - x->cp = *cp; - result = MatchRegExp(&gData, x); - if(!gData.ok) { - WARN("MatchRegExp failed\n"); - return E_FAIL; - } - - if(!result) { + hres = MatchRegExpNext(regexp->jsregexp, str->str, jsstr_length(str), + cp, &ctx->tmp_heap, &result, &matchlen); + if(FAILED(hres)) + return hres; + if(hres == S_FALSE) { if(rem_flags & REM_RESET_INDEX) set_last_index(regexp, 0); return S_FALSE; @@ -3410,8 +3431,6 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D memset(ctx->match_parens+n, 0, sizeof(ctx->match_parens) - n*sizeof(ctx->match_parens[0])); } - matchlen = (result->cp-*cp) - gData.skipped; - *cp = result->cp; ret->str = result->cp-matchlen; ret->len = matchlen; set_last_index(regexp, result->cp-str->str);

1 0

Piotr Caban : jscript: Don't use jsstr_t in js_NewRegExp.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 1d61b4581ab1b0daa343041f4165f1849ce948d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d61b4581ab1b0daa343041f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:44 2013 +0100 jscript: Don't use jsstr_t in js_NewRegExp. --- dlls/jscript/regexp.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index decabcc..db04e9b 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3218,7 +3218,7 @@ js_DestroyRegExp(JSRegExp *re) } static JSRegExp * -js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) +js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) { JSRegExp *re; heap_pool_t *mark; @@ -3230,10 +3230,10 @@ js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) re = NULL; mark = heap_pool_mark(&cx->tmp_heap); - len = jsstr_length(str); + len = str_len; state.context = cx; - state.cp = str->str; + state.cp = str; if (!state.cp) goto out; state.cpbegin = state.cp; @@ -3303,8 +3303,8 @@ js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) re->flags = flags; re->parenCount = state.parenCount; - re->source = str->str; - re->source_len = jsstr_length(str); + re->source = str; + re->source_len = str_len; out: heap_pool_clear(mark); @@ -3865,7 +3865,8 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r regexp->str = jsstr_addref(src); regexp->last_index_val = jsval_number(0); - regexp->jsregexp = js_NewRegExp(ctx, regexp->str, flags, FALSE); + regexp->jsregexp = js_NewRegExp(ctx, regexp->str->str, + jsstr_length(regexp->str), flags, FALSE); if(!regexp->jsregexp) { WARN("js_NewRegExp failed\n"); jsdisp_release(&regexp->dispex);

1 0

Piotr Caban : jscript: Don't use jsstr_t in JSRegExp structure.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 89711e35c1dab1b9fe98ceff142cd703606dc0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=89711e35c1dab1b9fe98ceff1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:29 2013 +0100 jscript: Don't use jsstr_t in JSRegExp structure. --- dlls/jscript/regexp.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index bca73a4..decabcc 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -74,7 +74,8 @@ typedef struct { size_t parenCount; /* number of parenthesized submatches */ size_t classCount; /* count [...] bitmaps */ RECharSet *classList; /* list of [...] bitmaps */ - jsstr_t *source; /* locked source string, sans // */ + const WCHAR *source; /* locked source string, sans // */ + DWORD source_len; jsbytecode program[1]; /* regular expression bytecode */ } JSRegExp; @@ -2038,7 +2039,7 @@ PushBackTrackState(REGlobalData *gData, REOp op, } static inline REMatchState * -FlatNIMatcher(REGlobalData *gData, REMatchState *x, WCHAR *matchChars, +FlatNIMatcher(REGlobalData *gData, REMatchState *x, const WCHAR *matchChars, size_t length) { size_t i; @@ -2157,13 +2158,12 @@ ProcessCharSet(REGlobalData *gData, RECharSet *charSet) * source string. */ assert(1 <= charSet->u.src.startIndex); - assert(charSet->u.src.startIndex - < jsstr_length(gData->regexp->source)); - assert(charSet->u.src.length <= jsstr_length(gData->regexp->source) - - 1 - charSet->u.src.startIndex); + assert(charSet->u.src.startIndex < gData->regexp->source_len); + assert(charSet->u.src.length <= gData->regexp->source_len + - 1 - charSet->u.src.startIndex); charSet->converted = TRUE; - src = gData->regexp->source->str + charSet->u.src.startIndex; + src = gData->regexp->source + charSet->u.src.startIndex; end = src + charSet->u.src.length; @@ -2392,7 +2392,7 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, size_t parenIndex; size_t offset, length, index; jsbytecode *pc = *startpc; /* pc has already been incremented past op */ - WCHAR *source; + const WCHAR *source; const WCHAR *startcp = x->cp; WCHAR ch; RECharSet *charSet; @@ -2488,12 +2488,12 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, break; case REOP_FLAT: pc = ReadCompactIndex(pc, &offset); - assert(offset < jsstr_length(gData->regexp->source)); + assert(offset < gData->regexp->source_len); pc = ReadCompactIndex(pc, &length); assert(1 <= length); - assert(length <= jsstr_length(gData->regexp->source) - offset); + assert(length <= gData->regexp->source_len - offset); if (length <= (size_t)(gData->cpend - x->cp)) { - source = gData->regexp->source->str + offset; + source = gData->regexp->source + offset; TRACE("%s\n", debugstr_wn(source, length)); for (index = 0; index != length; index++) { if (source[index] != x->cp[index]) @@ -2513,11 +2513,11 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, break; case REOP_FLATi: pc = ReadCompactIndex(pc, &offset); - assert(offset < jsstr_length(gData->regexp->source)); + assert(offset < gData->regexp->source_len); pc = ReadCompactIndex(pc, &length); assert(1 <= length); - assert(length <= jsstr_length(gData->regexp->source) - offset); - source = gData->regexp->source->str; + assert(length <= gData->regexp->source_len - offset); + source = gData->regexp->source; result = FlatNIMatcher(gData, x, source + offset, length); break; case REOP_FLAT1i: @@ -3303,7 +3303,8 @@ js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) re->flags = flags; re->parenCount = state.parenCount; - re->source = str; + re->source = str->str; + re->source_len = jsstr_length(str); out: heap_pool_clear(mark);

1 0

Dmitry Timoshkov : kernel32: There is no need for lock/ unlock heap in GlobalAlloc.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 70c21c8e6c5b6f7f0b543a704b292824ca0a307b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c21c8e6c5b6f7f0b543a704… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 15 16:40:43 2013 +0800 kernel32: There is no need for lock/unlock heap in GlobalAlloc. --- dlls/kernel32/heap.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index b74763f..e0b86e5 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -370,8 +370,6 @@ HGLOBAL WINAPI GlobalAlloc( return 0; } - RtlLockHeap(GetProcessHeap()); - pintern = HeapAlloc(GetProcessHeap(), 0, sizeof(GLOBAL32_INTERN)); if (pintern) { @@ -400,7 +398,6 @@ HGLOBAL WINAPI GlobalAlloc( pintern->Pointer = NULL; } - RtlUnlockHeap(GetProcessHeap()); if (!pintern) return 0; TRACE( "(flags=%04x) returning handle %p pointer %p\n", flags, INTERN_TO_HANDLE(pintern), pintern->Pointer );

1 0

Piotr Caban : jscript: Rename jsheap_t to heap_pool_t.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 02d63cb3120d89a5107d4e26a92eb4bd06e2213d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d63cb3120d89a5107d4e26a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:14 2013 +0100 jscript: Rename jsheap_t to heap_pool_t. --- dlls/jscript/compile.c | 6 +++--- dlls/jscript/engine.h | 8 ++++---- dlls/jscript/jscript.c | 4 ++-- dlls/jscript/jscript.h | 16 ++++++++-------- dlls/jscript/jsutils.c | 18 +++++++++--------- dlls/jscript/parser.y | 10 +++++----- dlls/jscript/regexp.c | 32 ++++++++++++++++---------------- 7 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02d63cb3120d89a5107d4…

1 0

Francois Gouget : ws2_32/tests: Fix the GetAcceptExSockaddrs() test.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 867615419e7ff3aac203743a03fdb661e28089b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=867615419e7ff3aac203743a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 15 11:34:00 2013 +0100 ws2_32/tests: Fix the GetAcceptExSockaddrs() test. --- dlls/ws2_32/tests/sock.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ebde182..804c66b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4771,6 +4771,7 @@ static void test_AcceptEx(void) ok(!iret, "getsockopt failed %d\n", WSAGetLastError()); ok(connect_time == ~0u, "unexpected connect time %u\n", connect_time); + /* AcceptEx() still won't complete until we send data */ iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); @@ -4786,6 +4787,13 @@ static void test_AcceptEx(void) iret = getsockname( connector, (struct sockaddr *)&peerAddress, &remoteSize); ok( !iret, "getsockname failed.\n"); + /* AcceptEx() could complete any time now */ + iret = send(connector, buffer, 1, 0); + ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + /* Check if the buffer from AcceptEx is decoded correctly */ pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, (struct sockaddr **)&readBindAddress, &localSize, @@ -4805,12 +4813,6 @@ static void test_AcceptEx(void) "Remote socket port is different: %d != %d\n", readRemoteAddress->sin_port, peerAddress.sin_port); - iret = send(connector, buffer, 1, 0); - ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); - - dwret = WaitForSingleObject(overlapped.hEvent, 1000); - ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); - bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 1, "bytesReturned isn't supposed to be %d\n", bytesReturned);

1 0

Dmitry Timoshkov : gdi32: SelectClipPath should update actual clipping region for a EMF DC.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: e069662c0c8d76f3935c20bca255f1e4fec057da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e069662c0c8d76f3935c20bca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 15 13:06:33 2013 +0800 gdi32: SelectClipPath should update actual clipping region for a EMF DC. --- dlls/gdi32/enhmfdrv/dc.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 3af7ef4..389dc38 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -159,7 +159,6 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExcludeClipRect ); EMREXCLUDECLIPRECT emr; - BOOL ret; emr.emr.iType = EMR_EXCLUDECLIPRECT; emr.emr.nSize = sizeof(emr); @@ -167,15 +166,14 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pExcludeClipRect( next, left, top, right, bottom ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pExcludeClipRect( next, left, top, right, bottom ); } INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pIntersectClipRect ); EMRINTERSECTCLIPRECT emr; - BOOL ret; emr.emr.iType = EMR_INTERSECTCLIPRECT; emr.emr.nSize = sizeof(emr); @@ -183,22 +181,21 @@ INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bot emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pIntersectClipRect( next, left, top, right, bottom ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pIntersectClipRect( next, left, top, right, bottom ); } INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetClipRgn ); EMROFFSETCLIPRGN emr; - BOOL ret; emr.emr.iType = EMR_OFFSETCLIPRGN; emr.emr.nSize = sizeof(emr); emr.ptlOffset.x = x; emr.ptlOffset.y = y; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pOffsetClipRgn( next, x, y ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pOffsetClipRgn( next, x, y ); } INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) @@ -477,13 +474,15 @@ BOOL EMFDRV_FlattenPath( PHYSDEV dev ) BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectClipPath ); EMRSELECTCLIPPATH emr; emr.emr.iType = EMR_SELECTCLIPPATH; emr.emr.nSize = sizeof(emr); emr.iMode = iMode; - return EMFDRV_WriteRecord( dev, &emr.emr ); + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; + return next->funcs->pSelectClipPath( next, iMode ); } BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev )

1 0

Piotr Caban : jscript: Moved generic regular expressions code to separate file.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 06e8d830e21804defd06a7423ec23ee47036829f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e8d830e21804defd06a7423… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:05:42 2013 +0100 jscript: Moved generic regular expressions code to separate file. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jsregexp.c | 1013 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/regexp.c | 1047 +--------------------------------------------- dlls/jscript/regexp.h | 90 ++++ 4 files changed, 1108 insertions(+), 1043 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06e8d830e21804defd06a…

1 0

Piotr Caban : jscript: Make context generic in internal regular expression functions.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 5f06c6de285d78caaae497e8b573e7fe238d1343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f06c6de285d78caaae497e8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:05:15 2013 +0100 jscript: Make context generic in internal regular expression functions. --- dlls/jscript/regexp.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index ea25c64..9df7372 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -294,7 +294,7 @@ typedef struct REBackTrackData { #define INITIAL_BACKTRACK 8000 typedef struct REGlobalData { - script_ctx_t *cx; + void *cx; JSRegExp *regexp; /* the RE in execution */ BOOL ok; /* runtime error (out_of_memory only?) */ size_t start; /* offset to start at */ @@ -354,7 +354,7 @@ struct RENode { #define CLASS_CACHE_SIZE 4 typedef struct CompilerState { - script_ctx_t *context; + void *context; const WCHAR *cpbegin; const WCHAR *cpend; const WCHAR *cp; @@ -370,6 +370,9 @@ typedef struct CompilerState { size_t index; } classCache[CLASS_CACHE_SIZE]; WORD flags; + + heap_pool_t *pool; /* It's faster to use one malloc'd pool + than to malloc/free */ } CompilerState; typedef struct EmitStateStackEntry { @@ -469,7 +472,7 @@ NewRENode(CompilerState *state, REOp op) { RENode *ren; - ren = heap_pool_alloc(&state->context->tmp_heap, sizeof(*ren)); + ren = heap_pool_alloc(state->pool, sizeof(*ren)); if (!ren) { /* js_ReportOutOfScriptQuota(cx); */ return NULL; @@ -3254,7 +3257,7 @@ js_DestroyRegExp(JSRegExp *re) } static JSRegExp * -js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) +js_NewRegExp(void *cx, heap_pool_t *pool, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) { JSRegExp *re; heap_pool_t *mark; @@ -3265,10 +3268,11 @@ js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL size_t len; re = NULL; - mark = heap_pool_mark(&cx->tmp_heap); + mark = heap_pool_mark(pool); len = str_len; state.context = cx; + state.pool = pool; state.cp = str; if (!state.cp) goto out; @@ -3884,7 +3888,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r regexp->str = jsstr_addref(src); regexp->last_index_val = jsval_number(0); - regexp->jsregexp = js_NewRegExp(ctx, regexp->str->str, + regexp->jsregexp = js_NewRegExp(ctx, &ctx->tmp_heap, regexp->str->str, jsstr_length(regexp->str), flags, FALSE); if(!regexp->jsregexp) { WARN("js_NewRegExp failed\n");

1 0