January 2008 - Wine-Commits

Dmitry Timoshkov : gdi32: Actually perform the fractional scaling test, make it pass under Wine.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 0acfe68864db9caa8d018c44f08040def7b09532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0acfe68864db9caa8d018c44f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jan 20 21:21:45 2008 +0800 gdi32: Actually perform the fractional scaling test, make it pass under Wine. --- dlls/gdi32/freetype.c | 67 +++++++++++++++++++++++++--------------------- dlls/gdi32/tests/font.c | 27 +++++++++++++----- 2 files changed, 55 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3e21a45..4b54699 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -324,7 +324,7 @@ struct tagGdiFont { struct list hfontlist; FONT_DESC font_desc; LONG aveWidth, ppem; - float scale_x, scale_y; + float scale_y; SHORT yMax; SHORT yMin; OUTLINETEXTMETRICW *potm; @@ -2471,6 +2471,7 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) if((err = pFT_Set_Pixel_Sizes(ft_face, 0, font->ppem)) != 0) WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", 0, font->ppem, err); } else { + font->ppem = height; if((err = pFT_Set_Pixel_Sizes(ft_face, width, height)) != 0) WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", width, height, err); } @@ -3157,18 +3158,29 @@ found: TRACE("Chosen: %s %s (%s/%p:%ld)\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName), face->file, face->font_data_ptr, face->face_index); - ret->scale_x = 0.0; - ret->scale_y = 0.0; - ret->aveWidth = abs(lf.lfWidth); if(!face->scalable) { - ret->ppem = face->size.height; - if (height != 0) ret->ppem += diff; + /* Windows uses integer scaling factors for bitmap fonts */ + INT scale, scaled_height; + + if (height != 0) height = diff; + else height = 0; + height += face->size.height; + + scale = (height + face->size.height - 1) / face->size.height; + scaled_height = scale * face->size.height; + /* XP allows not more than 10% deviation */ + if (scale > 1 && scaled_height - height > scaled_height / 10) scale--; + ret->scale_y = scale; width = face->size.x_ppem >> 6; height = face->size.y_ppem >> 6; } + else + ret->scale_y = 1.0; + TRACE("font scale y: %f\n", ret->scale_y); + ret->ft_face = OpenFontFace(ret, face, width, height); if (!ret->ft_face) @@ -3312,6 +3324,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, height = face->size.y_ppem >> 6; width = face->size.x_ppem >> 6; } + font->scale_y = 1.0; if (!(font->ft_face = OpenFontFace(font, face, width, height))) { @@ -3620,7 +3633,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, INT left, right, top = 0, bottom = 0, adv, lsb, bbx; FT_Angle angle = 0; FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; - float widthRatio = 1.0, heightRatio = 1.0; + float widthRatio = 1.0; FT_Matrix transMat = identityMat; BOOL needsTransform = FALSE; @@ -3661,11 +3674,13 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, } /* Scaling factor */ - if (font->scale_x != 0.0) + if (font->aveWidth && font->potm) { - widthRatio = font->scale_x; - heightRatio = font->scale_y; + widthRatio = (float)font->aveWidth * font->font_desc.matrix.eM11; + widthRatio /= (float)font->potm->otmTextMetrics.tmAveCharWidth; } + else + widthRatio = font->scale_y; left = (INT)(ft_face->glyph->metrics.horiBearingX * widthRatio) & -64; right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) * widthRatio + 63) & -64; @@ -3680,7 +3695,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, scaleMat.xx = FT_FixedFromFloat(widthRatio); scaleMat.xy = 0; scaleMat.yx = 0; - scaleMat.yy = FT_FixedFromFloat(heightRatio); + scaleMat.yy = FT_FixedFromFloat(font->scale_y); pFT_Matrix_Multiply(&scaleMat, &transMat); needsTransform = TRUE; @@ -4161,34 +4176,24 @@ static BOOL get_bitmap_text_metrics(GdiFont *font) static void scale_font_metrics(GdiFont *font, LPTEXTMETRICW ptm) { - if (font->scale_x == 0.0) - { - if (FT_IS_SCALABLE(font->ft_face) || !font->ppem) - font->scale_y = 1.0; - else - { - font->scale_y = (float)font->ppem * font->font_desc.matrix.eM22; - font->scale_y /= (float)font->potm->otmTextMetrics.tmHeight; - } - - if (font->aveWidth) - { - font->scale_x = (float)font->aveWidth * font->font_desc.matrix.eM11; - font->scale_x /= (float)font->potm->otmTextMetrics.tmAveCharWidth; - } - else - font->scale_x = font->scale_y; + float scale_x; - TRACE("font scale x: %f y: %f\n", font->scale_x, font->scale_y); + if (font->aveWidth) + { + scale_x = (float)font->aveWidth * font->font_desc.matrix.eM11; + scale_x /= (float)font->potm->otmTextMetrics.tmAveCharWidth; } + else + scale_x = font->scale_y; + ptm->tmHeight = (float)ptm->tmHeight * font->scale_y; ptm->tmAscent = (float)ptm->tmAscent * font->scale_y; ptm->tmDescent = (float)ptm->tmDescent * font->scale_y; ptm->tmInternalLeading = (float)ptm->tmInternalLeading * font->scale_y; ptm->tmExternalLeading = (float)ptm->tmExternalLeading * font->scale_y; - ptm->tmAveCharWidth = (float)ptm->tmAveCharWidth * font->scale_x; - ptm->tmMaxCharWidth = (float)ptm->tmMaxCharWidth * font->scale_x; + ptm->tmAveCharWidth = (float)ptm->tmAveCharWidth * scale_x; + ptm->tmMaxCharWidth = (float)ptm->tmMaxCharWidth * scale_x; } /************************************************************* diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ee577c6..08725de 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -156,7 +156,7 @@ static INT CALLBACK font_enum_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DW return 1; /* continue enumeration */ } -static void test_font_metrics(HDC hdc, HFONT hfont, const char *test_str, +static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, const char *test_str, INT test_str_len, const TEXTMETRICA *tm_orig, const SIZE *size_orig, INT width_of_A_orig, INT scale_x, INT scale_y) @@ -165,7 +165,7 @@ static void test_font_metrics(HDC hdc, HFONT hfont, const char *test_str, LOGFONTA lf; TEXTMETRICA tm; SIZE size; - INT width_of_A; + INT width_of_A, cx, cy; if (!hfont) return; @@ -176,13 +176,17 @@ static void test_font_metrics(HDC hdc, HFONT hfont, const char *test_str, GetTextMetricsA(hdc, &tm); + cx = tm.tmAveCharWidth / tm_orig->tmAveCharWidth; + cy = tm.tmHeight / tm_orig->tmHeight; + ok(cx == scale_x && cy == scale_y, "expected scale_x %d, scale_y %d, got cx %d, cy %d\n", + scale_x, scale_y, cx, cy); ok(tm.tmHeight == tm_orig->tmHeight * scale_y, "%d != %d\n", tm.tmHeight, tm_orig->tmHeight * scale_y); ok(tm.tmAscent == tm_orig->tmAscent * scale_y, "%d != %d\n", tm.tmAscent, tm_orig->tmAscent * scale_y); ok(tm.tmDescent == tm_orig->tmDescent * scale_y, "%d != %d\n", tm.tmDescent, tm_orig->tmDescent * scale_y); ok(tm.tmAveCharWidth == tm_orig->tmAveCharWidth * scale_x, "%d != %d\n", tm.tmAveCharWidth, tm_orig->tmAveCharWidth * scale_x); ok(tm.tmMaxCharWidth == tm_orig->tmMaxCharWidth * scale_x, "%d != %d\n", tm.tmAveCharWidth, tm_orig->tmMaxCharWidth * scale_x); - ok(lf.lfHeight == tm.tmHeight, "lf %d != tm %d\n", lf.lfHeight, tm.tmHeight); + ok(lf.lfHeight == lfHeight, "lf %d != %d\n", lf.lfHeight, lfHeight); if (lf.lfWidth) ok(lf.lfWidth == tm.tmAveCharWidth, "lf %d != tm %d\n", lf.lfWidth, tm.tmAveCharWidth); @@ -207,7 +211,7 @@ static void test_bitmap_font(void) HFONT hfont, old_hfont; TEXTMETRICA tm_orig; SIZE size_orig; - INT ret, i, width_orig, height_orig; + INT ret, i, width_orig, height_orig, scale; hdc = GetDC(0); @@ -233,10 +237,17 @@ static void test_bitmap_font(void) DeleteObject(hfont); /* test fractional scaling */ - for (i = 1; i < height_orig; i++) + for (i = 1; i <= height_orig * 3; i++) { + INT nearest_height; + + bitmap_lf.lfHeight = i; hfont = create_font("fractional", &bitmap_lf); - test_font_metrics(hdc, hfont, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, 1); + scale = (i + height_orig - 1) / height_orig; + nearest_height = scale * height_orig; + /* XP allows not more than 10% deviation */ + if (scale > 1 && nearest_height - i > nearest_height / 10) scale--; + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); DeleteObject(hfont); } @@ -244,14 +255,14 @@ static void test_bitmap_font(void) bitmap_lf.lfHeight = height_orig * 2; bitmap_lf.lfWidth *= 3; hfont = create_font("3x2", &bitmap_lf); - test_font_metrics(hdc, hfont, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); DeleteObject(hfont); /* test integer scaling 3x3 */ bitmap_lf.lfHeight = height_orig * 3; bitmap_lf.lfWidth = 0; hfont = create_font("3x3", &bitmap_lf); - test_font_metrics(hdc, hfont, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); DeleteObject(hfont); ReleaseDC(0, hdc);

1 0

Andrew Talbot : shell32: Remove unneeded casts.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 2f2575567465863f005e0dcfb5d073cc49c6ad68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2575567465863f005e0dcfb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 19 16:54:28 2008 +0000 shell32: Remove unneeded casts. --- dlls/shell32/recyclebin.c | 12 ++++++------ dlls/shell32/shell.c | 2 +- dlls/shell32/shell32_main.c | 6 +++--- dlls/shell32/shelllink.c | 4 ++-- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 2 +- dlls/shell32/shfldr_unixfs.c | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index ddf2fc3..6c26e3d 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -206,9 +206,9 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH HRESULT ret; int pidls_count; int i=0; - - TRACE("(%p, %p, %x, %p)\n", This, hwnd, (unsigned int)grfFlags, ppenumIDList); - + + TRACE("(%p, %p, %x, %p)\n", This, hwnd, grfFlags, ppenumIDList); + if (grfFlags & SHCONTF_NONFOLDERS) { *ppenumIDList = NULL; @@ -293,7 +293,7 @@ static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwn static HRESULT WINAPI RecycleBin_GetAttributesOf(IShellFolder2 *This, UINT cidl, LPCITEMIDLIST *apidl, SFGAOF *rgfInOut) { - TRACE("(%p, %d, {%p, ...}, {%x})\n", This, cidl, apidl[0], (unsigned int)*rgfInOut); + TRACE("(%p, %d, {%p, ...}, {%x})\n", This, cidl, apidl[0], *rgfInOut); *rgfInOut &= SFGAO_CANMOVE|SFGAO_CANDELETE|SFGAO_HASPROPSHEET|SFGAO_FILESYSTEM; return S_OK; } @@ -310,7 +310,7 @@ static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMID { WIN32_FIND_DATAW data; - TRACE("(%p, %p, %x, %p)\n", This, pidl, (unsigned int)uFlags, pName); + TRACE("(%p, %p, %x, %p)\n", This, pidl, uFlags, pName); TRASH_UnpackItemID(&pidl->mkid, NULL, &data); pName->uType = STRRET_WSTR; pName->u.pOleStr = StrDupW(PathFindFileNameW(data.cFileName)); @@ -371,7 +371,7 @@ static HRESULT WINAPI RecycleBin_EnumSearches(IShellFolder2 *iface, IEnumExtraSe static HRESULT WINAPI RecycleBin_GetDefaultColumn(IShellFolder2 *iface, DWORD dwReserved, ULONG *pSort, ULONG *pDisplay) { RecycleBin *This = (RecycleBin *)iface; - TRACE("(%p, %x, %p, %p)\n", This, (unsigned int)dwReserved, pSort, pDisplay); + TRACE("(%p, %x, %p, %p)\n", This, dwReserved, pSort, pDisplay); *pSort = 0; *pDisplay = 0; return S_OK; diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 0078f57..981e28c 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -133,7 +133,7 @@ end: void WINAPI DragFinish16(HDROP16 h) { TRACE("\n"); - GlobalFree16((HGLOBAL16)h); + GlobalFree16(h); } diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 0b7a8f3..37694ba 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -526,7 +526,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, static const WCHAR p1W[] = {'%','1',0}; WCHAR sTemp [MAX_PATH]; - szExt = (LPWSTR) PathFindExtensionW(szFullPath); + szExt = PathFindExtensionW(szFullPath); TRACE("szExt=%s\n", debugstr_w(szExt)); if ( szExt && HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && @@ -584,7 +584,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, static const WCHAR p1W[] = {'%','1',0}; psfi->iIcon = 0; - szExt = (LPWSTR) PathFindExtensionW(sTemp); + szExt = PathFindExtensionW(sTemp); if ( szExt && HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &icon_idx)) @@ -1090,7 +1090,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, if(!(hRes = FindResourceW(shell32_hInstance, wszSHELL_ABOUT_MSGBOX, (LPWSTR)RT_DIALOG))) return FALSE; - if(!(template = (LPVOID)LoadResource(shell32_hInstance, hRes))) + if(!(template = LoadResource(shell32_hInstance, hRes))) return FALSE; info.szApp = szApp; info.szOtherStuff = szOtherStuff; diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index c42242c..6e9ac70 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1539,7 +1539,7 @@ static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPCITEMIDLIST pidl, if (SUCCEEDED(hr)) { IExtractIconA* pei; - hr = IShellFolder_GetUIObjectOf(psf, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA, NULL, (LPVOID*)&pei); + hr = IShellFolder_GetUIObjectOf(psf, 0, 1, &pidlLast, &IID_IExtractIconA, NULL, (LPVOID*)&pei); if (SUCCEEDED(hr)) { hr = IExtractIconA_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); @@ -1918,7 +1918,7 @@ static HRESULT SHELL_PidlGeticonLocationW(IShellFolder* psf, LPCITEMIDLIST pidl, if (SUCCEEDED(hr)) { IExtractIconW* pei; - hr = IShellFolder_GetUIObjectOf(psf, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, NULL, (LPVOID*)&pei); + hr = IShellFolder_GetUIObjectOf(psf, 0, 1, &pidlLast, &IID_IExtractIconW, NULL, (LPVOID*)&pei); if (SUCCEEDED(hr)) { hr = IExtractIconW_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 2b0e407..830013b 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -588,7 +588,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, IShellFolder *psfParent = NULL; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, &rpidl); if(SUCCEEDED(hr)) { SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); IShellFolder_Release(psfParent); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 87530a5..af9958e 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -447,7 +447,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, IShellFolder *psfParent = NULL; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, &rpidl); if(SUCCEEDED(hr)) { SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); IShellFolder_Release(psfParent); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 6ec8d11..ab1f78a 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -947,11 +947,11 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_BindToObject(IShellFolder2* iface } else { clsidChild = This->m_pCLSID; } - + hr = CreateUnixFolder(NULL, &IID_IPersistFolder3, (void**)&persistFolder, clsidChild); if (!SUCCEEDED(hr)) return hr; - hr = IPersistFolder_QueryInterface(persistFolder, riid, (void**)ppvOut); - + hr = IPersistFolder_QueryInterface(persistFolder, riid, ppvOut); + if (SUCCEEDED(hr)) { UnixFolder *subfolder = ADJUST_THIS(UnixFolder, IPersistFolder3, persistFolder); subfolder->m_pidlLocation = ILCombine(This->m_pidlLocation, pidl);

1 0

Andrew Talbot : setupapi: Remove unneeded casts.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: e48bbc23e40ddb05d1b4205b7793abe38297058d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48bbc23e40ddb05d1b4205b7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 19 14:56:39 2008 +0000 setupapi: Remove unneeded casts. --- dlls/setupapi/devinst.c | 44 ++++++++++++++++++++++---------------------- dlls/setupapi/infparse.c | 2 +- dlls/setupapi/misc.c | 4 ++-- dlls/setupapi/parser.c | 16 ++++++++-------- dlls/setupapi/queue.c | 2 +- 5 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e48bbc23e40ddb05d1b42…

1 0

Andrew Talbot : sane.ds: Remove unneeded casts.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: e3c750f3c222b2f7c45608508250d48ddd958f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c750f3c222b2f7c45608508… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jan 18 21:27:06 2008 +0000 sane.ds: Remove unneeded casts. --- dlls/sane.ds/capability.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 6d237db..ad6a166 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -176,14 +176,14 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) static TW_BOOL TWAIN_OneValueSet (pTW_CAPABILITY pCapability, TW_UINT32 value) { - pCapability->hContainer = (TW_HANDLE)GlobalAlloc (0, sizeof(TW_ONEVALUE)); + pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); if (pCapability->hContainer) { - pTW_ONEVALUE pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); pVal->ItemType = TWTY_UINT32; pVal->Item = value; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); + GlobalUnlock (pCapability->hContainer); return TRUE; } else @@ -192,12 +192,12 @@ static TW_BOOL TWAIN_OneValueSet (pTW_CAPABILITY pCapability, TW_UINT32 value) static TW_BOOL TWAIN_OneValueGet (pTW_CAPABILITY pCapability, TW_UINT32 *pValue) { - pTW_ONEVALUE pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); if (pVal) { *pValue = pVal->Item; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); + GlobalUnlock (pCapability->hContainer); return TRUE; } else

1 0

Jacek Caban : shdocvw: Do navigation in message handler.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: b90346fd623a43089dab72c8dd778be7384c66b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90346fd623a43089dab72c8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 21:54:16 2008 +0100 shdocvw: Do navigation in message handler. --- dlls/shdocvw/navigate.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 396d978..4439922 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -638,10 +638,28 @@ static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mo return hres; } +typedef struct { + task_header_t header; + BindStatusCallback *bsc; +} task_navigate_bsc_t; + +static void navigate_bsc_proc(DocHost *This, task_header_t *t) +{ + task_navigate_bsc_t *task = (task_navigate_bsc_t*)t; + + if(!This->hwnd) + create_doc_view_hwnd(This); + + navigate_bsc(This, task->bsc, NULL); + + IBindStatusCallback_Release(BINDSC(task->bsc)); +} + + HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, const VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { - BindStatusCallback *bsc; + task_navigate_bsc_t *task; PBYTE post_data = NULL; ULONG post_data_len = 0; LPWSTR headers = NULL; @@ -671,16 +689,13 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, TRACE("Headers: %s\n", debugstr_w(headers)); } - if(!This->hwnd) - create_doc_view_hwnd(This); + task = heap_alloc(sizeof(*task)); + task->bsc = create_callback(This, url, post_data, post_data_len, headers); - bsc = create_callback(This, url, post_data, post_data_len, headers); if(post_data) SafeArrayUnaccessData(V_ARRAY(PostData)); - navigate_bsc(This, bsc, NULL); - - IBindStatusCallback_Release(BINDSC(bsc)); + push_dochost_task(This, &task->header, navigate_bsc_proc, This->url == NULL); return S_OK; }

1 0

Jacek Caban : shdocvw: Delay creating URL moniker to bind_to_object call.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 4e3bd6e60a47a5bbeb56c27e2cdabba52d627089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3bd6e60a47a5bbeb56c27e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 21:53:39 2008 +0100 shdocvw: Delay creating URL moniker to bind_to_object call. --- dlls/shdocvw/navigate.c | 88 +++++++++++++++++++++++++--------------------- 1 files changed, 48 insertions(+), 40 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 4bf21a5..396d978 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -20,7 +20,6 @@ #define NONAMELESSSTRUCT #include "wine/debug.h" -#include "wine/unicode.h" #include "shdocvw.h" #include "mshtml.h" @@ -388,8 +387,8 @@ static const IHttpNegotiateVtbl HttpNegotiateVtbl = { HttpNegotiate_OnResponse }; -static IBindStatusCallback *create_callback(DocHost *doc_host, LPCWSTR url, PBYTE post_data, - ULONG post_data_len, LPWSTR headers) +static BindStatusCallback *create_callback(DocHost *doc_host, LPCWSTR url, PBYTE post_data, + ULONG post_data_len, LPCWSTR headers) { BindStatusCallback *ret = heap_alloc(sizeof(BindStatusCallback)); @@ -416,7 +415,7 @@ static IBindStatusCallback *create_callback(DocHost *doc_host, LPCWSTR url, PBYT memcpy(ret->headers, headers, size); } - return BINDSC(ret); + return ret; } static void on_before_navigate2(DocHost *This, LPCWSTR url, const BYTE *post_data, @@ -567,12 +566,24 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt static const WCHAR httpsW[] = {'h','t','t','p','s',0}; static const WCHAR ftpW[]= {'f','t','p',0}; + if(mon) { + IMoniker_AddRef(mon); + }else { + hres = CreateURLMoniker(NULL, url, &mon); + if(FAILED(hres)) { + WARN("CreateURLMoniker failed: %08x\n", hres); + return hres; + } + } + + CoTaskMemFree(This->url); + hres = IMoniker_GetDisplayName(mon, 0, NULL, &This->url); + if(FAILED(hres)) + FIXME("GetDisplayName failed: %08x\n", hres); + IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, (IUnknown*)CLIENTSITE(This)); - if(This->frame) - IOleInPlaceFrame_EnableModeless(This->frame, FALSE); - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), &schema_len, 0); if(SUCCEEDED(hres) && @@ -586,49 +597,42 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt hres = S_OK; if(unk) IUnknown_Release(unk); - }else if(try_application_url(This->url)) { + }else if(try_application_url(url)) { hres = S_OK; }else { FIXME("BindToObject failed: %08x\n", hres); } } - if(This->frame) - IOleInPlaceFrame_EnableModeless(This->frame, TRUE); - + IMoniker_Release(mon); return S_OK; } -static HRESULT navigate_mon(DocHost *This, IMoniker *mon, PBYTE post_data, ULONG post_data_len, - LPWSTR headers) +static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mon) { - IBindStatusCallback *callback; IBindCtx *bindctx; VARIANT_BOOL cancel = VARIANT_FALSE; - LPWSTR url; HRESULT hres; - IMoniker_GetDisplayName(mon, NULL, NULL, &url); - TRACE("navigating to %s\n", debugstr_w(url)); - - on_before_navigate2(This, url, post_data, post_data_len, headers, &cancel); + on_before_navigate2(This, bsc->url, bsc->post_data, bsc->post_data_len, bsc->headers, &cancel); if(cancel) { FIXME("Navigation canceled\n"); - CoTaskMemFree(url); return S_OK; } if(This->document) deactivate_document(This); - CoTaskMemFree(This->url); - This->url = url; - callback = create_callback(This, url, post_data, post_data_len, (LPWSTR)headers); - CreateAsyncBindCtx(0, callback, 0, &bindctx); + CreateAsyncBindCtx(0, BINDSC(bsc), 0, &bindctx); + + if(This->frame) + IOleInPlaceFrame_EnableModeless(This->frame, FALSE); + + hres = bind_to_object(This, mon, bsc->url, bindctx, BINDSC(bsc)); - hres = bind_to_object(This, mon, This->url, bindctx, callback); + if(This->frame) + IOleInPlaceFrame_EnableModeless(This->frame, TRUE); - IBindStatusCallback_Release(callback); IBindCtx_Release(bindctx); return hres; @@ -637,20 +641,13 @@ static HRESULT navigate_mon(DocHost *This, IMoniker *mon, PBYTE post_data, ULONG HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, const VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { - IMoniker *mon; + BindStatusCallback *bsc; PBYTE post_data = NULL; ULONG post_data_len = 0; LPWSTR headers = NULL; - HRESULT hres; TRACE("navigating to %s\n", debugstr_w(url)); - hres = CreateURLMoniker(NULL, url, &mon); - if(FAILED(hres)) { - WARN("CreateURLMoniker failed: %08x\n", hres); - return hres; - } - if((Flags && V_VT(Flags) != VT_EMPTY) || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY)) FIXME("Unsupported args (Flags %p:%d; TargetFrameName %p:%d)\n", @@ -677,22 +674,25 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, if(!This->hwnd) create_doc_view_hwnd(This); - hres = navigate_mon(This, mon, post_data, post_data_len, headers); - - IMoniker_Release(mon); + bsc = create_callback(This, url, post_data, post_data_len, headers); if(post_data) SafeArrayUnaccessData(V_ARRAY(PostData)); - return hres; + navigate_bsc(This, bsc, NULL); + + IBindStatusCallback_Release(BINDSC(bsc)); + + return S_OK; } static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, IBindStatusCallback *callback) { IHttpNegotiate *http_negotiate; + BindStatusCallback *bsc; PBYTE post_data = NULL; ULONG post_data_len = 0; - LPWSTR headers = NULL; + LPWSTR headers = NULL, url; BINDINFO bindinfo; DWORD bindf = 0; HRESULT hres; @@ -718,8 +718,16 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, post_data = bindinfo.stgmedData.u.hGlobal; } - hres = navigate_mon(This, mon, post_data, post_data_len, headers); + hres = IMoniker_GetDisplayName(mon, 0, NULL, &url); + if(FAILED(hres)) + FIXME("GetDisplayName failed: %08x\n", hres); + + bsc = create_callback(This, url, post_data, post_data_len, headers); + CoTaskMemFree(url); + + hres = navigate_bsc(This, bsc, mon); + IBindStatusCallback_Release(BINDSC(bsc)); CoTaskMemFree(headers); ReleaseBindInfo(&bindinfo);

1 0

Jacek Caban : shdocvw: Store headers as BSTR.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 13a785cc11d4465632fa9f5273fbde3a678cc2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a785cc11d4465632fa9f527… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 21:54:30 2008 +0100 shdocvw: Store headers as BSTR. --- dlls/shdocvw/navigate.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 4439922..2d46abe 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -41,7 +41,7 @@ typedef struct { LPWSTR url; HGLOBAL post_data; - LPWSTR headers; + BSTR headers; ULONG post_data_len; } BindStatusCallback; @@ -160,8 +160,9 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) IOleClientSite_Release(CLIENTSITE(This->doc_host)); if(This->post_data) GlobalFree(This->post_data); + if(This->headers) + SysFreeString(This->headers); heap_free(This->url); - heap_free(This->headers); heap_free(This); } @@ -399,7 +400,7 @@ static BindStatusCallback *create_callback(DocHost *doc_host, LPCWSTR url, PBYTE ret->url = heap_strdupW(url); ret->post_data = NULL; ret->post_data_len = post_data_len; - ret->headers = NULL; + ret->headers = headers ? SysAllocString(headers) : NULL; ret->doc_host = doc_host; IOleClientSite_AddRef(CLIENTSITE(doc_host)); @@ -409,12 +410,6 @@ static BindStatusCallback *create_callback(DocHost *doc_host, LPCWSTR url, PBYTE memcpy(ret->post_data, post_data, post_data_len); } - if(headers) { - int size = (strlenW(headers)+1)*sizeof(WCHAR); - ret->headers = heap_alloc(size); - memcpy(ret->headers, headers, size); - } - return ret; }

1 0

Andrew Talbot : secur32: Remove unneeded casts.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: e4ca5c564790983e78e522613204f9fff24c4237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ca5c564790983e78e522613… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jan 18 21:27:09 2008 +0000 secur32: Remove unneeded casts. --- dlls/secur32/ntlm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index f50b4c6..3dbdd83 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -832,9 +832,9 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( helper->crypt.ntlm2.send_a4i = SECUR32_arc4Alloc(); helper->crypt.ntlm2.recv_a4i = SECUR32_arc4Alloc(); SECUR32_arc4Init(helper->crypt.ntlm2.send_a4i, - (BYTE *)helper->crypt.ntlm2.send_seal_key, 16); + helper->crypt.ntlm2.send_seal_key, 16); SECUR32_arc4Init(helper->crypt.ntlm2.recv_a4i, - (BYTE *)helper->crypt.ntlm2.recv_seal_key, 16); + helper->crypt.ntlm2.recv_seal_key, 16); helper->crypt.ntlm2.send_seq_no = 0l; helper->crypt.ntlm2.recv_seq_no = 0l; }

1 0

Andrew Talbot : shell32: Remove unneeded casts.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 52db721a69d0b5745d6c4431e64181711b85d93a URL: http://source.winehq.org/git/wine.git/?a=commit;h=52db721a69d0b5745d6c4431e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 19 16:54:24 2008 +0000 shell32: Remove unneeded casts. --- dlls/shell32/autocomplete.c | 3 +-- dlls/shell32/brsfolder.c | 2 +- dlls/shell32/changenotify.c | 4 ++-- dlls/shell32/cpanelfolder.c | 8 ++++---- dlls/shell32/dde.c | 2 +- dlls/shell32/dialogs.c | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index ebe6826..4c32b3f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -578,8 +578,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (hr != S_OK) break; - if ((LPWSTR)strstrW(strs, hwndText) == strs) { - + if (strstrW(strs, hwndText) == strs) { if (This->options & ACO_AUTOAPPEND) { SetWindowTextW(hwnd, strs); SendMessageW(hwnd, EM_SETSEL, lstrlenW(hwndText), lstrlenW(strs)); diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 6eeab5e..45e7519 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -290,7 +290,7 @@ static HTREEITEM InsertTreeViewItem( browse_info *info, IShellFolder * lpsf, tvins.hInsertAfter = NULL; tvins.hParent = hParent; - return (HTREEITEM)TreeView_InsertItemW( info->hwndTreeView, &tvins ); + return TreeView_InsertItemW( info->hwndTreeView, &tvins ); } /****************************************************************************** diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 4cd17e9..6c1882b 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -423,7 +423,7 @@ DWORD WINAPI NTSHChangeNotifyRegister( FIXME("(%p,0x%08x,0x%08x,0x%08x,0x%08x,%p):semi stub.\n", hwnd,events1,events2,msg,count,idlist); - return (DWORD) SHChangeNotifyRegister(hwnd, events1, events2, msg, count, idlist); + return SHChangeNotifyRegister(hwnd, events1, events2, msg, count, idlist); } /************************************************************************* @@ -448,7 +448,7 @@ HANDLE WINAPI SHChangeNotification_Lock( { idlist = SHAlloc( sizeof(LPCITEMIDLIST *) * node->cidl ); for(i=0; i<node->cidl; i++) - idlist[i] = (LPCITEMIDLIST)node->pidlSignaled; + idlist[i] = node->pidlSignaled; *lpwEventId = node->wSignalledEvent; *lppidls = (LPITEMIDLIST*)idlist; node->wSignalledEvent = 0; diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index aa09edf..fb6672d 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -288,7 +288,7 @@ static PIDLCPanelStruct* _ILGetCPanelPointer(LPCITEMIDLIST pidl) LPPIDLDATA pdata = _ILGetDataPointer(pidl); if (pdata && pdata->type==PT_CPLAPPLET) - return (PIDLCPanelStruct*)&(pdata->u.cpanel); + return &pdata->u.cpanel; return NULL; } @@ -436,14 +436,14 @@ static BOOL CreateCPanelEnumList( if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { strcpy(p, wfd.cFileName); - SHELL_RegisterCPanelApp((IEnumIDList*)iface, szPath); + SHELL_RegisterCPanelApp(iface, szPath); } } while(FindNextFileA(hFile, &wfd)); FindClose(hFile); } - SHELL_RegisterRegistryCPanelApps((IEnumIDList*)iface, HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); - SHELL_RegisterRegistryCPanelApps((IEnumIDList*)iface, HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); + SHELL_RegisterRegistryCPanelApps(iface, HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); + SHELL_RegisterRegistryCPanelApps(iface, HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); } return TRUE; } diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index ea794ad..129f753 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -111,7 +111,7 @@ static HDDEDATA CALLBACK DdeCallback( case XTYP_WILDCONNECT: return (HDDEDATA)(DWORD_PTR)Dde_OnWildConnect(hsz1, hsz2); case XTYP_REQUEST: - return (HDDEDATA)Dde_OnRequest(uFmt, hconv, hsz1, hsz2); + return Dde_OnRequest(uFmt, hconv, hsz1, hsz2); case XTYP_EXECUTE: return (HDDEDATA)(DWORD_PTR)Dde_OnExecute(hconv, hsz1, hdata); case XTYP_DISCONNECT: diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index f972cfc..6c5db44 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -103,7 +103,7 @@ void WINAPI RunFileDlg( MessageBoxA (hwndOwner, "Couldn't find dialog.", "Nix", MB_OK) ; return; } - if(!(template = (LPVOID)LoadResource(shell32_hInstance, hRes))) + if(!(template = LoadResource(shell32_hInstance, hRes))) { MessageBoxA (hwndOwner, "Couldn't load dialog.", "Nix", MB_OK) ; return;

1 0

Jacek Caban : shdocvw: Use more flexible mechanism instead of WB_WM_NAVIGATE2.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 1a7bf2e0fff0ecde25be2d9fb06f911f709d834b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7bf2e0fff0ecde25be2d9fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 21:53:25 2008 +0100 shdocvw: Use more flexible mechanism instead of WB_WM_NAVIGATE2. --- dlls/shdocvw/dochost.c | 33 ++++++++++++++++++++++++++------- dlls/shdocvw/iexplore.c | 2 ++ dlls/shdocvw/navigate.c | 9 ++++++++- dlls/shdocvw/oleobject.c | 2 ++ dlls/shdocvw/shdocvw.h | 20 ++++++++++++++++---- 5 files changed, 54 insertions(+), 12 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index f64ae09..c3a22f4 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -25,6 +25,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); static ATOM doc_view_atom = 0; +void push_dochost_task(DocHost *This, task_header_t *task, task_proc_t proc, BOOL send) +{ + task->proc = proc; + + /* FIXME: Don't use lParam */ + if(send) + SendMessageW(This->frame_hwnd, WM_DOCHOSTTASK, 0, (LPARAM)task); + else + PostMessageW(This->frame_hwnd, WM_DOCHOSTTASK, 0, (LPARAM)task); +} + +LRESULT process_dochost_task(DocHost *This, LPARAM lparam) +{ + task_header_t *task = (task_header_t*)lparam; + + task->proc(This, task); + + heap_free(task); + return 0; +} + static void navigate_complete(DocHost *This) { IDispatch *disp = NULL; @@ -59,7 +80,7 @@ static void navigate_complete(DocHost *This) IDispatch_Release(disp); } -static LRESULT navigate2(DocHost *This) +void object_available(DocHost *This) { IHlinkTarget *hlink; HRESULT hres; @@ -68,25 +89,25 @@ static LRESULT navigate2(DocHost *This) if(!This->document) { WARN("document == NULL\n"); - return 0; + return; } hres = IUnknown_QueryInterface(This->document, &IID_IHlinkTarget, (void**)&hlink); if(FAILED(hres)) { FIXME("Could not get IHlinkTarget interface\n"); - return 0; + return; } hres = IHlinkTarget_Navigate(hlink, 0, NULL); IHlinkTarget_Release(hlink); if(FAILED(hres)) { FIXME("Navigate failed\n"); - return 0; + return; } navigate_complete(This); - return 0; + return; } static LRESULT resize_document(DocHost *This, LONG width, LONG height) @@ -117,8 +138,6 @@ static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l switch(msg) { case WM_SIZE: return resize_document(This, LOWORD(lParam), HIWORD(lParam)); - case WB_WM_NAVIGATE2: - return navigate2(This); } return DefWindowProcW(hwnd, msg, wParam, lParam); diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index e6387d5..ca2c868 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -77,6 +77,8 @@ ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) return iewnd_OnDestroy(This); case WM_SIZE: return iewnd_OnSize(This, LOWORD(lparam), HIWORD(lparam)); + case WM_DOCHOSTTASK: + return process_dochost_task(&This->doc_host, lparam); } return DefWindowProcW(hwnd, msg, wparam, lparam); } diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 37245f7..4bf21a5 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -269,10 +269,16 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if return E_NOTIMPL; } +static void object_available_proc(DocHost *This, task_header_t *task) +{ + object_available(This); +} + static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, REFIID riid, IUnknown *punk) { BindStatusCallback *This = BINDSC_THIS(iface); + task_header_t *task; IOleObject *oleobj; HRESULT hres; @@ -302,7 +308,8 @@ static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback * /* FIXME: Call SetAdvise */ /* FIXME: Call Invoke(DISPID_READYSTATE) */ - PostMessageW(This->doc_host->hwnd, WB_WM_NAVIGATE2, 0, 0); + task = heap_alloc(sizeof(*task)); + push_dochost_task(This->doc_host, task, object_available_proc, FALSE); return S_OK; } diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index f07460f..8d05b77 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -61,6 +61,8 @@ static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, L switch(msg) { case WM_SIZE: return resize_window(This, LOWORD(lParam), HIWORD(lParam)); + case WM_DOCHOSTTASK: + return process_dochost_task(&This->doc_host, lParam); } return DefWindowProcW(hwnd, msg, wParam, lParam); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 5b9ed46..bc4c2a1 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -51,6 +51,7 @@ extern HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, */ typedef struct ConnectionPoint ConnectionPoint; +typedef struct DocHost DocHost; typedef struct { const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; @@ -62,7 +63,15 @@ typedef struct { IUnknown *impl; } ConnectionPointContainer; -typedef struct { +struct _task_header_t; + +typedef void (*task_proc_t)(DocHost*, struct _task_header_t*); + +typedef struct _task_header_t { + task_proc_t proc; +} task_header_t; + +struct DocHost { const IOleClientSiteVtbl *lpOleClientSiteVtbl; const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; const IDocHostUIHandler2Vtbl *lpDocHostUIHandlerVtbl; @@ -92,7 +101,7 @@ typedef struct { VARIANT_BOOL offline; ConnectionPointContainer cps; -} DocHost; +}; struct WebBrowser { /* Interfaces available via WebBrowser object */ @@ -198,17 +207,20 @@ HRESULT WebBrowserV2_Create(IUnknown*,REFIID,void**); void create_doc_view_hwnd(DocHost*); void deactivate_document(DocHost*); +void object_available(DocHost*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*); HRESULT go_home(DocHost*); +#define WM_DOCHOSTTASK (WM_USER+0x300) +void push_dochost_task(DocHost*,task_header_t*,task_proc_t,BOOL); +LRESULT process_dochost_task(DocHost*,LPARAM); + HRESULT InternetExplorer_Create(IUnknown*,REFIID,void**); void InternetExplorer_WebBrowser_Init(InternetExplorer*); HRESULT CUrlHistory_Create(IUnknown*,REFIID,void**); -#define WB_WM_NAVIGATE2 (WM_USER+100) - #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) /**********************************************************************

1 0