August 2009 - Wine-commits - list.winehq.org

Jacek Caban : msxml3: Return xmlnode object from create_basic_node.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: d48246e1cc70d94628c777e8b8e76dea531cffc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48246e1cc70d94628c777e8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 21 13:24:31 2009 +0200 msxml3: Return xmlnode object from create_basic_node. --- dlls/msxml3/attribute.c | 17 +++++------------ dlls/msxml3/cdata.c | 17 +++++------------ dlls/msxml3/comment.c | 17 +++++------------ dlls/msxml3/docfrag.c | 17 +++++------------ dlls/msxml3/domdoc.c | 18 +++++------------- dlls/msxml3/element.c | 17 +++++------------ dlls/msxml3/entityref.c | 17 +++++------------ dlls/msxml3/msxml_private.h | 8 +++++++- dlls/msxml3/node.c | 6 +++--- dlls/msxml3/pi.c | 17 +++++------------ dlls/msxml3/text.c | 17 +++++------------ 11 files changed, 55 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d48246e1cc70d94628c77…

1 0

Stefan Leichter : ntoskrnl.exe: Stub for IoReportResourceUsage.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 85201ceb3e7c463fcf907f4d3c9dc2e75feb4002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85201ceb3e7c463fcf907f4d3… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Aug 21 11:33:12 2009 +0200 ntoskrnl.exe: Stub for IoReportResourceUsage. --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 054b39e..85efdfe 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -719,6 +719,19 @@ NTSTATUS WINAPI IoRegisterShutdownNotification( PDEVICE_OBJECT obj ) /*********************************************************************** + * IoReportResourceUsage (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoReportResourceUsage(PUNICODE_STRING name, PDRIVER_OBJECT drv_obj, PCM_RESOURCE_LIST drv_list, + ULONG drv_size, PDRIVER_OBJECT dev_obj, PCM_RESOURCE_LIST dev_list, + ULONG dev_size, BOOLEAN overwrite, PBOOLEAN detected) +{ + FIXME("(%s %p %p %u %p %p %u %d %p) stub \n", debugstr_w(name? name->Buffer : NULL), + drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, detected); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * IofCompleteRequest (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 9cd5e8a..fa793eb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -440,7 +440,7 @@ @ stub IoReportDetectedDevice @ stub IoReportHalResourceUsage @ stub IoReportResourceForDetection -@ stub IoReportResourceUsage +@ stdcall IoReportResourceUsage(ptr ptr ptr long ptr ptr long long ptr) @ stub IoReportTargetDeviceChange @ stub IoReportTargetDeviceChangeAsynchronous @ stub IoRequestDeviceEject

1 0

Tony Wasserka : windowscodecs: Support Stat for memory streams in IWICStream.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: a3edb733a773ea37c1754eed8ee769be40a6c926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3edb733a773ea37c1754eed8… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Aug 21 11:12:03 2009 +0200 windowscodecs: Support Stat for memory streams in IWICStream. --- dlls/windowscodecs/stream.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index ebf64cb..ba1b2a6 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -194,8 +194,16 @@ static HRESULT WINAPI StreamOnMemory_UnlockRegion(IStream *iface, static HRESULT WINAPI StreamOnMemory_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + StreamOnMemory *This = (StreamOnMemory*)iface; + TRACE("(%p)\n", This); + + if (!pstatstg) return E_INVALIDARG; + + ZeroMemory(pstatstg, sizeof(STATSTG)); + pstatstg->type = STGTY_STREAM; + pstatstg->cbSize.QuadPart = This->dwMemsize; + + return S_OK; } /* Clone isn't implemented in the native windowscodecs DLL either */

1 0

Tony Wasserka : windowscodecs: Support Seek for memory streams in IWICStream.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 23952023883fe2edd43e4a10d191a6b9058afd91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23952023883fe2edd43e4a10d… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Aug 21 11:11:39 2009 +0200 windowscodecs: Support Seek for memory streams in IWICStream. --- dlls/windowscodecs/stream.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 8617129..ebf64cb 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -125,8 +125,23 @@ static HRESULT WINAPI StreamOnMemory_Write(IStream *iface, static HRESULT WINAPI StreamOnMemory_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + StreamOnMemory *This = (StreamOnMemory*)iface; + LARGE_INTEGER NewPosition; + TRACE("(%p)\n", This); + + if (dlibMove.QuadPart > 0xFFFFFFFF) return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW); + + if (dwOrigin == STREAM_SEEK_SET) NewPosition.QuadPart = dlibMove.QuadPart; + else if (dwOrigin == STREAM_SEEK_CUR) NewPosition.QuadPart = This->dwCurPos + dlibMove.QuadPart; + else if (dwOrigin == STREAM_SEEK_END) NewPosition.QuadPart = This->dwMemsize + dlibMove.QuadPart; + else return E_INVALIDARG; + + if (NewPosition.QuadPart > This->dwMemsize) return E_INVALIDARG; + if (NewPosition.QuadPart < 0) return E_INVALIDARG; + This->dwCurPos = NewPosition.LowPart; + + if(plibNewPosition) plibNewPosition->QuadPart = This->dwCurPos; + return S_OK; } /* SetSize isn't implemented in the native windowscodecs DLL either */

1 0

Tony Wasserka : windowscodecs: Support writing to memory streams in IWICStream.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 0b6df19375c26516846dc1d7a1f82f48498f0fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6df19375c26516846dc1d7a… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Aug 21 11:08:10 2009 +0200 windowscodecs: Support writing to memory streams in IWICStream. --- dlls/windowscodecs/stream.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index f1af925..8617129 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -107,8 +107,19 @@ static HRESULT WINAPI StreamOnMemory_Read(IStream *iface, static HRESULT WINAPI StreamOnMemory_Write(IStream *iface, void const *pv, ULONG cb, ULONG *pcbWritten) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + StreamOnMemory *This = (StreamOnMemory*)iface; + TRACE("(%p)\n", This); + + if (!pv) return E_INVALIDARG; + + if (cb > This->dwMemsize - This->dwCurPos) return STG_E_MEDIUMFULL; + if (cb) { + memcpy(This->pbMemory + This->dwCurPos, pv, cb); + This->dwCurPos += cb; + } + if (pcbWritten) *pcbWritten = cb; + + return S_OK; } static HRESULT WINAPI StreamOnMemory_Seek(IStream *iface,

1 0

Tony Wasserka : windowscodecs: Support reading from memory streams in IWICStream.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: bb83fb264b3cee27d8b7abae467d35d6b916f9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb83fb264b3cee27d8b7abae4… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Aug 21 11:07:37 2009 +0200 windowscodecs: Support reading from memory streams in IWICStream. --- dlls/windowscodecs/stream.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 6e28ae9..f1af925 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -37,6 +37,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct StreamOnMemory { const IStreamVtbl *lpVtbl; LONG ref; + + BYTE *pbMemory; + DWORD dwMemsize; + DWORD dwCurPos; } StreamOnMemory; static HRESULT WINAPI StreamOnMemory_QueryInterface(IStream *iface, @@ -86,8 +90,18 @@ static ULONG WINAPI StreamOnMemory_Release(IStream *iface) static HRESULT WINAPI StreamOnMemory_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + StreamOnMemory *This = (StreamOnMemory*)iface; + ULONG uBytesRead; + TRACE("(%p)\n", This); + + if (!pv) return E_INVALIDARG; + + uBytesRead = min(cb, This->dwMemsize - This->dwCurPos); + memcpy(pv, This->pbMemory + This->dwCurPos, uBytesRead); + This->dwCurPos += uBytesRead; + if (pcbRead) *pcbRead = uBytesRead; + + return S_OK; } static HRESULT WINAPI StreamOnMemory_Write(IStream *iface, @@ -400,6 +414,9 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromMemory(IWICStream *iface, pObject->lpVtbl = &StreamOnMemory_Vtbl; pObject->ref = 1; + pObject->pbMemory = pbBuffer; + pObject->dwMemsize = cbBufferSize; + pObject->dwCurPos = 0; This->pStream = (IStream*)pObject; return S_OK;

1 0

Tony Wasserka : windowscodecs: Add IWICStream_InitializeFromMemory implementation.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: af6ece97b15650ef309e68ab4d024090fef4f429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6ece97b15650ef309e68ab4… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Aug 21 12:02:10 2009 +0200 windowscodecs: Add IWICStream_InitializeFromMemory implementation. --- dlls/windowscodecs/stream.c | 193 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 191 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index b496b31..6e28ae9 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -29,6 +29,166 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); /****************************************** + * StreamOnMemory implementation + * + * Used by IWICStream_InitializeFromMemory + * + */ +typedef struct StreamOnMemory { + const IStreamVtbl *lpVtbl; + LONG ref; +} StreamOnMemory; + +static HRESULT WINAPI StreamOnMemory_QueryInterface(IStream *iface, + REFIID iid, void **ppv) +{ + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IStream, iid) || + IsEqualIID(&IID_ISequentialStream, iid)) + { + *ppv = iface; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } +} + +static ULONG WINAPI StreamOnMemory_AddRef(IStream *iface) +{ + StreamOnMemory *This = (StreamOnMemory*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI StreamOnMemory_Release(IStream *iface) +{ + StreamOnMemory *This = (StreamOnMemory*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) { + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI StreamOnMemory_Read(IStream *iface, + void *pv, ULONG cb, ULONG *pcbRead) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnMemory_Write(IStream *iface, + void const *pv, ULONG cb, ULONG *pcbWritten) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnMemory_Seek(IStream *iface, + LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +/* SetSize isn't implemented in the native windowscodecs DLL either */ +static HRESULT WINAPI StreamOnMemory_SetSize(IStream *iface, + ULARGE_INTEGER libNewSize) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +/* CopyTo isn't implemented in the native windowscodecs DLL either */ +static HRESULT WINAPI StreamOnMemory_CopyTo(IStream *iface, + IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +/* Commit isn't implemented in the native windowscodecs DLL either */ +static HRESULT WINAPI StreamOnMemory_Commit(IStream *iface, + DWORD grfCommitFlags) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +/* Revert isn't implemented in the native windowscodecs DLL either */ +static HRESULT WINAPI StreamOnMemory_Revert(IStream *iface) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +/* LockRegion isn't implemented in the native windowscodecs DLL either */ +static HRESULT WINAPI StreamOnMemory_LockRegion(IStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +/* UnlockRegion isn't implemented in the native windowscodecs DLL either */ +static HRESULT WINAPI StreamOnMemory_UnlockRegion(IStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnMemory_Stat(IStream *iface, + STATSTG *pstatstg, DWORD grfStatFlag) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +/* Clone isn't implemented in the native windowscodecs DLL either */ +static HRESULT WINAPI StreamOnMemory_Clone(IStream *iface, + IStream **ppstm) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + + +const IStreamVtbl StreamOnMemory_Vtbl = +{ + /*** IUnknown methods ***/ + StreamOnMemory_QueryInterface, + StreamOnMemory_AddRef, + StreamOnMemory_Release, + /*** ISequentialStream methods ***/ + StreamOnMemory_Read, + StreamOnMemory_Write, + /*** IStream methods ***/ + StreamOnMemory_Seek, + StreamOnMemory_SetSize, + StreamOnMemory_CopyTo, + StreamOnMemory_Commit, + StreamOnMemory_Revert, + StreamOnMemory_LockRegion, + StreamOnMemory_UnlockRegion, + StreamOnMemory_Stat, + StreamOnMemory_Clone, +}; + +/****************************************** * IWICStream implementation * */ @@ -209,11 +369,40 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromFilename(IWICStream *iface, return E_NOTIMPL; } +/****************************************** + * IWICStream_InitializeFromMemory + * + * Initializes the internal IStream object to retrieve its data from a memory chunk. + * + * PARAMS + * pbBuffer [I] pointer to the memory chunk + * cbBufferSize [I] number of bytes to use from the memory chunk + * + * RETURNS + * SUCCESS: S_OK + * FAILURE: E_INVALIDARG, if pbBuffer is NULL + * E_OUTOFMEMORY, if we run out of memory + * WINCODEC_ERR_WRONGSTATE, if the IStream object has already been initialized before + * + */ static HRESULT WINAPI IWICStreamImpl_InitializeFromMemory(IWICStream *iface, BYTE *pbBuffer, DWORD cbBufferSize) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + IWICStreamImpl *This = (IWICStreamImpl*)iface; + StreamOnMemory *pObject; + TRACE("(%p,%p)\n", iface, pbBuffer); + + if (!pbBuffer) return E_INVALIDARG; + if (This->pStream) return WINCODEC_ERR_WRONGSTATE; + + pObject = HeapAlloc(GetProcessHeap(), 0, sizeof(StreamOnMemory)); + if (!pObject) return E_OUTOFMEMORY; + + pObject->lpVtbl = &StreamOnMemory_Vtbl; + pObject->ref = 1; + + This->pStream = (IStream*)pObject; + return S_OK; } static HRESULT WINAPI IWICStreamImpl_InitializeFromIStreamRegion(IWICStream *iface,

1 0

Stefan Leichter : kernel32: Test GetPrivateProfileString with empty string as key and section.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 88a019956e0a1c5c4d6bbdb75c696bca928c54f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a019956e0a1c5c4d6bbdb75… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Aug 21 13:03:37 2009 +0200 kernel32: Test GetPrivateProfileString with empty string as key and section. --- dlls/kernel32/tests/profile.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index b9a71d3..4254c85 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -92,14 +92,23 @@ static void test_profile_int(void) static void test_profile_string(void) { + static WCHAR emptyW[] = { 0 }; + static WCHAR keyW[] = { 'k','e','y',0 }; + static WCHAR sW[] = { 's',0 }; + static WCHAR TESTFILE2W[] = {'.','\\','t','e','s','t','w','i','n','e','2','.','i','n','i',0}; + static WCHAR valsectionW[] = {'v','a','l','_','e','_','s','e','c','t','i','o','n',0 }; + static WCHAR valnokeyW[] = {'v','a','l','_','n','o','_','k','e','y',0}; HANDLE h; int ret; DWORD count; char buf[100]; + WCHAR bufW[100]; char *p; /* test that lines without an '=' will not be enumerated */ /* in the case below, name2 is a key while name3 is not. */ char content[]="[s]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n"; + char content2[]="\r\nkey=val_no_section\r\n[]\r\nkey=val_e_section\r\n" + "[s]\r\n=val_no_key\r\n[t]\r\n"; DeleteFileA( TESTFILE2); h = CreateFileA( TESTFILE2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -126,6 +135,27 @@ static void test_profile_string(void) ok( ret == 24 && !strcmp( buf, "name1,name2,name4,name5"), "wrong keys returned(%d): %s\n", ret, buf); + h = CreateFileA( TESTFILE2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok( h != INVALID_HANDLE_VALUE, " cannot create %s\n", TESTFILE2); + if( h == INVALID_HANDLE_VALUE) return; + WriteFile( h, content2, sizeof(content2), &count, NULL); + CloseHandle( h); + + /* works only in unicode, ascii crashes */ + ret=GetPrivateProfileStringW(emptyW, keyW, emptyW, bufW, + sizeof(bufW)/sizeof(bufW[0]), TESTFILE2W); + todo_wine + ok(!lstrcmpW(valsectionW,bufW), "expected %s, got %s\n", + wine_dbgstr_w(valsectionW), wine_dbgstr_w(bufW) ); + + /* works only in unicode, ascii crashes */ + ret=GetPrivateProfileStringW(sW, emptyW, emptyW, bufW, + sizeof(bufW)/sizeof(bufW[0]), TESTFILE2W); + todo_wine + ok(!lstrcmpW(valnokeyW,bufW), "expected %s, got %s\n", + wine_dbgstr_w(valnokeyW), wine_dbgstr_w(bufW) ); + DeleteFileA( TESTFILE2); }

1 0

Louis Lenders : windowscodecs: Add version resource.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 9c0a3eab9721e683a95ecf238b95a2de532db2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0a3eab9721e683a95ecf238… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Aug 21 13:02:53 2009 +0200 windowscodecs: Add version resource. --- dlls/windowscodecs/Makefile.in | 2 ++ dlls/windowscodecs/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index a85618e..ffd2f17 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -22,6 +22,8 @@ C_SRCS = \ stream.c \ ungif.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/windowscodecs/version.rc b/dlls/windowscodecs/version.rc new file mode 100644 index 0000000..40378d3 --- /dev/null +++ b/dlls/windowscodecs/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2008 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Windows Codecs Library" +#define WINE_FILENAME_STR "windowscodecs.dll" +#define WINE_FILEVERSION 6,0,6001,170099 +#define WINE_FILEVERSION_STR "6.0.6001.17009" +#define WINE_PRODUCTVERSION 6,0,6001,170099 +#define WINE_PRODUCTVERSION_STR "6.0.6001.17009" + +#include "wine/wine_common_ver.rc"

1 0

Alistair Leslie-Hughes : mshtml: Implement HTMLCurrentStyle_get_borderLeftWidth.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 6bcf724adcc62cb34932d31912f221eb81e585cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bcf724adcc62cb34932d3191… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 21 21:03:49 2009 +1000 mshtml: Implement HTMLCurrentStyle_get_borderLeftWidth. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 3ae03da..b02fc7a 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -300,8 +300,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderBottomWidth(IHTMLCurrentStyle * static HRESULT WINAPI HTMLCurrentStyle_get_borderLeftWidth(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_LEFT_WIDTH, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_left(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 798dcd2..5cec17e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2616,6 +2616,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_borderLeftWidth(current_style, &v); + ok(hres == S_OK, "get_borderLeftWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0