October 2008 - Wine-Commits

Dylan Smith : richedit: Handle ctrl-key shortcuts on WM_KEYDOWN.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 5bcb15dd7f5182ba90d43e07f27373e054f4ebe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bcb15dd7f5182ba90d43e07f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Oct 21 20:43:47 2008 -0400 richedit: Handle ctrl-key shortcuts on WM_KEYDOWN. --- dlls/riched20/editor.c | 239 +++++++++++++++++++++++------------------- dlls/riched20/tests/editor.c | 10 +- 2 files changed, 138 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5bcb15dd7f5182ba90d43…

1 0

Dylan Smith : richedit: Added tests for ctrl-key shortcut handling in WM_KEYDOWN.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: aa3b75f6b74fa87641b1f2b5912fbb82feb4c2da URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa3b75f6b74fa87641b1f2b59… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Oct 21 20:43:43 2008 -0400 richedit: Added tests for ctrl-key shortcut handling in WM_KEYDOWN. Previously the shortcuts for cut, copy, paste, undo, redo, and select all were being handled during the WM_CHAR message. These tests show that these shortcuts should be handled with the WM_KEYDOWN message instead. --- dlls/riched20/tests/editor.c | 124 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 119 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5b721a2..948f519 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -111,6 +111,34 @@ static void simulate_typing_characters(HWND hwnd, const char* szChars) } } +static BOOL hold_key(int vk) +{ + BYTE key_state[256]; + BOOL result; + + result = GetKeyboardState((LPBYTE)&key_state); + ok(result, "GetKeyboardState failed.\n"); + if (!result) return FALSE; + key_state[vk] |= 0x80; + result = SetKeyboardState((LPBYTE)&key_state); + ok(result, "SetKeyboardState failed.\n"); + return result != 0; +} + +static BOOL release_key(int vk) +{ + BYTE key_state[256]; + BOOL result; + + result = GetKeyboardState((LPBYTE)&key_state); + ok(result, "GetKeyboardState failed.\n"); + if (!result) return FALSE; + key_state[vk] &= ~0x80; + result = SetKeyboardState((LPBYTE)&key_state); + ok(result, "SetKeyboardState failed.\n"); + return result != 0; +} + static const char haystack[] = "WINEWine wineWine wine WineWine"; /* ^0 ^10 ^20 ^30 */ @@ -4397,11 +4425,15 @@ static void test_WM_PASTE(void) const char* text3 = "testing paste\r\npaste\r\ntesting paste"; HWND hwndRichEdit = new_richedit(NULL); - /* Native riched20 won't obey WM_CHAR messages or WM_KEYDOWN/WM_KEYUP - messages, probably because it inspects the keyboard state itself. - Therefore, native requires this in order to obey Ctrl-<key> keystrokes. + /* Native riched20 inspects the keyboard state (e.g. GetKeyState) + * to test the state of the modifiers (Ctrl/Alt/Shift). + * + * Therefore Ctrl-<key> keystrokes need to be simulated with + * keybd_event or by using SetKeyboardState to set the modifiers + * and SendMessage to simulate the keystrokes. */ + /* Sent keystrokes with keybd_event */ #define SEND_CTRL_C(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'C') #define SEND_CTRL_X(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'X') #define SEND_CTRL_V(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'V') @@ -4418,13 +4450,14 @@ static void test_WM_PASTE(void) /* Pasted text should be visible at this step */ result = strcmp(text1_step1, buffer); ok(result == 0, - "test paste: strcmp = %i\n", result); + "test paste: strcmp = %i, text='%s'\n", result, buffer); + SEND_CTRL_Z(hwndRichEdit); /* Undo */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Text should be the same as before (except for \r -> \r\n conversion) */ result = strcmp(text1_after, buffer); ok(result == 0, - "test paste: strcmp = %i\n", result); + "test paste: strcmp = %i, text='%s'\n", result, buffer); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text2); SendMessage(hwndRichEdit, EM_SETSEL, 8, 13); @@ -4449,6 +4482,87 @@ static void test_WM_PASTE(void) ok(result == 0, "test paste: strcmp = %i\n", result); +#undef SEND_CTRL_C +#undef SEND_CTRL_X +#undef SEND_CTRL_V +#undef SEND_CTRL_Z +#undef SEND_CTRL_Y + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) NULL); + /* Send WM_CHAR to simulates Ctrl-V */ + SendMessage(hwndRichEdit, WM_CHAR, 22, + (MapVirtualKey('V', MAPVK_VK_TO_VSC) << 16) & 1); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + /* Shouldn't paste because pasting is handled by WM_KEYDOWN */ + result = strcmp(buffer,""); + todo_wine ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + + /* Send keystrokes with WM_KEYDOWN after setting the modifiers + * with SetKeyboard state. */ + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) NULL); + /* Simulates paste (Ctrl-V) */ + hold_key(VK_CONTROL); + SendMessage(hwndRichEdit, WM_KEYDOWN, 'V', + (MapVirtualKey('V', MAPVK_VK_TO_VSC) << 16) & 1); + release_key(VK_CONTROL); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = strcmp(buffer,"paste"); + todo_wine ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text1); + SendMessage(hwndRichEdit, EM_SETSEL, 0, 7); + /* Simulates copy (Ctrl-C) */ + hold_key(VK_CONTROL); + SendMessage(hwndRichEdit, WM_KEYDOWN, 'C', + (MapVirtualKey('C', MAPVK_VK_TO_VSC) << 16) & 1); + release_key(VK_CONTROL); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) NULL); + SendMessage(hwndRichEdit, WM_PASTE, 0, 0); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = strcmp(buffer,"testing"); + todo_wine ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + + /* Cut with WM_KEYDOWN to simulate Ctrl-X */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "cut"); + /* Simulates select all (Ctrl-A) */ + hold_key(VK_CONTROL); + SendMessage(hwndRichEdit, WM_KEYDOWN, 'A', + (MapVirtualKey('A', MAPVK_VK_TO_VSC) << 16) & 1); + /* Simulates select cut (Ctrl-X) */ + SendMessage(hwndRichEdit, WM_KEYDOWN, 'X', + (MapVirtualKey('X', MAPVK_VK_TO_VSC) << 16) & 1); + release_key(VK_CONTROL); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = strcmp(buffer,""); + todo_wine ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) NULL); + SendMessage(hwndRichEdit, WM_PASTE, 0, 0); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = strcmp(buffer,"cut\r\n"); + todo_wine ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + /* Simulates undo (Ctrl-Z) */ + hold_key(VK_CONTROL); + SendMessage(hwndRichEdit, WM_KEYDOWN, 'Z', + (MapVirtualKey('Z', MAPVK_VK_TO_VSC) << 16) & 1); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = strcmp(buffer,""); + todo_wine ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + /* Simulates redo (Ctrl-Y) */ + SendMessage(hwndRichEdit, WM_KEYDOWN, 'Y', + (MapVirtualKey('Y', MAPVK_VK_TO_VSC) << 16) & 1); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = strcmp(buffer,"cut\r\n"); + todo_wine ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + release_key(VK_CONTROL); + DestroyWindow(hwndRichEdit); }

1 0

Jacek Caban : jscript: Return NaN in Math. ceil if called without any argument.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 9f1699b9a44f95eb7fa2f347121092984e9ce5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1699b9a44f95eb7fa2f3471… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 21 16:56:27 2008 -0700 jscript: Return NaN in Math.ceil if called without any argument. --- dlls/jscript/math.c | 5 +++-- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index d3d59ae..e6b7202 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -174,8 +174,9 @@ static HRESULT Math_ceil(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * TRACE("\n"); if(!arg_cnt(dp)) { - FIXME("arg_cnt = 0\n"); - return E_NOTIMPL; + if(retv) + num_set_nan(retv); + return S_OK; } hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d613eb1..6378bdd 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -431,6 +431,9 @@ ok(tmp === 1, "Math.ceil(true) = " + tmp); tmp = Math.ceil(1.1, 3, 4); ok(tmp === 2, "Math.ceil(1.1, 3, 4) = " + tmp); +tmp = Math.ceil(); +ok(isNaN(tmp), "ceil() is not NaN"); + tmp = Math.floor(0.5); ok(tmp === 0, "Math.floor(0.5) = " + tmp);

1 0

Jacek Caban : jscript: Added Math.floor implementation.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 9709eadca1be7d618243499386de3b957b83f111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9709eadca1be7d61824349938… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 21 16:56:15 2008 -0700 jscript: Added Math.floor implementation. --- dlls/jscript/math.c | 20 ++++++++++++++++++-- dlls/jscript/tests/api.js | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 1d37de5..d3d59ae 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -204,8 +204,24 @@ static HRESULT Math_exp(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d static HRESULT Math_floor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) + num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) + num_set_val(retv, floor(num_val(&v))); + return S_OK; } static HRESULT Math_log(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 602b7df..d613eb1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -431,6 +431,24 @@ ok(tmp === 1, "Math.ceil(true) = " + tmp); tmp = Math.ceil(1.1, 3, 4); ok(tmp === 2, "Math.ceil(1.1, 3, 4) = " + tmp); +tmp = Math.floor(0.5); +ok(tmp === 0, "Math.floor(0.5) = " + tmp); + +tmp = Math.floor(-0.5); +ok(tmp === -1, "Math.floor(-0.5) = " + tmp); + +tmp = Math.floor(1.1); +ok(tmp === 1, "Math.floor(1.1) = " + tmp); + +tmp = Math.floor(true); +ok(tmp === 1, "Math.floor(true) = " + tmp); + +tmp = Math.floor(1.1, 3, 4); +ok(tmp === 1, "Math.floor(1.1, 3, 4) = " + tmp); + +tmp = Math.floor(); +ok(isNaN(tmp), "floor is not NaN"); + tmp = Math.abs(3); ok(tmp === 3, "Math.abs(3) = " + tmp);

1 0

James Hawkins : msi: Only compare the file version if a version was specified.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: f18c6ba28dc677934e7bd9776188759303ead278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18c6ba28dc677934e7bd9776… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Oct 21 16:13:40 2008 -0500 msi: Only compare the file version if a version was specified. --- dlls/msi/appsearch.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index a9113c9..dc885bc 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -657,9 +657,10 @@ static UINT ACTION_FileVersionMatches(const MSISIGNATURE *sig, LPCWSTR filePath, HIWORD(sig->MinVersionLS), LOWORD(sig->MinVersionLS)); } - else if (info->dwFileVersionMS > sig->MaxVersionMS - || (info->dwFileVersionMS == sig->MaxVersionMS && - info->dwFileVersionLS > sig->MaxVersionLS)) + else if ((sig->MaxVersionMS || sig->MaxVersionLS) && + (info->dwFileVersionMS > sig->MaxVersionMS || + (info->dwFileVersionMS == sig->MaxVersionMS && + info->dwFileVersionLS > sig->MaxVersionLS))) { TRACE("Greater than maximum version %d.%d.%d.%d\n", HIWORD(sig->MaxVersionMS),

1 0

Aric Stewart : comdlg32: Some applications expect the filter combo to be filled before the CustomDlg is created .
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 45a352a7734a373d7992f8387c8e2c372f6653c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a352a7734a373d7992f8387… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 21 13:11:23 2008 -0500 comdlg32: Some applications expect the filter combo to be filled before the CustomDlg is created. --- dlls/comdlg32/filedlg.c | 7 ++++--- dlls/comdlg32/tests/filedlg.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index dd47528..65d73d2 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1388,6 +1388,10 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) LoadStringW(COMDLG32_hInstance, IDS_SAVE_IN, buf, sizeof(buf)/sizeof(WCHAR)); SetDlgItemTextW(hwnd, IDC_LOOKINSTATIC, buf); } + + /* Initialize the filter combo box */ + FILEDLG95_FILETYPE_Init(hwnd); + return 0; } @@ -1476,9 +1480,6 @@ static LRESULT FILEDLG95_FillControls(HWND hwnd, WPARAM wParam, LPARAM lParam) /* Initialize the Look In combo box */ FILEDLG95_LOOKIN_Init(fodInfos->DlgInfos.hwndLookInCB); - /* Initialize the filter combo box */ - FILEDLG95_FILETYPE_Init(hwnd); - /* Browse to the initial directory */ IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser,pidlItemId, SBSP_ABSOLUTE); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 6cfcd17..c3ca118 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -207,6 +207,17 @@ cleanup: static LONG_PTR WINAPI template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { + if (msg == WM_INITDIALOG) + { + HWND p,cb; + INT sel; + p = GetParent(dlg); + ok(p!=(HWND)NULL, "Failed to get parent of template\n"); + cb = GetDlgItem(p,0x470); + ok(cb!=(HWND)NULL, "Failed to get filter combobox\n"); + sel = SendMessage(cb, CB_GETCURSEL, 0, 0); + ok (sel != -1, "Failed to get selection from filter listbox\n"); + } if (msg == WM_NOTIFY) { if (((LPNMHDR)lParam)->code == CDN_FOLDERCHANGE) @@ -245,6 +256,7 @@ static void test_create_view_template(void) ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE; ofn.hInstance = GetModuleHandleW(NULL); ofn.lpTemplateName = "template1"; + ofn.lpstrFilter="text\0*.txt\0All\0*\0\0"; ret = GetOpenFileNameA(&ofn); ok(!ret, "GetOpenFileNameA returned %#x\n", ret); ret = CommDlgExtendedError();

1 0

Aric Stewart : comdlg32/tests: Add a test for GetOpenFileName with a dialog template.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: faa956f53765e4d31c2cf5f304bbaa13eca8eda9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa956f53765e4d31c2cf5f30… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 21 13:10:59 2008 -0500 comdlg32/tests: Add a test for GetOpenFileName with a dialog template. --- dlls/comdlg32/tests/Makefile.in | 2 ++ dlls/comdlg32/tests/filedlg.c | 30 ++++++++++++++++++++++++++++++ dlls/comdlg32/tests/rsrc.rc | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/Makefile.in b/dlls/comdlg32/tests/Makefile.in index fae9717..11ee930 100644 --- a/dlls/comdlg32/tests/Makefile.in +++ b/dlls/comdlg32/tests/Makefile.in @@ -9,6 +9,8 @@ CTESTS = \ filedlg.c \ printdlg.c +RC_SRCS = rsrc.rc + @MAKE_TEST_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 86895dc..6cfcd17 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -205,6 +205,16 @@ cleanup: return 0; } +static LONG_PTR WINAPI template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_NOTIFY) + { + if (((LPNMHDR)lParam)->code == CDN_FOLDERCHANGE) + PostMessage(GetParent(dlg), WM_COMMAND, IDCANCEL, 0); + } + return 0; +} + static void test_create_view_window2(void) { OPENFILENAMEA ofn = {0}; @@ -222,8 +232,28 @@ static void test_create_view_window2(void) ok(!ret, "CommDlgExtendedError returned %#x\n", ret); } +static void test_create_view_template(void) +{ + OPENFILENAMEA ofn = {0}; + char filename[1024] = {0}; + DWORD ret; + + ofn.lStructSize = sizeof(ofn); + ofn.lpstrFile = filename; + ofn.nMaxFile = 1042; + ofn.lpfnHook = (LPOFNHOOKPROC)template_hook; + ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE; + ofn.hInstance = GetModuleHandleW(NULL); + ofn.lpTemplateName = "template1"; + ret = GetOpenFileNameA(&ofn); + ok(!ret, "GetOpenFileNameA returned %#x\n", ret); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); +} + START_TEST(filedlg) { test_DialogCancel(); test_create_view_window2(); + test_create_view_template(); } diff --git a/dlls/comdlg32/tests/rsrc.rc b/dlls/comdlg32/tests/rsrc.rc new file mode 100644 index 0000000..51415fd --- /dev/null +++ b/dlls/comdlg32/tests/rsrc.rc @@ -0,0 +1,34 @@ +/* Resources for the common dialog unit test suite. + * + * Copyright 2008 CodeWeavers, Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winuser.h" + +TEMPLATE1 DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS +FONT 8, "MS Shell Dlg" +{ + LTEXT "Path:",-1,28,4,36,8 + LTEXT "Text1",-1,4,16,20,40 + LTEXT "Selected:",-1,32,49,40,8 + EDITTEXT 55,74,47,200,12,ES_AUTOHSCROLL + LTEXT "Text2",-1,232,20,65,8 + LTEXT "",-1,28,16,204,31 + EDITTEXT 56,65,2,200,12,ES_AUTOHSCROLL +}

1 0

Nikolay Sivov : gdiplus: Added Gdip[Get/Set]TextureWrapMode.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 37bbe9d4bc241b6cd92c776148554b103b4f1cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37bbe9d4bc241b6cd92c77614… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 21 19:39:21 2008 +0400 gdiplus: Added Gdip[Get/Set]TextureWrapMode. --- dlls/gdiplus/brush.c | 33 +++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/tests/brush.c | 49 ++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 5 files changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 8bf09ef..edccb10 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -605,6 +605,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, (*texture)->brush.gdibrush = CreateBrushIndirect(&(*texture)->brush.lb); (*texture)->brush.bt = BrushTypeTextureFill; + (*texture)->wrap = imageattr->wrap; GdipFree(dibits); GdipFree(buff); @@ -913,6 +914,21 @@ GpStatus WINGDIPAPI GdipGetTextureTransform(GpTexture *brush, GpMatrix *matrix) } /****************************************************************************** + * GdipGetTextureWrapMode [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetTextureWrapMode(GpTexture *brush, GpWrapMode *wrapmode) +{ + TRACE("(%p, %p)\n", brush, wrapmode); + + if(!brush || !wrapmode) + return InvalidParameter; + + *wrapmode = brush->wrap; + + return Ok; +} + +/****************************************************************************** * GdipResetTextureTransform [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipResetTextureTransform(GpTexture* brush) @@ -1138,6 +1154,23 @@ GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *texture, return Ok; } +/****************************************************************************** + * GdipSetTextureWrapMode [GDIPLUS.@] + * + * WrapMode not used, only stored + */ +GpStatus WINGDIPAPI GdipSetTextureWrapMode(GpTexture *brush, GpWrapMode wrapmode) +{ + TRACE("(%p, %d)\n", brush, wrapmode); + + if(!brush) + return InvalidParameter; + + brush->wrap = wrapmode; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient *brush, ARGB color1, ARGB color2) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3ef4271..ef53b9b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -399,7 +399,7 @@ @ stdcall GdipGetTextRenderingHint(ptr ptr) @ stub GdipGetTextureImage @ stdcall GdipGetTextureTransform(ptr ptr) -@ stub GdipGetTextureWrapMode +@ stdcall GdipGetTextureWrapMode(ptr ptr) @ stub GdipGetVisibleClipBounds @ stub GdipGetVisibleClipBoundsI @ stdcall GdipGetWorldTransform(ptr ptr) @@ -596,7 +596,7 @@ @ stub GdipSetTextContrast @ stdcall GdipSetTextRenderingHint(ptr long) @ stdcall GdipSetTextureTransform(ptr ptr) -@ stub GdipSetTextureWrapMode +@ stdcall GdipSetTextureWrapMode(ptr long) @ stdcall GdipSetWorldTransform(ptr ptr) @ stdcall GdipShearMatrix(ptr long long long) @ stdcall GdipStartPathFigure(ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0ca2714..05549b4 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -139,6 +139,7 @@ struct GpLineGradient{ struct GpTexture{ GpBrush brush; GpMatrix *transform; + WrapMode wrap; /* not used yet */ }; struct GpPath{ diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 9dd343b..ae83184 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -235,6 +235,54 @@ static void test_transform(void) ReleaseDC(0, hdc); } +static void test_texturewrap(void) +{ + GpStatus status; + GpTexture *texture; + GpGraphics *graphics = NULL; + GpBitmap *bitmap; + HDC hdc = GetDC(0); + GpWrapMode wrap; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + status = GdipCreateBitmapFromGraphics(1, 1, graphics, &bitmap); + expect(Ok, status); + + status = GdipCreateTexture((GpImage*)bitmap, WrapModeTile, &texture); + expect(Ok, status); + + /* NULL */ + status = GdipGetTextureWrapMode(NULL, NULL); + expect(InvalidParameter, status); + status = GdipGetTextureWrapMode(texture, NULL); + expect(InvalidParameter, status); + status = GdipGetTextureWrapMode(NULL, &wrap); + expect(InvalidParameter, status); + + /* get */ + wrap = WrapModeClamp; + status = GdipGetTextureWrapMode(texture, &wrap); + expect(Ok, status); + expect(WrapModeTile, wrap); + /* set, then get */ + wrap = WrapModeClamp; + status = GdipSetTextureWrapMode(texture, wrap); + expect(Ok, status); + wrap = WrapModeTile; + status = GdipGetTextureWrapMode(texture, &wrap); + expect(Ok, status); + expect(WrapModeClamp, wrap); + + status = GdipDeleteBrush((GpBrush*)texture); + expect(Ok, status); + status = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, status); + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + ReleaseDC(0, hdc); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -254,6 +302,7 @@ START_TEST(brush) test_getbounds(); test_getgamma(); test_transform(); + test_texturewrap(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8df65f4..4968792 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -208,6 +208,8 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage*,GDIPCONST GpImageAttributes*, REAL,REAL,REAL,REAL,GpTexture**); GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage*,GDIPCONST GpImageAttributes*, INT,INT,INT,INT,GpTexture**); +GpStatus WINGDIPAPI GdipGetTextureWrapMode(GpTexture*, GpWrapMode*); +GpStatus WINGDIPAPI GdipSetTextureWrapMode(GpTexture*, GpWrapMode); GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*);

1 0

Rob Shearman : wpp: Check for overflows when parsing integer constants.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 92f5aa0a69e6c5a581c4c83ced5493c525f047bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f5aa0a69e6c5a581c4c83ce… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Oct 21 15:14:11 2008 +0100 wpp: Check for overflows when parsing integer constants. --- libs/wpp/ppl.l | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 3e84a2e..e71bf6e 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -163,6 +163,16 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] #include <string.h> #include <ctype.h> #include <assert.h> +#include <errno.h> +#include <limits.h> + +#ifndef LLONG_MAX +# define LLONG_MAX ((long long)0x7fffffff << 32 | 0xffffffff) +# define LLONG_MIN (-LLONG_MAX - 1) +#endif +#ifndef ULLONG_MAX +# define ULLONG_MAX ((long long)0xffffffff << 32 | 0xffffffff) +#endif #ifndef HAVE_UNISTD_H #define YY_NO_UNISTD_H @@ -790,6 +800,7 @@ static int make_number(int radix, YYSTYPE *val, const char *str, int len) int is_ll = 0; int is_u = 0; char ext[4]; + long l; ext[3] = '\0'; ext[2] = toupper(str[len-1]); @@ -827,12 +838,18 @@ static int make_number(int radix, YYSTYPE *val, const char *str, int len) #ifdef HAVE_LONG_LONG if (is_u) { + errno = 0; val->ull = strtoull(str, NULL, radix); + if (val->ull == ULLONG_MAX && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tULONGLONG; } else { + errno = 0; val->sll = strtoll(str, NULL, radix); + if ((val->sll == LLONG_MIN || val->sll == LLONG_MAX) && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tSLONGLONG; } #else @@ -841,22 +858,38 @@ static int make_number(int radix, YYSTYPE *val, const char *str, int len) } else if(is_u && is_l) { + errno = 0; val->ulong = strtoul(str, NULL, radix); + if (val->ulong == ULONG_MAX && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tULONG; } else if(!is_u && is_l) { + errno = 0; val->slong = strtol(str, NULL, radix); + if ((val->slong == LONG_MIN || val->slong == LONG_MAX) && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tSLONG; } else if(is_u && !is_l) { - val->uint = (unsigned int)strtoul(str, NULL, radix); + unsigned long ul; + errno = 0; + ul = strtoul(str, NULL, radix); + if ((ul == ULONG_MAX && errno == ERANGE) || (ul > UINT_MAX)) + ppy_error("integer constant %s is too large\n", str); + val->uint = (unsigned int)ul; return tUINT; } /* Else it must be an int... */ - val->sint = (int)strtol(str, NULL, radix); + errno = 0; + l = strtol(str, NULL, radix); + if (((l == LONG_MIN || l == LONG_MAX) && errno == ERANGE) || + (l > INT_MAX) || (l < INT_MIN)) + ppy_error("integer constant %s is too large\n", str); + val->sint = (int)l; return tSINT; }

1 0

Henri Verbeet : dxgi: Add the IDXGIFactory interface.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 6a517b78511cfba28ba4c785c57265c9c2d7c613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a517b78511cfba28ba4c785c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 21 15:06:58 2008 +0200 dxgi: Add the IDXGIFactory interface. --- include/dxgi.idl | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index 9ac585a..c1eae50 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -263,3 +263,34 @@ interface IDXGISwapChain : IDXGIDeviceSubObject [out] UINT *last_present_count ); } + +[ + object, + local, + uuid(7b7166ec-21c7-44ae-b21a-c9ae321ae369) +] +interface IDXGIFactory : IDXGIObject +{ + HRESULT EnumAdapters( + [in] UINT adapter_idx, + [out] IDXGIAdapter **adapter + ); + HRESULT MakeWindowAssociation( + [in] HWND window, + [in] UINT flags + ); + HRESULT GetWindowAssociation( + [in] HWND *window + ); + HRESULT CreateSwapChain( + [in] IUnknown *device, + [in] DXGI_SWAP_CHAIN_DESC *desc, + [out] IDXGISwapChain **swapchain + ); + HRESULT CreateSoftwareAdapter( + [in] HMODULE swrast, + [out] IDXGIAdapter **adapter + ); +} + +[local] HRESULT CreateDXGIFactory(REFIID riid, void **factory);

1 0