October 2010 - Wine-commits

Alexandre Julliard : comctl32: Fix positioning of toolbars that have the WS_BORDER style.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 985770e0ac9c53a8a08050bdfd231733496f084f URL: http://source.winehq.org/git/wine.git/?a=commit;h=985770e0ac9c53a8a08050bdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 14:29:24 2010 +0200 comctl32: Fix positioning of toolbars that have the WS_BORDER style. (cherry picked from commit af6fb4712fd841f17583f1fb32a50089d70f9820) --- dlls/comctl32/toolbar.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fe782c3..9b41732 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3028,7 +3028,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!(infoPtr->dwStyle & CCS_NORESIZE)) { RECT window_rect; - UINT uPosFlags = SWP_NOZORDER; + UINT uPosFlags = SWP_NOZORDER | SWP_NOACTIVATE; if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_NOMOVEY) { @@ -3050,9 +3050,8 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (infoPtr->dwStyle & WS_BORDER) { - x = y = 1; /* FIXME: this looks wrong */ - cy += GetSystemMetrics(SM_CYEDGE); - cx += GetSystemMetrics(SM_CXEDGE); + cy += 2 * GetSystemMetrics(SM_CXBORDER); + cx += 2 * GetSystemMetrics(SM_CYBORDER); } SetWindowPos(infoPtr->hwndSelf, NULL, x, y, cx, cy, uPosFlags); @@ -4842,7 +4841,7 @@ TOOLBAR_SetRows (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPRECT lprc) SetWindowPos(infoPtr->hwndSelf, NULL, 0, 0, infoPtr->rcBound.right - infoPtr->rcBound.left, infoPtr->rcBound.bottom - infoPtr->rcBound.top, - SWP_NOMOVE); + SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); } /* repaint toolbar */ @@ -6007,7 +6006,7 @@ TOOLBAR_NCPaint (HWND hwnd, WPARAM wParam, LPARAM lParam) GetWindowRect (hwnd, &rcWindow); OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top); if( dwStyle & WS_BORDER ) - OffsetRect (&rcWindow, 1, 1); + InflateRect (&rcWindow, -1, -1); DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_TOP); }

1 0

Alexandre Julliard : winebuild: Add more checks to protect against corrupted resource files.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 4c039666093f38c48a0774fea53d63a4d7ffdc62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c039666093f38c48a0774fea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 16:04:51 2010 +0200 winebuild: Add more checks to protect against corrupted resource files. (cherry picked from commit 58dddbed234a45e6888cd35d4104ee72948e11e7) --- tools/winebuild/res32.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 6320a2e..28b950c 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -220,8 +220,12 @@ static void load_next_resource( DLLSPEC *spec ) res->data_size = get_dword(); hdr_size = get_dword(); if (hdr_size & 3) fatal_error( "%s header size not aligned\n", input_buffer_filename ); + if (hdr_size < 32) fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size ); res->data = input_buffer + input_buffer_pos - 2*sizeof(unsigned int) + hdr_size; + if ((const unsigned char *)res->data < input_buffer || + (const unsigned char *)res->data >= input_buffer + input_buffer_size) + fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size ); get_string( &res->type ); get_string( &res->name ); if (input_buffer_pos & 2) get_word(); /* align to dword boundary */

1 0

Owen Rudge : fusion: Implement IAssemblyNameImpl_GetDisplayName more completely.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 8df789f0b81a9735dc6d602ac9acbc7511eb7ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df789f0b81a9735dc6d602ac… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jul 20 18:02:36 2010 +0100 fusion: Implement IAssemblyNameImpl_GetDisplayName more completely. (cherry picked from commit 11dea57f692d1a3c24eebd5b393b05711301b5fa) --- dlls/fusion/Makefile.in | 2 +- dlls/fusion/asmname.c | 134 +++++++++++++++++++++++++++++++++++++++---- dlls/fusion/tests/asmname.c | 97 +++++++++++++++++++++++++++++-- 3 files changed, 216 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8df789f0b81a9735dc6d6…

1 0

Marcus Meissner : gdi32: Rebuild font hash after changing the matrix.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: c30e4b8d6b1ef885776412ecf50fcb94e8bc7494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30e4b8d6b1ef885776412ecf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 20 00:17:10 2010 +0200 gdi32: Rebuild font hash after changing the matrix. (cherry picked from commit 2f7ec73adde1a87f788eebcf66ec8dd16bf9109f) --- dlls/gdi32/freetype.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ddb3d24..9d88211 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3780,12 +3780,23 @@ found: if(!face->scalable) { /* Windows uses integer scaling factors for bitmap fonts */ INT scale, scaled_height; + GdiFont *cachedfont; /* FIXME: rotation of bitmap fonts is ignored */ height = abs(GDI_ROUND( (double)height * ret->font_desc.matrix.eM22 )); if (ret->aveWidth) ret->aveWidth = (double)ret->aveWidth * ret->font_desc.matrix.eM11; ret->font_desc.matrix.eM11 = ret->font_desc.matrix.eM22 = 1.0; + dcmat.eM11 = dcmat.eM22 = 1.0; + /* As we changed the matrix, we need to search the cache for the font again, + * otherwise we might explode the cache. */ + if((cachedfont = find_in_cache(hfont, &lf, &dcmat, can_use_bitmap)) != NULL) { + TRACE("Found cached font after non-scalable matrix rescale!\n"); + free_font( ret ); + LeaveCriticalSection( &freetype_cs ); + return cachedfont; + } + calc_hash(&ret->font_desc); if (height != 0) height = diff; height += face->size.height;

1 0

Laura Leinonen : comdlg32: Update Finnish translation.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: e66b73e5d16951078e1c9efd827b06dad70311b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e66b73e5d16951078e1c9efd8… Author: Laura Leinonen <leinonen.laura(a)gmail.com> Date: Tue Oct 5 16:09:44 2010 +0300 comdlg32: Update Finnish translation. --- dlls/comdlg32/cdlg_Fi.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg_Fi.rc b/dlls/comdlg32/cdlg_Fi.rc index e5ea674..8329d41 100644 --- a/dlls/comdlg32/cdlg_Fi.rc +++ b/dlls/comdlg32/cdlg_Fi.rc @@ -440,6 +440,14 @@ sinun t PD32_PRINTER_STATUS_POWER_SAVE "Virrans��st�tila; " } +STRINGTABLE /* Font styles */ +{ + IDS_FONT_REGULAR "Tavallinen" + IDS_FONT_BOLD "Lihavoitu" + IDS_FONT_ITALIC "Kursivoitu" + IDS_FONT_BOLD_ITALIC "Lihavoitu kursivoitu" +} + STRINGTABLE /* Color names */ { IDS_COLOR_BLACK "Musta"

1 0

Hans Leidekker : msi: Put the uninstall key for 32-bit packages under Wow6432Node on 64-bit.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 52aab76eb23d1953c80b3a2b7730dd934e5d5eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=52aab76eb23d1953c80b3a2b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 5 16:37:33 2010 +0200 msi: Put the uninstall key for 32-bit packages under Wow6432Node on 64-bit. --- dlls/msi/action.c | 4 +- dlls/msi/msipriv.h | 4 +- dlls/msi/package.c | 2 +- dlls/msi/registry.c | 34 ++++++++++--- dlls/msi/tests/install.c | 119 +++++++++++++++++++++++++++++++++++++--------- 5 files changed, 128 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52aab76eb23d1953c80b3…

1 0

Alexandre Julliard : comctl32/propsheet: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: a37e5975dc9bfb93d069dc39370f172b965507a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37e5975dc9bfb93d069dc393… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:04:01 2010 +0200 comctl32/propsheet: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/propsheet.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index e25db1d..f711399 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1074,18 +1074,13 @@ static PADDING_INFO PROPSHEET_GetPaddingInfo(HWND hwndDlg) { HWND hwndTab = GetDlgItem(hwndDlg, IDC_TABCONTROL); RECT rcTab; - POINT tl; PADDING_INFO padding; GetWindowRect(hwndTab, &rcTab); + MapWindowPoints( 0, hwndDlg, (POINT *)&rcTab, 2 ); - tl.x = rcTab.left; - tl.y = rcTab.top; - - ScreenToClient(hwndDlg, &tl); - - padding.x = tl.x; - padding.y = tl.y; + padding.x = rcTab.left; + padding.y = rcTab.top; return padding; } @@ -1131,21 +1126,17 @@ static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheet hwndControl = GetDlgItem(hwndDlg, idButton); GetWindowRect(hwndControl, &rc); - + MapWindowPoints( 0, hwndDlg, (POINT *)&rc, 2 ); ptButton.x = rc.left; ptButton.y = rc.top; - ScreenToClient(hwndDlg, &ptButton); - /* Line */ hwndControl = GetDlgItem(hwndDlg, IDC_SUNKEN_LINE); GetWindowRect(hwndControl, &rc); - + MapWindowPoints( 0, hwndDlg, (POINT *)&rc, 2 ); ptLine.x = rc.left; ptLine.y = rc.bottom; - ScreenToClient(hwndDlg, &ptLine); - padding.y = ptButton.y - ptLine.y; if (padding.y < 0)

1 0

Alexandre Julliard : comctl32/toolbar: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: d8950a7ea633053e4e19a142de919fe9a9500a9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8950a7ea633053e4e19a142d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:04:08 2010 +0200 comctl32/toolbar: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 880477e..0b9dec2 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3049,7 +3049,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_NOMOVEY) { GetWindowRect(infoPtr->hwndSelf, &window_rect); - ScreenToClient(parent, (LPPOINT)&window_rect.left); + MapWindowPoints( 0, parent, (POINT *)&window_rect, 2 ); y = window_rect.top; } if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_BOTTOM)

1 0

Alexandre Julliard : comdlg32: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: 6d5bfce3eee9c957b4850780e96325bdf998d218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5bfce3eee9c957b4850780e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:04:15 2010 +0200 comdlg32: Fix incorrect use of the ScreenToClient function. --- dlls/comdlg32/printdlg.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 05d9401..d692e7d 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3487,8 +3487,7 @@ static INT_PTR CALLBACK pagesetup_dlg_proc(HWND hDlg, UINT uMsg, WPARAM wParam, SetPropW(hDlg, pagesetupdlg_prop, data); SetPropW(hDrawWnd, pagesetupdlg_prop, data); GetWindowRect(hDrawWnd, &data->rtDrawRect); /* Calculating rect in client coordinates where paper draws */ - ScreenToClient(hDlg, (LPPOINT)&data->rtDrawRect); - ScreenToClient(hDlg, (LPPOINT)(&data->rtDrawRect.right)); + MapWindowPoints( 0, hDlg, (LPPOINT)&data->rtDrawRect, 2 ); lpfnStaticWndProc = (WNDPROC)SetWindowLongPtrW( hDrawWnd, GWLP_WNDPROC,

1 0

Reece Dunn : jscript: Throw TypeError if T in 'new T' is not an object.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: master Commit: e368fd545ca20da61f36f49f61269b7a8c28dbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e368fd545ca20da61f36f49f6… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Fri Oct 1 19:19:29 2010 +0100 jscript: Throw TypeError if T in 'new T' is not an object. --- dlls/jscript/engine.c | 13 ++++++++++--- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8aed4db..8e43f70 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1562,10 +1562,17 @@ HRESULT new_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j if(FAILED(hres)) return hres; - if(V_VT(&constr) != VT_DISPATCH) { - FIXME("throw TypeError\n"); + /* NOTE: Should use to_object here */ + + if(V_VT(&constr) == VT_NULL) { VariantClear(&constr); - return E_FAIL; + return throw_type_error(ctx->parser->script, ei, IDS_OBJECT_EXPECTED, NULL); + } else if(V_VT(&constr) != VT_DISPATCH) { + VariantClear(&constr); + return throw_type_error(ctx->parser->script, ei, IDS_UNSUPPORTED_ACTION, NULL); + } else if(!V_DISPATCH(&constr)) { + VariantClear(&constr); + return throw_type_error(ctx->parser->script, ei, IDS_NO_PROPERTY, NULL); } hres = disp_call(ctx->parser->script, V_DISPATCH(&constr), DISPID_VALUE, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2e0ae0b..956ea55 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1894,6 +1894,9 @@ exception_test(function() {(new Object()) instanceof nullDisp;}, "TypeError", -2 exception_test(function() {"test" in 3;}, "TypeError", -2146823281); exception_test(function() {"test" in null;}, "TypeError", -2146823281); exception_test(function() {"test" in nullDisp;}, "TypeError", -2146823281); +exception_test(function() {new 3;}, "TypeError", -2146827843); +exception_test(function() {new null;}, "TypeError", -2146823281); +exception_test(function() {new nullDisp;}, "TypeError", -2146827850); function testThisExcept(func, number) { exception_test(function() {func.call(new Object())}, "TypeError", number);

1 0