wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 583ba527144cf59e319c22a0b52378112216815b URL: http://source.winehq.org/git/wine.git/?a=commit;h=583ba527144cf59e319c22a0b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 24 11:48:04 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 124 +++++++++++++++++++++--------------------- dlls/msvcp70/msvcp70.spec | 88 +++++++++++++++--------------- dlls/msvcp71/msvcp71.spec | 120 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 120 +++++++++++++++++++++--------------------- 4 files changed, 226 insertions(+), 226 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=583ba527144cf59e319c2…

1 0

Piotr Caban : msvcp90: Fixed num_get<short>::vftable.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 7c970cc0102683696a047d8a0761e8c290c6886b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c970cc0102683696a047d8a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 24 11:47:40 2012 +0200 msvcp90: Fixed num_get<short>::vftable. --- dlls/msvcp90/locale.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1cdd4ea..8e1c425 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -8683,17 +8683,17 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(num_get_char_do_get_ushort) VTABLE_ADD_FUNC(num_get_char_do_get_bool)); __ASM_VTABLE(num_get_short, - VTABLE_ADD_FUNC(num_get_wchar_do_get_void) - VTABLE_ADD_FUNC(num_get_wchar_do_get_double) - VTABLE_ADD_FUNC(num_get_wchar_do_get_double) - VTABLE_ADD_FUNC(num_get_wchar_do_get_float) - VTABLE_ADD_FUNC(num_get_wchar_do_get_uint64) - VTABLE_ADD_FUNC(num_get_wchar_do_get_int64) - VTABLE_ADD_FUNC(num_get_wchar_do_get_ulong) - VTABLE_ADD_FUNC(num_get_wchar_do_get_long) - VTABLE_ADD_FUNC(num_get_wchar_do_get_uint) - VTABLE_ADD_FUNC(num_get_wchar_do_get_ushort) - VTABLE_ADD_FUNC(num_get_wchar_do_get_bool)); + VTABLE_ADD_FUNC(num_get_short_do_get_void) + VTABLE_ADD_FUNC(num_get_short_do_get_double) + VTABLE_ADD_FUNC(num_get_short_do_get_double) + VTABLE_ADD_FUNC(num_get_short_do_get_float) + VTABLE_ADD_FUNC(num_get_short_do_get_uint64) + VTABLE_ADD_FUNC(num_get_short_do_get_int64) + VTABLE_ADD_FUNC(num_get_short_do_get_ulong) + VTABLE_ADD_FUNC(num_get_short_do_get_long) + VTABLE_ADD_FUNC(num_get_short_do_get_uint) + VTABLE_ADD_FUNC(num_get_short_do_get_ushort) + VTABLE_ADD_FUNC(num_get_short_do_get_bool)); __ASM_VTABLE(num_get_wchar, VTABLE_ADD_FUNC(num_get_wchar_do_get_void) VTABLE_ADD_FUNC(num_get_wchar_do_get_double)

1 0

Piotr Caban : msvcp90: Added num_put<short> implementation.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: ebd239802b7d81cb28cedfa486f2ae2e42f2e652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd239802b7d81cb28cedfa48… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 24 11:47:23 2012 +0200 msvcp90: Added num_put<short> implementation. --- dlls/msvcp90/locale.c | 326 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcp90/msvcp90.spec | 124 +++++++++--------- 2 files changed, 379 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ebd239802b7d81cb28ced…

1 0

Piotr Caban : msvcp90: Fixed EOF detection in basic_streambuf_char__Xsgetn_s function.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 257c57bdf2e7872fb22fba36ca5c15571503f61c URL: http://source.winehq.org/git/wine.git/?a=commit;h=257c57bdf2e7872fb22fba36c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 24 11:46:56 2012 +0200 msvcp90: Fixed EOF detection in basic_streambuf_char__Xsgetn_s function. --- dlls/msvcp90/ios.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 13e5490..8592f18 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -786,6 +786,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Xsgetn_s, 16) streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, char *ptr, MSVCP_size_t size, streamsize count) { streamsize copied, chunk; + int c; TRACE("(%p %p %lu %ld)\n", this, ptr, size, count); @@ -800,7 +801,8 @@ streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, *this->prsize -= chunk; copied += chunk; size -= chunk; - }else if((ptr[copied] = call_basic_streambuf_char_uflow(this)) != EOF) { + }else if((c = call_basic_streambuf_char_uflow(this)) != EOF) { + ptr[copied] = c; copied++; size--; }else { @@ -1529,6 +1531,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar__Xsgetn_s, 16) streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *this, wchar_t *ptr, MSVCP_size_t size, streamsize count) { streamsize copied, chunk; + unsigned short c; TRACE("(%p %p %lu %ld)\n", this, ptr, size, count); @@ -1543,7 +1546,8 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi *this->prsize -= chunk; copied += chunk; size -= chunk; - }else if((ptr[copied] = call_basic_streambuf_wchar_uflow(this)) != WEOF) { + }else if((c = call_basic_streambuf_wchar_uflow(this)) != WEOF) { + ptr[copied] = c; copied++; size--; }else {

1 0

Piotr Caban : msvcp90: Fixed EOF detection in basic_filebuf_char_uflow function.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: b9bc582fa682357f80151d820d7f13813cbaa616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bc582fa682357f80151d820… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 24 11:46:34 2012 +0200 msvcp90: Fixed EOF detection in basic_filebuf_char_uflow function. --- dlls/msvcp90/ios.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9501c8a..13e5490 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2466,7 +2466,7 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) return *basic_streambuf_char__Gninc(&this->base); c = fgetc(this->file); - if(!this->cvt || !c) + if(!this->cvt || c==EOF) return c; buf_next = buf; @@ -2479,7 +2479,7 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) case CODECVT_ok: if(to_next == &ch) { c = fgetc(this->file); - if(!c) + if(c == EOF) return EOF; continue; }

1 0

Henri Verbeet : wined3d: Use struct opengl_funcs for storing GL extension pointers.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: c7e3bb5a93ecf3c65a773bca5eb58dcfe3dfda34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e3bb5a93ecf3c65a773bca5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 24 11:32:23 2012 +0200 wined3d: Use struct opengl_funcs for storing GL extension pointers. --- dlls/wined3d/directx.c | 91 ++++++++++++++++++++------------------- dlls/wined3d/gl_compat.c | 40 +++++++++--------- dlls/wined3d/wined3d_gl.h | 6 --- dlls/wined3d/wined3d_private.h | 16 ++++--- 4 files changed, 76 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7e3bb5a93ecf3c65a773…

1 0

Henri Verbeet : wined3d: Handle core fixups like any other kind of extension fixup.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 4f3263e08cf050bff6f46da7b495c5073d574971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3263e08cf050bff6f46da7b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 24 11:32:22 2012 +0200 wined3d: Handle core fixups like any other kind of extension fixup. --- dlls/wined3d/directx.c | 272 +++++++++++++++++++++++------------------------- 1 files changed, 129 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f3263e08cf050bff6f46…

1 0

Nikolay Sivov : kernel32: Some tests for blocking initialization with InitOnceBeginInitialize().
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 04f588e63a3ca7c0d8dae8e888382af0edc7a2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f588e63a3ca7c0d8dae8e88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 24 13:39:12 2012 +0400 kernel32: Some tests for blocking initialization with InitOnceBeginInitialize(). --- dlls/kernel32/tests/sync.c | 64 ++++++++++++++++++++++++++++++++++--------- include/winbase.h | 6 +++- include/winnt.h | 9 +++++- 3 files changed, 63 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 97139a9..6e55381 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -39,6 +39,8 @@ static HANDLE (WINAPI *pCreateMemoryResourceNotification)(MEMORY_RESOURCE_NOTIFI static BOOL (WINAPI *pQueryMemoryResourceNotification)(HANDLE, PBOOL); static VOID (WINAPI *pInitOnceInitialize)(PINIT_ONCE); static BOOL (WINAPI *pInitOnceExecuteOnce)(PINIT_ONCE,PINIT_ONCE_FN,PVOID,LPVOID*); +static BOOL (WINAPI *pInitOnceBeginInitialize)(PINIT_ONCE,DWORD,BOOL*,LPVOID*); +static BOOL (WINAPI *pInitOnceComplete)(PINIT_ONCE,DWORD,LPVOID); static void test_signalandwait(void) { @@ -1138,11 +1140,13 @@ static void test_WaitForMultipleObjects(void) } static BOOL g_initcallback_ret, g_initcallback_called; +static void *g_initctxt; BOOL CALLBACK initonce_callback(INIT_ONCE *initonce, void *parameter, void **ctxt) { g_initcallback_called = TRUE; /* zero bit set means here that initialization is taking place - initialization locked */ + ok(g_initctxt == *ctxt, "got wrong context value %p, expected %p\n", *ctxt, g_initctxt); ok(initonce->Ptr == (void*)0x1, "got %p\n", initonce->Ptr); ok(parameter == (void*)0xdeadbeef, "got wrong parameter\n"); return g_initcallback_ret; @@ -1151,8 +1155,7 @@ BOOL CALLBACK initonce_callback(INIT_ONCE *initonce, void *parameter, void **ctx static void test_initonce(void) { INIT_ONCE initonce; - void *ctxt; - BOOL ret; + BOOL ret, pending; if (!pInitOnceInitialize || !pInitOnceExecuteOnce) { @@ -1160,48 +1163,79 @@ static void test_initonce(void) return; } + /* blocking initialization with callback */ initonce.Ptr = (void*)0xdeadbeef; pInitOnceInitialize(&initonce); ok(initonce.Ptr == NULL, "got %p\n", initonce.Ptr); /* initialisation completed successfully */ g_initcallback_ret = TRUE; - ctxt = NULL; - ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + g_initctxt = NULL; + ret = pInitOnceExecuteOnce(&initonce, initonce_callback, (void*)0xdeadbeef, &g_initctxt); ok(ret, "got wrong ret value %d\n", ret); ok(initonce.Ptr == (void*)0x2, "got %p\n", initonce.Ptr); - ok(ctxt == (void*)0x0, "got %p\n", ctxt); + ok(g_initctxt == (void*)0x0, "got %p\n", g_initctxt); ok(g_initcallback_called, "got %d\n", g_initcallback_called); /* so it's been called already so won't be called again */ - ctxt = NULL; + g_initctxt = NULL; g_initcallback_called = FALSE; - ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ret = pInitOnceExecuteOnce(&initonce, initonce_callback, (void*)0xdeadbeef, &g_initctxt); ok(ret, "got wrong ret value %d\n", ret); ok(initonce.Ptr == (void*)0x2, "got %p\n", initonce.Ptr); - ok(ctxt == (void*)0, "got %p\n", ctxt); + ok(g_initctxt == (void*)0, "got %p\n", g_initctxt); ok(!g_initcallback_called, "got %d\n", g_initcallback_called); pInitOnceInitialize(&initonce); g_initcallback_called = FALSE; /* 2 lower order bits should never be used, you'll get a crash in result */ - ctxt = (void*)0xFFFFFFF0; - ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + g_initctxt = (void*)0xFFFFFFF0; + ret = pInitOnceExecuteOnce(&initonce, initonce_callback, (void*)0xdeadbeef, &g_initctxt); ok(ret, "got wrong ret value %d\n", ret); ok(initonce.Ptr == (void*)0xFFFFFFF2, "got %p\n", initonce.Ptr); - ok(ctxt == (void*)0xFFFFFFF0, "got %p\n", ctxt); + ok(g_initctxt == (void*)0xFFFFFFF0, "got %p\n", g_initctxt); ok(g_initcallback_called, "got %d\n", g_initcallback_called); /* callback failed */ g_initcallback_ret = FALSE; g_initcallback_called = FALSE; - ctxt = NULL; + g_initctxt = NULL; pInitOnceInitialize(&initonce); - ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ret = pInitOnceExecuteOnce(&initonce, initonce_callback, (void*)0xdeadbeef, &g_initctxt); ok(!ret, "got wrong ret value %d\n", ret); ok(initonce.Ptr == NULL, "got %p\n", initonce.Ptr); - ok(ctxt == NULL, "got %p\n", ctxt); + ok(g_initctxt == NULL, "got %p\n", g_initctxt); ok(g_initcallback_called, "got %d\n", g_initcallback_called); + + /* blocking initialzation without a callback */ + pInitOnceInitialize(&initonce); + g_initctxt = NULL; + pending = FALSE; + ret = pInitOnceBeginInitialize(&initonce, 0, &pending, &g_initctxt); + ok(ret, "got wrong ret value %d\n", ret); + ok(pending, "got %d\n", pending); + ok(initonce.Ptr == (void*)1, "got %p\n", initonce.Ptr); + ok(g_initctxt == NULL, "got %p\n", g_initctxt); + /* another attempt to begin initialization with block a single thread */ + + g_initctxt = NULL; + pending = 0xf; + ret = pInitOnceBeginInitialize(&initonce, INIT_ONCE_CHECK_ONLY, &pending, &g_initctxt); + ok(!ret, "got wrong ret value %d\n", ret); + ok(pending == 0xf, "got %d\n", pending); + ok(initonce.Ptr == (void*)1, "got %p\n", initonce.Ptr); + ok(g_initctxt == NULL, "got %p\n", g_initctxt); + + g_initctxt = (void*)0xdeadbee0; + ret = pInitOnceComplete(&initonce, INIT_ONCE_INIT_FAILED, g_initctxt); + ok(!ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == (void*)1, "got %p\n", initonce.Ptr); + + /* once failed already */ + g_initctxt = (void*)0xdeadbee0; + ret = pInitOnceComplete(&initonce, 0, g_initctxt); + ok(ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == (void*)0xdeadbee2, "got %p\n", initonce.Ptr); } START_TEST(sync) @@ -1218,6 +1252,8 @@ START_TEST(sync) pQueryMemoryResourceNotification = (void *)GetProcAddress(hdll, "QueryMemoryResourceNotification"); pInitOnceInitialize = (void *)GetProcAddress(hdll, "InitOnceInitialize"); pInitOnceExecuteOnce = (void *)GetProcAddress(hdll, "InitOnceExecuteOnce"); + pInitOnceBeginInitialize = (void *)GetProcAddress(hdll, "InitOnceBeginInitialize"); + pInitOnceComplete = (void *)GetProcAddress(hdll, "InitOnceComplete"); test_signalandwait(); test_mutex(); diff --git a/include/winbase.h b/include/winbase.h index 0bc5755..bc765f1 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1320,7 +1320,10 @@ typedef struct _WIN32_STREAM_ID { typedef RTL_RUN_ONCE INIT_ONCE; typedef PRTL_RUN_ONCE PINIT_ONCE; typedef PRTL_RUN_ONCE LPINIT_ONCE; -#define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT +#define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT +#define INIT_ONCE_CHECK_ONLY RTL_RUN_ONCE_CHECK_ONLY +#define INIT_ONCE_ASYNC RTL_RUN_ONCE_ASYNC +#define INIT_ONCE_INIT_FAILED RTL_RUN_ONCE_INIT_FAILED /* initialization callback prototype */ typedef BOOL (WINAPI *PINIT_ONCE_FN)(PINIT_ONCE,PVOID,PVOID*); @@ -1884,6 +1887,7 @@ WINADVAPI BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR, WINADVAPI BOOL WINAPI InitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); WINBASEAPI VOID WINAPI InitializeSListHead(PSLIST_HEADER); WINBASEAPI VOID WINAPI InitializeSRWLock(PSRWLOCK); +WINBASEAPI BOOL WINAPI InitOnceExecuteOnce(PINIT_ONCE,PINIT_ONCE_FN,PVOID,PVOID*); WINBASEAPI VOID WINAPI InitOnceInitialize(PINIT_ONCE); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); diff --git a/include/winnt.h b/include/winnt.h index d65e2f6..b679017 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5092,7 +5092,14 @@ typedef union _RTL_RUN_ONCE { PVOID Ptr; } RTL_RUN_ONCE, *PRTL_RUN_ONCE; -NTSYSAPI VOID NTAPI RtlRunOnceInitialize(PRTL_RUN_ONCE); +#define RTL_RUN_ONCE_CHECK_ONLY 0x00000001 +#define RTL_RUN_ONCE_ASYNC 0x00000002 +#define RTL_RUN_ONCE_INIT_FAILED 0x00000004 + +typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); +typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; +NTSYSAPI VOID WINAPI RtlRunOnceInitialize(PRTL_RUN_ONCE); +NTSYSAPI DWORD WINAPI RtlRunOnceExecuteOnce(PRTL_RUN_ONCE,PRTL_RUN_ONCE_INIT_FN,PVOID,PVOID*); #include <pshpack8.h> typedef struct _IO_COUNTERS {

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataHandler_Load.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 7d1e2741ce5647d9027bf2cbc67152eb593ead48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1e2741ce5647d9027bf2cbc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 15:00:29 2012 +0900 windowscodecs: Implement MetadataHandler_Load. --- dlls/windowscodecs/metadatahandler.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 7072a95..042d6ae 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -380,8 +380,9 @@ static HRESULT WINAPI MetadataHandler_IsDirty(IWICPersistStream *iface) static HRESULT WINAPI MetadataHandler_Load(IWICPersistStream *iface, IStream *pStm) { - FIXME("(%p,%p): stub\n", iface, pStm); - return E_NOTIMPL; + MetadataHandler *This = impl_from_IWICPersistStream(iface); + TRACE("(%p,%p)\n", iface, pStm); + return IWICPersistStream_LoadEx(&This->IWICPersistStream_iface, pStm, NULL, WICPersistOptionsDefault); } static HRESULT WINAPI MetadataHandler_Save(IWICPersistStream *iface,

1 0

Nikolay Sivov : msxml3: Accept ISequentialStream as reader input.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 5b7a55f67f8b8c5fa7e3602c9e65f95ee97b2b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7a55f67f8b8c5fa7e3602c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 24 09:59:50 2012 +0400 msxml3: Accept ISequentialStream as reader input. --- dlls/msxml3/saxreader.c | 45 ++++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 87974bc..d10b822 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2295,7 +2295,7 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz return hr; } -static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInterface) +static HRESULT internal_parseStream(saxreader *This, ISequentialStream *stream, BOOL vbInterface) { saxlocator *locator; HRESULT hr; @@ -2304,7 +2304,7 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt int ret; dataRead = 0; - hr = IStream_Read(stream, data, sizeof(data), &dataRead); + hr = ISequentialStream_Read(stream, data, sizeof(data), &dataRead); if(FAILED(hr)) return hr; hr = SAXLocator_create(This, &locator, vbInterface); @@ -2331,7 +2331,7 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt while(1) { dataRead = 0; - hr = IStream_Read(stream, data, sizeof(data), &dataRead); + hr = ISequentialStream_Read(stream, data, sizeof(data), &dataRead); if (FAILED(hr)) break; ret = xmlParseChunk(locator->pParserCtxt, data, dataRead, 0); @@ -2411,7 +2411,7 @@ static HRESULT internal_parse( case VT_UNKNOWN: case VT_DISPATCH: { IPersistStream *persistStream; - IStream *stream = NULL; + ISequentialStream *stream = NULL; IXMLDOMDocument *xmlDoc; if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), @@ -2430,29 +2430,44 @@ static HRESULT internal_parse( if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IPersistStream, (void**)&persistStream) == S_OK) { - hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream *stream_copy; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream_copy); if(hr != S_OK) { IPersistStream_Release(persistStream); return hr; } - hr = IPersistStream_Save(persistStream, stream, TRUE); + hr = IPersistStream_Save(persistStream, stream_copy, TRUE); IPersistStream_Release(persistStream); - if(hr != S_OK) - { - IStream_Release(stream); - stream = NULL; - } + if(hr == S_OK) + IStream_QueryInterface(stream_copy, &IID_ISequentialStream, (void**)&stream); + + IStream_Release(stream_copy); + } + + /* try base interface first */ + if(!stream) + { + IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_ISequentialStream, (void**)&stream); + if (!stream) + /* this should never happen if IStream is implemented properly, but just in case */ + IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IStream, (void**)&stream); } - if(stream || IUnknown_QueryInterface(V_UNKNOWN(&varInput), - &IID_IStream, (void**)&stream) == S_OK) + if(stream) { hr = internal_parseStream(This, stream, vbInterface); - IStream_Release(stream); - break; + ISequentialStream_Release(stream); } + else + { + WARN("IUnknown* input doesn't support any of expected interfaces\n"); + hr = E_INVALIDARG; + } + + break; } default: WARN("vt %d not implemented\n", V_VT(&varInput));

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012