Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[cwittich] 45927: [HLINK_WINETEST] sync hlink_winetest to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 13:27:21 2010 New Revision: 45927 URL: http://svn.reactos.org/svn/reactos?rev=45927&view=rev Log: [HLINK_WINETEST] sync hlink_winetest to wine 1.1.40 Modified: trunk/rostests/winetests/hlink/hlink.c Modified: trunk/rostests/winetests/hlink/hlink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/hlink.c?r… ============================================================================== --- trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] Sat Mar 6 13:27:21 2010 @@ -134,6 +134,13 @@ r = IHlink_GetStringReference(lnk, -1, &str, NULL); ok(r == S_OK, "failed\n"); CoTaskMemFree(str); + + r = IHlink_GetStringReference(lnk, -1, NULL, NULL); + ok(r == S_OK, "failed, r=%08x\n", r); + + r = IHlink_GetStringReference(lnk, -1, NULL, &str); + ok(r == S_OK, "failed, r=%08x\n", r); + ok(str == NULL, "string should be null\n"); r = IHlink_GetStringReference(lnk, HLINKGETREF_DEFAULT, &str, NULL); ok(r == S_OK, "failed\n"); @@ -1212,6 +1219,18 @@ CoTaskMemFree(fnd_tgt); CoTaskMemFree(fnd_loc); + hres = IHlink_GetStringReference(link, -1, &fnd_tgt, NULL); + todo_wine ok(hres == E_FAIL, "IHlink_GetStringReference should have failed " + "with E_FAIL (0x%08x), instead: 0x%08x\n", E_FAIL, hres); + CoTaskMemFree(fnd_tgt); + + hres = IHlink_GetStringReference(link, -1, NULL, NULL); + ok(hres == S_OK, "failed, hres=%08x\n", hres); + + hres = IHlink_GetStringReference(link, -1, NULL, &fnd_loc); + ok(hres == S_OK, "failed, hres=%08x\n", hres); + CoTaskMemFree(fnd_loc); + hres = IHlink_GetStringReference(link, -1, &fnd_tgt, &fnd_loc); todo_wine ok(hres == E_FAIL, "IHlink_GetStringReference should have failed " "with E_FAIL (0x%08x), instead: 0x%08x\n", E_FAIL, hres);

1 0

[cwittich] 45926: [CABINET_WINETEST] sync cabinet_winetest to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 13:26:31 2010 New Revision: 45926 URL: http://svn.reactos.org/svn/reactos?rev=45926&view=rev Log: [CABINET_WINETEST] sync cabinet_winetest to wine 1.1.40 Modified: trunk/rostests/winetests/cabinet/extract.c Modified: trunk/rostests/winetests/cabinet/extract.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/extract… ============================================================================== --- trunk/rostests/winetests/cabinet/extract.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/extract.c [iso-8859-1] Sat Mar 6 13:26:31 2010 @@ -670,6 +670,7 @@ lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; res = pExtract(&session, "extract.cab"); + node = session.FileList; todo_wine { ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, @@ -694,8 +695,8 @@ todo_wine { ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); } - ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "a.txt", TRUE), "list entry wrong\n");

1 0

[cwittich] 45925: [AMSTREAM] sync amstream to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 13:23:59 2010 New Revision: 45925 URL: http://svn.reactos.org/svn/reactos?rev=45925&view=rev Log: [AMSTREAM] sync amstream to wine 1.1.40 Modified: trunk/reactos/dll/directx/amstream/amstream.c trunk/reactos/dll/directx/amstream/mediastream.c trunk/reactos/dll/directx/amstream/mediastreamfilter.c trunk/reactos/dll/directx/amstream/regsvr.c Modified: trunk/reactos/dll/directx/amstream/amstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/amstream/amstr… ============================================================================== --- trunk/reactos/dll/directx/amstream/amstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/amstream/amstream.c [iso-8859-1] Sat Mar 6 13:23:59 2010 @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { - IAMMultiMediaStream lpVtbl; + const IAMMultiMediaStreamVtbl *lpVtbl; LONG ref; IGraphBuilder* pFilterGraph; IPin* ipin; @@ -63,7 +63,7 @@ return E_OUTOFMEMORY; } - object->lpVtbl.lpVtbl = &AM_Vtbl; + object->lpVtbl = &AM_Vtbl; object->ref = 1; *ppObj = object; @@ -129,7 +129,7 @@ MSPID PurposeId; unsigned int i; - TRACE("(%p/%p)->(%p,%p)\n", This, iface, idPurpose, ppMediaStream); + TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_guid(idPurpose), ppMediaStream); for (i = 0; i < This->nbStreams; i++) { @@ -214,7 +214,7 @@ IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; HRESULT hr = S_OK; - FIXME("(%p/%p)->(%x,%x,%p) partial stub!\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); + TRACE("(%p/%p)->(%x,%x,%p)\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); if (pFilterGraph) { @@ -238,9 +238,17 @@ { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppGraphBuilder); - - return E_NOTIMPL; + TRACE("(%p/%p)->(%p)\n", This, iface, ppGraphBuilder); + + if (!ppGraphBuilder) + return E_POINTER; + + if (This->pFilterGraph) + return IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)ppGraphBuilder); + else + *ppGraphBuilder = NULL; + + return S_OK; } static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* iface, IMediaStreamFilter** ppFilter) @@ -260,7 +268,7 @@ IMediaStream* pStream; IMediaStream** pNewStreams; - FIXME("(%p/%p)->(%p,%p,%x,%p) partial stub!\n", This, iface, pStreamObject, PurposeId, dwFlags, ppNewStream); + FIXME("(%p/%p)->(%p,%s,%x,%p) partial stub!\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream); if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) hr = DirectDrawMediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); @@ -339,6 +347,14 @@ { IEnumPins_Release(EnumPins); goto end; + } + + /* If Initialize was not called before, we do it here */ + if (!This->pFilterGraph) + { + ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); + if (FAILED(ret)) + goto end; } ret = IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)&This->GraphBuilder); Modified: trunk/reactos/dll/directx/amstream/mediastream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/amstream/media… ============================================================================== --- trunk/reactos/dll/directx/amstream/mediastream.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/amstream/mediastream.c [iso-8859-1] Sat Mar 6 13:23:59 2010 @@ -29,13 +29,14 @@ #include "wingdi.h" #include "amstream_private.h" +#include "amstream.h" + #include "ddstream.h" -#include "amstream.h" WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { - IMediaStream lpVtbl; + const IMediaStreamVtbl *lpVtbl; LONG ref; IMultiMediaStream* Parent; MSPID PurposeId; @@ -43,7 +44,7 @@ } IMediaStreamImpl; typedef struct { - IDirectDrawMediaStream lpVtbl; + const IDirectDrawMediaStreamVtbl *lpVtbl; LONG ref; IMultiMediaStream* Parent; MSPID PurposeId; @@ -57,7 +58,7 @@ { IMediaStreamImpl* object; - TRACE("(%p,%p,%p)\n", Parent, pPurposeId, ppMediaStream); + TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl)); if (!object) @@ -66,7 +67,7 @@ return E_OUTOFMEMORY; } - object->lpVtbl.lpVtbl = &MediaStream_Vtbl; + object->lpVtbl = &MediaStream_Vtbl; object->ref = 1; object->Parent = Parent; @@ -197,7 +198,7 @@ { IDirectDrawMediaStreamImpl* object; - TRACE("(%p,%p,%p)\n", Parent, pPurposeId, ppMediaStream); + TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl)); if (!object) @@ -206,7 +207,7 @@ return E_OUTOFMEMORY; } - object->lpVtbl.lpVtbl = &DirectDrawMediaStream_Vtbl; + object->lpVtbl = &DirectDrawMediaStream_Vtbl; object->ref = 1; object->Parent = Parent; Modified: trunk/reactos/dll/directx/amstream/mediastreamfilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/amstream/media… ============================================================================== --- trunk/reactos/dll/directx/amstream/mediastreamfilter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/amstream/mediastreamfilter.c [iso-8859-1] Sat Mar 6 13:23:59 2010 @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { - IMediaStreamFilter lpVtbl; + const IMediaStreamFilterVtbl *lpVtbl; LONG ref; CRITICAL_SECTION csFilter; FILTER_STATE state; @@ -63,7 +63,7 @@ return E_OUTOFMEMORY; } - object->lpVtbl.lpVtbl = &MediaStreamFilter_Vtbl; + object->lpVtbl = &MediaStreamFilter_Vtbl; object->ref = 1; *ppObj = object; @@ -120,7 +120,7 @@ if (!refCount) { - This->lpVtbl.lpVtbl = NULL; + This->lpVtbl = NULL; HeapFree(GetProcessHeap(), 0, This); } Modified: trunk/reactos/dll/directx/amstream/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/amstream/regsv… ============================================================================== --- trunk/reactos/dll/directx/amstream/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/amstream/regsvr.c [iso-8859-1] Sat Mar 6 13:23:59 2010 @@ -456,6 +456,13 @@ "Both" }, + { &CLSID_MediaStreamFilter, + "SFilter Class", + NULL, + "amstream.dll", + "Both" + }, + { NULL } /* list terminator */ };

1 0

[cwittich] 45924: [GDIPLUS] sync gdiplus to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 13:15:38 2010 New Revision: 45924 URL: http://svn.reactos.org/svn/reactos?rev=45924&view=rev Log: [GDIPLUS] sync gdiplus to wine 1.1.40 Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/imageattributes.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/include/psdk/gdipluscolormatrix.h Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sat Mar 6 13:15:38 2010 @@ -290,7 +290,7 @@ @ stdcall GdipGetImageGraphicsContext(ptr ptr) @ stdcall GdipGetImageHeight(ptr ptr) @ stdcall GdipGetImageHorizontalResolution(ptr ptr) -@ stub GdipGetImageItemData +@ stdcall GdipGetImageItemData(ptr ptr) @ stdcall GdipGetImagePalette(ptr ptr long) @ stdcall GdipGetImagePaletteSize(ptr ptr) @ stdcall GdipGetImagePixelFormat(ptr ptr) @@ -381,7 +381,7 @@ @ stdcall GdipGetRegionDataSize(ptr ptr) @ stdcall GdipGetRegionHRgn(ptr ptr ptr) @ stub GdipGetRegionScans -@ stub GdipGetRegionScansCount +@ stdcall GdipGetRegionScansCount(ptr ptr ptr) @ stub GdipGetRegionScansI @ stub GdipGetRenderingOrigin @ stdcall GdipGetSmoothingMode(ptr ptr) Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Sat Mar 6 13:15:38 2010 @@ -264,10 +264,17 @@ ColorMatrix graymatrix; }; +struct color_remap_table{ + BOOL enabled; + INT mapsize; + GDIPCONST ColorMap *colormap; +}; + struct GpImageAttributes{ WrapMode wrap; struct color_key colorkeys[ColorAdjustTypeCount]; struct color_matrix colormatrices[ColorAdjustTypeCount]; + struct color_remap_table colorremaptables[ColorAdjustTypeCount]; BOOL gamma_enabled[ColorAdjustTypeCount]; REAL gamma[ColorAdjustTypeCount]; }; Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sat Mar 6 13:15:38 2010 @@ -3173,9 +3173,10 @@ return Ok; } +/* FIXME: Need to handle color depths less than 24bpp */ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) { - FIXME("(%p, %p): stub\n", graphics, argb); + FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); if(!graphics || !argb) return InvalidParameter; @@ -3183,7 +3184,7 @@ if(graphics->busy) return ObjectBusy; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics *graphics, REAL *scale) Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sat Mar 6 13:15:38 2010 @@ -1614,7 +1614,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, PixelFormat format, BYTE* scan0, GpBitmap** bitmap) { - BITMAPINFOHEADER bmih; + BITMAPINFO* pbmi; HBITMAP hbitmap; INT row_size, dib_stride; HDC hdc; @@ -1644,26 +1644,33 @@ if(stride == 0) stride = dib_stride; - bmih.biSize = sizeof(BITMAPINFOHEADER); - bmih.biWidth = width; - bmih.biHeight = -height; - bmih.biPlanes = 1; + pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + if (!pbmi) + return OutOfMemory; + + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = width; + pbmi->bmiHeader.biHeight = -height; + pbmi->bmiHeader.biPlanes = 1; /* FIXME: use the rest of the data from format */ - bmih.biBitCount = PIXELFORMATBPP(format); - bmih.biCompression = BI_RGB; - bmih.biSizeImage = 0; - bmih.biXPelsPerMeter = 0; - bmih.biYPelsPerMeter = 0; - bmih.biClrUsed = 0; - bmih.biClrImportant = 0; + pbmi->bmiHeader.biBitCount = PIXELFORMATBPP(format); + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 0; + pbmi->bmiHeader.biYPelsPerMeter = 0; + pbmi->bmiHeader.biClrUsed = 0; + pbmi->bmiHeader.biClrImportant = 0; hdc = CreateCompatibleDC(NULL); - if (!hdc) return GenericError; - - hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, (void**)&bits, - NULL, 0); + if (!hdc) { + GdipFree(pbmi); + return GenericError; + } + + hbitmap = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); DeleteDC(hdc); + GdipFree(pbmi); if (!hbitmap) return GenericError; @@ -1837,6 +1844,7 @@ { GdipFree(((GpBitmap*)image)->bitmapbits); DeleteDC(((GpBitmap*)image)->hdc); + DeleteObject(((GpBitmap*)image)->hbitmap); } GdipFree(image->palette_entries); GdipFree(image); @@ -1852,6 +1860,18 @@ if(!image || !item) return InvalidParameter; + + if (!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetImageItemData(GpImage *image, ImageItemData *item) +{ + static int calls; + + TRACE("(%p,%p)\n", image, item); if (!(calls++)) FIXME("not implemented\n"); Modified: trunk/reactos/dll/win32/gdiplus/imageattributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/imageatt… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/imageattributes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/imageattributes.c [iso-8859-1] Sat Mar 6 13:15:38 2010 @@ -204,14 +204,23 @@ ColorAdjustType type, BOOL enableFlag, UINT mapSize, GDIPCONST ColorMap *map) { - static int calls; - TRACE("(%p,%u,%i,%u,%p)\n", imageAttr, type, enableFlag, mapSize, map); - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + if(!imageAttr || type >= ColorAdjustTypeCount) + return InvalidParameter; + + if (enableFlag) + { + if(!map || !mapSize) + return InvalidParameter; + + imageAttr->colorremaptables[type].mapsize = mapSize; + imageAttr->colorremaptables[type].colormap = map; + } + + imageAttr->colorremaptables[type].enabled = enableFlag; + + return Ok; } GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes *imageAttr, Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Sat Mar 6 13:15:38 2010 @@ -1306,3 +1306,15 @@ return GdipTranslateRegion(region, (REAL)dx, (REAL)dy); } + +GpStatus WINGDIPAPI GdipGetRegionScansCount(GpRegion *region, UINT *count, GpMatrix *matrix) +{ + static int calls; + + TRACE("(%p, %p, %p)\n", region, count, matrix); + + if (!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} Modified: trunk/reactos/include/psdk/gdipluscolormatrix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdipluscolorm… ============================================================================== --- trunk/reactos/include/psdk/gdipluscolormatrix.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdipluscolormatrix.h [iso-8859-1] Sat Mar 6 13:15:38 2010 @@ -45,7 +45,7 @@ struct ColorMap { Color oldColor; - Color newCOlor; + Color newColor; }; #ifndef __cplusplus

1 0

[cwittich] 45923: [SHLWAPI] sync shlwapi to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 13:08:51 2010 New Revision: 45923 URL: http://svn.reactos.org/svn/reactos?rev=45923&view=rev Log: [SHLWAPI] sync shlwapi to wine 1.1.40 Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/include/psdk/shlwapi.h Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Sat Mar 6 13:08:51 2010 @@ -1082,23 +1082,25 @@ * PARAMS * hWnd [I] Window to get value from * offset [I] Offset of value - * wMask [I] Mask for uiFlags - * wFlags [I] Bits to set in window value + * mask [I] Mask for flags + * flags [I] Bits to set in window value * * RETURNS * The new value as it was set, or 0 if any parameter is invalid. * * NOTES - * Any bits set in uiMask are cleared from the value, then any bits set in - * uiFlags are set in the value. - */ -LONG WINAPI SHSetWindowBits(HWND hwnd, INT offset, UINT wMask, UINT wFlags) -{ - LONG ret = GetWindowLongA(hwnd, offset); - LONG newFlags = (wFlags & wMask) | (ret & ~wFlags); - - if (newFlags != ret) - ret = SetWindowLongA(hwnd, offset, newFlags); + * Only bits specified in mask are affected - set if present in flags and + * reset otherwise. + */ +LONG WINAPI SHSetWindowBits(HWND hwnd, INT offset, UINT mask, UINT flags) +{ + LONG ret = GetWindowLongW(hwnd, offset); + LONG new_flags = (flags & mask) | (ret & ~mask); + + TRACE("%p %d %x %x\n", hwnd, offset, mask, flags); + + if (new_flags != ret) + ret = SetWindowLongW(hwnd, offset, new_flags); return ret; } @@ -4659,7 +4661,7 @@ * fileTime [I] Pointer to FILETIME structure specifying the time * flags [I] Flags specifying the desired output * buf [O] Pointer to buffer for output - * bufSize [I] Number of characters that can be contained in buffer + * size [I] Number of characters that can be contained in buffer * * RETURNS * success: number of characters written to the buffer @@ -4667,10 +4669,65 @@ * */ INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, - LPWSTR buf, UINT bufSize) -{ - FIXME("%p %p %s %d STUB\n", fileTime, flags, debugstr_w(buf), bufSize); - return 0; + LPWSTR buf, UINT size) +{ +#define SHFORMATDT_UNSUPPORTED_FLAGS (FDTF_RELATIVE | FDTF_LTRDATE | FDTF_RTLDATE | FDTF_NOAUTOREADINGORDER) + DWORD fmt_flags = flags ? *flags : FDTF_DEFAULT; + SYSTEMTIME st; + FILETIME ft; + INT ret = 0; + + TRACE("%p %p %p %u\n", fileTime, flags, buf, size); + + if (!buf || !size) + return 0; + + if (fmt_flags & SHFORMATDT_UNSUPPORTED_FLAGS) + FIXME("ignoring some flags - 0x%08x\n", fmt_flags & SHFORMATDT_UNSUPPORTED_FLAGS); + + FileTimeToLocalFileTime(fileTime, &ft); + FileTimeToSystemTime(&ft, &st); + + /* first of all date */ + if (fmt_flags & (FDTF_LONGDATE | FDTF_SHORTDATE)) + { + static const WCHAR sep1[] = {',',' ',0}; + static const WCHAR sep2[] = {' ',0}; + + DWORD date = fmt_flags & FDTF_LONGDATE ? DATE_LONGDATE : DATE_SHORTDATE; + ret = GetDateFormatW(LOCALE_USER_DEFAULT, date, &st, NULL, buf, size); + if (ret >= size) return ret; + + /* add separator */ + if (ret < size && (fmt_flags & (FDTF_LONGTIME | FDTF_SHORTTIME))) + { + if ((fmt_flags & FDTF_LONGDATE) && (ret < size + 2)) + { + if (ret < size + 2) + { + lstrcatW(&buf[ret-1], sep1); + ret += 2; + } + } + else + { + lstrcatW(&buf[ret-1], sep2); + ret++; + } + } + } + /* time part */ + if (fmt_flags & (FDTF_LONGTIME | FDTF_SHORTTIME)) + { + DWORD time = fmt_flags & FDTF_LONGTIME ? 0 : TIME_NOSECONDS; + + if (ret) ret--; + ret += GetTimeFormatW(LOCALE_USER_DEFAULT, time, &st, NULL, &buf[ret], size - ret); + } + + return ret; + +#undef SHFORMATDT_UNSUPPORTED_FLAGS } /*********************************************************************** @@ -4680,21 +4737,19 @@ * */ INT WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *fileTime, DWORD *flags, - LPCSTR buf, UINT bufSize) + LPSTR buf, UINT size) { WCHAR *bufW; - DWORD buflenW, convlen; INT retval; - if (!buf || !bufSize) + if (!buf || !size) return 0; - buflenW = bufSize; - bufW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * buflenW); - retval = SHFormatDateTimeW(fileTime, flags, bufW, buflenW); + bufW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * size); + retval = SHFormatDateTimeW(fileTime, flags, bufW, size); if (retval != 0) - convlen = WideCharToMultiByte(CP_ACP, 0, bufW, -1, (LPSTR) buf, bufSize, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, size, NULL, NULL); HeapFree(GetProcessHeap(), 0, bufW); return retval; Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Sat Mar 6 13:08:51 2010 @@ -630,6 +630,8 @@ process_case = 1; } else do { + BOOL manual_search = FALSE; + /* mk is a special case */ if(base.nScheme == URL_SCHEME_MK) { static const WCHAR wsz[] = {':',':',0}; @@ -659,13 +661,45 @@ } } - /* Change .sizep2 to not have the last leaf in it, - * Note: we need to start after the location (if it exists) - */ - work = strrchrW((base.pszSuffix+sizeloc), '/'); - if (work) { - len = (DWORD)(work - base.pszSuffix + 1); - base.cchSuffix = len; + /* If there is a '#' and the characters immediately preceeding it are + * ".htm[l]", then begin looking for the last leaf starting from + * the '#'. Otherwise the '#' is not meaningful and just start + * looking from the end. */ + if ((work = strchrW(base.pszSuffix + sizeloc, '#'))) { + const WCHAR htmlW[] = {'.','h','t','m','l',0}; + const int len_htmlW = 5; + const WCHAR htmW[] = {'.','h','t','m',0}; + const int len_htmW = 4; + + if (work - base.pszSuffix > len_htmW * sizeof(WCHAR)) { + work -= len_htmW; + if (strncmpiW(work, htmW, len_htmW) == 0) + manual_search = TRUE; + work += len_htmW; + } + + if (!manual_search && + work - base.pszSuffix > len_htmlW * sizeof(WCHAR)) { + work -= len_htmlW; + if (strncmpiW(work, htmlW, len_htmlW) == 0) + manual_search = TRUE; + work += len_htmlW; + } + } + + if (manual_search) { + /* search backwards starting from the current position */ + while (*work != '/' && work > base.pszSuffix + sizeloc) + --work; + if (work > base.pszSuffix + sizeloc) + base.cchSuffix = work - base.pszSuffix + 1; + }else { + /* search backwards starting from the end of the string */ + work = strrchrW((base.pszSuffix+sizeloc), '/'); + if (work) { + len = (DWORD)(work - base.pszSuffix + 1); + base.cchSuffix = len; + } } /* Modified: trunk/reactos/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] Sat Mar 6 13:08:51 2010 @@ -1092,6 +1092,17 @@ #define TPS_EXECUTEIO 0x00000001 #define TPS_LONGEXECTIME 0x00000008 +/* SHFormatDateTimeA/SHFormatDateTimeW flags */ +#define FDTF_SHORTTIME 0x00000001 +#define FDTF_SHORTDATE 0x00000002 +#define FDTF_DEFAULT (FDTF_SHORTDATE | FDTF_SHORTTIME) +#define FDTF_LONGDATE 0x00000004 +#define FDTF_LONGTIME 0x00000008 +#define FDTF_RELATIVE 0x00000010 +#define FDTF_LTRDATE 0x00000100 +#define FDTF_RTLDATE 0x00000200 +#define FDTF_NOAUTOREADINGORDER 0x00000400 + #include <poppack.h> #ifdef __cplusplus

1 0

[cwittich] 45922: [ACTXPRXY] partially sync actxprxy to wine 1.1.40 (shlobjidl.idl needs fixing!!!)
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 13:05:00 2010 New Revision: 45922 URL: http://svn.reactos.org/svn/reactos?rev=45922&view=rev Log: [ACTXPRXY] partially sync actxprxy to wine 1.1.40 (shlobjidl.idl needs fixing!!!) Added: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl (with props) Modified: trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild trunk/reactos/dll/win32/actxprxy/usrmarshal.c Modified: trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] Sat Mar 6 13:05:00 2010 @@ -9,20 +9,29 @@ <include base="actxprxy" root="intermediate">.</include> <define name="__WINESRC__" /> <library>wine</library> - <library>actxprxy_interface</library> <library>actxprxy_proxy</library> <library>ntdll</library> <library>rpcrt4</library> + <library>ole32</library> + <library>oleaut32</library> + <library>uuid</library> <library>pseh</library> <file>usrmarshal.c</file> -</module> -<module name="actxprxy_interface" type="idlinterface"> - <file>actxprxy_servprov.idl</file> </module> <module name="actxprxy_proxy" type="rpcproxy"> <define name="__WINESRC__" /> <define name="REGISTER_PROXY_DLL" /> - <define name="PROXY_CLSID_IS">"{ 0xb8da6310, 0xe19b, 0x11d0, { 0x93, 0x3c, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9 } }"</define> + <define name="PROXY_DELEGATION" /> + <file>actxprxy_activscp.idl</file> + <file>actxprxy_comcat.idl</file> + <file>actxprxy_docobj.idl</file> + <file>actxprxy_hlink.idl</file> + <file>actxprxy_htiframe.idl</file> + <file>actxprxy_objsafe.idl</file> + <file>actxprxy_ocmm.idl</file> <file>actxprxy_servprov.idl</file> +  + <file>actxprxy_urlhist.idl +</file> </module> </group> Added: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] Sat Mar 6 13:05:00 2010 @@ -1,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for activscp.idl */ + +#include "activscp.idl" Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] Sat Mar 6 13:05:00 2010 @@ -1,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for comcat.idl */ + +#include "comcat.idl" Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] Sat Mar 6 13:05:00 2010 @@ -1,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for docobj.idl */ + +#include "docobj.idl" Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] Sat Mar 6 13:05:00 2010 @@ -1,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for hlink.idl */ + +#include "hlink.idl" Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] Sat Mar 6 13:05:00 2010 @@ -1,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for htiframe.idl */ + +#include "htiframe.idl" Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] Sat Mar 6 13:05:00 2010 @@ -1,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for objsafe.idl */ + +#include "objsafe.idl" Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] Sat Mar 6 13:05:00 2010 @@ -1,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for ocmm.idl */ + +#include "ocmm.idl" Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] Sat Mar 6 13:05:00 2010 @@ -1,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for shobjidl.idl */ + +#include "shobjidl.idl" Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] Sat Mar 6 13:05:00 2010 @@ -1,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for urlhist.idl */ + +#include "urlhist.idl" Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/usrmars… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/usrmarshal.c [iso-8859-1] Sat Mar 6 13:05:00 2010 @@ -32,6 +32,8 @@ #include "winerror.h" #include "objbase.h" #include "servprov.h" +#include "comcat.h" +#include "docobj.h" #include "wine/debug.h" @@ -62,3 +64,107 @@ return IServiceProvider_QueryService(This, guidService, riid, (void **)ppvObject); } + +HRESULT CALLBACK ICatInformation_EnumClassesOfCategories_Proxy( + ICatInformation *This, + ULONG cImplemented, + CATID rgcatidImpl[], + ULONG cRequired, + CATID rgcatidReq[], + IEnumCLSID** ppenumClsid ) +{ + TRACE("(%p)\n", This); + return ICatInformation_RemoteEnumClassesOfCategories_Proxy( This, cImplemented, rgcatidImpl, + cRequired, rgcatidReq, ppenumClsid ); +} + +HRESULT __RPC_STUB ICatInformation_EnumClassesOfCategories_Stub( + ICatInformation *This, + ULONG cImplemented, + CATID rgcatidImpl[], + ULONG cRequired, + CATID rgcatidReq[], + IEnumCLSID** ppenumClsid ) +{ + TRACE("(%p)\n", This); + return ICatInformation_EnumClassesOfCategories( This, cImplemented, rgcatidImpl, + cRequired, rgcatidReq, ppenumClsid ); +} + +HRESULT CALLBACK ICatInformation_IsClassOfCategories_Proxy( + ICatInformation *This, + REFCLSID rclsid, + ULONG cImplemented, + CATID rgcatidImpl[], + ULONG cRequired, + CATID rgcatidReq[] ) +{ + TRACE("(%p)\n", This); + return ICatInformation_RemoteIsClassOfCategories_Proxy( This, rclsid, cImplemented, rgcatidImpl, + cRequired, rgcatidReq ); +} + +HRESULT __RPC_STUB ICatInformation_IsClassOfCategories_Stub( + ICatInformation *This, + REFCLSID rclsid, + ULONG cImplemented, + CATID rgcatidImpl[], + ULONG cRequired, + CATID rgcatidReq[] ) +{ + TRACE("(%p)\n", This); + return ICatInformation_IsClassOfCategories( This, rclsid, cImplemented, rgcatidImpl, + cRequired, rgcatidReq ); +} + +HRESULT CALLBACK IPrint_Print_Proxy( + IPrint *This, + DWORD grfFlags, + DVTARGETDEVICE **pptd, + PAGESET **ppPageSet, + STGMEDIUM *pstgmOptions, + IContinueCallback *pcallback, + LONG nFirstPage, + LONG *pcPagesPrinted, + LONG *pnLastPage ) +{ + TRACE("(%p)\n", This); + return IPrint_RemotePrint_Proxy( This, grfFlags, pptd, ppPageSet, (RemSTGMEDIUM *)pstgmOptions, + pcallback, nFirstPage, pcPagesPrinted, pnLastPage ); +} + +HRESULT __RPC_STUB IPrint_Print_Stub( + IPrint *This, + DWORD grfFlags, + DVTARGETDEVICE **pptd, + PAGESET **ppPageSet, + RemSTGMEDIUM *pstgmOptions, + IContinueCallback *pcallback, + LONG nFirstPage, + LONG *pcPagesPrinted, + LONG *pnLastPage ) +{ + TRACE("(%p)\n", This); + return IPrint_Print( This, grfFlags, pptd, ppPageSet, (STGMEDIUM *)pstgmOptions, + pcallback, nFirstPage, pcPagesPrinted, pnLastPage ); +} + +HRESULT CALLBACK IEnumOleDocumentViews_Next_Proxy( + IEnumOleDocumentViews *This, + ULONG cViews, + IOleDocumentView **rgpView, + ULONG *pcFetched ) +{ + TRACE("(%p)\n", This); + return IEnumOleDocumentViews_RemoteNext_Proxy( This, cViews, rgpView, pcFetched ); +} + +HRESULT __RPC_STUB IEnumOleDocumentViews_Next_Stub( + IEnumOleDocumentViews *This, + ULONG cViews, + IOleDocumentView **rgpView, + ULONG *pcFetched ) +{ + TRACE("(%p)\n", This); + return IEnumOleDocumentViews_Next( This, cViews, rgpView, pcFetched ); +}

1 0

[cwittich] 45921: [PSTOREC] sync pstorec to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 12:53:27 2010 New Revision: 45921 URL: http://svn.reactos.org/svn/reactos?rev=45921&view=rev Log: [PSTOREC] sync pstorec to wine 1.1.40 Added: trunk/reactos/dll/win32/pstorec/pstorec_tlb.idl (with props) trunk/reactos/dll/win32/pstorec/rsrc.rc (with props) Modified: trunk/reactos/dll/win32/pstorec/pstorec.c trunk/reactos/dll/win32/pstorec/pstorec.rbuild trunk/reactos/include/psdk/pstore.idl Modified: trunk/reactos/dll/win32/pstorec/pstorec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] Sat Mar 6 12:53:27 2010 @@ -388,6 +388,5 @@ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); return S_OK; } Modified: trunk/reactos/dll/win32/pstorec/pstorec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.rbuild [iso-8859-1] Sat Mar 6 12:53:27 2010 @@ -1,8 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="pstorec_tlb" type="embeddedtypelib"> + <dependency>stdole2</dependency> + <file>pstorec_tlb.idl</file> +</module> <module name="pstorec" type="win32dll" baseaddress="${BASEADDRESS_PSTOREC}" installbase="system32" installname="pstorec.dll"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="pstorec.spec" /> - <include base="pstorec">.</include> + <include base="pstorec" root="intermediate">.</include> + <dependency>pstorec_tlb</dependency> <library>wine</library> <library>uuid</library> <file>pstorec.c</file> + <file>rsrc.rc</file> </module> +</group> Added: trunk/reactos/dll/win32/pstorec/pstorec_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec_… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec_tlb.idl (added) +++ trunk/reactos/dll/win32/pstorec/pstorec_tlb.idl [iso-8859-1] Sat Mar 6 12:53:27 2010 @@ -1,0 +1,21 @@ +/* + * Typelib for pstorec + * + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "pstore.idl" Propchange: trunk/reactos/dll/win32/pstorec/pstorec_tlb.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/pstorec/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/pstorec/rsrc.rc (added) +++ trunk/reactos/dll/win32/pstorec/rsrc.rc [iso-8859-1] Sat Mar 6 12:53:27 2010 @@ -1,0 +1,29 @@ +/* + * Resource file for pstorec + * + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: pstorec_tlb.tlb */ +1 TYPELIB LOADONCALL DISCARDABLE pstorec_tlb.tlb Propchange: trunk/reactos/dll/win32/pstorec/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/pstore.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pstore.idl?re… ============================================================================== --- trunk/reactos/include/psdk/pstore.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pstore.idl [iso-8859-1] Sat Mar 6 12:53:27 2010 @@ -34,6 +34,18 @@ typedef DWORD PST_PROVIDERCAPABILITIES; typedef GUID PST_PROVIDERID, *PPST_PROVIDERID; +/***************************************************************************** + * PSTOREC library + */ +[ + uuid(5a6f1ebd-2db1-11d0-8c39-00c04fd9126b), + version(1.0), + helpstring("PStore 1.0 Type Library") +] +library PSTORECLib +{ + importlib("stdole2.tlb"); + typedef struct _PST_PROVIDERINFO { DWORD cbSize; @@ -50,27 +62,27 @@ LPCWSTR szPrompt; } PST_PROMPTINFO, *PPST_PROMPTINFO; -typedef struct { +typedef struct _PST_ACCESSCLAUSE { DWORD cbSize; PST_ACCESSCLAUSETYPE ClauseType; DWORD cbClauseData; BYTE* pbClauseData; } PST_ACCESSCLAUSE, *PPST_ACCESSCLAUSE; -typedef struct { +typedef struct _PST_ACCESSRULE { DWORD cbSize; PST_ACCESSMODE AccessModeFlags; DWORD cClauses; PST_ACCESSCLAUSE* rgClauses; } PST_ACCESSRULE, *PPST_ACCESSRULE; -typedef struct { +typedef struct _PST_ACCESSRULESET { DWORD cbSize; DWORD cClause; PST_ACCESSRULE* rgRules; } PST_ACCESSRULESET, *PPST_ACCESSRULESET; -typedef struct { +typedef struct _PST_TYPEINFO { DWORD cbSize; LPWSTR szDisplayName; } PST_TYPEINFO, *PPST_TYPEINFO; @@ -259,3 +271,5 @@ [in] DWORD dwFlags, [in] IEnumPStoreItems** ppenum ); } + +};

1 0

[cwittich] 45920: [SHDOCVW] sync shdocvw to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 12:44:48 2010 New Revision: 45920 URL: http://svn.reactos.org/svn/reactos?rev=45920&view=rev Log: [SHDOCVW] sync shdocvw to wine 1.1.40 Modified: trunk/reactos/dll/win32/shdocvw/client.c trunk/reactos/dll/win32/shdocvw/taskbarlist.c Modified: trunk/reactos/dll/win32/shdocvw/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/client.c… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/client.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/client.c [iso-8859-1] Sat Mar 6 12:44:48 2010 @@ -73,7 +73,7 @@ return S_OK; } - WARN("Unsupported intrface %s\n", debugstr_guid(riid)); + WARN("Unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } Modified: trunk/reactos/dll/win32/shdocvw/taskbarlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/taskbarl… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/taskbarlist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/taskbarlist.c [iso-8859-1] Sat Mar 6 12:44:48 2010 @@ -81,9 +81,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_HrInit(ITaskbarList *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList *iface, HWND hwnd)

1 0

[cwittich] 45919: [MSHTML_WINETEST] sync mshtml_winetest to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 12:43:08 2010 New Revision: 45919 URL: http://svn.reactos.org/svn/reactos?rev=45919&view=rev Log: [MSHTML_WINETEST] sync mshtml_winetest to wine 1.1.40 Modified: trunk/rostests/winetests/mshtml/dom.c trunk/rostests/winetests/mshtml/events.c trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/htmllocation.c trunk/rostests/winetests/mshtml/script.c Modified: trunk/rostests/winetests/mshtml/dom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/dom.c?re… ============================================================================== --- trunk/rostests/winetests/mshtml/dom.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/dom.c [iso-8859-1] Sat Mar 6 12:43:08 2010 @@ -99,7 +99,8 @@ ET_TR, ET_TD, ET_IFRAME, - ET_FORM + ET_FORM, + ET_FRAME } elem_type_t; static const IID * const none_iids[] = { @@ -310,7 +311,7 @@ NULL }; -static const IID * const iframe_iids[] = { +static const IID * const frame_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLDOMNode2, &IID_IHTMLElement, @@ -323,6 +324,20 @@ NULL }; +static const IID * const iframe_iids[] = { + &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, + &IID_IHTMLElement, + &IID_IHTMLElement2, + &IID_IHTMLElement3, + &IID_IHTMLFrameBase, + &IID_IHTMLFrameBase2, + &IID_IHTMLIFrameElement, + &IID_IDispatchEx, + &IID_IConnectionPointContainer, + NULL +}; + static const IID * const form_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLDOMNode2, @@ -389,7 +404,7 @@ {"A", anchor_iids, &DIID_DispHTMLAnchorElement}, {"INPUT", input_iids, &DIID_DispHTMLInputElement}, {"SELECT", select_iids, &DIID_DispHTMLSelectElement}, - {"TEXTAREA", textarea_iids, NULL}, + {"TEXTAREA", textarea_iids, &DIID_DispHTMLTextAreaElement}, {"OPTION", option_iids, &DIID_DispHTMLOptionElement}, {"STYLE", elem_iids, NULL}, {"BLOCKQUOTE",elem_iids, NULL}, @@ -397,7 +412,7 @@ {"BR", elem_iids, NULL}, {"TABLE", table_iids, &DIID_DispHTMLTable}, {"TBODY", elem_iids, NULL}, - {"SCRIPT", script_iids, NULL}, + {"SCRIPT", script_iids, &DIID_DispHTMLScriptElement}, {"TEST", elem_iids, &DIID_DispHTMLUnknownElement}, {"TEST", generic_iids, &DIID_DispHTMLGenericElement}, {"!", comment_iids, &DIID_DispHTMLCommentElement}, @@ -405,7 +420,8 @@ {"TR", tr_iids, &DIID_DispHTMLTableRow}, {"TD", td_iids, NULL}, {"IFRAME", iframe_iids, &DIID_DispHTMLIFrame}, - {"FORM", form_iids, &DIID_DispHTMLFormElement} + {"FORM", form_iids, &DIID_DispHTMLFormElement}, + {"FRAME", frame_iids, &DIID_DispHTMLFrameElement} }; static const char *dbgstr_guid(REFIID riid) @@ -666,6 +682,17 @@ hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMTextNode, (void**)&text); ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMTextNode: %08x\n", hres); return text; +} + +#define get_comment_iface(u) _get_comment_iface(__LINE__,u) +static IHTMLCommentElement *_get_comment_iface(unsigned line, IUnknown *unk) +{ + IHTMLCommentElement *comment; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLCommentElement, (void**)&comment); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLCommentElement: %08x\n", hres); + return comment; } #define test_node_name(u,n) _test_node_name(__LINE__,u,n) @@ -1086,6 +1113,22 @@ _test_option_value(line, option, value); } +#define test_comment_text(c,t) _test_comment_text(__LINE__,c,t) +static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) +{ + IHTMLCommentElement *comment = _get_comment_iface(__LINE__,unk); + BSTR text; + HRESULT hres; + + text = a2bstr(extext); + hres = IHTMLCommentElement_get_text(comment, &text); + ok_(__FILE__,line)(hres == S_OK, "get_text failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(text, extext), "text = \"%s\", expected \"%s\"\n", wine_dbgstr_w(text), extext); + + IHTMLCommentElement_Release(comment); + SysFreeString(text); +} + #define create_option_elem(d,t,v) _create_option_elem(__LINE__,d,t,v) static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *doc, const char *txt, const char *val) @@ -1129,8 +1172,8 @@ HRESULT hres; hres = IHTMLImgElement_get_width(img, &found); - todo_wine ok_(__FILE__,line) (hres == S_OK, "get_width failed: %08x\n", hres); - todo_wine ok_(__FILE__,line) (found == exp, "width=%d\n", found); + ok_(__FILE__,line) (hres == S_OK, "get_width failed: %08x\n", hres); + ok_(__FILE__,line) (found == exp, "width=%d\n", found); } #define test_img_put_width(o,w) _test_img_put_width(__LINE__,o,w) @@ -1139,7 +1182,7 @@ HRESULT hres; hres = IHTMLImgElement_put_width(img, width); - todo_wine ok(hres == S_OK, "put_width failed: %08x\n", hres); + ok(hres == S_OK, "put_width failed: %08x\n", hres); _test_img_width(line, img, width); } @@ -1151,8 +1194,8 @@ HRESULT hres; hres = IHTMLImgElement_get_height(img, &found); - todo_wine ok_(__FILE__,line) (hres == S_OK, "get_height failed: %08x\n", hres); - todo_wine ok_(__FILE__,line) (found == exp, "height=%d\n", found); + ok_(__FILE__,line) (hres == S_OK, "get_height failed: %08x\n", hres); + ok_(__FILE__,line) (found == exp, "height=%d\n", found); } #define test_img_put_height(o,w) _test_img_put_height(__LINE__,o,w) @@ -1161,7 +1204,7 @@ HRESULT hres; hres = IHTMLImgElement_put_height(img, height); - todo_wine ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08x\n", hres); _test_img_height(line, img, height); } @@ -1633,6 +1676,21 @@ html = a2bstr(outer_html); hres = IHTMLElement_put_outerHTML(elem, html); ok_(__FILE__,line)(hres == S_OK, "put_outerHTML failed: %08x\n", hres); + + IHTMLElement_Release(elem); + SysFreeString(html); +} + +#define test_elem_outerhtml(e,t) _test_elem_outerhtml(__LINE__,e,t) +static void _test_elem_outerhtml(unsigned line, IUnknown *unk, const char *outer_html) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + BSTR html; + HRESULT hres; + + hres = IHTMLElement_get_outerHTML(elem, &html); + ok_(__FILE__,line)(hres == S_OK, "get_outerHTML failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(html, outer_html), "outerHTML = '%s', expected '%s'\n", wine_dbgstr_w(html), outer_html); IHTMLElement_Release(elem); SysFreeString(html); @@ -3853,6 +3911,18 @@ ok(!strcmp_wa(V_BSTR(&v), "auto"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_I4; + V_I4(&v) = 100; + hres = IHTMLStyle_put_width(style, v); + ok(hres == S_OK, "put_width failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_width(style, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "100px"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + /* margin tests */ str = (void*)0xdeadbeef; hres = IHTMLStyle_get_margin(style, &str); @@ -4418,8 +4488,8 @@ */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderRightColor(style, &v); - todo_wine ok(hres == S_OK, "get_borderRightColor failed: %08x\n", hres); - todo_wine ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(hres == S_OK, "get_borderRightColor failed: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL; @@ -4452,8 +4522,8 @@ */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderTopColor(style, &v); - todo_wine ok(hres == S_OK, "get_borderTopColor failed: %08x\n", hres); - todo_wine ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(hres == S_OK, "get_borderTopColor failed: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL; @@ -4486,8 +4556,8 @@ */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderBottomColor(style, &v); - todo_wine ok(hres == S_OK, "get_borderBottomColor failed: %08x\n", hres); - todo_wine ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(hres == S_OK, "get_borderBottomColor failed: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL; @@ -4520,8 +4590,8 @@ */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderLeftColor(style, &v); - todo_wine ok(hres == S_OK, "get_borderLeftColor failed: %08x\n", hres); - todo_wine ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(hres == S_OK, "get_borderLeftColor failed: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL; @@ -5142,10 +5212,12 @@ SafeArrayDestroy(sa); } -static void test_frame_doc(IUnknown *frame_elem) +static void test_frame_doc(IUnknown *frame_elem, BOOL iframe) { IHTMLDocument2 *window_doc, *elem_doc; + IHTMLFrameElement3 *frame_elem3; IHTMLWindow2 *content_window; + HRESULT hres; content_window = get_frame_content_window(frame_elem); window_doc = get_window_doc(content_window); @@ -5153,6 +5225,23 @@ elem_doc = get_elem_doc(frame_elem); ok(iface_cmp((IUnknown*)window_doc, (IUnknown*)elem_doc), "content_doc != elem_doc\n"); + + if(!iframe) { + hres = IUnknown_QueryInterface(frame_elem, &IID_IHTMLFrameElement3, (void**)&frame_elem3); + if(SUCCEEDED(hres)) { + IDispatch *disp = NULL; + + hres = IHTMLFrameElement3_get_contentDocument(frame_elem3, &disp); + ok(hres == S_OK, "get_contentDocument failed: %08x\n", hres); + ok(disp != NULL, "contentDocument == NULL\n"); + ok(iface_cmp((IUnknown*)disp, (IUnknown*)window_doc), "contentDocument != contentWindow.document\n"); + + IDispatch_Release(disp); + IHTMLFrameElement3_Release(frame_elem3); + }else { + win_skip("IHTMLFrameElement3 not supported\n"); + } + } IHTMLDocument2_Release(elem_doc); IHTMLDocument2_Release(window_doc); @@ -5176,7 +5265,7 @@ ET_BR }; - test_frame_doc((IUnknown*)elem); + test_frame_doc((IUnknown*)elem, TRUE); content_window = get_frame_content_window((IUnknown*)elem); test_window_length(content_window, 0); @@ -5503,9 +5592,18 @@ { VARIANT_BOOL vb; + hres = IHTMLScriptElement_put_type (script, NULL); + ok(hres == S_OK, "put_type failed: %08x\n", hres); + hres = IHTMLScriptElement_get_type(script, &type); + ok(hres == S_OK, "get_type failed: %08x\n", hres); + ok(type == NULL, "Unexpected type %s\n", wine_dbgstr_w(type)); + + hres = IHTMLScriptElement_put_type (script, a2bstr ("text/javascript")); + ok(hres == S_OK, "put_type failed: %08x\n", hres); hres = IHTMLScriptElement_get_type(script, &type); ok(hres == S_OK, "get_type failed: %08x\n", hres); ok(!strcmp_wa(type, "text/javascript"), "Unexpected type %s\n", wine_dbgstr_w(type)); + SysFreeString(type); /* test defer */ @@ -5861,6 +5959,11 @@ ok(type == 8, "type=%d, expected 8\n", type); test_node_get_value_str((IUnknown*)comment, "testing"); + test_elem_title((IUnknown*)comment, NULL); + test_elem_set_title((IUnknown*)comment, "comment title"); + test_elem_title((IUnknown*)comment, "comment title"); + test_comment_text((IUnknown*)comment, ""); + test_elem_outerhtml((IUnknown*)comment, ""); IHTMLDOMNode_Release(comment); } @@ -5869,6 +5972,22 @@ } IHTMLElement_Release(body); +} + +static void test_null_write(IHTMLDocument2 *doc) +{ + HRESULT hres; + + doc_write(doc, FALSE, NULL); + doc_write(doc, TRUE, NULL); + + hres = IHTMLDocument2_write(doc, NULL); + ok(hres == S_OK, + "Expected IHTMLDocument2::write to return S_OK, got 0x%08x\n", hres); + + hres = IHTMLDocument2_writeln(doc, NULL); + ok(hres == S_OK, + "Expected IHTMLDocument2::writeln to return S_OK, got 0x%08x\n", hres); } static void test_exec(IUnknown *unk, const GUID *grpid, DWORD cmdid, VARIANT *in, VARIANT *out) @@ -5964,7 +6083,8 @@ if(FAILED(hres)) return; - test_frame_doc((IUnknown*)frame_elem); + test_elem_type((IUnknown*)frame_elem, ET_FRAME); + test_frame_doc((IUnknown*)frame_elem, FALSE); test_elem_id((IUnknown*)frame_elem, exp_id); IHTMLElement_Release(frame_elem); @@ -6344,6 +6464,7 @@ run_domtest(elem_test2_str, test_elems2); run_domtest(doc_blank, test_create_elems); run_domtest(doc_blank, test_defaults); + run_domtest(doc_blank, test_null_write); run_domtest(indent_test_str, test_indent); run_domtest(cond_comment_str, test_cond_comment); run_domtest(frameset_str, test_frameset); Modified: trunk/rostests/winetests/mshtml/events.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/events.c… ============================================================================== --- trunk/rostests/winetests/mshtml/events.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/events.c [iso-8859-1] Sat Mar 6 12:43:08 2010 @@ -63,6 +63,7 @@ DEFINE_EXPECT(div_onclick_attached); DEFINE_EXPECT(timeout); DEFINE_EXPECT(doccp_onclick); +DEFINE_EXPECT(div_onclick_disp); DEFINE_EXPECT(iframe_onreadystatechange_loading); DEFINE_EXPECT(iframe_onreadystatechange_interactive); DEFINE_EXPECT(iframe_onreadystatechange_complete); @@ -674,6 +675,20 @@ ok_(__FILE__,line)(res == VARIANT_TRUE, "attachEvent returned %x\n", res); } +#define elem_detach_event(a,b,c) _elem_detach_event(__LINE__,a,b,c) +static void _elem_detach_event(unsigned line, IUnknown *unk, const char *namea, IDispatch *disp) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + BSTR name; + HRESULT hres; + + name = a2bstr(namea); + hres = IHTMLElement2_detachEvent(elem, name, disp); + IHTMLElement2_Release(elem); + SysFreeString(name); + ok_(__FILE__,line)(hres == S_OK, "detachEvent failed: %08x\n", hres); +} + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -683,6 +698,23 @@ || IsEqualGUID(riid, &IID_IDispatchEx)) *ppv = iface; else { + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + return S_OK; +} + +static HRESULT WINAPI Dispatch_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IDispatchEx)) { + return E_NOINTERFACE; + }else { ok(0, "unexpected riid %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1015,6 +1047,32 @@ static IDispatchEx timeoutFunc = { &timeoutFuncVtbl }; +static HRESULT WINAPI div_onclick_disp_Invoke(IDispatchEx *iface, DISPID id, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, UINT *puArgErr) +{ + CHECK_EXPECT(div_onclick_disp); + + test_attached_event_args(id, wFlags, pdp, pvarRes, pei); + + ok(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid)); + ok(!puArgErr, "puArgErr = %p\n", puArgErr); + + return S_OK; +} + +static IDispatchExVtbl div_onclick_dispVtbl = { + Dispatch_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + div_onclick_disp_Invoke, +}; + +static IDispatchEx div_onclick_disp = { &div_onclick_dispVtbl }; + static void pump_msgs(BOOL *b) { MSG msg; @@ -1163,8 +1221,10 @@ CHECK_CALLED(document_onclick); cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); + elem_attach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); SET_EXPECT(div_onclick); + SET_EXPECT(div_onclick_disp); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); SET_EXPECT(document_onclick); @@ -1174,12 +1234,36 @@ ok(hres == S_OK, "click failed: %08x\n", hres); CHECK_CALLED(div_onclick); + CHECK_CALLED(div_onclick_disp); CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); CHECK_CALLED(doccp_onclick); unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); + + V_VT(&v) = VT_NULL; + hres = IHTMLElement_put_onclick(div, v); + ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + + hres = IHTMLElement_get_onclick(div, &v); + ok(hres == S_OK, "get_onclick failed: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "get_onclick returned vt %d\n", V_VT(&v)); + + elem_detach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); + elem_detach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); + elem_detach_event((IUnknown*)div, "test", (IDispatch*)&div_onclick_disp); + + SET_EXPECT(div_onclick_attached); + SET_EXPECT(body_onclick); + SET_EXPECT(document_onclick); + + hres = IHTMLElement_click(div); + ok(hres == S_OK, "click failed: %08x\n", hres); + + CHECK_CALLED(div_onclick_attached); + CHECK_CALLED(body_onclick); + CHECK_CALLED(document_onclick); IHTMLElement_Release(div); IHTMLElement_Release(body); Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Sat Mar 6 12:43:08 2010 @@ -103,6 +103,8 @@ DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_0); DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_1); DEFINE_EXPECT(Exec_ShellDocView_37); +DEFINE_EXPECT(Exec_ShellDocView_63); +DEFINE_EXPECT(Exec_ShellDocView_67); DEFINE_EXPECT(Exec_ShellDocView_84); DEFINE_EXPECT(Exec_ShellDocView_103); DEFINE_EXPECT(Exec_ShellDocView_105); @@ -112,6 +114,7 @@ DEFINE_EXPECT(Exec_HTTPEQUIV); DEFINE_EXPECT(Exec_MSHTML_PARSECOMPLETE); DEFINE_EXPECT(Exec_Explorer_69); +DEFINE_EXPECT(Exec_DOCCANNAVIGATE); DEFINE_EXPECT(Invoke_AMBIENT_USERMODE); DEFINE_EXPECT(Invoke_AMBIENT_DLCONTROL); DEFINE_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -151,13 +154,14 @@ DEFINE_EXPECT(Frame_GetWindow); DEFINE_EXPECT(TranslateUrl); DEFINE_EXPECT(Advise_Close); +DEFINE_EXPECT(OnViewChange); static IUnknown *doc_unk; static IMoniker *doc_mon; static BOOL expect_LockContainer_fLock; static BOOL expect_InPlaceUIWindow_SetActiveObject_active = TRUE; static BOOL ipsex, ipsw; -static BOOL set_clientsite = FALSE, container_locked = FALSE; +static BOOL set_clientsite, container_locked, navigated_load; static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE, show_failed; static BOOL inplace_deactivated; @@ -187,8 +191,10 @@ static const WCHAR doc_url[] = {'w','i','n','e','t','e','s','t',':','d','o','c',0}; static const WCHAR about_blank_url[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; +#define DOCHOST_DOCCANNAVIGATE 0 + static HRESULT QueryInterface(REFIID riid, void **ppv); -static void test_MSHTML_QueryStatus(IUnknown*,DWORD); +static void test_MSHTML_QueryStatus(IHTMLDocument2*,DWORD); #define test_readyState(u) _test_readyState(__LINE__,u) static void _test_readyState(unsigned,IUnknown*); @@ -201,6 +207,9 @@ static const char *debugstr_guid(REFIID riid) { static char buf[50]; + + if(!riid) + return "(null)"; sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], @@ -328,7 +337,7 @@ hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); - ok(!lstrcmpW(url, exurl), "unexpected url\n"); + ok(!lstrcmpW(url, exurl), "unexpected url %s\n", wine_dbgstr_w(url)); ok(!lstrcmpW(url, doc_url), "url != doc_url\n"); CoTaskMemFree(url); @@ -756,11 +765,7 @@ case DISPID_READYSTATE: CHECK_EXPECT2(OnChanged_READYSTATE); - if(readystate_set_interactive) { - readystate_set_interactive = FALSE; - load_state = LD_INTERACTIVE; - } - else + if(!readystate_set_interactive) test_MSHTML_QueryStatus(NULL, OLECMDF_SUPPORTED | (editmode && (load_state == LD_INTERACTIVE || load_state == LD_COMPLETE) ? OLECMDF_ENABLED : 0)); @@ -2338,7 +2343,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - if(!pguidCmdGroup || !IsEqualGUID(pguidCmdGroup, &CGID_Explorer)) + if((!pguidCmdGroup || !IsEqualGUID(pguidCmdGroup, &CGID_Explorer)) + && (!pguidCmdGroup || !IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup) || nCmdID != 63)) test_readyState(NULL); if(!pguidCmdGroup) { @@ -2430,7 +2436,7 @@ case 37: CHECK_EXPECT2(Exec_ShellDocView_37); - if(load_from_stream) + if(load_from_stream || navigated_load) test_GetCurMoniker(doc_unk, NULL, about_blank_url); else if(!editmode) test_GetCurMoniker(doc_unk, doc_mon, NULL); @@ -2442,6 +2448,38 @@ ok(V_I4(pvaIn) == 0, "V_I4(pvaIn)=%d, expected 0\n", V_I4(pvaIn)); } return S_OK; + + case 63: { + IHTMLPrivateWindow *priv_window; + HRESULT hres; + + CHECK_EXPECT(Exec_ShellDocView_63); + ok(pvaIn != NULL, "pvaIn == NULL\n"); + ok(V_VT(pvaIn) == VT_UNKNOWN, "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); + ok(V_UNKNOWN(pvaIn) != NULL, "VPUNKNOWN(pvaIn) = NULL\n"); + ok(pvaOut != NULL, "pvaOut == NULL\n"); + ok(V_VT(pvaOut) == VT_EMPTY, "V_VT(pvaOut) = %d\n", V_VT(pvaOut)); + + hres = IUnknown_QueryInterface(V_UNKNOWN(pvaIn), &IID_IHTMLPrivateWindow, (void**)&priv_window); + ok(hres == S_OK, "Could not get IHTMLPrivateWindow: %08x\n", hres); + if(SUCCEEDED(hres)) + IHTMLPrivateWindow_Release(priv_window); + + load_state = LD_LOADING; + return S_OK; /* TODO */ + } + + case 67: + CHECK_EXPECT(Exec_ShellDocView_67); + ok(pvaIn != NULL, "pvaIn == NULL\n"); + ok(V_VT(pvaIn) == VT_BSTR, "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); + ok(!strcmp_wa(V_BSTR(pvaIn), "about:blank"), "V_BSTR(pvaIn) = %s\n", wine_dbgstr_w(V_BSTR(pvaIn))); + ok(pvaOut != NULL, "pvaOut == NULL\n"); + ok(V_VT(pvaOut) == VT_BOOL, "V_VT(pvaOut) = %d\n", V_VT(pvaOut)); + ok(V_BOOL(pvaOut) == VARIANT_TRUE, "V_BOOL(pvaOut) = %x\n", V_BOOL(pvaOut)); + load_state = LD_DOLOAD; + return S_OK; + case 84: CHECK_EXPECT2(Exec_ShellDocView_84); @@ -2496,8 +2534,19 @@ }; } - if(IsEqualGUID(&CGID_DocHostCmdPriv, pguidCmdGroup)) - return E_FAIL; /* TODO */ + if(IsEqualGUID(&CGID_DocHostCmdPriv, pguidCmdGroup)) { + switch(nCmdID) { + case DOCHOST_DOCCANNAVIGATE: + CHECK_EXPECT(Exec_DOCCANNAVIGATE); + ok(pvaIn != NULL, "pvaIn == NULL\n"); + ok(pvaOut == NULL, "pvaOut != NULL\n"); + ok(V_VT(pvaIn) == VT_UNKNOWN, "V_VT(pvaIn) != VT_UNKNOWN\n"); + /* FIXME: test V_UNKNOWN(pvaIn) == window */ + return S_OK; + default: + return E_FAIL; /* TODO */ + } + } if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) { ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); @@ -2664,50 +2713,60 @@ static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; -static HRESULT WINAPI AdviseSink_QueryInterface(IAdviseSink *iface, +static HRESULT WINAPI AdviseSink_QueryInterface(IAdviseSinkEx *iface, REFIID riid, void **ppv) { return QueryInterface(riid, ppv); } -static ULONG WINAPI AdviseSink_AddRef(IAdviseSink *iface) +static ULONG WINAPI AdviseSink_AddRef(IAdviseSinkEx *iface) { return 2; } -static ULONG WINAPI AdviseSink_Release(IAdviseSink *iface) +static ULONG WINAPI AdviseSink_Release(IAdviseSinkEx *iface) { return 1; } -static void WINAPI AdviseSink_OnDataChange(IAdviseSink *iface, +static void WINAPI AdviseSink_OnDataChange(IAdviseSinkEx *iface, FORMATETC *pFormatetc, STGMEDIUM *pStgmed) { ok(0, "unexpected call\n"); } -static void WINAPI AdviseSink_OnViewChange(IAdviseSink *iface, +static void WINAPI AdviseSink_OnViewChange(IAdviseSinkEx *iface, DWORD dwAspect, LONG lindex) { ok(0, "unexpected call\n"); } -static void WINAPI AdviseSink_OnRename(IAdviseSink *iface, IMoniker *pmk) -{ - ok(0, "unexpected call\n"); -} - -static void WINAPI AdviseSink_OnSave(IAdviseSink *iface) -{ - ok(0, "unexpected call\n"); -} - -static void WINAPI AdviseSink_OnClose(IAdviseSink *iface) +static void WINAPI AdviseSink_OnRename(IAdviseSinkEx *iface, IMoniker *pmk) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI AdviseSink_OnSave(IAdviseSinkEx *iface) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI AdviseSink_OnClose(IAdviseSinkEx *iface) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI AdviseSinkEx_OnViewStatusChange(IAdviseSinkEx *iface, DWORD dwViewStatus) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI ObjectAdviseSink_OnClose(IAdviseSinkEx *iface) { CHECK_EXPECT(Advise_Close); } -static const IAdviseSinkVtbl AdviseSinkVtbl = { +static const IAdviseSinkExVtbl AdviseSinkVtbl = { AdviseSink_QueryInterface, AdviseSink_AddRef, AdviseSink_Release, @@ -2715,10 +2774,47 @@ AdviseSink_OnViewChange, AdviseSink_OnRename, AdviseSink_OnSave, - AdviseSink_OnClose + ObjectAdviseSink_OnClose, + AdviseSinkEx_OnViewStatusChange }; -static IAdviseSink AdviseSink = { &AdviseSinkVtbl }; +static IAdviseSinkEx AdviseSink = { &AdviseSinkVtbl }; + +static HRESULT WINAPI ViewAdviseSink_QueryInterface(IAdviseSinkEx *iface, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IAdviseSinkEx, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static void WINAPI ViewAdviseSink_OnViewChange(IAdviseSinkEx *iface, + DWORD dwAspect, LONG lindex) +{ + CHECK_EXPECT2(OnViewChange); + + ok(dwAspect == DVASPECT_CONTENT, "dwAspect = %d\n", dwAspect); + ok(lindex == -1, "lindex = %d\n", lindex); +} + +static const IAdviseSinkExVtbl ViewAdviseSinkVtbl = { + ViewAdviseSink_QueryInterface, + AdviseSink_AddRef, + AdviseSink_Release, + AdviseSink_OnDataChange, + ViewAdviseSink_OnViewChange, + AdviseSink_OnRename, + AdviseSink_OnSave, + AdviseSink_OnClose, + AdviseSinkEx_OnViewStatusChange +}; + +static IAdviseSinkEx ViewAdviseSink = { &ViewAdviseSinkVtbl }; DEFINE_GUID(IID_unk1, 0xD48A6EC6,0x6A4A,0x11CF,0x94,0xA7,0x44,0x45,0x53,0x54,0x00,0x00); /* HTMLWindow2 ? */ DEFINE_GUID(IID_IThumbnailView, 0x7BB0B520,0xB1A7,0x11D2,0xBB,0x23,0x00,0xC0,0x4F,0x79,0xAB,0xCD); @@ -2798,7 +2894,8 @@ switch(load_state) { case LD_DOLOAD: case LD_NO: - ok(!elem, "elem != NULL\n"); + if(!navigated_load) + ok(!elem, "elem != NULL\n"); default: break; case LD_INTERACTIVE: @@ -2905,6 +3002,20 @@ IHTMLDocument2_Release(htmldoc); } +static void test_ViewAdviseSink(IHTMLDocument2 *doc) +{ + IViewObject *view; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IViewObject, (void**)&view); + ok(hres == S_OK, "QueryInterface(IID_IViewObject) failed: %08x\n", hres); + + hres = IViewObject_SetAdvise(view, DVASPECT_CONTENT, ADVF_PRIMEFIRST, (IAdviseSink*)&ViewAdviseSink); + ok(hres == S_OK, "SetAdvise failed: %08x\n", hres); + + IViewObject_Release(view); +} + static void test_ConnectionPoint(IConnectionPointContainer *container, REFIID riid) { IConnectionPointContainer *tmp_container = NULL; @@ -2943,12 +3054,12 @@ IConnectionPoint_Release(cp); } -static void test_ConnectionPointContainer(IUnknown *unk) +static void test_ConnectionPointContainer(IHTMLDocument2 *doc) { IConnectionPointContainer *container; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); + hres = IUnknown_QueryInterface(doc, &IID_IConnectionPointContainer, (void**)&container); ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -2990,6 +3101,7 @@ SET_EXPECT(GetOptionKeyPath); SET_EXPECT(GetOverrideKeyPath); SET_EXPECT(GetWindow); + SET_EXPECT(Exec_DOCCANNAVIGATE); SET_EXPECT(QueryStatus_SETPROGRESSTEXT); SET_EXPECT(Exec_SETPROGRESSMAX); SET_EXPECT(Exec_SETPROGRESSPOS); @@ -3030,6 +3142,7 @@ CHECK_CALLED(GetOptionKeyPath); CHECK_CALLED(GetOverrideKeyPath); CHECK_CALLED(GetWindow); + CHECK_CALLED(Exec_DOCCANNAVIGATE); CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); CHECK_CALLED(Exec_SETPROGRESSMAX); CHECK_CALLED(Exec_SETPROGRESSPOS); @@ -3084,6 +3197,7 @@ SET_EXPECT(SetStatusText); if(!(flags & DWL_EMPTY)) SET_EXPECT(Exec_SETDOWNLOADSTATE_1); + SET_EXPECT(OnViewChange); SET_EXPECT(GetDropTarget); if(flags & DWL_TRYCSS) SET_EXPECT(Exec_ShellDocView_84); @@ -3100,7 +3214,9 @@ SET_EXPECT(Frame_EnableModeless_TRUE); /* IE7 */ SET_EXPECT(EnableModeless_FALSE); /* IE7 */ SET_EXPECT(Frame_EnableModeless_FALSE); /* IE7 */ - if(doc_mon != &Moniker) { + if(navigated_load) + SET_EXPECT(Exec_ShellDocView_37); + if(flags & DWL_HTTP) { SET_EXPECT(OnChanged_1012); SET_EXPECT(Exec_HTTPEQUIV); SET_EXPECT(Exec_SETTITLE); @@ -3116,6 +3232,11 @@ SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); SET_EXPECT(Exec_HTTPEQUIV_DONE); SET_EXPECT(SetStatusText); + if(navigated_load) { + SET_EXPECT(UpdateUI); + SET_EXPECT(Exec_UPDATECOMMANDS); + SET_EXPECT(Exec_SETTITLE); + } expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ while(!called_Exec_HTTPEQUIV_DONE && GetMessage(&msg, NULL, 0, 0)) { @@ -3127,12 +3248,20 @@ CHECK_CALLED(Exec_SETPROGRESSMAX); if(flags & DWL_HTTP) SET_CALLED(Exec_SETPROGRESSMAX); - if((flags & DWL_VERBDONE) && !load_from_stream) - CHECK_CALLED(GetHostInfo); + if((flags & DWL_VERBDONE) && !load_from_stream) { + if(navigated_load) + todo_wine CHECK_CALLED(GetHostInfo); + else + CHECK_CALLED(GetHostInfo); + } CHECK_CALLED(SetStatusText); if(!(flags & DWL_EMPTY)) CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); - CHECK_CALLED(GetDropTarget); + CHECK_CALLED(OnViewChange); + if(navigated_load) + CHECK_CALLED(GetDropTarget); + else + SET_CALLED(GetDropTarget); if(flags & DWL_TRYCSS) SET_CALLED(Exec_ShellDocView_84); if(flags & DWL_CSS) { @@ -3148,7 +3277,9 @@ SET_CALLED(Frame_EnableModeless_TRUE); /* IE7 */ SET_CALLED(EnableModeless_FALSE); /* IE7 */ SET_CALLED(Frame_EnableModeless_FALSE); /* IE7 */ - if(doc_mon != &Moniker) todo_wine { + if(navigated_load) + todo_wine CHECK_CALLED(Exec_ShellDocView_37); + if(flags & DWL_HTTP) todo_wine { CHECK_CALLED(OnChanged_1012); CHECK_CALLED(Exec_HTTPEQUIV); CHECK_CALLED(Exec_SETTITLE); @@ -3164,20 +3295,25 @@ CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE); SET_CALLED(SetStatusText); + if(navigated_load) { /* avoiding race, FIXME: fund better way */ + SET_CALLED(UpdateUI); + SET_CALLED(Exec_UPDATECOMMANDS); + SET_CALLED(Exec_SETTITLE); + } load_state = LD_COMPLETE; test_readyState(NULL); } -static void test_Persist(IUnknown *unk, IMoniker *mon) +static void test_Persist(IHTMLDocument2 *doc, IMoniker *mon) { IPersistMoniker *persist_mon; IPersistFile *persist_file; GUID guid; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IPersistFile, (void**)&persist_file); + hres = IUnknown_QueryInterface(doc, &IID_IPersistFile, (void**)&persist_file); ok(hres == S_OK, "QueryInterface(IID_IPersist) failed: %08x\n", hres); if(SUCCEEDED(hres)) { hres = IPersist_GetClassID(persist_file, NULL); @@ -3190,7 +3326,7 @@ IPersist_Release(persist_file); } - hres = IUnknown_QueryInterface(unk, &IID_IPersistMoniker, (void**)&persist_mon); + hres = IUnknown_QueryInterface(doc, &IID_IPersistMoniker, (void**)&persist_mon); ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) failed: %08x\n", hres); if(SUCCEEDED(hres)) { hres = IPersistMoniker_GetClassID(persist_mon, NULL); @@ -3203,25 +3339,23 @@ if(load_state == LD_DOLOAD) test_Load(persist_mon, mon); - test_readyState(unk); + test_readyState((IUnknown*)doc); IPersistMoniker_Release(persist_mon); } } -static void test_put_href(IUnknown *unk) -{ +static void test_put_href(IHTMLDocument2 *doc) +{ + IHTMLPrivateWindow *priv_window; + IHTMLWindow2 *window; IHTMLLocation *location; - IHTMLDocument2 *doc; - BSTR str; + BSTR str, str2; + VARIANT vempty; HRESULT hres; - - hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&doc); - ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); location = NULL; hres = IHTMLDocument2_get_location(doc, &location); - IHTMLDocument2_Release(doc); ok(hres == S_OK, "get_location failed: %08x\n", hres); ok(location != NULL, "location == NULL\n"); @@ -3229,12 +3363,46 @@ SET_EXPECT(Navigate); str = a2bstr("about:blank"); hres = IHTMLLocation_put_href(location, str); - SysFreeString(str); ok(hres == S_OK, "put_href failed: %08x\n", hres); CHECK_CALLED(TranslateUrl); CHECK_CALLED(Navigate); IHTMLLocation_Release(location); + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLPrivateWindow, (void**)&priv_window); + IHTMLWindow2_Release(window); + ok(hres == S_OK, "QueryInterface(IID_IHTMLPrivateWindow) failed: %08x\n", hres); + + readystate_set_loading = TRUE; + navigated_load = TRUE; + SET_EXPECT(TranslateUrl); + SET_EXPECT(Exec_ShellDocView_67); + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(OnChanged_READYSTATE); + SET_EXPECT(Exec_ShellDocView_63); + + str2 = a2bstr(""); + V_VT(&vempty) = VT_EMPTY; + hres = IHTMLPrivateWindow_SuperNavigate(priv_window, str, str2, NULL, NULL, &vempty, &vempty, 0); + SysFreeString(str); + SysFreeString(str2); + ok(hres == S_OK, "SuperNavigate failed: %08x\n", hres); + + CHECK_CALLED(TranslateUrl); + CHECK_CALLED(Exec_ShellDocView_67); + CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_CALLED(OnChanged_READYSTATE); /* not always called */ + CHECK_CALLED(Exec_ShellDocView_63); + + test_GetCurMoniker(doc_unk, doc_mon, NULL); + IHTMLPrivateWindow_Release(priv_window); + + test_download(DWL_VERBDONE); } static const OLECMDF expect_cmds[OLECMDID_GETPRINTTEMPLATE+1] = { @@ -3300,10 +3468,9 @@ ok_(__FILE__,line) (olecmd.cmdf == cmdf, "(%u) cmdf=%08x, expected %08x\n", cmdid, olecmd.cmdf, cmdf); } -static void test_MSHTML_QueryStatus(IUnknown *unk, DWORD cmdf) -{ - if(!unk) - unk = doc_unk; +static void test_MSHTML_QueryStatus(IHTMLDocument2 *doc, DWORD cmdf) +{ + IUnknown *unk = doc ? (IUnknown*)doc : doc_unk; test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTNAME, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTSIZE, cmdf); @@ -3323,14 +3490,14 @@ test_QueryStatus(unk, &CGID_MSHTML, IDM_DELETE, cmdf); } -static void test_OleCommandTarget(IUnknown *unk) +static void test_OleCommandTarget(IHTMLDocument2 *doc) { IOleCommandTarget *cmdtrg; OLECMD cmds[OLECMDID_GETPRINTTEMPLATE]; int i; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + hres = IUnknown_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget failed: %08x\n", hres); if(FAILED(hres)) return; @@ -3361,7 +3528,7 @@ IOleCommandTarget_Release(cmdtrg); } -static void test_OleCommandTarget_fail(IUnknown *unk) +static void test_OleCommandTarget_fail(IHTMLDocument2 *doc) { IOleCommandTarget *cmdtrg; int i; @@ -3372,7 +3539,7 @@ {OLECMDID_GETPRINTTEMPLATE+1, 0xf0f0} }; - hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + hres = IUnknown_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); ok(hres == S_OK, "QueryInterface(IIDIOleCommandTarget failed: %08x\n", hres); if(FAILED(hres)) return; @@ -3413,13 +3580,13 @@ IOleCommandTarget_Release(cmdtrg); } -static void test_exec_onunload(IUnknown *unk) +static void test_exec_onunload(IHTMLDocument2 *doc) { IOleCommandTarget *cmdtrg; VARIANT var; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + hres = IUnknown_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -3568,14 +3735,14 @@ IOleCommandTarget_Release(cmdtrg); } -static void test_IsDirty(IUnknown *unk, HRESULT exhres) +static void test_IsDirty(IHTMLDocument2 *doc, HRESULT exhres) { IPersistStreamInit *perinit; IPersistMoniker *permon; IPersistFile *perfile; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IPersistStreamInit, (void**)&perinit); + hres = IUnknown_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&perinit); ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit failed: %08x\n", hres); if(SUCCEEDED(hres)) { hres = IPersistStreamInit_IsDirty(perinit); @@ -3583,7 +3750,7 @@ IPersistStreamInit_Release(perinit); } - hres = IUnknown_QueryInterface(unk, &IID_IPersistMoniker, (void**)&permon); + hres = IUnknown_QueryInterface(doc, &IID_IPersistMoniker, (void**)&permon); ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker failed: %08x\n", hres); if(SUCCEEDED(hres)) { hres = IPersistMoniker_IsDirty(permon); @@ -3591,7 +3758,7 @@ IPersistMoniker_Release(permon); } - hres = IUnknown_QueryInterface(unk, &IID_IPersistFile, (void**)&perfile); + hres = IUnknown_QueryInterface(doc, &IID_IPersistFile, (void**)&perfile); ok(hres == S_OK, "QueryInterface(IID_IPersistFile failed: %08x\n", hres); if(SUCCEEDED(hres)) { hres = IPersistFile_IsDirty(perfile); @@ -3676,6 +3843,8 @@ SET_EXPECT(GetOverrideKeyPath); } SET_EXPECT(GetWindow); + if(flags & CLIENTSITE_EXPECTPATH) + SET_EXPECT(Exec_DOCCANNAVIGATE); SET_EXPECT(QueryStatus_SETPROGRESSTEXT); SET_EXPECT(Exec_SETPROGRESSMAX); SET_EXPECT(Exec_SETPROGRESSPOS); @@ -3695,6 +3864,8 @@ CHECK_CALLED(GetOverrideKeyPath); } CHECK_CALLED(GetWindow); + if(flags & CLIENTSITE_EXPECTPATH) + CHECK_CALLED(Exec_DOCCANNAVIGATE); CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); CHECK_CALLED(Exec_SETPROGRESSMAX); CHECK_CALLED(Exec_SETPROGRESSPOS); @@ -3716,12 +3887,12 @@ ok(clientsite == &ClientSite, "GetClientSite() = %p, expected %p\n", clientsite, &ClientSite); } -static void test_OnAmbientPropertyChange(IUnknown *unk) +static void test_OnAmbientPropertyChange(IHTMLDocument2 *doc) { IOleControl *control = NULL; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleControl, (void**)&control); + hres = IUnknown_QueryInterface(doc, &IID_IOleControl, (void**)&control); ok(hres == S_OK, "QueryInterface(IID_IOleControl failed: %08x\n", hres); if(FAILED(hres)) return; @@ -3765,12 +3936,12 @@ -static void test_OnAmbientPropertyChange2(IUnknown *unk) +static void test_OnAmbientPropertyChange2(IHTMLDocument2 *doc) { IOleControl *control = NULL; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleControl, (void**)&control); + hres = IUnknown_QueryInterface(doc, &IID_IOleControl, (void**)&control); ok(hres == S_OK, "QueryInterface(IID_IOleControl failed: %08x\n", hres); if(FAILED(hres)) return; @@ -3781,12 +3952,12 @@ IOleControl_Release(control); } -static void test_Close(IUnknown *unk, BOOL set_client) +static void test_Close(IHTMLDocument2 *doc, BOOL set_client) { IOleObject *oleobj = NULL; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -3806,14 +3977,14 @@ IOleObject_Release(oleobj); } -static void test_Advise(IUnknown *unk) +static void test_Advise(IHTMLDocument2 *doc) { IOleObject *oleobj = NULL; IEnumSTATDATA *enum_advise = (void*)0xdeadbeef; DWORD conn; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -3831,14 +4002,14 @@ ok(hres == E_INVALIDARG || hres == S_OK, "Advise returned: %08x\n", hres); ok(conn == 0 || conn == 1, "conn = %d\n", conn); - hres = IOleObject_Advise(oleobj, &AdviseSink, NULL); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, NULL); ok(hres == E_INVALIDARG, "Advise returned: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise returned: %08x\n", hres); ok(conn == 1, "conn = %d\n", conn); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise returned: %08x\n", hres); ok(conn == 2, "conn = %d\n", conn); @@ -3898,12 +4069,12 @@ IOleInPlaceActiveObject_Release(inplaceact); } -static void test_InPlaceDeactivate(IUnknown *unk, BOOL expect_call) +static void test_InPlaceDeactivate(IHTMLDocument2 *doc, BOOL expect_call) { IOleInPlaceObjectWindowless *windowlessobj = NULL; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObjectWindowless, + hres = IUnknown_QueryInterface(doc, &IID_IOleInPlaceObjectWindowless, (void**)&windowlessobj); ok(hres == S_OK, "QueryInterface(IID_IOleInPlaceObjectWindowless) failed: %08x\n", hres); if(FAILED(hres)) @@ -3929,7 +4100,7 @@ IOleInPlaceObjectWindowless_Release(windowlessobj); } -static void test_Activate(IUnknown *unk, DWORD flags) +static void test_Activate(IHTMLDocument2 *doc, DWORD flags) { IOleObject *oleobj = NULL; IOleDocumentView *docview; @@ -3942,7 +4113,7 @@ IOleDocumentView_Release(view); view = NULL; - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); hres = IOleObject_GetUserClassID(oleobj, NULL); @@ -3952,10 +4123,10 @@ ok(hres == S_OK, "GetUserClassID failed: %08x\n", hres); ok(IsEqualGUID(&guid, &CLSID_HTMLDocument), "guid != CLSID_HTMLDocument\n"); - test_OnFrameWindowActivate(unk); + test_OnFrameWindowActivate((IUnknown*)doc); test_ClientSite(oleobj, flags); - test_InPlaceDeactivate(unk, FALSE); + test_InPlaceDeactivate(doc, FALSE); test_DoVerb(oleobj); if(call_UIActivate == CallUIActivate_AfterShow) { @@ -3983,10 +4154,10 @@ IOleObject_Release(oleobj); - test_OnFrameWindowActivate(unk); -} - -static void test_Window(IUnknown *unk, BOOL expect_success) + test_OnFrameWindowActivate((IUnknown*)doc); +} + +static void test_Window(IHTMLDocument2 *doc, BOOL expect_success) { IOleInPlaceActiveObject *activeobject = NULL; HWND tmp_hwnd; @@ -4069,34 +4240,34 @@ ok(hres == S_OK, "Show failed: %08x\n", hres); } -static HRESULT create_document(IUnknown **unk) +static HRESULT create_document(IHTMLDocument2 **doc) { IHTMLDocument5 *doc5; HRESULT hres; hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IUnknown, (void**)unk); + &IID_IHTMLDocument2, (void**)doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); if(FAILED(hres)) return hres; - hres = IUnknown_QueryInterface(*unk, &IID_IHTMLDocument5, (void**)&doc5); + hres = IHTMLDocument2_QueryInterface(*doc, &IID_IHTMLDocument5, (void**)&doc5); if(SUCCEEDED(hres)) { IHTMLDocument5_Release(doc5); }else { win_skip("Could not get IHTMLDocument5, probably too old IE\n"); - IUnknown_Release(*unk); + IHTMLDocument2_Release(*doc); } return hres; } -static void test_Navigate(IUnknown *unk) +static void test_Navigate(IHTMLDocument2 *doc) { IHlinkTarget *hlink; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IHlinkTarget, (void**)&hlink); + hres = IUnknown_QueryInterface(doc, &IID_IHlinkTarget, (void**)&hlink); ok(hres == S_OK, "QueryInterface(IID_IHlinkTarget) failed: %08x\n", hres); SET_EXPECT(ActivateMe); @@ -4107,18 +4278,13 @@ IHlinkTarget_Release(hlink); } -static void test_external(IUnknown *unk, BOOL initialized) +static void test_external(IHTMLDocument2 *doc, BOOL initialized) { IDispatch *external; - IHTMLDocument2 *doc; IHTMLWindow2 *htmlwin; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&doc); - ok(hres == S_OK, "QueryInterface(IID_IHTMLWindow2) failed: %08x\n", hres); - hres = IHTMLDocument2_get_parentWindow(doc, &htmlwin); - IHTMLDocument2_Release(doc); ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); if(initialized) @@ -4137,12 +4303,12 @@ IHTMLWindow2_Release(htmlwin); } -static void test_StreamLoad(IUnknown *unk) +static void test_StreamLoad(IHTMLDocument2 *doc) { IPersistStreamInit *init; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IPersistStreamInit, (void**)&init); + hres = IUnknown_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -4164,17 +4330,17 @@ CHECK_CALLED(Read); test_timer(EXPECT_SETTITLE); - test_GetCurMoniker(unk, NULL, about_blank_url); + test_GetCurMoniker((IUnknown*)doc, NULL, about_blank_url); IPersistStreamInit_Release(init); } -static void test_StreamInitNew(IUnknown *unk) +static void test_StreamInitNew(IHTMLDocument2 *doc) { IPersistStreamInit *init; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IPersistStreamInit, (void**)&init); + hres = IUnknown_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -4194,12 +4360,12 @@ CHECK_CALLED(OnChanged_READYSTATE); test_timer(EXPECT_SETTITLE); - test_GetCurMoniker(unk, NULL, about_blank_url); + test_GetCurMoniker((IUnknown*)doc, NULL, about_blank_url); IPersistStreamInit_Release(init); } -static void test_QueryInterface(IUnknown *unk) +static void test_QueryInterface(IHTMLDocument2 *doc) { IUnknown *qi; HRESULT hres; @@ -4208,32 +4374,42 @@ {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa0}}; qi = (void*)0xdeadbeef; - hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&qi); + hres = IUnknown_QueryInterface(doc, &IID_IRunnableObject, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qirunnable=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; - hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&qi); + hres = IUnknown_QueryInterface(doc, &IID_IHTMLDOMNode, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; - hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode2, (void**)&qi); + hres = IUnknown_QueryInterface(doc, &IID_IHTMLDOMNode2, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; - hres = IUnknown_QueryInterface(unk, &IID_IPersistPropertyBag, (void**)&qi); + hres = IUnknown_QueryInterface(doc, &IID_IPersistPropertyBag, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; - hres = IUnknown_QueryInterface(unk, &IID_UndocumentedScriptIface, (void**)&qi); + hres = IUnknown_QueryInterface(doc, &IID_UndocumentedScriptIface, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; - hres = IUnknown_QueryInterface(unk, &IID_IMarshal, (void**)&qi); + hres = IUnknown_QueryInterface(doc, &IID_IMarshal, (void**)&qi); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); + + qi = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(doc, &IID_IExternalConnection, (void**)&qi); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); + + qi = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(doc, &IID_IStdMarshalInfo, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); } @@ -4250,11 +4426,12 @@ protocol_read = 0; ipsex = FALSE; inplace_deactivated = FALSE; + navigated_load = FALSE; } static void test_HTMLDocument(BOOL do_load) { - IUnknown *unk; + IHTMLDocument2 *doc; HRESULT hres; ULONG ref; @@ -4262,80 +4439,81 @@ init_test(do_load ? LD_DOLOAD : LD_NO); - hres = create_document(&unk); + hres = create_document(&doc); if(FAILED(hres)) return; - doc_unk = unk; - - test_QueryInterface(unk); - test_Advise(unk); - test_IsDirty(unk, S_FALSE); - test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); - test_external(unk, FALSE); - test_ConnectionPointContainer(unk); - test_GetCurMoniker(unk, NULL, NULL); - test_Persist(unk, &Moniker); + doc_unk = (IUnknown*)doc; + + test_QueryInterface(doc); + test_Advise(doc); + test_IsDirty(doc, S_FALSE); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); + test_external(doc, FALSE); + test_ViewAdviseSink(doc); + test_ConnectionPointContainer(doc); + test_GetCurMoniker((IUnknown*)doc, NULL, NULL); + test_Persist(doc, &Moniker); if(!do_load) - test_OnAmbientPropertyChange2(unk); - - test_Activate(unk, CLIENTSITE_EXPECTPATH); + test_OnAmbientPropertyChange2(doc); + + test_Activate(doc, CLIENTSITE_EXPECTPATH); if(do_load) { test_download(DWL_CSS|DWL_TRYCSS); - test_GetCurMoniker(unk, &Moniker, NULL); - } - - test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); - test_OleCommandTarget_fail(unk); - test_OleCommandTarget(unk); - test_OnAmbientPropertyChange(unk); - test_Window(unk, TRUE); - test_external(unk, TRUE); + test_GetCurMoniker((IUnknown*)doc, &Moniker, NULL); + } + + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); + test_OleCommandTarget_fail(doc); + test_OleCommandTarget(doc); + test_OnAmbientPropertyChange(doc); + test_Window(doc, TRUE); + test_external(doc, TRUE); test_UIDeactivate(); - test_OleCommandTarget(unk); - test_Window(unk, TRUE); - test_InPlaceDeactivate(unk, TRUE); + test_OleCommandTarget(doc); + test_Window(doc, TRUE); + test_InPlaceDeactivate(doc, TRUE); /* Calling test_OleCommandTarget here causes Segmentation Fault with native * MSHTML. It doesn't with Wine. */ - test_Window(unk, FALSE); + test_Window(doc, FALSE); test_Hide(); - test_InPlaceDeactivate(unk, FALSE); + test_InPlaceDeactivate(doc, FALSE); test_CloseView(); - test_Close(unk, FALSE); + test_Close(doc, FALSE); /* Activate HTMLDocument again */ - test_Activate(unk, CLIENTSITE_SETNULL); - test_Window(unk, TRUE); - test_OleCommandTarget(unk); + test_Activate(doc, CLIENTSITE_SETNULL); + test_Window(doc, TRUE); + test_OleCommandTarget(doc); test_UIDeactivate(); - test_InPlaceDeactivate(unk, TRUE); - test_Close(unk, FALSE); + test_InPlaceDeactivate(doc, TRUE); + test_Close(doc, FALSE); /* Activate HTMLDocument again, this time without UIActivate */ call_UIActivate = CallUIActivate_None; - test_Activate(unk, CLIENTSITE_SETNULL); - test_Window(unk, TRUE); + test_Activate(doc, CLIENTSITE_SETNULL); + test_Window(doc, TRUE); test_UIDeactivate(); - test_InPlaceDeactivate(unk, TRUE); + test_InPlaceDeactivate(doc, TRUE); test_CloseView(); test_CloseView(); - test_Close(unk, TRUE); - test_OnAmbientPropertyChange2(unk); - test_GetCurMoniker(unk, do_load ? &Moniker : NULL, NULL); + test_Close(doc, TRUE); + test_OnAmbientPropertyChange2(doc); + test_GetCurMoniker((IUnknown*)doc, do_load ? &Moniker : NULL, NULL); if(!do_load) { /* Activate HTMLDocument again, calling UIActivate after showing the window */ call_UIActivate = CallUIActivate_AfterShow; - test_Activate(unk, 0); - test_Window(unk, TRUE); - test_OleCommandTarget(unk); + test_Activate(doc, 0); + test_Window(doc, TRUE); + test_OleCommandTarget(doc); test_UIDeactivate(); - test_InPlaceDeactivate(unk, TRUE); - test_Close(unk, FALSE); + test_InPlaceDeactivate(doc, TRUE); + test_Close(doc, FALSE); call_UIActivate = CallUIActivate_None; } @@ -4345,7 +4523,7 @@ ok(IsWindow(hwnd), "hwnd is destroyed\n"); - ref = IUnknown_Release(unk); + ref = IHTMLDocument2_Release(doc); ok(ref == 0, "ref=%d, expected 0\n", ref); ok(!IsWindow(hwnd), "hwnd is not destroyed\n"); @@ -4353,7 +4531,7 @@ static void test_HTMLDocument_hlink(void) { - IUnknown *unk; + IHTMLDocument2 *doc; HRESULT hres; ULONG ref; @@ -4362,51 +4540,48 @@ init_test(LD_DOLOAD); ipsex = TRUE; - hres = create_document(&unk); + hres = create_document(&doc); if(FAILED(hres)) return; - doc_unk = unk; - - test_ConnectionPointContainer(unk); - test_GetCurMoniker(unk, NULL, NULL); - test_Persist(unk, &Moniker); - test_Navigate(unk); + doc_unk = (IUnknown*)doc; + + test_ViewAdviseSink(doc); + test_ConnectionPointContainer(doc); + test_GetCurMoniker((IUnknown*)doc, NULL, NULL); + test_Persist(doc, &Moniker); + test_Navigate(doc); if(show_failed) { - IUnknown_Release(unk); + IUnknown_Release(doc); return; } test_download(DWL_CSS|DWL_TRYCSS); - test_IsDirty(unk, S_FALSE); - test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); - - test_exec_onunload(unk); - test_Window(unk, TRUE); - test_InPlaceDeactivate(unk, TRUE); - test_Close(unk, FALSE); - test_IsDirty(unk, S_FALSE); - test_GetCurMoniker(unk, &Moniker, NULL); + test_IsDirty(doc, S_FALSE); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); + + test_exec_onunload(doc); + test_Window(doc, TRUE); + test_InPlaceDeactivate(doc, TRUE); + test_Close(doc, FALSE); + test_IsDirty(doc, S_FALSE); + test_GetCurMoniker((IUnknown*)doc, &Moniker, NULL); if(view) IOleDocumentView_Release(view); view = NULL; - ref = IUnknown_Release(unk); + ref = IHTMLDocument2_Release(doc); ok(ref == 0, "ref=%d, expected 0\n", ref); } -static void test_cookies(IUnknown *unk) +static void test_cookies(IHTMLDocument2 *doc) { WCHAR buf[1024]; - IHTMLDocument2 *doc; DWORD size; BSTR str, str2; BOOL b; HRESULT hres; - - hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&doc); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08x\n", hres); hres = IHTMLDocument2_get_cookie(doc, &str); ok(hres == S_OK, "get_cookie failed: %08x\n", hres); @@ -4449,73 +4624,74 @@ ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); SysFreeString(str); SysFreeString(str2); - - IHTMLDocument2_Release(doc); } static void test_HTMLDocument_http(void) { IMoniker *http_mon; - IUnknown *unk; + IHTMLDocument2 *doc; ULONG ref; HRESULT hres; trace("Testing HTMLDocument (http)...\n"); + if(!winetest_interactive && is_ie_hardened()) { + win_skip("IE running in Enhanced Security Configuration\n"); + return; + } + + init_test(LD_DOLOAD); + ipsex = TRUE; + + hres = create_document(&doc); + if(FAILED(hres)) + return; + doc_unk = (IUnknown*)doc; + hres = CreateURLMoniker(NULL, http_urlW, &http_mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); - init_test(LD_DOLOAD); - ipsex = TRUE; - - hres = create_document(&unk); - if(FAILED(hres)) + test_ViewAdviseSink(doc); + test_ConnectionPointContainer(doc); + test_GetCurMoniker((IUnknown*)doc, NULL, NULL); + test_Persist(doc, http_mon); + test_Navigate(doc); + if(show_failed) { + IUnknown_Release(doc); return; - doc_unk = unk; - - test_ConnectionPointContainer(unk); - test_GetCurMoniker(unk, NULL, NULL); - test_Persist(unk, http_mon); - test_Navigate(unk); - if(show_failed) { - IUnknown_Release(unk); - return; - } - - if (winetest_interactive || ! is_ie_hardened()) - test_download(DWL_HTTP); - else - win_skip("IE running in Enhanced Security Configuration\n"); - - test_cookies(unk); - test_IsDirty(unk, S_FALSE); - test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); - - test_put_href(unk); - - test_InPlaceDeactivate(unk, TRUE); - test_Close(unk, FALSE); - test_IsDirty(unk, S_FALSE); - test_GetCurMoniker(unk, http_mon, NULL); + } + + test_download(DWL_HTTP); + test_cookies(doc); + test_IsDirty(doc, S_FALSE); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); + test_GetCurMoniker((IUnknown*)doc, http_mon, NULL); + + test_put_href(doc); + + test_InPlaceDeactivate(doc, TRUE); + test_Close(doc, FALSE); + test_IsDirty(doc, S_FALSE); + test_GetCurMoniker((IUnknown*)doc, NULL, about_blank_url); if(view) IOleDocumentView_Release(view); view = NULL; - ref = IUnknown_Release(unk); + ref = IHTMLDocument2_Release(doc); ok(!ref, "ref=%d, expected 0\n", ref); ref = IMoniker_Release(http_mon); ok(!ref, "ref=%d, expected 0\n", ref); } -static void test_QueryService(IUnknown *unk, BOOL success) +static void test_QueryService(IHTMLDocument2 *doc, BOOL success) { IServiceProvider *sp; IHlinkFrame *hf; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&sp); + hres = IUnknown_QueryInterface(doc, &IID_IServiceProvider, (void**)&sp); ok(hres == S_OK, "QueryService returned %08x\n", hres); hres = IServiceProvider_QueryService(sp, &IID_IHlinkFrame, &IID_IHlinkFrame, (void**)&hf); @@ -4529,8 +4705,8 @@ static void test_HTMLDocument_StreamLoad(void) { + IHTMLDocument2 *doc; IOleObject *oleobj; - IUnknown *unk; DWORD conn; HRESULT hres; ULONG ref; @@ -4540,39 +4716,40 @@ init_test(LD_DOLOAD); load_from_stream = TRUE; - hres = create_document(&unk); + hres = create_document(&doc); if(FAILED(hres)) return; - doc_unk = unk; - - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + doc_unk = (IUnknown*)doc; + + hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise failed: %08x\n", hres); - test_readyState(unk); - test_IsDirty(unk, S_FALSE); - test_ConnectionPointContainer(unk); - test_QueryService(unk, FALSE); + test_readyState((IUnknown*)doc); + test_IsDirty(doc, S_FALSE); + test_ViewAdviseSink(doc); + test_ConnectionPointContainer(doc); + test_QueryService(doc, FALSE); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); - test_QueryService(unk, TRUE); + test_QueryService(doc, TRUE); test_DoVerb(oleobj); - test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); IOleObject_Release(oleobj); - test_GetCurMoniker(unk, NULL, NULL); - test_StreamLoad(unk); + test_GetCurMoniker((IUnknown*)doc, NULL, NULL); + test_StreamLoad(doc); test_download(DWL_VERBDONE|DWL_TRYCSS); - test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); test_UIDeactivate(); - test_InPlaceDeactivate(unk, TRUE); + test_InPlaceDeactivate(doc, TRUE); SET_EXPECT(Advise_Close); - test_Close(unk, FALSE); + test_Close(doc, FALSE); CHECK_CALLED(Advise_Close); - test_IsDirty(unk, S_FALSE); + test_IsDirty(doc, S_FALSE); if(view) { IOleDocumentView_Release(view); @@ -4580,14 +4757,14 @@ } - ref = IUnknown_Release(unk); + ref = IHTMLDocument2_Release(doc); ok(ref == 0, "ref=%d, expected 0\n", ref); } static void test_HTMLDocument_StreamInitNew(void) { + IHTMLDocument2 *doc; IOleObject *oleobj; - IUnknown *unk; DWORD conn; HRESULT hres; ULONG ref; @@ -4597,37 +4774,38 @@ init_test(LD_DOLOAD); load_from_stream = TRUE; - hres = create_document(&unk); + hres = create_document(&doc); if(FAILED(hres)) return; - doc_unk = unk; - - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + doc_unk = (IUnknown*)doc; + + hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise failed: %08x\n", hres); - test_readyState(unk); - test_IsDirty(unk, S_FALSE); - test_ConnectionPointContainer(unk); + test_readyState((IUnknown*)doc); + test_IsDirty(doc, S_FALSE); + test_ViewAdviseSink(doc); + test_ConnectionPointContainer(doc); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); - test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); IOleObject_Release(oleobj); - test_GetCurMoniker(unk, NULL, NULL); - test_StreamInitNew(unk); + test_GetCurMoniker((IUnknown*)doc, NULL, NULL); + test_StreamInitNew(doc); test_download(DWL_VERBDONE|DWL_TRYCSS|DWL_EMPTY); - test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); test_UIDeactivate(); - test_InPlaceDeactivate(unk, TRUE); + test_InPlaceDeactivate(doc, TRUE); SET_EXPECT(Advise_Close); - test_Close(unk, FALSE); + test_Close(doc, FALSE); CHECK_CALLED(Advise_Close); - test_IsDirty(unk, S_FALSE); + test_IsDirty(doc, S_FALSE); if(view) { IOleDocumentView_Release(view); @@ -4635,7 +4813,7 @@ } - ref = IUnknown_Release(unk); + ref = IHTMLDocument2_Release(doc); ok(ref == 0, "ref=%d, expected 0\n", ref); } @@ -4668,6 +4846,7 @@ static void test_editing_mode(BOOL do_load) { + IHTMLDocument2 *doc; IUnknown *unk; IOleObject *oleobj; DWORD conn; @@ -4679,40 +4858,41 @@ init_test(do_load ? LD_DOLOAD : LD_NO); call_UIActivate = CallUIActivate_AfterShow; - hres = create_document(&unk); + hres = create_document(&doc); if(FAILED(hres)) return; - doc_unk = unk; - - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + unk = doc_unk = (IUnknown*)doc; + + hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise failed: %08x\n", hres); - test_readyState(unk); - test_ConnectionPointContainer(unk); + test_readyState((IUnknown*)doc); + test_ViewAdviseSink(doc); + test_ConnectionPointContainer(doc); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); test_edit_uiactivate(oleobj); - test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); if(do_load) - test_Persist(unk, &Moniker); + test_Persist(doc, &Moniker); stream_read = protocol_read = 0; test_exec_editmode(unk, do_load); test_UIDeactivate(); call_UIActivate = CallUIActivate_None; IOleObject_Release(oleobj); - test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); test_download(DWL_VERBDONE | (do_load ? DWL_CSS|DWL_TRYCSS : 0)); SET_EXPECT(SetStatusText); /* ignore race in native mshtml */ test_timer(EXPECT_UPDATEUI); SET_CALLED(SetStatusText); - test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED|OLECMDF_ENABLED); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED|OLECMDF_ENABLED); if(!do_load) { test_exec_fontname(unk, NULL, wszTimesNewRoman); @@ -4739,9 +4919,9 @@ } test_UIDeactivate(); - test_InPlaceDeactivate(unk, TRUE); + test_InPlaceDeactivate(doc, TRUE); SET_EXPECT(Advise_Close); - test_Close(unk, FALSE); + test_Close(doc, FALSE); CHECK_CALLED(Advise_Close); if(view) { @@ -4755,7 +4935,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) { - IUnknown *unk; + IHTMLDocument2 *doc; IOleObject *oleobj; IOleInPlaceSite *inplacesite; HRESULT hres; @@ -4765,18 +4945,18 @@ init_test(do_load ? LD_DOLOAD : LD_NO); - hres = create_document(&unk); + hres = create_document(&doc); if(FAILED(hres)) return; - doc_unk = unk; + doc_unk = (IUnknown*)doc; ipsex = use_ipsex; ipsw = use_ipsw; - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); - hres = IUnknown_QueryInterface(unk, &IID_IOleDocumentView, (void**)&view); + hres = IUnknown_QueryInterface(doc, &IID_IOleDocumentView, (void**)&view); ok(hres == S_OK, "QueryInterface(IID_IOleDocumentView) failed: %08x\n", hres); SET_EXPECT(Invoke_AMBIENT_USERMODE); @@ -4789,6 +4969,7 @@ SET_EXPECT(GetOptionKeyPath); SET_EXPECT(GetOverrideKeyPath); SET_EXPECT(GetWindow); + SET_EXPECT(Exec_DOCCANNAVIGATE); SET_EXPECT(QueryStatus_SETPROGRESSTEXT); SET_EXPECT(Exec_SETPROGRESSMAX); SET_EXPECT(Exec_SETPROGRESSPOS); @@ -4806,6 +4987,7 @@ CHECK_CALLED(GetOptionKeyPath); CHECK_CALLED(GetOverrideKeyPath); CHECK_CALLED(GetWindow); + CHECK_CALLED(Exec_DOCCANNAVIGATE); CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); CHECK_CALLED(Exec_SETPROGRESSMAX); CHECK_CALLED(Exec_SETPROGRESSPOS); @@ -4893,13 +5075,13 @@ else CHECK_CALLED(OnInPlaceDeactivate); - test_Close(unk, TRUE); + test_Close(doc, TRUE); IOleObject_Release(oleobj); IOleDocumentView_Release(view); view = NULL; - ref = IUnknown_Release(unk); + ref = IHTMLDocument2_Release(doc); ok(ref == 0, "ref=%d, expected 0\n", ref); } @@ -4922,16 +5104,16 @@ static void test_HTMLDoc_ISupportErrorInfo(void) { + IHTMLDocument2 *doc; HRESULT hres; - IUnknown *unk; ISupportErrorInfo *sinfo; LONG ref; - hres = create_document(&unk); + hres = create_document(&doc); if(FAILED(hres)) return; - hres = IUnknown_QueryInterface(unk, &IID_ISupportErrorInfo, (void**)&sinfo); + hres = IUnknown_QueryInterface(doc, &IID_ISupportErrorInfo, (void**)&sinfo); ok(hres == S_OK, "got %x\n", hres); ok(sinfo != NULL, "got %p\n", sinfo); if(sinfo) @@ -4941,27 +5123,27 @@ IUnknown_Release(sinfo); } - ref = IUnknown_Release(unk); + ref = IHTMLDocument2_Release(doc); ok(ref == 0, "ref=%d, expected 0\n", ref); } static void test_IPersistHistory(void) { + IHTMLDocument2 *doc; HRESULT hres; - IUnknown *unk; LONG ref; IPersistHistory *phist; - hres = create_document(&unk); + hres = create_document(&doc); if(FAILED(hres)) return; - hres = IUnknown_QueryInterface(unk, &IID_IPersistHistory, (void**)&phist); + hres = IUnknown_QueryInterface(doc, &IID_IPersistHistory, (void**)&phist); ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); if(hres == S_OK) IPersistHistory_Release(phist); - ref = IUnknown_Release(unk); + ref = IHTMLDocument2_Release(doc); ok(ref == 0, "ref=%d, expected 0\n", ref); } Modified: trunk/rostests/winetests/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmlloca… ============================================================================== --- trunk/rostests/winetests/mshtml/htmllocation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmllocation.c [iso-8859-1] Sat Mar 6 12:43:08 2010 @@ -22,10 +22,11 @@ #include <wine/test.h> #include "mshtml.h" +#include "wininet.h" struct location_test { const char *name; - const WCHAR *url; + const char *url; const char *href; const char *protocol; @@ -37,75 +38,68 @@ const char *hash; }; -static const WCHAR http_url[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','?','s','e','a','r','c','h','#','h','a','s','h',0}; -static const struct location_test http_test = { - "HTTP", - http_url, - "http://www.winehq.org/?search#hash", - "http:", - "www.winehq.org:80", - "www.winehq.org", - "80", - "", - "?search", - "#hash" - }; - -static const WCHAR http_file_url[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','f','i','l','e','?','s','e','a','r','c','h','#','h','a','s','h',0}; -static const struct location_test http_file_test = { - "HTTP with file", - http_file_url, - "http://www.winehq.org/file?search#hash", - "http:", - "www.winehq.org:80", - "www.winehq.org", - "80", - "file", - "?search", - "#hash" - }; - -static const WCHAR ftp_url[] = {'f','t','p',':','/','/','f','t','p','.','w','i','n','e','h','q','.','o','r','g','/',0}; -static const struct location_test ftp_test = { - "FTP", - ftp_url, - "ftp://ftp.winehq.org/", - "ftp:", - "ftp.winehq.org:21", - "ftp.winehq.org", - "21", - "", - NULL, - NULL - }; - -static const WCHAR ftp_file_url[] = {'f','t','p',':','/','/','f','t','p','.','w','i','n','e','h','q','.','o','r','g','/','f','i','l','e',0}; -static const struct location_test ftp_file_test = { - "FTP with file", - ftp_file_url, - "ftp://ftp.winehq.org/file", - "ftp:", - "ftp.winehq.org:21", - "ftp.winehq.org", - "21", - "file", - NULL, - NULL - }; - -static const WCHAR file_url[] = {'f','i','l','e',':','/','/','C',':','\\','w','i','n','d','o','w','s','\\','w','i','n','.','i','n','i',0}; -static const struct location_test file_test = { - "FILE", - file_url, - "file:///C:/windows/win.ini", - "file:", - NULL, - NULL, - "", - "C:\\windows\\win.ini", - NULL, - NULL - }; +static const struct location_test location_tests[] = { + { + "HTTP", + "http://www.winehq.org?search#hash", + "http://www.winehq.org/?search#hash", + "http:", + "www.winehq.org:80", + "www.winehq.org", + "80", + "", + "?search", + "#hash" + }, + { + "HTTP with file", + "http://www.winehq.org/file?search#hash", + "http://www.winehq.org/file?search#hash", + "http:", + "www.winehq.org:80", + "www.winehq.org", + "80", + "file", + "?search", + "#hash" + }, + { + "FTP", + "ftp://ftp.winehq.org/", + "ftp://ftp.winehq.org/", + "ftp:", + "ftp.winehq.org:21", + "ftp.winehq.org", + "21", + "", + NULL, + NULL + }, + { + "FTP with file", + "ftp://ftp.winehq.org/file", + "ftp://ftp.winehq.org/file", + "ftp:", + "ftp.winehq.org:21", + "ftp.winehq.org", + "21", + "file", + NULL, + NULL + }, + { + "FILE", + "file://C:\\windows\\win.ini", + "file:///C:/windows/win.ini", + "file:", + NULL, + NULL, + "", + "C:\\windows\\win.ini", + NULL, + NULL + } +}; static int str_eq_wa(LPCWSTR strw, const char *stra) { @@ -267,6 +261,7 @@ static void perform_test(const struct location_test* test) { + WCHAR url[INTERNET_MAX_URL_LENGTH]; HRESULT hres; IBindCtx *bc; IMoniker *url_mon; @@ -280,7 +275,8 @@ if(FAILED(hres)) return; - hres = CreateURLMoniker(NULL, test->url, &url_mon); + MultiByteToWideChar(CP_ACP, 0, test->url, -1, url, sizeof(url)/sizeof(WCHAR)); + hres = CreateURLMoniker(NULL, url, &url_mon); ok(hres == S_OK, "%s: CreateURLMoniker failed: 0x%08x\n", test->name, hres); if(FAILED(hres)){ IBindCtx_Release(bc); @@ -356,13 +352,12 @@ START_TEST(htmllocation) { + int i; + CoInitialize(NULL); - perform_test(&http_test); - perform_test(&http_file_test); - perform_test(&ftp_test); - perform_test(&ftp_file_test); - perform_test(&file_test); + for(i=0; i < sizeof(location_tests)/sizeof(*location_tests); i++) + perform_test(location_tests+i); CoUninitialize(); } Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… ============================================================================== --- trunk/rostests/winetests/mshtml/script.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/script.c [iso-8859-1] Sat Mar 6 12:43:08 2010 @@ -1803,6 +1803,11 @@ test_func(dispex); test_nextdispid(dispex); + + tmp = a2bstr("test"); + hres = IDispatchEx_DeleteMemberByName(dispex, tmp, fdexNameCaseSensitive); + ok(hres == E_NOTIMPL, "DeleteMemberByName failed: %08x\n", hres); + IDispatchEx_Release(dispex); script_disp = (IDispatch*)&scriptDisp; @@ -1842,6 +1847,10 @@ CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(script_testprop2_d); SysFreeString(tmp); + + tmp = a2bstr("test"); + hres = IDispatchEx_DeleteMemberByName(window_dispex, tmp, fdexNameCaseSensitive); + ok(hres == E_NOTIMPL, "DeleteMemberByName failed: %08x\n", hres); test_global_id();

1 0

[cwittich] 45918: [MSHTML] sync mshtml to wine 1.1.40
by cwittich＠svn.reactos.org 06 Mar '10

06 Mar '10

Author: cwittich Date: Sat Mar 6 12:42:03 2010 New Revision: 45918 URL: http://svn.reactos.org/svn/reactos?rev=45918&view=rev Log: [MSHTML] sync mshtml to wine 1.1.40 Modified: trunk/reactos/dll/win32/mshtml/htmldoc.c trunk/reactos/dll/win32/mshtml/htmlscript.c trunk/reactos/dll/win32/mshtml/htmlwindow.c trunk/reactos/dll/win32/mshtml/mshtml_private.h trunk/reactos/dll/win32/mshtml/navigate.c trunk/reactos/dll/win32/mshtml/nsembed.c trunk/reactos/dll/win32/mshtml/nsiface.idl trunk/reactos/dll/win32/mshtml/nsio.c trunk/reactos/dll/win32/mshtml/oleobj.c trunk/reactos/dll/win32/mshtml/persist.c trunk/reactos/dll/win32/mshtml/rsrc.rc trunk/reactos/include/psdk/mshtml.idl Modified: trunk/reactos/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc.c… ============================================================================== --- trunk/reactos/dll/win32/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmldoc.c [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -1776,6 +1776,9 @@ }else if(IsEqualGUID(&IID_IExternalConnection, riid)) { TRACE("(%p)->(IID_IExternalConnection %p) returning NULL\n", This, ppv); *ppv = NULL; + }else if(IsEqualGUID(&IID_IStdMarshalInfo, riid)) { + TRACE("(%p)->(IID_IStdMarshalInfo %p) returning NULL\n", This, ppv); + *ppv = NULL; }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { TRACE("(%p)->(IID_IObjectWithSite %p)\n", This, ppv); *ppv = OBJSITE(This); Modified: trunk/reactos/dll/win32/mshtml/htmlscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscrip… ============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlscript.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlscript.c [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -214,8 +214,18 @@ static HRESULT WINAPI HTMLScriptElement_put_type(IHTMLScriptElement *iface, BSTR v) { HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nstype_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_Init(&nstype_str, v); + nsres = nsIDOMHTMLScriptElement_SetType(This->nsscript, &nstype_str); + if (NS_FAILED(nsres)) + ERR("SetType failed: %08x\n", nsres); + nsAString_Finish (&nstype_str); + + return S_OK; } static HRESULT WINAPI HTMLScriptElement_get_type(IHTMLScriptElement *iface, BSTR *p) Modified: trunk/reactos/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlwindo… ============================================================================== --- trunk/reactos/dll/win32/mshtml/htmlwindow.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/htmlwindow.c [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -1,5 +1,5 @@ /* - * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2006-2010 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,15 +25,17 @@ #include "winuser.h" #include "ole2.h" #include "mshtmdid.h" +#include "shlguid.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +#define HTMLPRIVWINDOW(x) ((IHTMLPrivateWindow*) &(x)->lpIHTMLPrivateWindowVtbl) static struct list window_list = LIST_INIT(window_list); @@ -166,6 +168,9 @@ }else if(IsEqualGUID(&IID_IHTMLWindow4, riid)) { TRACE("(%p)->(IID_IHTMLWindow4 %p)\n", This, ppv); *ppv = HTMLWINDOW4(This); + }else if(IsEqualGUID(&IID_IHTMLPrivateWindow, riid)) { + TRACE("(%p)->(IID_IHTMLPrivateWindow %p)\n", This, ppv); + *ppv = HTMLPRIVWINDOW(This); }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -1641,6 +1646,162 @@ HTMLWindow4_get_frameElement }; +#define HTMLPRIVWINDOW_THIS(iface) DEFINE_THIS(HTMLWindow, IHTMLPrivateWindow, iface) + +static HRESULT WINAPI HTMLPrivateWindow_QueryInterface(IHTMLPrivateWindow *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = HTMLPRIVWINDOW_THIS(iface); + + return IHTMLWindow2_QueryInterface(HTMLWINDOW2(This), riid, ppv); +} + +static ULONG WINAPI HTMLPrivateWindow_AddRef(IHTMLPrivateWindow *iface) +{ + HTMLWindow *This = HTMLPRIVWINDOW_THIS(iface); + + return IHTMLWindow2_AddRef(HTMLWINDOW2(This)); +} + +static ULONG WINAPI HTMLPrivateWindow_Release(IHTMLPrivateWindow *iface) +{ + HTMLWindow *This = HTMLPRIVWINDOW_THIS(iface); + + return IHTMLWindow2_Release(HTMLWINDOW2(This)); +} + +static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, BSTR url, BSTR arg2, BSTR arg3, + BSTR arg4, VARIANT *post_data_var, VARIANT *headers_var, ULONG flags) +{ + HTMLWindow *This = HTMLPRIVWINDOW_THIS(iface); + DWORD post_data_size = 0; + BYTE *post_data = NULL; + WCHAR *headers = NULL; + nsChannelBSC *bsc; + IMoniker *mon; + BSTR new_url; + HRESULT hres; + + TRACE("(%p)->(%s %s %s %s %s %s %x)\n", This, debugstr_w(url), debugstr_w(arg2), debugstr_w(arg3), debugstr_w(arg4), + debugstr_variant(post_data_var), debugstr_variant(headers_var), flags); + + new_url = url; + if(This->doc_obj->hostui) { + OLECHAR *translated_url = NULL; + + hres = IDocHostUIHandler_TranslateUrl(This->doc_obj->hostui, 0, url, &translated_url); + if(hres == S_OK && translated_url) { + new_url = SysAllocString(translated_url); + CoTaskMemFree(translated_url); + } + } + + if(This->doc_obj->client) { + IOleCommandTarget *cmdtrg; + + hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + VARIANT in, out; + + V_VT(&in) = VT_BSTR; + V_BSTR(&in) = new_url; + V_VT(&out) = VT_BOOL; + V_BOOL(&out) = VARIANT_TRUE; + hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 67, 0, &in, &out); + IOleCommandTarget_Release(cmdtrg); + if(SUCCEEDED(hres)) + VariantClear(&out); + } + } + + /* FIXME: Why not set_ready_state? */ + This->readystate = READYSTATE_UNINITIALIZED; + + hres = CreateURLMoniker(NULL, new_url, &mon); + if(new_url != url) + SysFreeString(new_url); + if(FAILED(hres)) + return hres; + + if(post_data_var) { + if(V_VT(post_data_var) == (VT_ARRAY|VT_UI1)) { + SafeArrayAccessData(V_ARRAY(post_data_var), (void**)&post_data); + post_data_size = V_ARRAY(post_data_var)->rgsabound[0].cElements; + } + } + + if(headers_var && V_VT(headers_var) != VT_EMPTY && V_VT(headers_var) != VT_ERROR) { + if(V_VT(headers_var) != VT_BSTR) + return E_INVALIDARG; + + headers = V_BSTR(headers_var); + } + + hres = create_channelbsc(mon, headers, post_data, post_data_size, &bsc); + if(post_data) + SafeArrayUnaccessData(V_ARRAY(post_data_var)); + if(FAILED(hres)) { + IMoniker_Release(mon); + return hres; + } + + hres = set_moniker(&This->doc_obj->basedoc, mon, NULL, bsc, TRUE); + if(SUCCEEDED(hres)) + hres = async_start_doc_binding(This, bsc); + + IUnknown_Release((IUnknown*)bsc); + IMoniker_Release(mon); + return hres; +} + +static HRESULT WINAPI HTMLPrivateWindow_GetPendingUrl(IHTMLPrivateWindow *iface, BSTR *url) +{ + HTMLWindow *This = HTMLPRIVWINDOW_THIS(iface); + FIXME("(%p)->(%p)\n", This, url); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPrivateWindow_SetPICSTarget(IHTMLPrivateWindow *iface, IOleCommandTarget *cmdtrg) +{ + HTMLWindow *This = HTMLPRIVWINDOW_THIS(iface); + FIXME("(%p)->(%p)\n", This, cmdtrg); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPrivateWindow_PICSComplete(IHTMLPrivateWindow *iface, int arg) +{ + HTMLWindow *This = HTMLPRIVWINDOW_THIS(iface); + FIXME("(%p)->(%x)\n", This, arg); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPrivateWindow_FindWindowByName(IHTMLPrivateWindow *iface, LPCWSTR name, IHTMLWindow2 **ret) +{ + HTMLWindow *This = HTMLPRIVWINDOW_THIS(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(name), ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLPrivateWindow_GetAddressBar(IHTMLPrivateWindow *iface, BSTR *url) +{ + HTMLWindow *This = HTMLPRIVWINDOW_THIS(iface); + FIXME("(%p)->(%p)\n", This, url); + return E_NOTIMPL; +} + +#undef HTMLPRIVWINDOW_THIS + +static const IHTMLPrivateWindowVtbl HTMLPrivateWindowVtbl = { + HTMLPrivateWindow_QueryInterface, + HTMLPrivateWindow_AddRef, + HTMLPrivateWindow_Release, + HTMLPrivateWindow_SuperNavigate, + HTMLPrivateWindow_GetPendingUrl, + HTMLPrivateWindow_SetPICSTarget, + HTMLPrivateWindow_PICSComplete, + HTMLPrivateWindow_FindWindowByName, + HTMLPrivateWindow_GetAddressBar +}; + #define DISPEX_THIS(iface) DEFINE_THIS(HTMLWindow, IDispatchEx, iface) static HRESULT WINAPI WindowDispEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -1954,6 +2115,7 @@ window->lpHTMLWindow2Vtbl = &HTMLWindow2Vtbl; window->lpHTMLWindow3Vtbl = &HTMLWindow3Vtbl; window->lpHTMLWindow4Vtbl = &HTMLWindow4Vtbl; + window->lpIHTMLPrivateWindowVtbl = &HTMLPrivateWindowVtbl; window->lpIDispatchExVtbl = &WindowDispExVtbl; window->ref = 1; window->doc_obj = doc_obj; Modified: trunk/reactos/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr… ============================================================================== --- trunk/reactos/dll/win32/mshtml/mshtml_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/mshtml_private.h [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -172,9 +172,11 @@ HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**); HRESULT get_dispids(tid_t,DWORD*,DISPID**); +typedef struct HTMLWindow HTMLWindow; typedef struct HTMLDocumentNode HTMLDocumentNode; typedef struct HTMLDocumentObj HTMLDocumentObj; typedef struct HTMLFrameBase HTMLFrameBase; +typedef struct NSContainer NSContainer; typedef enum { SCRIPTMODE_GECKO, @@ -226,11 +228,14 @@ LONG ref; } windowref_t; +typedef struct nsChannelBSC nsChannelBSC; + struct HTMLWindow { DispatchEx dispex; const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; const IHTMLWindow3Vtbl *lpHTMLWindow3Vtbl; const IHTMLWindow4Vtbl *lpHTMLWindow4Vtbl; + const IHTMLPrivateWindowVtbl *lpIHTMLPrivateWindowVtbl; const IDispatchExVtbl *lpIDispatchExVtbl; LONG ref; @@ -393,7 +398,7 @@ BOOL in_place_active; BOOL ui_active; BOOL window_active; - BOOL has_key_path; + BOOL hostui_setup; BOOL container_locked; BOOL focus; INT download_state; @@ -434,6 +439,11 @@ HWND reset_focus; /* hack */ }; +typedef struct nsWineURI nsWineURI; + +HRESULT set_wine_url(nsWineURI*,LPCWSTR); +nsresult on_start_uri_open(NSContainer*,nsIURI*,PRBool*); + typedef struct { const nsIHttpChannelVtbl *lpHttpChannelVtbl; const nsIUploadChannelVtbl *lpUploadChannelVtbl; @@ -441,7 +451,7 @@ LONG ref; - nsIWineURI *uri; + nsWineURI *uri; nsIInputStream *post_data_stream; nsILoadGroup *load_group; nsIInterfaceRequestor *notif_callback; @@ -696,12 +706,13 @@ BOOL install_wine_gecko(BOOL); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); -HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsIWineURI**); - -HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD); +HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsWineURI**); +HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD); + +HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD,BOOL*); HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*); HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*); -HRESULT load_nsuri(HTMLWindow*,nsIWineURI*,DWORD); +HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL); void call_property_onchanged(ConnectionPoint*,DISPID); HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*); @@ -730,11 +741,12 @@ void set_window_bscallback(HTMLWindow*,nsChannelBSC*); void set_current_mon(HTMLWindow*,IMoniker*); HRESULT start_binding(HTMLWindow*,HTMLDocumentNode*,BSCallback*,IBindCtx*); +HRESULT async_start_doc_binding(HTMLWindow*,nsChannelBSC*); void abort_document_bindings(HTMLDocumentNode*); HRESULT bind_mon_to_buffer(HTMLDocumentNode*,IMoniker*,void**,DWORD*); -nsChannelBSC *create_channelbsc(IMoniker*); +HRESULT create_channelbsc(IMoniker*,WCHAR*,BYTE*,DWORD,nsChannelBSC**); HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*); void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*); IMoniker *get_channelbsc_mon(nsChannelBSC*); Modified: trunk/reactos/dll/win32/mshtml/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/navigate.… ============================================================================== --- trunk/reactos/dll/win32/mshtml/navigate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/navigate.c [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -717,8 +717,11 @@ /* NOTE: IE7 calls IsSystemMoniker here*/ - if(window) + if(window) { + if(bscallback->mon != window->mon) + set_current_mon(window, bscallback->mon); call_docview_84(window->doc_obj); + } if(bctx) { RegisterBindStatusCallback(bctx, STATUSCLB(bscallback), NULL, 0); @@ -1087,7 +1090,7 @@ TRACE("redirect to %s\n", debugstr_w(status_text)); /* FIXME: We should find a better way to handle this */ - nsIWineURI_SetWineURL(This->nschannel->uri, status_text); + set_wine_url(This->nschannel->uri, status_text); } return S_OK; @@ -1113,13 +1116,38 @@ nsChannelBSC_on_response }; -nsChannelBSC *create_channelbsc(IMoniker *mon) -{ - nsChannelBSC *ret = heap_alloc_zero(sizeof(*ret)); +HRESULT create_channelbsc(IMoniker *mon, WCHAR *headers, BYTE *post_data, DWORD post_data_size, nsChannelBSC **retval) +{ + nsChannelBSC *ret; + + ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; init_bscallback(&ret->bsc, &nsChannelBSCVtbl, mon, BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA); - return ret; + if(headers) { + ret->bsc.headers = heap_strdupW(headers); + if(!ret->bsc.headers) { + IBindStatusCallback_Release(STATUSCLB(&ret->bsc)); + return E_OUTOFMEMORY; + } + } + + if(post_data) { + ret->bsc.post_data = GlobalAlloc(0, post_data_size); + if(!ret->bsc.post_data) { + heap_free(ret->bsc.headers); + IBindStatusCallback_Release(STATUSCLB(&ret->bsc)); + return E_OUTOFMEMORY; + } + + memcpy(ret->bsc.post_data, post_data, post_data_size); + ret->bsc.post_data_len = post_data_size; + } + + *retval = ret; + return S_OK; } IMoniker *get_channelbsc_mon(nsChannelBSC *This) @@ -1148,6 +1176,36 @@ } } +typedef struct { + task_t header; + HTMLWindow *window; + nsChannelBSC *bscallback; +} start_doc_binding_task_t; + +static void start_doc_binding_proc(task_t *_task) +{ + start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; + + start_binding(task->window, NULL, (BSCallback*)task->bscallback, NULL); + IBindStatusCallback_Release(STATUSCLB(&task->bscallback->bsc)); +} + +HRESULT async_start_doc_binding(HTMLWindow *window, nsChannelBSC *bscallback) +{ + start_doc_binding_task_t *task; + + task = heap_alloc(sizeof(start_doc_binding_task_t)); + if(!task) + return E_OUTOFMEMORY; + + task->window = window; + task->bscallback = bscallback; + IBindStatusCallback_AddRef(STATUSCLB(&bscallback->bsc)); + + push_task(&task->header, start_doc_binding_proc, window->task_magic); + return S_OK; +} + void abort_document_bindings(HTMLDocumentNode *doc) { BSCallback *iter; @@ -1196,37 +1254,43 @@ } HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, - nsIInputStream *post_data_stream, DWORD hlnf) + nsIInputStream *post_data_stream, DWORD hlnf, BOOL *cancel) { IHlinkFrame *hlink_frame; + nsChannelBSC *callback; IServiceProvider *sp; - BSCallback *callback; IBindCtx *bindctx; IMoniker *mon; IHlink *hlink; HRESULT hres; + *cancel = FALSE; + hres = IOleClientSite_QueryInterface(doc->doc_obj->client, &IID_IServiceProvider, (void**)&sp); if(FAILED(hres)) - return hres; + return S_OK; hres = IServiceProvider_QueryService(sp, &IID_IHlinkFrame, &IID_IHlinkFrame, (void**)&hlink_frame); IServiceProvider_Release(sp); if(FAILED(hres)) + return S_OK; + + hres = create_channelbsc(NULL, NULL, NULL, 0, &callback); + if(FAILED(hres)) { + IHlinkFrame_Release(hlink_frame); return hres; - - callback = &create_channelbsc(NULL)->bsc; + } if(post_data_stream) { - parse_post_data(post_data_stream, &callback->headers, &callback->post_data, - &callback->post_data_len); - TRACE("headers = %s post_data = %s\n", debugstr_w(callback->headers), - debugstr_an(callback->post_data, callback->post_data_len)); - } - - hres = CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx); + parse_post_data(post_data_stream, &callback->bsc.headers, &callback->bsc.post_data, + &callback->bsc.post_data_len); + TRACE("headers = %s post_data = %s\n", debugstr_w(callback->bsc.headers), + debugstr_an(callback->bsc.post_data, callback->bsc.post_data_len)); + } + + hres = CreateAsyncBindCtx(0, STATUSCLB(&callback->bsc), NULL, &bindctx); if(SUCCEEDED(hres)) hres = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hlink); @@ -1242,50 +1306,22 @@ IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */ } - hres = IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink); - + hres = IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(&callback->bsc), hlink); IMoniker_Release(mon); + *cancel = hres == S_OK; + hres = S_OK; } IHlinkFrame_Release(hlink_frame); IBindCtx_Release(bindctx); - IBindStatusCallback_Release(STATUSCLB(callback)); + IBindStatusCallback_Release(STATUSCLB(&callback->bsc)); return hres; } -HRESULT load_nsuri(HTMLWindow *window, nsIWineURI *uri, DWORD flags) -{ - nsIWebNavigation *web_navigation; - nsIDocShell *doc_shell; - nsresult nsres; - - nsres = get_nsinterface((nsISupports*)window->nswindow, &IID_nsIWebNavigation, (void**)&web_navigation); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIWebNavigation interface: %08x\n", nsres); - return E_FAIL; - } - - nsres = nsIWebNavigation_QueryInterface(web_navigation, &IID_nsIDocShell, (void**)&doc_shell); - nsIWebNavigation_Release(web_navigation); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDocShell: %08x\n", nsres); - return E_FAIL; - } - - nsres = nsIDocShell_LoadURI(doc_shell, (nsIURI*)uri, NULL, flags, FALSE); - nsIDocShell_Release(doc_shell); - if(NS_FAILED(nsres)) { - WARN("LoadURI failed: %08x\n", nsres); - return E_FAIL; - } - - return S_OK; -} - HRESULT navigate_url(HTMLWindow *window, const WCHAR *new_url, const WCHAR *base_url) { WCHAR url[INTERNET_MAX_URL_LENGTH]; - nsIWineURI *uri; + nsWineURI *uri; HRESULT hres; if(!new_url) { @@ -1307,23 +1343,30 @@ hres = IDocHostUIHandler_TranslateUrl(window->doc_obj->hostui, 0, url, &translated_url); if(hres == S_OK) { + TRACE("%08x %s -> %s\n", hres, debugstr_w(url), debugstr_w(translated_url)); strcpyW(url, translated_url); CoTaskMemFree(translated_url); } } if(window->doc_obj && window == window->doc_obj->basedoc.window) { - hres = hlink_frame_navigate(&window->doc->basedoc, url, NULL, 0); - if(SUCCEEDED(hres)) + BOOL cancel; + + hres = hlink_frame_navigate(&window->doc->basedoc, url, NULL, 0, &cancel); + if(FAILED(hres)) + return hres; + + if(cancel) { + TRACE("Navigation handled by hlink frame\n"); return S_OK; - TRACE("hlink_frame_navigate failed: %08x\n", hres); + } } hres = create_doc_uri(window, url, &uri); if(FAILED(hres)) return hres; - hres = load_nsuri(window, uri, LOAD_FLAGS_NONE); - nsIWineURI_Release(uri); + hres = load_nsuri(window, uri, NULL, LOAD_FLAGS_NONE); + nsISupports_Release((nsISupports*)uri); return hres; } Modified: trunk/reactos/dll/win32/mshtml/nsembed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c… ============================================================================== --- trunk/reactos/dll/win32/mshtml/nsembed.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/nsembed.c [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -1124,41 +1124,12 @@ return nsIWebBrowserChrome_Release(NSWBCHROME(This)); } -static BOOL translate_url(HTMLDocumentObj *doc, nsIWineURI *nsuri) -{ - OLECHAR *new_url = NULL, *url; - BOOL ret = FALSE; - LPCWSTR wine_url; - HRESULT hres; - - if(!doc->hostui) - return FALSE; - - nsIWineURI_GetWineURL(nsuri, &wine_url); - - url = heap_strdupW(wine_url); - hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); - heap_free(url); - if(hres != S_OK || !new_url) - return FALSE; - - if(strcmpW(url, new_url)) { - FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); - ret = TRUE; - } - - CoTaskMemFree(new_url); - return ret; -} - static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener *iface, nsIURI *aURI, PRBool *_retval) { NSContainer *This = NSURICL_THIS(iface); - nsIWineURI *wine_uri; nsACString spec_str; const char *spec; - BOOL is_doc_uri; nsresult nsres; nsACString_Init(&spec_str, NULL); @@ -1169,22 +1140,9 @@ nsACString_Finish(&spec_str); - nsres = nsIURI_QueryInterface(aURI, &IID_nsIWineURI, (void**)&wine_uri); - if(NS_FAILED(nsres)) { - WARN("Could not get nsIWineURI interface: %08x\n", nsres); - return NS_ERROR_NOT_IMPLEMENTED; - } - - nsIWineURI_GetIsDocumentURI(wine_uri, &is_doc_uri); - - if(!is_doc_uri) { - nsIWineURI_SetNSContainer(wine_uri, This); - nsIWineURI_SetIsDocumentURI(wine_uri, TRUE); - - *_retval = translate_url(This->doc->basedoc.doc_obj, wine_uri); - } - - nsIWineURI_Release(wine_uri); + nsres = on_start_uri_open(This, aURI, _retval); + if(NS_FAILED(nsres)) + return nsres; return !*_retval && This->content_listener ? nsIURIContentListener_OnStartURIOpen(This->content_listener, aURI, _retval) Modified: trunk/reactos/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsiface.i… ============================================================================== --- trunk/reactos/dll/win32/mshtml/nsiface.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/nsiface.idl [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -2820,32 +2820,3 @@ void BindToDocument(nsIDocument *aDocument, nsIContent *aContent); void DoneAddingChildren(nsIContent *aContent, PRBool aHaveNotified); } - -/* - * NOTE: - * This is a private Wine interface that is implemented by our implementation - * of nsIURI to store its owner. - */ -[ - object, - uuid(5088272e-900b-11da-c687-000fea57f21a), - local - /* INTERNAL */ -] -interface nsIWineURI : nsIURL -{ - typedef struct NSContainer NSContainer; - typedef struct HTMLWindow HTMLWindow; - typedef struct nsChannelBSC nsChannelBSC; - - nsresult GetNSContainer(NSContainer **aNSContainer); - nsresult SetNSContainer(NSContainer *aNSContainer); - nsresult GetWindow(HTMLWindow **aHTMLWindow); - nsresult SetWindow(HTMLWindow *aHTMLWindow); - nsresult GetChannelBSC(nsChannelBSC **aChannelBSC); - nsresult SetChannelBSC(nsChannelBSC *aChannelBSC); - nsresult GetIsDocumentURI(PRBool *aIsDocumentURI); - nsresult SetIsDocumentURI(PRBool aIsDocumentURI); - nsresult GetWineURL(LPCWSTR *aURL); - nsresult SetWineURL(LPCWSTR aURL); -} Modified: trunk/reactos/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsio.c?re… ============================================================================== --- trunk/reactos/dll/win32/mshtml/nsio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/nsio.c [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -43,14 +43,16 @@ static const IID NS_IOSERVICE_CID = {0x9ac9e770, 0x18bc, 0x11d3, {0x93, 0x37, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40}}; +static const IID IID_nsWineURI = + {0x5088272e, 0x900b, 0x11da, {0xc6,0x87, 0x00,0x0f,0xea,0x57,0xf2,0x1a}}; static nsIIOService *nsio = NULL; static nsINetUtil *net_util; static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; -typedef struct { - const nsIWineURIVtbl *lpWineURIVtbl; +struct nsWineURI { + const nsIURLVtbl *lpIURLVtbl; LONG ref; @@ -60,14 +62,14 @@ windowref_t *window_ref; nsChannelBSC *channel_bsc; LPWSTR wine_url; - PRBool is_doc_uri; + BOOL is_doc_uri; BOOL use_wine_url; -} nsURI; - -#define NSURI(x) ((nsIURI*) &(x)->lpWineURIVtbl) -#define NSWINEURI(x) ((nsIWineURI*) &(x)->lpWineURIVtbl) - -static nsresult create_uri(nsIURI*,HTMLWindow*,NSContainer*,nsIWineURI**); +}; + +#define NSURI(x) ((nsIURI*) &(x)->lpIURLVtbl) +#define NSURL(x) ((nsIURL*) &(x)->lpIURLVtbl) + +static nsresult create_uri(nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -129,14 +131,8 @@ { HTMLDocumentObj *doc = container->doc; DWORD hlnf = 0; - LPCWSTR uri; + BOOL cancel; HRESULT hres; - - nsIWineURI_GetWineURL(channel->uri, &uri); - if(!uri) { - ERR("GetWineURL returned NULL\n"); - return TRUE; - } if(!doc) { NSContainer *container_iter = container; @@ -150,11 +146,163 @@ if(!doc->client) return TRUE; - if(!hlnf && !exec_shldocvw_67(doc, uri)) + if(!hlnf && !exec_shldocvw_67(doc, channel->uri->wine_url)) return FALSE; - hres = hlink_frame_navigate(&doc->basedoc, uri, channel->post_data_stream, hlnf); - return hres != S_OK; + hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel->post_data_stream, hlnf, &cancel); + return FAILED(hres) || cancel; +} + +HRESULT load_nsuri(HTMLWindow *window, nsWineURI *uri, nsChannelBSC *channelbsc, DWORD flags) +{ + nsIWebNavigation *web_navigation; + nsIDocShell *doc_shell; + nsresult nsres; + + nsres = get_nsinterface((nsISupports*)window->nswindow, &IID_nsIWebNavigation, (void**)&web_navigation); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIWebNavigation interface: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIWebNavigation_QueryInterface(web_navigation, &IID_nsIDocShell, (void**)&doc_shell); + nsIWebNavigation_Release(web_navigation); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDocShell: %08x\n", nsres); + return E_FAIL; + } + + + uri->channel_bsc = channelbsc; + nsres = nsIDocShell_LoadURI(doc_shell, NSURI(uri), NULL, flags, FALSE); + uri->channel_bsc = NULL; + nsIDocShell_Release(doc_shell); + if(NS_FAILED(nsres)) { + WARN("LoadURI failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; +} + +static BOOL translate_url(HTMLDocumentObj *doc, nsWineURI *uri) +{ + OLECHAR *new_url = NULL, *url; + BOOL ret = FALSE; + HRESULT hres; + + if(!doc->hostui) + return FALSE; + + url = heap_strdupW(uri->wine_url); + hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); + heap_free(url); + if(hres != S_OK || !new_url) + return FALSE; + + if(strcmpW(url, new_url)) { + FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); + ret = TRUE; + } + + CoTaskMemFree(new_url); + return ret; +} + +nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retval) +{ + nsWineURI *wine_uri; + nsresult nsres; + + *_retval = FALSE; + + nsres = nsIURI_QueryInterface(uri, &IID_nsWineURI, (void**)&wine_uri); + if(NS_FAILED(nsres)) { + WARN("Could not get nsWineURI: %08x\n", nsres); + return NS_ERROR_NOT_IMPLEMENTED; + } + + if(!wine_uri->is_doc_uri) { + if(!wine_uri->container) { + nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer)); + wine_uri->container = nscontainer; + } + + wine_uri->is_doc_uri = TRUE; + *_retval = translate_url(nscontainer->doc->basedoc.doc_obj, wine_uri); + } + + nsIURI_Release(NSURI(wine_uri)); + return NS_OK; +} + +HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) +{ + static const WCHAR wszFtp[] = {'f','t','p',':'}; + static const WCHAR wszHttp[] = {'h','t','t','p',':'}; + static const WCHAR wszHttps[] = {'h','t','t','p','s',':'}; + + TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + + if(url) { + WCHAR *new_url; + + new_url = heap_strdupW(url); + if(!new_url) + return E_OUTOFMEMORY; + heap_free(This->wine_url); + This->wine_url = new_url; + + if(This->uri) { + /* FIXME: Always use wine url */ + This->use_wine_url = + strncmpW(url, wszFtp, sizeof(wszFtp)/sizeof(WCHAR)) + && strncmpW(url, wszHttp, sizeof(wszHttp)/sizeof(WCHAR)) + && strncmpW(url, wszHttps, sizeof(wszHttps)/sizeof(WCHAR)); + }else { + This->use_wine_url = TRUE; + } + }else { + heap_free(This->wine_url); + This->wine_url = NULL; + This->use_wine_url = FALSE; + } + + return S_OK; +} + +static void set_uri_nscontainer(nsWineURI *This, NSContainer *nscontainer) +{ + if(This->container) { + if(This->container == nscontainer) + return; + TRACE("Changing %p -> %p\n", This->container, nscontainer); + nsIWebBrowserChrome_Release(NSWBCHROME(This->container)); + } + + if(nscontainer) + nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer)); + This->container = nscontainer; +} + +static void set_uri_window(nsWineURI *This, HTMLWindow *window) +{ + if(This->window_ref) { + if(This->window_ref->window == window) + return; + TRACE("Changing %p -> %p\n", This->window_ref->window, window); + windowref_release(This->window_ref); + } + + if(window) { + windowref_addref(window->window_ref); + This->window_ref = window->window_ref; + + if(window->doc_obj) + set_uri_nscontainer(This, window->doc_obj->nscontainer); + }else { + This->window_ref = NULL; + } } static inline BOOL is_http_channel(nsChannel *This) @@ -215,7 +363,7 @@ LONG ref = InterlockedDecrement(&This->ref); if(!ref) { - nsIWineURI_Release(This->uri); + nsIURI_Release(NSURI(This->uri)); if(This->owner) nsISupports_Release(This->owner); if(This->post_data_stream) @@ -369,7 +517,7 @@ TRACE("(%p)->(%p)\n", This, aURI); - nsIWineURI_AddRef(This->uri); + nsIURI_AddRef(NSURI(This->uri)); *aURI = (nsIURI*)This->uri; return NS_OK; @@ -531,8 +679,7 @@ static HRESULT create_mon_for_nschannel(nsChannel *channel, IMoniker **mon) { - nsIWineURI *wine_uri; - LPCWSTR wine_url; + nsWineURI *wine_uri; nsresult nsres; HRESULT hres; @@ -541,22 +688,22 @@ return E_FAIL; } - nsres = nsIURI_QueryInterface(channel->original_uri, &IID_nsIWineURI, (void**)&wine_uri); + nsres = nsIURI_QueryInterface(channel->original_uri, &IID_nsWineURI, (void**)&wine_uri); if(NS_FAILED(nsres)) { - ERR("Could not get nsIWineURI: %08x\n", nsres); + ERR("Could not get nsWineURI: %08x\n", nsres); return E_FAIL; } - nsIWineURI_GetWineURL(wine_uri, &wine_url); - nsIWineURI_Release(wine_uri); - if(!wine_url) { + if(wine_uri->wine_url) { + hres = CreateURLMoniker(NULL, wine_uri->wine_url, mon); + if(FAILED(hres)) + WARN("CreateURLMoniker failed: %08x\n", hres); + }else { TRACE("wine_url == NULL\n"); - return E_FAIL; - } - - hres = CreateURLMoniker(NULL, wine_url, mon); - if(FAILED(hres)) - WARN("CreateURLMoniker failed: %08x\n", hres); + hres = E_FAIL; + } + + nsIURI_Release(NSURI(wine_uri)); return hres; } @@ -566,7 +713,7 @@ HTMLWindow *window; nsIChannel *channel; nsIRequest *req; - nsIWineURI *wine_uri; + nsWineURI *wine_uri; nsIURI *uri; nsresult nsres; @@ -593,15 +740,17 @@ return NULL; } - nsres = nsIURI_QueryInterface(uri, &IID_nsIWineURI, (void**)&wine_uri); + nsres = nsIURI_QueryInterface(uri, &IID_nsWineURI, (void**)&wine_uri); nsIURI_Release(uri); if(NS_FAILED(nsres)) { - TRACE("Could not get nsIWineURI: %08x\n", nsres); + TRACE("Could not get nsWineURI: %08x\n", nsres); return NULL; } - nsIWineURI_GetWindow(wine_uri, &window); - nsIWineURI_Release(wine_uri); + window = wine_uri->window_ref ? wine_uri->window_ref->window : NULL; + if(window) + IHTMLWindow2_AddRef(HTMLWINDOW2(window)); + nsIURI_Release(NSURI(wine_uri)); return window; } @@ -660,19 +809,7 @@ start_binding_task_t *task = (start_binding_task_t*)_task; start_binding(NULL, task->doc, (BSCallback*)task->bscallback, NULL); -} - -typedef struct { - task_t header; - HTMLWindow *window; - nsChannelBSC *bscallback; -} start_doc_binding_task_t; - -static void start_doc_binding_proc(task_t *_task) -{ - start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; - - start_binding(task->window, NULL, (BSCallback*)task->bscallback, NULL); + IUnknown_Release((IUnknown*)task->bscallback); } @@ -690,20 +827,17 @@ if(is_doc_channel) set_current_mon(window, mon); - bscallback = create_channelbsc(mon); + hres = create_channelbsc(mon, NULL, NULL, 0, &bscallback); IMoniker_Release(mon); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; channelbsc_set_channel(bscallback, This, listener, context); if(is_doc_channel) { - start_doc_binding_task_t *task; - set_window_bscallback(window, bscallback); - - task = heap_alloc(sizeof(start_doc_binding_task_t)); - task->window = window; - task->bscallback = bscallback; - push_task(&task->header, start_doc_binding_proc, window->task_magic); + async_start_doc_binding(window, bscallback); + IUnknown_Release((IUnknown*)bscallback); }else { start_binding_task_t *task = heap_alloc(sizeof(start_binding_task_t)); @@ -720,51 +854,37 @@ { nsChannel *This = NSCHANNEL_THIS(iface); HTMLWindow *window = NULL; - PRBool is_doc_uri; BOOL open = TRUE; nsresult nsres = NS_OK; - TRACE("(%p)->(%p %p)\n", This, aListener, aContext); - - if(TRACE_ON(mshtml)) { - LPCWSTR url; - - nsIWineURI_GetWineURL(This->uri, &url); - TRACE("opening %s\n", debugstr_w(url)); - } - - nsIWineURI_GetIsDocumentURI(This->uri, &is_doc_uri); - if(is_doc_uri) { + TRACE("(%p)->(%p %p) opening %s\n", This, aListener, aContext, debugstr_w(This->uri->wine_url)); + + if(This->uri->is_doc_uri) { window = get_channel_window(This); if(window) { - nsIWineURI_SetWindow(This->uri, window); - }else { - NSContainer *nscontainer; - - nsIWineURI_GetNSContainer(This->uri, &nscontainer); - if(nscontainer) { - BOOL b; - - /* nscontainer->doc should be NULL which means navigation to a new window */ - if(nscontainer->doc) - FIXME("nscontainer->doc = %p\n", nscontainer->doc); - - b = before_async_open(This, nscontainer); - nsIWebBrowserChrome_Release(NSWBCHROME(nscontainer)); - if(b) - FIXME("Navigation not cancelled\n"); - return NS_ERROR_UNEXPECTED; - } + set_uri_window(This->uri, window); + }else if(This->uri->container) { + BOOL b; + + /* nscontainer->doc should be NULL which means navigation to a new window */ + if(This->uri->container->doc) + FIXME("nscontainer->doc = %p\n", This->uri->container->doc); + + b = before_async_open(This, This->uri->container); + if(b) + FIXME("Navigation not cancelled\n"); + return NS_ERROR_UNEXPECTED; } } if(!window) { - nsIWineURI_GetWindow(This->uri, &window); - - if(!window && This->load_group) { + if(This->uri->window_ref && This->uri->window_ref->window) { + window = This->uri->window_ref->window; + IHTMLWindow2_AddRef(HTMLWINDOW2(window)); + }else if(This->load_group) { window = get_window_from_load_group(This); if(window) - nsIWineURI_SetWindow(This->uri, window); + set_uri_window(This->uri, window); } } @@ -773,13 +893,9 @@ return NS_ERROR_UNEXPECTED; } - if(is_doc_uri && window == window->doc_obj->basedoc.window) { - nsChannelBSC *channel_bsc; - - nsIWineURI_GetChannelBSC(This->uri, &channel_bsc); - if(channel_bsc) { - channelbsc_set_channel(channel_bsc, This, aListener, aContext); - IUnknown_Release((IUnknown*)channel_bsc); + if(This->uri->is_doc_uri && window == window->doc_obj->basedoc.window) { + if(This->uri->channel_bsc) { + channelbsc_set_channel(This->uri->channel_bsc, This, aListener, aContext); if(window->doc_obj->mime) { heap_free(This->content_type); @@ -797,7 +913,7 @@ } if(open) - nsres = async_open(This, window, is_doc_uri, aListener, aContext); + nsres = async_open(This, window, This->uri->is_doc_uri, aListener, aContext); IHTMLWindow2_Release(HTMLWINDOW2(window)); return nsres; @@ -1225,11 +1341,11 @@ nsHttpChannelInternal_SetForceAllowThirdPartyCookie }; -#define NSURI_THIS(iface) DEFINE_THIS(nsURI, WineURI, iface) - -static nsresult NSAPI nsURI_QueryInterface(nsIWineURI *iface, nsIIDRef riid, nsQIResult result) -{ - nsURI *This = NSURI_THIS(iface); +#define NSURI_THIS(iface) DEFINE_THIS(nsWineURI, IURL, iface) + +static nsresult NSAPI nsURI_QueryInterface(nsIURL *iface, nsIIDRef riid, nsQIResult result) +{ + nsWineURI *This = NSURI_THIS(iface); *result = NULL; @@ -1241,10 +1357,10 @@ *result = NSURI(This); }else if(IsEqualGUID(&IID_nsIURL, riid)) { TRACE("(%p)->(IID_nsIURL %p)\n", This, result); - *result = NSURI(This); - }else if(IsEqualGUID(&IID_nsIWineURI, riid)) { - TRACE("(%p)->(IID_nsIWineURI %p)\n", This, result); - *result = NSURI(This); + *result = NSURL(This); + }else if(IsEqualGUID(&IID_nsWineURI, riid)) { + TRACE("(%p)->(IID_nsWineURI %p)\n", This, result); + *result = This; } if(*result) { @@ -1256,9 +1372,9 @@ return This->uri ? nsIURI_QueryInterface(This->uri, riid, result) : NS_NOINTERFACE; } -static nsrefcnt NSAPI nsURI_AddRef(nsIWineURI *iface) -{ - nsURI *This = NSURI_THIS(iface); +static nsrefcnt NSAPI nsURI_AddRef(nsIURL *iface) +{ + nsWineURI *This = NSURI_THIS(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -1266,9 +1382,9 @@ return ref; } -static nsrefcnt NSAPI nsURI_Release(nsIWineURI *iface) -{ - nsURI *This = NSURI_THIS(iface); +static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) +{ + nsWineURI *This = NSURI_THIS(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -1289,9 +1405,9 @@ return ref; } -static nsresult NSAPI nsURI_GetSpec(nsIWineURI *iface, nsACString *aSpec) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetSpec(nsIURL *iface, nsACString *aSpec) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aSpec); @@ -1311,9 +1427,9 @@ } -static nsresult NSAPI nsURI_SetSpec(nsIWineURI *iface, const nsACString *aSpec) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aSpec); @@ -1324,9 +1440,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetPrePath(nsIWineURI *iface, nsACString *aPrePath) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetPrePath(nsIURL *iface, nsACString *aPrePath) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aPrePath); @@ -1337,9 +1453,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetScheme(nsIWineURI *iface, nsACString *aScheme) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetScheme(nsIURL *iface, nsACString *aScheme) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aScheme); @@ -1359,9 +1475,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_SetScheme(nsIWineURI *iface, const nsACString *aScheme) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_SetScheme(nsIURL *iface, const nsACString *aScheme) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aScheme); @@ -1372,9 +1488,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetUserPass(nsIWineURI *iface, nsACString *aUserPass) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetUserPass(nsIURL *iface, nsACString *aUserPass) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aUserPass); @@ -1385,9 +1501,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_SetUserPass(nsIWineURI *iface, const nsACString *aUserPass) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_SetUserPass(nsIURL *iface, const nsACString *aUserPass) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aUserPass); @@ -1398,9 +1514,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetUsername(nsIWineURI *iface, nsACString *aUsername) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetUsername(nsIURL *iface, nsACString *aUsername) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aUsername); @@ -1411,9 +1527,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_SetUsername(nsIWineURI *iface, const nsACString *aUsername) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_SetUsername(nsIURL *iface, const nsACString *aUsername) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aUsername); @@ -1424,9 +1540,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetPassword(nsIWineURI *iface, nsACString *aPassword) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetPassword(nsIURL *iface, nsACString *aPassword) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aPassword); @@ -1437,9 +1553,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_SetPassword(nsIWineURI *iface, const nsACString *aPassword) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_SetPassword(nsIURL *iface, const nsACString *aPassword) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aPassword); @@ -1450,9 +1566,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetHostPort(nsIWineURI *iface, nsACString *aHostPort) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetHostPort(nsIURL *iface, nsACString *aHostPort) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aHostPort); @@ -1463,9 +1579,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_SetHostPort(nsIWineURI *iface, const nsACString *aHostPort) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_SetHostPort(nsIURL *iface, const nsACString *aHostPort) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aHostPort); @@ -1476,9 +1592,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetHost(nsIWineURI *iface, nsACString *aHost) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetHost(nsIURL *iface, nsACString *aHost) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aHost); @@ -1489,9 +1605,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_SetHost(nsIWineURI *iface, const nsACString *aHost) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_SetHost(nsIURL *iface, const nsACString *aHost) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aHost); @@ -1502,9 +1618,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetPort(nsIWineURI *iface, PRInt32 *aPort) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetPort(nsIURL *iface, PRInt32 *aPort) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aPort); @@ -1515,9 +1631,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_SetPort(nsIWineURI *iface, PRInt32 aPort) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_SetPort(nsIURL *iface, PRInt32 aPort) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%d)\n", This, aPort); @@ -1528,9 +1644,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetPath(nsIWineURI *iface, nsACString *aPath) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetPath(nsIURL *iface, nsACString *aPath) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aPath); @@ -1541,9 +1657,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_SetPath(nsIWineURI *iface, const nsACString *aPath) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_SetPath(nsIURL *iface, const nsACString *aPath) +{ + nsWineURI *This = NSURI_THIS(iface); const char *path; nsACString_GetData(aPath, &path); @@ -1560,7 +1676,7 @@ hres = UrlCombineW(This->wine_url, pathw, new_url, &size, 0); heap_free(pathw); if(SUCCEEDED(hres)) - nsIWineURI_SetWineURL(NSWINEURI(This), new_url); + set_wine_url(This, new_url); else WARN("UrlCombine failed: %08x\n", hres); } @@ -1571,11 +1687,10 @@ return nsIURI_SetPath(This->uri, aPath); } -static nsresult NSAPI nsURI_Equals(nsIWineURI *iface, nsIURI *other, PRBool *_retval) -{ - nsURI *This = NSURI_THIS(iface); - nsIWineURI *wine_uri; - LPCWSTR other_url = NULL; +static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval) +{ + nsWineURI *This = NSURI_THIS(iface); + nsWineURI *wine_uri; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, other, _retval); @@ -1583,23 +1698,22 @@ if(This->uri) return nsIURI_Equals(This->uri, other, _retval); - nsres = nsIURI_QueryInterface(other, &IID_nsIWineURI, (void**)&wine_uri); + nsres = nsIURI_QueryInterface(other, &IID_nsWineURI, (void**)&wine_uri); if(NS_FAILED(nsres)) { - TRACE("Could not get nsIWineURI interface\n"); + TRACE("Could not get nsWineURI interface\n"); *_retval = FALSE; return NS_OK; } - nsIWineURI_GetWineURL(wine_uri, &other_url); - *_retval = other_url && !UrlCompareW(This->wine_url, other_url, TRUE); - nsIWineURI_Release(wine_uri); + *_retval = wine_uri->wine_url && !UrlCompareW(This->wine_url, wine_uri->wine_url, TRUE); + nsIURI_Release(NSURI(wine_uri)); return NS_OK; } -static nsresult NSAPI nsURI_SchemeIs(nsIWineURI *iface, const char *scheme, PRBool *_retval) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool *_retval) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_a(scheme), _retval); @@ -1620,11 +1734,11 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_Clone(nsIWineURI *iface, nsIURI **_retval) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) +{ + nsWineURI *This = NSURI_THIS(iface); nsIURI *nsuri = NULL; - nsIWineURI *wine_uri; + nsWineURI *wine_uri; nsresult nsres; TRACE("(%p)->(%p)\n", This, _retval); @@ -1643,14 +1757,16 @@ return nsres; } - *_retval = (nsIURI*)wine_uri; - return nsIWineURI_SetWineURL(wine_uri, This->wine_url); -} - -static nsresult NSAPI nsURI_Resolve(nsIWineURI *iface, const nsACString *arelativePath, + set_wine_url(wine_uri, This->wine_url); + + *_retval = NSURI(wine_uri); + return NS_OK; +} + +static nsresult NSAPI nsURI_Resolve(nsIURL *iface, const nsACString *arelativePath, nsACString *_retval) { - nsURI *This = NSURI_THIS(iface); + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p %p)\n", This, arelativePath, _retval); @@ -1661,9 +1777,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetAsciiSpec(nsIWineURI *iface, nsACString *aAsciiSpec) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetAsciiSpec(nsIURL *iface, nsACString *aAsciiSpec) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aAsciiSpec); @@ -1677,9 +1793,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetAsciiHost(nsIWineURI *iface, nsACString *aAsciiHost) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetAsciiHost(nsIURL *iface, nsACString *aAsciiHost) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aAsciiHost); @@ -1690,9 +1806,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetOriginCharset(nsIWineURI *iface, nsACString *aOriginCharset) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginCharset) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aOriginCharset); @@ -1703,9 +1819,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_GetFilePath(nsIWineURI *iface, nsACString *aFilePath) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_GetFilePath(nsIURL *iface, nsACString *aFilePath) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aFilePath); @@ -1716,9 +1832,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_SetFilePath(nsIWineURI *iface, const nsACString *aFilePath) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_SetFilePath(nsIURL *iface, const nsACString *aFilePath) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFilePath)); @@ -1729,9 +1845,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_GetParam(nsIWineURI *iface, nsACString *aParam) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_GetParam(nsIURL *iface, nsACString *aParam) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aParam); @@ -1742,9 +1858,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_SetParam(nsIWineURI *iface, const nsACString *aParam) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_SetParam(nsIURL *iface, const nsACString *aParam) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aParam)); @@ -1755,9 +1871,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_GetQuery(nsIWineURI *iface, nsACString *aQuery) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_GetQuery(nsIURL *iface, nsACString *aQuery) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aQuery); @@ -1768,9 +1884,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_SetQuery(nsIWineURI *iface, const nsACString *aQuery) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery) +{ + nsWineURI *This = NSURI_THIS(iface); const WCHAR *ptr1, *ptr2; const char *query; WCHAR *new_url, *ptr; @@ -1821,9 +1937,9 @@ return NS_OK; } -static nsresult NSAPI nsURL_GetRef(nsIWineURI *iface, nsACString *aRef) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_GetRef(nsIURL *iface, nsACString *aRef) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aRef); @@ -1834,9 +1950,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_SetRef(nsIWineURI *iface, const nsACString *aRef) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_SetRef(nsIURL *iface, const nsACString *aRef) +{ + nsWineURI *This = NSURI_THIS(iface); const char *refa; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRef)); @@ -1852,9 +1968,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_GetDirectory(nsIWineURI *iface, nsACString *aDirectory) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aDirectory); @@ -1865,9 +1981,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_SetDirectory(nsIWineURI *iface, const nsACString *aDirectory) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_SetDirectory(nsIURL *iface, const nsACString *aDirectory) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aDirectory)); @@ -1878,9 +1994,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_GetFileName(nsIWineURI *iface, nsACString *aFileName) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_GetFileName(nsIURL *iface, nsACString *aFileName) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aFileName); @@ -1891,9 +2007,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_SetFileName(nsIWineURI *iface, const nsACString *aFileName) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_SetFileName(nsIURL *iface, const nsACString *aFileName) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileName)); @@ -1904,9 +2020,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_GetFileBaseName(nsIWineURI *iface, nsACString *aFileBaseName) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_GetFileBaseName(nsIURL *iface, nsACString *aFileBaseName) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aFileBaseName); @@ -1917,9 +2033,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_SetFileBaseName(nsIWineURI *iface, const nsACString *aFileBaseName) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_SetFileBaseName(nsIURL *iface, const nsACString *aFileBaseName) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileBaseName)); @@ -1930,9 +2046,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_GetFileExtension(nsIWineURI *iface, nsACString *aFileExtension) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_GetFileExtension(nsIURL *iface, nsACString *aFileExtension) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p)\n", This, aFileExtension); @@ -1943,9 +2059,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_SetFileExtension(nsIWineURI *iface, const nsACString *aFileExtension) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_SetFileExtension(nsIURL *iface, const nsACString *aFileExtension) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileExtension)); @@ -1956,9 +2072,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_GetCommonBaseSpec(nsIWineURI *iface, nsIURI *aURIToCompare, nsACString *_retval) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_GetCommonBaseSpec(nsIURL *iface, nsIURI *aURIToCompare, nsACString *_retval) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p %p)\n", This, aURIToCompare, _retval); @@ -1969,9 +2085,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURL_GetRelativeSpec(nsIWineURI *iface, nsIURI *aURIToCompare, nsACString *_retval) -{ - nsURI *This = NSURI_THIS(iface); +static nsresult NSAPI nsURL_GetRelativeSpec(nsIURL *iface, nsIURI *aURIToCompare, nsACString *_retval) +{ + nsWineURI *This = NSURI_THIS(iface); TRACE("(%p)->(%p %p)\n", This, aURIToCompare, _retval); @@ -1982,174 +2098,9 @@ return NS_ERROR_NOT_IMPLEMENTED; } -static nsresult NSAPI nsURI_GetNSContainer(nsIWineURI *iface, NSContainer **aContainer) -{ - nsURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aContainer); - - if(This->container) - nsIWebBrowserChrome_AddRef(NSWBCHROME(This->container)); - *aContainer = This->container; - - return NS_OK; -} - -static nsresult NSAPI nsURI_SetNSContainer(nsIWineURI *iface, NSContainer *aContainer) -{ - nsURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aContainer); - - if(This->container) { - if(This->container == aContainer) - return NS_OK; - TRACE("Changing %p -> %p\n", This->container, aContainer); - nsIWebBrowserChrome_Release(NSWBCHROME(This->container)); - } - - if(aContainer) - nsIWebBrowserChrome_AddRef(NSWBCHROME(aContainer)); - This->container = aContainer; - - return NS_OK; -} - -static nsresult NSAPI nsURI_GetWindow(nsIWineURI *iface, HTMLWindow **aHTMLWindow) -{ - nsURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aHTMLWindow); - - if(This->window_ref && This->window_ref->window) { - IHTMLWindow2_AddRef(HTMLWINDOW2(This->window_ref->window)); - *aHTMLWindow = This->window_ref->window; - }else { - *aHTMLWindow = NULL; - } - - return NS_OK; -} - -static nsresult NSAPI nsURI_SetWindow(nsIWineURI *iface, HTMLWindow *aHTMLWindow) -{ - nsURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aHTMLWindow); - - if(This->window_ref) { - if(This->window_ref->window == aHTMLWindow) - return NS_OK; - TRACE("Changing %p -> %p\n", This->window_ref->window, aHTMLWindow); - windowref_release(This->window_ref); - } - - if(aHTMLWindow) { - windowref_addref(aHTMLWindow->window_ref); - This->window_ref = aHTMLWindow->window_ref; - - if(aHTMLWindow->doc_obj) - nsIWineURI_SetNSContainer(NSWINEURI(This), aHTMLWindow->doc_obj->nscontainer); - }else { - This->window_ref = NULL; - } - - return NS_OK; -} - -static nsresult NSAPI nsURI_GetChannelBSC(nsIWineURI *iface, nsChannelBSC **aChannelBSC) -{ - nsURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aChannelBSC); - - if(This->channel_bsc) - IUnknown_AddRef((IUnknown*)This->channel_bsc); - *aChannelBSC = This->channel_bsc; - return NS_OK; -} - -static nsresult NSAPI nsURI_SetChannelBSC(nsIWineURI *iface, nsChannelBSC *aChannelBSC) -{ - nsURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aChannelBSC); - - if(This->channel_bsc) - IUnknown_Release((IUnknown*)This->channel_bsc); - if(aChannelBSC) - IUnknown_AddRef((IUnknown*)aChannelBSC); - This->channel_bsc = aChannelBSC; - return NS_OK; -} - -static nsresult NSAPI nsURI_GetIsDocumentURI(nsIWineURI *iface, PRBool *aIsDocumentURI) -{ - nsURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aIsDocumentURI); - - *aIsDocumentURI = This->is_doc_uri; - return NS_OK; -} - -static nsresult NSAPI nsURI_SetIsDocumentURI(nsIWineURI *iface, PRBool aIsDocumentURI) -{ - nsURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%x)\n", This, aIsDocumentURI); - - This->is_doc_uri = aIsDocumentURI; - return NS_OK; -} - -static nsresult NSAPI nsURI_GetWineURL(nsIWineURI *iface, LPCWSTR *aURL) -{ - nsURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aURL); - - *aURL = This->wine_url; - return NS_OK; -} - -static nsresult NSAPI nsURI_SetWineURL(nsIWineURI *iface, LPCWSTR aURL) -{ - nsURI *This = NSURI_THIS(iface); - - static const WCHAR wszFtp[] = {'f','t','p',':'}; - static const WCHAR wszHttp[] = {'h','t','t','p',':'}; - static const WCHAR wszHttps[] = {'h','t','t','p','s',':'}; - - TRACE("(%p)->(%s)\n", This, debugstr_w(aURL)); - - heap_free(This->wine_url); - - if(aURL) { - int len = strlenW(aURL)+1; - This->wine_url = heap_alloc(len*sizeof(WCHAR)); - memcpy(This->wine_url, aURL, len*sizeof(WCHAR)); - - if(This->uri) { - /* FIXME: Always use wine url */ - This->use_wine_url = - strncmpW(aURL, wszFtp, sizeof(wszFtp)/sizeof(WCHAR)) - && strncmpW(aURL, wszHttp, sizeof(wszHttp)/sizeof(WCHAR)) - && strncmpW(aURL, wszHttps, sizeof(wszHttps)/sizeof(WCHAR)); - }else { - This->use_wine_url = TRUE; - } - }else { - This->wine_url = NULL; - This->use_wine_url = FALSE; - } - - return NS_OK; -} - #undef NSURI_THIS -static const nsIWineURIVtbl nsWineURIVtbl = { +static const nsIURLVtbl nsURLVtbl = { nsURI_QueryInterface, nsURI_AddRef, nsURI_Release, @@ -2196,51 +2147,39 @@ nsURL_GetFileExtension, nsURL_SetFileExtension, nsURL_GetCommonBaseSpec, - nsURL_GetRelativeSpec, - nsURI_GetNSContainer, - nsURI_SetNSContainer, - nsURI_GetWindow, - nsURI_SetWindow, - nsURI_GetChannelBSC, - nsURI_SetChannelBSC, - nsURI_GetIsDocumentURI, - nsURI_SetIsDocumentURI, - nsURI_GetWineURL, - nsURI_SetWineURL + nsURL_GetRelativeSpec }; -static nsresult create_uri(nsIURI *uri, HTMLWindow *window, NSContainer *container, nsIWineURI **_retval) -{ - nsURI *ret = heap_alloc_zero(sizeof(nsURI)); - - ret->lpWineURIVtbl = &nsWineURIVtbl; +static nsresult create_uri(nsIURI *uri, HTMLWindow *window, NSContainer *container, nsWineURI **_retval) +{ + nsWineURI *ret = heap_alloc_zero(sizeof(nsWineURI)); + + ret->lpIURLVtbl = &nsURLVtbl; ret->ref = 1; ret->uri = uri; - nsIWineURI_SetNSContainer(NSWINEURI(ret), container); - nsIWineURI_SetWindow(NSWINEURI(ret), window); + set_uri_nscontainer(ret, container); + set_uri_window(ret, window); if(uri) nsIURI_QueryInterface(uri, &IID_nsIURL, (void**)&ret->nsurl); - else - ret->nsurl = NULL; TRACE("retval=%p\n", ret); - *_retval = NSWINEURI(ret); + *_retval = ret; return NS_OK; } -HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsIWineURI **ret) -{ - nsIWineURI *uri; +HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsWineURI **ret) +{ + nsWineURI *uri; nsresult nsres; nsres = create_uri(NULL, window, window->doc_obj->nscontainer, &uri); if(NS_FAILED(nsres)) return E_FAIL; - nsIWineURI_SetWineURL(uri, url); - nsIWineURI_SetIsDocumentURI(uri, TRUE); + set_wine_url(uri, url); + uri->is_doc_uri = TRUE; *ret = uri; return S_OK; @@ -2470,11 +2409,11 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *aSpec, const char *aOriginCharset, nsIURI *aBaseURI, nsIURI **_retval) { + nsWineURI *wine_uri, *base_wine_uri = NULL; const char *spec = NULL; HTMLWindow *window = NULL; nsIURI *uri = NULL; LPCWSTR base_wine_url = NULL; - nsIWineURI *base_wine_uri = NULL, *wine_uri; BOOL is_wine_uri = FALSE; nsresult nsres; @@ -2494,16 +2433,19 @@ if(aBaseURI) { PARSEDURLA parsed_url = {sizeof(PARSEDURLA)}; - nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsIWineURI, (void**)&base_wine_uri); + nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsWineURI, (void**)&base_wine_uri); if(NS_SUCCEEDED(nsres)) { - nsIWineURI_GetWineURL(base_wine_uri, &base_wine_url); - nsIWineURI_GetWindow(base_wine_uri, &window); + base_wine_url = base_wine_uri->wine_url; + if(base_wine_uri->window_ref && base_wine_uri->window_ref->window) { + window = base_wine_uri->window_ref->window; + IHTMLWindow2_AddRef(HTMLWINDOW2(window)); + } TRACE("base url: %s window: %p\n", debugstr_w(base_wine_url), window); }else if(FAILED(ParseURLA(spec, &parsed_url))) { TRACE("not wraping\n"); return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); }else { - WARN("Could not get base nsIWineURI: %08x\n", nsres); + WARN("Could not get base nsWineURI: %08x\n", nsres); } } @@ -2528,18 +2470,18 @@ URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, url, sizeof(url)/sizeof(WCHAR), &len, 0); if(SUCCEEDED(hres)) - nsIWineURI_SetWineURL(wine_uri, url); + set_wine_url(wine_uri, url); else WARN("CoCombineUrl failed: %08x\n", hres); }else if(is_wine_uri) { WCHAR url[INTERNET_MAX_URL_LENGTH]; MultiByteToWideChar(CP_ACP, 0, spec, -1, url, sizeof(url)/sizeof(WCHAR)); - nsIWineURI_SetWineURL(wine_uri, url); + set_wine_url(wine_uri, url); } if(base_wine_uri) - nsIWineURI_Release(base_wine_uri); + nsIURI_Release(NSURI(base_wine_uri)); return nsres; } @@ -2556,15 +2498,14 @@ { PARSEDURLW parsed_url = {sizeof(PARSEDURLW)}; nsChannel *ret; - nsIWineURI *wine_uri; - const WCHAR *url; + nsWineURI *wine_uri; nsresult nsres; TRACE("(%p %p)\n", aURI, _retval); - nsres = nsIURI_QueryInterface(aURI, &IID_nsIWineURI, (void**)&wine_uri); + nsres = nsIURI_QueryInterface(aURI, &IID_nsWineURI, (void**)&wine_uri); if(NS_FAILED(nsres)) { - TRACE("Could not get nsIWineURI: %08x\n", nsres); + TRACE("Could not get nsWineURI: %08x\n", nsres); return nsIIOService_NewChannelFromURI(nsio, aURI, _retval); } @@ -2578,9 +2519,8 @@ nsIURI_AddRef(aURI); ret->original_uri = aURI; - - nsIWineURI_GetWineURL(wine_uri, &url); - ret->url_scheme = url && SUCCEEDED(ParseURLW(url, &parsed_url)) ? parsed_url.nScheme : URL_SCHEME_UNKNOWN; + ret->url_scheme = wine_uri->wine_url && SUCCEEDED(ParseURLW(wine_uri->wine_url, &parsed_url)) + ? parsed_url.nScheme : URL_SCHEME_UNKNOWN; *_retval = NSCHANNEL(ret); return NS_OK; Modified: trunk/reactos/dll/win32/mshtml/oleobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/oleobj.c?… ============================================================================== --- trunk/reactos/dll/win32/mshtml/oleobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/oleobj.c [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -34,8 +34,12 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); +#define DOCHOST_DOCCANNAVIGATE 0 /********************************************************** * IOleObject implementation @@ -92,6 +96,7 @@ HTMLDocument *This = OLEOBJ_THIS(iface); IDocHostUIHandler *pDocHostUIHandler = NULL; IOleCommandTarget *cmdtrg = NULL; + BOOL hostui_setup; VARIANT silent; HRESULT hres; @@ -115,6 +120,8 @@ if(!pClientSite) return S_OK; + + hostui_setup = This->doc_obj->hostui_setup; hres = IOleObject_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&pDocHostUIHandler); if(SUCCEEDED(hres)) { @@ -133,7 +140,7 @@ This->doc_obj->hostinfo = hostinfo; } - if(!This->doc_obj->has_key_path) { + if(!hostui_setup) { hres = IDocHostUIHandler_GetOptionKeyPath(pDocHostUIHandler, &key_path, 0); if(hres == S_OK && key_path) { if(key_path[0]) { @@ -157,7 +164,7 @@ IDocHostUIHandler2_Release(pDocHostUIHandler2); } - This->doc_obj->has_key_path = TRUE; + This->doc_obj->hostui_setup = TRUE; } } @@ -178,6 +185,12 @@ if(SUCCEEDED(hres)) { VARIANT var; OLECMD cmd = {OLECMDID_SETPROGRESSTEXT, 0}; + + if(!hostui_setup) { + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)HTMLWINDOW2(This->window); + IOleCommandTarget_Exec(cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0, &var, NULL); + } IOleCommandTarget_QueryStatus(cmdtrg, NULL, 1, &cmd, NULL); Modified: trunk/reactos/dll/win32/mshtml/persist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/persist.c… ============================================================================== --- trunk/reactos/dll/win32/mshtml/persist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/persist.c [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -155,6 +155,9 @@ doc->download_state = 1; } + if(doc->view_sink) + IAdviseSink_OnViewChange(doc->view_sink, DVASPECT_CONTENT, -1); + if(doc->hostui) { IDropTarget *drop_target = NULL; @@ -166,50 +169,15 @@ } } -static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL set_download) +HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannelBSC *async_bsc, BOOL set_download) { nsChannelBSC *bscallback; - LPOLESTR url = NULL; docobj_task_t *task; download_proc_task_t *download_task; - nsIWineURI *nsuri; + nsWineURI *nsuri; + LPOLESTR url; HRESULT hres; - if(pibc) { - IUnknown *unk = NULL; - - /* FIXME: - * Use params: - * "__PrecreatedObject" - * "BIND_CONTEXT_PARAM" - * "__HTMLLOADOPTIONS" - * "__DWNBINDINFO" - * "URL Context" - * "CBinding Context" - * "_ITransData_Object_" - * "_EnumFORMATETC_" - */ - - IBindCtx_GetObjectParam(pibc, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, &unk); - if(unk) { - IOleClientSite *client = NULL; - - hres = IUnknown_QueryInterface(unk, &IID_IOleClientSite, (void**)&client); - if(SUCCEEDED(hres)) { - TRACE("Got client site %p\n", client); - IOleObject_SetClientSite(OLEOBJ(This), client); - IOleClientSite_Release(client); - } - - IUnknown_Release(unk); - } - } - - set_ready_state(This->window, READYSTATE_LOADING); - update_doc(This, UPDATE_TITLE); - - HTMLDocument_LockContainer(This->doc_obj, TRUE); - hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); if(FAILED(hres)) { WARN("GetDiaplayName failed: %08x\n", hres); @@ -218,11 +186,8 @@ TRACE("got url: %s\n", debugstr_w(url)); - set_current_mon(This->window, mon); - if(This->doc_obj->client) { VARIANT silent, offline; - IOleCommandTarget *cmdtrg = NULL; hres = get_client_disp_property(This->doc_obj->client, DISPID_AMBIENT_SILENT, &silent); if(SUCCEEDED(hres)) { @@ -240,15 +205,37 @@ else if(V_BOOL(&silent)) FIXME("offline == true\n"); } + } + + if(This->window->mon) { + update_doc(This, UPDATE_TITLE|UPDATE_UI); + }else { + update_doc(This, UPDATE_TITLE); + set_current_mon(This->window, mon); + } + + set_ready_state(This->window, READYSTATE_LOADING); + + if(This->doc_obj->client) { + IOleCommandTarget *cmdtrg = NULL; hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); if(SUCCEEDED(hres)) { - VARIANT var; - - V_VT(&var) = VT_I4; - V_I4(&var) = 0; - IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); + VARIANT var, out; + + if(!async_bsc) { + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); + }else { + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)HTMLWINDOW2(This->window); + V_VT(&out) = VT_EMPTY; + hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 63, 0, &var, &out); + if(SUCCEEDED(hres)) + VariantClear(&out); + } IOleCommandTarget_Release(cmdtrg); } @@ -259,16 +246,24 @@ if(FAILED(hres)) return hres; - bscallback = create_channelbsc(mon); - - nsIWineURI_SetChannelBSC(nsuri, bscallback); - hres = load_nsuri(This->window, nsuri, LOAD_INITIAL_DOCUMENT_URI); - nsIWineURI_SetChannelBSC(nsuri, NULL); + if(async_bsc) { + bscallback = async_bsc; + }else { + hres = create_channelbsc(mon, NULL, NULL, 0, &bscallback); + if(FAILED(hres)) + return hres; + } + + hres = load_nsuri(This->window, nsuri, bscallback, LOAD_INITIAL_DOCUMENT_URI); + nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(SUCCEEDED(hres)) set_window_bscallback(This->window, bscallback); - IUnknown_Release((IUnknown*)bscallback); + if(bscallback != async_bsc) + IUnknown_Release((IUnknown*)bscallback); if(FAILED(hres)) return hres; + + HTMLDocument_LockContainer(This->doc_obj, TRUE); if(This->doc_obj->frame) { task = heap_alloc(sizeof(docobj_task_t)); @@ -375,7 +370,36 @@ TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode); - hres = set_moniker(This, pimkName, pibc, TRUE); + if(pibc) { + IUnknown *unk = NULL; + + /* FIXME: + * Use params: + * "__PrecreatedObject" + * "BIND_CONTEXT_PARAM" + * "__HTMLLOADOPTIONS" + * "__DWNBINDINFO" + * "URL Context" + * "_ITransData_Object_" + * "_EnumFORMATETC_" + */ + + IBindCtx_GetObjectParam(pibc, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, &unk); + if(unk) { + IOleClientSite *client = NULL; + + hres = IUnknown_QueryInterface(unk, &IID_IOleClientSite, (void**)&client); + if(SUCCEEDED(hres)) { + TRACE("Got client site %p\n", client); + IOleObject_SetClientSite(OLEOBJ(This), client); + IOleClientSite_Release(client); + } + + IUnknown_Release(unk); + } + } + + hres = set_moniker(This, pimkName, pibc, NULL, TRUE); if(FAILED(hres)) return hres; @@ -636,7 +660,7 @@ return hres; } - hres = set_moniker(This, mon, NULL, TRUE); + hres = set_moniker(This, mon, NULL, NULL, TRUE); IMoniker_Release(mon); if(FAILED(hres)) return hres; @@ -682,44 +706,24 @@ { HTMLDocument *This = PERSTRINIT_THIS(iface); IMoniker *mon; - HGLOBAL body; - LPSTREAM stream; HRESULT hres; static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - static const WCHAR html_bodyW[] = {'<','H','T','M','L','>','<','/','H','T','M','L','>',0}; TRACE("(%p)\n", This); - - body = GlobalAlloc(0, sizeof(html_bodyW)); - if(!body) - return E_OUTOFMEMORY; - memcpy(body, html_bodyW, sizeof(html_bodyW)); hres = CreateURLMoniker(NULL, about_blankW, &mon); if(FAILED(hres)) { WARN("CreateURLMoniker failed: %08x\n", hres); - GlobalFree(body); return hres; } - hres = set_moniker(This, mon, NULL, FALSE); + hres = set_moniker(This, mon, NULL, NULL, FALSE); IMoniker_Release(mon); - if(FAILED(hres)) { - GlobalFree(body); + if(FAILED(hres)) return hres; - } - - hres = CreateStreamOnHGlobal(body, TRUE, &stream); - if(FAILED(hres)) { - GlobalFree(body); - return hres; - } - - hres = channelbsc_load_stream(This->window->bscallback, stream); - - IStream_Release(stream); - return hres; + + return start_binding(This->window, NULL, (BSCallback*)This->window->bscallback, NULL); } #undef PERSTRINIT_THIS Modified: trunk/reactos/dll/win32/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/mshtml/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/rsrc.rc [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -35,27 +35,30 @@ #include "Bg.rc" #include "Da.rc" -#include "De.rc" #include "En.rc" #include "Es.rc" #include "Fi.rc" +#include "Hu.rc" +#include "Ko.rc" +#include "Nl.rc" +#include "Pl.rc" +#include "Sv.rc" +#include "Tr.rc" + +/* UTF-8 */ +#include "De.rc" #include "Fr.rc" -#include "Hu.rc" #include "It.rc" #include "Ja.rc" -#include "Ko.rc" #include "Lt.rc" -#include "Nl.rc" #include "No.rc" -#include "Pl.rc" #include "Pt.rc" #include "Ro.rc" #include "Ru.rc" #include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" #include "Uk.rc" #include "Zh.rc" + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re… ============================================================================== --- trunk/reactos/include/psdk/mshtml.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mshtml.idl [iso-8859-1] Sat Mar 6 12:42:03 2010 @@ -15407,3 +15407,23 @@ } } /* library MSHTML */ + +interface IOleCommandTarget; + +/***************************************************************************** + * IHTMLPrivateWindow interface + */ +[ + object, + uuid(3050f6dc-98b5-11cf-bb82-00aa00bdce0b), + local +] +interface IHTMLPrivateWindow : IUnknown +{ + HRESULT SuperNavigate(BSTR url, BSTR arg2, BSTR arg3, BSTR arg4, VARIANT *post_data, VARIANT *headers, ULONG flags); + HRESULT GetPendingUrl(BSTR *url); + HRESULT SetPICSTarget(IOleCommandTarget *cmdtrg); + HRESULT PICSComplete(int arg); + HRESULT FindWindowByName(LPCWSTR name, IHTMLWindow2 **ret); + HRESULT GetAddressBarUrl(BSTR *url); +}

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2010