Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

[akhaldi] 71587: [RICHED20_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 7 11:02:39 2016 New Revision: 71587 URL: http://svn.reactos.org/svn/reactos?rev=71587&view=rev Log: [RICHED20_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 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] Tue Jun 7 11:02:39 2016 @@ -601,6 +601,7 @@ POINTL pt; LOCALESIGNATURE sig; BOOL rtl; + PARAFORMAT2 fmt; static const char text[] = "aa\n" "this is a long line of text that should be longer than the " "control's width\n" @@ -726,6 +727,18 @@ /* Try a negative position. */ SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, -1); ok(pt.x == 1, "pt.x = %d\n", pt.x); + + /* test negative indentation */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, + (LPARAM)"{\\rtf1\\pard\\fi-200\\li-200\\f1 TestSomeText\\par}"); + SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, 0); + ok(pt.x == 1, "pt.x = %d\n", pt.x); + + fmt.cbSize = sizeof(fmt); + SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); + ok(fmt.dxStartIndent == -400, "got %d\n", fmt.dxStartIndent); + ok(fmt.dxOffset == 200, "got %d\n", fmt.dxOffset); + ok(fmt.wAlignment == PFA_LEFT, "got %d\n", fmt.wAlignment); DestroyWindow(hwndRichEdit); } @@ -3281,11 +3294,12 @@ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"x"); cr.cpMin = 0; - cr.cpMax = 1; + cr.cpMax = -1; + SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); + SendMessageA(hwndRichEdit, WM_COPY, 0, 0); /*Load "x" into the clipboard. Paste is an easy, undo'able operation. also, multiple pastes don't combine like WM_CHAR would */ - SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); /* first case - check the default */ SendMessageA(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0,0); @@ -3808,7 +3822,7 @@ getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; - memset(buf, 0, MAX_BUF_LEN); + memset(buf, 0, sizeof(buf)); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem2) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -3823,7 +3837,7 @@ getText.flags = GT_USECRLF; /* <-- asking for CR -> CRLF conversion */ getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; - memset(buf, 0, MAX_BUF_LEN); + memset(buf, 0, sizeof(buf)); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -5032,7 +5046,7 @@ todo_wine ok(!strcmp(buffer, "WTestSomeTextne"), "WM_GETTEXT returned incorrect string\n"); if (!redraw) - /* This is needed to avoid interferring with keybd_event calls + /* This is needed to avoid interfering with keybd_event calls * on other tests that simulate keyboard events. */ SendMessageA(hwndRichEdit, WM_SETREDRAW, TRUE, 0); @@ -5403,9 +5417,10 @@ EDITSTREAM es; char buffer[1024] = {0}, tmp[16]; CHARRANGE range; - - const char * streamText0 = "{\\rtf1 TestSomeText}"; - const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; + PARAFORMAT2 fmt; + + const char * streamText0 = "{\\rtf1\\fi100\\li200\\rtlpar\\qr TestSomeText}"; + const char * streamText0a = "{\\rtf1\\fi100\\li200\\rtlpar\\qr TestSomeText\\par}"; const char * streamText0b = "{\\rtf1 TestSomeText\\par\\par}"; const char * ptr; @@ -5462,6 +5477,17 @@ ok (result == 0, "EM_STREAMIN: Test 0 set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); + /* Show that para fmts are ignored */ + range.cpMin = 2; + range.cpMax = 2; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&range); + memset(&fmt, 0xcc, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + result = SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); + ok(fmt.dxStartIndent == 0, "got %d\n", fmt.dxStartIndent); + ok(fmt.dxOffset == 0, "got %d\n", fmt.dxOffset); + ok(fmt.wAlignment == PFA_LEFT, "got %d\n", fmt.wAlignment); + ok((fmt.wEffects & PFE_RTLPARA) == 0, "got %x\n", fmt.wEffects); /* Native richedit 2.0 ignores last \par */ ptr = streamText0a; @@ -5478,6 +5504,17 @@ 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); + /* This time para fmts are processed */ + range.cpMin = 2; + range.cpMax = 2; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&range); + memset(&fmt, 0xcc, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + result = SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); + ok(fmt.dxStartIndent == 300, "got %d\n", fmt.dxStartIndent); + ok(fmt.dxOffset == -100, "got %d\n", fmt.dxOffset); + ok(fmt.wAlignment == PFA_RIGHT, "got %d\n", fmt.wAlignment); + ok((fmt.wEffects & PFE_RTLPARA) == PFE_RTLPARA, "got %x\n", fmt.wEffects); /* Native richedit 2.0 ignores last \par, next-to-last \par appears */ es.dwCookie = (DWORD_PTR)&streamText0b; @@ -8219,7 +8256,7 @@ pf.cbSize = sizeof(PARAFORMAT2); pf.dwMask = -1; SendMessageW(richedit, EM_GETPARAFORMAT, SCF_SELECTION, (LPARAM)&pf); - ok(pf.wAlignment == ES_CENTER, "got %d expected ES_CENTER\n", pf.wAlignment); + ok(pf.wAlignment == PFA_LEFT, "got %d expected PFA_LEFT\n", pf.wAlignment); DestroyWindow(richedit); } @@ -8254,6 +8291,96 @@ DestroyWindow(hwndRichEdit); } +static void test_rtf_specials(void) +{ + const char *specials = "{\\rtf1\\emspace\\enspace\\bullet\\lquote" + "\\rquote\\ldblquote\\rdblquote\\ltrmark\\rtlmark\\zwj\\zwnj}"; + const WCHAR expect_specials[] = {' ',' ',0x2022,0x2018,0x2019,0x201c, + 0x201d,0x200e,0x200f,0x200d,0x200c}; + const char *pard = "{\\rtf1 ABC\\rtlpar\\par DEF\\par HIJ\\pard\\par}"; + HWND edit = new_richeditW( NULL ); + EDITSTREAM es; + WCHAR buf[80]; + LRESULT result; + PARAFORMAT2 fmt; + + es.dwCookie = (DWORD_PTR)&specials; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == 11, "got %ld\n", result ); + + result = SendMessageW( edit, WM_GETTEXT, sizeof(buf)/sizeof(buf[0]), (LPARAM)buf ); + ok( result == sizeof(expect_specials)/sizeof(expect_specials[0]), "got %ld\n", result ); + ok( !memcmp( buf, expect_specials, sizeof(expect_specials) ), "got %s\n", wine_dbgstr_w(buf) ); + + /* Show that \rtlpar propagates to the second paragraph and is + reset by \pard in the third. */ + es.dwCookie = (DWORD_PTR)&pard; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == 11, "got %ld\n", result ); + + fmt.cbSize = sizeof(fmt); + SendMessageW( edit, EM_SETSEL, 1, 1 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( fmt.wEffects & PFE_RTLPARA, "rtl para not set\n" ); + SendMessageW( edit, EM_SETSEL, 5, 5 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( fmt.wEffects & PFE_RTLPARA, "rtl para not set\n" ); + SendMessageW( edit, EM_SETSEL, 9, 9 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( !(fmt.wEffects & PFE_RTLPARA), "rtl para set\n" ); + + DestroyWindow( edit ); +} + +static void test_background(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + + /* set the background color to black */ + ValidateRect(hwndRichEdit, NULL); + SendMessageA(hwndRichEdit, EM_SETBKGNDCOLOR, FALSE, RGB(0, 0, 0)); + ok(GetUpdateRect(hwndRichEdit, NULL, FALSE), "Update rectangle is empty!\n"); + + DestroyWindow(hwndRichEdit); +} + +static void test_window_classes(void) +{ + static const struct + { + const char *class; + BOOL success; + } test[] = + { + { "RichEdit", FALSE }, + { "RichEdit20A", TRUE }, + { "RichEdit20W", TRUE }, + { "RichEdit50A", FALSE }, + { "RichEdit50W", FALSE } + }; + int i; + HWND hwnd; + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, test[i].class, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL); +todo_wine_if(!strcmp(test[i].class, "RichEdit50A") || !strcmp(test[i].class, "RichEdit50W")) + ok(!hwnd == !test[i].success, "CreateWindow(%s) should %s\n", + test[i].class, test[i].success ? "succeed" : "fail"); + if (!hwnd) +todo_wine + ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS, "got %d\n", GetLastError()); + else + DestroyWindow(hwnd); + } +} + START_TEST( editor ) { BOOL ret; @@ -8263,6 +8390,7 @@ ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); + test_window_classes(); test_WM_CHAR(); test_EM_FINDTEXT(FALSE); test_EM_FINDTEXT(TRUE); @@ -8323,6 +8451,8 @@ test_EM_SETREADONLY(); test_EM_SETFONTSIZE(); test_alignment_style(); + test_rtf_specials(); + test_background(); /* 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] Tue Jun 7 11:02:39 2016 @@ -53,6 +53,7 @@ HWND hwnd = CreateWindowA(lpClassName, NULL, dwStyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); return hwnd; } @@ -761,6 +762,65 @@ ITextRange_Release(txtRge); } +/* Helper function for testing ITextRange_ScrollIntoView */ +static void check_range(HWND w, ITextDocument* doc, int first, int lim, + LONG bStart, int expected_nonzero) +{ + SCROLLINFO si; + ITextRange *txtRge = NULL; + HRESULT hres; + + si.cbSize = sizeof(SCROLLINFO); + si.fMask = SIF_POS | SIF_RANGE; + + hres = ITextDocument_Range(doc, first, lim, &txtRge); + ok(hres == S_OK, "got 0x%08x\n", hres); + hres = ITextRange_ScrollIntoView(txtRge, bStart); + ok(hres == S_OK, "got 0x%08x\n", hres); + GetScrollInfo(w, SB_VERT, &si); + if (expected_nonzero) { + ok(si.nPos != 0, + "Scrollbar at 0, should be >0. (TextRange %d-%d, scroll range %d-%d.)\n", + first, lim, si.nMin, si.nMax); + } else { + ok(si.nPos == 0, + "Scrollbar at %d, should be 0. (TextRange %d-%d, scroll range %d-%d.)\n", + si.nPos, first, lim, si.nMin, si.nMax); + } +} + +static void test_ITextRange_ScrollIntoView(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + static const CHAR test_text1[] = "1\n2\n3\n4\n5\n6\n7\n8\n9\n10"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + /* Scroll to the top. */ + check_range(w, txtDoc, 0, 1, tomStart, 0); + + /* Scroll to the bottom. */ + check_range(w, txtDoc, 19, 20, tomStart, 1); + + /* Back up to the top. */ + check_range(w, txtDoc, 0, 1, tomStart, 0); + + /* Large range */ + check_range(w, txtDoc, 0, 20, tomStart, 0); + + hres = ITextDocument_Range(txtDoc, 0, 0, &txtRge); + ok(hres == S_OK, "got 0x%08x\n", hres); + release_interfaces(&w, &reOle, &txtDoc, NULL); + hres = ITextRange_ScrollIntoView(txtRge, tomStart); + ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + ITextRange_Release(txtRge); +} + static void test_ITextSelection_GetChar(void) { HWND w; @@ -3801,6 +3861,7 @@ test_ITextSelection_GetStoryLength(); test_ITextDocument_Range(); test_ITextRange_GetChar(); + test_ITextRange_ScrollIntoView(); test_ITextRange_GetStart_GetEnd(); test_ITextRange_GetDuplicate(); test_ITextRange_SetStart();

8 years, 3 months

[akhaldi] 71586: [RICHED20] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 7 11:01:48 2016 New Revision: 71586 URL: http://svn.reactos.org/svn/reactos?rev=71586&view=rev Log: [RICHED20] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/paint.c trunk/reactos/dll/win32/riched20/para.c trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/richole.c trunk/reactos/dll/win32/riched20/rtf.h trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/dll/win32/riched20/wrap.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] Tue Jun 7 11:01:48 2016 @@ -216,9 +216,8 @@ } -static void -ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height) +void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, + int *x, int *y, int *height) { ME_DisplayItem *row; ME_DisplayItem *run = pCursor->pRun; @@ -390,7 +389,7 @@ nCharsToDelete is a number of chars to delete from THIS run */ nChars -= nCharsToDelete; shift -= nCharsToDelete; - TRACE("Deleting %d (remaning %d) chars at %d in %s (%d)\n", + TRACE("Deleting %d (remaining %d) chars at %d in %s (%d)\n", nCharsToDelete, nChars, c.nOffset, debugstr_run( run ), run->len); 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] Tue Jun 7 11:01:48 2016 @@ -541,11 +541,6 @@ the same tags mean different things in different contexts */ void ME_RTFParAttrHook(RTF_Info *info) { - PARAFORMAT2 fmt; - fmt.cbSize = sizeof(fmt); - fmt.dwMask = 0; - fmt.wEffects = 0; - switch(info->rtfMinor) { case rtfParDef: /* restores default paragraph attributes */ @@ -553,18 +548,19 @@ info->borderType = RTFBorderParaLeft; else /* v1.0 - 3.0 */ info->borderType = RTFBorderParaTop; - fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS | + info->fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS | PFM_OFFSET | PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE | - PFM_STARTINDENT; + PFM_STARTINDENT | PFM_RTLPARA; /* TODO: numbering, shading */ - fmt.wAlignment = PFA_LEFT; - fmt.cTabCount = 0; - fmt.dxOffset = fmt.dxStartIndent = fmt.dxRightIndent = 0; - fmt.wBorderWidth = fmt.wBorders = 0; - fmt.wBorderSpace = 0; - fmt.bLineSpacingRule = 0; - fmt.dySpaceBefore = fmt.dySpaceAfter = 0; - fmt.dyLineSpacing = 0; + info->fmt.wAlignment = PFA_LEFT; + info->fmt.cTabCount = 0; + info->fmt.dxOffset = info->fmt.dxStartIndent = info->fmt.dxRightIndent = 0; + info->fmt.wBorderWidth = info->fmt.wBorders = 0; + info->fmt.wBorderSpace = 0; + info->fmt.bLineSpacingRule = 0; + info->fmt.dySpaceBefore = info->fmt.dySpaceAfter = 0; + info->fmt.dyLineSpacing = 0; + info->fmt.wEffects &= ~PFE_RTLPARA; if (!info->editor->bEmulateVersion10) /* v4.1 */ { if (info->tableDef && info->tableDef->tableRowStart && @@ -588,8 +584,8 @@ } } } else { /* v1.0 - v3.0 */ - fmt.dwMask |= PFM_TABLE; - fmt.wEffects &= ~PFE_TABLE; + info->fmt.dwMask |= PFM_TABLE; + info->fmt.wEffects &= ~PFE_TABLE; } break; case rtfNestLevel: @@ -657,197 +653,168 @@ } return; } else { /* v1.0 - v3.0 */ - fmt.dwMask |= PFM_TABLE; - fmt.wEffects |= PFE_TABLE; + info->fmt.dwMask |= PFM_TABLE; + info->fmt.wEffects |= PFE_TABLE; } break; } case rtfFirstIndent: - ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask = PFM_STARTINDENT | PFM_OFFSET; - fmt.dxStartIndent += fmt.dxOffset + info->rtfParam; - fmt.dxOffset = -info->rtfParam; - break; case rtfLeftIndent: - ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask = PFM_STARTINDENT; - fmt.dxStartIndent = info->rtfParam - fmt.dxOffset; + if ((info->fmt.dwMask & (PFM_STARTINDENT | PFM_OFFSET)) != (PFM_STARTINDENT | PFM_OFFSET)) + { + PARAFORMAT2 fmt; + fmt.cbSize = sizeof(fmt); + ME_GetSelectionParaFormat(info->editor, &fmt); + info->fmt.dwMask |= PFM_STARTINDENT | PFM_OFFSET; + info->fmt.dxStartIndent = fmt.dxStartIndent; + info->fmt.dxOffset = fmt.dxOffset; + } + if (info->rtfMinor == rtfFirstIndent) + { + info->fmt.dxStartIndent += info->fmt.dxOffset + info->rtfParam; + info->fmt.dxOffset = -info->rtfParam; + } + else + info->fmt.dxStartIndent = info->rtfParam - info->fmt.dxOffset; break; case rtfRightIndent: - fmt.dwMask = PFM_RIGHTINDENT; - fmt.dxRightIndent = info->rtfParam; + info->fmt.dwMask |= PFM_RIGHTINDENT; + info->fmt.dxRightIndent = info->rtfParam; break; case rtfQuadLeft: case rtfQuadJust: - fmt.dwMask = PFM_ALIGNMENT; - fmt.wAlignment = PFA_LEFT; + info->fmt.dwMask |= PFM_ALIGNMENT; + info->fmt.wAlignment = PFA_LEFT; break; case rtfQuadRight: - fmt.dwMask = PFM_ALIGNMENT; - fmt.wAlignment = PFA_RIGHT; + info->fmt.dwMask |= PFM_ALIGNMENT; + info->fmt.wAlignment = PFA_RIGHT; break; case rtfQuadCenter: - fmt.dwMask = PFM_ALIGNMENT; - fmt.wAlignment = PFA_CENTER; + info->fmt.dwMask |= PFM_ALIGNMENT; + info->fmt.wAlignment = PFA_CENTER; break; case rtfTabPos: - ME_GetSelectionParaFormat(info->editor, &fmt); - if (!(fmt.dwMask & PFM_TABSTOPS)) - { - fmt.cTabCount = 0; - } - if (fmt.cTabCount < MAX_TAB_STOPS && info->rtfParam < 0x1000000) - fmt.rgxTabs[fmt.cTabCount++] = info->rtfParam; - fmt.dwMask = PFM_TABSTOPS; + if (!(info->fmt.dwMask & PFM_TABSTOPS)) + { + PARAFORMAT2 fmt; + fmt.cbSize = sizeof(fmt); + ME_GetSelectionParaFormat(info->editor, &fmt); + memcpy(info->fmt.rgxTabs, fmt.rgxTabs, + fmt.cTabCount * sizeof(fmt.rgxTabs[0])); + info->fmt.cTabCount = fmt.cTabCount; + info->fmt.dwMask |= PFM_TABSTOPS; + } + if (info->fmt.cTabCount < MAX_TAB_STOPS && info->rtfParam < 0x1000000) + info->fmt.rgxTabs[info->fmt.cTabCount++] = info->rtfParam; break; case rtfKeep: - fmt.dwMask = PFM_KEEP; - fmt.wEffects = PFE_KEEP; + info->fmt.dwMask |= PFM_KEEP; + info->fmt.wEffects |= PFE_KEEP; break; case rtfNoWidowControl: - fmt.dwMask = PFM_NOWIDOWCONTROL; - fmt.wEffects = PFE_NOWIDOWCONTROL; + info->fmt.dwMask |= PFM_NOWIDOWCONTROL; + info->fmt.wEffects |= PFE_NOWIDOWCONTROL; break; case rtfKeepNext: - fmt.dwMask = PFM_KEEPNEXT; - fmt.wEffects = PFE_KEEPNEXT; + info->fmt.dwMask |= PFM_KEEPNEXT; + info->fmt.wEffects |= PFE_KEEPNEXT; break; case rtfSpaceAfter: - fmt.dwMask = PFM_SPACEAFTER; - fmt.dySpaceAfter = info->rtfParam; + info->fmt.dwMask |= PFM_SPACEAFTER; + info->fmt.dySpaceAfter = info->rtfParam; break; case rtfSpaceBefore: - fmt.dwMask = PFM_SPACEBEFORE; - fmt.dySpaceBefore = info->rtfParam; + info->fmt.dwMask |= PFM_SPACEBEFORE; + info->fmt.dySpaceBefore = info->rtfParam; break; case rtfSpaceBetween: - fmt.dwMask = PFM_LINESPACING; + info->fmt.dwMask |= PFM_LINESPACING; if ((int)info->rtfParam > 0) { - fmt.dyLineSpacing = info->rtfParam; - fmt.bLineSpacingRule = 3; + info->fmt.dyLineSpacing = info->rtfParam; + info->fmt.bLineSpacingRule = 3; } else { - fmt.dyLineSpacing = info->rtfParam; - fmt.bLineSpacingRule = 4; + info->fmt.dyLineSpacing = info->rtfParam; + info->fmt.bLineSpacingRule = 4; } break; case rtfSpaceMultiply: - fmt.dwMask = PFM_LINESPACING; - fmt.dyLineSpacing = info->rtfParam * 20; - fmt.bLineSpacingRule = 5; + info->fmt.dwMask |= PFM_LINESPACING; + info->fmt.dyLineSpacing = info->rtfParam * 20; + info->fmt.bLineSpacingRule = 5; break; case rtfParBullet: - fmt.dwMask = PFM_NUMBERING; - fmt.wNumbering = PFN_BULLET; + info->fmt.dwMask |= PFM_NUMBERING; + info->fmt.wNumbering = PFN_BULLET; break; case rtfParSimple: - fmt.dwMask = PFM_NUMBERING; - fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ + info->fmt.dwMask |= PFM_NUMBERING; + info->fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ break; case rtfParNumDecimal: - fmt.dwMask = PFM_NUMBERING; - fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ + info->fmt.dwMask |= PFM_NUMBERING; + info->fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ break; case rtfParNumIndent: - fmt.dwMask = PFM_NUMBERINGTAB; - fmt.wNumberingTab = info->rtfParam; + info->fmt.dwMask |= PFM_NUMBERINGTAB; + info->fmt.wNumberingTab = info->rtfParam; break; case rtfParNumStartAt: - fmt.dwMask = PFM_NUMBERINGSTART; - fmt.wNumberingStart = info->rtfParam; + info->fmt.dwMask |= PFM_NUMBERINGSTART; + info->fmt.wNumberingStart = info->rtfParam; break; case rtfBorderLeft: info->borderType = RTFBorderParaLeft; - ME_GetSelectionParaFormat(info->editor, &fmt); - if (!(fmt.dwMask & PFM_BORDER)) - { - fmt.wBorderSpace = 0; - fmt.wBorderWidth = 1; - fmt.wBorders = 0; - } - fmt.wBorders |= 1; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders |= 1; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderRight: info->borderType = RTFBorderParaRight; - ME_GetSelectionParaFormat(info->editor, &fmt); - if (!(fmt.dwMask & PFM_BORDER)) - { - fmt.wBorderSpace = 0; - fmt.wBorderWidth = 1; - fmt.wBorders = 0; - } - fmt.wBorders |= 2; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders |= 2; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderTop: info->borderType = RTFBorderParaTop; - ME_GetSelectionParaFormat(info->editor, &fmt); - if (!(fmt.dwMask & PFM_BORDER)) - { - fmt.wBorderSpace = 0; - fmt.wBorderWidth = 1; - fmt.wBorders = 0; - } - fmt.wBorders |= 4; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders |= 4; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderBottom: info->borderType = RTFBorderParaBottom; - ME_GetSelectionParaFormat(info->editor, &fmt); - if (!(fmt.dwMask & PFM_BORDER)) - { - fmt.wBorderSpace = 0; - fmt.wBorderWidth = 1; - fmt.wBorders = 0; - } - fmt.wBorders |= 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders |= 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderSingle: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x700; - fmt.wBorders |= 1 << 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders &= ~0x700; + info->fmt.wBorders |= 1 << 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderThick: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x700; - fmt.wBorders |= 2 << 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders &= ~0x700; + info->fmt.wBorders |= 2 << 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderShadow: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x700; - fmt.wBorders |= 10 << 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders &= ~0x700; + info->fmt.wBorders |= 10 << 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderDouble: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x700; - fmt.wBorders |= 7 << 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders &= ~0x700; + info->fmt.wBorders |= 7 << 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderDot: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x700; - fmt.wBorders |= 11 << 8; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorders &= ~0x700; + info->fmt.wBorders |= 11 << 8; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderWidth: { int borderSide = info->borderType & RTFBorderSideMask; RTFTable *tableDef = info->tableDef; - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorderWidth |= ((info->rtfParam / 15) & 7) << 8; if ((info->borderType & RTFBorderTypeMask) == RTFBorderTypeCell) { RTFBorder *border; @@ -857,14 +824,13 @@ border->width = info->rtfParam; break; } - fmt.dwMask = PFM_BORDER; + info->fmt.wBorderWidth = info->rtfParam; + info->fmt.dwMask |= PFM_BORDER; break; } case rtfBorderSpace: - ME_GetSelectionParaFormat(info->editor, &fmt); - /* we assume that borders have been created before (RTF spec) */ - fmt.wBorderSpace = info->rtfParam; - fmt.dwMask = PFM_BORDER; + info->fmt.wBorderSpace = info->rtfParam; + info->fmt.dwMask |= PFM_BORDER; break; case rtfBorderColor: { @@ -891,18 +857,13 @@ break; } case rtfRTLPar: - fmt.dwMask = PFM_RTLPARA; - fmt.wEffects = PFE_RTLPARA; + info->fmt.dwMask |= PFM_RTLPARA; + info->fmt.wEffects |= PFE_RTLPARA; break; case rtfLTRPar: - fmt.dwMask = PFM_RTLPARA; - fmt.wEffects = 0; + info->fmt.dwMask = PFM_RTLPARA; + info->fmt.wEffects &= ~PFE_RTLPARA; break; - } - if (fmt.dwMask) { - RTFFlushOutputBuffer(info); - /* FIXME too slow ? how come ?*/ - ME_SetSelectionParaFormat(info->editor, &fmt); } } @@ -3662,7 +3623,6 @@ editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); } ITextHost_TxInvalidateRect(editor->texthost, NULL, TRUE); - ITextHost_TxViewChange(editor->texthost, TRUE); return lColor; } case EM_GETMODIFY: 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] Tue Jun 7 11:01:48 2016 @@ -227,6 +227,7 @@ int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; +void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) DECLSPEC_HIDDEN; /* context.c */ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/paint.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/paint.c [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -956,7 +956,7 @@ rc.right = rc.left + run->nWidth; rc.top = c->pt.y + para->pt.y + run->pt.y; rc.bottom = rc.top + height; - TRACE("rc = (%d, %d, %d, %d)\n", rc.left, rc.top, rc.right, rc.bottom); + TRACE("rc = %s\n", wine_dbgstr_rect(&rc)); FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); } if (visible) Modified: trunk/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/para.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -506,7 +506,7 @@ DUMP(PFM_STYLE, "Text style:", "%d", sStyle); DUMP(PFM_LINESPACING, "Line spacing rule:", "%u", bLineSpacingRule); /* bOutlineLevel should be 0 */ - DUMP(PFM_SHADING, "Shading Weigth:", "%u", wShadingWeight); + DUMP(PFM_SHADING, "Shading Weight:", "%u", wShadingWeight); DUMP(PFM_SHADING, "Shading Style:", "%u", wShadingStyle); DUMP(PFM_NUMBERINGSTART, "Numbering Start:", "%u", wNumberingStart); DUMP(PFM_NUMBERINGSTYLE, "Numbering Style:", "0x%x", wNumberingStyle); 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] Tue Jun 7 11:01:48 2016 @@ -258,6 +258,9 @@ info->nestingLevel = 0; info->canInheritInTbl = FALSE; info->borderType = 0; + + memset(&info->fmt, 0, sizeof(info->fmt)); + info->fmt.cbSize = sizeof(info->fmt); } /* @@ -2505,6 +2508,10 @@ case rtfPage: case rtfSect: case rtfPar: + RTFFlushOutputBuffer(info); + ME_SetSelectionParaFormat(info->editor, &info->fmt); + memset(&info->fmt, 0, sizeof(info->fmt)); + info->fmt.cbSize = sizeof(info->fmt); RTFPutUnicodeChar (info, '\r'); if (info->editor->bEmulateVersion10) RTFPutUnicodeChar (info, '\n'); break; @@ -2526,6 +2533,12 @@ case rtfEnDash: RTFPutUnicodeChar (info, 0x2013); break; + case rtfEmSpace: + RTFPutUnicodeChar (info, ' '); + break; + case rtfEnSpace: + RTFPutUnicodeChar (info, ' '); + break; case rtfLQuote: RTFPutUnicodeChar (info, 0x2018); break; @@ -2538,6 +2551,18 @@ case rtfRDblQuote: RTFPutUnicodeChar (info, 0x201D); break; + case rtfLTRMark: + RTFPutUnicodeChar (info, 0x200E); + break; + case rtfRTLMark: + RTFPutUnicodeChar (info, 0x200F); + break; + case rtfNoWidthJoiner: + RTFPutUnicodeChar (info, 0x200D); + break; + case rtfNoWidthNonJoiner: + RTFPutUnicodeChar (info, 0x200C); + break; } } 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] Tue Jun 7 11:01:48 2016 @@ -2445,13 +2445,29 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) { ITextRangeImpl *This = impl_from_ITextRange(me); - - FIXME("(%p)->(%d): stub\n", This, value); - - if (!This->child.reole) - return CO_E_RELEASED; - - return E_NOTIMPL; + ME_TextEditor *editor; + ME_Cursor cursor; + int x, y, height; + + TRACE("(%p)->(%d)\n", This, value); + + if (!This->child.reole) + return CO_E_RELEASED; + + editor = This->child.reole->editor; + + switch (value) + { + case tomStart: + ME_CursorFromCharOfs(editor, This->start, &cursor); + ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + break; + default: + FIXME("bStart value %d not handled\n", value); + return E_NOTIMPL; + } + ME_ScrollAbs(editor, x, y); + return S_OK; } static HRESULT WINAPI ITextRange_fnGetEmbeddedObject(ITextRange *me, IUnknown **ppv) Modified: trunk/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -1171,6 +1171,8 @@ int nestingLevel; BOOL canInheritInTbl; int borderType; /* value corresponds to the RTFBorder constants. */ + + PARAFORMAT2 fmt; /* Accumulated para fmt for current paragraph. */ }; 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] Tue Jun 7 11:01:48 2016 @@ -404,10 +404,7 @@ ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE, ES_LEFT); ITextImpl->editor->exStyleFlags = 0; - ITextImpl->editor->rcFormat.left = 0; - ITextImpl->editor->rcFormat.top = 0; - ITextImpl->editor->rcFormat.right = 0; - ITextImpl->editor->rcFormat.bottom = 0; + SetRectEmpty(&ITextImpl->editor->rcFormat); if (pUnkOuter) ITextImpl->outer_unk = pUnkOuter; Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] Tue Jun 7 11:01:48 2016 @@ -746,6 +746,11 @@ assert( p->type == diParagraph ); + if (para->pFmt->dwMask & PFM_RTLPARA && para->pFmt->wEffects & PFE_RTLPARA) + state.uBidiLevel = 1; + + TRACE( "Base embedding level %d\n", state.uBidiLevel ); + while (1) { hr = ScriptItemize( para->text->szData, para->text->nLen, items_passed, &control, @@ -874,6 +879,11 @@ wc.nFirstMargin = ME_twips2pointsX(c, dxStartIndent); wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, pFmt->dxOffset); wc.nRightMargin = ME_twips2pointsX(c, pFmt->dxRightIndent); + + if (wc.nFirstMargin < 0) + wc.nFirstMargin = 0; + if (wc.nLeftMargin < 0) + wc.nLeftMargin = 0; } if (c->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) 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] Tue Jun 7 11:01:48 2016 @@ -161,7 +161,7 @@ reactos/dll/win32/query # Synced to WineStaging-1.9.4 reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.4 reactos/dll/win32/resutils # Synced to WineStaging-1.9.4 -reactos/dll/win32/riched20 # Synced to WineStaging-1.9.4 +reactos/dll/win32/riched20 # Synced to WineStaging-1.9.11 reactos/dll/win32/riched32 # Synced to WineStaging-1.9.4 reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.9.4 reactos/dll/win32/rsabase # Synced to WineStaging-1.9.4

8 years, 3 months

[akhaldi] 71585: [MSVFW32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 7 10:59:18 2016 New Revision: 71585 URL: http://svn.reactos.org/svn/reactos?rev=71585&view=rev Log: [MSVFW32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/msvfw32/msvfw.c Modified: trunk/rostests/winetests/msvfw32/msvfw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/msvfw.c… ============================================================================== --- trunk/rostests/winetests/msvfw32/msvfw.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvfw32/msvfw.c [iso-8859-1] Tue Jun 7 10:59:18 2016 @@ -25,6 +25,11 @@ #include "wine/test.h" +static inline int get_stride(int width, int depth) +{ + return ((depth * width + 31) >> 3) & ~3; +} + static void test_OpenCase(void) { HIC h; @@ -88,6 +93,7 @@ { static BITMAPINFOHEADER bi = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RLE8, 0,100000,100000, 0,0}; static BITMAPINFOHEADER bo = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RGB, 0,100000,100000, 0,0}; + BITMAPINFOHEADER tmp = {sizeof(BITMAPINFOHEADER)}; HIC h; DWORD err; @@ -122,6 +128,45 @@ err = ICDecompressQuery(h, &bi, &bo); ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n", err); bo.biHeight = -bo.biHeight; + + bi.biWidth = 17; + + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 15; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 16; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 24; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 32; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biWidth = 32; ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); @@ -201,6 +246,50 @@ err = ICDecompressQuery(h, &bi, &bo); todo_wine ok(err == ICERR_OK, "Query MSVC->RGB16 height<0: %d\n", err); bo.biHeight = -bo.biHeight; + + bo.biBitCount = 24; + err = ICDecompressQuery(h, &bi, &bo); + ok(err == ICERR_OK, "Query MSVC 16->24: %d\n", err); + bo.biBitCount = 16; + + bi.biWidth = 553; + + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biBitCount == 8, "Expected 8 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 8) * 8, "Expected size %d, got %d\n", + get_stride(552, 8) * 8, tmp.biSizeImage); + + bi.biBitCount = 15; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biBitCount = 16; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biBitCount == 16, "Expected 16 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 16) * 8, "Expected size %d, got %d\n", + get_stride(552, 16) * 8, tmp.biSizeImage); + + bi.biBitCount = 24; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biBitCount = 32; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biHeight = 17; + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biHeight == 16, "Expected height 16, got %d\n", tmp.biHeight); + bi.biHeight = 8; + + bi.biWidth = 32; bi.biCompression = mmioFOURCC('m','s','v','c'); err = ICDecompressQuery(h, &bi, &bo); @@ -285,9 +374,294 @@ ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); } +struct msg_result +{ + int msg_index; + UINT msg; + BOOL output_format; + int width; + int height; + int bits; + int compression; + LRESULT result; + BOOL todo; +}; + +static struct msg_result expected_msgs[] = +{ + /* Wine bug - shouldn't be called */ + { 0, DRV_LOAD, FALSE, 0, 0, 0, 0, TRUE, TRUE}, + { 0, DRV_ENABLE, FALSE, 0, 0, 0, 0, 0, TRUE}, + + { 0, DRV_OPEN, FALSE, 0, 0, 0, 0, 0xdeadbeef, FALSE}, + + /* test 1 */ + { 1, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + { 2, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_BADFORMAT, FALSE}, + { 3, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 8, BI_RGB, ICERR_BADFORMAT, FALSE}, + { 4, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_RGB, ICERR_BADFORMAT, FALSE}, + { 5, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_BITFIELDS, ICERR_BADFORMAT, FALSE}, + { 6, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 24, BI_RGB, ICERR_BADFORMAT, FALSE}, + { 7, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_BADFORMAT, FALSE}, + { 8, ICM_DECOMPRESS_GET_FORMAT, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 2 */ + { 9, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {10, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_BADFORMAT, FALSE}, + {11, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 8, BI_RGB, ICERR_BADFORMAT, FALSE}, + {12, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_RGB, ICERR_OK, FALSE}, + + /* test 3 */ + {13, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {14, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {15, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 8, BI_RGB, ICERR_BADFORMAT, FALSE}, + {16, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 16, BI_RGB, ICERR_OK, FALSE}, + + /* test 4 */ + {17, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {18, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_BADFORMAT, FALSE}, + {19, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 24, BI_RGB, ICERR_BADFORMAT, FALSE}, + {20, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_BADFORMAT, FALSE}, + {21, ICM_DECOMPRESS_GET_FORMAT, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 5 */ + {22, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {23, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {24, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 6 */ + {25, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {26, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {27, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 7 */ + {28, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {29, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {30, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 9, BI_RGB, ICERR_BADFORMAT, FALSE}, + {31, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_BADFORMAT, FALSE}, + {32, ICM_DECOMPRESS_GET_FORMAT, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 8 */ + {33, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {34, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {35, ICM_DECOMPRESS_QUERY, TRUE, 800, 600, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 9 */ + {36, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {37, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {38, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 10 */ + {39, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {40, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {41, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 32, BI_RGB, ICERR_OK, FALSE}, + + /* test 11 */ + {42, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {43, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {44, ICM_DECOMPRESS_QUERY, TRUE, 270, 270, 8, BI_RGB, ICERR_OK, FALSE}, + {45, ICM_DECOMPRESS_GET_PALETTE, FALSE, 0, 0, 0, 0, ICERR_UNSUPPORTED, FALSE}, + + /* test 12 */ + {46, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {47, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {48, ICM_DECOMPRESS_QUERY, TRUE, 270, 270, 16, BI_RGB, ICERR_OK, FALSE}, + + /* test 13 */ + {49, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {50, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {51, ICM_DECOMPRESS_QUERY, TRUE, 270, 270, 24, BI_RGB, ICERR_OK, FALSE}, + + /* test 14 */ + {52, ICM_DECOMPRESS_QUERY, FALSE, 0, 0, 0, 0, ICERR_OK, FALSE}, + {53, ICM_DECOMPRESS_GET_FORMAT, TRUE, 320, 240, 16, BI_RGB, ICERR_OK, FALSE}, + {54, ICM_DECOMPRESS_QUERY, TRUE, 640, 480, 4, BI_RGB, ICERR_OK, FALSE}, + + /* Wine bug - shouldn't be called */ + {55, DRV_DISABLE, FALSE, 0, 0, 0, 0, ICERR_OK, TRUE}, + {55, DRV_FREE, FALSE, 0, 0, 0, 0, ICERR_OK, TRUE}, +}; + +static int msg_index = 0; + +static struct msg_result *get_expected_msg(UINT msg) +{ + int i = 0; + for(; i < sizeof(expected_msgs) / sizeof(expected_msgs[0]); i++) + { + if (expected_msgs[i].msg_index == msg_index && expected_msgs[i].msg == msg) + return &expected_msgs[i]; + } + return NULL; +} + +LRESULT WINAPI driver_proc_test(DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, + LPARAM lParam1, LPARAM lParam2) +{ + struct msg_result *expected = get_expected_msg(msg); + LRESULT res = expected ? expected->result : ICERR_UNSUPPORTED; + + if (msg == DRV_CLOSE) + return ICERR_OK; + + if (!expected) + { + ok(0, "unexpected message: %04x %ld %ld at msg index %d\n", + msg, lParam1, lParam2, msg_index); + return ICERR_UNSUPPORTED; + } + else if (expected->todo) + { + todo_wine ok(0, "unexpected message: %04x %ld %ld at msg index %d\n", + msg, lParam1, lParam2, msg_index); + return res; + } + + switch (msg) + { + case ICM_DECOMPRESS_QUERY: + { + BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lParam2; + + if (!lParam2) + { + trace("query -> without format\n"); + ok(!expected->output_format, "Expected no output format pointer\n"); + break; + } + + ok(expected->output_format, "Expected output format pointer\n"); + ok(out->biWidth == expected->width, + "Expected width %d, got %d\n", expected->width, out->biWidth); + ok(out->biHeight == expected->height, + "Expected height %d, got %d\n", expected->height, out->biHeight); + ok(out->biBitCount == expected->bits, + "Expected biBitCount %d, got %d\n", expected->bits, out->biBitCount); + ok(out->biCompression == expected->compression, + "Expected compression %d, got %d\n", expected->compression, out->biCompression); + ok(out->biSizeImage == get_stride(out->biWidth, out->biBitCount) * out->biHeight, + "Expected biSizeImage %d, got %d\n", get_stride(out->biWidth, out->biBitCount) * out->biHeight, + out->biSizeImage); + + trace("query -> width: %d, height: %d, bit: %d, compression: %d, size: %d\n", + out->biWidth, out->biHeight, out->biBitCount, out->biCompression, out->biSizeImage); + break; + } + + case ICM_DECOMPRESS_GET_FORMAT: + { + BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lParam2; + + if (!lParam2) + { + trace("format -> without format\n"); + ok(!expected->output_format, "Expected no output format pointer\n"); + break; + } + + ok(expected->output_format, "Expected output format pointer\n"); + ok(out->biWidth == expected->width, + "Expected width %d, got %d\n", expected->width, out->biWidth); + ok(out->biHeight == expected->height, + "Expected height %d, got %d\n", expected->height, out->biHeight); + ok(out->biBitCount == expected->bits, + "Expected biBitCount %d, got %d\n", expected->bits, out->biBitCount); + ok(out->biCompression == expected->compression, + "Expected compression %d, got %d\n", expected->compression, out->biCompression); + + trace("format -> width: %d, height: %d, bit: %d, compression: %d, size: %d\n", + out->biWidth, out->biHeight, out->biBitCount, out->biCompression, out->biSizeImage); + + out->biBitCount = 64; + break; + } + } + + msg_index++; + return res; +} + + +void test_ICGetDisplayFormat(void) +{ + static const struct + { + int bits_wanted; + int bits_expected; + int dx; + int width_expected; + int dy; + int height_expected; + int msg_index; + } + tests[] = + { + { 8, 64, 0, 640, 0, 480, 9}, + { 8, 16, 0, 640, 0, 480, 13}, + { 8, 16, 0, 640, 0, 480, 17}, + {24, 64, 0, 640, 0, 480, 22}, + {32, 32, 0, 640, 0, 480, 25}, + { 0, 32, 0, 640, 0, 480, 28}, + { 9, 64, 0, 640, 0, 480, 33}, + {32, 32, 800, 800, 600, 600, 36}, + {32, 32, -1, 640, -1, 480, 39}, + {32, 32, -90, 640, -60, 480, 42}, + { 8, 8, 270, 270, 270, 270, 46}, + {16, 16, 270, 270, 270, 270, 49}, + {24, 24, 270, 270, 270, 270, 52}, + { 4, 4, 0, 640, 0, 480, 55}, + }; + + HIC ic, ic2; + BITMAPINFOHEADER in; + BITMAPINFOHEADER out; + int real_depth; + int i; + + ic = ICOpenFunction(ICTYPE_VIDEO, 0xdeadbeef, ICMODE_DECOMPRESS, driver_proc_test); + ok(!!ic, "Opening driver failed\n"); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + memset(&in, 0, sizeof(in)); + memset(&out, 0, sizeof(out)); + + in.biSize = sizeof(in); + in.biWidth = 640; + in.biHeight = 480; + in.biPlanes = 1; + in.biBitCount = 32; + in.biCompression = BI_PNG; + in.biSizeImage = 1024; + + out.biBitCount = 16; + out.biWidth = 320; + out.biHeight = 240; + + ic2 = ICGetDisplayFormat(ic, &in, &out, tests[i].bits_wanted, tests[i].dx, tests[i].dy); + ok(!!ic2, "Expected ICGetDisplayFormat to succeeded\n"); + + ok(out.biBitCount == tests[i].bits_expected, + "Expected biBitCount %d, got %d\n", tests[i].bits_expected, out.biBitCount); + ok(out.biWidth == tests[i].width_expected, + "Expected biWidth %d, got %d\n", tests[i].width_expected, out.biWidth); + ok(out.biHeight == tests[i].height_expected, + "Expected biHeight %d, got %d\n", tests[i].height_expected, out.biHeight); + real_depth = (out.biBitCount > 32) ? 32 : out.biBitCount; + ok(out.biSizeImage == get_stride(out.biWidth, real_depth) * out.biHeight, + "Expected biSizeImage %d, got %d\n", get_stride(out.biWidth, real_depth) * out.biHeight, + out.biSizeImage); + ok(msg_index == tests[i].msg_index, + "Expected msg_index %d, got %d\n", tests[i].msg_index, msg_index); + } + + ICClose(ic); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); test_ICSeqCompress(); -} + test_ICGetDisplayFormat(); +}

8 years, 3 months

[akhaldi] 71584: [OPENGL32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 7 10:58:19 2016 New Revision: 71584 URL: http://svn.reactos.org/svn/reactos?rev=71584&view=rev Log: [OPENGL32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/opengl32/opengl.c Modified: trunk/rostests/winetests/opengl32/opengl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/opengl… ============================================================================== --- trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] Tue Jun 7 10:58:19 2016 @@ -389,7 +389,7 @@ res = wglMakeCurrent(winhdc, hglrc2); ok(res, "Make current failed\n"); res = wglShareLists(hglrc1, hglrc2); - todo_wine ok(res, "Sharing display lists with a destination context which has been made current failed\n"); + ok(res, "Sharing display lists with a destination context which has been made current failed\n"); wglMakeCurrent(0, 0); wglDeleteContext(hglrc2); }

8 years, 3 months

[akhaldi] 71583: [QMGR] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 7 10:55:17 2016 New Revision: 71583 URL: http://svn.reactos.org/svn/reactos?rev=71583&view=rev Log: [QMGR] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/qmgr/file.c trunk/reactos/dll/win32/qmgr/job.c trunk/reactos/dll/win32/qmgr/service.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/qmgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/file.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/file.c [iso-8859-1] Tue Jun 7 10:55:17 2016 @@ -412,7 +412,8 @@ WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); - if (!ret) DeleteFileW(tmpfile); + if (!ret && !transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_ERROR)) + transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR); SetEvent(job->done); return ret; @@ -513,17 +514,15 @@ uc.nPort = 0; uc.lpszUrlPath = NULL; uc.dwUrlPathLength = ~0u; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = 0; ret = WinHttpCrackUrl(file->info.RemoteName, 0, 0, &uc); if (!ret) { TRACE("WinHttpCrackUrl failed, trying local file copy\n"); - if (!transfer_file_local(file, tmpName)) return FALSE; - } - else if (!transfer_file_http(file, &uc, tmpName)) - { - WARN("HTTP transfer failed\n"); - return FALSE; - } + if (!transfer_file_local(file, tmpName)) WARN("local transfer failed\n"); + } + else if (!transfer_file_http(file, &uc, tmpName)) WARN("HTTP transfer failed\n"); if (transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_QUEUED) || transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_QUEUED)) Modified: trunk/reactos/dll/win32/qmgr/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/job.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/qmgr/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/job.c [iso-8859-1] Tue Jun 7 10:55:17 2016 @@ -364,6 +364,12 @@ && This->state != BG_JOB_STATE_TRANSFERRING) { This->state = BG_JOB_STATE_QUEUED; + This->error.context = This->error.code = 0; + if (This->error.file) + { + IBackgroundCopyFile2_Release(This->error.file); + This->error.file = NULL; + } SetEvent(globalMgr.jobEvent); } LeaveCriticalSection(&globalMgr.cs); Modified: trunk/reactos/dll/win32/qmgr/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/service.c?r… ============================================================================== --- trunk/reactos/dll/win32/qmgr/service.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/service.c [iso-8859-1] Tue Jun 7 10:55:17 2016 @@ -143,7 +143,7 @@ WaitForSingleObject(fileTxThread, INFINITE); UpdateStatus(SERVICE_STOPPED, NO_ERROR, 0); CloseHandle(stop_event); - TRACE("service stoped\n"); + TRACE("service stopped\n"); CoUninitialize(); } 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] Tue Jun 7 10:55:17 2016 @@ -156,7 +156,7 @@ reactos/dll/win32/printui # Synced to WineStaging-1.9.4 reactos/dll/win32/propsys # Synced to WineStaging-1.9.4 reactos/dll/win32/pstorec # Synced to WineStaging-1.9.4 -reactos/dll/win32/qmgr # Synced to WineStaging-1.9.4 +reactos/dll/win32/qmgr # Synced to WineStaging-1.9.11 reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.9.4 reactos/dll/win32/query # Synced to WineStaging-1.9.4 reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.4

8 years, 3 months

[akhaldi] 71582: [OLEAUT32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 7 10:53:40 2016 New Revision: 71582 URL: http://svn.reactos.org/svn/reactos?rev=71582&view=rev Log: [OLEAUT32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/oleaut32/olefont.c trunk/rostests/winetests/oleaut32/olepicture.c trunk/rostests/winetests/oleaut32/typelib.c trunk/rostests/winetests/oleaut32/vartest.c trunk/rostests/winetests/oleaut32/vartype.c Modified: trunk/rostests/winetests/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olefon… ============================================================================== --- trunk/rostests/winetests/oleaut32/olefont.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/olefont.c [iso-8859-1] Tue Jun 7 10:53:40 2016 @@ -63,9 +63,8 @@ /* SetRatio to ratio_logical, ratio_himetric, */ /* check that resulting hfont has height hfont_height. */ /* Various checks along the way. */ -static void test_ifont_size(LONG lo_size, LONG hi_size, - LONG ratio_logical, LONG ratio_himetric, - LONG hfont_height, const char * test_name) +static void test_ifont_size(LONGLONG size, LONG ratio_logical, LONG ratio_himetric, + LONG hfont_height, const char * test_name) { FONTDESC fd; LPVOID pvObj = NULL; @@ -78,8 +77,7 @@ fd.cbSizeofstruct = sizeof(FONTDESC); fd.lpstrName = arial_font; /* using scalable instead of bitmap font reduces errors due to font realization */ - S(fd.cySize).Lo = lo_size; - S(fd.cySize).Hi = hi_size; + fd.cySize.int64 = size; fd.sWeight = 0; fd.sCharset = 0; fd.fItalic = FALSE; @@ -104,9 +102,9 @@ test_name, hres); /* Check returned size - allow for errors due to rounding & font realization. */ - ok((abs(S(psize).Lo - lo_size) < 10000) && S(psize).Hi == hi_size, + ok((psize.int64 - size) < 10000 && (psize.int64 - size) > -10000, "%s: IFont_get_Size: Lo=%d, Hi=%d; expected Lo=%d, Hi=%d.\n", - test_name, S(psize).Lo, S(psize).Hi, lo_size, hi_size); + test_name, S(psize).Lo, S(psize).Hi, fd.cySize.Lo, fd.cySize.Hi); /* Check hFont size. */ hres = IFont_get_hFont (ifnt, &hfont); @@ -135,59 +133,59 @@ ReleaseDC(0, hdc); if(dpi == 96) /* normal resolution display */ { - test_ifont_size(180000, 0, 0, 0, -24, "default"); /* normal font */ - test_ifont_size(186000, 0, 0, 0, -25, "rounding"); /* test rounding */ + test_ifont_size(180000, 0, 0, -24, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, -25, "rounding"); /* test rounding */ } else if(dpi == 72) /* low resolution display */ { - test_ifont_size(180000, 0, 0, 0, -18, "default"); /* normal font */ - test_ifont_size(186000, 0, 0, 0, -19, "rounding"); /* test rounding */ + test_ifont_size(180000, 0, 0, -18, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, -19, "rounding"); /* test rounding */ } else if(dpi == 120) /* high resolution display */ { - test_ifont_size(180000, 0, 0, 0, -30, "default"); /* normal font */ - test_ifont_size(186000, 0, 0, 0, -31, "rounding"); /* test rounding */ + test_ifont_size(180000, 0, 0, -30, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, -31, "rounding"); /* test rounding */ } else skip("Skipping resolution dependent font size tests - display resolution is %d\n", dpi); /* Next 4 tests specify a scaling ratio, so display resolution is not a factor. */ - test_ifont_size(180000, 0, 72, 2540, -18, "ratio1"); /* change ratio */ - test_ifont_size(180000, 0, 144, 2540, -36, "ratio2"); /* another ratio */ - test_ifont_size(180000, 0, 72, 1270, -36, "ratio3"); /* yet another ratio */ - test_ifont_size(186000, 0, 72, 2540, -19, "rounding+ratio"); /* test rounding with ratio */ + test_ifont_size(180000, 72, 2540, -18, "ratio1"); /* change ratio */ + test_ifont_size(180000, 144, 2540, -36, "ratio2"); /* another ratio */ + test_ifont_size(180000, 72, 1270, -36, "ratio3"); /* yet another ratio */ + test_ifont_size(186000, 72, 2540, -19, "rounding+ratio"); /* test rounding with ratio */ /* test various combinations of logical == himetric */ - test_ifont_size(180000, 0, 10, 10, -635, "identical ratio 1"); - test_ifont_size(240000, 0, 10, 10, -848, "identical ratio 2"); - test_ifont_size(300000, 0, 10, 10, -1058, "identical ratio 3"); + test_ifont_size(180000, 10, 10, -635, "identical ratio 1"); + test_ifont_size(240000, 10, 10, -848, "identical ratio 2"); + test_ifont_size(300000, 10, 10, -1058, "identical ratio 3"); /* test various combinations of logical and himetric both set to 1 */ - test_ifont_size(180000, 0, 1, 1, -24, "1:1 ratio 1"); - test_ifont_size(240000, 0, 1, 1, -32, "1:1 ratio 2"); - test_ifont_size(300000, 0, 1, 1, -40, "1:1 ratio 3"); + test_ifont_size(180000, 1, 1, -24, "1:1 ratio 1"); + test_ifont_size(240000, 1, 1, -32, "1:1 ratio 2"); + test_ifont_size(300000, 1, 1, -40, "1:1 ratio 3"); /* test various combinations of logical set to 1 */ - test_ifont_size(180000, 0, 1, 0, -24, "1:0 ratio 1"); - test_ifont_size(240000, 0, 1, 0, -32, "1:0 ratio 2"); - test_ifont_size(300000, 0, 1, 0, -40, "1:0 ratio 3"); + test_ifont_size(180000, 1, 0, -24, "1:0 ratio 1"); + test_ifont_size(240000, 1, 0, -32, "1:0 ratio 2"); + test_ifont_size(300000, 1, 0, -40, "1:0 ratio 3"); /* test various combinations of himetric set to 1 */ - test_ifont_size(180000, 0, 0, 1, -24, "0:1 ratio 1"); - test_ifont_size(240000, 0, 0, 1, -32, "0:1 ratio 2"); - test_ifont_size(300000, 0, 0, 1, -40, "0:1 ratio 3"); + test_ifont_size(180000, 0, 1, -24, "0:1 ratio 1"); + test_ifont_size(240000, 0, 1, -32, "0:1 ratio 2"); + test_ifont_size(300000, 0, 1, -40, "0:1 ratio 3"); /* test various combinations of 2:1 logical:himetric */ - test_ifont_size(180000, 0, 2, 1, -1270, "2:1 ratio 1"); - test_ifont_size(240000, 0, 2, 1, -1694, "2:1 ratio 2"); - test_ifont_size(300000, 0, 2, 1, -2117, "2:1 ratio 3"); + test_ifont_size(180000, 2, 1, -1270, "2:1 ratio 1"); + test_ifont_size(240000, 2, 1, -1694, "2:1 ratio 2"); + test_ifont_size(300000, 2, 1, -2117, "2:1 ratio 3"); /* test various combinations of 1:2 logical:himetric */ - test_ifont_size(180000, 0, 1, 2, -318, "1:2 ratio 1"); - test_ifont_size(240000, 0, 1, 2, -424, "1:2 ratio 2"); - test_ifont_size(300000, 0, 1, 2, -529, "1:2 ratio 3"); + test_ifont_size(180000, 1, 2, -318, "1:2 ratio 1"); + test_ifont_size(240000, 1, 2, -424, "1:2 ratio 2"); + test_ifont_size(300000, 1, 2, -529, "1:2 ratio 3"); /* test various combinations of logical and himetric both set to 2 */ - test_ifont_size(180000, 0, 2, 2, -635, "2:2 ratio 1"); - test_ifont_size(240000, 0, 2, 2, -848, "2:2 ratio 2"); - test_ifont_size(300000, 0, 2, 2, -1058, "2:2 ratio 3"); + test_ifont_size(180000, 2, 2, -635, "2:2 ratio 1"); + test_ifont_size(240000, 2, 2, -848, "2:2 ratio 2"); + test_ifont_size(300000, 2, 2, -1058, "2:2 ratio 3"); } static void test_QueryInterface(void) Modified: trunk/rostests/winetests/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olepic… ============================================================================== --- trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] Tue Jun 7 10:53:40 2016 @@ -225,7 +225,7 @@ { BITMAP bmp; GetObjectA(UlongToHandle(handle), sizeof(BITMAP), &bmp); - todo_wine ok(bmp.bmBits != 0, "not a dib\n"); + ok(bmp.bmBits != 0, "not a dib\n"); } width = 0; @@ -854,6 +854,7 @@ HANDLE file; DWORD size; WCHAR *ptr; + VARIANT var; const struct { @@ -920,6 +921,14 @@ if (pic) IPicture_Release(pic); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW + 8); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == S_OK, "OleLoadPictureFile error %#x\n", hres); + IPicture_Release(pic); + VariantClear(&var); + /* Try a DOS path with tacked on "file:". */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || @@ -928,6 +937,13 @@ if (pic) IPicture_Release(pic); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#x\n", hres); + VariantClear(&var); + DeleteFileA(temp_file); /* Try with a nonexistent file. */ @@ -937,11 +953,25 @@ broken(hres == E_FAIL), /*Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW + 8); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_FILENOTFOUND, "wrong error %#x\n", hres); + VariantClear(&var); + hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ broken(hres == E_UNEXPECTED) || /* NT4 */ broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); + + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#x\n", hres); + VariantClear(&var); file = CreateFileA(temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -964,6 +994,13 @@ if (pic) IPicture_Release(pic); + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#x\n", hres); + VariantClear(&var); + DeleteFileA(temp_file); /* Try with a nonexistent file. */ @@ -972,6 +1009,22 @@ broken(hres == E_UNEXPECTED) || /* NT4 */ broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); + + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(temp_fileW); + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_PATHFILEACCESSERROR, "wrong error %#x\n", hres); + VariantClear(&var); + + VariantInit(&var); + V_VT(&var) = VT_INT; + V_INT(&var) = 762; + hres = OleLoadPictureFile(var, (IDispatch **)&pic); + ok(hres == CTL_E_FILENOTFOUND, "wrong error %#x\n", hres); + +if (0) /* crashes under Windows */ + hres = OleLoadPictureFile(var, NULL); } static void test_himetric(void) @@ -1083,18 +1136,14 @@ size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == 66, "expected 66, got %d\n", size); mem = GlobalLock(hmem); -todo_wine ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1161,15 +1210,12 @@ todo_wine ok(size == 766, "expected 766, got %d\n", size); mem = GlobalLock(hmem); -todo_wine ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1235,13 +1281,11 @@ size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); @@ -1307,6 +1351,89 @@ } /* Non-statable impl always deletes on release */ IStream_Release(stream); +} + +static void test_load_save_emf(void) +{ + HDC hdc; + IPicture *pic; + PICTDESC desc; + short type; + OLE_HANDLE handle; + HGLOBAL hmem; + DWORD *mem; + ENHMETAHEADER *emh; + IPersistStream *src_stream; + IStream *dst_stream; + LARGE_INTEGER offset; + HRESULT hr; + LONG size; + + hdc = CreateEnhMetaFileA(0, NULL, NULL, NULL); + ok(hdc != 0, "CreateEnhMetaFileA failed\n"); + + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_ENHMETAFILE; + desc.u.emf.hemf = CloseEnhMetaFile(hdc); + ok(desc.u.emf.hemf != 0, "CloseEnhMetaFile failed\n"); + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); + + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_ENHMETAFILE,"expected PICTYPE_ENHMETAFILE, got %d\n", type); + + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(IntToPtr(handle) == desc.u.emf.hemf, "get_Handle returned wrong handle %#x\n", handle); + + hmem = GlobalAlloc(GMEM_MOVEABLE, 0); + hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); + ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); + ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); + ok(size == 128, "expected 128, got %d\n", size); + emh = GlobalLock(hmem); +if (size) +{ + ok(emh->iType == EMR_HEADER, "wrong iType %04x\n", emh->iType); + ok(emh->dSignature == ENHMETA_SIGNATURE, "wrong dSignature %08x\n", emh->dSignature); +} + GlobalUnlock(hmem); + + size = -1; + hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); + ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); + ok(size == -1, "expected -1, got %d\n", size); + + offset.QuadPart = 0; + hr = IStream_Seek(dst_stream, offset, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek %#x\n", hr); + + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); + ok(hr == S_OK, "Save error %#x\n", hr); + + IPersistStream_Release(src_stream); + IStream_Release(dst_stream); + + mem = GlobalLock(hmem); + ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); + ok(mem[1] == 128, "expected 128, got %u\n", mem[1]); + emh = (ENHMETAHEADER *)(mem + 2); + ok(emh->iType == EMR_HEADER, "wrong iType %04x\n", emh->iType); + ok(emh->dSignature == ENHMETA_SIGNATURE, "wrong dSignature %08x\n", emh->dSignature); + + GlobalUnlock(hmem); + GlobalFree(hmem); + + DeleteEnhMetaFile(desc.u.emf.hemf); + IPicture_Release(pic); } START_TEST(olepicture) @@ -1348,6 +1475,7 @@ test_load_save_bmp(); test_load_save_icon(); test_load_save_empty_picture(); + test_load_save_emf(); } Modified: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… ============================================================================== --- trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] Tue Jun 7 10:53:40 2016 @@ -5712,19 +5712,23 @@ hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 7, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); + tl = NULL; hr = LoadRegTypeLib(&LIBID_TestTypelib, 0xffff, 0xffff, LOCALE_NEUTRAL, &tl); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITypeLib_GetLibAttr(tl, &attr); - ok(hr == S_OK, "got 0x%08x\n", hr); - - ok(attr->lcid == 0, "got %x\n", attr->lcid); - ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); - ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); - ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); - - ITypeLib_ReleaseTLibAttr(tl, attr); - ITypeLib_Release(tl); + if (tl) + { + hr = ITypeLib_GetLibAttr(tl, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ok(attr->lcid == 0, "got %x\n", attr->lcid); + ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); + ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); + ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); + + ITypeLib_ReleaseTLibAttr(tl, attr); + ITypeLib_Release(tl); + } DeleteFileA("test_actctx_tlb.tlb"); DeleteFileA("test_actctx_tlb2.tlb"); Modified: trunk/rostests/winetests/oleaut32/vartest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartes… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] Tue Jun 7 10:53:40 2016 @@ -2548,7 +2548,7 @@ hres = pVarSub(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, "VarSub: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); - ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 0), + ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 0.0), "VarSub: BSTR + BSTR, expected %f got %f\n", 0.0, V_R8(&result)); /* Manually test some VT_CY and VT_DECIMAL variants */ @@ -2569,7 +2569,7 @@ ok(hres == S_OK && V_VT(&result) == VT_CY, "VarSub: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 4702), + ok(hres == S_OK && EQ_DOUBLE(r, 4702.0), "VarSub: CY value %f, expected %f\n", r, (double)4720); hres = pVarSub(&left, &dec, &result); @@ -5388,7 +5388,7 @@ hres = pVarMul(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 42399), "VarMul: CY value %f, expected %f\n", r, (double)42399); + ok(hres == S_OK && EQ_DOUBLE(r, 42399.0), "VarMul: CY value %f, expected %f\n", r, (double)42399); hres = pVarMul(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); @@ -5559,7 +5559,7 @@ hres = pVarAdd(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r); - ok(hres == S_OK && EQ_DOUBLE(r, 1212), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); + ok(hres == S_OK && EQ_DOUBLE(r, 1212.0), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); VariantClear(&result); /* Manuly test some VT_CY and VT_DECIMAL variants */ @@ -5579,7 +5579,7 @@ hres = pVarAdd(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 4720), "VarAdd: CY value %f, expected %f\n", r, (double)4720); + ok(hres == S_OK && EQ_DOUBLE(r, 4720.0), "VarAdd: CY value %f, expected %f\n", r, (double)4720); hres = pVarAdd(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); Modified: trunk/rostests/winetests/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartyp… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] Tue Jun 7 10:53:40 2016 @@ -3533,6 +3533,9 @@ DFS("1-2-1970"); EXPECT_DBL(25570.0); DFS("13-1-1970"); EXPECT_DBL(25581.0); DFS("1970-1-13"); EXPECT_DBL(25581.0); + DFS("6/30/2011 01:20:34"); EXPECT_DBL(40724.05594907407); + DFS("6/30/2011 01:20:34 AM"); EXPECT_DBL(40724.05594907407); + DFS("6/30/2011 01:20:34 PM"); EXPECT_DBL(40724.55594907407); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ /* test a non-english data string */

8 years, 3 months

[akhaldi] 71581: [OLEAUT32] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 7 10:51:58 2016 New Revision: 71581 URL: http://svn.reactos.org/svn/reactos?rev=71581&view=rev Log: [OLEAUT32] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c trunk/reactos/dll/win32/oleaut32/oleaut32.spec trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/typelib.h trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/oleaut32/vartype.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut.c [iso-8859-1] Tue Jun 7 10:51:58 2016 @@ -100,7 +100,7 @@ static inline bstr_t *bstr_from_str(BSTR str) { - return CONTAINING_RECORD(str, bstr_t, u.str); + return CONTAINING_RECORD((void *)str, bstr_t, u.str); } static inline bstr_cache_entry_t *get_cache_entry_from_idx(unsigned cache_idx) Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.spec [iso-8859-1] Tue Jun 7 10:51:58 2016 @@ -374,7 +374,7 @@ 419 stdcall OleCreatePictureIndirect(ptr ptr long ptr) 420 stdcall OleCreateFontIndirect(ptr ptr ptr) 421 stdcall OleTranslateColor(long long long) -422 stub OleLoadPictureFile +422 stdcall OleLoadPictureFile(int128 ptr) 423 stdcall OleSavePictureFile(ptr wstr) 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr) 425 stdcall VarUI4FromI8(int64 ptr) Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] Tue Jun 7 10:51:58 2016 @@ -246,6 +246,18 @@ } } +static void OLEPictureImpl_SetEMF(OLEPictureImpl *This) +{ + ENHMETAHEADER emh; + + GetEnhMetaFileHeader(This->desc.u.emf.hemf, sizeof(emh), &emh); + + This->origWidth = 0; + This->origHeight = 0; + This->himetricWidth = emh.rclFrame.right - emh.rclFrame.left; + This->himetricHeight = emh.rclFrame.bottom - emh.rclFrame.top; +} + /************************************************************************ * OLEPictureImpl_Construct * @@ -326,7 +338,11 @@ case PICTYPE_ICON: OLEPictureImpl_SetIcon(newObject); break; + case PICTYPE_ENHMETAFILE: + OLEPictureImpl_SetEMF(newObject); + break; + default: FIXME("Unsupported type %d\n", pictDesc->picType); newObject->himetricWidth = newObject->himetricHeight = 0; @@ -616,8 +632,7 @@ TRACE("(%p)->(%p, (%d,%d), (%d,%d) <- (%d,%d), (%d,%d), %p)\n", This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds); if(prcWBounds) - TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top, - prcWBounds->right, prcWBounds->bottom); + TRACE("prcWBounds %s\n", wine_dbgstr_rect(prcWBounds)); if(cx == 0 || cy == 0 || cxSrc == 0 || cySrc == 0){ return CTL_E_INVALIDPROPERTYVALUE; @@ -814,19 +829,6 @@ } /************************************************************************ - * OLEPictureImpl_SaveAsFile - */ -static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, - IStream *pstream, - BOOL SaveMemCopy, - LONG *pcbSize) -{ - OLEPictureImpl *This = impl_from_IPicture(iface); - FIXME("(%p)->(%p, %d, %p), hacked stub.\n", This, pstream, SaveMemCopy, pcbSize); - return IStream_Write(pstream,This->data,This->datalen,(ULONG*)pcbSize); -} - -/************************************************************************ * OLEPictureImpl_get_Attributes */ static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface, @@ -979,23 +981,16 @@ { BITMAPFILEHEADER *bfh = (BITMAPFILEHEADER*)xbuf; BITMAPINFO *bi = (BITMAPINFO*)(bfh+1); - HDC hdcref; - - /* Does not matter whether this is a coreheader or not, we only use - * components which are in both - */ - hdcref = GetDC(0); - This->desc.u.bmp.hbitmap = CreateDIBitmap( - hdcref, - &(bi->bmiHeader), - CBM_INIT, - xbuf+bfh->bfOffBits, - bi, - DIB_RGB_COLORS - ); - ReleaseDC(0, hdcref); + void *bits; + BITMAP bmp; + + This->desc.u.bmp.hbitmap = CreateDIBSection(0, bi, DIB_RGB_COLORS, &bits, NULL, 0); if (This->desc.u.bmp.hbitmap == 0) return E_FAIL; + + GetObjectA(This->desc.u.bmp.hbitmap, sizeof(bmp), &bmp); + memcpy(bits, xbuf + bfh->bfOffBits, bmp.bmHeight * bmp.bmWidthBytes); + This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); return S_OK; @@ -1005,10 +1000,9 @@ { HRESULT hr; BITMAPINFOHEADER bih; - HDC hdcref; UINT width, height; UINT stride, buffersize; - LPBYTE bits=NULL; + BYTE *bits; WICRect rc; IWICBitmapSource *real_source; UINT x, y; @@ -1036,10 +1030,10 @@ stride = 4 * width; buffersize = stride * height; - bits = HeapAlloc(GetProcessHeap(), 0, buffersize); - if (!bits) + This->desc.u.bmp.hbitmap = CreateDIBSection(0, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void **)&bits, NULL, 0); + if (This->desc.u.bmp.hbitmap == 0) { - hr = E_OUTOFMEMORY; + hr = E_FAIL; goto end; } @@ -1049,21 +1043,8 @@ rc.Height = height; hr = IWICBitmapSource_CopyPixels(real_source, &rc, stride, buffersize, bits); if (FAILED(hr)) - goto end; - - hdcref = GetDC(0); - This->desc.u.bmp.hbitmap = CreateDIBitmap( - hdcref, - &bih, - CBM_INIT, - bits, - (BITMAPINFO*)&bih, - DIB_RGB_COLORS); - - if (This->desc.u.bmp.hbitmap == 0) { - hr = E_FAIL; - ReleaseDC(0, hdcref); + DeleteObject(This->desc.u.bmp.hbitmap); goto end; } @@ -1086,8 +1067,10 @@ if (has_alpha) { - HDC hdcBmp, hdcXor, hdcMask; + HDC hdcref, hdcBmp, hdcXor, hdcMask; HBITMAP hbmoldBmp, hbmoldXor, hbmoldMask; + + hdcref = GetDC(0); This->hbmXor = CreateDIBitmap( hdcref, @@ -1118,12 +1101,10 @@ DeleteDC(hdcBmp); DeleteDC(hdcXor); DeleteDC(hdcMask); - } - - ReleaseDC(0, hdcref); + ReleaseDC(0, hdcref); + } end: - HeapFree(GetProcessHeap(), 0, bits); IWICBitmapSource_Release(real_source); return hr; } @@ -1742,6 +1723,17 @@ return success; } +static BOOL serializeEMF(HENHMETAFILE hemf, void **buf, unsigned *size) +{ + *size = GetEnhMetaFileBits(hemf, 0, NULL); + if (!*size) return FALSE; + + *buf = HeapAlloc(GetProcessHeap(), 0, *size); + if (!*buf) return FALSE; + + return GetEnhMetaFileBits(hemf, *size, *buf) != 0; +} + static HRESULT WINAPI OLEPictureImpl_Save( IPersistStream* iface,IStream*pStm,BOOL fClearDirty) { @@ -1817,11 +1809,30 @@ IStream_Write(pStm, This->data, This->datalen, &dummy); hResult = S_OK; break; + + case PICTYPE_ENHMETAFILE: + if (This->bIsDirty || !This->data) + { + serializeResult = serializeEMF(This->desc.u.emf.hemf, &pIconData, &iDataSize); + if (!serializeResult) + { + hResult = E_FAIL; + break; + } + + HeapFree(GetProcessHeap(), 0, This->data); + This->data = pIconData; + This->datalen = iDataSize; + } + header[0] = 0x0000746c; + header[1] = This->datalen; + IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); + IStream_Write(pStm, This->data, This->datalen, &dummy); + hResult = S_OK; + break; + case PICTYPE_METAFILE: FIXME("(%p,%p,%d), PICTYPE_METAFILE not implemented!\n",This,pStm,fClearDirty); - break; - case PICTYPE_ENHMETAFILE: - FIXME("(%p,%p,%d),PICTYPE_ENHMETAFILE not implemented!\n",This,pStm,fClearDirty); break; default: FIXME("(%p,%p,%d), [unknown type] not implemented!\n",This,pStm,fClearDirty); @@ -1839,6 +1850,98 @@ return E_NOTIMPL; } +/************************************************************************ + * OLEPictureImpl_SaveAsFile + */ +static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, + IStream *stream, BOOL mem_copy, LONG *size) +{ + OLEPictureImpl *This = impl_from_IPicture(iface); + void *data; + unsigned data_size; + ULONG written; + HRESULT hr; + + FIXME("(%p)->(%p,%d,%p): semi-stub\n", This, stream, mem_copy, size); + + switch (This->desc.picType) + { + case PICTYPE_NONE: + return S_OK; + + case PICTYPE_ICON: + if (!mem_copy) return E_FAIL; + + if (This->bIsDirty || !This->data) + { + if (!serializeIcon(This->desc.u.icon.hicon, &data, &data_size)) + return E_FAIL; + HeapFree(GetProcessHeap(), 0, This->data); + This->data = data; + This->datalen = data_size; + } + hr = IStream_Write(stream, This->data, This->datalen, &written); + if (hr == S_OK && size) *size = written; + return hr; + + case PICTYPE_BITMAP: + if (!mem_copy) return E_FAIL; + + if (This->bIsDirty || !This->data) + { + switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) + { + case BITMAP_FORMAT_BMP: + if (!serializeBMP(This->desc.u.bmp.hbitmap, &data, &data_size)) + return E_FAIL; + break; + case BITMAP_FORMAT_JPEG: + FIXME("BITMAP_FORMAT_JPEG is not implemented\n"); + return E_NOTIMPL; + case BITMAP_FORMAT_GIF: + FIXME("BITMAP_FORMAT_GIF is not implemented\n"); + return E_NOTIMPL; + case BITMAP_FORMAT_PNG: + FIXME("BITMAP_FORMAT_PNG is not implemented\n"); + return E_NOTIMPL; + default: + FIXME("PICTYPE_BITMAP/%#x is not implemented\n", This->loadtime_format); + return E_NOTIMPL; + } + + HeapFree(GetProcessHeap(), 0, This->data); + This->data = data; + This->datalen = data_size; + } + hr = IStream_Write(stream, This->data, This->datalen, &written); + if (hr == S_OK && size) *size = written; + return hr; + + case PICTYPE_METAFILE: + FIXME("PICTYPE_METAFILE is not implemented\n"); + return E_NOTIMPL; + + case PICTYPE_ENHMETAFILE: + if (!mem_copy) return E_FAIL; + + if (This->bIsDirty || !This->data) + { + if (!serializeEMF(This->desc.u.emf.hemf, &data, &data_size)) + return E_FAIL; + HeapFree(GetProcessHeap(), 0, This->data); + This->data = data; + This->datalen = data_size; + } + hr = IStream_Write(stream, This->data, This->datalen, &written); + if (hr == S_OK && size) *size = written; + return hr; + + default: + FIXME("%#x is not implemented\n", This->desc.picType); + break; + } + return E_NOTIMPL; +} /************************************************************************ * IDispatch @@ -2295,6 +2398,72 @@ return hr; } +static HRESULT create_stream(const WCHAR *filename, IStream **stream) +{ + HANDLE hFile; + DWORD dwFileSize; + HGLOBAL hGlobal = NULL; + DWORD dwBytesRead; + HRESULT hr = S_OK; + + hFile = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + dwFileSize = GetFileSize(hFile, NULL); + if (dwFileSize != INVALID_FILE_SIZE) + { + hGlobal = GlobalAlloc(GMEM_FIXED, dwFileSize); + if (!hGlobal) + hr = E_OUTOFMEMORY; + else + { + if (!ReadFile(hFile, hGlobal, dwFileSize, &dwBytesRead, NULL)) + { + GlobalFree(hGlobal); + hr = HRESULT_FROM_WIN32(GetLastError()); + } + } + } + + CloseHandle(hFile); + + if (FAILED(hr)) return hr; + + hr = CreateStreamOnHGlobal(hGlobal, TRUE, stream); + if (FAILED(hr)) + GlobalFree(hGlobal); + + return hr; +} + +/*********************************************************************** + * OleLoadPictureFile (OLEAUT32.422) + */ +HRESULT WINAPI OleLoadPictureFile(VARIANT filename, IDispatch **picture) +{ + IStream *stream; + HRESULT hr; + + TRACE("(%s,%p)\n", wine_dbgstr_variant(&filename), picture); + + if (V_VT(&filename) != VT_BSTR) + return CTL_E_FILENOTFOUND; + + hr = create_stream(V_BSTR(&filename), &stream); + if (hr != S_OK) + { + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + return CTL_E_FILENOTFOUND; + + return CTL_E_PATHFILEACCESSERROR; + } + + hr = OleLoadPicture(stream, 0, FALSE, &IID_IDispatch, (void **)picture); + IStream_Release(stream); + return hr; +} + /*********************************************************************** * OleSavePictureFile (OLEAUT32.423) */ @@ -2312,16 +2481,8 @@ LPVOID *ppvRet ) { static const WCHAR file[] = { 'f','i','l','e',':',0 }; - IPicture *ipicture; - HANDLE hFile; - DWORD dwFileSize; - HGLOBAL hGlobal = NULL; - DWORD dwBytesRead; IStream *stream; - BOOL bRead; - IPersistStream *pStream; HRESULT hRes; - HRESULT init_res; WCHAR *file_candidate; WCHAR path_buf[MAX_PATH]; @@ -2349,36 +2510,9 @@ /* Handle candidate DOS paths separately. */ if (file_candidate[1] == ':') { - hFile = CreateFileW(file_candidate, GENERIC_READ, 0, NULL, OPEN_EXISTING, - 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) - return INET_E_RESOURCE_NOT_FOUND; - - dwFileSize = GetFileSize(hFile, NULL); - if (dwFileSize != INVALID_FILE_SIZE ) - { - hGlobal = GlobalAlloc(GMEM_FIXED,dwFileSize); - if ( hGlobal) - { - bRead = ReadFile(hFile, hGlobal, dwFileSize, &dwBytesRead, NULL) && dwBytesRead == dwFileSize; - if (!bRead) - { - GlobalFree(hGlobal); - hGlobal = 0; - } - } - } - CloseHandle(hFile); - - if (!hGlobal) + hRes = create_stream(file_candidate, &stream); + if (FAILED(hRes)) return INET_E_RESOURCE_NOT_FOUND; - - hRes = CreateStreamOnHGlobal(hGlobal, TRUE, &stream); - if (FAILED(hRes)) - { - GlobalFree(hGlobal); - return hRes; - } } else { IMoniker *pmnk; IBindCtx *pbc; @@ -2398,31 +2532,9 @@ return hRes; } - init_res = CoInitialize(NULL); - - hRes = CoCreateInstance(&CLSID_StdPicture, punkCaller, CLSCTX_INPROC_SERVER, - &IID_IPicture, (LPVOID*)&ipicture); - if (SUCCEEDED(hRes)) { - hRes = IPicture_QueryInterface(ipicture, &IID_IPersistStream, (LPVOID*)&pStream); - - if (SUCCEEDED(hRes)) { - hRes = IPersistStream_Load(pStream, stream); - - if (SUCCEEDED(hRes)) { - hRes = IPicture_QueryInterface(ipicture, riid, ppvRet); - - if (FAILED(hRes)) - ERR("Failed to get interface %s from IPicture.\n", debugstr_guid(riid)); - } - IPersistStream_Release(pStream); - } - IPicture_Release(ipicture); - } + hRes = OleLoadPicture(stream, 0, FALSE, riid, ppvRet); IStream_Release(stream); - - if (SUCCEEDED(init_res)) - CoUninitialize(); return hRes; } Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] Tue Jun 7 10:51:58 2016 @@ -3536,6 +3536,10 @@ /* name, eventually add to a hash table */ pTypeLibImpl->Name = MSFT_ReadName(&cx, tlbHeader.NameOffset); + TRACE("%s, syskind %d, version %d.%d, flags %04x\n", + debugstr_w(pTypeLibImpl->Name->str), pTypeLibImpl->syskind, + pTypeLibImpl->ver_major, pTypeLibImpl->ver_minor, pTypeLibImpl->libflags); + /* help info */ pTypeLibImpl->DocString = MSFT_ReadString(&cx, tlbHeader.helpstring); pTypeLibImpl->HelpFile = MSFT_ReadString(&cx, tlbHeader.helpfile); @@ -7080,6 +7084,7 @@ UINT cNamedArgs = pDispParams->cNamedArgs; DISPID *rgdispidNamedArgs = pDispParams->rgdispidNamedArgs; UINT vargs_converted=0; + ULONG_PTR offset; hres = S_OK; @@ -7327,7 +7332,11 @@ break; } } - if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ + if (FAILED(hres)) + { + ERR("failed: %08x\n", hres); + goto func_fail; /* FIXME: we don't free changed types here */ + } /* VT_VOID is a special case for return types, so it is not * handled in the general function */ @@ -7340,7 +7349,16 @@ if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ } - hres = DispCallFunc(pIUnk, func_desc->oVft & 0xFFFC, func_desc->callconv, + offset = func_desc->oVft & 0xFFFC; +#ifdef _WIN64 + if (This->pTypeLib->syskind == SYS_WIN32) + { + offset *= 2; + TRACE("extended offset to %#lx for SYS_WIN32\n", offset); + } +#endif + TRACE("func_desc->oVft %#x, offset %#lx\n", func_desc->oVft, offset); + hres = DispCallFunc(pIUnk, offset, func_desc->callconv, V_VT(&varresult), func_desc->cParams, rgvt, prgpvarg, &varresult); Modified: trunk/reactos/dll/win32/oleaut32/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.h [iso-8859-1] Tue Jun 7 10:51:58 2016 @@ -211,7 +211,7 @@ /* after this may follow an array with default value pointers if the * appropriate bit in the FKCCIC field has been set: - * INT oDefautlValue[nrargs]; + * INT oDefaultValue[nrargs]; */ /* Parameter info one per argument*/ Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] Tue Jun 7 10:51:58 2016 @@ -28,6 +28,15 @@ #include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); + +static CRITICAL_SECTION cache_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &cache_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cache_cs") } +}; +static CRITICAL_SECTION cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, @@ -1474,7 +1483,6 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',',','$',0,'.',',' }; - static CRITICAL_SECTION csLastChars = { NULL, -1, 0, 0, 0, 0 }; static VARIANT_NUMBER_CHARS lastChars; static LCID lastLcid = -1; static DWORD lastFlags = 0; @@ -1482,14 +1490,14 @@ WCHAR buff[4]; /* To make caching thread-safe, a critical section is needed */ - EnterCriticalSection(&csLastChars); + EnterCriticalSection(&cache_cs); /* Asking for default locale entries is very expensive: It is a registry server call. So cache one locally, as Microsoft does it too */ if(lcid == lastLcid && dwFlags == lastFlags) { memcpy(lpChars, &lastChars, sizeof(defaultChars)); - LeaveCriticalSection(&csLastChars); + LeaveCriticalSection(&cache_cs); return; } @@ -1516,7 +1524,7 @@ memcpy(&lastChars, lpChars, sizeof(defaultChars)); lastLcid = lcid; lastFlags = dwFlags; - LeaveCriticalSection(&csLastChars); + LeaveCriticalSection(&cache_cs); } /* Number Parsing States */ Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] Tue Jun 7 10:51:58 2016 @@ -7658,11 +7658,13 @@ /* Parse the string into our structure */ while (*strIn) { - if (dp.dwCount >= 6) - break; - if (isdigitW(*strIn)) { + if (dp.dwCount >= 6) + { + hRet = DISP_E_TYPEMISMATCH; + break; + } dp.dwValues[dp.dwCount] = strtoulW(strIn, &strIn, 10); dp.dwCount++; strIn--; @@ -7678,9 +7680,14 @@ { if (i <= 25) { - dp.dwValues[dp.dwCount] = ParseDateMonths[i]; - dp.dwFlags[dp.dwCount] |= (DP_MONTH|DP_DATESEP); - dp.dwCount++; + if (dp.dwCount >= 6) + hRet = DISP_E_TYPEMISMATCH; + else + { + dp.dwValues[dp.dwCount] = ParseDateMonths[i]; + dp.dwFlags[dp.dwCount] |= (DP_MONTH|DP_DATESEP); + dp.dwCount++; + } } else if (i > 39 && i < 42) { 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] Tue Jun 7 10:51:58 2016 @@ -144,7 +144,7 @@ reactos/dll/win32/odbccp32 # Synced to WineStaging-1.9.4 reactos/dll/win32/ole32 # Synced to WineStaging-1.9.11 reactos/dll/win32/oleacc # Synced to WineStaging-1.9.4 -reactos/dll/win32/oleaut32 # Synced to WineStaging-1.9.4 +reactos/dll/win32/oleaut32 # Synced to WineStaging-1.9.11 reactos/dll/win32/olecli32 # Synced to WineStaging-1.9.4 reactos/dll/win32/oledlg # Synced to WineStaging-1.9.4 reactos/dll/win32/olepro32 # Synced to WineStaging-1.9.4

8 years, 3 months

[akhaldi] 71580: [OLE32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 7 10:49:20 2016 New Revision: 71580 URL: http://svn.reactos.org/svn/reactos?rev=71580&view=rev Log: [OLE32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/ole32/clipboard.c trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/dragdrop.c trunk/rostests/winetests/ole32/moniker.c trunk/rostests/winetests/ole32/ole2.c trunk/rostests/winetests/ole32/stg_prop.c Modified: trunk/rostests/winetests/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/clipboard… ============================================================================== --- trunk/rostests/winetests/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/clipboard.c [iso-8859-1] Tue Jun 7 10:49:20 2016 @@ -461,7 +461,7 @@ return S_OK; } -static void test_get_clipboard_unitialized(void) +static void test_get_clipboard_uninitialized(void) { HRESULT hr; IDataObject *pDObj; @@ -1609,7 +1609,7 @@ START_TEST(clipboard) { - test_get_clipboard_unitialized(); + test_get_clipboard_uninitialized(); test_set_clipboard(); test_consumer_refs(); test_flushed_getdata(); Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Tue Jun 7 10:49:20 2016 @@ -104,6 +104,7 @@ static const GUID IID_TestPS = { 0x66666666, 0x8888, 0x7777, { 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 } }; DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_testclsid, 0xacd014c7,0x9535,0x4fac,0x8b,0x53,0xa4,0x8c,0xa7,0xf4,0xd7,0x26); static const WCHAR stdfont[] = {'S','t','d','F','o','n','t',0}; static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0}; @@ -1302,6 +1303,12 @@ ok(!res, "RegCreateKeyEx returned %d\n", res); res = RegCreateKeyExA(hkey_iface, clsidDeadBeef, 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey, NULL); + if (res == ERROR_ACCESS_DENIED) + { + win_skip("Failed to create a key, skipping some of CoGetPSClsid() tests\n"); + goto cleanup; + } + ok(!res, "RegCreateKeyEx returned %d\n", res); res = RegCreateKeyExA(hkey, "ProxyStubClsid32", 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey_psclsid, NULL); @@ -1319,6 +1326,8 @@ RegCloseKey(hkey); res = pRegDeleteKeyExA(hkey_iface, clsidDeadBeef, opposite, 0); ok(!res, "RegDeleteKeyEx returned %d\n", res); + + cleanup: RegCloseKey(hkey_iface); } @@ -1775,7 +1784,7 @@ { HRESULT hr; ULONG refs; - IComThreadingInfo *pComThreadingInfo; + IComThreadingInfo *pComThreadingInfo, *threadinginfo2; IContextCallback *pContextCallback; IObjContext *pObjContext; APTTYPE apttype; @@ -1783,10 +1792,11 @@ struct info info; HANDLE thread; DWORD tid, exitcode; + GUID id, id2; if (!pCoGetObjectContext) { - skip("CoGetObjectContext not present\n"); + win_skip("CoGetObjectContext not present\n"); return; } @@ -1811,6 +1821,23 @@ pComThreadingInfo = NULL; hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + + threadinginfo2 = NULL; + hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&threadinginfo2); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + ok(pComThreadingInfo == threadinginfo2, "got different instance\n"); + IComThreadingInfo_Release(threadinginfo2); + + hr = IComThreadingInfo_GetCurrentLogicalThreadId(pComThreadingInfo, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + id = id2 = GUID_NULL; + hr = IComThreadingInfo_GetCurrentLogicalThreadId(pComThreadingInfo, &id); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoGetCurrentLogicalThreadId(&id2); + ok(IsEqualGUID(&id, &id2), "got %s, expected %s\n", wine_dbgstr_guid(&id), wine_dbgstr_guid(&id2)); + IComThreadingInfo_Release(pComThreadingInfo); SetEvent(info.stop); @@ -1843,11 +1870,8 @@ hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); - if (hr == S_OK) - { - refs = IContextCallback_Release(pContextCallback); - ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); - } + refs = IContextCallback_Release(pContextCallback); + ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); CoUninitialize(); @@ -1870,11 +1894,8 @@ hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); - if (hr == S_OK) - { - refs = IContextCallback_Release(pContextCallback); - ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); - } + refs = IContextCallback_Release(pContextCallback); + ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); hr = pCoGetObjectContext(&IID_IObjContext, (void **)&pObjContext); ok_ole_success(hr, "CoGetObjectContext"); @@ -1996,7 +2017,7 @@ { HRESULT hr; ULONG refs; - ULONG_PTR token; + ULONG_PTR token, token2; IObjContext *ctx; struct info info; HANDLE thread; @@ -2031,6 +2052,11 @@ hr = pCoGetContextToken(&token); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + token2 = 0; + hr = pCoGetContextToken(&token2); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + ok(token == token2, "got different token\n"); + SetEvent(info.stop); ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); @@ -2052,18 +2078,23 @@ ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); ok(token, "Expected token != 0\n"); + token2 = 0; + hr = pCoGetContextToken(&token2); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + ok(token2 == token, "got different token\n"); + refs = IUnknown_AddRef((IUnknown *)token); - todo_wine ok(refs == 1, "Expected 1, got %u\n", refs); + ok(refs == 1, "Expected 1, got %u\n", refs); hr = pCoGetObjectContext(&IID_IObjContext, (void **)&ctx); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); - todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); + ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); refs = IObjContext_AddRef(ctx); - todo_wine ok(refs == 3, "Expected 3, got %u\n", refs); + ok(refs == 3, "Expected 3, got %u\n", refs); refs = IObjContext_Release(ctx); - todo_wine ok(refs == 2, "Expected 2, got %u\n", refs); + ok(refs == 2, "Expected 2, got %u\n", refs); refs = IUnknown_Release((IUnknown *)token); ok(refs == 1, "Expected 1, got %u\n", refs); @@ -2073,7 +2104,7 @@ hr = pCoGetContextToken(&token); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); ok(token, "Expected token != 0\n"); - todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); + ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); refs = IObjContext_AddRef(ctx); ok(refs == 2, "Expected 1, got %u\n", refs); @@ -2107,12 +2138,11 @@ ok (IsEqualGUID(&out,&deadbeef), "expected to get same clsid back\n"); lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &clsidkey); - ok(lr == ERROR_SUCCESS, "Couldn't open CLSID key\n"); + ok(!lr, "Couldn't open CLSID key, error %d\n", lr); lr = RegCreateKeyExA(clsidkey, deadbeefA, 0, NULL, 0, KEY_WRITE, NULL, &deadbeefkey, NULL); if (lr) { - win_skip("CoGetTreatAsClass() tests will be skipped (failed to create a test key, error %d)\n", - GetLastError()); + win_skip("CoGetTreatAsClass() tests will be skipped (failed to create a test key, error %d)\n", lr); RegCloseKey(clsidkey); return; } @@ -2197,7 +2227,7 @@ IUnknown *pUnk; REFCLSID rclsid = &CLSID_InternetZoneManager; - /* 1. OleInitialize fails but OleUnintialize is still called: apartment stays inited */ + /* 1. OleInitialize fails but OleUninitialize is still called: apartment stays initialized */ hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); ok(hr == S_OK, "CoInitializeEx(COINIT_MULTITHREADED) failed with error 0x%08x\n", hr); @@ -2212,7 +2242,7 @@ CoUninitialize(); - /* 2. Extra multiple OleUninitialize: apartment stays inited until CoUnitialize */ + /* 2. Extra multiple OleUninitialize: apartment stays initialized until CoUninitialize */ hr = CoInitialize(NULL); ok(hr == S_OK, "CoInitialize() failed with error 0x%08x\n", hr); @@ -2373,22 +2403,26 @@ StringFromGUID2(&CLSID_non_existent, clsidW, sizeof(clsidW)/sizeof(clsidW[0])); ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsidkeyW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &clsidhkey, &disposition); + if (!ret) + { + ret = RegCreateKeyExW(clsidhkey, clsidW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &classkey, NULL); + if (ret) + RegCloseKey(clsidhkey); + } + if (ret == ERROR_ACCESS_DENIED) { - skip("Failed to create test key, skipping some of OleRegGetUserType() tests.\n"); + win_skip("Failed to create test key, skipping some of OleRegGetUserType() tests.\n"); return; } - ok(!ret, "failed to create a key %d, error %d\n", ret, GetLastError()); - - ret = RegCreateKeyExW(clsidhkey, clsidW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &classkey, NULL); - ok(!ret, "failed to create a key %d, error %d\n", ret, GetLastError()); + ok(!ret, "failed to create a key, error %d\n", ret); ret = RegSetValueExW(classkey, NULL, 0, REG_SZ, (const BYTE*)defvalueW, sizeof(defvalueW)); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); ret = RegCreateKeyExA(classkey, "AuxUserType", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &auxhkey, NULL); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); /* populate AuxUserType */ for (i = 0; i <= 4; i++) { @@ -2396,10 +2430,10 @@ sprintf(name, "AuxUserType\\%d", i); ret = RegCreateKeyExA(classkey, name, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); ret = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE*)auxvalues[i], strlen(auxvalues[i])); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret, "got error %d\n", ret); RegCloseKey(hkey); } @@ -2902,40 +2936,45 @@ } hr = pCoGetApartmentType(NULL, NULL); - ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%0x\n", hr); - + ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); + + type = 0xdeadbeef; hr = pCoGetApartmentType(&type, NULL); - ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%0x\n", hr); - + ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); + ok(type == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", type); + + qualifier = 0xdeadbeef; hr = pCoGetApartmentType(NULL, &qualifier); - ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%0x\n", hr); - + ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); + ok(qualifier == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", qualifier); + + type = 0xdeadbeef; + qualifier = 0xdeadbeef; hr = pCoGetApartmentType(&type, &qualifier); - ok(hr == CO_E_NOTINITIALIZED, "CoGetApartmentType succeeded, error: 0x%0x\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); ok(type == APTTYPE_CURRENT, "Expected APTTYPE_CURRENT, got %u\n", type); ok(qualifier == APTTYPEQUALIFIER_NONE, "Expected APTTYPEQUALIFIER_NONE, got %u\n", qualifier); + type = 0xdeadbeef; + qualifier = 0xdeadbeef; hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ok(!hr, "CoInitializeEx failed, error: 0x%08x\n", hr); - + ok(hr == S_OK, "CoInitializeEx failed, error: 0x%08x\n", hr); hr = pCoGetApartmentType(&type, &qualifier); - ok(!hr, "CoGetApartmentType failed, error: 0x%08x\n", hr); + ok(hr == S_OK, "CoGetApartmentType failed, error: 0x%08x\n", hr); ok(type == APTTYPE_MAINSTA, "Expected APTTYPE_MAINSTA, got %u\n", type); ok(qualifier == APTTYPEQUALIFIER_NONE, "Expected APTTYPEQUALIFIER_NONE, got %u\n", qualifier); - CoUninitialize(); + type = 0xdeadbeef; + qualifier = 0xdeadbeef; hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); - ok(!hr, "CoInitializeEx failed, error: 0x%08x\n", hr); - + ok(hr == S_OK, "CoInitializeEx failed, error: 0x%08x\n", hr); hr = pCoGetApartmentType(&type, &qualifier); - ok(!hr, "CoGetApartmentType failed, error: 0x%08x\n", hr); + ok(hr == S_OK, "CoGetApartmentType failed, error: 0x%08x\n", hr); ok(type == APTTYPE_MTA, "Expected APTTYPE_MTA, got %u\n", type); ok(qualifier == APTTYPEQUALIFIER_NONE, "Expected APTTYPEQUALIFIER_NONE, got %u\n", qualifier); - CoUninitialize(); } - static HRESULT WINAPI testspy_QI(IMallocSpy *iface, REFIID riid, void **obj) { @@ -3054,8 +3093,20 @@ IMalloc *imalloc; HRESULT hr; + hr = CoRegisterMallocSpy(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = CoRevokeMallocSpy(); + ok(hr == CO_E_OBJNOTREG, "got 0x%08x\n", hr); + hr = CoRegisterMallocSpy(&testspy); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRegisterMallocSpy(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = CoRegisterMallocSpy(&testspy); + ok(hr == CO_E_OBJISREG, "got 0x%08x\n", hr); imalloc = NULL; hr = CoGetMalloc(MEMCTX_TASK, &imalloc); @@ -3068,6 +3119,404 @@ hr = CoRevokeMallocSpy(); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRevokeMallocSpy(); + ok(hr == CO_E_OBJNOTREG, "got 0x%08x\n", hr); +} + +static void test_CoGetCurrentLogicalThreadId(void) +{ + HRESULT hr; + GUID id; + + hr = CoGetCurrentLogicalThreadId(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + id = GUID_NULL; + hr = CoGetCurrentLogicalThreadId(&id); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!IsEqualGUID(&id, &GUID_NULL), "got null id\n"); +} + +static HRESULT WINAPI testinitialize_QI(IInitializeSpy *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IInitializeSpy) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IInitializeSpy_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testinitialize_AddRef(IInitializeSpy *iface) +{ + return 2; +} + +static ULONG WINAPI testinitialize_Release(IInitializeSpy *iface) +{ + return 1; +} + +static HRESULT WINAPI testinitialize_PreInitialize(IInitializeSpy *iface, DWORD coinit, DWORD aptrefs) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testinitialize_PostInitialize(IInitializeSpy *iface, HRESULT hr, DWORD coinit, DWORD aptrefs) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testinitialize_PreUninitialize(IInitializeSpy *iface, DWORD aptrefs) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testinitialize_PostUninitialize(IInitializeSpy *iface, DWORD aptrefs) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IInitializeSpyVtbl testinitializevtbl = +{ + testinitialize_QI, + testinitialize_AddRef, + testinitialize_Release, + testinitialize_PreInitialize, + testinitialize_PostInitialize, + testinitialize_PreUninitialize, + testinitialize_PostUninitialize +}; + +static IInitializeSpy testinitialize = { &testinitializevtbl }; + +static void test_IInitializeSpy(void) +{ + ULARGE_INTEGER cookie, cookie1, cookie2; + HRESULT hr; + + hr = CoRegisterInitializeSpy(NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cookie.QuadPart = 1; + hr = CoRegisterInitializeSpy(NULL, &cookie); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(cookie.QuadPart == 1, "got wrong cookie\n"); + + hr = CoRegisterInitializeSpy(&testinitialize, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cookie.HighPart = 0; + cookie.LowPart = 1; + hr = CoRegisterInitializeSpy(&testinitialize, &cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(cookie.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie.HighPart, + GetCurrentThreadId()); + ok(cookie.LowPart == 0, "got wrong low part 0x%x\n", cookie.LowPart); +} + /* register same instance one more time */ + cookie1.HighPart = 0; + cookie1.LowPart = 0; + hr = CoRegisterInitializeSpy(&testinitialize, &cookie1); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie1.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie1.HighPart, + GetCurrentThreadId()); + ok(cookie1.LowPart == 1, "got wrong low part 0x%x\n", cookie1.LowPart); +} + cookie2.HighPart = 0; + cookie2.LowPart = 0; + hr = CoRegisterInitializeSpy(&testinitialize, &cookie2); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie2.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie2.HighPart, + GetCurrentThreadId()); + ok(cookie2.LowPart == 2, "got wrong low part 0x%x\n", cookie2.LowPart); +} + hr = CoRevokeInitializeSpy(cookie1); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRevokeInitializeSpy(cookie1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cookie1.HighPart = 0; + cookie1.LowPart = 0; + hr = CoRegisterInitializeSpy(&testinitialize, &cookie1); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie1.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie1.HighPart, + GetCurrentThreadId()); + ok(cookie1.LowPart == 1, "got wrong low part 0x%x\n", cookie1.LowPart); +} + hr = CoRevokeInitializeSpy(cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRevokeInitializeSpy(cookie1); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoRevokeInitializeSpy(cookie2); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +} + +static HRESULT g_persistfile_qi_ret; +static HRESULT g_persistfile_load_ret; +static HRESULT WINAPI testinstance_QI(IPersistFile *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + if (IsEqualIID(riid, &IID_IPersistFile)) { + if (SUCCEEDED(g_persistfile_qi_ret)) { + *obj = iface; + IUnknown_AddRef(iface); + } + else + *obj = NULL; + return g_persistfile_qi_ret; + } + + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testinstance_AddRef(IPersistFile *iface) +{ + return 2; +} + +static ULONG WINAPI testinstance_Release(IPersistFile *iface) +{ + return 1; +} + +static HRESULT WINAPI testinstance_GetClassID(IPersistFile *iface, CLSID *clsid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testinstance_IsDirty(IPersistFile *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testinstance_Load(IPersistFile *iface, LPCOLESTR filename, DWORD mode) +{ + return g_persistfile_load_ret; +} + +static HRESULT WINAPI testinstance_Save(IPersistFile *iface, LPCOLESTR filename, BOOL remember) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI testinstance_SaveCompleted(IPersistFile *iface, LPCOLESTR filename) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testinstance_GetCurFile(IPersistFile *iface, LPOLESTR *filename) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IPersistFileVtbl testpersistfilevtbl = { + testinstance_QI, + testinstance_AddRef, + testinstance_Release, + testinstance_GetClassID, + testinstance_IsDirty, + testinstance_Load, + testinstance_Save, + testinstance_SaveCompleted, + testinstance_GetCurFile +}; + +static IPersistFile testpersistfile = { &testpersistfilevtbl }; + +static HRESULT WINAPI getinstance_cf_QI(IClassFactory *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { + *obj = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI getinstance_cf_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI getinstance_cf_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI getinstance_cf_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) { + *obj = &testpersistfile; + return S_OK; + } + + ok(0, "unexpected call, riid %s\n", wine_dbgstr_guid(riid)); + *obj = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI getinstance_cf_LockServer(IClassFactory *iface, BOOL lock) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IClassFactoryVtbl getinstance_cf_vtbl = { + getinstance_cf_QI, + getinstance_cf_AddRef, + getinstance_cf_Release, + getinstance_cf_CreateInstance, + getinstance_cf_LockServer +}; + +static IClassFactory getinstance_cf = { &getinstance_cf_vtbl }; + +static void test_CoGetInstanceFromFile(void) +{ + static const WCHAR filenameW[] = {'d','u','m','m','y','p','a','t','h',0}; + CLSID *clsid = (CLSID*)&CLSID_testclsid; + MULTI_QI mqi[2]; + DWORD cookie; + HRESULT hr; + + hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* CLSID is not specified, file does not exist */ + mqi[0].pIID = &IID_IUnknown; + mqi[0].pItf = NULL; + mqi[0].hr = E_NOTIMPL; + hr = CoGetInstanceFromFile(NULL, NULL, NULL, CLSCTX_INPROC_SERVER, STGM_READ, (OLECHAR*)filenameW, 1, mqi); +todo_wine + ok(hr == MK_E_CANTOPENFILE, "got 0x%08x\n", hr); + ok(mqi[0].pItf == NULL, "got %p\n", mqi[0].pItf); + ok(mqi[0].hr == E_NOINTERFACE, "got 0x%08x\n", mqi[0].hr); + + /* class is not available */ + mqi[0].pIID = &IID_IUnknown; + mqi[0].pItf = NULL; + mqi[0].hr = E_NOTIMPL; + hr = CoGetInstanceFromFile(NULL, clsid, NULL, CLSCTX_INPROC_SERVER, STGM_READ, (OLECHAR*)filenameW, 1, mqi); + ok(hr == REGDB_E_CLASSNOTREG, "got 0x%08x\n", hr); + ok(mqi[0].pItf == NULL, "got %p\n", mqi[0].pItf); + ok(mqi[0].hr == REGDB_E_CLASSNOTREG, "got 0x%08x\n", mqi[0].hr); + + hr = CoRegisterClassObject(clsid, (IUnknown*)&getinstance_cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, + &cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + + mqi[0].pIID = &IID_IUnknown; + mqi[0].pItf = (void*)0xdeadbeef; + mqi[0].hr = S_OK; + hr = CoGetInstanceFromFile(NULL, clsid, NULL, CLSCTX_INPROC_SERVER, STGM_READ, (OLECHAR*)filenameW, 1, mqi); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(mqi[0].pItf == (void*)0xdeadbeef, "got %p\n", mqi[0].pItf); +} + ok(mqi[0].hr == S_OK, "got 0x%08x\n", mqi[0].hr); + + mqi[0].pIID = &IID_IUnknown; + mqi[0].pItf = (void*)0xdeadbeef; + mqi[0].hr = E_NOTIMPL; + hr = CoGetInstanceFromFile(NULL, clsid, NULL, CLSCTX_INPROC_SERVER, STGM_READ, (OLECHAR*)filenameW, 1, mqi); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(mqi[0].pItf == (void*)0xdeadbeef, "got %p\n", mqi[0].pItf); + ok(mqi[0].hr == E_NOTIMPL, "got 0x%08x\n", mqi[0].hr); +} + mqi[0].pIID = &IID_IUnknown; + mqi[0].pItf = NULL; + mqi[0].hr = E_NOTIMPL; + hr = CoGetInstanceFromFile(NULL, clsid, NULL, CLSCTX_INPROC_SERVER, STGM_READ, (OLECHAR*)filenameW, 1, mqi); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mqi[0].pItf != NULL, "got %p\n", mqi[0].pItf); + ok(mqi[0].hr == S_OK, "got 0x%08x\n", mqi[0].hr); + + mqi[0].pIID = &IID_IUnknown; + mqi[0].pItf = NULL; + mqi[0].hr = S_OK; + hr = CoGetInstanceFromFile(NULL, clsid, NULL, CLSCTX_INPROC_SERVER, STGM_READ, (OLECHAR*)filenameW, 1, mqi); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mqi[0].pItf != NULL, "got %p\n", mqi[0].pItf); + ok(mqi[0].hr == S_OK, "got 0x%08x\n", mqi[0].hr); + + mqi[0].pIID = &IID_IUnknown; + mqi[0].pItf = NULL; + mqi[0].hr = S_OK; + g_persistfile_qi_ret = S_FALSE; + hr = CoGetInstanceFromFile(NULL, clsid, NULL, CLSCTX_INPROC_SERVER, STGM_READ, (OLECHAR*)filenameW, 1, mqi); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mqi[0].pItf != NULL, "got %p\n", mqi[0].pItf); + ok(mqi[0].hr == S_OK, "got 0x%08x\n", mqi[0].hr); + g_persistfile_qi_ret = S_OK; + + mqi[0].pIID = &IID_IUnknown; + mqi[0].pItf = NULL; + mqi[0].hr = S_OK; + mqi[1].pIID = &IID_IUnknown; + mqi[1].pItf = NULL; + mqi[1].hr = S_OK; + g_persistfile_qi_ret = 0x8000efef; + hr = CoGetInstanceFromFile(NULL, clsid, NULL, CLSCTX_INPROC_SERVER, STGM_READ, (OLECHAR*)filenameW, 2, mqi); + ok(hr == 0x8000efef, "got 0x%08x\n", hr); + ok(mqi[0].pItf == NULL, "got %p\n", mqi[0].pItf); + ok(mqi[0].hr == 0x8000efef, "got 0x%08x\n", mqi[0].hr); + ok(mqi[1].pItf == NULL, "got %p\n", mqi[1].pItf); + ok(mqi[1].hr == 0x8000efef, "got 0x%08x\n", mqi[1].hr); + g_persistfile_qi_ret = S_OK; + + mqi[0].pIID = &IID_IUnknown; + mqi[0].pItf = NULL; + mqi[0].hr = S_OK; + mqi[1].pIID = &IID_IUnknown; + mqi[1].pItf = NULL; + mqi[1].hr = S_OK; + g_persistfile_load_ret = 0x8000fefe; + hr = CoGetInstanceFromFile(NULL, clsid, NULL, CLSCTX_INPROC_SERVER, STGM_READ, (OLECHAR*)filenameW, 2, mqi); + ok(hr == 0x8000fefe, "got 0x%08x\n", hr); + ok(mqi[0].pItf == NULL, "got %p\n", mqi[0].pItf); + ok(mqi[0].hr == 0x8000fefe, "got 0x%08x\n", mqi[0].hr); + ok(mqi[1].pItf == NULL, "got %p\n", mqi[1].pItf); + ok(mqi[1].hr == 0x8000fefe, "got 0x%08x\n", mqi[1].hr); + g_persistfile_load_ret = S_OK; + + hr = CoRevokeClassObject(cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CoUninitialize(); } static void init_funcs(void) @@ -3138,4 +3587,7 @@ test_OleRegGetUserType(); test_CoGetApartmentType(); test_IMallocSpy(); -} + test_CoGetCurrentLogicalThreadId(); + test_IInitializeSpy(); + test_CoGetInstanceFromFile(); +} Modified: trunk/rostests/winetests/ole32/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/dragdrop.… ============================================================================== --- trunk/rostests/winetests/ole32/dragdrop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/dragdrop.c [iso-8859-1] Tue Jun 7 10:49:20 2016 @@ -36,39 +36,233 @@ #include <wine/test.h> -#define DEFINE_EXPECT(func) \ - static BOOL expect_ ## func = FALSE, called_ ## func = FALSE - -#define SET_EXPECT(func) \ - expect_ ## func = TRUE - -#define CHECK_EXPECT2(func) \ - do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ - called_ ## func = TRUE; \ - }while(0) - -#define CHECK_EXPECT(func) \ - do { \ - CHECK_EXPECT2(func); \ - expect_ ## func = FALSE; \ - }while(0) - -#define CHECK_CALLED(func) \ - do { \ - ok(called_ ## func, "expected " #func "\n"); \ - expect_ ## func = called_ ## func = FALSE; \ - }while(0) - -DEFINE_EXPECT(DataObject_EnumFormatEtc); -DEFINE_EXPECT(EnumFORMATETC_Next); -DEFINE_EXPECT(EnumFORMATETC_Reset); -DEFINE_EXPECT(DataObject_QueryGetData); -DEFINE_EXPECT(DropSource_QueryContinueDrag); -DEFINE_EXPECT(DropTarget_DragEnter); -DEFINE_EXPECT(DropSource_GiveFeedback); -DEFINE_EXPECT(DropTarget_Drop); -DEFINE_EXPECT(DropTarget_DragLeave); + +#define METHOD_LIST \ + METHOD(DO_EnumFormatEtc), \ + METHOD(DO_QueryGetData), \ + METHOD(EnumFMT_Next), \ + METHOD(EnumFMT_Reset), \ + METHOD(EnumFMT_Skip), \ + METHOD(DS_QueryContinueDrag), \ + METHOD(DS_GiveFeedback), \ + METHOD(DT_DragEnter), \ + METHOD(DT_Drop), \ + METHOD(DT_DragLeave), \ + METHOD(DT_DragOver), \ + METHOD(DoDragDrop_effect_in), \ + METHOD(DoDragDrop_ret), \ + METHOD(DoDragDrop_effect_out), \ + METHOD(end_seq) + +#define METHOD(x) x +enum method +{ + METHOD_LIST +}; +#undef METHOD + +#define METHOD(x) #x +static const char *method_names[] = +{ + METHOD_LIST +}; +#undef METHOD +#undef METHOD_LIST + +struct method_call +{ + enum method method; + DWORD expect_param; + + HRESULT set_ret; + DWORD set_param; + + int called_todo : 1; +}; + +const struct method_call *call_ptr; + +static HRESULT check_expect_(enum method func, DWORD expect_param, DWORD *set_param, const char *file, int line ) +{ + HRESULT hr; + + do + { + todo_wine_if(call_ptr->called_todo) + ok_( file, line )( func == call_ptr->method, "unexpected call %s instead of %s\n", + method_names[func], method_names[call_ptr->method] ); + if (call_ptr->method == func) break; + } while ((++call_ptr)->method != end_seq); + + ok_( file, line )( expect_param == call_ptr->expect_param, "%s: unexpected param %08x expected %08x\n", + method_names[func], expect_param, call_ptr->expect_param ); + if (set_param) *set_param = call_ptr->set_param; + hr = call_ptr->set_ret; + if (call_ptr->method != end_seq) call_ptr++; + return hr; +} + +#define check_expect(func, expect_param, set_param) \ + check_expect_((func), (expect_param), (set_param), __FILE__, __LINE__) + + +struct method_call call_lists[][30] = +{ + { /* First QueryContinueDrag rets DRAGDROP_S_DROP */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_DROP, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_Drop, DROPEFFECT_COPY, 0xbeefbeef, DROPEFFECT_COPY, 0 }, + + { DoDragDrop_ret, 0xbeefbeef, 0, 0, 0, }, + { DoDragDrop_effect_out, DROPEFFECT_COPY, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* As above, but initial effects == 0 */ + { DoDragDrop_effect_in, 0, 0, 0, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_DROP, 0, 0 }, + { DT_DragEnter, 0, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, 0, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_DragLeave, 0, 0, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_DROP, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* Multiple initial effects */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_DROP, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_Drop, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_DROP, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First couple of QueryContinueDrag return S_OK followed by a drop */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_DROP, 0, 0 }, + { DT_Drop, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_DROP, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First QueryContinueDrag cancels */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_CANCEL, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_CANCEL, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First couple of QueryContinueDrag return S_OK followed by a cancel */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_CANCEL, 0, 0 }, + { DT_DragLeave, 0, 0, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_CANCEL, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First couple of QueryContinueDrag return S_OK followed by a E_FAIL */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, E_FAIL, 0, 0 }, + { DT_DragLeave, 0, 0, 0, 0 }, + + { DoDragDrop_ret, E_FAIL, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, +}; static int droptarget_refs; @@ -107,9 +301,7 @@ DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) { - CHECK_EXPECT(DropTarget_DragEnter); - *pdwEffect = DROPEFFECT_COPY; - return S_OK; + return check_expect(DT_DragEnter, *pdwEffect, pdwEffect); } static HRESULT WINAPI DropTarget_DragOver(IDropTarget* iface, @@ -117,23 +309,19 @@ POINTL pt, DWORD* pdwEffect) { - ok(0, "unexpected call\n"); - *pdwEffect = DROPEFFECT_COPY; - return S_OK; + return check_expect(DT_DragOver, *pdwEffect, pdwEffect); } static HRESULT WINAPI DropTarget_DragLeave(IDropTarget* iface) { - CHECK_EXPECT(DropTarget_DragLeave); - return E_NOTIMPL; + return check_expect(DT_DragLeave, 0, NULL); } static HRESULT WINAPI DropTarget_Drop(IDropTarget* iface, IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) { - CHECK_EXPECT(DropTarget_Drop); - return 0xbeefbeef; + return check_expect(DT_Drop, *pdwEffect, pdwEffect); } static const IDropTargetVtbl DropTarget_VTbl = @@ -176,16 +364,14 @@ BOOL fEscapePressed, DWORD grfKeyState) { - CHECK_EXPECT(DropSource_QueryContinueDrag); - return DRAGDROP_S_DROP; + return check_expect(DS_QueryContinueDrag, 0, NULL); } static HRESULT WINAPI DropSource_GiveFeedback( IDropSource *iface, DWORD dwEffect) { - CHECK_EXPECT(DropSource_GiveFeedback); - return DRAGDROP_S_USEDEFAULTCURSORS; + return check_expect(DS_GiveFeedback, dwEffect, NULL); } static const IDropSourceVtbl dropsource_vtbl = { @@ -215,37 +401,28 @@ return 1; } -static BOOL formats_enumerated; static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) { static FORMATETC format = { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; - - CHECK_EXPECT2(EnumFORMATETC_Next); + HRESULT hr = check_expect(EnumFMT_Next, 0, NULL); ok(celt == 1, "celt = %d\n", celt); ok(rgelt != NULL, "rgelt == NULL\n"); ok(pceltFetched == NULL, "pceltFetched != NULL\n"); - if(formats_enumerated) - return S_FALSE; - *rgelt = format; - formats_enumerated = TRUE; - return S_OK; + return hr; } static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + return check_expect(EnumFMT_Skip, 0, NULL); } static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface) { - CHECK_EXPECT(EnumFORMATETC_Reset); - formats_enumerated = FALSE; - return S_OK; + return check_expect(EnumFMT_Reset, 0, NULL); } static HRESULT WINAPI EnumFORMATETC_Clone(IEnumFORMATETC *iface, @@ -316,8 +493,7 @@ IDataObject *iface, FORMATETC *pformatetc) { - CHECK_EXPECT(DataObject_QueryGetData); - return S_OK; + return check_expect(DO_QueryGetData, 0, NULL); } static HRESULT WINAPI DataObject_GetCanonicalFormatEtc( @@ -344,10 +520,9 @@ DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) { - CHECK_EXPECT(DataObject_EnumFormatEtc); + HRESULT hr = check_expect(DO_EnumFormatEtc, 0, NULL); *ppenumFormatEtc = &EnumFORMATETC; - formats_enumerated = FALSE; - return S_OK; + return hr; } static HRESULT WINAPI DataObject_DAdvise( @@ -492,6 +667,7 @@ HRESULT hr; HWND hwnd; RECT rect; + int seq; hwnd = CreateWindowExA(WS_EX_TOPMOST, "WineOleTestClass", "Test", 0, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, @@ -529,43 +705,19 @@ ShowWindow(hwnd, SW_SHOW); GetWindowRect(hwnd, &rect); ok(SetCursorPos(rect.left+50, rect.top+50), "SetCursorPos failed\n"); - SET_EXPECT(DataObject_EnumFormatEtc); - SET_EXPECT(EnumFORMATETC_Next); - SET_EXPECT(EnumFORMATETC_Reset); - SET_EXPECT(DataObject_QueryGetData); - SET_EXPECT(DropSource_QueryContinueDrag); - SET_EXPECT(DropTarget_DragEnter); - SET_EXPECT(DropSource_GiveFeedback); - SET_EXPECT(DropTarget_Drop); - hr = DoDragDrop(&DataObject, &DropSource, DROPEFFECT_COPY, &effect); - ok(hr == 0xbeefbeef, "got 0x%08x\n", hr); - todo_wine CHECK_CALLED(DataObject_EnumFormatEtc); - todo_wine CHECK_CALLED(EnumFORMATETC_Next); - todo_wine CHECK_CALLED(EnumFORMATETC_Reset); - todo_wine CHECK_CALLED(DataObject_QueryGetData); - CHECK_CALLED(DropSource_QueryContinueDrag); - CHECK_CALLED(DropTarget_DragEnter); - CHECK_CALLED(DropSource_GiveFeedback); - CHECK_CALLED(DropTarget_Drop); - - SET_EXPECT(DataObject_EnumFormatEtc); - SET_EXPECT(EnumFORMATETC_Next); - SET_EXPECT(EnumFORMATETC_Reset); - SET_EXPECT(DataObject_QueryGetData); - SET_EXPECT(DropSource_QueryContinueDrag); - SET_EXPECT(DropTarget_DragEnter); - SET_EXPECT(DropSource_GiveFeedback); - SET_EXPECT(DropTarget_DragLeave); - hr = DoDragDrop(&DataObject, &DropSource, 0, &effect); - ok(hr == DRAGDROP_S_DROP, "got 0x%08x\n", hr); - todo_wine CHECK_CALLED(DataObject_EnumFormatEtc); - todo_wine CHECK_CALLED(EnumFORMATETC_Next); - todo_wine CHECK_CALLED(EnumFORMATETC_Reset); - todo_wine CHECK_CALLED(DataObject_QueryGetData); - CHECK_CALLED(DropSource_QueryContinueDrag); - CHECK_CALLED(DropTarget_DragEnter); - CHECK_CALLED(DropSource_GiveFeedback); - CHECK_CALLED(DropTarget_DragLeave); + + for (seq = 0; seq < sizeof(call_lists) / sizeof(call_lists[0]); seq++) + { + DWORD effect_in; + trace("%d\n", seq); + call_ptr = call_lists[seq]; + effect_in = call_ptr->set_param; + call_ptr++; + + hr = DoDragDrop(&DataObject, &DropSource, effect_in, &effect); + check_expect(DoDragDrop_ret, hr, NULL); + check_expect(DoDragDrop_effect_out, effect, NULL); + } OleUninitialize(); Modified: trunk/rostests/winetests/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/moniker.c… ============================================================================== --- trunk/rostests/winetests/ole32/moniker.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/moniker.c [iso-8859-1] Tue Jun 7 10:49:20 2016 @@ -1586,11 +1586,11 @@ IBindCtx *bindctx; IMoniker *inverse; IUnknown *unknown; - static const WCHAR wszDelimeter[] = {'!',0}; + static const WCHAR wszDelimiter[] = {'!',0}; static const WCHAR wszObjectName[] = {'T','e','s','t',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t',0 }; - hr = CreateItemMoniker(wszDelimeter, wszObjectName, &moniker); + hr = CreateItemMoniker(wszDelimiter, wszObjectName, &moniker); ok_ole_success(hr, CreateItemMoniker); test_moniker("item moniker", moniker, @@ -1715,15 +1715,15 @@ FILETIME filetime; IMoniker *inverse; IUnknown *unknown; - static const WCHAR wszDelimeter1[] = {'!',0}; + static const WCHAR wszDelimiter1[] = {'!',0}; static const WCHAR wszObjectName1[] = {'T','e','s','t',0}; - static const WCHAR wszDelimeter2[] = {'#',0}; + static const WCHAR wszDelimiter2[] = {'#',0}; static const WCHAR wszObjectName2[] = {'W','i','n','e',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t','#','W','i','n','e',0 }; - hr = CreateItemMoniker(wszDelimeter1, wszObjectName1, &moniker1); + hr = CreateItemMoniker(wszDelimiter1, wszObjectName1, &moniker1); ok_ole_success(hr, CreateItemMoniker); - hr = CreateItemMoniker(wszDelimeter2, wszObjectName2, &moniker2); + hr = CreateItemMoniker(wszDelimiter2, wszObjectName2, &moniker2); ok_ole_success(hr, CreateItemMoniker); hr = CreateGenericComposite(moniker1, moniker2, &moniker); ok_ole_success(hr, CreateGenericComposite); Modified: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… ============================================================================== --- trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] Tue Jun 7 10:49:20 2016 @@ -39,6 +39,11 @@ #include <wine/test.h> +#include "initguid.h" + +DEFINE_GUID(CLSID_Picture_Metafile,0x315,0,0,0xc0,0,0,0,0,0,0,0x46); +DEFINE_GUID(CLSID_Picture_Dib,0x316,0,0,0xc0,0,0,0,0,0,0,0x46); + #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define DEFINE_EXPECT(func) \ @@ -158,12 +163,7 @@ while (expected_method_list->flags & TEST_OPTIONAL && \ strcmp(expected_method_list->method, method_name) != 0) \ expected_method_list++; \ - if (expected_method_list->flags & TEST_TODO) \ - todo_wine \ - ok(!strcmp(expected_method_list->method, method_name), \ - "Expected %s to be called instead of %s\n", \ - expected_method_list->method, method_name); \ - else \ + todo_wine_if (expected_method_list->flags & TEST_TODO) \ ok(!strcmp(expected_method_list->method, method_name), \ "Expected %s to be called instead of %s\n", \ expected_method_list->method, method_name); \ @@ -1512,13 +1512,11 @@ static ULONG WINAPI Unknown_AddRef(IUnknown *iface) { - ok(0, "unexpected AddRef\n"); return 2; } static ULONG WINAPI Unknown_Release(IUnknown *iface) { - ok(0, "unexpected Release\n"); return 1; } @@ -1535,7 +1533,9 @@ { HRESULT hr; IOleCache2 *pOleCache; + IOleCache *olecache; IStorage *pStorage; + IUnknown *unk; IPersistStorage *pPS; IViewObject *pViewObject; IOleCacheControl *pOleCacheControl; @@ -1605,12 +1605,34 @@ /* requested is not IUnknown */ hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IOleCache2, (void**)&pOleCache); -todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&pOleCache); + hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IOleCache, (void**)&olecache); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache2, (void**)&pOleCache); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(unk != (IUnknown*)olecache, "got %p, expected %p\n", olecache, unk); + ok(unk != (IUnknown*)pOleCache, "got %p, expected %p\n", pOleCache, unk); IOleCache2_Release(pOleCache); + IOleCache_Release(olecache); + IUnknown_Release(unk); + + hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache, (void**)&olecache); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache2, (void**)&pOleCache); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(unk == (IUnknown*)olecache, "got %p, expected %p\n", olecache, unk); + ok(unk == (IUnknown*)pOleCache, "got %p, expected %p\n", pOleCache, unk); +} + IOleCache2_Release(pOleCache); + IOleCache_Release(olecache); + IUnknown_Release(unk); /* Test with new data */ Modified: trunk/rostests/winetests/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/stg_prop.… ============================================================================== --- trunk/rostests/winetests/ole32/stg_prop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/stg_prop.c [iso-8859-1] Tue Jun 7 10:49:20 2016 @@ -42,6 +42,8 @@ static HRESULT (WINAPI *pFmtIdToPropStgName)(const FMTID *, LPOLESTR); static HRESULT (WINAPI *pPropStgNameToFmtId)(const LPOLESTR, FMTID *); static HRESULT (WINAPI *pStgCreatePropSetStg)(IStorage *, DWORD, IPropertySetStorage **); +static HRESULT (WINAPI *pStgCreatePropStg)(IUnknown *, REFFMTID, const CLSID *, DWORD, DWORD, IPropertyStorage **); +static HRESULT (WINAPI *pStgOpenPropStg)(IUnknown *, REFFMTID, DWORD, DWORD, IPropertyStorage **); static void init_function_pointers(void) { @@ -49,20 +51,25 @@ pFmtIdToPropStgName = (void*)GetProcAddress(hmod, "FmtIdToPropStgName"); pPropStgNameToFmtId = (void*)GetProcAddress(hmod, "PropStgNameToFmtId"); pStgCreatePropSetStg = (void*)GetProcAddress(hmod, "StgCreatePropSetStg"); + pStgCreatePropStg = (void*)GetProcAddress(hmod, "StgCreatePropStg"); + pStgOpenPropStg = (void*)GetProcAddress(hmod, "StgOpenPropStg"); } + /* FIXME: this creates an ANSI storage, try to find conditions under which * Unicode translation fails */ -static void testProps(void) +static void testPropsHelper(IPropertySetStorage **propSetStorage) { static const WCHAR szDot[] = { '.',0 }; static const WCHAR szPrefix[] = { 's','t','g',0 }; + static const WCHAR szSummaryInfo[] = { 5,'S','u','m','m','a','r','y', + 'I','n','f','o','r','m','a','t','i','o','n',0 }; static WCHAR propName[] = { 'p','r','o','p',0 }; static char val[] = "l33t auth0r"; WCHAR filename[MAX_PATH]; HRESULT hr; IStorage *storage = NULL; - IPropertySetStorage *propSetStorage = NULL; + IStream *stream = NULL; IPropertyStorage *propertyStorage = NULL; PROPSPEC spec; PROPVARIANT var; @@ -71,6 +78,11 @@ GUID anyOldGuid = { 0x12345678,0xdead,0xbeef, { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07 } }; + if(propSetStorage) + trace("Testing property storage with a set...\n"); + else + trace("Testing property storage without a set...\n"); + if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) return; @@ -80,20 +92,40 @@ STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, &storage); ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); - if(!pStgCreatePropSetStg) - { - IStorage_Release(storage); - DeleteFileW(filename); - return; - } - hr = pStgCreatePropSetStg(storage, 0, &propSetStorage); - ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); - - hr = IPropertySetStorage_Create(propSetStorage, - &FMTID_SummaryInformation, NULL, PROPSETFLAG_ANSI, - STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, - &propertyStorage); - ok(hr == S_OK, "IPropertySetStorage_Create failed: 0x%08x\n", hr); + if(propSetStorage) + { + if(!pStgCreatePropSetStg) + { + IStorage_Release(storage); + DeleteFileW(filename); + return; + } + hr = pStgCreatePropSetStg(storage, 0, propSetStorage); + ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); + + hr = IPropertySetStorage_Create(*propSetStorage, + &FMTID_SummaryInformation, NULL, PROPSETFLAG_ANSI, + STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, + &propertyStorage); + ok(hr == S_OK, "IPropertySetStorage_Create failed: 0x%08x\n", hr); + } + else + { + hr = IStorage_CreateStream(storage, szSummaryInfo, + STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream); + ok(hr == S_OK, "IStorage_CreateStream failed: 0x%08x\n", hr); + + if(!pStgCreatePropStg) + { + IStorage_Release(storage); + IUnknown_Release(stream); + DeleteFileW(filename); + return; + } + hr = pStgCreatePropStg((IUnknown *)stream, &FMTID_SummaryInformation, + NULL, PROPSETFLAG_ANSI, 0, &propertyStorage); + ok(hr == S_OK, "StgCreatePropStg failed: 0x%08x\n", hr); + } hr = IPropertyStorage_WriteMultiple(propertyStorage, 0, NULL, NULL, 0); ok(hr == S_OK, "WriteMultiple with 0 args failed: 0x%08x\n", hr); @@ -261,23 +293,41 @@ */ IPropertyStorage_Release(propertyStorage); - propertyStorage = NULL; - IPropertySetStorage_Release(propSetStorage); - propSetStorage = NULL; + if(propSetStorage) IPropertySetStorage_Release(*propSetStorage); IStorage_Release(storage); - storage = NULL; + if(stream) IUnknown_Release(stream); /* now open it again */ hr = StgOpenStorage(filename, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &storage); ok(hr == S_OK, "StgOpenStorage failed: 0x%08x\n", hr); - hr = pStgCreatePropSetStg(storage, 0, &propSetStorage); - ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); - - hr = IPropertySetStorage_Open(propSetStorage, &FMTID_SummaryInformation, - STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); - ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr); + if(propSetStorage) + { + hr = pStgCreatePropSetStg(storage, 0, propSetStorage); + ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); + + hr = IPropertySetStorage_Open(*propSetStorage, &FMTID_SummaryInformation, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); + ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr); + } + else + { + hr = IStorage_OpenStream(storage, szSummaryInfo, + 0, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); + ok(hr == S_OK, "IStorage_OpenStream failed: 0x%08x\n", hr); + + if(!pStgOpenPropStg) + { + IStorage_Release(storage); + IUnknown_Release(stream); + DeleteFileW(filename); + return; + } + hr = pStgOpenPropStg((IUnknown *)stream, &FMTID_SummaryInformation, + PROPSETFLAG_DEFAULT, 0, &propertyStorage); + ok(hr == S_OK, "StgOpenPropStg failed: 0x%08x\n", hr); + } /* check properties again */ spec.ulKind = PRSPEC_LPWSTR; @@ -297,8 +347,9 @@ PropVariantClear(&var); IPropertyStorage_Release(propertyStorage); - IPropertySetStorage_Release(propSetStorage); + if(propSetStorage) IPropertySetStorage_Release(*propSetStorage); IStorage_Release(storage); + if(stream) IUnknown_Release(stream); DeleteFileW(filename); @@ -307,20 +358,27 @@ STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, &storage); ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); - if(!pStgCreatePropSetStg) - { - IStorage_Release(storage); - DeleteFileW(filename); - return; - } - hr = pStgCreatePropSetStg(storage, 0, &propSetStorage); - ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); - - hr = IPropertySetStorage_Create(propSetStorage, - &anyOldGuid, NULL, PROPSETFLAG_ANSI, - STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, - &propertyStorage); - ok(hr == S_OK, "IPropertySetStorage_Create failed: 0x%08x\n", hr); + if(propSetStorage) + { + hr = pStgCreatePropSetStg(storage, 0, propSetStorage); + ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); + + hr = IPropertySetStorage_Create(*propSetStorage, + &anyOldGuid, NULL, PROPSETFLAG_ANSI, + STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, + &propertyStorage); + ok(hr == S_OK, "IPropertySetStorage_Create failed: 0x%08x\n", hr); + } + else + { + hr = IStorage_CreateStream(storage, szSummaryInfo, + STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream); + ok(hr == S_OK, "IStorage_CreateStream failed: 0x%08x\n", hr); + + hr = pStgCreatePropStg((IUnknown *)stream, &anyOldGuid, NULL, + PROPSETFLAG_DEFAULT, 0, &propertyStorage); + ok(hr == S_OK, "StgCreatePropStg failed: 0x%08x\n", hr); + } spec.ulKind = PRSPEC_PROPID; U(spec).propid = PID_FIRST_USABLE; @@ -333,21 +391,34 @@ ok(hr == S_OK, "Commit failed: 0x%08x\n", hr); IPropertyStorage_Release(propertyStorage); - IPropertySetStorage_Release(propSetStorage); + if(propSetStorage) IPropertySetStorage_Release(*propSetStorage); IStorage_Release(storage); - propertyStorage = NULL; + if(stream) IUnknown_Release(stream); /* now open it again */ hr = StgOpenStorage(filename, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &storage); ok(hr == S_OK, "StgOpenStorage failed: 0x%08x\n", hr); - hr = pStgCreatePropSetStg(storage, 0, &propSetStorage); - ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); - - hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid, - STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); - ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr); + if(propSetStorage) + { + hr = pStgCreatePropSetStg(storage, 0, propSetStorage); + ok(hr == S_OK, "StgCreatePropSetStg failed: 0x%08x\n", hr); + + hr = IPropertySetStorage_Open(*propSetStorage, &anyOldGuid, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); + ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr); + } + else + { + hr = IStorage_OpenStream(storage, szSummaryInfo, + 0, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); + ok(hr == S_OK, "IStorage_OpenStream failed: 0x%08x\n", hr); + + hr = pStgOpenPropStg((IUnknown *)stream, &anyOldGuid, + PROPSETFLAG_DEFAULT, 0, &propertyStorage); + ok(hr == S_OK, "StgOpenPropStg failed: 0x%08x\n", hr); + } spec.ulKind = PRSPEC_PROPID; U(spec).propid = PID_FIRST_USABLE; @@ -359,10 +430,19 @@ var.vt, U(var).lVal); IPropertyStorage_Release(propertyStorage); - IPropertySetStorage_Release(propSetStorage); + if(propSetStorage) IPropertySetStorage_Release(*propSetStorage); IStorage_Release(storage); + if(stream) IUnknown_Release(stream); DeleteFileW(filename); +} + +static void testProps(void) +{ + IPropertySetStorage *propSetStorage = NULL; + + testPropsHelper(&propSetStorage); + testPropsHelper(NULL); } static void testCodepage(void)

8 years, 3 months

[akhaldi] 71579: [OLE32] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 7 10:47:21 2016 New Revision: 71579 URL: http://svn.reactos.org/svn/reactos?rev=71579&view=rev Log: [OLE32] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compositemoniker.c trunk/reactos/dll/win32/ole32/datacache.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/ifs.c trunk/reactos/dll/win32/ole32/marshal.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole2stubs.c trunk/reactos/dll/win32/ole32/ole32_ros.diff trunk/reactos/dll/win32/ole32/ole32res.rc trunk/reactos/dll/win32/ole32/olestd.h trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -3181,14 +3181,14 @@ return hres; } -static void init_multi_qi(DWORD count, MULTI_QI *mqi) +static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) { ULONG i; for (i = 0; i < count; i++) { mqi[i].pItf = NULL; - mqi[i].hr = E_NOINTERFACE; + mqi[i].hr = hr; } } @@ -3244,7 +3244,7 @@ if (pServerInfo) FIXME("() non-NULL pServerInfo not supported!\n"); - init_multi_qi(cmq, pResults); + init_multi_qi(cmq, pResults, E_NOINTERFACE); hres = CoGetTreatAsClass(rclsid, &clsid); if(FAILED(hres)) @@ -3328,7 +3328,7 @@ if (server_info) FIXME("() non-NULL server_info not supported\n"); - init_multi_qi(count, results); + init_multi_qi(count, results, E_NOINTERFACE); /* optionally get CLSID from a file */ if (!rclsid) @@ -3350,20 +3350,30 @@ (void**)&unk); if (hr != S_OK) - return hr; + { + init_multi_qi(count, results, hr); + return hr; + } /* init from file */ hr = IUnknown_QueryInterface(unk, &IID_IPersistFile, (void**)&pf); if (FAILED(hr)) - ERR("failed to get IPersistFile\n"); - - if (pf) { - IPersistFile_Load(pf, filename, grfmode); - IPersistFile_Release(pf); + init_multi_qi(count, results, hr); + IUnknown_Release(unk); + return hr; } - return return_multi_qi(unk, count, results, FALSE); + hr = IPersistFile_Load(pf, filename, grfmode); + IPersistFile_Release(pf); + if (SUCCEEDED(hr)) + return return_multi_qi(unk, count, results, FALSE); + else + { + init_multi_qi(count, results, hr); + IUnknown_Release(unk); + return hr; + } } /*********************************************************************** @@ -3390,7 +3400,7 @@ if (server_info) FIXME("() non-NULL server_info not supported\n"); - init_multi_qi(count, results); + init_multi_qi(count, results, E_NOINTERFACE); /* optionally get CLSID from a file */ if (!rclsid) @@ -3826,6 +3836,20 @@ DWORD WINAPI CoGetCurrentProcess(void) { return GetCurrentProcessId(); +} + +/*********************************************************************** + * CoGetCurrentLogicalThreadId [OLE32.@] + */ +HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id) +{ + TRACE("(%p)\n", id); + + if (!id) + return E_INVALIDARG; + + *id = COM_CurrentCausalityId(); + return S_OK; } /****************************************************************************** @@ -4595,7 +4619,6 @@ IContextCallback IContextCallback_iface; IObjContext IObjContext_iface; LONG refs; - APTTYPE apttype; } Context; static inline Context *impl_from_IComThreadingInfo( IComThreadingInfo *iface ) @@ -4648,10 +4671,15 @@ static ULONG Context_Release(Context *This) { - ULONG refs = InterlockedDecrement(&This->refs); - if (!refs) + /* Context instance is initially created with CoGetContextToken() with refcount set to 0, + releasing context while refcount is at 0 destroys it. */ + if (!This->refs) + { HeapFree(GetProcessHeap(), 0, This); - return refs; + return 0; + } + + return InterlockedDecrement(&This->refs); } static HRESULT WINAPI Context_CTI_QueryInterface(IComThreadingInfo *iface, REFIID riid, LPVOID *ppv) @@ -4674,21 +4702,26 @@ static HRESULT WINAPI Context_CTI_GetCurrentApartmentType(IComThreadingInfo *iface, APTTYPE *apttype) { - Context *This = impl_from_IComThreadingInfo(iface); + APTTYPEQUALIFIER qualifier; TRACE("(%p)\n", apttype); - *apttype = This->apttype; - return S_OK; + return CoGetApartmentType(apttype, &qualifier); } static HRESULT WINAPI Context_CTI_GetCurrentThreadType(IComThreadingInfo *iface, THDTYPE *thdtype) { - Context *This = impl_from_IComThreadingInfo(iface); + APTTYPEQUALIFIER qualifier; + APTTYPE apttype; + HRESULT hr; + + hr = CoGetApartmentType(&apttype, &qualifier); + if (FAILED(hr)) + return hr; TRACE("(%p)\n", thdtype); - switch (This->apttype) + switch (apttype) { case APTTYPE_STA: case APTTYPE_MAINSTA: @@ -4703,8 +4736,8 @@ static HRESULT WINAPI Context_CTI_GetCurrentLogicalThreadId(IComThreadingInfo *iface, GUID *logical_thread_id) { - FIXME("(%p): stub\n", logical_thread_id); - return E_NOTIMPL; + TRACE("(%p)\n", logical_thread_id); + return CoGetCurrentLogicalThreadId(logical_thread_id); } static HRESULT WINAPI Context_CTI_SetCurrentLogicalThreadId(IComThreadingInfo *iface, REFGUID logical_thread_id) @@ -4884,44 +4917,18 @@ */ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) { - APARTMENT *apt = COM_CurrentApt(); - Context *context; + IObjContext *context; HRESULT hr; TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); *ppv = NULL; - if (!apt) - { - if (!(apt = apartment_find_multi_threaded())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); - } - - context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); - if (!context) - return E_OUTOFMEMORY; - - context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; - context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; - context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; - context->refs = 1; - if (apt->multi_threaded) - context->apttype = APTTYPE_MTA; - else if (apt->main) - context->apttype = APTTYPE_MAINSTA; - else - context->apttype = APTTYPE_STA; - - hr = IComThreadingInfo_QueryInterface(&context->IComThreadingInfo_iface, riid, ppv); - IComThreadingInfo_Release(&context->IComThreadingInfo_iface); - - return hr; -} - + hr = CoGetContextToken((ULONG_PTR*)&context); + if (FAILED(hr)) + return hr; + + return IObjContext_QueryInterface(context, riid, ppv); +} /*********************************************************************** * CoGetContextToken [OLE32.@] @@ -4951,16 +4958,24 @@ if (!info->context_token) { - HRESULT hr; - IObjContext *ctx; - - hr = CoGetObjectContext(&IID_IObjContext, (void **)&ctx); - if (FAILED(hr)) return hr; - info->context_token = ctx; + Context *context; + + context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); + if (!context) + return E_OUTOFMEMORY; + + context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; + context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; + context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; + /* Context token does not take a reference, it's always zero until + interface is explicitely requested with CoGetObjectContext(). */ + context->refs = 0; + + info->context_token = &context->IObjContext_iface; } *token = (ULONG_PTR)info->context_token; - TRACE("apt->context_token=%p\n", info->context_token); + TRACE("context_token=%p\n", info->context_token); return S_OK; } @@ -5013,7 +5028,7 @@ { struct oletls *info = COM_CurrentInfo(); - FIXME("(%p %p): semi-stub\n", type, qualifier); + FIXME("(%p, %p): semi-stub\n", type, qualifier); if (!type || !qualifier) return E_INVALIDARG; @@ -5032,7 +5047,7 @@ *qualifier = APTTYPEQUALIFIER_NONE; - return info->apt ? ERROR_SUCCESS : CO_E_NOTINITIALIZED; + return info->apt ? S_OK : CO_E_NOTINITIALIZED; } /*********************************************************************** Modified: trunk/reactos/dll/win32/ole32/compositemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compositem… ============================================================================== --- trunk/reactos/dll/win32/ole32/compositemoniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compositemoniker.c [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -64,7 +64,7 @@ return CONTAINING_RECORD(iface, EnumMonikerImpl, IEnumMoniker_iface); } -static HRESULT EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker,ULONG tabSize,ULONG currentPos,BOOL leftToRigth,IEnumMoniker ** ppmk); +static HRESULT EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker,ULONG tabSize,ULONG currentPos,BOOL leftToRight,IEnumMoniker ** ppmk); /******************************************************************************* * CompositeMoniker_QueryInterface @@ -320,7 +320,7 @@ { HRESULT res; IRunningObjectTable *prot; - IMoniker *tempMk,*antiMk,*mostRigthMk; + IMoniker *tempMk,*antiMk,*rightMostMk; IEnumMoniker *enumMoniker; TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); @@ -349,17 +349,17 @@ /* component of the composite, passing the rest of the composite as the pmkToLeft parameter for that call */ IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); + IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); IEnumMoniker_Release(enumMoniker); res=CreateAntiMoniker(&antiMk); res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); - res=IMoniker_BindToObject(mostRigthMk,pbc,tempMk,riid,ppvResult); + res=IMoniker_BindToObject(rightMostMk,pbc,tempMk,riid,ppvResult); IMoniker_Release(tempMk); - IMoniker_Release(mostRigthMk); + IMoniker_Release(rightMostMk); } return res; @@ -373,7 +373,7 @@ IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult) { HRESULT res; - IMoniker *tempMk,*antiMk,*mostRigthMk,*leftMk; + IMoniker *tempMk,*antiMk,*rightMostMk,*leftMk; IEnumMoniker *enumMoniker; TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); @@ -392,7 +392,7 @@ leftMk = iface; IMoniker_Enum(iface, FALSE, &enumMoniker); - IEnumMoniker_Next(enumMoniker, 1, &mostRigthMk, NULL); + IEnumMoniker_Next(enumMoniker, 1, &rightMostMk, NULL); IEnumMoniker_Release(enumMoniker); res = CreateAntiMoniker(&antiMk); @@ -401,11 +401,11 @@ if (FAILED(res)) return res; IMoniker_Release(antiMk); - res = IMoniker_BindToStorage(mostRigthMk, pbc, tempMk, riid, ppvResult); + res = IMoniker_BindToStorage(rightMostMk, pbc, tempMk, riid, ppvResult); IMoniker_Release(tempMk); - IMoniker_Release(mostRigthMk); + IMoniker_Release(rightMostMk); if (pmkToLeft) IMoniker_Release(leftMk); @@ -420,7 +420,7 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { - IMoniker *tempMk,*antiMk,*mostRigthMk,*leftReducedComposedMk,*mostRigthReducedMk; + IMoniker *tempMk,*antiMk,*rightMostMk,*leftReducedComposedMk,*rightMostReducedMk; IEnumMoniker *enumMoniker; TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); @@ -433,14 +433,14 @@ if (ppmkToLeft==NULL){ IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); + IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); IEnumMoniker_Release(enumMoniker); CreateAntiMoniker(&antiMk); IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); - return IMoniker_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); + return IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); } else if (*ppmkToLeft==NULL) @@ -450,7 +450,7 @@ /* separate the composite moniker in to left and right moniker */ IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); + IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); IEnumMoniker_Release(enumMoniker); CreateAntiMoniker(&antiMk); @@ -459,11 +459,11 @@ /* If any of the components reduces itself, the method returns S_OK and passes back a composite */ /* of the reduced components */ - if (IMoniker_Reduce(mostRigthMk,pbc,dwReduceHowFar,NULL,&mostRigthReducedMk) && - IMoniker_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) + if (IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,NULL,&rightMostReducedMk) && + IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) ) - return CreateGenericComposite(leftReducedComposedMk,mostRigthReducedMk,ppmkReduced); + return CreateGenericComposite(leftReducedComposedMk,rightMostReducedMk,ppmkReduced); else{ /* If no reduction occurred, the method passes back the same moniker and returns MK_S_REDUCED_TO_SELF.*/ @@ -613,7 +613,7 @@ { IRunningObjectTable* rot; HRESULT res; - IMoniker *tempMk,*antiMk,*mostRigthMk; + IMoniker *tempMk,*antiMk,*rightMostMk; IEnumMoniker *enumMoniker; TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning); @@ -665,17 +665,17 @@ else{ IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); + IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); IEnumMoniker_Release(enumMoniker); res=CreateAntiMoniker(&antiMk); res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); - res=IMoniker_IsRunning(mostRigthMk,pbc,tempMk,pmkNewlyRunning); + res=IMoniker_IsRunning(rightMostMk,pbc,tempMk,pmkNewlyRunning); IMoniker_Release(tempMk); - IMoniker_Release(mostRigthMk); + IMoniker_Release(rightMostMk); return res; } @@ -690,7 +690,7 @@ IMoniker* pmkToLeft, FILETIME* pCompositeTime) { HRESULT res; - IMoniker *tempMk,*antiMk,*mostRigthMk,*leftMk; + IMoniker *tempMk,*antiMk,*rightMostMk,*leftMk; IEnumMoniker *enumMoniker; TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pCompositeTime); @@ -727,17 +727,17 @@ leftMk = iface; IMoniker_Enum(iface, FALSE, &enumMoniker); - IEnumMoniker_Next(enumMoniker, 1, &mostRigthMk, NULL); + IEnumMoniker_Next(enumMoniker, 1, &rightMostMk, NULL); IEnumMoniker_Release(enumMoniker); res = CreateAntiMoniker(&antiMk); res = IMoniker_ComposeWith(leftMk, antiMk, 0, &tempMk); IMoniker_Release(antiMk); - res = IMoniker_GetTimeOfLastChange(mostRigthMk, pbc, tempMk, pCompositeTime); + res = IMoniker_GetTimeOfLastChange(rightMostMk, pbc, tempMk, pCompositeTime); IMoniker_Release(tempMk); - IMoniker_Release(mostRigthMk); + IMoniker_Release(rightMostMk); if (pmkToLeft) IMoniker_Release(leftMk); @@ -752,7 +752,7 @@ CompositeMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) { HRESULT res; - IMoniker *tempMk,*antiMk,*mostRigthMk,*tempInvMk,*mostRigthInvMk; + IMoniker *tempMk,*antiMk,*rightMostMk,*tempInvMk,*rightMostInvMk; IEnumMoniker *enumMoniker; TRACE("(%p,%p)\n",iface,ppmk); @@ -781,18 +781,18 @@ else{ IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); + IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); IEnumMoniker_Release(enumMoniker); - IMoniker_Inverse(mostRigthMk,&mostRigthInvMk); + IMoniker_Inverse(rightMostMk,&rightMostInvMk); CompositeMonikerImpl_Inverse(tempMk,&tempInvMk); - res=CreateGenericComposite(mostRigthInvMk,tempInvMk,ppmk); + res=CreateGenericComposite(rightMostInvMk,tempInvMk,ppmk); IMoniker_Release(tempMk); - IMoniker_Release(mostRigthMk); + IMoniker_Release(rightMostMk); IMoniker_Release(tempInvMk); - IMoniker_Release(mostRigthInvMk); + IMoniker_Release(rightMostInvMk); return res; } @@ -1140,13 +1140,13 @@ IMoniker** ppmkOut) { IEnumMoniker *enumMoniker; - IMoniker *tempMk,*mostRigthMk,*antiMk; + IMoniker *tempMk,*rightMostMk,*antiMk; /* This method recursively calls IMoniker::ParseDisplayName on the rightmost component of the composite,*/ /* passing everything else as the pmkToLeft parameter for that call. */ /* get the most right moniker */ IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); + IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); IEnumMoniker_Release(enumMoniker); /* get the left moniker */ @@ -1154,7 +1154,7 @@ IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); - return IMoniker_ParseDisplayName(mostRigthMk,pbc,tempMk,pszDisplayName,pchEaten,ppmkOut); + return IMoniker_ParseDisplayName(rightMostMk,pbc,tempMk,pszDisplayName,pchEaten,ppmkOut); } /****************************************************************************** @@ -1742,6 +1742,7 @@ IMoniker *tempMk; HRESULT res; CompositeMonikerImpl *This; + int i; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); @@ -1787,12 +1788,14 @@ if (++This->tabLastIndex==This->tabSize){ - LPVOID tab_moniker = This->tabMoniker; + IMoniker **tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; - This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); + This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL){ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(tab_moniker[i]); HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; @@ -1835,18 +1838,25 @@ IMoniker_Release(This->tabMoniker[This->tabLastIndex-1]); This->tabMoniker[This->tabLastIndex-1]=tempMk; - } else + } else{ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(This->tabMoniker[i]); + HeapFree(GetProcessHeap(), 0, This->tabMoniker); + HeapFree(GetProcessHeap(), 0, This); return res; + } /* resize tabMoniker if needed */ if (This->tabLastIndex==This->tabSize){ - LPVOID tab_moniker = This->tabMoniker; + IMoniker **tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); if (This->tabMoniker==NULL){ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(tab_moniker[i]); HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; @@ -1883,13 +1893,15 @@ } if (This->tabLastIndex==This->tabSize){ - LPVOID tab_moniker = This->tabMoniker; + IMoniker **tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL){ + for (i = 0; i < This->tabLastIndex; i++) + IMoniker_Release(tab_moniker[i]); HeapFree(GetProcessHeap(), 0, tab_moniker); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; Modified: trunk/reactos/dll/win32/ole32/datacache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.… ============================================================================== --- trunk/reactos/dll/win32/ole32/datacache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/datacache.c [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -2450,7 +2450,7 @@ * IUnknown pointer can be returned to the outside. */ if ( pUnkOuter && !IsEqualIID(&IID_IUnknown, riid) ) - return CLASS_E_NOAGGREGATION; + return E_INVALIDARG; /* * Try to construct a new instance of the class. Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… ============================================================================== --- trunk/reactos/dll/win32/ole32/filemoniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/filemoniker.c [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -678,39 +678,39 @@ lastIdx2=FileMonikerImpl_DecomposePath(str2,&strDec2)-1; if ((lastIdx1==-1 && lastIdx2>-1)||(lastIdx1==1 && lstrcmpW(strDec1[0],twoPoint)==0)) - return MK_E_SYNTAX; - - if(lstrcmpW(strDec1[lastIdx1],bkSlash)==0) - lastIdx1--; - - /* for etch "..\" in the left of str2 remove the right element from str1 */ - for(i=0; ( (lastIdx1>=0) && (strDec2[i]!=NULL) && (lstrcmpW(strDec2[i],twoPoint)==0) ) ;i+=2){ - - lastIdx1-=2; - } - - /* the length of the composed path string is raised by the sum of the two paths lengths */ - newStr=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(lstrlenW(str1)+lstrlenW(str2)+1)); - - if (newStr) - { - /* new path is the concatenation of the rest of str1 and str2 */ - for(*newStr=0,j=0;j<=lastIdx1;j++) - strcatW(newStr,strDec1[j]); - - if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || lstrcmpW(strDec2[i],bkSlash)!=0) - strcatW(newStr,bkSlash); - - for(j=i;j<=lastIdx2;j++) - strcatW(newStr,strDec2[j]); - - /* create a new moniker with the new string */ - res=CreateFileMoniker(newStr,ppmkComposite); - - /* free all strings space memory used by this function */ - HeapFree(GetProcessHeap(),0,newStr); - } - else res = E_OUTOFMEMORY; + res = MK_E_SYNTAX; + else{ + if(lstrcmpW(strDec1[lastIdx1],bkSlash)==0) + lastIdx1--; + + /* for each "..\" in the left of str2 remove the right element from str1 */ + for(i=0; ( (lastIdx1>=0) && (strDec2[i]!=NULL) && (lstrcmpW(strDec2[i],twoPoint)==0) ); i+=2){ + + lastIdx1-=2; + } + + /* the length of the composed path string is increased by the sum of the two paths' lengths */ + newStr=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(lstrlenW(str1)+lstrlenW(str2)+1)); + + if (newStr){ + /* new path is the concatenation of the rest of str1 and str2 */ + for(*newStr=0,j=0;j<=lastIdx1;j++) + strcatW(newStr,strDec1[j]); + + if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || lstrcmpW(strDec2[i],bkSlash)!=0) + strcatW(newStr,bkSlash); + + for(j=i;j<=lastIdx2;j++) + strcatW(newStr,strDec2[j]); + + /* create a new moniker with the new string */ + res=CreateFileMoniker(newStr,ppmkComposite); + + /* free string memory used by this function */ + HeapFree(GetProcessHeap(),0,newStr); + } + else res = E_OUTOFMEMORY; + } free_stringtable(strDec1); free_stringtable(strDec2); Modified: trunk/reactos/dll/win32/ole32/ifs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -448,13 +448,15 @@ IMallocSpy* pSpy; HRESULT hres = E_INVALIDARG; - TRACE("\n"); - - if(Malloc32.pSpy) return CO_E_OBJISREG; + TRACE("%p\n", pMallocSpy); + + if(!pMallocSpy) return E_INVALIDARG; EnterCriticalSection(&IMalloc32_SpyCS); - if (SUCCEEDED(IMallocSpy_QueryInterface(pMallocSpy, &IID_IMallocSpy, (void**)&pSpy))) { + if (Malloc32.pSpy) + hres = CO_E_OBJISREG; + else if (SUCCEEDED(IMallocSpy_QueryInterface(pMallocSpy, &IID_IMallocSpy, (void**)&pSpy))) { Malloc32.pSpy = pSpy; hres = S_OK; } @@ -488,7 +490,9 @@ EnterCriticalSection(&IMalloc32_SpyCS); - if (Malloc32.SpyedAllocationsLeft) { + if (!Malloc32.pSpy) + hres = CO_E_OBJNOTREG; + else if (Malloc32.SpyedAllocationsLeft) { TRACE("SpyReleasePending with %u allocations left\n", Malloc32.SpyedAllocationsLeft); Malloc32.SpyReleasePending = TRUE; hres = E_ACCESSDENIED; Modified: trunk/reactos/dll/win32/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/marshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/marshal.c [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -750,7 +750,7 @@ EnterCriticalSection(&apt->cs); /* FIXME: we are dependent on the ordering in here to make sure a proxy's - * IRemUnknown proxy doesn't get destroyed before the regual proxy does + * IRemUnknown proxy doesn't get destroyed before the regular proxy does * because we need the IRemUnknown proxy during the destruction of the * regular proxy. Ideally, we should maintain a separate list for the * IRemUnknown proxies that need late destruction */ @@ -1760,7 +1760,7 @@ } } - TRACE("Calling IMarshal::MarshalInterace\n"); + TRACE("Calling IMarshal::MarshalInterface\n"); /* call helper object to do the actual marshaling */ hr = IMarshal_MarshalInterface(pMarshal, pStream, riid, pUnk, dwDestContext, pvDestContext, mshlFlags); Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole2.c [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -25,6 +25,8 @@ #include "precomp.h" +#include "olestd.h" + WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(accel); @@ -43,7 +45,6 @@ BOOL escPressed; HWND curTargetHWND; /* window the mouse is hovering over */ - HWND curDragTargetHWND; /* might be an ancestor of curTargetHWND */ IDropTarget* curDragTarget; POINTL curMousePos; /* current position of the mouse in screen coordinates */ DWORD dwKeyState; /* current state of the shift and ctrl keys and the mouse buttons */ @@ -745,7 +746,6 @@ trackerInfo.pdwEffect = pdwEffect; trackerInfo.trackingDone = FALSE; trackerInfo.escPressed = FALSE; - trackerInfo.curDragTargetHWND = 0; trackerInfo.curTargetHWND = 0; trackerInfo.curDragTarget = 0; @@ -2158,6 +2158,96 @@ return DefWindowProcW (hwnd, uMsg, wParam, lParam); } +static void drag_enter( TrackerWindowInfo *info, HWND new_target ) +{ + HRESULT hr; + + info->curTargetHWND = new_target; + + while (new_target && !is_droptarget( new_target )) + new_target = GetParent( new_target ); + + info->curDragTarget = get_droptarget_pointer( new_target ); + + if (info->curDragTarget) + { + *info->pdwEffect = info->dwOKEffect; + hr = IDropTarget_DragEnter( info->curDragTarget, info->dataObject, + info->dwKeyState, info->curMousePos, + info->pdwEffect ); + *info->pdwEffect &= info->dwOKEffect; + + /* failed DragEnter() means invalid target */ + if (hr != S_OK) + { + IDropTarget_Release( info->curDragTarget ); + info->curDragTarget = NULL; + info->curTargetHWND = NULL; + } + } +} + +static void drag_end( TrackerWindowInfo *info ) +{ + HRESULT hr; + + info->trackingDone = TRUE; + ReleaseCapture(); + + if (info->curDragTarget) + { + if (info->returnValue == DRAGDROP_S_DROP && + *info->pdwEffect != DROPEFFECT_NONE) + { + *info->pdwEffect = info->dwOKEffect; + hr = IDropTarget_Drop( info->curDragTarget, info->dataObject, info->dwKeyState, + info->curMousePos, info->pdwEffect ); + *info->pdwEffect &= info->dwOKEffect; + + if (FAILED( hr )) + info->returnValue = hr; + } + else + { + IDropTarget_DragLeave( info->curDragTarget ); + *info->pdwEffect = DROPEFFECT_NONE; + } + IDropTarget_Release( info->curDragTarget ); + info->curDragTarget = NULL; + } + else + *info->pdwEffect = DROPEFFECT_NONE; +} + +static HRESULT give_feedback( TrackerWindowInfo *info ) +{ + HRESULT hr; + int res; + HCURSOR cur; + + if (info->curDragTarget == NULL) + *info->pdwEffect = DROPEFFECT_NONE; + + hr = IDropSource_GiveFeedback( info->dropSource, *info->pdwEffect ); + + if (hr == DRAGDROP_S_USEDEFAULTCURSORS) + { + if (*info->pdwEffect & DROPEFFECT_MOVE) + res = CURSOR_MOVE; + else if (*info->pdwEffect & DROPEFFECT_COPY) + res = CURSOR_COPY; + else if (*info->pdwEffect & DROPEFFECT_LINK) + res = CURSOR_LINK; + else + res = CURSOR_NODROP; + + cur = LoadCursorW( hProxyDll, MAKEINTRESOURCEW( res ) ); + SetCursor( cur ); + } + + return hr; +} + /*** * OLEDD_TrackStateChange() * @@ -2171,7 +2261,6 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) { HWND hwndNewTarget = 0; - HRESULT hr = S_OK; POINT pt; /* @@ -2185,186 +2274,40 @@ trackerInfo->escPressed, trackerInfo->dwKeyState); - /* - * Every time, we re-initialize the effects passed to the - * IDropTarget to the effects allowed by the source. - */ - *trackerInfo->pdwEffect = trackerInfo->dwOKEffect; - - /* - * If we are hovering over the same target as before, send the - * DragOver notification - */ - if ( (trackerInfo->curDragTarget != 0) && - (trackerInfo->curTargetHWND == hwndNewTarget) ) - { - IDropTarget_DragOver(trackerInfo->curDragTarget, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); - *trackerInfo->pdwEffect &= trackerInfo->dwOKEffect; + if (trackerInfo->curTargetHWND != hwndNewTarget && + (trackerInfo->returnValue == S_OK || + trackerInfo->returnValue == DRAGDROP_S_DROP)) + { + if (trackerInfo->curDragTarget) + { + IDropTarget_DragLeave(trackerInfo->curDragTarget); + IDropTarget_Release(trackerInfo->curDragTarget); + trackerInfo->curDragTarget = NULL; + trackerInfo->curTargetHWND = NULL; + } + + if (hwndNewTarget) + drag_enter( trackerInfo, hwndNewTarget ); + + give_feedback( trackerInfo ); + + } + + if (trackerInfo->returnValue == S_OK) + { + if (trackerInfo->curDragTarget) + { + *trackerInfo->pdwEffect = trackerInfo->dwOKEffect; + IDropTarget_DragOver(trackerInfo->curDragTarget, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, + trackerInfo->pdwEffect); + *trackerInfo->pdwEffect &= trackerInfo->dwOKEffect; + } + give_feedback( trackerInfo ); } else - { - /* - * If we changed window, we have to notify our old target and check for - * the new one. - */ - if (trackerInfo->curDragTarget) - IDropTarget_DragLeave(trackerInfo->curDragTarget); - - /* - * Make sure we're hovering over a window. - */ - if (hwndNewTarget) - { - /* - * Find-out if there is a drag target under the mouse - */ - HWND next_target_wnd = hwndNewTarget; - - trackerInfo->curTargetHWND = hwndNewTarget; - - while (next_target_wnd && !is_droptarget(next_target_wnd)) - next_target_wnd = GetParent(next_target_wnd); - - if (next_target_wnd) hwndNewTarget = next_target_wnd; - - trackerInfo->curDragTargetHWND = hwndNewTarget; - if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); - trackerInfo->curDragTarget = get_droptarget_pointer(hwndNewTarget); - - /* - * If there is, notify it that we just dragged-in - */ - if (trackerInfo->curDragTarget) - { - hr = IDropTarget_DragEnter(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); - *trackerInfo->pdwEffect &= trackerInfo->dwOKEffect; - - /* failed DragEnter() means invalid target */ - if (hr != S_OK) - { - trackerInfo->curDragTargetHWND = 0; - trackerInfo->curTargetHWND = 0; - IDropTarget_Release(trackerInfo->curDragTarget); - trackerInfo->curDragTarget = 0; - } - } - } - else - { - /* - * The mouse is not over a window so we don't track anything. - */ - trackerInfo->curDragTargetHWND = 0; - trackerInfo->curTargetHWND = 0; - if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); - trackerInfo->curDragTarget = 0; - } - } - - /* - * Now that we have done that, we have to tell the source to give - * us feedback on the work being done by the target. If we don't - * have a target, simulate no effect. - */ - if (trackerInfo->curDragTarget==0) - { - *trackerInfo->pdwEffect = DROPEFFECT_NONE; - } - - hr = IDropSource_GiveFeedback(trackerInfo->dropSource, - *trackerInfo->pdwEffect); - - /* - * When we ask for feedback from the drop source, sometimes it will - * do all the necessary work and sometimes it will not handle it - * when that's the case, we must display the standard drag and drop - * cursors. - */ - if (hr == DRAGDROP_S_USEDEFAULTCURSORS) - { - HCURSOR hCur; - - if (*trackerInfo->pdwEffect & DROPEFFECT_MOVE) - { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(2)); - } - else if (*trackerInfo->pdwEffect & DROPEFFECT_COPY) - { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(3)); - } - else if (*trackerInfo->pdwEffect & DROPEFFECT_LINK) - { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(4)); - } - else - { - hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(1)); - } - - SetCursor(hCur); - } - - /* - * All the return valued will stop the operation except the S_OK - * return value. - */ - if (trackerInfo->returnValue!=S_OK) - { - /* - * Make sure the message loop in DoDragDrop stops - */ - trackerInfo->trackingDone = TRUE; - - /* - * Release the mouse in case the drop target decides to show a popup - * or a menu or something. - */ - ReleaseCapture(); - - /* - * If we end-up over a target, drop the object in the target or - * inform the target that the operation was cancelled. - */ - if (trackerInfo->curDragTarget) - { - switch (trackerInfo->returnValue) - { - /* - * If the source wants us to complete the operation, we tell - * the drop target that we just dropped the object in it. - */ - case DRAGDROP_S_DROP: - if (*trackerInfo->pdwEffect != DROPEFFECT_NONE) - { - hr = IDropTarget_Drop(trackerInfo->curDragTarget, trackerInfo->dataObject, - trackerInfo->dwKeyState, trackerInfo->curMousePos, trackerInfo->pdwEffect); - if (FAILED(hr)) - trackerInfo->returnValue = hr; - } - else - IDropTarget_DragLeave(trackerInfo->curDragTarget); - break; - - /* - * If the source told us that we should cancel, fool the drop - * target by telling it that the mouse left its window. - * Also set the drop effect to "NONE" in case the application - * ignores the result of DoDragDrop. - */ - case DRAGDROP_S_CANCEL: - IDropTarget_DragLeave(trackerInfo->curDragTarget); - *trackerInfo->pdwEffect = DROPEFFECT_NONE; - break; - } - } - } + drag_end( trackerInfo ); } /*** Modified: trunk/reactos/dll/win32/ole32/ole2stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2stubs.… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole2stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole2stubs.c [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -74,12 +74,3 @@ FIXME("stub!\n"); return E_NOTIMPL; } - -/*********************************************************************** - * CoGetCurrentLogicalThreadId [OLE32.@] - */ -HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *pguid) -{ - FIXME(": stub\n"); - return E_NOTIMPL; -} Modified: trunk/reactos/dll/win32/ole32/ole32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_ros.… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32_ros.diff [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -1,7 +1,30 @@ -diff -prudN e:\wine\dlls\ole32/compobj.c dll\win32\ole32/compobj.c ---- e:\wine\dlls\ole32/compobj.c 2015-02-21 17:13:09.561542200 +0100 -+++ dll\win32\ole32/compobj.c 2015-02-28 13:26:29.259662000 +0100 -@@ -331,8 +304,12 @@ static NTSTATUS create_key( HKEY *retkey +diff -pudN e:\wine\dlls\ole32/comcat.c e:\reactos\dll\win32\ole32/comcat.c +--- e:\wine\dlls\ole32/comcat.c 2016-05-31 18:02:11 +0100 ++++ e:\reactos\dll\win32\ole32/comcat.c 2016-03-04 10:20:45 +0100 +@@ -229,7 +229,11 @@ static HRESULT COMCAT_IsClassOfCategorie + if (res != ERROR_SUCCESS) return S_FALSE; + for (string = impl_strings; *string; string += CHARS_IN_GUID) { + HKEY catkey; ++#ifdef __REACTOS__ + res = open_classes_key(subkey, string, READ_CONTROL, &catkey); ++#else ++ res = open_classes_key(subkey, string, 0, &catkey); ++#endif + if (res != ERROR_SUCCESS) { + RegCloseKey(subkey); + return S_FALSE; +diff -pudN e:\wine\dlls\ole32/compobj.c e:\reactos\dll\win32\ole32/compobj.c +--- e:\wine\dlls\ole32/compobj.c 2016-05-31 18:02:11 +0100 ++++ e:\reactos\dll\win32\ole32/compobj.c 2016-06-07 11:34:16 +0100 +@@ -43,6 +43,7 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(ole); + ++#undef ARRAYSIZE + #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) + + /**************************************************************************** +@@ -303,9 +304,13 @@ static NTSTATUS create_key( HKEY *retkey return status; } @@ -9,52 +32,63 @@ +static const WCHAR classes_rootW[] = L"\\REGISTRY\\Machine\\Software\\Classes"; +#else static const WCHAR classes_rootW[] = - {'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s',0}; + {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e', + '\\','S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s',0}; +#endif static HKEY classes_root_hkey; -diff -prudN e:\wine\dlls\ole32/stg_prop.c dll\win32\ole32/stg_prop.c ---- e:\wine\dlls\ole32/stg_prop.c 2015-02-21 17:13:09.569542200 +0100 -+++ dll\win32\ole32/stg_prop.c 2014-04-08 19:21:32.097336500 +0100 -@@ -1035,12 +1018,12 @@ static HRESULT PropertyStorage_ReadDicti +diff -pudN e:\wine\dlls\ole32/stg_prop.c e:\reactos\dll\win32\ole32/stg_prop.c +--- e:\wine\dlls\ole32/stg_prop.c 2016-05-31 18:02:11 +0100 ++++ e:\reactos\dll\win32\ole32/stg_prop.c 2016-06-07 11:34:17 +0100 +@@ -41,6 +41,10 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(storage); + ++#ifdef _MSC_VER ++#define __ASM_STDCALL_FUNC(name,args,code) ++#endif ++ + static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *iface ) + { + return CONTAINING_RECORD(iface, StorageImpl, base.IPropertySetStorage_iface); +@@ -1013,7 +1017,13 @@ static HRESULT PropertyStorage_ReadDicti + return hr; } - #ifdef __i386__ --#define __thiscall __stdcall +-static void* WINAPI Allocate_CoTaskMemAlloc(void *this, ULONG size) ++#ifdef __i386__ +#define __thiscall_wrapper __stdcall - #else --#define __thiscall __cdecl ++#else +#define __thiscall_wrapper __cdecl - #endif - --static __thiscall void* Allocate_CoTaskMemAlloc(void *userdata, ULONG size) -+static void* __thiscall_wrapper Allocate_CoTaskMemAlloc(void *userdata, ULONG size) ++#endif ++ ++static void* __thiscall_wrapper Allocate_CoTaskMemAlloc(void *this, ULONG size) { return CoTaskMemAlloc(size); } -@@ -1049,7 +1032,7 @@ static __thiscall void* Allocate_CoTaskM +@@ -1022,7 +1032,7 @@ static void* WINAPI Allocate_CoTaskMemAl * end of the buffer. */ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, -- UINT codepage, void* (__thiscall *allocate)(void *userdata, ULONG size), void *allocate_data) -+ UINT codepage, void* (__thiscall_wrapper *allocate)(void *userdata, ULONG size), void *allocate_data) +- UINT codepage, void* (WINAPI *allocate)(void *this, ULONG size), void *allocate_data) ++ UINT codepage, void* (__thiscall_wrapper *allocate)(void *this, ULONG size), void *allocate_data) { HRESULT hr = S_OK; -@@ -2738,13 +2721,13 @@ end: +@@ -2711,13 +2721,13 @@ end: "jmp *(4*(" #num "))(%eax)" ) DEFINE_STDCALL_WRAPPER(0,Allocate_PMemoryAllocator,8) --extern void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize); +-extern void* WINAPI Allocate_PMemoryAllocator(void *this, ULONG cbSize); +extern void* __stdcall Allocate_PMemoryAllocator(void *this, ULONG cbSize); #else --static void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize) +-static void* WINAPI Allocate_PMemoryAllocator(void *this, ULONG cbSize) +static void* __cdecl Allocate_PMemoryAllocator(void *this, ULONG cbSize) { -- void* (__thiscall *fn)(void*,ULONG) = **(void***)this; +- void* (WINAPI *fn)(void*,ULONG) = **(void***)this; + void* (__cdecl *fn)(void*,ULONG) = **(void***)this; return fn(this, cbSize); } Modified: trunk/reactos/dll/win32/ole32/ole32res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32res.r… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32res.rc [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -23,6 +23,8 @@ //#include "winuser.h" //#include "winnls.h" +#include "olestd.h" + #define WINE_FILENAME_STR "ole32.dll" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" @@ -37,15 +39,15 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: nodrop.cur */ -1 CURSOR nodrop.cur +CURSOR_NODROP CURSOR nodrop.cur /* @makedep: drag_move.cur */ -2 CURSOR drag_move.cur +CURSOR_MOVE CURSOR drag_move.cur /* @makedep: drag_copy.cur */ -3 CURSOR drag_copy.cur +CURSOR_COPY CURSOR drag_copy.cur /* @makedep: drag_link.cur */ -4 CURSOR drag_link.cur +CURSOR_LINK CURSOR drag_link.cur 1 WINE_REGISTRY "ole32.rgs" Modified: trunk/reactos/dll/win32/ole32/olestd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/olestd.h?r… ============================================================================== --- trunk/reactos/dll/win32/ole32/olestd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/olestd.h [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -49,4 +49,9 @@ #define OleStdCopyMetafilePict(hpictin, phpictout) \ (*(phpictout) = OleDuplicateData(hpictin,CF_METAFILEPICT,GHND|GMEM_SHARE)) +#define CURSOR_NODROP 1 +#define CURSOR_MOVE 2 +#define CURSOR_COPY 3 +#define CURSOR_LINK 4 + #endif /* __WINE_OLESTD_H_ */ Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… ============================================================================== --- trunk/reactos/dll/win32/ole32/stg_prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/stg_prop.c [iso-8859-1] Tue Jun 7 10:47:21 2016 @@ -2053,12 +2053,12 @@ hr = PropertyStorage_CreateDictionaries(*pps); if (FAILED(hr)) { - IStream_Release(stm); (*pps)->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&(*pps)->cs); HeapFree(GetProcessHeap(), 0, *pps); *pps = NULL; } + else IStream_AddRef( stm ); return hr; } @@ -2080,11 +2080,7 @@ TRACE("PropertyStorage %p constructed\n", ps); hr = S_OK; } - else - { - PropertyStorage_DestroyDictionaries(ps); - HeapFree(GetProcessHeap(), 0, ps); - } + else IPropertyStorage_Release( &ps->IPropertyStorage_iface ); } return hr; } @@ -2212,6 +2208,8 @@ r = PropertyStorage_ConstructEmpty(stm, rfmtid, grfFlags, grfMode, ppprstg); + IStream_Release( stm ); + end: TRACE("returning 0x%08x\n", r); return r; @@ -2256,6 +2254,8 @@ goto end; r = PropertyStorage_ConstructFromStream(stm, rfmtid, grfMode, ppprstg); + + IStream_Release( stm ); end: TRACE("returning 0x%08x\n", r); @@ -2757,3 +2757,93 @@ return NULL; } + +HRESULT WINAPI StgCreatePropStg(IUnknown *unk, REFFMTID fmt, const CLSID *clsid, + DWORD flags, DWORD reserved, IPropertyStorage **prop_stg) +{ + IStorage *stg; + IStream *stm; + HRESULT r; + + TRACE("%p %s %s %08x %d %p\n", unk, debugstr_guid(fmt), debugstr_guid(clsid), flags, reserved, prop_stg); + + if (!fmt || reserved) + { + r = E_INVALIDARG; + goto end; + } + + if (flags & PROPSETFLAG_NONSIMPLE) + { + r = IUnknown_QueryInterface(unk, &IID_IStorage, (void **)&stg); + if (FAILED(r)) + goto end; + + /* FIXME: if (flags & PROPSETFLAG_NONSIMPLE), we need to create a + * storage, not a stream. For now, disallow it. + */ + FIXME("PROPSETFLAG_NONSIMPLE not supported\n"); + IStorage_Release(stg); + r = STG_E_INVALIDFLAG; + } + else + { + r = IUnknown_QueryInterface(unk, &IID_IStream, (void **)&stm); + if (FAILED(r)) + goto end; + + r = PropertyStorage_ConstructEmpty(stm, fmt, flags, + STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + + IStream_Release( stm ); + } + +end: + TRACE("returning 0x%08x\n", r); + return r; +} + +HRESULT WINAPI StgOpenPropStg(IUnknown *unk, REFFMTID fmt, DWORD flags, + DWORD reserved, IPropertyStorage **prop_stg) +{ + IStorage *stg; + IStream *stm; + HRESULT r; + + TRACE("%p %s %08x %d %p\n", unk, debugstr_guid(fmt), flags, reserved, prop_stg); + + if (!fmt || reserved) + { + r = E_INVALIDARG; + goto end; + } + + if (flags & PROPSETFLAG_NONSIMPLE) + { + r = IUnknown_QueryInterface(unk, &IID_IStorage, (void **)&stg); + if (FAILED(r)) + goto end; + + /* FIXME: if (flags & PROPSETFLAG_NONSIMPLE), we need to open a + * storage, not a stream. For now, disallow it. + */ + FIXME("PROPSETFLAG_NONSIMPLE not supported\n"); + IStorage_Release(stg); + r = STG_E_INVALIDFLAG; + } + else + { + r = IUnknown_QueryInterface(unk, &IID_IStream, (void **)&stm); + if (FAILED(r)) + goto end; + + r = PropertyStorage_ConstructFromStream(stm, fmt, + STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + + IStream_Release( stm ); + } + +end: + TRACE("returning 0x%08x\n", r); + return r; +} 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] Tue Jun 7 10:47:21 2016 @@ -142,7 +142,7 @@ reactos/dll/win32/objsel # Synced to WineStaging-1.9.4 reactos/dll/win32/odbc32 # Synced to WineStaging-1.9.4. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/ole32 # Synced to WineStaging-1.9.4 +reactos/dll/win32/ole32 # Synced to WineStaging-1.9.11 reactos/dll/win32/oleacc # Synced to WineStaging-1.9.4 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.9.4 reactos/dll/win32/olecli32 # Synced to WineStaging-1.9.4

8 years, 3 months

[akhaldi] 71578: [PSDK] Update objbase.h. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 7 10:43:40 2016 New Revision: 71578 URL: http://svn.reactos.org/svn/reactos?rev=71578&view=rev Log: [PSDK] Update objbase.h. CORE-11368 Modified: trunk/reactos/sdk/include/psdk/objbase.h Modified: trunk/reactos/sdk/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/objbase.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/objbase.h [iso-8859-1] Tue Jun 7 10:43:40 2016 @@ -292,6 +292,8 @@ void WINAPI CoUninitialize(void); DWORD WINAPI CoGetCurrentProcess(void); +HRESULT WINAPI CoGetCurrentLogicalThreadId(_Out_ GUID *id); +HRESULT WINAPI CoGetApartmentType(_Out_ APTTYPE *type, _Out_ APTTYPEQUALIFIER *qualifier); HINSTANCE WINAPI CoLoadLibrary(_In_ LPOLESTR lpszLibName, _In_ BOOL bAutoFree); void WINAPI CoFreeAllLibraries(void); @@ -642,6 +644,19 @@ CoGetObjectContext( _In_ REFIID riid, _Outptr_ LPVOID *ppv); + +_Check_return_ +HRESULT +WINAPI +CoRegisterInitializeSpy( + _In_ IInitializeSpy *spy, + _Out_ ULARGE_INTEGER *cookie); + +_Check_return_ +HRESULT +WINAPI +CoRevokeInitializeSpy( + _In_ ULARGE_INTEGER cookie); _Check_return_ HRESULT WINAPI CoCreateGuid(_Out_ GUID *pguid); BOOL WINAPI CoIsOle1Class(_In_ REFCLSID rclsid);

8 years, 3 months

← Newer
1
...
10
11
12
13
14
15
16
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2016