Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 71581: [OLEAUT32] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

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

1 0

[akhaldi] 71580: [OLE32_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

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

1 0

[akhaldi] 71579: [OLE32] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

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

1 0

[akhaldi] 71578: [PSDK] Update objbase.h. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

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

1 0

[akhaldi] 71577: [MSXML3_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: akhaldi Date: Tue Jun 7 10:30:15 2016 New Revision: 71577 URL: http://svn.reactos.org/svn/reactos?rev=71577&view=rev Log: [MSXML3_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/msxml3/domdoc.c trunk/rostests/winetests/msxml3/httpreq.c trunk/rostests/winetests/msxml3/saxreader.c trunk/rostests/winetests/msxml3/schema.c trunk/rostests/winetests/msxml3/xmldoc.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Tue Jun 7 10:30:15 2016 @@ -6742,9 +6742,9 @@ BSTR sPart1 = _bstr_(szBasicTransformSSXMLPart1); BSTR sPart2 = _bstr_(szBasicTransformSSXMLPart2); BSTR sFileName = _bstr_(lpPathBuffer); - int nLegnth = lstrlenW(sPart1) + lstrlenW(sPart2) + lstrlenW(sFileName) + 1; - - sXSL = SysAllocStringLen(NULL, nLegnth); + int nLength = lstrlenW(sPart1) + lstrlenW(sPart2) + lstrlenW(sFileName) + 1; + + sXSL = SysAllocStringLen(NULL, nLength); lstrcpyW(sXSL, sPart1); lstrcatW(sXSL, sFileName); lstrcatW(sXSL, sPart2); @@ -9297,10 +9297,12 @@ { const get_attributes_t *entry = get_attributes; IXMLDOMNamedNodeMap *map; - IXMLDOMDocument *doc; + IXMLDOMDocument *doc, *doc2; IXMLDOMNode *node, *node2; + IXMLDOMElement *elem; VARIANT_BOOL b; HRESULT hr; + VARIANT v; BSTR str; LONG length; @@ -9469,6 +9471,39 @@ ok(hr == S_OK, "got %08x\n", hr); EXPECT_REF(node2, 1); IXMLDOMNode_Release(node2); + + IXMLDOMNamedNodeMap_Release(map); + + /* append created element a different document, map still works */ + hr = IXMLDOMDocument_createElement(doc, _bstr_("test"), &elem); + ok(hr == S_OK, "createElement failed: %08x\n", hr); + + V_VT(&v) = VT_I4; + V_I4(&v) = 1; + hr = IXMLDOMElement_setAttribute(elem, _bstr_("testattr"), v); + ok(hr == S_OK, "setAttribute failed: %08x\n", hr); + + hr = IXMLDOMElement_get_attributes(elem, &map); + ok(hr == S_OK, "get_attributes failed: %08x\n", hr); + + length = 0; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + ok(hr == S_OK, "got %08x\n", hr); + ok(length == 1, "got %d\n", length); + + doc2 = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_appendChild(doc2, (IXMLDOMNode*)elem, &node); + ok(hr == S_OK, "appendChild failed: %08x\n", hr); + ok(node == (IXMLDOMNode*)elem, "node != elem\n"); + IXMLDOMNode_Release(node); + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc2); + + length = 0; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + ok(hr == S_OK, "got %08x\n", hr); + ok(length == 1, "got %d\n", length); IXMLDOMNamedNodeMap_Release(map); Modified: trunk/rostests/winetests/msxml3/httpreq.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/httpreq.… ============================================================================== --- trunk/rostests/winetests/msxml3/httpreq.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/httpreq.c [iso-8859-1] Tue Jun 7 10:30:15 2016 @@ -49,9 +49,10 @@ #define EXPECT_REF(node,ref) _expect_ref((IUnknown*)node, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } DEFINE_GUID(SID_SContainerDispatch, 0xb722be00, 0x4e68, 0x101b, 0xa2, 0xbc, 0x00, 0xaa, 0x00, 0x40, 0x47, 0x70); Modified: trunk/rostests/winetests/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/saxreade… ============================================================================== --- trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] Tue Jun 7 10:30:15 2016 @@ -47,9 +47,10 @@ #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } static LONG get_refcount(void *iface) @@ -2931,7 +2932,6 @@ ok(hr == S_OK, "%s, expected S_OK, got %08x\n", wine_dbgstr_guid(riids[i]), hr); ok(writer2 == writer, "got %p, expected %p\n", writer2, writer); EXPECT_REF(writer, 3); - EXPECT_REF(writer2, 3); IMXWriter_Release(writer2); IUnknown_Release(handler); } @@ -3309,7 +3309,6 @@ pos2.QuadPart = 0; hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); EXPECT_HR(hr, S_OK); -todo_wine ok(pos2.QuadPart != 0, "unexpected stream beginning\n"); hr = IMXWriter_get_output(writer, NULL); @@ -4150,7 +4149,6 @@ V_UNKNOWN(&dest) = (IUnknown*)&mxstream; hr = IMXWriter_put_output(writer, dest); ok(hr == S_OK, "put_output failed with %08x on test %d\n", hr, current_stream_test_index); - VariantClear(&dest); hr = IMXWriter_put_byteOrderMark(writer, test->bom); ok(hr == S_OK, "put_byteOrderMark failed with %08x on test %d\n", hr, current_stream_test_index); @@ -4795,6 +4793,7 @@ ISAXLexicalHandler *lexical; IVBSAXDeclHandler *vbdecl; ISAXDeclHandler *decl; + ISAXDTDHandler *dtd; IMXWriter *writer; VARIANT dest; HRESULT hr; @@ -4993,19 +4992,70 @@ hr = IVBSAXDeclHandler_externalEntityDecl(vbdecl, NULL, NULL, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), 0, NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), -1, NULL, 0, NULL, 0); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), strlen("name"), _bstr_("pubid"), strlen("pubid"), _bstr_("sysid"), strlen("sysid")); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), strlen("name"), NULL, 0, _bstr_("sysid"), strlen("sysid")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), strlen("name"), _bstr_("pubid"), strlen("pubid"), + NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<!ENTITY name PUBLIC \"pubid\" \"sysid\">\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_( + "<!ENTITY name PUBLIC \"pubid\" \"sysid\">\r\n" + "<!ENTITY name SYSTEM \"sysid\">\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + /* notation declaration */ + hr = IMXWriter_QueryInterface(writer, &IID_ISAXDTDHandler, (void**)&dtd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, NULL, 0, NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), _bstr_("pubid"), strlen("pubid"), NULL, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), _bstr_("pubid"), strlen("pubid"), _bstr_("sysid"), strlen("sysid")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDTDHandler_notationDecl(dtd, _bstr_("name"), strlen("name"), NULL, 0, _bstr_("sysid"), strlen("sysid")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_( + "<!NOTATION name" + "<!NOTATION name PUBLIC \"pubid\">\r\n" + "<!NOTATION name PUBLIC \"pubid\" \"sysid\">\r\n" + "<!NOTATION name SYSTEM \"sysid\">\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + + VariantClear(&dest); + + ISAXDTDHandler_Release(dtd); ISAXContentHandler_Release(content); ISAXLexicalHandler_Release(lexical); @@ -5586,7 +5636,7 @@ if(FAILED(hr)) { - skip("Failed to create SAXXMLReader instance\n"); + win_skip("Failed to create SAXXMLReader instance\n"); CoUninitialize(); return; } @@ -5636,7 +5686,7 @@ test_mxattr_dispex(); } else - skip("SAXAttributes not supported\n"); + win_skip("SAXAttributes not supported\n"); CoUninitialize(); } Modified: trunk/rostests/winetests/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/schema.c… ============================================================================== --- trunk/rostests/winetests/msxml3/schema.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/schema.c [iso-8859-1] Tue Jun 7 10:30:15 2016 @@ -514,6 +514,7 @@ VARIANT_BOOL b; BSTR str; LONG len; + HRESULT hr; doc = create_document(&IID_IXMLDOMDocument2); if (!doc) @@ -563,6 +564,24 @@ ole_check(IXMLDOMSchemaCollection_remove(cache, NULL)); len = -1; ole_check(IXMLDOMSchemaCollection_get_length(cache, &len)); + ok(len == 0, "got %d\n", len); + + /* same, but with VT_UNKNOWN type */ + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)doc; + hr = IXMLDOMSchemaCollection_add(cache, NULL, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + len = -1; + hr = IXMLDOMSchemaCollection_get_length(cache, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 1, "got %d\n", len); + + hr = IXMLDOMSchemaCollection_remove(cache, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + len = -1; + hr = IXMLDOMSchemaCollection_get_length(cache, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(len == 0, "got %d\n", len); str = SysAllocString(xdr_schema_uri); @@ -1638,6 +1657,24 @@ free_bstrs(); } +static void test_ifaces(void) +{ + IXMLDOMSchemaCollection2 *cache; + IUnknown *unk; + HRESULT hr; + + cache = create_cache_version(60, &IID_IXMLDOMSchemaCollection2); + if (!cache) return; + + /* CLSID_XMLSchemaCache60 is returned as an interface (the same as IXMLDOMSchemaCollection2). */ + hr = IXMLDOMSchemaCollection2_QueryInterface(cache, &CLSID_XMLSchemaCache60, (void**)&unk); + ok (hr == S_OK, "Could not get CLSID_XMLSchemaCache60 iface: %08x\n", hr); + ok (unk == (IUnknown*)cache, "unk != cache\n"); + + IUnknown_Release(unk); + IXMLDOMSchemaCollection2_Release(cache); +} + START_TEST(schema) { HRESULT r; @@ -1655,6 +1692,7 @@ test_dispex(); test_get(); test_remove(); + test_ifaces(); CoUninitialize(); } Modified: trunk/rostests/winetests/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmldoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/xmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/xmldoc.c [iso-8859-1] Tue Jun 7 10:30:15 2016 @@ -520,7 +520,7 @@ &IID_IXMLDocument, (LPVOID*)&doc); if (FAILED(hr)) { - skip("Failed to create XMLDocument instance\n"); + win_skip("Failed to create XMLDocument instance\n"); return FALSE; }

1 0

[akhaldi] 71576: [MSXML3] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: akhaldi Date: Tue Jun 7 10:29:11 2016 New Revision: 71576 URL: http://svn.reactos.org/svn/reactos?rev=71576&view=rev Log: [MSXML3] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h trunk/reactos/dll/win32/msxml3/mxwriter.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/nodemap.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/schema.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml_pri… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml_private.h [iso-8859-1] Tue Jun 7 10:29:11 2016 @@ -296,6 +296,8 @@ extern LONG xmldoc_release( xmlDocPtr doc ) DECLSPEC_HIDDEN; extern LONG xmldoc_add_refs( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; extern LONG xmldoc_release_refs ( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; +extern void xmlnode_add_ref(xmlNodePtr node) DECLSPEC_HIDDEN; +extern void xmlnode_release(xmlNodePtr node) DECLSPEC_HIDDEN; extern int xmlnode_get_inst_cnt( xmlnode *node ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/msxml3/mxwriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/mxwriter.… ============================================================================== --- trunk/reactos/dll/win32/msxml3/mxwriter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/mxwriter.c [iso-8859-1] Tue Jun 7 10:29:11 2016 @@ -1,7 +1,7 @@ /* * MXWriter implementation * - * Copyright 2011-2014 Nikolay Sivov for CodeWeavers + * Copyright 2011-2014, 2016 Nikolay Sivov for CodeWeavers * Copyright 2011 Thomas Mullaly * * This library is free software; you can redistribute it and/or @@ -27,6 +27,8 @@ static const WCHAR closetagW[] = {'>','\r','\n'}; static const WCHAR crlfW[] = {'\r','\n'}; static const WCHAR entityW[] = {'<','!','E','N','T','I','T','Y',' '}; +static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; +static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; /* should be ordered as encoding names are sorted */ typedef enum @@ -80,13 +82,6 @@ typedef enum { - OutputBuffer_Native = 0x001, - OutputBuffer_Encoded = 0x010, - OutputBuffer_Both = 0x100 -} output_mode; - -typedef enum -{ MXWriter_BOM = 0, MXWriter_DisableEscaping, MXWriter_Indent, @@ -103,6 +98,7 @@ typedef struct { + struct list entry; char *data; unsigned int allocated; unsigned int written; @@ -110,9 +106,10 @@ typedef struct { - encoded_buffer utf16; encoded_buffer encoded; UINT code_page; + UINT utf16_total; /* total number of bytes written since last buffer reinitialization */ + struct list blocks; /* only used when output was not set, for BSTR case */ } output_buffer; typedef struct @@ -151,9 +148,8 @@ BSTR element; IStream *dest; - ULONG dest_written; - - output_buffer *buffer; + + output_buffer buffer; } mxwriter; typedef struct @@ -231,7 +227,7 @@ static HRESULT init_encoded_buffer(encoded_buffer *buffer) { - const int initial_len = 0x2000; + const int initial_len = 0x1000; buffer->data = heap_alloc(initial_len); if (!buffer->data) return E_OUTOFMEMORY; @@ -263,121 +259,202 @@ return S_OK; } -static HRESULT alloc_output_buffer(xml_encoding encoding, output_buffer **buffer) -{ - output_buffer *ret; +static HRESULT init_output_buffer(xml_encoding encoding, output_buffer *buffer) +{ HRESULT hr; - ret = heap_alloc(sizeof(*ret)); - if (!ret) return E_OUTOFMEMORY; - - hr = get_code_page(encoding, &ret->code_page); - if (hr != S_OK) { - heap_free(ret); + hr = get_code_page(encoding, &buffer->code_page); + if (hr != S_OK) return hr; - } - - hr = init_encoded_buffer(&ret->utf16); - if (hr != S_OK) { - heap_free(ret); + + hr = init_encoded_buffer(&buffer->encoded); + if (hr != S_OK) return hr; - } - - /* currently we always create a default output buffer that is UTF-16 only, - but it's possible to allocate with specific encoding too */ - if (encoding != XmlEncoding_UTF16) { - hr = init_encoded_buffer(&ret->encoded); - if (hr != S_OK) { - free_encoded_buffer(&ret->utf16); - heap_free(ret); - return hr; + + list_init(&buffer->blocks); + buffer->utf16_total = 0; + + return S_OK; +} + +static void free_output_buffer(output_buffer *buffer) +{ + encoded_buffer *cur, *cur2; + + free_encoded_buffer(&buffer->encoded); + + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &buffer->blocks, encoded_buffer, entry) + { + list_remove(&cur->entry); + free_encoded_buffer(cur); + heap_free(cur); + } +} + +static HRESULT write_output_buffer(mxwriter *writer, const WCHAR *data, int len) +{ + output_buffer *buffer = &writer->buffer; + encoded_buffer *buff; + unsigned int written; + int src_len; + + if (!len || !*data) + return S_OK; + + src_len = len == -1 ? strlenW(data) : len; + if (writer->dest) + { + buff = &buffer->encoded; + + if (buffer->code_page == ~0) + { + unsigned int avail = buff->allocated - buff->written; + + src_len *= sizeof(WCHAR); + written = min(avail, src_len); + + /* fill internal buffer first */ + if (avail) + { + memcpy(buff->data + buff->written, data, written); + data += written / sizeof(WCHAR); + buff->written += written; + avail -= written; + src_len -= written; + } + + if (!avail) + { + IStream_Write(writer->dest, buff->data, buff->written, &written); + buff->written = 0; + if (src_len >= buff->allocated) + IStream_Write(writer->dest, data, src_len, &written); + else if (src_len) + { + memcpy(buff->data, data, src_len); + buff->written += src_len; + } + } } - } + else + { + unsigned int avail = buff->allocated - buff->written; + int length; + + length = WideCharToMultiByte(buffer->code_page, 0, data, src_len, NULL, 0, NULL, NULL); + if (avail >= length) + { + length = WideCharToMultiByte(buffer->code_page, 0, data, src_len, buff->data + buff->written, length, NULL, NULL); + buff->written += length; + } + else + { + /* drain what we go so far */ + if (buff->written) + { + IStream_Write(writer->dest, buff->data, buff->written, &written); + buff->written = 0; + avail = buff->allocated; + } + + if (avail >= length) + { + length = WideCharToMultiByte(buffer->code_page, 0, data, src_len, buff->data + buff->written, length, NULL, NULL); + buff->written += length; + } + else + { + char *mb; + + /* if current chunk is larger than total buffer size, convert it at once using temporary allocated buffer */ + mb = heap_alloc(length); + if (!mb) + return E_OUTOFMEMORY; + + length = WideCharToMultiByte(buffer->code_page, 0, data, src_len, mb, length, NULL, NULL); + IStream_Write(writer->dest, mb, length, &written); + heap_free(mb); + } + } + } + } + /* When writer has no output set we have to accumulate everything to return it later in a form of BSTR. + To achieve that: + + - fill a buffer already allocated as part of output buffer; + - when current buffer is full, allocate another one and switch to it; buffers themselves never grow, + but are linked together, with head pointing to first allocated buffer after initial one got filled; + - later during get_output() contents are concatenated by copying one after another to destination BSTR buffer, + that's returned to the client. */ else - memset(&ret->encoded, 0, sizeof(ret->encoded)); - - *buffer = ret; - - return S_OK; -} - -static void free_output_buffer(output_buffer *buffer) -{ - free_encoded_buffer(&buffer->encoded); - free_encoded_buffer(&buffer->utf16); - heap_free(buffer); -} - -static void grow_buffer(encoded_buffer *buffer, int length) -{ - /* grow if needed, plus 4 bytes to be sure null terminator will fit in */ - if (buffer->allocated < buffer->written + length + 4) - { - int grown_size = max(2*buffer->allocated, buffer->allocated + length); - buffer->data = heap_realloc(buffer->data, grown_size); - buffer->allocated = grown_size; - } -} - -static HRESULT write_output_buffer_mode(output_buffer *buffer, output_mode mode, const WCHAR *data, int len) -{ - int length; - char *ptr; - - if (mode & (OutputBuffer_Encoded | OutputBuffer_Both)) { - if (buffer->code_page != ~0) + { + /* select last used block */ + if (list_empty(&buffer->blocks)) + buff = &buffer->encoded; + else + buff = LIST_ENTRY(list_tail(&buffer->blocks), encoded_buffer, entry); + + src_len *= sizeof(WCHAR); + while (src_len) { - length = WideCharToMultiByte(buffer->code_page, 0, data, len, NULL, 0, NULL, NULL); - grow_buffer(&buffer->encoded, length); - ptr = buffer->encoded.data + buffer->encoded.written; - length = WideCharToMultiByte(buffer->code_page, 0, data, len, ptr, length, NULL, NULL); - buffer->encoded.written += len == -1 ? length-1 : length; + unsigned int avail = buff->allocated - buff->written; + unsigned int written = min(avail, src_len); + + if (avail) + { + memcpy(buff->data + buff->written, data, written); + buff->written += written; + buffer->utf16_total += written; + src_len -= written; + } + + /* alloc new block if needed and retry */ + if (src_len) + { + encoded_buffer *next = heap_alloc(sizeof(*next)); + HRESULT hr; + + if (FAILED(hr = init_encoded_buffer(next))) { + heap_free(next); + return hr; + } + + list_add_tail(&buffer->blocks, &next->entry); + buff = next; + } } } - if (mode & (OutputBuffer_Native | OutputBuffer_Both)) { - /* WCHAR data just copied */ - length = len == -1 ? strlenW(data) : len; - if (length) - { - length *= sizeof(WCHAR); - - grow_buffer(&buffer->utf16, length); - ptr = buffer->utf16.data + buffer->utf16.written; - - memcpy(ptr, data, length); - buffer->utf16.written += length; - ptr += length; - /* null termination */ - memset(ptr, 0, sizeof(WCHAR)); - } - } - - return S_OK; -} - -static HRESULT write_output_buffer(output_buffer *buffer, const WCHAR *data, int len) -{ - return write_output_buffer_mode(buffer, OutputBuffer_Both, data, len); -} - -static HRESULT write_output_buffer_quoted(output_buffer *buffer, const WCHAR *data, int len) -{ - write_output_buffer(buffer, quotW, 1); - write_output_buffer(buffer, data, len); - write_output_buffer(buffer, quotW, 1); + return S_OK; +} + +static HRESULT write_output_buffer_quoted(mxwriter *writer, const WCHAR *data, int len) +{ + write_output_buffer(writer, quotW, 1); + write_output_buffer(writer, data, len); + write_output_buffer(writer, quotW, 1); return S_OK; } /* frees buffer data, reallocates with a default lengths */ -static void close_output_buffer(mxwriter *This) -{ - heap_free(This->buffer->utf16.data); - heap_free(This->buffer->encoded.data); - init_encoded_buffer(&This->buffer->utf16); - init_encoded_buffer(&This->buffer->encoded); - get_code_page(This->xml_enc, &This->buffer->code_page); +static void close_output_buffer(mxwriter *writer) +{ + encoded_buffer *cur, *cur2; + + heap_free(writer->buffer.encoded.data); + + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &writer->buffer.blocks, encoded_buffer, entry) + { + list_remove(&cur->entry); + free_encoded_buffer(cur); + heap_free(cur); + } + + init_encoded_buffer(&writer->buffer.encoded); + get_code_page(writer->xml_enc, &writer->buffer.code_page); + writer->buffer.utf16_total = 0; + list_init(&writer->buffer.blocks); } /* Escapes special characters like: @@ -452,7 +529,7 @@ return ret; } -static void write_prolog_buffer(mxwriter *This) +static void write_prolog_buffer(mxwriter *writer) { static const WCHAR versionW[] = {'<','?','x','m','l',' ','v','e','r','s','i','o','n','='}; static const WCHAR encodingW[] = {' ','e','n','c','o','d','i','n','g','=','\"'}; @@ -461,99 +538,83 @@ static const WCHAR noW[] = {'n','o','\"','?','>'}; /* version */ - write_output_buffer(This->buffer, versionW, sizeof(versionW)/sizeof(WCHAR)); - write_output_buffer_quoted(This->buffer, This->version, -1); + write_output_buffer(writer, versionW, sizeof(versionW)/sizeof(WCHAR)); + write_output_buffer_quoted(writer, writer->version, -1); /* encoding */ - write_output_buffer(This->buffer, encodingW, sizeof(encodingW)/sizeof(WCHAR)); - - /* always write UTF-16 to WCHAR buffer */ - write_output_buffer_mode(This->buffer, OutputBuffer_Native, utf16W, sizeof(utf16W)/sizeof(WCHAR) - 1); - write_output_buffer_mode(This->buffer, OutputBuffer_Encoded, This->encoding, -1); - write_output_buffer(This->buffer, quotW, 1); + write_output_buffer(writer, encodingW, sizeof(encodingW)/sizeof(WCHAR)); + + if (writer->dest) + write_output_buffer(writer, writer->encoding, -1); + else + write_output_buffer(writer, utf16W, sizeof(utf16W)/sizeof(WCHAR) - 1); + write_output_buffer(writer, quotW, 1); /* standalone */ - write_output_buffer(This->buffer, standaloneW, sizeof(standaloneW)/sizeof(WCHAR)); - if (This->props[MXWriter_Standalone] == VARIANT_TRUE) - write_output_buffer(This->buffer, yesW, sizeof(yesW)/sizeof(WCHAR)); + write_output_buffer(writer, standaloneW, sizeof(standaloneW)/sizeof(WCHAR)); + if (writer->props[MXWriter_Standalone] == VARIANT_TRUE) + write_output_buffer(writer, yesW, sizeof(yesW)/sizeof(WCHAR)); else - write_output_buffer(This->buffer, noW, sizeof(noW)/sizeof(WCHAR)); - - write_output_buffer(This->buffer, crlfW, sizeof(crlfW)/sizeof(WCHAR)); - This->newline = TRUE; + write_output_buffer(writer, noW, sizeof(noW)/sizeof(WCHAR)); + + write_output_buffer(writer, crlfW, sizeof(crlfW)/sizeof(WCHAR)); + writer->newline = TRUE; } /* Attempts to the write data from the mxwriter's buffer to * the destination stream (if there is one). */ -static HRESULT write_data_to_stream(mxwriter *This) -{ - encoded_buffer *buffer; +static HRESULT write_data_to_stream(mxwriter *writer) +{ + encoded_buffer *buffer = &writer->buffer.encoded; ULONG written = 0; - HRESULT hr; - - if (!This->dest) + + if (!writer->dest) return S_OK; - if (This->xml_enc != XmlEncoding_UTF16) - buffer = &This->buffer->encoded; + if (buffer->written == 0) + { + if (writer->xml_enc == XmlEncoding_UTF8) + IStream_Write(writer->dest, buffer->data, 0, &written); + } else - buffer = &This->buffer->utf16; - - if (This->dest_written > buffer->written) { - ERR("Failed sanity check! Not sure what to do... (%d > %d)\n", This->dest_written, buffer->written); - return E_FAIL; - } else if (This->dest_written == buffer->written && This->xml_enc != XmlEncoding_UTF8) - /* Windows seems to make an empty write call when the encoding is UTF-8 and - * all the data has been written to the stream. It doesn't seem make this call - * for any other encodings. - */ - return S_OK; - - /* Write the current content from the output buffer into 'dest'. - * TODO: Check what Windows does if the IStream doesn't write all of - * the data we give it at once. - */ - hr = IStream_Write(This->dest, buffer->data+This->dest_written, - buffer->written-This->dest_written, &written); - if (FAILED(hr)) { - WARN("Failed to write data to IStream (0x%08x)\n", hr); - return hr; - } - - This->dest_written += written; - return hr; + { + IStream_Write(writer->dest, buffer->data, buffer->written, &written); + buffer->written = 0; + } + + return S_OK; } /* Newly added element start tag left unclosed cause for empty elements we have to close it differently. */ -static void close_element_starttag(const mxwriter *This) +static void close_element_starttag(mxwriter *writer) { static const WCHAR gtW[] = {'>'}; - if (!This->element) return; - write_output_buffer(This->buffer, gtW, 1); -} - -static void write_node_indent(mxwriter *This) + if (!writer->element) return; + write_output_buffer(writer, gtW, 1); +} + +static void write_node_indent(mxwriter *writer) { static const WCHAR tabW[] = {'\t'}; - int indent = This->indent; - - if (!This->props[MXWriter_Indent] || This->text) - { - This->text = FALSE; + int indent = writer->indent; + + if (!writer->props[MXWriter_Indent] || writer->text) + { + writer->text = FALSE; return; } /* This is to workaround PI output logic that always puts newline chars, document prolog PI does that too. */ - if (!This->newline) - write_output_buffer(This->buffer, crlfW, sizeof(crlfW)/sizeof(WCHAR)); + if (!writer->newline) + write_output_buffer(writer, crlfW, sizeof(crlfW)/sizeof(WCHAR)); while (indent--) - write_output_buffer(This->buffer, tabW, 1); - - This->newline = FALSE; - This->text = FALSE; + write_output_buffer(writer, tabW, 1); + + writer->newline = FALSE; + writer->text = FALSE; } static inline void writer_inc_indent(mxwriter *This) @@ -592,7 +653,6 @@ static inline void reset_output_buffer(mxwriter *This) { close_output_buffer(This); - This->dest_written = 0; } static HRESULT writer_set_property(mxwriter *writer, mxwriter_prop property, VARIANT_BOOL value) @@ -754,7 +814,7 @@ { /* Windows flushes the buffer when the interface is destroyed. */ flush_output_buffer(This); - free_output_buffer(This->buffer); + free_output_buffer(&This->buffer); if (This->dest) IStream_Release(This->dest); SysFreeString(This->version); @@ -858,22 +918,43 @@ if (!dest) return E_POINTER; - if (!This->dest) - { - HRESULT hr = flush_output_buffer(This); + if (This->dest) + { + /* we only support IStream output so far */ + V_VT(dest) = VT_UNKNOWN; + V_UNKNOWN(dest) = (IUnknown*)This->dest; + IStream_AddRef(This->dest); + } + else + { + encoded_buffer *buff; + char *dest_ptr; + HRESULT hr; + + hr = flush_output_buffer(This); if (FAILED(hr)) return hr; V_VT(dest) = VT_BSTR; - V_BSTR(dest) = SysAllocString((WCHAR*)This->buffer->utf16.data); - - return S_OK; - } - - /* we only support IStream output so far */ - V_VT(dest) = VT_UNKNOWN; - V_UNKNOWN(dest) = (IUnknown*)This->dest; - IStream_AddRef(This->dest); + V_BSTR(dest) = SysAllocStringLen(NULL, This->buffer.utf16_total / sizeof(WCHAR)); + if (!V_BSTR(dest)) + return E_OUTOFMEMORY; + + dest_ptr = (char*)V_BSTR(dest); + buff = &This->buffer.encoded; + + if (buff->written) + { + memcpy(dest_ptr, buff->data, buff->written); + dest_ptr += buff->written; + } + + LIST_FOR_EACH_ENTRY(buff, &This->buffer.blocks, encoded_buffer, entry) + { + memcpy(dest_ptr, buff->data, buff->written); + dest_ptr += buff->written; + } + } return S_OK; } @@ -1159,18 +1240,18 @@ static const WCHAR eqW[] = {'='}; /* space separator in front of every attribute */ - write_output_buffer(writer->buffer, spaceW, 1); - write_output_buffer(writer->buffer, qname, qname_len); - write_output_buffer(writer->buffer, eqW, 1); + write_output_buffer(writer, spaceW, 1); + write_output_buffer(writer, qname, qname_len); + write_output_buffer(writer, eqW, 1); if (escape) { WCHAR *escaped = get_escaped_string(value, EscapeValue, &value_len); - write_output_buffer_quoted(writer->buffer, escaped, value_len); + write_output_buffer_quoted(writer, escaped, value_len); heap_free(escaped); } else - write_output_buffer_quoted(writer->buffer, value, value_len); + write_output_buffer_quoted(writer, value, value_len); } static void mxwriter_write_starttag(mxwriter *writer, const WCHAR *qname, int len) @@ -1182,8 +1263,8 @@ write_node_indent(writer); - write_output_buffer(writer->buffer, ltW, 1); - write_output_buffer(writer->buffer, qname ? qname : emptyW, qname ? len : 0); + write_output_buffer(writer, ltW, 1); + write_output_buffer(writer, qname ? qname : emptyW, qname ? len : 0); writer_inc_indent(writer); } @@ -1260,7 +1341,7 @@ if (This->element) { static const WCHAR closeW[] = {'/','>'}; - write_output_buffer(This->buffer, closeW, 2); + write_output_buffer(This, closeW, 2); } else { @@ -1268,9 +1349,9 @@ static const WCHAR gtW[] = {'>'}; write_node_indent(This); - write_output_buffer(This->buffer, closetagW, 2); - write_output_buffer(This->buffer, QName, nQName); - write_output_buffer(This->buffer, gtW, 1); + write_output_buffer(This, closetagW, 2); + write_output_buffer(This, QName, nQName); + write_output_buffer(This, gtW, 1); } set_element_name(This, NULL, 0); @@ -1298,14 +1379,14 @@ if (nchars) { if (This->cdata || This->props[MXWriter_DisableEscaping] == VARIANT_TRUE) - write_output_buffer(This->buffer, chars, nchars); + write_output_buffer(This, chars, nchars); else { int len = nchars; WCHAR *escaped; escaped = get_escaped_string(chars, EscapeText, &len); - write_output_buffer(This->buffer, escaped, len); + write_output_buffer(This, escaped, len); heap_free(escaped); } } @@ -1324,7 +1405,7 @@ if (!chars) return E_INVALIDARG; - write_output_buffer(This->buffer, chars, nchars); + write_output_buffer(This, chars, nchars); return S_OK; } @@ -1345,18 +1426,18 @@ if (!target) return E_INVALIDARG; write_node_indent(This); - write_output_buffer(This->buffer, openpiW, sizeof(openpiW)/sizeof(WCHAR)); + write_output_buffer(This, openpiW, sizeof(openpiW)/sizeof(WCHAR)); if (*target) - write_output_buffer(This->buffer, target, ntarget); + write_output_buffer(This, target, ntarget); if (data && *data && ndata) { - write_output_buffer(This->buffer, spaceW, 1); - write_output_buffer(This->buffer, data, ndata); - } - - write_output_buffer(This->buffer, closepiW, sizeof(closepiW)/sizeof(WCHAR)); + write_output_buffer(This, spaceW, 1); + write_output_buffer(This, data, ndata); + } + + write_output_buffer(This, closepiW, sizeof(closepiW)/sizeof(WCHAR)); This->newline = TRUE; return S_OK; @@ -1424,42 +1505,38 @@ if (!name) return E_INVALIDARG; - write_output_buffer(This->buffer, doctypeW, sizeof(doctypeW)/sizeof(WCHAR)); + write_output_buffer(This, doctypeW, sizeof(doctypeW)/sizeof(WCHAR)); if (*name) { - write_output_buffer(This->buffer, name, name_len); - write_output_buffer(This->buffer, spaceW, 1); + write_output_buffer(This, name, name_len); + write_output_buffer(This, spaceW, 1); } if (publicId) { - static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; - - write_output_buffer(This->buffer, publicW, sizeof(publicW)/sizeof(WCHAR)); - write_output_buffer_quoted(This->buffer, publicId, publicId_len); + write_output_buffer(This, publicW, sizeof(publicW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, publicId, publicId_len); if (!systemId) return E_INVALIDARG; if (*publicId) - write_output_buffer(This->buffer, spaceW, 1); - - write_output_buffer_quoted(This->buffer, systemId, systemId_len); + write_output_buffer(This, spaceW, 1); + + write_output_buffer_quoted(This, systemId, systemId_len); if (*systemId) - write_output_buffer(This->buffer, spaceW, 1); + write_output_buffer(This, spaceW, 1); } else if (systemId) { - static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; - - write_output_buffer(This->buffer, systemW, sizeof(systemW)/sizeof(WCHAR)); - write_output_buffer_quoted(This->buffer, systemId, systemId_len); + write_output_buffer(This, systemW, sizeof(systemW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, systemId, systemId_len); if (*systemId) - write_output_buffer(This->buffer, spaceW, 1); - } - - write_output_buffer(This->buffer, openintW, sizeof(openintW)/sizeof(WCHAR)); + write_output_buffer(This, spaceW, 1); + } + + write_output_buffer(This, openintW, sizeof(openintW)/sizeof(WCHAR)); return S_OK; } @@ -1471,7 +1548,7 @@ TRACE("(%p)\n", This); - write_output_buffer(This->buffer, closedtdW, sizeof(closedtdW)/sizeof(WCHAR)); + write_output_buffer(This, closedtdW, sizeof(closedtdW)/sizeof(WCHAR)); return S_OK; } @@ -1498,7 +1575,7 @@ TRACE("(%p)\n", This); write_node_indent(This); - write_output_buffer(This->buffer, scdataW, sizeof(scdataW)/sizeof(WCHAR)); + write_output_buffer(This, scdataW, sizeof(scdataW)/sizeof(WCHAR)); This->cdata = TRUE; return S_OK; @@ -1511,7 +1588,7 @@ TRACE("(%p)\n", This); - write_output_buffer(This->buffer, ecdataW, sizeof(ecdataW)/sizeof(WCHAR)); + write_output_buffer(This, ecdataW, sizeof(ecdataW)/sizeof(WCHAR)); This->cdata = FALSE; return S_OK; @@ -1530,10 +1607,10 @@ close_element_starttag(This); write_node_indent(This); - write_output_buffer(This->buffer, copenW, sizeof(copenW)/sizeof(WCHAR)); + write_output_buffer(This, copenW, sizeof(copenW)/sizeof(WCHAR)); if (nchars) - write_output_buffer(This->buffer, chars, nchars); - write_output_buffer(This->buffer, ccloseW, sizeof(ccloseW)/sizeof(WCHAR)); + write_output_buffer(This, chars, nchars); + write_output_buffer(This, ccloseW, sizeof(ccloseW)/sizeof(WCHAR)); return S_OK; } @@ -1583,14 +1660,14 @@ if (!name || !model) return E_INVALIDARG; - write_output_buffer(This->buffer, elementW, sizeof(elementW)/sizeof(WCHAR)); + write_output_buffer(This, elementW, sizeof(elementW)/sizeof(WCHAR)); if (n_name) { - write_output_buffer(This->buffer, name, n_name); - write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer(This, name, n_name); + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); } if (n_model) - write_output_buffer(This->buffer, model, n_model); - write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); + write_output_buffer(This, model, n_model); + write_output_buffer(This, closetagW, sizeof(closetagW)/sizeof(WCHAR)); return S_OK; } @@ -1608,31 +1685,31 @@ debugstr_wn(attr, n_attr), n_attr, debugstr_wn(type, n_type), n_type, debugstr_wn(Default, n_default), n_default, debugstr_wn(value, n_value), n_value); - write_output_buffer(This->buffer, attlistW, sizeof(attlistW)/sizeof(WCHAR)); + write_output_buffer(This, attlistW, sizeof(attlistW)/sizeof(WCHAR)); if (n_element) { - write_output_buffer(This->buffer, element, n_element); - write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer(This, element, n_element); + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); } if (n_attr) { - write_output_buffer(This->buffer, attr, n_attr); - write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer(This, attr, n_attr); + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); } if (n_type) { - write_output_buffer(This->buffer, type, n_type); - write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer(This, type, n_type); + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); } if (n_default) { - write_output_buffer(This->buffer, Default, n_default); - write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer(This, Default, n_default); + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); } if (n_value) - write_output_buffer_quoted(This->buffer, value, n_value); - - write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, value, n_value); + + write_output_buffer(This, closetagW, sizeof(closetagW)/sizeof(WCHAR)); return S_OK; } @@ -1647,16 +1724,16 @@ if (!name || !value) return E_INVALIDARG; - write_output_buffer(This->buffer, entityW, sizeof(entityW)/sizeof(WCHAR)); + write_output_buffer(This, entityW, sizeof(entityW)/sizeof(WCHAR)); if (n_name) { - write_output_buffer(This->buffer, name, n_name); - write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer(This, name, n_name); + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); } if (n_value) - write_output_buffer_quoted(This->buffer, value, n_value); - - write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, value, n_value); + + write_output_buffer(This, closetagW, sizeof(closetagW)/sizeof(WCHAR)); return S_OK; } @@ -1665,37 +1742,33 @@ const WCHAR *name, int n_name, const WCHAR *publicId, int n_publicId, const WCHAR *systemId, int n_systemId) { - static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; - static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; mxwriter *This = impl_from_ISAXDeclHandler( iface ); TRACE("(%p)->(%s:%d %s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, debugstr_wn(publicId, n_publicId), n_publicId, debugstr_wn(systemId, n_systemId), n_systemId); - if (!name) return E_INVALIDARG; - if (publicId && !systemId) return E_INVALIDARG; - if (!publicId && !systemId) return E_INVALIDARG; - - write_output_buffer(This->buffer, entityW, sizeof(entityW)/sizeof(WCHAR)); + if (!name || !systemId) return E_INVALIDARG; + + write_output_buffer(This, entityW, sizeof(entityW)/sizeof(WCHAR)); if (n_name) { - write_output_buffer(This->buffer, name, n_name); - write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer(This, name, n_name); + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); } if (publicId) { - write_output_buffer(This->buffer, publicW, sizeof(publicW)/sizeof(WCHAR)); - write_output_buffer_quoted(This->buffer, publicId, n_publicId); - write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); - write_output_buffer_quoted(This->buffer, systemId, n_systemId); + write_output_buffer(This, publicW, sizeof(publicW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, publicId, n_publicId); + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, systemId, n_systemId); } else { - write_output_buffer(This->buffer, systemW, sizeof(systemW)/sizeof(WCHAR)); - write_output_buffer_quoted(This->buffer, systemId, n_systemId); - } - - write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); + write_output_buffer(This, systemW, sizeof(systemW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, systemId, n_systemId); + } + + write_output_buffer(This, closetagW, sizeof(closetagW)/sizeof(WCHAR)); return S_OK; } @@ -2194,14 +2267,45 @@ } static HRESULT WINAPI SAXDTDHandler_notationDecl(ISAXDTDHandler *iface, - const WCHAR *name, INT nname, - const WCHAR *publicid, INT npublicid, - const WCHAR *systemid, INT nsystemid) -{ + const WCHAR *name, INT n_name, + const WCHAR *publicid, INT n_publicid, + const WCHAR *systemid, INT n_systemid) +{ + static const WCHAR notationW[] = {'<','!','N','O','T','A','T','I','O','N',' '}; mxwriter *This = impl_from_ISAXDTDHandler( iface ); - FIXME("(%p)->(%s:%d, %s:%d, %s:%d): stub\n", This, debugstr_wn(name, nname), nname, - debugstr_wn(publicid, npublicid), npublicid, debugstr_wn(systemid, nsystemid), nsystemid); - return E_NOTIMPL; + + TRACE("(%p)->(%s:%d, %s:%d, %s:%d)\n", This, debugstr_wn(name, n_name), n_name, + debugstr_wn(publicid, n_publicid), n_publicid, debugstr_wn(systemid, n_systemid), n_systemid); + + if (!name || !n_name) + return E_INVALIDARG; + + write_output_buffer(This, notationW, sizeof(notationW)/sizeof(WCHAR)); + write_output_buffer(This, name, n_name); + + if (!publicid && !systemid) + return E_INVALIDARG; + + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + if (publicid) + { + write_output_buffer(This, publicW, sizeof(publicW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, publicid, n_publicid); + if (systemid) + { + write_output_buffer(This, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, systemid, n_systemid); + } + } + else + { + write_output_buffer(This, systemW, sizeof(systemW)/sizeof(WCHAR)); + write_output_buffer_quoted(This, systemid, n_systemid); + } + + write_output_buffer(This, closetagW, sizeof(closetagW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXDTDHandler_unparsedEntityDecl(ISAXDTDHandler *iface, @@ -2502,9 +2606,8 @@ This->newline = FALSE; This->dest = NULL; - This->dest_written = 0; - - hr = alloc_output_buffer(This->xml_enc, &This->buffer); + + hr = init_output_buffer(This->xml_enc, &This->buffer); if (hr != S_OK) { SysFreeString(This->encoding); SysFreeString(This->version); Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Tue Jun 7 10:29:11 2016 @@ -412,13 +412,13 @@ /* _private field holds a number of COM instances spawned from this libxml2 node * most significant bits are used to store information about ignorrable whitespace nodes */ -static void xmlnode_add_ref(xmlNodePtr node) +void xmlnode_add_ref(xmlNodePtr node) { if (node->type == XML_DOCUMENT_NODE) return; InterlockedIncrement((LONG*)&node->_private); } -static void xmlnode_release(xmlNodePtr node) +void xmlnode_release(xmlNodePtr node) { if (node->type == XML_DOCUMENT_NODE) return; InterlockedDecrement((LONG*)&node->_private); Modified: trunk/reactos/dll/win32/msxml3/nodemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodemap.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] Tue Jun 7 10:29:11 2016 @@ -120,6 +120,7 @@ TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { + xmlnode_release( This->node ); xmldoc_release( This->node->doc ); if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant); heap_free( This ); @@ -430,6 +431,7 @@ init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMNamedNodeMap_iface, &xmlnodemap_dispex); + xmlnode_add_ref(node); xmldoc_add_ref(node->doc); return &This->IXMLDOMNamedNodeMap_iface; Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Tue Jun 7 10:29:11 2016 @@ -2500,7 +2500,7 @@ if (encoding == XML_CHAR_ENCODING_NONE) { const WCHAR *ptr = (WCHAR*)buffer; - /* xml declaration with possibly specfied encoding will be still handled by parser */ + /* xml declaration with possibly specified encoding will be still handled by parser */ if ((size >= 2) && *ptr == '<' && ptr[1] != '?') { enc_name = (xmlChar*)xmlGetCharEncodingName(XML_CHAR_ENCODING_UTF16LE); Modified: trunk/reactos/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] Tue Jun 7 10:29:11 2016 @@ -789,7 +789,7 @@ static inline schema_cache* impl_from_IXMLDOMSchemaCollection(IXMLDOMSchemaCollection* iface) { - return CONTAINING_RECORD(iface, schema_cache, IXMLDOMSchemaCollection2_iface); + return CONTAINING_RECORD((IXMLDOMSchemaCollection2 *)iface, schema_cache, IXMLDOMSchemaCollection2_iface); } static inline schema_cache* unsafe_impl_from_IXMLDOMSchemaCollection(IXMLDOMSchemaCollection *iface) @@ -1085,6 +1085,18 @@ { *ppvObject = iface; } + else if(This->version == MSXML6 && IsEqualIID(riid, &CLSID_XMLSchemaCache60)) + { + /* + * Version 6 can be queried for an interface with IID equal to CLSID. + * There is no public interface with that IID and returned pointer + * is equal to returned IXMLDOMSchemaCollection2 iface. We assume + * that it's just another way for querying IXMLDOMSchemaCollection2 + * interface. Office 2013 ClickToRun installer uses this. + */ + WARN("riid CLSID_XMLSchemaCache60, returning IXMLDOMSchemaCollection2 interface.\n"); + *ppvObject = iface; + } else if (dispex_query_interface(&This->dispex, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; @@ -1206,12 +1218,13 @@ break; case VT_DISPATCH: + case VT_UNKNOWN: { xmlDocPtr doc = NULL; cache_entry* entry; CacheEntryType type; IXMLDOMNode* domnode = NULL; - IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IXMLDOMNode, (void**)&domnode); + IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IXMLDOMNode, (void**)&domnode); if (domnode) doc = xmlNodePtr_from_domnode(domnode, XML_DOCUMENT_NODE)->doc; @@ -1255,10 +1268,9 @@ break; default: - { - heap_free(name); - return E_INVALIDARG; - } + FIXME("arg type is not supported, %s\n", debugstr_variant(&var)); + heap_free(name); + return E_INVALIDARG; } heap_free(name); return S_OK; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Jun 7 10:29:11 2016 @@ -131,7 +131,7 @@ reactos/dll/win32/msvidc32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml # Synced to WineStaging-1.9.4 reactos/dll/win32/msxml2 # Synced to WineStaging-1.9.4 -reactos/dll/win32/msxml3 # Synced to WineStaging-1.9.4 +reactos/dll/win32/msxml3 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml4 # Synced to WineStaging-1.9.4 reactos/dll/win32/msxml6 # Synced to WineStaging-1.9.4 reactos/dll/win32/nddeapi # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71575: [MSVIDC32] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: akhaldi Date: Tue Jun 7 10:27:20 2016 New Revision: 71575 URL: http://svn.reactos.org/svn/reactos?rev=71575&view=rev Log: [MSVIDC32] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/msvidc32/msvideo1.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msvidc32/msvideo1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvideo… ============================================================================== --- trunk/reactos/dll/win32/msvidc32/msvideo1.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvidc32/msvideo1.c [iso-8859-1] Tue Jun 7 10:27:20 2016 @@ -71,8 +71,13 @@ typedef struct Msvideo1Context { DWORD dwMagic; - BOOL mode_8bit; /* if it's not 8-bit, it's 16-bit */ + int depth; } Msvideo1Context; + +static inline int get_stride(int width, int depth) +{ + return ((depth * width + 31) >> 3) & ~3; +} static void msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_size, @@ -331,8 +336,15 @@ TRACE("out->bpp = %d\n", out->bmiHeader.biBitCount ); TRACE("out->height = %d\n", out->bmiHeader.biHeight ); TRACE("out->width = %d\n", out->bmiHeader.biWidth ); - if(( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) || - ( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) || + + if ((in->bmiHeader.biBitCount != out->bmiHeader.biBitCount) && + (in->bmiHeader.biBitCount != 16 || out->bmiHeader.biBitCount != 24)) + { + TRACE("incompatible depth requested\n"); + return ICERR_BADFORMAT; + } + + if(( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) || ( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) || ( in->bmiHeader.biWidth != out->bmiHeader.biWidth )) { @@ -359,12 +371,17 @@ if (in->bmiHeader.biBitCount <= 8) size += in->bmiHeader.biClrUsed * sizeof(RGBQUAD); + if (in->bmiHeader.biBitCount != 8 && in->bmiHeader.biBitCount != 16) + return ICERR_BADFORMAT; + if( out ) { memcpy( out, in, size ); + out->bmiHeader.biWidth = in->bmiHeader.biWidth & ~1; + out->bmiHeader.biHeight = in->bmiHeader.biHeight & ~1; out->bmiHeader.biCompression = BI_RGB; - out->bmiHeader.biSizeImage = in->bmiHeader.biHeight - * in->bmiHeader.biWidth *4; + out->bmiHeader.biSizeImage = in->bmiHeader.biHeight * + get_stride(out->bmiHeader.biWidth, out->bmiHeader.biBitCount); return ICERR_OK; } @@ -380,21 +397,56 @@ TRACE("bitmap is %d bpp\n", in->bmiHeader.biBitCount); if( in->bmiHeader.biBitCount == 8 ) - info->mode_8bit = TRUE; + info->depth = 8; else if( in->bmiHeader.biBitCount == 16 ) - info->mode_8bit = FALSE; + info->depth = 16; else { - info->mode_8bit = FALSE; + info->depth = 0; FIXME("Unsupported output format %i\n", in->bmiHeader.biBitCount); } return ICERR_OK; } +static void convert_depth(char *input, int depth_in, char *output, BITMAPINFOHEADER *out_hdr) +{ + int x, y; + int stride_in = get_stride(out_hdr->biWidth, depth_in); + int stride_out = get_stride(out_hdr->biWidth, out_hdr->biBitCount); + + if (depth_in == 16 && out_hdr->biBitCount == 24) + { + static const unsigned char convert_5to8[] = + { + 0x00, 0x08, 0x10, 0x19, 0x21, 0x29, 0x31, 0x3a, + 0x42, 0x4a, 0x52, 0x5a, 0x63, 0x6b, 0x73, 0x7b, + 0x84, 0x8c, 0x94, 0x9c, 0xa5, 0xad, 0xb5, 0xbd, + 0xc5, 0xce, 0xd6, 0xde, 0xe6, 0xef, 0xf7, 0xff, + }; + + for (y = 0; y < out_hdr->biHeight; y++) + { + WORD *src_row = (WORD *)(input + y * stride_in); + char *out_row = output + y * stride_out; + + for (x = 0; x < out_hdr->biWidth; x++) + { + WORD pixel = *src_row++; + *out_row++ = convert_5to8[(pixel & 0x7c00u) >> 10]; + *out_row++ = convert_5to8[(pixel & 0x03e0u) >> 5]; + *out_row++ = convert_5to8[(pixel & 0x001fu)]; + } + } + } + else + FIXME("Conversion from %d to %d bit unimplemented\n", depth_in, out_hdr->biBitCount); +} + static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD size ) { LONG width, height, stride, sz; + void *output; TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); @@ -405,18 +457,33 @@ width = icd->lpbiInput->biWidth; height = icd->lpbiInput->biHeight; - stride = width; /* in bytes or 16bit words */ sz = icd->lpbiInput->biSizeImage; - if (info->mode_8bit) - { + output = icd->lpOutput; + + if (icd->lpbiOutput->biBitCount != info->depth) + { + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiOutput->biWidth * icd->lpbiOutput->biHeight * info->depth / 8); + if (!output) return ICERR_MEMORY; + } + + if (info->depth == 8) + { + stride = get_stride(width, 8); msvideo1_decode_8bit( width, height, icd->lpInput, sz, - icd->lpOutput, stride); + output, stride ); } else { + stride = get_stride(width, 16) / 2; msvideo1_decode_16bit( width, height, icd->lpInput, sz, - icd->lpOutput, stride); + output, stride ); + } + + if (icd->lpbiOutput->biBitCount != info->depth) + { + convert_depth(output, info->depth, icd->lpOutput, icd->lpbiOutput); + HeapFree(GetProcessHeap(), 0, output); } return ICERR_OK; @@ -425,6 +492,7 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DWORD size ) { LONG width, height, stride, sz; + void *output; TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); @@ -435,18 +503,33 @@ width = icd->lpbiSrc->biWidth; height = icd->lpbiSrc->biHeight; - stride = width; sz = icd->lpbiSrc->biSizeImage; - if (info->mode_8bit) - { + output = icd->lpDst; + + if (icd->lpbiDst->biBitCount != info->depth) + { + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiDst->biWidth * icd->lpbiDst->biHeight * info->depth / 8); + if (!output) return ICERR_MEMORY; + } + + if (info->depth == 8) + { + stride = get_stride(width, 8); msvideo1_decode_8bit( width, height, icd->lpSrc, sz, - icd->lpDst, stride); + output, stride ); } else { + stride = get_stride(width, 16) / 2; msvideo1_decode_16bit( width, height, icd->lpSrc, sz, - icd->lpDst, stride); + output, stride ); + } + + if (icd->lpbiDst->biBitCount != info->depth) + { + convert_depth(output, info->depth, icd->lpDst, icd->lpbiDst); + HeapFree(GetProcessHeap(), 0, output); } return ICERR_OK; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Jun 7 10:27:20 2016 @@ -128,7 +128,7 @@ reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/msvidc32 # Synced to WineStaging-1.9.4 +reactos/dll/win32/msvidc32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml # Synced to WineStaging-1.9.4 reactos/dll/win32/msxml2 # Synced to WineStaging-1.9.4 reactos/dll/win32/msxml3 # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71574: [MSVFW32] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: akhaldi Date: Tue Jun 7 10:26:22 2016 New Revision: 71574 URL: http://svn.reactos.org/svn/reactos?rev=71574&view=rev Log: [MSVFW32] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] Tue Jun 7 10:26:22 2016 @@ -88,6 +88,11 @@ } #undef XX return str; +} + +static inline int get_stride(int width, int depth) +{ + return ((depth * width + 31) >> 3) & ~3; } static WINE_HIC* MSVIDEO_FirstHic /* = NULL */; @@ -442,7 +447,7 @@ local = ICOpen(fccType, info.fccHandler, wMode); if (local != 0) { - TRACE("Returning %s as defult handler for %s\n", + TRACE("Returning %s as default handler for %s\n", wine_dbgstr_fcc(info.fccHandler), wine_dbgstr_fcc(fccType)); return local; } @@ -711,23 +716,84 @@ HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut, INT depth,INT dx,INT dy) { - HIC tmphic = hic; - - TRACE("(%p,%p,%p,%d,%d,%d)!\n",hic,lpbiIn,lpbiOut,depth,dx,dy); - - if (!tmphic) { - tmphic=ICLocate(ICTYPE_VIDEO,0,lpbiIn,NULL,ICMODE_DECOMPRESS); - if (!tmphic) - return tmphic; - } - if ((dy == lpbiIn->biHeight) && (dx == lpbiIn->biWidth)) - dy = dx = 0; /* no resize needed */ + static const struct + { + int depth; + int compression; + } + try_depths[] = + { + { 8, BI_RGB}, + {16, BI_RGB}, + {16, BI_BITFIELDS}, + {24, BI_RGB}, + {32, BI_RGB}, + }; + + int screen_depth, i; + BOOL found = FALSE; + HIC tmphic; + HDC hdc; + + TRACE("(%p,%p,%p,%d,%d,%d)!\n", hic, lpbiIn, lpbiOut, depth, dx, dy); + + tmphic = hic ? hic : ICLocate(ICTYPE_VIDEO, 0, lpbiIn, NULL, ICMODE_DECOMPRESS); + if (!tmphic) return tmphic; + + hdc = GetDC(0); + screen_depth = GetDeviceCaps(hdc, BITSPIXEL) * GetDeviceCaps(hdc, PLANES); + ReleaseDC(0, hdc); + + if (dx <= 0) dx = lpbiIn->biWidth; + if (dy <= 0) dy = lpbiIn->biHeight; + if (!depth) depth = screen_depth; /* Can we decompress it ? */ - if (ICDecompressQuery(tmphic,lpbiIn,NULL) != 0) + if (ICDecompressQuery(tmphic, lpbiIn, NULL) != ICERR_OK) goto errout; /* no, sorry */ ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut); + + lpbiOut->biSize = sizeof(BITMAPINFOHEADER); + lpbiOut->biWidth = dx; + lpbiOut->biHeight = dy; + lpbiOut->biPlanes = 1; + + for (i = 0; i < sizeof(try_depths) / sizeof(try_depths[0]); i++) + { + if (!found && try_depths[i].depth != depth) + continue; + + found = TRUE; + lpbiOut->biBitCount = try_depths[i].depth; + lpbiOut->biCompression = try_depths[i].compression; + lpbiOut->biSizeImage = dx * get_stride(dy, lpbiOut->biBitCount); + + if (ICDecompressQuery(tmphic, lpbiIn, lpbiOut) == ICERR_OK) + { + if (try_depths[i].depth == 8) + ICDecompressGetPalette(tmphic, lpbiIn, lpbiOut); + goto success; + } + } + + if (!found) + { + lpbiOut->biBitCount = depth; + lpbiOut->biCompression = BI_RGB; + lpbiOut->biSizeImage = dx * get_stride(dy, lpbiOut->biBitCount); + if (ICDecompressQuery(tmphic, lpbiIn, lpbiOut) == ICERR_OK) + goto success; + + lpbiOut->biBitCount = screen_depth; + lpbiOut->biCompression = BI_RGB; + lpbiOut->biSizeImage = dx * get_stride(dy, lpbiOut->biBitCount); + if (ICDecompressQuery(tmphic, lpbiIn, lpbiOut) == ICERR_OK) + goto success; + } + + if (ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut)) + goto errout; if (lpbiOut->biCompression != 0) { FIXME("Ooch, how come decompressor outputs compressed data (%d)??\n", @@ -738,20 +804,11 @@ lpbiOut->biSize); lpbiOut->biSize = sizeof(*lpbiOut); } - if (!depth) { - HDC hdc; - - hdc = GetDC(0); - depth = GetDeviceCaps(hdc,BITSPIXEL)*GetDeviceCaps(hdc,PLANES); - ReleaseDC(0,hdc); - if (depth==15) depth = 16; - if (depth<8) depth = 8; - } - if (lpbiIn->biBitCount == 8) - depth = 8; - + +success: TRACE("=> %p\n", tmphic); return tmphic; + errout: if (hic!=tmphic) ICClose(tmphic); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Jun 7 10:26:22 2016 @@ -127,7 +127,7 @@ reactos/dll/win32/mstask # Synced to WineStaging-1.9.4 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to WineStaging-1.9.4 +reactos/dll/win32/msvfw32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msvidc32 # Synced to WineStaging-1.9.4 reactos/dll/win32/msxml # Synced to WineStaging-1.9.4 reactos/dll/win32/msxml2 # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71573: [MSRLE32] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 07 Jun '16

07 Jun '16

Author: akhaldi Date: Tue Jun 7 10:24:56 2016 New Revision: 71573 URL: http://svn.reactos.org/svn/reactos?rev=71573&view=rev Log: [MSRLE32] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/msrle32/msrle32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msrle32/msrle32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle32.… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle32.c [iso-8859-1] Tue Jun 7 10:24:56 2016 @@ -1567,8 +1567,16 @@ size = lpbiIn->biSize; - if (lpbiIn->biBitCount <= 8) - size += lpbiIn->biClrUsed * sizeof(RGBQUAD); + if (lpbiIn->biBitCount <= 8) { + int colors; + + if (lpbiIn->biClrUsed == 0) + colors = 1 << lpbiIn->biBitCount; + else + colors = lpbiIn->biClrUsed; + + size += colors * sizeof(RGBQUAD); + } if (lpbiOut != NULL) { memcpy(lpbiOut, lpbiIn, size); @@ -1647,27 +1655,33 @@ if (lpbiIn->biCompression != BI_RGB) { + int colors; + + if (lpbiIn->biBitCount <= 8 && lpbiIn->biClrUsed == 0) + colors = 1 << lpbiIn->biBitCount; + else + colors = lpbiIn->biClrUsed; + rgbIn = (const RGBQUAD*)((const BYTE*)lpbiIn + lpbiIn->biSize); rgbOut = (const RGBQUAD*)((const BYTE*)lpbiOut + lpbiOut->biSize); switch (lpbiOut->biBitCount) { case 4: case 8: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed); + pi->palette_map = LocalAlloc(LPTR, colors); if (pi->palette_map == NULL) return ICERR_MEMORY; - for (i = 0; i < lpbiIn->biClrUsed; i++) { - pi->palette_map[i] = MSRLE32_GetNearestPaletteIndex(lpbiOut->biClrUsed, rgbOut, rgbIn[i]); - } + for (i = 0; i < colors; i++) + pi->palette_map[i] = MSRLE32_GetNearestPaletteIndex(colors, rgbOut, rgbIn[i]); break; case 15: case 16: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * 2); + pi->palette_map = LocalAlloc(LPTR, colors * 2); if (pi->palette_map == NULL) return ICERR_MEMORY; - for (i = 0; i < lpbiIn->biClrUsed; i++) { + for (i = 0; i < colors; i++) { WORD color; if (lpbiOut->biBitCount == 15) @@ -1683,10 +1697,10 @@ break; case 24: case 32: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * sizeof(RGBQUAD)); + pi->palette_map = LocalAlloc(LPTR, colors * sizeof(RGBQUAD)); if (pi->palette_map == NULL) return ICERR_MEMORY; - memcpy(pi->palette_map, rgbIn, lpbiIn->biClrUsed * sizeof(RGBQUAD)); + memcpy(pi->palette_map, rgbIn, colors * sizeof(RGBQUAD)); break; }; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Jun 7 10:24:56 2016 @@ -121,7 +121,7 @@ reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.9.4 reactos/dll/win32/msnet32 # Synced to WineStaging-1.9.4 reactos/dll/win32/mspatcha # Synced to WineStaging-1.9.4 -reactos/dll/win32/msrle32 # Synced to WineStaging-1.9.4 +reactos/dll/win32/msrle32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mssign32 # Synced to WineStaging-1.9.4 reactos/dll/win32/mssip32 # Synced to WineStaging-1.9.4 reactos/dll/win32/mstask # Synced to WineStaging-1.9.4

1 0

[mjansen] 71572: [APPHELP_APITEST] Extend stringtable related tests. CORE-10367
by mjansen＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: mjansen Date: Sun Jun 5 21:26:07 2016 New Revision: 71572 URL: http://svn.reactos.org/svn/reactos?rev=71572&view=rev Log: [APPHELP_APITEST] Extend stringtable related tests. CORE-10367 Modified: trunk/rostests/apitests/apphelp/db.c Modified: trunk/rostests/apitests/apphelp/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.c?rev… ============================================================================== --- trunk/rostests/apitests/apphelp/db.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/db.c [iso-8859-1] Sun Jun 5 21:26:07 2016 @@ -315,6 +315,7 @@ /* - Show that a stringtable is automatically generated, + - Show that entries in the stringtable are re-used, - validate multiple lists (for the length) */ static void test_write_ex(void) @@ -327,6 +328,7 @@ TAG tag; DWORD size; BOOL ret; + LPWSTR ptr; /* Write a small database */ pdb = pSdbCreateDatabase(path1, DOS_PATH); @@ -336,12 +338,14 @@ tagdb = pSdbBeginWriteListTag(pdb, TAG_DATABASE); ok(tagdb == 12, "Expected tag to be 12, was %u\n", tagdb); ret = pSdbWriteStringTag(pdb, TAG_NAME, test1); + ret = pSdbWriteStringTag(pdb, TAG_NAME, test2); ok(ret, "Expected SdbWriteStringTag to succeed\n"); ret = pSdbEndWriteListTag(pdb, tagdb); ok(ret, "Expected SdbEndWriteListTag to succeed\n"); tagdb = pSdbBeginWriteListTag(pdb, TAG_DATABASE); - ok(tagdb == 24, "Expected tag to be 24, was %u\n", tagdb); + ok(tagdb == 30, "Expected tag to be 24, was %u\n", tagdb); + ret = pSdbWriteStringTag(pdb, TAG_NAME, test1); ret = pSdbWriteStringTag(pdb, TAG_NAME, test2); ok(ret, "Expected SdbWriteStringTag to succeed\n"); ret = pSdbEndWriteListTag(pdb, tagdb); @@ -354,10 +358,12 @@ ok(pdb != NULL, "Expected a valid database\n"); if (!pdb) return; + tagdb = pSdbFindFirstTag(pdb, TAGID_ROOT, TAG_DATABASE); ok(tagdb == 12, "Expected tag to be 12, was %u\n", tagdb); size = pSdbGetTagDataSize(pdb, tagdb); - ok(size == 6, "Expected size to be 6, was %u\n", size); + ok(size == 12, "Expected size to be 12, was %u\n", size); + tagstr = pSdbFindFirstTag(pdb, tagdb, TAG_NAME); ok(tagstr == 18, "Expected string tag to be 18, was %u\n", tagstr); tag = pSdbGetTagFromTagID(pdb, tagstr); @@ -365,38 +371,160 @@ size = pSdbGetTagDataSize(pdb, tagstr); ok(size == 4, "Expected size to be 4, was 0x%x\n", size); + tagstr = pSdbFindNextTag(pdb, tagdb, tagstr); + ok(tagstr == 24, "Expected string tag to be 24, was %u\n", tagstr); + tag = pSdbGetTagFromTagID(pdb, tagstr); + ok(tag == TAG_NAME, "Expected tag to be TAG_NAME, was 0x%x\n", (DWORD)tag); + size = pSdbGetTagDataSize(pdb, tagstr); + ok(size == 4, "Expected size to be 4, was 0x%x\n", size); + tagdb = pSdbFindNextTag(pdb, TAGID_ROOT, tagdb); - ok(tagdb == 24, "Expected tag to be 24, was %u\n", tagdb); + ok(tagdb == 30, "Expected tag to be 30, was %u\n", tagdb); size = pSdbGetTagDataSize(pdb, tagdb); - ok(size == 6, "Expected size to be 6, was %u\n", size); + ok(size == 12, "Expected size to be 12, was %u\n", size); + tagstr = pSdbFindFirstTag(pdb, tagdb, TAG_NAME); - ok(tagstr == 30, "Expected string tag to be 30, was %u\n", tagstr); + ok(tagstr == 36, "Expected string tag to be 36, was %u\n", tagstr); tag = pSdbGetTagFromTagID(pdb, tagstr); ok(tag == TAG_NAME, "Expected tag to be TAG_NAME, was 0x%x\n", (DWORD)tag); size = pSdbGetTagDataSize(pdb, tagstr); ok(size == 4, "Expected size to be 4, was %u\n", size); + tagstr = pSdbFindNextTag(pdb, tagdb, tagstr); + ok(tagstr == 42, "Expected string tag to be 42, was %u\n", tagstr); + tag = pSdbGetTagFromTagID(pdb, tagstr); + ok(tag == TAG_NAME, "Expected tag to be TAG_NAME, was 0x%x\n", (DWORD)tag); + size = pSdbGetTagDataSize(pdb, tagstr); + ok(size == 4, "Expected size to be 4, was 0x%x\n", size); + tagdb = pSdbFindFirstTag(pdb, TAGID_ROOT, TAG_STRINGTABLE); - ok(tagdb == 36, "Expected tag to be 36, was %u\n", tagdb); + ok(tagdb == 48, "Expected tag to be 48, was %u\n", tagdb); size = pSdbGetTagDataSize(pdb, tagdb); ok(size == 32, "Expected size to be 32, was %u\n", size); + tagstr = pSdbGetFirstChild(pdb, tagdb); - ok(tagstr == 42, "Expected string tag to be 42, was %u\n", tagstr); + ok(tagstr == 54, "Expected string tag to be 54, was %u\n", tagstr); tag = pSdbGetTagFromTagID(pdb, tagstr); ok(tag == TAG_STRINGTABLE_ITEM, "Expected tag to be TAG_STRINGTABLE_ITEM, was 0x%x\n", (DWORD)tag); size = pSdbGetTagDataSize(pdb, tagstr); ok(size == 10, "Expected size to be 10, was %u\n", size); + ptr = pSdbGetStringTagPtr(pdb, tagstr); + ok(ptr != NULL, "Expected a valid pointer\n"); + if (ptr) + ok(!wcscmp(ptr, test1), "Expected ptr to be %s, was %s\n", wine_dbgstr_w(test1), wine_dbgstr_w(ptr)); tagstr = pSdbGetNextChild(pdb, tagdb, tagstr); - ok(tagstr == 58, "Expected string tag to be 58, was %u\n", tagstr); + ok(tagstr == 70, "Expected string tag to be 70, was %u\n", tagstr); tag = pSdbGetTagFromTagID(pdb, tagstr); ok(tag == TAG_STRINGTABLE_ITEM, "Expected tag to be TAG_STRINGTABLE_ITEM, was 0x%x\n", (DWORD)tag); size = pSdbGetTagDataSize(pdb, tagstr); ok(size == 10, "Expected size to be 10, was %u\n", size); + ptr = pSdbGetStringTagPtr(pdb, tagstr); + ok(ptr != NULL, "Expected a valid pointer\n"); + if (ptr) + ok(!wcscmp(ptr, test2), "Expected ptr to be %s, was %s\n", wine_dbgstr_w(test2), wine_dbgstr_w(ptr)); pSdbCloseDatabase(pdb); } + +static void write_db_strings(const WCHAR* name, const WCHAR* data[], size_t count) +{ + PDB pdb; + size_t n; + BOOL ret; + + pdb = pSdbCreateDatabase(name, DOS_PATH); + ok(pdb != NULL, "Failed to create db for case %u\n", count); + for (n = 0; n < count; ++n) + { + ret = pSdbWriteStringTag(pdb, TAG_NAME, data[n]); + ok(ret, "Failed to write string %u/%u\n", n, count); + } + pSdbCloseDatabaseWrite(pdb); +} + +static void test_stringtable() +{ + static const WCHAR path1[] = {'t','e','s','t','.','s','d','b',0}; + static const WCHAR test1[] = {'t','e','s','t','1',0}; + static const WCHAR test2[] = {'T','e','s','t','1',0}; + static const WCHAR test3[] = {'T','E','s','t','1',0}; + static const WCHAR test4[] = {'T','E','S','T','1',0}; + static const WCHAR test5[] = {'T','E','S','T','2',0}; + static const WCHAR lipsum[] = {'L','o','r','e','m',' ','i','p','s','u','m',' ','d','o','l','o','r',' ','s','i','t',' ','a','m','e','t',',',' ','c','o','n','s','e','c','t','e','t','u','r',' ','a','d','i','p','i','s','c','i','n','g',' ','e','l','i','t','.',' ','N','u','l','l','a',' ','a','n','t','e',' ','r','i','s','u','s',',',' ','m','a','l','e','s','u','a','d','a',' ','s','e','d',' ','i','a','c','u','l','i','s',' ','l','u','c','t','u','s',',',' ','o','r','n','a','r','e',' ','p','u','l','v','i','n','a','r',' ','v','e','l','i','t','.',' ','L','o','r','e','m',' ','i','p','s','u','m',' ','d','o','l','o','r',' ','s','i','t',' ','a','m','e','t',',',' ','c','o','n','s','e','c','t','e','t','u','r',' ','a','d','i','p','i','s','c','i','n','g',' ','e','l','i','t','.',' ','I','n','t','e','g','e','r',' ','q','u','i','s',' ','f','e','l','i','s',' ','u','t',' ','l','e','o',' ','e','l','e','i','f','e','n','d',' ','u','l','t','r','i','c','e','s',' ','f','i','n','i','b','u','s',' ','e','u',' ','d','o','l','o','r','.',' ','I','n',' ','b','i','b','e','n','d','u','m',',',' ','e','r','o','s',' ','e','u',' ','f','a','u','c','i','b','u','s',' ','c','o','n','s','e','q','u','a','t',',',' ','n','i','s','i',' ','m','a','g','n','a',' ','v','e','n','e','n','a','t','i','s',' ','j','u','s','t','o',',',' ','a','t',' ','t','r','i','s','t','i','q','u','e',' ','m','e','t','u','s',' ','d','o','l','o','r',' ','u','t',' ','r','i','s','u','s','.',' ','N','u','n','c',' ','e','u',' ','o','d','i','o',' ','d','i','g','n','i','s','s','i','m',',',' ','o','r','n','a','r','e',' ','a','n','t','e',' ','g','r','a','v','i','d','a',',',' ','l','o','b','o','r','t','i','s',' ','e','r','o','s','.',' ','C','r','a','s',' ','s','e','m',' ','e','x',',',' ','c','o','n','s','e','c','t','e','t','u','r',' ','p','u','l','v','i','n','a','r',' ','t','i','n','c','i','d','u','n','t',' ','e','u',',',' ','c','o','n','g','u','e',' ','a',' ','e','r','o','s','.',' ','C','u','r','a','b','i','t','u','r',' ','e','r','o','s',' ','e','r','a','t',',',' ','p','e','l','l','e','n','t','e','s','q','u','e',' ','e','t',' ','n','i','b','h',' ','q','u','i','s',',',' ','i','n','t','e','r','d','u','m',' ','t','e','m','p','o','r',' ','o','d','i','o','.',' ','E','t','i','a','m',' ','s','a','p','i','e','n',' ','s','a','p','i','e','n',',',' ','a','l','i','q','u','a','m',' ','u','t',' ','a','l','i','q','u','a','m',' ','a','t',',',' ','s','a','g','i','t','t','i','s',' ','e','u',' ','m','a','g','n','a','.',' ','M','a','e','c','e','n','a','s',' ','m','a','g','n','a',' ','m','a','g','n','a',',',' ','s','u','s','c','i','p','i','t',' ','u','t',' ','l','o','r','e','m',' ','u','t',',',' ','v','a','r','i','u','s',' ','p','r','e','t','i','u','m',' ','f','e','l','i','s','.',' ','I','n','t','e','g','e','r',' ','t','i','n','c','i','d','u','n','t',',',' ','m','e','t','u','s',' ','v','e','l',' ','s','o','l','l','i','c','i','t','u','d','i','n',' ','f','i','n','i','b','u','s',',',' ','f','e','l','i','s',' ','e','r','a','t',' ','m','o','l','e','s','t','i','e',' ','u','r','n','a',',',' ','a',' ','c','o','n','d','i','m','e','n','t','u','m',' ','a','u','g','u','e',' ','a','r','c','u',' ','v','i','t','a','e',' ','r','i','s','u','s','.',' ','E','t','i','a','m',' ','i','d',' ','s','a','g','i','t','t','i','s',' ','q','u','a','m','.',' ','M','o','r','b','i',' ','a',' ','u','l','t','r','i','c','i','e','s',' ','n','u','n','c','.',' ','P','h','a','s','e','l','l','u','s',' ','e','r','o','s',' ','r','i','s','u','s',',',' ','c','u','r','s','u','s',' ','u','l','l','a','m','c','o','r','p','e','r',' ','m','a','s','s','a',' ','s','e','d',',',' ','d','i','g','n','i','s','s','i','m',' ','c','o','n','s','e','q','u','a','t',' ','l','i','g','u','l','a','.',' ','A','l','i','q','u','a','m',' ','t','u','r','p','i','s',' ','a','r','c','u',',',' ','a','c','c','u','m','s','a','n',' ','q','u','i','s',' ','s','a','p','i','e','n',' ','v','i','t','a','e',',',' ','l','a','c','i','n','i','a',' ','e','u','i','s','m','o','d',' ','n','i','s','l','.',' ','M','a','u','r','i','s',' ','i','d',' ','f','e','l','i','s',' ','s','e','m','.',0}; + /* Last char changed from '.' to '!' */ + static const WCHAR lipsum2[] = {'L','o','r','e','m',' ','i','p','s','u','m',' ','d','o','l','o','r',' ','s','i','t',' ','a','m','e','t',',',' ','c','o','n','s','e','c','t','e','t','u','r',' ','a','d','i','p','i','s','c','i','n','g',' ','e','l','i','t','.',' ','N','u','l','l','a',' ','a','n','t','e',' ','r','i','s','u','s',',',' ','m','a','l','e','s','u','a','d','a',' ','s','e','d',' ','i','a','c','u','l','i','s',' ','l','u','c','t','u','s',',',' ','o','r','n','a','r','e',' ','p','u','l','v','i','n','a','r',' ','v','e','l','i','t','.',' ','L','o','r','e','m',' ','i','p','s','u','m',' ','d','o','l','o','r',' ','s','i','t',' ','a','m','e','t',',',' ','c','o','n','s','e','c','t','e','t','u','r',' ','a','d','i','p','i','s','c','i','n','g',' ','e','l','i','t','.',' ','I','n','t','e','g','e','r',' ','q','u','i','s',' ','f','e','l','i','s',' ','u','t',' ','l','e','o',' ','e','l','e','i','f','e','n','d',' ','u','l','t','r','i','c','e','s',' ','f','i','n','i','b','u','s',' ','e','u',' ','d','o','l','o','r','.',' ','I','n',' ','b','i','b','e','n','d','u','m',',',' ','e','r','o','s',' ','e','u',' ','f','a','u','c','i','b','u','s',' ','c','o','n','s','e','q','u','a','t',',',' ','n','i','s','i',' ','m','a','g','n','a',' ','v','e','n','e','n','a','t','i','s',' ','j','u','s','t','o',',',' ','a','t',' ','t','r','i','s','t','i','q','u','e',' ','m','e','t','u','s',' ','d','o','l','o','r',' ','u','t',' ','r','i','s','u','s','.',' ','N','u','n','c',' ','e','u',' ','o','d','i','o',' ','d','i','g','n','i','s','s','i','m',',',' ','o','r','n','a','r','e',' ','a','n','t','e',' ','g','r','a','v','i','d','a',',',' ','l','o','b','o','r','t','i','s',' ','e','r','o','s','.',' ','C','r','a','s',' ','s','e','m',' ','e','x',',',' ','c','o','n','s','e','c','t','e','t','u','r',' ','p','u','l','v','i','n','a','r',' ','t','i','n','c','i','d','u','n','t',' ','e','u',',',' ','c','o','n','g','u','e',' ','a',' ','e','r','o','s','.',' ','C','u','r','a','b','i','t','u','r',' ','e','r','o','s',' ','e','r','a','t',',',' ','p','e','l','l','e','n','t','e','s','q','u','e',' ','e','t',' ','n','i','b','h',' ','q','u','i','s',',',' ','i','n','t','e','r','d','u','m',' ','t','e','m','p','o','r',' ','o','d','i','o','.',' ','E','t','i','a','m',' ','s','a','p','i','e','n',' ','s','a','p','i','e','n',',',' ','a','l','i','q','u','a','m',' ','u','t',' ','a','l','i','q','u','a','m',' ','a','t',',',' ','s','a','g','i','t','t','i','s',' ','e','u',' ','m','a','g','n','a','.',' ','M','a','e','c','e','n','a','s',' ','m','a','g','n','a',' ','m','a','g','n','a',',',' ','s','u','s','c','i','p','i','t',' ','u','t',' ','l','o','r','e','m',' ','u','t',',',' ','v','a','r','i','u','s',' ','p','r','e','t','i','u','m',' ','f','e','l','i','s','.',' ','I','n','t','e','g','e','r',' ','t','i','n','c','i','d','u','n','t',',',' ','m','e','t','u','s',' ','v','e','l',' ','s','o','l','l','i','c','i','t','u','d','i','n',' ','f','i','n','i','b','u','s',',',' ','f','e','l','i','s',' ','e','r','a','t',' ','m','o','l','e','s','t','i','e',' ','u','r','n','a',',',' ','a',' ','c','o','n','d','i','m','e','n','t','u','m',' ','a','u','g','u','e',' ','a','r','c','u',' ','v','i','t','a','e',' ','r','i','s','u','s','.',' ','E','t','i','a','m',' ','i','d',' ','s','a','g','i','t','t','i','s',' ','q','u','a','m','.',' ','M','o','r','b','i',' ','a',' ','u','l','t','r','i','c','i','e','s',' ','n','u','n','c','.',' ','P','h','a','s','e','l','l','u','s',' ','e','r','o','s',' ','r','i','s','u','s',',',' ','c','u','r','s','u','s',' ','u','l','l','a','m','c','o','r','p','e','r',' ','m','a','s','s','a',' ','s','e','d',',',' ','d','i','g','n','i','s','s','i','m',' ','c','o','n','s','e','q','u','a','t',' ','l','i','g','u','l','a','.',' ','A','l','i','q','u','a','m',' ','t','u','r','p','i','s',' ','a','r','c','u',',',' ','a','c','c','u','m','s','a','n',' ','q','u','i','s',' ','s','a','p','i','e','n',' ','v','i','t','a','e',',',' ','l','a','c','i','n','i','a',' ','e','u','i','s','m','o','d',' ','n','i','s','l','.',' ','M','a','u','r','i','s',' ','i','d',' ','f','e','l','i','s',' ','s','e','m','!',0}; + static const WCHAR empty[] = {0}; + static const WCHAR* all[] = { test1, test2, test3, test4, test5, lipsum, lipsum2, empty }; + static const TAGID expected_str[] = { 0xc, 0x12, 0x18, 0x1e, 0x24, 0x2a, 0x30, 0x36 }; + static const TAGID expected_tab[] = { 6, 0x18, 0x2a, 0x3c, 0x4e, 0x60, 0x846, 0x102c }; + size_t n, j; + + for (n = 0; n < (sizeof(all) / sizeof(all[0])); ++n) + { + PDB pdb; + TAGID tagstr, table, expected_table; + + write_db_strings(path1, all, n+1); + + pdb = pSdbOpenDatabase(path1, DOS_PATH); + ok(pdb != NULL, "Expected a valid database\n"); + if (!pdb) + { + DeleteFileW(path1); + continue; + } + tagstr = pSdbFindFirstTag(pdb, TAGID_ROOT, TAG_NAME); + for (j = 0; j <= n; ++j) + { + ok(tagstr == expected_str[j], "Expected tagstr to be 0x%x, was 0x%x for %u/%u\n", expected_str[j], tagstr, j, n); + if (tagstr) + { + LPWSTR data; + DWORD size; + TAG tag = pSdbGetTagFromTagID(pdb, tagstr); + ok(tag == TAG_NAME, "Expected tag to be TAG_NAME, was 0x%x for %u/%u\n", tag, j, n); + size = pSdbGetTagDataSize(pdb, tagstr); + ok(size == 4, "Expected datasize to be 4, was %u for %u/%u\n", size, j, n); + data = pSdbGetStringTagPtr(pdb, tagstr); + ok(data && !wcsicmp(data, all[j]), "Expected data to be %s was %s for %u/%u\n", wine_dbgstr_w(all[j]), wine_dbgstr_w(data), j, n); + } + tagstr = pSdbFindNextTag(pdb, TAGID_ROOT, tagstr); + } + ok(tagstr == TAGID_NULL, "Expected to be at the end for %u\n", n); + + + table = pSdbFindFirstTag(pdb, TAGID_ROOT, TAG_STRINGTABLE); + expected_table = 0xc + (n+1)*6; + ok(table == expected_table, "Expected to find a stringtable at 0x%x instead of 0x%x for %u\n", expected_table, table, n); + if (table) + { + tagstr = pSdbFindFirstTag(pdb, table, TAG_STRINGTABLE_ITEM); + for (j = 0; j <= n; ++j) + { + ok(tagstr == (expected_tab[j] + expected_table), "Expected tagstr to be 0x%x, was 0x%x for %u/%u\n", (expected_tab[j] + expected_table), tagstr, j, n); + if (tagstr) + { + LPWSTR data; + DWORD size, expected_size; + TAG tag = pSdbGetTagFromTagID(pdb, tagstr); + ok(tag == TAG_STRINGTABLE_ITEM, "Expected tag to be TAG_NAME, was 0x%x for %u/%u\n", tag, j, n); + size = pSdbGetTagDataSize(pdb, tagstr); + expected_size = (lstrlenW(all[j])+1) * 2; + ok(size == expected_size, "Expected datasize to be %u, was %u for %u/%u\n", expected_size, size, j, n); + data = pSdbGetStringTagPtr(pdb, tagstr); + ok(data && !wcsicmp(data, all[j]), "Expected data to be %s was %s for %u/%u\n", wine_dbgstr_w(all[j]), wine_dbgstr_w(data), j, n); + } + tagstr = pSdbFindNextTag(pdb, TAGID_ROOT, tagstr); + } + ok(tagstr == TAGID_NULL, "Expected to be at the end for %u\n", n); + } + + pSdbCloseDatabase(pdb); + DeleteFileW(path1); + } +} static void match_str_attr_imp(PDB pdb, TAGID parent, TAG find, const char* compare) { @@ -876,5 +1004,6 @@ test_Sdb(); test_write_ex(); + test_stringtable(); test_CheckDatabaseManually(); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs