March 2006 - Wine-commits - list.winehq.org

Jacek Caban : shdocvw: Don' t call hlink_navigate if HLNF_OPENINNEWWINDOW is set.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: d3a5921e8eeaab5f33bb074c77bb04d8ccd0fa0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d3a5921e8eeaab5f33bb074… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 1 22:06:11 2006 +0100 shdocvw: Don't call hlink_navigate if HLNF_OPENINNEWWINDOW is set. - Don't call hlink_navigate if HLNF_OPENINNEWWINDOW is set. - Remove unneeded call to GetBindInfo. --- dlls/shdocvw/navigate.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index f821558..5a6b45a 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -497,6 +497,7 @@ HRESULT navigate_hlink(WebBrowser *This, bindinfo.cbSize = sizeof(bindinfo); hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo); + dump_BINDINFO(&bindinfo); if(bindinfo.dwBindVerb == BINDVERB_POST) { post_data_len = bindinfo.cbStgmedData; if(post_data_len) @@ -558,8 +559,6 @@ static HRESULT WINAPI HlinkFrame_Navigat WebBrowser *This = HLINKFRAME_THIS(iface); IMoniker *mon; LPWSTR location = NULL; - BINDINFO bi = {0}; - DWORD bindf = 0; TRACE("(%p)->(%08lx %p %p %p)\n", This, grfHLNF, pbc, pibsc, pihlNavigate); @@ -568,12 +567,6 @@ static HRESULT WINAPI HlinkFrame_Navigat /* Windows calls GetTargetFrameName here. */ - memset(&bi, 0, sizeof(bi)); - bi.cbSize = sizeof(bi); - - IBindStatusCallback_GetBindInfo(pibsc, &bindf, &bi); - dump_BINDINFO(&bi); - IHlink_GetMonikerReference(pihlNavigate, 1, &mon, &location); if(location) { @@ -583,6 +576,11 @@ static HRESULT WINAPI HlinkFrame_Navigat /* Windows calls GetHlinkSite here */ + if(grfHLNF & HLNF_OPENINNEWWINDOW) { + FIXME("Not supported HLNF_OPENINNEWWINDOW\n"); + return E_NOTIMPL; + } + return navigate_hlink(This, mon, pbc, pibsc); }

1 0

Jacek Caban : mshtml: Beginning support for links opened in a new frame.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: d656f996f118667a9a455c08a950d4f4ab647a0b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d656f996f118667a9a455c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 1 22:04:51 2006 +0100 mshtml: Beginning support for links opened in a new frame. --- dlls/mshtml/htmldoc.c | 2 - dlls/mshtml/mshtml_private.h | 7 ++- dlls/mshtml/navigate.c | 13 ++++-- dlls/mshtml/nsembed.c | 22 +++++++---- dlls/mshtml/nsiface.idl | 44 +++++++++++++++++++++ dlls/mshtml/nsio.c | 21 ++++++++-- dlls/mshtml/nsservice.c | 87 +++++++++++++++++++++++++++++++++++++++++- 7 files changed, 173 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d656f996f118667a9a4…

1 0

Jacek Caban : mshtml: Use NSContainer as 'This' of its window.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 2be7ffdf594594f74a702ebc67a8bf4746bf6bd3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2be7ffdf594594f74a702eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 1 22:03:00 2006 +0100 mshtml: Use NSContainer as 'This' of its window. --- dlls/mshtml/nsembed.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 25b44ad..3747ba6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -81,23 +81,23 @@ static ATOM nscontainer_class; static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - HTMLDocument *This; + NSContainer *This; nsresult nsres; static const WCHAR wszTHIS[] = {'T','H','I','S',0}; if(msg == WM_CREATE) { - This = *(HTMLDocument**)lParam; + This = *(NSContainer**)lParam; SetPropW(hwnd, wszTHIS, This); }else { - This = (HTMLDocument*)GetPropW(hwnd, wszTHIS); + This = (NSContainer*)GetPropW(hwnd, wszTHIS); } switch(msg) { case WM_SIZE: TRACE("(%p)->(WM_SIZE)\n", This); - nsres = nsIBaseWindow_SetSize(This->nscontainer->window, + nsres = nsIBaseWindow_SetSize(This->window, LOWORD(lParam), HIWORD(lParam), TRUE); if(NS_FAILED(nsres)) WARN("SetSize failed: %08lx\n", nsres); @@ -106,7 +106,6 @@ static LRESULT WINAPI nsembed_proc(HWND return DefWindowProcW(hwnd, msg, wParam, lParam); } - static void register_nscontainer_class(void) { static WNDCLASSEXW wndclass = { @@ -1034,7 +1033,7 @@ void NSContainer_Create(HTMLDocument *do ret->hwnd = CreateWindowExW(0, wszNsContainer, NULL, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, - GetDesktopWindow(), NULL, hInst, doc); + GetDesktopWindow(), NULL, hInst, ret); nsres = nsIBaseWindow_InitWindow(ret->window, ret->hwnd, NULL, 0, 0, 100, 100); if(NS_SUCCEEDED(nsres)) {

1 0

Gerold J. Wucherpfennig : cabinet: Set proper error information on failures .
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 4f75f8469b5c495ce2e1ba266a6e978289f4886d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f75f8469b5c495ce2e1ba2… Author: Gerold J. Wucherpfennig <gjwucherpfennig(a)gmx.net> Date: Fri Feb 24 14:28:20 2006 +0100 cabinet: Set proper error information on failures. --- dlls/cabinet/cabinet.h | 1 dlls/cabinet/fci.c | 567 +++++++++++++++++++++++++++++------------------- 2 files changed, 341 insertions(+), 227 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4f75f8469b5c495ce2e…

1 0

Rein Klazes : user32: Fix handling of '\b' right flush character in menus.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: cc5b5cea967d466ef4c87d039f63d90a99980b76 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc5b5cea967d466ef4c87d0… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Wed Mar 1 16:39:37 2006 +0100 user32: Fix handling of '\b' right flush character in menus. - do not add extra space; modify the tests to confirm this; - right flush to the menu tab stop, not to the menu border; - small fixes to the menu tab stop calculation. --- dlls/user/menu.c | 17 +++++++---------- dlls/user/tests/menu.c | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index e2c6318..673fcc4 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -997,6 +997,7 @@ static void MENU_CalcItemSize( HDC hdc, } itemheight = 0; + lpitem->xTab = 0; if (!menuBar) { if (lpitem->hbmpItem) { @@ -1011,9 +1012,11 @@ static void MENU_CalcItemSize( HDC hdc, lpitem->rect.right += size.cx + 2; itemheight = size.cy + 2; } - lpitem->rect.right += 4 + arrow_bitmap_width + menucharsize.cx; if( !(lppop->dwStyle & MNS_NOCHECK)) lpitem->rect.right += check_bitmap_width; + lpitem->rect.right += 4 + menucharsize.cx; + lpitem->xTab = lpitem->rect.right; + lpitem->rect.right += arrow_bitmap_width; } else if (lpitem->hbmpItem) { /* menuBar */ SIZE size; @@ -1030,7 +1033,6 @@ static void MENU_CalcItemSize( HDC hdc, RECT rc = lpitem->rect; LONG txtheight, txtwidth; - lpitem->xTab = 0; if ( lpitem->fState & MFS_DEFAULT ) { hfontOld = SelectObject( hdc, get_menu_font(TRUE) ); } @@ -1055,8 +1057,7 @@ static void MENU_CalcItemSize( HDC hdc, /* get text size after the tab */ tmpheight = DrawTextW( hdc, p, -1, &tmprc, DT_SINGLELINE|DT_CALCRECT); - lpitem->xTab = menucharsize.cx + - 4 + check_bitmap_width + lpitem->bmpsize.cx + txtwidth; + lpitem->xTab += txtwidth; txtheight = max( txtheight, tmpheight); txtwidth += menucharsize.cx + /* space for the tab */ tmprc.right - tmprc.left; /* space for the short cut */ @@ -1064,13 +1065,8 @@ static void MENU_CalcItemSize( HDC hdc, txtheight = DrawTextW( hdc, lpitem->text, -1, &rc, DT_SINGLELINE|DT_CALCRECT); txtwidth = rc.right - rc.left; - if (strchrW( lpitem->text, '\b' )) - lpitem->rect.right += menucharsize.cx; - lpitem->xTab = 4 + check_bitmap_width + lpitem->bmpsize.cx + - txtwidth; + lpitem->xTab += txtwidth; } - if( (lppop->dwStyle & MNS_NOCHECK)) - lpitem->xTab -= check_bitmap_width; lpitem->rect.right += 2 + txtwidth; itemheight = max( itemheight, max( txtheight + 2, menucharsize.cy + 4)); @@ -1642,6 +1638,7 @@ static void MENU_DrawMenuItem( HWND hwnd } else { + rect.right = lpitem->xTab; uFormat = DT_RIGHT | DT_VCENTER | DT_SINGLELINE; } diff --git a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c index 7de5d6d..7bb0f94 100644 --- a/dlls/user/tests/menu.c +++ b/dlls/user/tests/menu.c @@ -64,7 +64,7 @@ static struct { SIZE sc_size; /* size of the short-cut */ } MOD_txtsizes[] = { { "Pinot &Noir" }, - { "&Merlot\t" }, + { "&Merlot\bF4" }, { "Shira&z\tAlt+S" }, { "" }, { NULL }

1 0

Brandon Woodmansee : riched20: Implement EM_AUTOURLDETECT & EM_GETAUTOURLDETECT.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: dee813b5ff599e3325ef8d9eb774a554d7e08ae2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dee813b5ff599e3325ef8d9… Author: Brandon Woodmansee <wood(a)socal.rr.com> Date: Wed Mar 1 10:49:42 2006 +0000 riched20: Implement EM_AUTOURLDETECT & EM_GETAUTOURLDETECT. --- dlls/riched20/editor.c | 115 ++++++++++++++++++++++++++++++++++++++++-- dlls/riched20/editor.h | 2 - dlls/riched20/editstr.h | 1 dlls/riched20/tests/editor.c | 75 +++++++++++++++++++++++++++ 4 files changed, 186 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index feb99c3..a07f086 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -24,7 +24,7 @@ API implementation status: Messages (ANSI versions not done yet) - - EM_AUTOURLDETECT 2.0 + + EM_AUTOURLDETECT 2.0 + EM_CANPASTE + EM_CANREDO 2.0 + EM_CANUNDO @@ -40,7 +40,7 @@ - EM_FINDWORDBREAK - EM_FMTLINES - EM_FORMATRANGE - - EM_GETAUTOURLDETECT 2.0 + + EM_GETAUTOURLDETECT 2.0 - EM_GETBIDIOPTIONS 3.0 - EM_GETCHARFORMAT (partly done) - EM_GETEDITSTYLE @@ -1290,13 +1290,11 @@ LRESULT WINAPI RichEditANSIWndProc(HWND switch(msg) { - UNSUPPORTED_MSG(EM_AUTOURLDETECT) UNSUPPORTED_MSG(EM_DISPLAYBAND) UNSUPPORTED_MSG(EM_EXLIMITTEXT) UNSUPPORTED_MSG(EM_FINDWORDBREAK) UNSUPPORTED_MSG(EM_FMTLINES) UNSUPPORTED_MSG(EM_FORMATRANGE) - UNSUPPORTED_MSG(EM_GETAUTOURLDETECT) UNSUPPORTED_MSG(EM_GETBIDIOPTIONS) UNSUPPORTED_MSG(EM_GETEDITSTYLE) UNSUPPORTED_MSG(EM_GETIMECOMPMODE) @@ -1447,6 +1445,19 @@ LRESULT WINAPI RichEditANSIWndProc(HWND ME_SendSelChange(editor); return 0; } + case EM_AUTOURLDETECT: + { + if (wParam==1 || wParam ==0) + { + editor->AutoURLDetect_bEnable = (BOOL)wParam; + return 0; + } + return E_INVALIDARG; + } + case EM_GETAUTOURLDETECT: + { + return editor->AutoURLDetect_bEnable; + } case EM_EXSETSEL: { CHARRANGE *pRange = (CHARRANGE *)lParam; @@ -2089,7 +2100,9 @@ LRESULT WINAPI RichEditANSIWndProc(HWND case WM_CHAR: { WCHAR wstr = LOWORD(wParam); - + if (editor->AutoURLDetect_bEnable) + ME_AutoURLDetect(editor, wstr); + switch (wstr) { case 3: /* Ctrl-C */ @@ -2513,3 +2526,95 @@ LRESULT WINAPI REExtendedRegisterClass(v return result; } + +int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar) +{ + struct prefix_s { + char *text; + int length; + } prefixes[12] = { + {"http:", 5}, + {"file:", 6}, + {"mailto:", 8}, + {"ftp:", 5}, + {"https:", 7}, + {"gopher:", 8}, + {"nntp:", 6}, + {"prospero:", 10}, + {"telnet:", 8}, + {"news:", 6}, + {"wais:", 6}, + {"www.", 5} + }; + CHARRANGE ins_pt; + int curf_ef, link_ef, def_ef; + int cur_prefx, prefx_cnt; + int sel_min, sel_max; + int car_pos = 0; + int text_pos=-1; + int URLmin, URLmax; + CHARRANGE url; + FINDTEXTA ft; + CHARFORMAT2W cur_format; + CHARFORMAT2W default_format; + CHARFORMAT2W link; + RichEditANSIWndProc(editor->hWnd, EM_EXGETSEL, (WPARAM) 0, (LPARAM) &ins_pt); + sel_min = ins_pt.cpMin; + sel_max = ins_pt.cpMax; + if (sel_min==sel_max) + car_pos = sel_min; + if (sel_min!=sel_max) + car_pos = ME_GetTextLength(editor)+1; + cur_format.cbSize = sizeof(cur_format); + default_format.cbSize = sizeof(default_format); + RichEditANSIWndProc(editor->hWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cur_format); + RichEditANSIWndProc(editor->hWnd, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &default_format); + link.cbSize = sizeof(link); + link.dwMask = CFM_LINK | CFM_COLOR | CFM_UNDERLINE; + link.dwEffects = CFE_LINK | CFE_UNDERLINE; + link.crTextColor = RGB(0,0,255); + curf_ef = cur_format.dwEffects & link.dwEffects; + def_ef = default_format.dwEffects & link.dwEffects; + link_ef = link.dwEffects & link.dwEffects; + if (curf_ef == link_ef) + { + if( curChar == '\n' || curChar=='\r' || curChar==' ') + { + ME_SetSelection(editor, car_pos, car_pos); + RichEditANSIWndProc(editor->hWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &default_format); + text_pos=-1; + return 0; + } + } + if (curf_ef == def_ef) + { + cur_prefx = 0; + prefx_cnt = (sizeof(prefixes)/sizeof(struct prefix_s))-1; + while (cur_prefx<=prefx_cnt) + { + if (text_pos == -1) + { + ft.lpstrText = prefixes[cur_prefx].text; + URLmin=max(0,(car_pos-prefixes[cur_prefx].length)); + URLmax=max(0, car_pos); + if ((car_pos == 0) && (ME_GetTextLength(editor) != 0)) + { + URLmax = ME_GetTextLength(editor)+1; + } + ft.chrg.cpMin = URLmin; + ft.chrg.cpMax = URLmax; + text_pos=RichEditANSIWndProc(editor->hWnd, EM_FINDTEXT, FR_DOWN, (LPARAM)&ft); + cur_prefx++; + } + if (text_pos != -1) + { + url.cpMin=text_pos; + url.cpMax=car_pos-1; + ME_SetCharFormat(editor, text_pos, (URLmax-text_pos), &link); + ME_Repaint(editor); + break; + } + } + } + return 0; +} diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7376e28..5cafda1 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -250,7 +250,7 @@ void ME_EmptyUndoStack(ME_TextEditor *ed int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, BOOL bCRLF); ME_DisplayItem *ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int *nItemOffset); void ME_StreamInFill(ME_InStream *stream); - +int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar); extern int me_debug; extern HANDLE me_heap; extern void DoWrap(ME_TextEditor *editor); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 17cf2d8..0911e90 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -317,6 +317,7 @@ typedef struct tagME_TextEditor *TM_SINGLECODEPAGE or TM_MULTICODEPAGE*/ int mode; BOOL bHideSelection; + BOOL AutoURLDetect_bEnable; } ME_TextEditor; typedef struct tagME_Context diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4f34a66..8835f08 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -536,6 +536,79 @@ static void test_EM_SETOPTIONS() DestroyWindow(hwndRichEdit); } +static void check_CFE_LINK_rcvd(HWND hwnd, int is_url) +{ + CHARFORMAT2W text_format; + int link_present = 0; + text_format.cbSize = sizeof(text_format); + SendMessage(hwnd, EM_SETSEL, 0, 0); + SendMessage(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &text_format); + link_present = text_format.dwEffects & CFE_LINK; + if (is_url) + { /* control text is url; should get CFE_LINK */ + ok(0 != link_present, "URL Case: CFE_LINK not set.\n"); + } + else + { + ok(0 == link_present, "Non-URL Case: CFE_LINK set.\n"); + } +} + +static HWND new_static_wnd(HWND parent) { + return new_window("Static", 0, parent); +} + +static void test_EM_AUTOURLDETECT(void) +{ + struct urls_s { + char *text; + int is_url; + } urls[12] = { + {"winehq.org", 0}, + {"http://www.winehq.org", 1}, + {"http//winehq.org", 0}, + {"ww.winehq.org", 0}, + {"www.winehq.org", 1}, + {"ftp://192.168.1.1", 1}, + {"ftp//192.168.1.1", 0}, + {"mailto:your(a)email.com", 1}, + {"prospero:prosperoserver", 1}, + {"telnet:test", 1}, + {"news:newserver", 1}, + {"wais:waisserver", 1} + }; + + int i; + int urlRet=-1; + HWND hwndRichEdit, parent; + + parent = new_static_wnd(NULL); + hwndRichEdit = new_richedit(parent); + /* Try and pass EM_AUTOURLDETECT some test wParam values */ + urlRet=SendMessage(hwndRichEdit, EM_AUTOURLDETECT, FALSE, 0); + ok(urlRet==0, "Good wParam: urlRet is: %d\n", urlRet); + urlRet=SendMessage(hwndRichEdit, EM_AUTOURLDETECT, 1, 0); + ok(urlRet==0, "Good wParam2: urlRet is: %d\n", urlRet); + /* Windows returns -2147024809 (0x80070057) on bad wParam values */ + urlRet=SendMessage(hwndRichEdit, EM_AUTOURLDETECT, 8, 0); + ok(urlRet==E_INVALIDARG, "Bad wParam: urlRet is: %d\n", urlRet); + urlRet=SendMessage(hwndRichEdit, EM_AUTOURLDETECT, (WPARAM)"h", (LPARAM)"h"); + ok(urlRet==E_INVALIDARG, "Bad wParam2: urlRet is: %d\n", urlRet); + /* for each url, check the text to see if CFE_LINK effect is present */ + for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, FALSE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) urls[i].text); + SendMessage(hwndRichEdit, WM_CHAR, 0, 0); + check_CFE_LINK_rcvd(hwndRichEdit, 0); + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) urls[i].text); + SendMessage(hwndRichEdit, WM_CHAR, 0, 0); + check_CFE_LINK_rcvd(hwndRichEdit, urls[i].is_url); + } + DestroyWindow(hwndRichEdit); + DestroyWindow(parent); +} + static void test_EM_SCROLL() { int i, j; @@ -686,7 +759,6 @@ START_TEST( editor ) * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); - test_EM_FINDTEXT(); test_EM_SCROLLCARET(); test_EM_SCROLL(); @@ -694,6 +766,7 @@ START_TEST( editor ) test_TM_PLAINTEXT(); test_EM_SETOPTIONS(); test_WM_GETTEXT(); + test_EM_AUTOURLDETECT(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Jeremy White : crypt32: More gcc 2.95 adjustments.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: efccbbfbea3a6d4ae9ea8617a7f23fb0a8f127c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efccbbfbea3a6d4ae9ea861… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Mar 1 09:52:22 2006 -0600 crypt32: More gcc 2.95 adjustments. --- dlls/crypt32/tests/oid.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index cfda412..fc1fdfc 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -356,8 +356,8 @@ static void test_findOIDInfo(void) { ok(!strcmp(info->pszOID, szOID_RSA_MD5), "Expected %s, got %s\n", szOID_RSA_MD5, info->pszOID); - ok(info->Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", - info->Algid); + ok(U(*info).Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", + U(*info).Algid); } info = CryptFindOIDInfo(CRYPT_OID_INFO_NAME_KEY, (void *)sha1, 0); ok(info != NULL, "Expected to find sha1\n"); @@ -365,8 +365,8 @@ static void test_findOIDInfo(void) { ok(!strcmp(info->pszOID, szOID_OIWSEC_sha1), "Expected %s, got %s\n", szOID_OIWSEC_sha1, info->pszOID); - ok(info->Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n", - info->Algid); + ok(U(*info).Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n", + U(*info).Algid); } info = CryptFindOIDInfo(CRYPT_OID_INFO_ALGID_KEY, &alg, 0); ok(info != NULL, "Expected to find sha1\n"); @@ -374,8 +374,8 @@ static void test_findOIDInfo(void) { ok(!strcmp(info->pszOID, szOID_OIWSEC_sha1), "Expected %s, got %s\n", szOID_OIWSEC_sha1, info->pszOID); - ok(info->Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n", - info->Algid); + ok(U(*info).Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n", + U(*info).Algid); } info = CryptFindOIDInfo(CRYPT_OID_INFO_SIGN_KEY, algs, 0); ok(info != NULL, "Expected to find md5RSA\n"); @@ -383,8 +383,8 @@ static void test_findOIDInfo(void) { ok(!strcmp(info->pszOID, szOID_RSA_MD5RSA), "Expected %s, got %s\n", szOID_RSA_MD5RSA, info->pszOID); - ok(info->Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", - info->Algid); + ok(U(*info).Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", + U(*info).Algid); } }

1 0

Robert Shearman : oleaut: Use IsEqualIID in connpt. c instead of memcmp for comparing IIDs.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 269909f53e902014a6c1a5b92689269ec684d424 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=269909f53e902014a6c1a5b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 1 12:17:00 2006 +0000 oleaut: Use IsEqualIID in connpt.c instead of memcmp for comparing IIDs. --- dlls/oleaut32/connpt.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index da0ffcc..78f4117 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -160,14 +160,10 @@ static HRESULT WINAPI ConnectionPointImp /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) - { + if (IsEqualIID(&IID_IUnknown, riid)) *ppvObject = (IConnectionPoint*)This; - } - else if (memcmp(&IID_IConnectionPoint, riid, sizeof(IID_IConnectionPoint)) == 0) - { + else if (IsEqualIID(&IID_IConnectionPoint, riid)) *ppvObject = (IConnectionPoint*)This; - } /* * Check that we obtained an interface. @@ -433,14 +429,10 @@ static HRESULT WINAPI EnumConnectionsImp /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) - { + if (IsEqualIID(&IID_IUnknown, riid)) *ppvObject = (IEnumConnections*)This; - } - else if (memcmp(&IID_IEnumConnections, riid, sizeof(IID_IEnumConnections)) == 0) - { + else if (IsEqualIID(&IID_IEnumConnections, riid)) *ppvObject = (IEnumConnections*)This; - } /* * Check that we obtained an interface.

1 0

Robert Shearman : ole: Fix marshaling of proxies for interfaces that haven' t already been unmarshaled.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 857a6d1f63001794ad6370abeab6f610b37f6a90 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=857a6d1f63001794ad6370a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 1 12:18:14 2006 +0000 ole: Fix marshaling of proxies for interfaces that haven't already been unmarshaled. --- dlls/ole32/marshal.c | 54 ++++++++++++++++++++++++++++++++------- dlls/ole32/tests/marshal.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index ef3df6e..aebdba1 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -366,25 +366,59 @@ static HRESULT WINAPI Proxy_MarshalInter void* pvDestContext, DWORD mshlflags) { ICOM_THIS_MULTI(struct proxy_manager, lpVtblMarshal, iface); - ULONG res; HRESULT hr; - STDOBJREF stdobjref; struct ifproxy *ifproxy; TRACE("(...,%s,...)\n", debugstr_guid(riid)); hr = proxy_manager_find_ifproxy(This, riid, &ifproxy); - if (FAILED(hr)) + if (SUCCEEDED(hr)) { - ERR("couldn't find proxy for interface %s, error 0x%08lx\n", debugstr_guid(riid), hr); - return hr; + STDOBJREF stdobjref = ifproxy->stdobjref; + /* FIXME: optimization - share out proxy's public references if possible + * instead of making new proxy do a roundtrip through the server */ + stdobjref.cPublicRefs = 0; /* InterlockedDecrement(&This->stdobjref.cPublicRefs) >= 0 ? 1 : 0 */ + + hr = IStream_Write(pStm, &stdobjref, sizeof(stdobjref), NULL); } + else + { + /* we don't have the interface already unmarshaled so we have to + * request the object from the server */ + IRemUnknown *remunk; + IPID *ipid; + REMQIRESULT *qiresults = NULL; + IID iid = *riid; + + /* get the ipid of the first entry */ + /* FIXME: should we implement ClientIdentity on the ifproxies instead + * of the proxy_manager so we use the correct ipid here? */ + ipid = &LIST_ENTRY(list_head(&This->interfaces), struct ifproxy, entry)->stdobjref.ipid; + + /* get IRemUnknown proxy so we can communicate with the remote object */ + hr = proxy_manager_get_remunknown(This, &remunk); - stdobjref = ifproxy->stdobjref; - /* FIXME: optimization - share out proxy's public references if possible - * instead of making new proxy do a roundtrip through the server */ - stdobjref.cPublicRefs = 0; /* InterlockedDecrement(&This->stdobjref.cPublicRefs) >= 0 ? 1 : 0 */ - hr = IStream_Write(pStm, &stdobjref, sizeof(stdobjref), &res); + if (hr == S_OK) + { + hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS, + 1, &iid, &qiresults); + if (SUCCEEDED(hr)) + { + hr = IStream_Write(pStm, &qiresults->std, sizeof(qiresults->std), NULL); + if (FAILED(hr)) + { + REMINTERFACEREF rif; + rif.ipid = qiresults->std.ipid; + rif.cPublicRefs = qiresults->std.cPublicRefs; + rif.cPrivateRefs = 0; + IRemUnknown_RemRelease(remunk, 1, &rif); + } + CoTaskMemFree(qiresults); + } + else + ERR("IRemUnknown_RemQueryInterface failed with error 0x%08lx\n", hr); + } + } return hr; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 10c690c..3de88a9 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -472,6 +472,66 @@ static void test_proxy_marshal_and_unmar end_host_object(tid, thread); } +/* tests success case of an interthread marshal and then marshaling the proxy + * using an iid that hasn't previously been unmarshaled */ +static void test_proxy_marshal_and_unmarshal2(void) +{ + HRESULT hr; + IStream *pStream = NULL; + IUnknown *pProxy = NULL; + IUnknown *pProxy2 = NULL; + DWORD tid; + HANDLE thread; + + cLocks = 0; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok_ole_success(hr, CreateStreamOnHGlobal); + tid = start_host_object(pStream, &IID_IUnknown, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &thread); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IUnknown, (void **)&pProxy); + ok_ole_success(hr, CoUnmarshalInterface); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + /* marshal the proxy */ + hr = CoMarshalInterface(pStream, &IID_IClassFactory, pProxy, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoMarshalInterface); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + /* unmarshal the second proxy to the object */ + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy2); + ok_ole_success(hr, CoUnmarshalInterface); + IStream_Release(pStream); + + /* now the proxies should be as follows: + * pProxy -> &Test_ClassFactory + * pProxy2 -> &Test_ClassFactory + * they should NOT be as follows: + * pProxy -> &Test_ClassFactory + * pProxy2 -> pProxy + * the above can only really be tested by looking in +ole traces + */ + + ok_more_than_one_lock(); + + IUnknown_Release(pProxy); + + ok_more_than_one_lock(); + + IUnknown_Release(pProxy2); + + ok_no_locks(); + + end_host_object(tid, thread); +} + /* tests that stubs are released when the containing apartment is destroyed */ static void test_marshal_stub_apartment_shutdown(void) { @@ -1930,6 +1990,7 @@ START_TEST(marshal) test_marshal_and_unmarshal_invalid(); test_interthread_marshal_and_unmarshal(); test_proxy_marshal_and_unmarshal(); + test_proxy_marshal_and_unmarshal2(); test_marshal_stub_apartment_shutdown(); test_marshal_proxy_apartment_shutdown(); test_marshal_proxy_mta_apartment_shutdown();

1 0

Robert Shearman : ole: Change NORMALEXTREFS to 5, like it is in native.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 9a9981bad5a860368b535360094270426b4dc3e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a9981bad5a860368b53536… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 1 12:18:33 2006 +0000 ole: Change NORMALEXTREFS to 5, like it is in native. --- dlls/ole32/marshal.c | 2 +- dlls/ole32/stubmanager.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index aebdba1..8f952f9 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); extern const CLSID CLSID_DfMarshal; /* number of refs given out for normal marshaling */ -#define NORMALEXTREFS 1 /* FIXME: this should be 5, but we have to wait for IRemUnknown support first */ +#define NORMALEXTREFS 5 /* private flag indicating that the caller does not want to notify the stub * when the proxy disconnects or is destroyed */ diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 2f2e297..add7246 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -534,7 +534,7 @@ void stub_manager_release_marshal_data(s if (ifstub->flags & MSHLFLAGS_TABLEWEAK) refs = 0; - else + else if (ifstub->flags & MSHLFLAGS_TABLESTRONG) refs = 1; stub_manager_ext_release(m, refs);

1 0