Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 64573: [PSDK] * Update wincrypt.h. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:42:46 2014 New Revision: 64573 URL: http://svn.reactos.org/svn/reactos?rev=64573&view=rev Log: [PSDK] * Update wincrypt.h. CORE-8540 Modified: trunk/reactos/include/psdk/wincrypt.h Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] Mon Oct 6 18:42:46 2014 @@ -1958,6 +1958,22 @@ 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }; #endif #define MS_ENH_RSA_AES_PROV WINELIB_NAME_AW(MS_ENH_RSA_AES_PROV_) + +#define MS_ENH_RSA_AES_PROV_XP_A "Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" +#if defined(__GNUC__) +# define MS_ENH_RSA_AES_PROV_XP_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \ + 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ',\ + 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',' ',\ + '(','P','r','o','t','o','t','y','p','e',')',0 } +#elif defined(_MSC_VER) +# define MS_ENH_RSA_AES_PROV_XP_W L"Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" +#else +static const WCHAR MS_ENH_RSA_AES_PROV_XP_W[] = { 'M','i','c','r','o','s','o','f','t',' ', + 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', + 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',' ', + '(','P','r','o','t','o','t','y','p','e',')',0 }; +#endif +#define MS_ENH_RSA_AES_PROV_XP WINELIB_NAME_AW(MS_ENH_RSA_AES_PROV_XP_) /* Key Specs*/ #define AT_KEYEXCHANGE 1

1 0

[akhaldi] 64572: [RICHED20_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:42:09 2014 New Revision: 64572 URL: http://svn.reactos.org/svn/reactos?rev=64572&view=rev Log: [RICHED20_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/riched20/editor.c trunk/rostests/winetests/riched20/richole.c Modified: trunk/rostests/winetests/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/editor… ============================================================================== --- trunk/rostests/winetests/riched20/editor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/editor.c [iso-8859-1] Mon Oct 6 18:42:09 2014 @@ -4362,7 +4362,9 @@ {5, 10, 10, 5, 10, 0}, {15, 17, 17, 15, 17, 0}, /* test cpMax > strlen() */ - {0, 100, 18, 0, 18, 1}, + {0, 100, 18, 0, 18, 0}, + /* test cpMin < 0 && cpMax >= 0 after cpMax > strlen() */ + {-1, 1, 17, 17, 17, 0}, /* test cpMin == cpMax */ {5, 5, 5, 5, 5, 0}, /* test cpMin < 0 && cpMax >= 0 (bug 4462) */ @@ -4372,13 +4374,13 @@ /* test cpMin < 0 && cpMax < 0 */ {-1, -1, 17, 17, 17, 0}, {-4, -5, 17, 17, 17, 0}, - /* test cMin >=0 && cpMax < 0 (bug 6814) */ - {0, -1, 18, 0, 18, 1}, - {17, -5, 18, 17, 18, 1}, + /* test cpMin >=0 && cpMax < 0 (bug 6814) */ + {0, -1, 18, 0, 18, 0}, + {17, -5, 18, 17, 18, 0}, {18, -3, 17, 17, 17, 0}, /* test if cpMin > cpMax */ - {15, 19, 18, 15, 18, 1}, - {19, 15, 18, 15, 18, 1} + {15, 19, 18, 15, 18, 0}, + {19, 15, 18, 15, 18, 0}, }; static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { @@ -5070,11 +5072,13 @@ DWORD phase; LRESULT result; EDITSTREAM es; - char buffer[1024] = {0}; + char buffer[1024] = {0}, tmp[16]; + CHARRANGE range; const char * streamText0 = "{\\rtf1 TestSomeText}"; const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; const char * streamText0b = "{\\rtf1 TestSomeText\\par\\par}"; + const char * ptr; const char * streamText1 = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" @@ -5099,6 +5103,9 @@ "This text just needs to be long enough to cause run to be split onto " "two separate lines and make sure the null terminating character is " "handled properly.\0"; + + const WCHAR UTF8Split_exp[4] = {0xd6, 0xcf, 0xcb, 0}; + int length4 = strlen(streamText4) + 1; struct StringWithLength cookieForStream4 = { length4, @@ -5128,7 +5135,8 @@ ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par */ - es.dwCookie = (DWORD_PTR)&streamText0a; + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); @@ -5157,6 +5165,43 @@ "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test 0-b set error %d, expected %d\n", es.dwError, 0); + /* Show that when using SFF_SELECTION the last \par is not ignored. */ + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + ok(result == 12, "got %ld, expected %d\n", result, 12); + + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (result == 12, + "EM_STREAMIN: Test 0-a returned %ld, expected 12\n", result); + result = strcmp (buffer,"TestSomeText"); + ok (result == 0, + "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0-a set error %d, expected %d\n", es.dwError, 0); + + range.cpMin = 0; + range.cpMax = -1; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&range); + ok (result == 13, "got %ld\n", result); + + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SFF_SELECTION | SF_RTF, (LPARAM)&es); + ok(result == 13, "got %ld, expected 13\n", result); + + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (result == 14, + "EM_STREAMIN: Test SFF_SELECTION 0-a returned %ld, expected 14\n", result); + result = strcmp (buffer,"TestSomeText\r\n"); + ok (result == 0, + "EM_STREAMIN: Test SFF_SELECTION 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test SFF_SELECTION 0-a set error %d, expected %d\n", es.dwError, 0); + es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; @@ -5216,10 +5261,12 @@ result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); ok(result == 8, "got %ld\n", result); + WideCharToMultiByte(CP_ACP, 0, UTF8Split_exp, -1, tmp, sizeof(tmp), NULL, NULL); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok(result == 3, "EM_STREAMIN: Test UTF8Split returned %ld\n", result); - result = memcmp (buffer,"\xd6\xcf\xcb", 3); + result = memcmp (buffer, tmp, 3); ok(result == 0, "EM_STREAMIN: Test UTF8Split set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test UTF8Split set error %d, expected %d\n", es.dwError, 0); @@ -5888,6 +5935,62 @@ "selections is incorrectly at (%d,%d)\n", sel_start, sel_end); DestroyWindow(hwndRichedit_WM_NOTIFY); + DestroyWindow(parent); +} + +static int cpMin_EN_LINK = -1; +static int cpMax_EN_LINK = -1; + +static LRESULT WINAPI EN_LINK_ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + ENLINK* enlink = (ENLINK*)lParam; + if(message == WM_NOTIFY && enlink->nmhdr.code == EN_LINK) + { + cpMin_EN_LINK = enlink->chrg.cpMin; + cpMax_EN_LINK = enlink->chrg.cpMax; + } + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static void test_EN_LINK(void) +{ + HWND parent; + WNDCLASSA cls; + HWND hwndRichedit_EN_LINK; + CHARFORMAT2A cf2; + + /* register class to capture WM_NOTIFY */ + cls.style = 0; + cls.lpfnWndProc = EN_LINK_ParentMsgCheckProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "EN_LINK_ParentClass"; + if(!RegisterClassA(&cls)) assert(0); + + parent = CreateWindowA(cls.lpszClassName, NULL, WS_POPUP|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok(parent != 0, "Failed to create parent window\n"); + + hwndRichedit_EN_LINK = new_richedit(parent); + ok(hwndRichedit_EN_LINK != 0, "Failed to create edit window\n"); + + SendMessageA(hwndRichedit_EN_LINK, EM_SETEVENTMASK, 0, ENM_LINK); + + cf2.cbSize = sizeof(CHARFORMAT2A); + cf2.dwMask = CFM_LINK; + cf2.dwEffects = CFE_LINK; + SendMessageA(hwndRichedit_EN_LINK, EM_SETCHARFORMAT, 0, (LPARAM)&cf2); + /* mixing letters and numbers causes runs to be split */ + SendMessageA(hwndRichedit_EN_LINK, WM_SETTEXT, 0, (LPARAM)"link text with at least 2 runs"); + SendMessageA(hwndRichedit_EN_LINK, WM_LBUTTONDOWN, 0, MAKELPARAM(5, 5)); + ok(cpMin_EN_LINK == 0 && cpMax_EN_LINK == 31, "Expected link range [0,31) got [%i,%i)\n", cpMin_EN_LINK, cpMax_EN_LINK); + + DestroyWindow(hwndRichedit_EN_LINK); DestroyWindow(parent); } @@ -7472,6 +7575,25 @@ ok( fmt.wAlignment == def_align, "got %d exppect %d\n", fmt.wAlignment, def_align ); DestroyWindow( richedit ); +} + +static void test_EM_SETREADONLY(void) +{ + HWND richedit = new_richeditW(NULL); + DWORD dwStyle; + LRESULT res; + + res = SendMessageA(richedit, EM_SETREADONLY, TRUE, 0); + ok(res == 1, "EM_SETREADONLY\n"); + dwStyle = GetWindowLongA(richedit, GWL_STYLE); + ok(dwStyle & ES_READONLY, "got wrong value: 0x%x\n", dwStyle & ES_READONLY); + + res = SendMessageA(richedit, EM_SETREADONLY, FALSE, 0); + ok(res == 1, "EM_SETREADONLY\n"); + dwStyle = GetWindowLongA(richedit, GWL_STYLE); + ok(!(dwStyle & ES_READONLY), "got wrong value: 0x%x\n", dwStyle & ES_READONLY); + + DestroyWindow(richedit); } START_TEST( editor ) @@ -7519,6 +7641,7 @@ test_EM_REPLACESEL(1); test_EM_REPLACESEL(0); test_WM_NOTIFY(); + test_EN_LINK(); test_EM_AUTOURLDETECT(); test_eventMask(); test_undo_coalescing(); @@ -7536,6 +7659,7 @@ test_enter(); test_WM_CREATE(); test_reset_default_para_fmt(); + test_EM_SETREADONLY(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging. Modified: trunk/rostests/winetests/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/richol… ============================================================================== --- trunk/rostests/winetests/riched20/richole.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/richole.c [iso-8859-1] Mon Oct 6 18:42:09 2014 @@ -86,21 +86,29 @@ static void release_interfaces(HWND *w, IRichEditOle **reOle, ITextDocument **txtDoc, ITextSelection **txtSel) { + if(txtSel) + ITextSelection_Release(*txtSel); ITextDocument_Release(*txtDoc); IRichEditOle_Release(*reOle); DestroyWindow(*w); - ITextSelection_Release(*txtSel); +} + +static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); } static void test_Interfaces(void) { - IRichEditOle *reOle = NULL; + IRichEditOle *reOle = NULL, *reOle1 = NULL; ITextDocument *txtDoc = NULL; ITextSelection *txtSel = NULL; IUnknown *punk; HRESULT hres; LRESULT res; HWND w; + ULONG refcount; w = new_richedit(NULL); if (!w) { @@ -111,6 +119,14 @@ res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle); ok(res, "SendMessage\n"); ok(reOle != NULL, "EM_GETOLEINTERFACE\n"); + refcount = get_refcount((IUnknown *)reOle); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle1); + ok(res == 1, "SendMessage\n"); + ok(reOle1 == reOle, "Should not return a new IRichEditOle interface\n"); + refcount = get_refcount((IUnknown *)reOle); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument, (void **) &txtDoc); @@ -142,6 +158,8 @@ ITextDocument_Release(txtDoc); IRichEditOle_Release(reOle); + refcount = IRichEditOle_Release(reOle); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); DestroyWindow(w); /* Methods should return CO_E_RELEASED if the backing document has @@ -385,6 +403,544 @@ VariantClear(&testfile); } +static void test_ITextSelection_GetText(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hres; + BSTR bstr = NULL; + int first, lim; + static const CHAR test_text1[] = "TestSomeText"; + static const WCHAR bufW1[] = {'T', 'e', 's', 't', 0}; + static const WCHAR bufW2[] = {'T', 'e', 'x', 't', '\r', 0}; + static const WCHAR bufW3[] = {'T', 'e', 'x', 't', 0}; + static const WCHAR bufW4[] = {'T', 'e', 's', 't', 'S', 'o', 'm', + 'e', 'T', 'e', 'x', 't', '\r', 0}; + static const WCHAR bufW5[] = {'\r', 0}; + BOOL is64bit = sizeof(void *) > sizeof(int); + + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 0, lim = 4; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_GetText(txtSel, &bstr); + ok(hres == S_OK, "ITextSelection_GetText\n"); + ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + first = 4, lim = 0; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_GetText(txtSel, &bstr); + ok(hres == S_OK, "ITextSelection_GetText\n"); + ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + first = 1, lim = 1; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_GetText(txtSel, &bstr); + ok(hres == S_OK, "ITextSelection_GetText\n"); + ok(!bstr, "got wrong text: %s\n", wine_dbgstr_w(bstr)); + + if (!is64bit) + { + hres = ITextSelection_GetText(txtSel, NULL); + ok(hres == E_INVALIDARG, "ITextSelection_GetText\n"); + } + + first = 8, lim = 12; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_GetText(txtSel, &bstr); + ok(hres == S_OK, "ITextSelection_GetText\n"); + ok(!lstrcmpW(bstr, bufW3), "got wrong text: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + first = 8, lim = 13; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_GetText(txtSel, &bstr); + ok(hres == S_OK, "ITextSelection_GetText\n"); + ok(!lstrcmpW(bstr, bufW2), "got wrong text: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + first = 12, lim = 13; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_GetText(txtSel, &bstr); + ok(hres == S_OK, "ITextSelection_GetText\n"); + ok(!lstrcmpW(bstr, bufW5), "got wrong text: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + first = 0, lim = -1; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_GetText(txtSel, &bstr); + ok(hres == S_OK, "ITextSelection_GetText\n"); + ok(!lstrcmpW(bstr, bufW4), "got wrong text: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + first = -1, lim = 9; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_GetText(txtSel, &bstr); + ok(hres == S_OK, "ITextSelection_GetText\n"); + ok(!bstr, "got wrong text: %s\n", wine_dbgstr_w(bstr)); + + release_interfaces(&w, &reOle, &txtDoc, &txtSel); +} + +static void test_ITextDocument_Range(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + ITextRange *pointer = NULL; + HRESULT hres; + ULONG refcount; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + hres = ITextDocument_Range(txtDoc, 0, 0, &txtRge); + ok(hres == S_OK, "ITextDocument_Range fails 0x%x.\n", hres); + refcount = get_refcount((IUnknown *)txtRge); + ok(refcount == 1, "get wrong refcount: returned %d expected 1\n", refcount); + + pointer = txtRge; + hres = ITextDocument_Range(txtDoc, 0, 0, &txtRge); + ok(hres == S_OK, "ITextDocument_Range fails 0x%x.\n", hres); + ok(pointer != txtRge, "A new pointer should be returned\n"); + ITextRange_Release(pointer); + + hres = ITextDocument_Range(txtDoc, 0, 0, NULL); + ok(hres == E_INVALIDARG, "ITextDocument_Range should fail 0x%x.\n", hres); + + release_interfaces(&w, &reOle, &txtDoc, NULL); + hres = ITextRange_CanEdit(txtRge, NULL); + ok(hres == CO_E_RELEASED, "ITextRange after ITextDocument destroyed\n"); + ITextRange_Release(txtRge); +} + +static void test_ITextRange_GetChar(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + LONG pch = 0xdeadbeef; + int first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + first = 0, lim = 4; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 0, lim = 0; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 12, lim = 12; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 13, lim = 13; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + first = 12, lim = 12; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_GetChar(txtRge, NULL); + ok(hres == E_INVALIDARG, "ITextRange_GetChar\n"); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + +static void test_ITextSelection_GetChar(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hres; + LONG pch = 0xdeadbeef; + int first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 0, lim = 4; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + + first = 0, lim = 0; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + + first = 12, lim = 12; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + + first = 13, lim = 13; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + + hres = ITextSelection_GetChar(txtSel, NULL); + ok(hres == E_INVALIDARG, "ITextSelection_GetChar\n"); + + release_interfaces(&w, &reOle, &txtDoc, &txtSel); +} + +static void test_ITextRange_GetStart_GetEnd(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + int first, lim, start, end; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 1, lim = 6; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 1, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 6, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = 6, lim = 1; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 1, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 6, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = -1, lim = 13; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 0, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 13, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = 13, lim = 13; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 12, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 12, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + +static void test_ITextSelection_GetStart_GetEnd(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hres; + int first, lim, start, end; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 2, lim = 5; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 2, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 5, "got wrong end value: %d\n", end); + + first = 5, lim = 2; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 2, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 5, "got wrong end value: %d\n", end); + + first = 0, lim = -1; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 0, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 13, "got wrong end value: %d\n", end); + + first = 13, lim = 13; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 12, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 12, "got wrong end value: %d\n", end); + + release_interfaces(&w, &reOle, &txtDoc, &txtSel); +} + +static void test_ITextRange_GetDuplicate(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + ITextRange *txtRgeDup = NULL; + HRESULT hres; + LONG first, lim, start, end; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + first = 0, lim = 4; + hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); + ok(hres == S_OK, "ITextDocument_Range fails 0x%x.\n", hres); + + hres = ITextRange_GetDuplicate(txtRge, &txtRgeDup); + ok(hres == S_OK, "ITextRange_GetDuplicate\n"); + ok(txtRgeDup != txtRge, "A new pointer should be returned\n"); + ITextRange_GetStart(txtRgeDup, &start); + ok(start == first, "got wrong value: %d\n", start); + ITextRange_GetEnd(txtRgeDup, &end); + ok(end == lim, "got wrong value: %d\n", end); + + ITextRange_Release(txtRgeDup); + + hres = ITextRange_GetDuplicate(txtRge, NULL); + ok(hres == E_INVALIDARG, "ITextRange_GetDuplicate\n"); + + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + +static void test_ITextRange_Collapse(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + LONG first, lim, start, end; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 4, lim = 8; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomTrue); + ok(hres == S_OK, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 4, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 4, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomStart); + ok(hres == S_OK, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 4, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 4, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomFalse); + ok(hres == S_OK, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 8, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 8, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomEnd); + ok(hres == S_OK, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 8, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 8, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + /* tomStart is the default */ + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, 256); + ok(hres == S_OK, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 4, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 4, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = 6, lim = 6; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomEnd); + ok(hres == S_FALSE, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 6, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 6, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = 8, lim = 8; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomStart); + ok(hres == S_FALSE, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 8, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 8, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + +static void test_ITextSelection_Collapse(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hres; + LONG first, lim, start, end; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 4, lim = 8; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomTrue); + ok(hres == S_OK, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 4, "got wrong start value: %d\n", start); + ok(end == 4, "got wrong end value: %d\n", end); + + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomStart); + ok(hres == S_OK, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 4, "got wrong start value: %d\n", start); + ok(end == 4, "got wrong end value: %d\n", end); + + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomFalse); + ok(hres == S_OK, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 8, "got wrong start value: %d\n", start); + ok(end == 8, "got wrong end value: %d\n", end); + + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomEnd); + ok(hres == S_OK, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 8, "got wrong start value: %d\n", start); + ok(end == 8, "got wrong end value: %d\n", end); + + /* tomStart is the default */ + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, 256); + ok(hres == S_OK, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 4, "got wrong start value: %d\n", start); + ok(end == 4, "got wrong end value: %d\n", end); + + first = 6, lim = 6; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomEnd); + ok(hres == S_FALSE, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 6, "got wrong start value: %d\n", start); + ok(end == 6, "got wrong end value: %d\n", end); + + first = 8, lim = 8; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomStart); + ok(hres == S_FALSE, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 8, "got wrong start value: %d\n", start); + ok(end == 8, "got wrong end value: %d\n", end); + + release_interfaces(&w, &reOle, &txtDoc, &txtSel); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -394,4 +950,13 @@ test_Interfaces(); test_ITextDocument_Open(); -} + test_ITextSelection_GetText(); + test_ITextSelection_GetChar(); + test_ITextSelection_GetStart_GetEnd(); + test_ITextSelection_Collapse(); + test_ITextDocument_Range(); + test_ITextRange_GetChar(); + test_ITextRange_GetStart_GetEnd(); + test_ITextRange_GetDuplicate(); + test_ITextRange_Collapse(); +}

1 0

[akhaldi] 64571: [RICHED20] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:41:33 2014 New Revision: 64571 URL: http://svn.reactos.org/svn/reactos?rev=64571&view=rev Log: [RICHED20] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/clipboard.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/editstr.h trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/richole.c trunk/reactos/dll/win32/riched20/string.c trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] Mon Oct 6 18:41:33 2014 @@ -139,6 +139,7 @@ { ME_SetCursorToStart(editor, &editor->pCursors[1]); ME_SetCursorToEnd(editor, &editor->pCursors[0]); + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; ME_InvalidateSelection(editor); return len + 1; } @@ -159,6 +160,11 @@ ME_GetSelectionOfs(editor, &start, &end); if (start != end) { + if (end > len) + { + editor->pCursors[0].nOffset = 0; + end --; + } editor->pCursors[1] = editor->pCursors[0]; ME_Repaint(editor); } @@ -200,7 +206,12 @@ if (editor->pCursors[1].pRun->member.run.nFlags & MERF_ENDPARA) editor->pCursors[1].nOffset = 0; if (editor->pCursors[0].pRun->member.run.nFlags & MERF_ENDPARA) - editor->pCursors[0].nOffset = 0; + { + if (to > len) + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + else + editor->pCursors[0].nOffset = 0; + } return to; } Modified: trunk/reactos/dll/win32/riched20/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/clipboa… ============================================================================== --- trunk/reactos/dll/win32/riched20/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/clipboard.c [iso-8859-1] Mon Oct 6 18:41:33 2014 @@ -352,7 +352,7 @@ ret = GlobalAlloc(GMEM_MOVEABLE, sizeof(WCHAR) * (nChars + pars + 1)); data = GlobalLock(ret); - ME_GetTextW(editor, data, nChars + pars, start, nChars, TRUE); + ME_GetTextW(editor, data, nChars + pars, start, nChars, TRUE, FALSE); GlobalUnlock(ret); return ret; } Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Mon Oct 6 18:41:33 2014 @@ -1618,7 +1618,7 @@ CR/LF counters, since RTF streaming presents only \para tokens, which are converted according to the standard rules: \r for 2.0, \r\n for 1.0 */ - if (stripLastCR) { + if (stripLastCR && !(format & SFF_SELECTION)) { int newto; ME_GetSelection(editor, &selStart, &selEnd); newto = ME_GetCursorOfs(selEnd); @@ -1628,7 +1628,7 @@ ME_Cursor linebreakCursor = *selEnd; ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize); - ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE); + ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE, FALSE); if (lastchar[0] == '\r' && (lastchar[1] == '\n' || lastchar[1] == '\0')) { ME_InternalDeleteText(editor, &linebreakCursor, linebreakSize, FALSE); } @@ -1966,7 +1966,7 @@ if (ex->codepage == CP_UNICODE) { return ME_GetTextW(editor, (LPWSTR)pText, ex->cb / sizeof(WCHAR) - 1, - &start, nChars, ex->flags & GT_USECRLF); + &start, nChars, ex->flags & GT_USECRLF, FALSE); } else { @@ -1983,7 +1983,7 @@ buflen = min(crlfmul * nChars, ex->cb - 1); buffer = heap_alloc((buflen + 1) * sizeof(WCHAR)); - nChars = ME_GetTextW(editor, buffer, buflen, &start, nChars, ex->flags & GT_USECRLF); + nChars = ME_GetTextW(editor, buffer, buflen, &start, nChars, ex->flags & GT_USECRLF, FALSE); rc = WideCharToMultiByte(ex->codepage, 0, buffer, nChars + 1, (LPSTR)pText, ex->cb, ex->lpDefaultChar, ex->lpUsedDefChar); if (rc) rc--; /* do not count 0 terminator */ @@ -1998,12 +1998,12 @@ { if (!strText) return 0; if (unicode) { - return ME_GetTextW(editor, strText, INT_MAX, start, nLen, FALSE); + return ME_GetTextW(editor, strText, INT_MAX, start, nLen, FALSE, FALSE); } else { int nChars; WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1); if (!p) return 0; - nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE); + nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE, FALSE); WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, nLen+1, NULL, NULL); FREE_OBJ(p); @@ -2742,6 +2742,7 @@ ed->hwndParent = NULL; ed->sizeWindow.cx = ed->sizeWindow.cy = 0; ed->texthost = texthost; + ed->reOle = NULL; ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0; ITextHost_TxGetPropertyBits(texthost, @@ -2884,6 +2885,11 @@ if(editor->lpOleCallback) IRichEditOleCallback_Release(editor->lpOleCallback); ITextHost_Release(editor->texthost); + if (editor->reOle) + { + IRichEditOle_Release(editor->reOle); + editor->reOle = NULL; + } OleUninitialize(); FREE_OBJ(editor->pBuffer); @@ -3091,6 +3097,8 @@ if (cursor.pRun->member.run.style->fmt.dwMask & CFM_LINK && cursor.pRun->member.run.style->fmt.dwEffects & CFE_LINK) { /* The clicked run has CFE_LINK set */ + ME_DisplayItem *di; + info.nmhdr.hwndFrom = NULL; info.nmhdr.idFrom = 0; info.nmhdr.code = EN_LINK; @@ -3098,8 +3106,25 @@ info.wParam = wParam; info.lParam = lParam; cursor.nOffset = 0; + + /* find the first contiguous run with CFE_LINK set */ info.chrg.cpMin = ME_GetCursorOfs(&cursor); - info.chrg.cpMax = info.chrg.cpMin + cursor.pRun->member.run.len; + for (di = cursor.pRun->prev; + di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); + di = di->prev) + { + info.chrg.cpMin -= di->member.run.len; + } + + /* find the last contiguous run with CFE_LINK set */ + info.chrg.cpMax = ME_GetCursorOfs(&cursor) + cursor.pRun->member.run.len; + for (di = cursor.pRun->next; + di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); + di = di->next) + { + info.chrg.cpMax += di->member.run.len; + } + ITextHost_TxNotify(editor->texthost, info.nmhdr.code, &info); } } @@ -3452,7 +3477,7 @@ editor->styleFlags |= ES_READONLY; else editor->styleFlags &= ~ES_READONLY; - return 0; + return 1; } case EM_SETEVENTMASK: { @@ -4446,8 +4471,12 @@ } case EM_GETOLEINTERFACE: { - LPVOID *ppvObj = (LPVOID*) lParam; - return CreateIRichEditOle(editor, ppvObj); + if (!editor->reOle) + if (!CreateIRichEditOle(editor, (LPVOID *)&editor->reOle)) + return 0; + *(LPVOID *)lParam = editor->reOle; + IRichEditOle_AddRef(editor->reOle); + return 1; } case EM_GETPASSWORDCHAR: { @@ -4716,7 +4745,8 @@ * The written text is always NULL terminated. */ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, - const ME_Cursor *start, int srcChars, BOOL bCRLF) + const ME_Cursor *start, int srcChars, BOOL bCRLF, + BOOL bEOP) { ME_DisplayItem *pRun, *pNextRun; const WCHAR *pStart = buffer; @@ -4734,7 +4764,6 @@ nLen = pRun->member.run.len - start->nOffset; str = get_text( &pRun->member.run, start->nOffset ); - /* No '\r' is appended to the last paragraph. */ while (srcChars && buflen && pNextRun) { int nFlags = pRun->member.run.nFlags; @@ -4765,6 +4794,12 @@ nLen = pRun->member.run.len; str = get_text( &pRun->member.run, 0 ); + } + /* append '\r' to the last paragraph. */ + if (pRun->next->type == diTextEnd && bEOP) + { + *buffer = '\r'; + buffer ++; } *buffer = 0; return buffer - pStart; @@ -5010,7 +5045,7 @@ WCHAR bufferW[MAX_PREFIX_LEN + 1]; unsigned int i; - ME_GetTextW(editor, bufferW, MAX_PREFIX_LEN, start, nChars, FALSE); + ME_GetTextW(editor, bufferW, MAX_PREFIX_LEN, start, nChars, FALSE, FALSE); for (i = 0; i < sizeof(prefixes) / sizeof(*prefixes); i++) { if (nChars < prefixes[i].length) continue; Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] Mon Oct 6 18:41:33 2014 @@ -286,7 +286,7 @@ LPARAM lParam, BOOL unicode, HRESULT* phresult) DECLSPEC_HIDDEN; void ME_SendOldNotify(ME_TextEditor *editor, int nCode) DECLSPEC_HIDDEN; int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, - const ME_Cursor *start, int srcChars, BOOL bCRLF) DECLSPEC_HIDDEN; + const ME_Cursor *start, int srcChars, BOOL bCRLF, BOOL bEOP) DECLSPEC_HIDDEN; void ME_RTFCharAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_RTFParAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_RTFTblAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr… ============================================================================== --- trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] Mon Oct 6 18:41:33 2014 @@ -357,6 +357,7 @@ { HWND hWnd, hwndParent; ITextHost *texthost; + IRichEditOle *reOle; BOOL bEmulateVersion10; ME_TextBuffer *pBuffer; ME_Cursor *pCursors; Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… ============================================================================== --- trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] Mon Oct 6 18:41:33 2014 @@ -699,7 +699,7 @@ /* * Read the next character from the input. This handles setting the - * current line and position-within-line variables. Those variable are + * current line and position-within-line variables. Those variables are * set correctly whether lines end with CR, LF, or CRLF (the last being * the tricky case). * Modified: trunk/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/richole… ============================================================================== --- trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] Mon Oct 6 18:41:33 2014 @@ -37,6 +37,7 @@ typedef struct ITextSelectionImpl ITextSelectionImpl; typedef struct IOleClientSiteImpl IOleClientSiteImpl; +typedef struct ITextRangeImpl ITextRangeImpl; typedef struct IRichEditOleImpl { IRichEditOle IRichEditOle_iface; @@ -46,7 +47,17 @@ ME_TextEditor *editor; ITextSelectionImpl *txtSel; IOleClientSiteImpl *clientSite; + struct list rangelist; } IRichEditOleImpl; + +struct ITextRangeImpl { + ITextRange ITextRange_iface; + LONG ref; + LONG start, end; + struct list entry; + + IRichEditOleImpl *reOle; +}; struct ITextSelectionImpl { ITextSelection ITextSelection_iface; @@ -116,10 +127,13 @@ if (!ref) { + ITextRangeImpl *txtRge; TRACE ("Destroying %p\n", This); This->txtSel->reOle = NULL; ITextSelection_Release(&This->txtSel->ITextSelection_iface); IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); + LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry) + txtRge->reOle = NULL; heap_free(This); } return ref; @@ -431,6 +445,722 @@ IRichEditOle_fnImportDataObject }; +/* ITextRange interface */ +static inline ITextRangeImpl *impl_from_ITextRange(ITextRange *iface) +{ + return CONTAINING_RECORD(iface, ITextRangeImpl, ITextRange_iface); +} + +static HRESULT WINAPI ITextRange_fnQueryInterface(ITextRange *me, REFIID riid, void **ppvObj) +{ + *ppvObj = NULL; + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDispatch) + || IsEqualGUID(riid, &IID_ITextRange)) + { + *ppvObj = me; + ITextRange_AddRef(me); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI ITextRange_fnAddRef(ITextRange *me) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI ITextRange_fnRelease(ITextRange *me) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE ("%p ref=%u\n", This, ref); + if (ref == 0) + { + if (This->reOle) + { + list_remove(&This->entry); + This->reOle = NULL; + } + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI ITextRange_fnGetTypeInfoCount(ITextRange *me, UINT *pctinfo) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetTypeInfo(ITextRange *me, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetIDsOfNames(ITextRange *me, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnInvoke(ITextRange *me, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetText(ITextRange *me, BSTR *pbstr) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR bstr) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT range_GetChar(ME_TextEditor *editor, ME_Cursor *cursor, LONG *pch) +{ + WCHAR wch[2]; + + ME_GetTextW(editor, wch, 1, cursor, 1, FALSE, cursor->pRun->next->type == diTextEnd); + *pch = wch[0]; + + return S_OK; +} + +static HRESULT WINAPI ITextRange_fnGetChar(ITextRange *me, LONG *pch) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + ME_Cursor cursor; + + if (!This->reOle) + return CO_E_RELEASED; + TRACE("%p\n", pch); + if (!pch) + return E_INVALIDARG; + + ME_CursorFromCharOfs(This->reOle->editor, This->start, &cursor); + return range_GetChar(This->reOle->editor, &cursor, pch); +} + +static HRESULT WINAPI ITextRange_fnSetChar(ITextRange *me, LONG ch) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT CreateITextRange(IRichEditOleImpl *reOle, LONG start, LONG end, ITextRange** ppRange); + +static HRESULT WINAPI ITextRange_fnGetDuplicate(ITextRange *me, ITextRange **ppRange) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + TRACE("%p %p\n", This, ppRange); + if (!ppRange) + return E_INVALIDARG; + + return CreateITextRange(This->reOle, This->start, This->end, ppRange); +} + +static HRESULT WINAPI ITextRange_fnGetFormattedText(ITextRange *me, ITextRange **ppRange) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnSetFormattedText(ITextRange *me, ITextRange *pRange) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + if (!pcpFirst) + return E_INVALIDARG; + *pcpFirst = This->start; + TRACE("%d\n", *pcpFirst); + return S_OK; +} + +static HRESULT WINAPI ITextRange_fnSetStart(ITextRange *me, LONG cpFirst) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + if (!pcpLim) + return E_INVALIDARG; + *pcpLim = This->end; + TRACE("%d\n", *pcpLim); + return S_OK; +} + +static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetFont(ITextRange *me, ITextFont **pFont) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetPara(ITextRange *me, ITextPara **ppPara) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnSetPara(ITextRange *me, ITextPara *pPara) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *pcch) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetStoryType(ITextRange *me, LONG *pValue) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT range_Collapse(LONG bStart, LONG *start, LONG *end) +{ + if (*end == *start) + return S_FALSE; + + if (bStart == tomEnd || bStart == tomFalse) + *start = *end; + else + *end = *start; + return S_OK; +} + +static HRESULT WINAPI ITextRange_fnCollapse(ITextRange *me, LONG bStart) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + return range_Collapse(bStart, &This->start, &This->end); +} + +static HRESULT WINAPI ITextRange_fnExpand(ITextRange *me, LONG Unit, LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetIndex(ITextRange *me, LONG Unit, LONG *pIndex) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG Unit, LONG Index, + LONG Extend) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG cpActive, LONG cpOther) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnInRange(ITextRange *me, ITextRange *pRange, LONG *pb) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnInStory(ITextRange *me, ITextRange *pRange, LONG *pb) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnIsEqual(ITextRange *me, ITextRange *pRange, LONG *pb) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnSelect(ITextRange *me) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnStartOf(ITextRange *me, LONG Unit, LONG Extend, + LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnEndOf(ITextRange *me, LONG Unit, LONG Extend, + LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnMove(ITextRange *me, LONG Unit, LONG Count, LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnMoveStart(ITextRange *me, LONG Unit, LONG Count, + LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnMoveEnd(ITextRange *me, LONG Unit, LONG Count, + LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnMoveWhile(ITextRange *me, VARIANT *Cset, LONG Count, + LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnMoveStartWhile(ITextRange *me, VARIANT *Cset, LONG Count, + LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnMoveEndWhile(ITextRange *me, VARIANT *Cset, LONG Count, + LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnMoveUntil(ITextRange *me, VARIANT *Cset, LONG Count, + LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnMoveStartUntil(ITextRange *me, VARIANT *Cset, LONG Count, + LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnMoveEndUntil(ITextRange *me, VARIANT *Cset, LONG Count, + LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnFindText(ITextRange *me, BSTR bstr, LONG cch, LONG Flags, + LONG *pLength) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnFindTextStart(ITextRange *me, BSTR bstr, LONG cch, + LONG Flags, LONG *pLength) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnFindTextEnd(ITextRange *me, BSTR bstr, LONG cch, + LONG Flags, LONG *pLength) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnDelete(ITextRange *me, LONG Unit, LONG Count, + LONG *pDelta) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnCut(ITextRange *me, VARIANT *pVar) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnCopy(ITextRange *me, VARIANT *pVar) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnPaste(ITextRange *me, VARIANT *pVar, LONG Format) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnCanPaste(ITextRange *me, VARIANT *pVar, LONG Format, + LONG *pb) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnCanEdit(ITextRange *me, LONG *pb) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnChangeCase(ITextRange *me, LONG Type) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetPoint(ITextRange *me, LONG Type, LONG *cx, LONG *cy) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnSetPoint(ITextRange *me, LONG x, LONG y, LONG Type, + LONG Extend) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG Value) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITextRange_fnGetEmbeddedObject(ITextRange *me, IUnknown **ppv) +{ + ITextRangeImpl *This = impl_from_ITextRange(me); + if (!This->reOle) + return CO_E_RELEASED; + + FIXME("not implemented %p\n", This); + return E_NOTIMPL; +} + +static const ITextRangeVtbl trvt = { + ITextRange_fnQueryInterface, + ITextRange_fnAddRef, + ITextRange_fnRelease, + ITextRange_fnGetTypeInfoCount, + ITextRange_fnGetTypeInfo, + ITextRange_fnGetIDsOfNames, + ITextRange_fnInvoke, + ITextRange_fnGetText, + ITextRange_fnSetText, + ITextRange_fnGetChar, + ITextRange_fnSetChar, + ITextRange_fnGetDuplicate, + ITextRange_fnGetFormattedText, + ITextRange_fnSetFormattedText, + ITextRange_fnGetStart, + ITextRange_fnSetStart, + ITextRange_fnGetEnd, + ITextRange_fnSetEnd, + ITextRange_fnGetFont, + ITextRange_fnSetFont, + ITextRange_fnGetPara, + ITextRange_fnSetPara, + ITextRange_fnGetStoryLength, + ITextRange_fnGetStoryType, + ITextRange_fnCollapse, + ITextRange_fnExpand, + ITextRange_fnGetIndex, + ITextRange_fnSetIndex, + ITextRange_fnSetRange, + ITextRange_fnInRange, + ITextRange_fnInStory, + ITextRange_fnIsEqual, + ITextRange_fnSelect, + ITextRange_fnStartOf, + ITextRange_fnEndOf, + ITextRange_fnMove, + ITextRange_fnMoveStart, + ITextRange_fnMoveEnd, + ITextRange_fnMoveWhile, + ITextRange_fnMoveStartWhile, + ITextRange_fnMoveEndWhile, + ITextRange_fnMoveUntil, + ITextRange_fnMoveStartUntil, + ITextRange_fnMoveEndUntil, + ITextRange_fnFindText, + ITextRange_fnFindTextStart, + ITextRange_fnFindTextEnd, + ITextRange_fnDelete, + ITextRange_fnCut, + ITextRange_fnCopy, + ITextRange_fnPaste, + ITextRange_fnCanPaste, + ITextRange_fnCanEdit, + ITextRange_fnChangeCase, + ITextRange_fnGetPoint, + ITextRange_fnSetPoint, + ITextRange_fnScrollIntoView, + ITextRange_fnGetEmbeddedObject +}; +/* ITextRange interface */ + static HRESULT WINAPI ITextDocument_fnQueryInterface(ITextDocument* me, REFIID riid, void** ppvObject) @@ -634,13 +1364,48 @@ return E_NOTIMPL; } +static HRESULT CreateITextRange(IRichEditOleImpl *reOle, LONG start, LONG end, ITextRange** ppRange) +{ + ITextRangeImpl *txtRge = heap_alloc(sizeof(ITextRangeImpl)); + + if (!txtRge) + return E_OUTOFMEMORY; + txtRge->ITextRange_iface.lpVtbl = &trvt; + txtRge->ref = 1; + txtRge->reOle = reOle; + txtRge->start = start; + txtRge->end = end; + list_add_head(&reOle->rangelist, &txtRge->entry); + *ppRange = &txtRge->ITextRange_iface; + return S_OK; +} + static HRESULT WINAPI ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2, ITextRange** ppRange) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - FIXME("stub %p\n",This); - return E_NOTIMPL; + const int len = ME_GetTextLength(This->editor) + 1; + + TRACE("%p %p %d %d\n", This, ppRange, cp1, cp2); + if (!ppRange) + return E_INVALIDARG; + + cp1 = max(cp1, 0); + cp2 = max(cp2, 0); + cp1 = min(cp1, len); + cp2 = min(cp2, len); + if (cp1 > cp2) + { + LONG tmp; + tmp = cp1; + cp1 = cp2; + cp2 = tmp; + } + if (cp1 == len) + cp1 = cp2 = len - 1; + + return CreateITextRange(This, cp1, cp2, ppRange); } static HRESULT WINAPI @@ -771,11 +1536,34 @@ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr) { ITextSelectionImpl *This = impl_from_ITextSelection(me); - if (!This->reOle) - return CO_E_RELEASED; - - FIXME("not implemented\n"); - return E_NOTIMPL; + ME_Cursor *start = NULL, *end = NULL; + int nChars, endOfs; + BOOL bEOP; + + if (!This->reOle) + return CO_E_RELEASED; + TRACE("%p\n", pbstr); + if (!pbstr) + return E_INVALIDARG; + + ME_GetSelection(This->reOle->editor, &start, &end); + endOfs = ME_GetCursorOfs(end); + nChars = endOfs - ME_GetCursorOfs(start); + if (!nChars) + { + *pbstr = NULL; + return S_OK; + } + + *pbstr = SysAllocStringLen(NULL, nChars); + if (!*pbstr) + return E_OUTOFMEMORY; + + bEOP = (end->pRun->next->type == diTextEnd && endOfs > ME_GetTextLength(This->reOle->editor)); + ME_GetTextW(This->reOle->editor, *pbstr, nChars, start, nChars, FALSE, bEOP); + TRACE("%s\n", wine_dbgstr_w(*pbstr)); + + return S_OK; } static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR bstr) @@ -791,11 +1579,16 @@ static HRESULT WINAPI ITextSelection_fnGetChar(ITextSelection *me, LONG *pch) { ITextSelectionImpl *This = impl_from_ITextSelection(me); - if (!This->reOle) - return CO_E_RELEASED; - - FIXME("not implemented\n"); - return E_NOTIMPL; + ME_Cursor *start = NULL, *end = NULL; + + if (!This->reOle) + return CO_E_RELEASED; + TRACE("%p\n", pch); + if (!pch) + return E_INVALIDARG; + + ME_GetSelection(This->reOle->editor, &start, &end); + return range_GetChar(This->reOle->editor, start, pch); } static HRESULT WINAPI ITextSelection_fnSetChar(ITextSelection *me, LONG ch) @@ -841,11 +1634,15 @@ static HRESULT WINAPI ITextSelection_fnGetStart(ITextSelection *me, LONG *pcpFirst) { ITextSelectionImpl *This = impl_from_ITextSelection(me); - if (!This->reOle) - return CO_E_RELEASED; - - FIXME("not implemented\n"); - return E_NOTIMPL; + LONG lim; + if (!This->reOle) + return CO_E_RELEASED; + + if (!pcpFirst) + return E_INVALIDARG; + ME_GetSelectionOfs(This->reOle->editor, pcpFirst, &lim); + TRACE("%d\n", *pcpFirst); + return S_OK; } static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG cpFirst) @@ -861,11 +1658,15 @@ static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim) { ITextSelectionImpl *This = impl_from_ITextSelection(me); - if (!This->reOle) - return CO_E_RELEASED; - - FIXME("not implemented\n"); - return E_NOTIMPL; + LONG first; + if (!This->reOle) + return CO_E_RELEASED; + + if (!pcpLim) + return E_INVALIDARG; + ME_GetSelectionOfs(This->reOle->editor, &first, pcpLim); + TRACE("%d\n", *pcpLim); + return S_OK; } static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG cpLim) @@ -941,11 +1742,16 @@ static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart) { ITextSelectionImpl *This = impl_from_ITextSelection(me); - if (!This->reOle) - return CO_E_RELEASED; - - FIXME("not implemented\n"); - return E_NOTIMPL; + LONG start, end; + HRESULT hres; + if (!This->reOle) + return CO_E_RELEASED; + + ME_GetSelectionOfs(This->reOle->editor, &start, &end); + hres = range_Collapse(bStart, &start, &end); + if (SUCCEEDED(hres)) + ME_SetSelection(This->reOle->editor, start, end); + return hres; } static HRESULT WINAPI ITextSelection_fnExpand(ITextSelection *me, LONG Unit, LONG *pDelta) @@ -1513,6 +2319,7 @@ } TRACE("Created %p\n",reo); *ppObj = reo; + list_init(&reo->rangelist); return 1; } @@ -1551,7 +2358,12 @@ return; } - IOleObject_QueryInterface(run->ole_obj->poleobj, &IID_IDataObject, (void**)&ido); + if (IOleObject_QueryInterface(run->ole_obj->poleobj, &IID_IDataObject, (void**)&ido) != S_OK) + { + FIXME("Query Interface IID_IDataObject failed!\n"); + pSize->cx = pSize->cy = 0; + return; + } fmt.cfFormat = CF_BITMAP; fmt.ptd = NULL; fmt.dwAspect = DVASPECT_CONTENT; Modified: trunk/reactos/dll/win32/riched20/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/string.… ============================================================================== --- trunk/reactos/dll/win32/riched20/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/string.c [iso-8859-1] Mon Oct 6 18:41:33 2014 @@ -125,8 +125,7 @@ /* FIXME: Native also knows about punctuation */ TRACE("s==%s, start==%d, len==%d, code==%d\n", debugstr_wn(s, len), start, len, code); - /* convert number of bytes to number of characters. */ - len /= sizeof(WCHAR); + switch (code) { case WB_ISDELIMITER: @@ -154,7 +153,7 @@ ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT code) { if (!editor->pfnWordBreak) { - return ME_WordBreakProc(str, start, len * sizeof(WCHAR), code); + return ME_WordBreakProc(str, start, len, code); } else if (!editor->bEmulateVersion10) { /* MSDN lied about the third parameter for EditWordBreakProc being the number * of characters, it is actually the number of bytes of the string. */ Modified: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… ============================================================================== --- trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] Mon Oct 6 18:41:33 2014 @@ -250,7 +250,7 @@ return E_OUTOFMEMORY; ME_CursorFromCharOfs(This->editor, 0, &start); - ME_GetTextW(This->editor, bstr, length, &start, INT_MAX, FALSE); + ME_GetTextW(This->editor, bstr, length, &start, INT_MAX, FALSE, FALSE); *pbstrText = bstr; } else { *pbstrText = NULL; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Oct 6 18:41:33 2014 @@ -169,7 +169,7 @@ reactos/dll/win32/query # Synced to Wine-1.7.17 reactos/dll/win32/rasapi32 # Synced to Wine-1.7.27 reactos/dll/win32/resutils # Synced to Wine-1.7.17 -reactos/dll/win32/riched20 # Synced to Wine-1.7.17 +reactos/dll/win32/riched20 # Synced to Wine-1.7.27 reactos/dll/win32/riched32 # Synced to Wine-1.7.17 reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.17 reactos/dll/win32/rsabase # Synced to Wine-1.7.17

1 0

[akhaldi] 64570: [RASAPI32] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:40:17 2014 New Revision: 64570 URL: http://svn.reactos.org/svn/reactos?rev=64570&view=rev Log: [RASAPI32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi.… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] Mon Oct 6 18:40:17 2014 @@ -243,7 +243,7 @@ /************************************************************************** * RasEnumDevicesA [RASAPI32.19] * - * Just return a virtual modem too see what other APIs programs will + * Just return a virtual modem to see what other APIs programs will * call with it. */ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD lpcDevices) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Oct 6 18:40:17 2014 @@ -167,7 +167,7 @@ reactos/dll/win32/qmgr # Synced to Wine-1.7.17 reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.17 reactos/dll/win32/query # Synced to Wine-1.7.17 -reactos/dll/win32/rasapi32 # Synced to Wine-1.7.17 +reactos/dll/win32/rasapi32 # Synced to Wine-1.7.27 reactos/dll/win32/resutils # Synced to Wine-1.7.17 reactos/dll/win32/riched20 # Synced to Wine-1.7.17 reactos/dll/win32/riched32 # Synced to Wine-1.7.17

1 0

[akhaldi] 64569: [PROPSYS] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:39:23 2014 New Revision: 64569 URL: http://svn.reactos.org/svn/reactos?rev=64569&view=rev Log: [PROPSYS] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/propsys/propsys.spec trunk/reactos/dll/win32/propsys/propsys_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/propsys/propsys.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys.… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/propsys/propsys.spec [iso-8859-1] Mon Oct 6 18:39:23 2014 @@ -85,7 +85,7 @@ @ stdcall PSGetPropertyDescriptionListFromString(ptr ptr ptr) @ stub PSGetPropertyFromPropertyStorage @ stub PSGetPropertyKeyFromName -@ stub PSGetPropertySystem +@ stdcall PSGetPropertySystem(ptr ptr) @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID @ stdcall PSPropertyKeyFromString(wstr ptr) Modified: trunk/reactos/dll/win32/propsys/propsys_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/propsys/propsys_main.c [iso-8859-1] Mon Oct 6 18:39:23 2014 @@ -126,6 +126,109 @@ return S_FALSE; } +static HRESULT WINAPI propsys_QueryInterface(IPropertySystem *iface, REFIID riid, void **obj) +{ + *obj = NULL; + + if (IsEqualIID(riid, &IID_IPropertySystem) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IPropertySystem_AddRef(iface); + return S_OK; + } + + FIXME("%s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI propsys_AddRef(IPropertySystem *iface) +{ + return 2; +} + +static ULONG WINAPI propsys_Release(IPropertySystem *iface) +{ + return 1; +} + +static HRESULT WINAPI propsys_GetPropertyDescription(IPropertySystem *iface, + REFPROPERTYKEY propkey, REFIID riid, void **ppv) +{ + return PSGetPropertyDescription(propkey, riid, ppv); +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *iface, + LPCWSTR canonical_name, REFIID riid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_w(canonical_name), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionListFromString(IPropertySystem *iface, + LPCWSTR proplist, REFIID riid, void **ppv) +{ + return PSGetPropertyDescriptionListFromString(proplist, riid, ppv); +} + +static HRESULT WINAPI propsys_EnumeratePropertyDescriptions(IPropertySystem *iface, + PROPDESC_ENUMFILTER filter, REFIID riid, void **ppv) +{ + FIXME("%d %s %p: stub\n", filter, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR dest, DWORD destlen) +{ + FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplayAlloc(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR *text) +{ + FIXME("%p %p %x %p: stub\n", key, propvar, flags, text); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_RegisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + return PSRegisterPropertySchema(path); +} + +static HRESULT WINAPI propsys_UnregisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + return PSUnregisterPropertySchema(path); +} + +static HRESULT WINAPI propsys_RefreshPropertySchema(IPropertySystem *iface) +{ + return PSRefreshPropertySchema(); +} + +static const IPropertySystemVtbl propsysvtbl = { + propsys_QueryInterface, + propsys_AddRef, + propsys_Release, + propsys_GetPropertyDescription, + propsys_GetPropertyDescriptionByName, + propsys_GetPropertyDescriptionListFromString, + propsys_EnumeratePropertyDescriptions, + propsys_FormatForDisplay, + propsys_FormatForDisplayAlloc, + propsys_RegisterPropertySchema, + propsys_UnregisterPropertySchema, + propsys_RefreshPropertySchema +}; + +static IPropertySystem propsys = { &propsysvtbl }; + +HRESULT WINAPI PSGetPropertySystem(REFIID riid, void **obj) +{ + return IPropertySystem_QueryInterface(&propsys, riid, obj); +} + HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) { FIXME("%s stub\n", debugstr_w(path)); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Oct 6 18:39:23 2014 @@ -162,7 +162,7 @@ reactos/dll/win32/pidgen # Synced to Wine-1.7.17 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.7.17 -reactos/dll/win32/propsys # Synced to Wine-1.7.17 +reactos/dll/win32/propsys # Synced to Wine-1.7.27 reactos/dll/win32/pstorec # Synced to Wine-1.7.17 reactos/dll/win32/qmgr # Synced to Wine-1.7.17 reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.17

1 0

[akhaldi] 64568: [PDH] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:37:50 2014 New Revision: 64568 URL: http://svn.reactos.org/svn/reactos?rev=64568&view=rev Log: [PDH] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/pdh/pdh.spec trunk/reactos/dll/win32/pdh/pdh_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/pdh/pdh.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] Mon Oct 6 18:37:50 2014 @@ -36,8 +36,8 @@ @ stub PdhEnumObjectsHA @ stub PdhEnumObjectsHW @ stub PdhEnumObjectsW -@ stub PdhExpandCounterPathA -@ stub PdhExpandCounterPathW +@ stdcall PdhExpandCounterPathA(str ptr ptr) +@ stdcall PdhExpandCounterPathW(wstr ptr ptr) @ stdcall PdhExpandWildCardPathA(str str ptr ptr long) @ stub PdhExpandWildCardPathHA @ stub PdhExpandWildCardPathHW Modified: trunk/reactos/dll/win32/pdh/pdh_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] Mon Oct 6 18:37:50 2014 @@ -638,6 +638,24 @@ } /*********************************************************************** + * PdhExpandCounterPathA (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandCounterPathA( LPCSTR szWildCardPath, LPSTR mszExpandedPathList, LPDWORD pcchPathListLength ) +{ + FIXME("%s, %p, %p: stub\n", debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength); + return PdhExpandWildCardPathA(NULL, szWildCardPath, mszExpandedPathList, pcchPathListLength, 0); +} + +/*********************************************************************** + * PdhExpandCounterPathW (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandCounterPathW( LPCWSTR szWildCardPath, LPWSTR mszExpandedPathList, LPDWORD pcchPathListLength ) +{ + FIXME("%s, %p, %p: stub\n", debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength); + return PdhExpandWildCardPathW(NULL, szWildCardPath, mszExpandedPathList, pcchPathListLength, 0); +} + +/*********************************************************************** * PdhGetCounterInfoA (PDH.@) */ PDH_STATUS WINAPI PdhGetCounterInfoA( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size, PPDH_COUNTER_INFO_A info ) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Oct 6 18:37:50 2014 @@ -158,7 +158,7 @@ reactos/dll/win32/olepro32 # Synced to Wine-1.7.17 reactos/dll/win32/olesvr32 # Synced to Wine-1.7.17 reactos/dll/win32/olethk32 # Synced to Wine-1.7.17 -reactos/dll/win32/pdh # Synced to Wine-1.7.17 +reactos/dll/win32/pdh # Synced to Wine-1.7.27 reactos/dll/win32/pidgen # Synced to Wine-1.7.17 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.7.17

1 0

[akhaldi] 64567: [CMAKE] * Target build_header doesn't exist, don't depend on it.
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:36:01 2014 New Revision: 64567 URL: http://svn.reactos.org/svn/reactos?rev=64567&view=rev Log: [CMAKE] * Target build_header doesn't exist, don't depend on it. Modified: trunk/reactos/tools/wpp/CMakeLists.txt Modified: trunk/reactos/tools/wpp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/tools/wpp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/CMakeLists.txt [iso-8859-1] Mon Oct 6 18:36:01 2014 @@ -34,5 +34,4 @@ add_library(wpp ${SOURCE}) else() add_library(wpphost ${SOURCE}) - add_dependencies(wpphost build_header) endif()

1 0

[ekohl] 64566: [DEVMGR] - Replace the call to DevInstallW by InstallDevInst in the device properties. - Also call InstallDevInst from the device problem wizard. CORE-6350 #resolve
by ekohl＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: ekohl Date: Mon Oct 6 18:35:17 2014 New Revision: 64566 URL: http://svn.reactos.org/svn/reactos?rev=64566&view=rev Log: [DEVMGR] - Replace the call to DevInstallW by InstallDevInst in the device properties. - Also call InstallDevInst from the device problem wizard. CORE-6350 #resolve Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/devprblm.c trunk/reactos/dll/win32/devmgr/precomp.h Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Mon Oct 6 18:35:17 2014 @@ -399,13 +399,6 @@ return Ret; } -BOOL -WINAPI -DevInstallW( - IN HWND hWndParent, - IN HINSTANCE hInstance, - IN LPCWSTR InstanceId, - IN INT Show); static VOID @@ -415,6 +408,7 @@ { TOKEN_PRIVILEGES Privileges; HANDLE hToken; + DWORD dwReboot; BOOL NeedReboot = FALSE; // Better use InstallDevInst: @@ -426,7 +420,8 @@ // BOOL bUpdate, // DWORD *dwReboot); // See: http://comp.os.ms-windows.programmer.win32.narkive.com/J8FTd4KK/signature-o… - if (!DevInstallW(hwndDlg, NULL, dap->szDeviceID, SW_SHOWNOACTIVATE)) + + if (!InstallDevInst(hwndDlg, dap->szDeviceID, TRUE, &dwReboot)) return; if (NeedReboot == FALSE) @@ -1619,6 +1614,8 @@ DWORD nDriverPages = 0; BOOL RecalcPages = FALSE; + TRACE("UpdateDevInfo()\n"); + hPropSheetDlg = GetParent(hwndDlg); if (dap->PageInitialized) @@ -2014,6 +2011,7 @@ dap->PropertySheetType) && nDriverPages != 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { +TRACE("Count %d additional pages!\n", nDriverPages); dap->nDevPropSheets += nDriverPages; } else @@ -2035,6 +2033,7 @@ /* add the device property sheets */ if (dap->nDevPropSheets != 0) { +TRACE("Show %d pages!\n", dap->nDevPropSheets); dap->DevPropSheets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dap->nDevPropSheets * sizeof(HPROPSHEETPAGE)); @@ -2054,20 +2053,28 @@ { /* add the property sheets */ for (iPage = 0; - iPage != nDriverPages; + iPage < nDriverPages; iPage++) { +TRACE("Add page %d\n", iPage); +TRACE("Sheet %p\n", dap->DevPropSheets[iPage]); + if (PropSheet_AddPage(hPropSheetDlg, dap->DevPropSheets[iPage])) { RecalcPages = TRUE; } + else + { +TRACE("PropSheet_AddPage() failed\n"); + } } dap->FreeDevPropSheets = TRUE; } else { +TRACE("SetupDiGetClassDevPropertySheets() failed\n"); /* cleanup, we were unable to get the device property sheets */ iPage = nDriverPages; dap->nDevPropSheets -= nDriverPages; Modified: trunk/reactos/dll/win32/devmgr/devprblm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devprblm.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] Mon Oct 6 18:35:17 2014 @@ -34,9 +34,19 @@ IN PSP_DEVINFO_DATA DevInfoData, IN HMACHINE hMachine OPTIONAL) { + WCHAR szDeviceInstanceId[256]; CONFIGRET cr; ULONG Status, ProblemNumber; + DWORD dwReboot; BOOL Ret = FALSE; + + /* Get the device instance id */ + if (!SetupDiGetDeviceInstanceId(hDevInfo, + DevInfoData, + szDeviceInstanceId, + 256, + NULL)) + return FALSE; cr = CM_Get_DevNode_Status_Ex(&Status, &ProblemNumber, @@ -62,6 +72,7 @@ case CM_PROB_UNKNOWN_RESOURCE: { /* FIXME - display the update driver wizard */ + InstallDevInst(hWndParent, szDeviceInstanceId, TRUE, &dwReboot); break; } @@ -78,6 +89,7 @@ case CM_PROB_FAILED_INSTALL: { /* FIXME - display the driver (re)installation wizard */ + InstallDevInst(hWndParent, szDeviceInstanceId, TRUE, &dwReboot); break; } Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Mon Oct 6 18:35:17 2014 @@ -13,6 +13,7 @@ #include <regstr.h> #include <setupapi.h> #include <cfgmgr32.h> +#include <dll/newdevp.h> #include <dll/devmgr/devmgr.h> #include <wine/debug.h>

1 0

[akhaldi] 64565: [PSAPI_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:32:06 2014 New Revision: 64565 URL: http://svn.reactos.org/svn/reactos?rev=64565&view=rev Log: [PSAPI_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/psapi/psapi_main.c Modified: trunk/rostests/winetests/psapi/psapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/psapi_mai… ============================================================================== --- trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] Mon Oct 6 18:32:06 2014 @@ -78,7 +78,7 @@ (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA"); pGetProcessImageFileNameW = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); - pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtQueryVirtualMemory"); + pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory"); return TRUE; } @@ -102,7 +102,7 @@ static void test_EnumProcessModules(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); DWORD ret, cbNeeded = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -131,8 +131,8 @@ ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); if(ret != 1) return; - ok(hMod == GetModuleHandle(NULL), - "hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL)); + ok(hMod == GetModuleHandleA(NULL), + "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded); /* Windows sometimes has a bunch of extra dlls, presumably brought in by * aclayers.dll. @@ -155,7 +155,7 @@ static void test_GetModuleInformation(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); MODULEINFO info; DWORD ret; @@ -225,7 +225,11 @@ todo_wine ok(!status, "NtQueryVirtualMemory error %x\n", status); /* FIXME: remove once Wine is fixed */ - if (status) return FALSE; + if (status) + { + HeapFree(GetProcessHeap(), 0, buf); + return FALSE; + } section_name = (MEMORY_SECTION_NAME *)buf; ok(ret_len == section_name->SectionFileName.MaximumLength + sizeof(*section_name), "got %lu, %u\n", @@ -244,7 +248,7 @@ static void test_GetMappedFileName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szMapPath[MAX_PATH], szModPath[MAX_PATH], *szMapBaseName; DWORD ret; char *base; @@ -285,26 +289,26 @@ } } - GetTempPath(MAX_PATH, temp_path); - GetTempFileName(temp_path, "map", 0, file_name); + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "map", 0, file_name); drive[0] = file_name[0]; drive[1] = ':'; drive[2] = 0; SetLastError(0xdeadbeef); - ret = QueryDosDevice(drive, device_name, sizeof(device_name)); - ok(ret, "QueryDosDevice error %d\n", GetLastError()); + ret = QueryDosDeviceA(drive, device_name, sizeof(device_name)); + ok(ret, "QueryDosDeviceA error %d\n", GetLastError()); trace("%s -> %s\n", drive, device_name); SetLastError(0xdeadbeef); - hfile = CreateFile(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + hfile = CreateFileA(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFileA(%s) error %d\n", file_name, GetLastError()); SetFilePointer(hfile, 0x4000, NULL, FILE_BEGIN); SetEndOfFile(hfile); SetLastError(0xdeadbeef); - hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); - ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + hmap = CreateFileMappingA(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); + ok(hmap != 0, "CreateFileMappingA error %d\n", GetLastError()); SetLastError(0xdeadbeef); base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0); @@ -379,11 +383,11 @@ UnmapViewOfFile(base); CloseHandle(hmap); CloseHandle(hfile); - DeleteFile(file_name); - - SetLastError(0xdeadbeef); - hmap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0, 4096, NULL); - ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + DeleteFileA(file_name); + + SetLastError(0xdeadbeef); + hmap = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0, 4096, NULL); + ok(hmap != 0, "CreateFileMappingA error %d\n", GetLastError()); SetLastError(0xdeadbeef); base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0); @@ -401,7 +405,7 @@ static void test_GetProcessImageFileName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szImgPath[MAX_PATH], szMapPath[MAX_PATH]; WCHAR szImgPathW[MAX_PATH]; DWORD ret, ret1; @@ -479,7 +483,7 @@ static void test_GetModuleFileNameEx(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szModExPath[MAX_PATH+1], szModPath[MAX_PATH+1]; WCHAR buffer[MAX_PATH]; DWORD ret; @@ -538,7 +542,7 @@ static void test_GetModuleBaseName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szModPath[MAX_PATH], szModBaseName[MAX_PATH]; DWORD ret;

1 0

[akhaldi] 64564: [OLEDLG] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:31:15 2014 New Revision: 64564 URL: http://svn.reactos.org/svn/reactos?rev=64564&view=rev Log: [OLEDLG] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Sq.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs