September 2007 - Wine-commits

Stefan Leichter : dinput8: Remove 'recursive registry key delete' function.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 51f27e1549ccdf2a939d2adc11032851a065c539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f27e1549ccdf2a939d2adc1… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Sep 24 10:40:40 2007 +0200 dinput8: Remove 'recursive registry key delete' function. --- dlls/dinput8/regsvr.c | 73 +++---------------------------------------------- 1 files changed, 4 insertions(+), 69 deletions(-) diff --git a/dlls/dinput8/regsvr.c b/dlls/dinput8/regsvr.c index c278ed3..3d8cdc9 100644 --- a/dlls/dinput8/regsvr.c +++ b/dlls/dinput8/regsvr.c @@ -93,9 +93,6 @@ static LONG register_key_defvalueW(HKEY base, WCHAR const *name, WCHAR const *value); static LONG register_key_defvalueA(HKEY base, WCHAR const *name, char const *value); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_coclasses @@ -199,11 +196,13 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -255,70 +254,6 @@ static LONG register_key_defvalueA( } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */

1 0

Stefan Leichter : dinput: Remove 'recursive registry key delete' function.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: dd8c4a9583846b3ff5afa0637a9f54850d7c6d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8c4a9583846b3ff5afa0637… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Sep 24 10:53:23 2007 +0200 dinput: Remove 'recursive registry key delete' function. --- dlls/dinput/regsvr.c | 79 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/dinput/regsvr.c b/dlls/dinput/regsvr.c index fed3aad..ac1ffc1 100644 --- a/dlls/dinput/regsvr.c +++ b/dlls/dinput/regsvr.c @@ -115,9 +115,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -206,7 +203,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -313,16 +311,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -435,70 +436,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Mikołaj Zalewski : advapi32: Add some more rights constants for ConvertStringSecurityDescriptorToSecurityDescriptor .
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 5b4aa62fd2ae961a2c4017d766b728b834b705cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4aa62fd2ae961a2c4017d76… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Sep 22 21:26:05 2007 -0700 advapi32: Add some more rights constants for ConvertStringSecurityDescriptorToSecurityDescriptor. --- dlls/advapi32/security.c | 44 ++++++++++++++++++++++++++++++++++++++++ dlls/advapi32/tests/security.c | 3 -- include/iads.idl | 24 +++++++++++++++++++++ 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4c41e0c..5e43203 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -35,6 +35,8 @@ #include "sddl.h" #include "winsvc.h" #include "aclapi.h" +#include "objbase.h" +#include "iads.h" #include "advapi32_misc.h" #include "wine/debug.h" @@ -246,6 +248,27 @@ static const WCHAR SDDL_READ_CONTROL[] = {'R','C',0}; static const WCHAR SDDL_WRITE_DAC[] = {'W','D',0}; static const WCHAR SDDL_WRITE_OWNER[] = {'W','O',0}; static const WCHAR SDDL_STANDARD_DELETE[] = {'S','D',0}; + +static const WCHAR SDDL_READ_PROPERTY[] = {'R','P',0}; +static const WCHAR SDDL_WRITE_PROPERTY[] = {'W','P',0}; +static const WCHAR SDDL_CREATE_CHILD[] = {'C','C',0}; +static const WCHAR SDDL_DELETE_CHILD[] = {'D','C',0}; +static const WCHAR SDDL_LIST_CHILDREN[] = {'L','C',0}; +static const WCHAR SDDL_SELF_WRITE[] = {'S','W',0}; +static const WCHAR SDDL_LIST_OBJECT[] = {'L','O',0}; +static const WCHAR SDDL_DELETE_TREE[] = {'D','T',0}; +static const WCHAR SDDL_CONTROL_ACCESS[] = {'C','R',0}; + +static const WCHAR SDDL_FILE_ALL[] = {'F','A',0}; +static const WCHAR SDDL_FILE_READ[] = {'F','R',0}; +static const WCHAR SDDL_FILE_WRITE[] = {'F','W',0}; +static const WCHAR SDDL_FILE_EXECUTE[] = {'F','X',0}; + +static const WCHAR SDDL_KEY_ALL[] = {'K','A',0}; +static const WCHAR SDDL_KEY_READ[] = {'K','R',0}; +static const WCHAR SDDL_KEY_WRITE[] = {'K','W',0}; +static const WCHAR SDDL_KEY_EXECUTE[] = {'K','X',0}; + static const WCHAR SDDL_GENERIC_ALL[] = {'G','A',0}; static const WCHAR SDDL_GENERIC_READ[] = {'G','R',0}; static const WCHAR SDDL_GENERIC_WRITE[] = {'G','W',0}; @@ -3107,10 +3130,31 @@ static const ACEFLAG AceRights[] = { SDDL_GENERIC_READ, GENERIC_READ }, { SDDL_GENERIC_WRITE, GENERIC_WRITE }, { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, + { SDDL_READ_CONTROL, READ_CONTROL }, { SDDL_STANDARD_DELETE, DELETE }, { SDDL_WRITE_DAC, WRITE_DAC }, { SDDL_WRITE_OWNER, WRITE_OWNER }, + + { SDDL_READ_PROPERTY, ADS_RIGHT_DS_READ_PROP}, + { SDDL_WRITE_PROPERTY, ADS_RIGHT_DS_WRITE_PROP}, + { SDDL_CREATE_CHILD, ADS_RIGHT_DS_CREATE_CHILD}, + { SDDL_DELETE_CHILD, ADS_RIGHT_DS_DELETE_CHILD}, + { SDDL_LIST_CHILDREN, ADS_RIGHT_ACTRL_DS_LIST}, + { SDDL_SELF_WRITE, ADS_RIGHT_DS_SELF}, + { SDDL_LIST_OBJECT, ADS_RIGHT_DS_LIST_OBJECT}, + { SDDL_DELETE_TREE, ADS_RIGHT_DS_DELETE_TREE}, + { SDDL_CONTROL_ACCESS, ADS_RIGHT_DS_CONTROL_ACCESS}, + + { SDDL_FILE_ALL, FILE_ALL_ACCESS }, + { SDDL_FILE_READ, FILE_GENERIC_READ }, + { SDDL_FILE_WRITE, FILE_GENERIC_WRITE }, + { SDDL_FILE_EXECUTE, FILE_GENERIC_EXECUTE }, + + { SDDL_KEY_ALL, KEY_ALL_ACCESS }, + { SDDL_KEY_READ, KEY_READ }, + { SDDL_KEY_WRITE, KEY_WRITE }, + { SDDL_KEY_EXECUTE, KEY_EXECUTE }, { NULL, 0 }, }; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9756ca8..86c4c50 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1848,19 +1848,16 @@ static void test_ConvertStringSecurityDescriptor(void) SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, &pSD, NULL); - todo_wine ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, &pSD, NULL); - todo_wine ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, &pSD, NULL); - todo_wine ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); diff --git a/include/iads.idl b/include/iads.idl index 08cbfe8..ce38bfe 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -18,6 +18,30 @@ import "oaidl.idl"; +typedef enum +{ + ADS_RIGHT_DS_CREATE_CHILD = 0x00000001, + ADS_RIGHT_DS_DELETE_CHILD = 0x00000002, + ADS_RIGHT_ACTRL_DS_LIST = 0x00000004, + ADS_RIGHT_DS_SELF = 0x00000008, + ADS_RIGHT_DS_READ_PROP = 0x00000010, + ADS_RIGHT_DS_WRITE_PROP = 0x00000020, + ADS_RIGHT_DS_DELETE_TREE = 0x00000040, + ADS_RIGHT_DS_LIST_OBJECT = 0x00000080, + ADS_RIGHT_DS_CONTROL_ACCESS = 0x00000100, + + ADS_RIGHT_DELETE = 0x00010000, + ADS_RIGHT_READ_CONTROL = 0x00020000, + ADS_RIGHT_WRITE_DAC = 0x00040000, + ADS_RIGHT_WRITE_OWNER = 0x00080000, + ADS_RIGHT_SYNCHRONIZE = 0x00100000, + ADS_RIGHT_ACCESS_SYSTEM_SECURITY = 0x00200000, + + ADS_RIGHT_GENERIC_ALL = 0x10000000, + ADS_RIGHT_GENERIC_EXECUTE = 0x20000000, + ADS_RIGHT_GENERIC_WRITE = 0x40000000, + ADS_RIGHT_GENERIC_READ = 0x80000000 +} ADS_RIGHTS_ENUM; /***************************************************************************** * IADsContainer interface

1 0

Alex Villacís Lasso : riched20: Tests show WM_GETTEXT change \r to \r\n.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 47316d62bb82b7f46c5f759ceea159c47992f864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47316d62bb82b7f46c5f759ce… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Sep 23 00:59:33 2007 -0500 riched20: Tests show WM_GETTEXT change \r to \r\n. --- dlls/riched20/tests/editor.c | 92 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5c00586..a0b04e0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -910,6 +910,71 @@ static void test_ES_PASSWORD(void) DestroyWindow(hwndRichEdit); } +static void test_WM_SETTEXT() +{ + HWND hwndRichEdit = new_richedit(NULL); + const char * TestItem1 = "TestSomeText"; + const char * TestItem2 = "TestSomeText\r"; + const char * TestItem2_after = "TestSomeText\r\n"; + const char * TestItem3 = "TestSomeText\rSomeMoreText\r"; + const char * TestItem3_after = "TestSomeText\r\nSomeMoreText\r\n"; + char buf[1024] = {0}; + LRESULT result; + + /* This test attempts to show that WM_SETTEXT on a riched20 control causes + any solitary \r to be converted to \r\n on return. Properly paired + \r\n are not affected. + */ + + result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem1); + ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); + ok (result == strlen(buf), + "WM_GETTEXT returned %ld instead of expected %u\n", + result, strlen(buf)); + result = strcmp(TestItem1, buf); + ok(result == 0, + "WM_SETTEXT round trip: strcmp = %ld\n", result); + + result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem2); + ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); + ok (result == strlen(buf), + "WM_GETTEXT returned %ld instead of expected %u\n", + result, strlen(buf)); + result = strcmp(TestItem2_after, buf); + todo_wine { + ok(result == 0, + "WM_SETTEXT round trip: strcmp = %ld\n", result); + } + + result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem3); + ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); + ok (result == strlen(buf), + "WM_GETTEXT returned %ld instead of expected %u\n", + result, strlen(buf)); + result = strcmp(TestItem3_after, buf); + todo_wine { + ok(result == 0, + "WM_SETTEXT round trip: strcmp = %ld\n", result); + } + + result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem3_after); + ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); + ok (result == strlen(buf), + "WM_GETTEXT returned %ld instead of expected %u\n", + result, strlen(buf)); + result = strcmp(TestItem3_after, buf); + todo_wine { + ok(result == 0, + "WM_SETTEXT round trip: strcmp = %ld\n", result); + } + + DestroyWindow(hwndRichEdit); +} + static void test_EM_SETTEXTEX(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -918,6 +983,11 @@ static void test_EM_SETTEXTEX(void) WCHAR TestItem1[] = {'T', 'e', 's', 't', 'S', 'o', 'm', 'e', 'T', 'e', 'x', 't', 0}; + WCHAR TestItem2[] = {'T', 'e', 's', 't', + 'S', 'o', 'm', 'e', + 'T', 'e', 'x', 't', + '\r', 0}; + const char * TestItem2_after = "TestSomeText\r\n"; #define MAX_BUF_LEN 1024 WCHAR buf[MAX_BUF_LEN]; int result; @@ -934,6 +1004,27 @@ static void test_EM_SETTEXTEX(void) ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); + /* Unlike WM_SETTEXT/WM_GETTEXT pair, EM_SETTEXTEX/EM_GETTEXTEX does not + convert \r to \r\n on return + */ + setText.codepage = 1200; /* no constant for unicode */ + getText.codepage = 1200; /* no constant for unicode */ + getText.cb = MAX_BUF_LEN; + getText.flags = GT_DEFAULT; + + setText.flags = 0; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem2); + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + ok(lstrcmpW(buf, TestItem2) == 0, + "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); + + /* However, WM_GETTEXT *does* see \r\n where EM_GETTEXTEX would see \r */ + SendMessage(hwndRichEdit, WM_GETTEXT, MAX_BUF_LEN, (LPARAM)buf); + todo_wine { + ok(strcmp((const char *)buf, TestItem2_after) == 0, + "WM_GETTEXT did *not* see \\r converted to \\r\\n pairs.\n"); + } + result = SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) NULL); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -2031,6 +2122,7 @@ START_TEST( editor ) test_EM_GETLINE(); test_EM_SCROLLCARET(); test_EM_SCROLL(); + test_WM_SETTEXT(); test_EM_SETTEXTMODE(); test_TM_PLAINTEXT(); test_EM_SETOPTIONS();

1 0

Alex Villacís Lasso : riched20: Fix WM_GETTEXT to change \r to \r\n.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 00e562735dd5e092b6149944ef09dd7f2ec97f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e562735dd5e092b6149944e… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Sep 23 16:40:28 2007 -0500 riched20: Fix WM_GETTEXT to change \r to \r\n. --- dlls/riched20/editor.c | 13 ++++++++----- dlls/riched20/tests/editor.c | 13 +++---------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index dff0b5f..a10c954 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1983,11 +1983,14 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return ME_GetTextLengthEx(editor, (GETTEXTLENGTHEX *)wParam); case WM_GETTEXT: { - TEXTRANGEW tr; /* W and A differ only by rng->lpstrText */ - tr.chrg.cpMin = 0; - tr.chrg.cpMax = wParam ? (wParam - 1) : 0; - tr.lpstrText = (WCHAR *)lParam; - return RichEditWndProc_common(hWnd, EM_GETTEXTRANGE, 0, (LPARAM)&tr, unicode); + GETTEXTEX ex; + + ex.cb = wParam; + ex.flags = GT_USECRLF; + ex.codepage = unicode ? 1200 : CP_ACP; + ex.lpDefaultChar = NULL; + ex.lpUsedDefaultChar = NULL; + return RichEditWndProc_common(hWnd, EM_GETTEXTEX, (WPARAM)&ex, lParam, unicode); } case EM_GETTEXTEX: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a0b04e0..1c564ec 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -943,10 +943,8 @@ static void test_WM_SETTEXT() "WM_GETTEXT returned %ld instead of expected %u\n", result, strlen(buf)); result = strcmp(TestItem2_after, buf); - todo_wine { ok(result == 0, "WM_SETTEXT round trip: strcmp = %ld\n", result); - } result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem3); ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); @@ -955,10 +953,8 @@ static void test_WM_SETTEXT() "WM_GETTEXT returned %ld instead of expected %u\n", result, strlen(buf)); result = strcmp(TestItem3_after, buf); - todo_wine { ok(result == 0, "WM_SETTEXT round trip: strcmp = %ld\n", result); - } result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem3_after); ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); @@ -967,10 +963,8 @@ static void test_WM_SETTEXT() "WM_GETTEXT returned %ld instead of expected %u\n", result, strlen(buf)); result = strcmp(TestItem3_after, buf); - todo_wine { ok(result == 0, "WM_SETTEXT round trip: strcmp = %ld\n", result); - } DestroyWindow(hwndRichEdit); } @@ -1020,10 +1014,8 @@ static void test_EM_SETTEXTEX(void) /* However, WM_GETTEXT *does* see \r\n where EM_GETTEXTEX would see \r */ SendMessage(hwndRichEdit, WM_GETTEXT, MAX_BUF_LEN, (LPARAM)buf); - todo_wine { ok(strcmp((const char *)buf, TestItem2_after) == 0, "WM_GETTEXT did *not* see \\r converted to \\r\\n pairs.\n"); - } result = SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) NULL); @@ -1616,8 +1608,9 @@ static void test_WM_PASTE(void) int result; char buffer[1024] = {0}; const char* text1 = "testing paste\r"; + const char* text1_after = "testing paste\r\n"; const char* text2 = "testing paste\r\rtesting paste"; - const char* text3 = "testing paste\rpaste\rtesting paste"; + const char* text3 = "testing paste\r\npaste\r\ntesting paste"; HWND hwndRichEdit = new_richedit(NULL); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text1); @@ -1627,7 +1620,7 @@ static void test_WM_PASTE(void) SendMessage(hwndRichEdit, WM_CHAR, 22, 0); /* ctrl-v */ SendMessage(hwndRichEdit, WM_CHAR, 26, 0); /* ctrl-z */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - result = strcmp(text1, buffer); + result = strcmp(text1_after, buffer); ok(result == 0, "test paste: strcmp = %i\n", result);

1 0

Jacek Caban : shdocvw: Added WebBrowser::FullScreen property implementation .
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 2fe9af5507f55a7a09a84ecee39e256a9275727e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe9af5507f55a7a09a84ecee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 23 22:37:01 2007 +0200 shdocvw: Added WebBrowser::FullScreen property implementation. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/tests/webbrowser.c | 23 +++++++++++++++++++++++ dlls/shdocvw/webbrowser.c | 15 +++++++++++---- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 0e2a739..28637bf 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -131,6 +131,7 @@ struct WebBrowser { VARIANT_BOOL address_bar; VARIANT_BOOL status_bar; VARIANT_BOOL tool_bar; + VARIANT_BOOL full_screen; DocHost doc_host; }; diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 8f80505..c4b76ec 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1094,6 +1094,29 @@ static void test_ie_funcs(IUnknown *unk) hres = IWebBrowser2_put_ToolBar(wb, VARIANT_TRUE); ok(hres == S_OK, "put_ToolBar failed: %08x\n", hres); + /* FullScreen */ + + hres = IWebBrowser2_get_FullScreen(wb, &b); + ok(hres == S_OK, "get_FullScreen failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "b=%x\n", b); + + hres = IWebBrowser2_put_FullScreen(wb, VARIANT_TRUE); + ok(hres == S_OK, "put_FullScreen failed: %08x\n", hres); + + hres = IWebBrowser2_get_FullScreen(wb, &b); + ok(hres == S_OK, "get_FullScreen failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_FullScreen(wb, 100); + ok(hres == S_OK, "put_FullScreen failed: %08x\n", hres); + + hres = IWebBrowser2_get_FullScreen(wb, &b); + ok(hres == S_OK, "get_FullScreen failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_FullScreen(wb, VARIANT_FALSE); + ok(hres == S_OK, "put_FullScreen failed: %08x\n", hres); + IWebBrowser2_Release(wb); } diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index ff7f699..cc27632 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -638,15 +638,21 @@ static HRESULT WINAPI WebBrowser_put_MenuBar(IWebBrowser2 *iface, VARIANT_BOOL V static HRESULT WINAPI WebBrowser_get_FullScreen(IWebBrowser2 *iface, VARIANT_BOOL *pbFullScreen) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pbFullScreen); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pbFullScreen); + + *pbFullScreen = This->full_screen; + return S_OK; } static HRESULT WINAPI WebBrowser_put_FullScreen(IWebBrowser2 *iface, VARIANT_BOOL bFullScreen) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, bFullScreen); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, bFullScreen); + + This->full_screen = bFullScreen ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI WebBrowser_Navigate2(IWebBrowser2 *iface, VARIANT *URL, VARIANT *Flags, @@ -927,6 +933,7 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi ret->address_bar = VARIANT_TRUE; ret->status_bar = VARIANT_TRUE; ret->tool_bar = VARIANT_TRUE; + ret->full_screen = VARIANT_FALSE; WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);

1 0

Vitaliy Margolen : mshtml: Fix typo.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 201e03b87a6f4b2f035a3382bcbac1db793594b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=201e03b87a6f4b2f035a3382b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Sep 21 21:43:13 2007 -0600 mshtml: Fix typo. --- dlls/mshtml/htmlelem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 05071d8..77d50b0 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1291,7 +1291,7 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) ret = HTMLBodyElement_Create(nselem); else if(!strcmpW(class_name, wszINPUT)) ret = HTMLInputElement_Create(nselem); - if(!strcmpW(class_name, wszSELECT)) + else if(!strcmpW(class_name, wszSELECT)) ret = HTMLSelectElement_Create(nselem); else if(!strcmpW(class_name, wszTEXTAREA)) ret = HTMLTextAreaElement_Create(nselem);

1 0

Vitaliy Margolen : mshtml: Fix another typo and add trace.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 2755c92fc3c2a64b029bc16f871c85e5ff488999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2755c92fc3c2a64b029bc16f8… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Sep 21 21:45:06 2007 -0600 mshtml: Fix another typo and add trace. --- dlls/mshtml/htmlbody.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index b8c153a..3064347 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -40,8 +40,6 @@ typedef struct { const IHTMLBodyElementVtbl *lpHTMLBodyElementVtbl; - HTMLTextContainer text_container; - ConnectionPointContainer cp_container; ConnectionPoint cp_propnotif; ConnectionPoint cp_txtcontevents; @@ -71,8 +69,8 @@ static HRESULT WINAPI HTMLBodyElement_QueryInterface(IHTMLBodyElement *iface, TRACE("(%p)->(IID_IHTMLBodyElement %p)\n", This, ppv); *ppv = HTMLBODY(This); }else if(IsEqualGUID(&IID_IHTMLTextContainer, riid)) { - TRACE("(%p)->(IID_IHTMLTextContainer %p)\n", This, ppv); - *ppv = HTMLTEXTCONT(&This->text_container); + TRACE("(%p)->(IID_IHTMLTextContainer %p)\n", &This->textcont, ppv); + *ppv = HTMLTEXTCONT(&This->textcont); }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = CONPTCONT(&This->cp_container); @@ -487,9 +485,11 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) HTMLBodyElement *ret = mshtml_alloc(sizeof(HTMLBodyElement)); nsresult nsres; + TRACE("(%p)->(%p)\n", ret, nselem); + ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl; - HTMLTextContainer_Init(&ret->text_container); + HTMLTextContainer_Init(&ret->textcont); ConnectionPoint_Init(&ret->cp_propnotif, CONPTCONT(&ret->cp_container), &IID_IPropertyNotifySink, NULL);

1 0

Stefan Dösinger : wined3d: Add signed format conversion for glsl.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 10f25e01047c379f31fdffdda5942c716bba56ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f25e01047c379f31fdffdda… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 21 23:34:09 2007 +0200 wined3d: Add signed format conversion for glsl. --- dlls/wined3d/glsl_shader.c | 131 +++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/surface.c | 55 ++++++++++++++++-- 2 files changed, 179 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10f25e01047c379f31fdf…

1 0

Stefan Dösinger : wined3d: Recompile glsl pixelshaders if the sampler format changes.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 1c4a15d2cd5100464328e7f65bba4b49388ac11c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4a15d2cd5100464328e7f65… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 21 23:47:40 2007 +0200 wined3d: Recompile glsl pixelshaders if the sampler format changes. --- dlls/wined3d/device.c | 9 +++++ dlls/wined3d/glsl_shader.c | 20 +++++++++++ dlls/wined3d/pixelshader.c | 69 +++++++++++++++++++++++++++++++--------- dlls/wined3d/utils.c | 42 ++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 12 +++++++ include/wine/wined3d_gl.h | 1 + 6 files changed, 135 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c4a15d2cd5100464328e…

1 0