wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Lauri Kenttä : cabinet: Make Extract overwrite existing files.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: af86bdc31b59c68ea218d6fcdb794e7c3ae74d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=af86bdc31b59c68ea218d6fcd… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Feb 4 14:24:49 2017 +0200 cabinet: Make Extract overwrite existing files. Only read-only files must not be overwritten. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/cabinet_main.c | 2 +- dlls/cabinet/tests/extract.c | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 5a1ae06..239849d 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -251,7 +251,7 @@ static INT_PTR CDECL fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICAT } hFile = CreateFileA(szFullPath, GENERIC_READ | GENERIC_WRITE, 0, NULL, - CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) hFile = 0; diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index 849d612..d39043f 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -80,6 +80,18 @@ static void createTestFile(const CHAR *name) CloseHandle(file); } +static int getFileSize(const CHAR *name) +{ + HANDLE file; + int size; + file = CreateFileA(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (file == INVALID_HANDLE_VALUE) + return -1; + size = GetFileSize(file, NULL); + CloseHandle(file); + return size; +} + static void create_test_files(void) { int len; @@ -621,9 +633,10 @@ static void test_Extract(void) ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); free_file_list(&session); - /* first file exists */ + /* first file exists but is read-only */ createTestFile("dest\\a.txt"); SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_READONLY); + ok(getFileSize("dest\\a.txt") == 11, "Expected dest\\a.txt to be 11 bytes\n"); ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; @@ -647,7 +660,8 @@ static void test_Extract(void) ok(!lstrcmpA(session.Destination, "dest"), "Expected dest, got %s\n", session.Destination); ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved); ok(!session.FilterList, "Expected empty filter list\n"); - ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); + ok(getFileSize("dest\\a.txt") == 11, "Expected dest\\a.txt to be 11 bytes\n"); + ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to be read-only\n"); todo_wine { ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); @@ -663,7 +677,8 @@ static void test_Extract(void) SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_NORMAL); DeleteFileA("dest\\a.txt"); - /* third file exists */ + /* first file exists and is writable, third file exists but is read-only */ + createTestFile("dest\\a.txt"); createTestFile("dest\\testdir\\c.txt"); SetFileAttributesA("dest\\testdir\\c.txt", FILE_ATTRIBUTE_READONLY); ZeroMemory(&session, sizeof(SESSION)); @@ -689,9 +704,10 @@ static void test_Extract(void) ok(!lstrcmpA(session.Destination, "dest"), "Expected dest, got %s\n", session.Destination); ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved); ok(!session.FilterList, "Expected empty filter list\n"); + ok(getFileSize("dest\\a.txt") == 6, "Expected dest\\a.txt to be 6 bytes\n"); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); - ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to be read-only\n"); todo_wine { ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n");

1 0

Jacek Caban : mshtml/tests: Added MHTML document tests.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 7219c7cf5d9e0dee20adf8406924d2493e346972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7219c7cf5d9e0dee20adf8406… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 3 18:59:02 2017 +0100 mshtml/tests: Added MHTML document tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 132 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 117 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index cb6c9b0..2cfc414 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -224,6 +224,7 @@ static BOOL support_wbapp, allow_new_window, no_travellog; static BOOL report_mime; static BOOL testing_submit; static BOOL resetting_document; +static BOOL is_mhtml; static int stream_read, protocol_read; static IStream *history_stream; static enum load_state_t { @@ -244,6 +245,22 @@ static const char html_page[] = "<body><div>test</div></body>" "</html>"; +static const char mhtml_page[] = + "MIME-Version: 1.0\r\n" + "Content-Type: multipart/related; type:=\"text/html\"; boundary=\"----=_NextPart_000_00\"\r\n" + "\r\n" + "------=_NextPart_000_00\r\n" + "Content-Type: text/html; charset=\"Windows-1252\"\r\n" + "Content-Transfer-Encoding: quoted-printable\r\n" + "\r\n" + "<HTML></HTML>\r\n" + "------=_NextPart_000_00\r\n" + "Content-Type: Image/Jpeg\r\n" + "Content-Transfer-Encoding: base64\r\n" + "Content-Location: http://winehq.org/mhtmltest.html\r\n" + "\r\n\t\t\t\tVGVzdA==\r\n\r\n" + "------=_NextPart_000_00--"; + static const char css_data[] = "body {color: red; margin: 0}"; static const WCHAR http_urlW[] = @@ -578,12 +595,15 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(pOIBindInfo != NULL, "pOIBindInfo == NULL\n"); ok(!grfPI, "grfPI = %x\n", grfPI); ok(!dwReserved, "dwReserved = %lx\n", dwReserved); + if(is_mhtml) + ok(!strcmp_wa(szUrl, "winetest:doc"), "unexpected URL %s\n", wine_dbgstr_w(szUrl)); memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(bindinfo); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); if(!testing_submit) + todo_wine_if(is_mhtml) ok(bindf == (BINDF_FROMURLMON|BINDF_PULLDATA|BINDF_NEEDFILE|BINDF_ASYNCSTORAGE|BINDF_ASYNCHRONOUS), "bindf = %x\n", bindf); else @@ -606,9 +626,11 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(!memcmp(U(bindinfo.stgmedData).hGlobal, "cmd=TEST", 8), "unexpected hGlobal\n"); } ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb); - ok(bindinfo.dwOptions == 0x80000 || - bindinfo.dwOptions == 0x4080000, /* win2k3 */ - "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); + if(is_mhtml) + ok(!bindinfo.dwOptions, "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); + else + ok(bindinfo.dwOptions == 0x80000 || bindinfo.dwOptions == 0x4080000, /* win2k3 */ + "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%d\n", bindinfo.dwOptionsFlags); /* TODO: test dwCodePage */ /* TODO: test securityAttributes */ @@ -672,18 +694,23 @@ static HRESULT WINAPI Protocol_Resume(IInternetProtocol *iface) static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { + const char *data = is_mhtml ? mhtml_page : css_data; + unsigned data_len = strlen(data); + CHECK_EXPECT2(Protocol_Read); ok(pv != NULL, "pv == NULL\n"); - ok(cb > sizeof(css_data), "cb < sizeof(css_data)\n"); + ok(cb > data_len, "cb < data_len\n"); ok(pcbRead != NULL, "pcbRead == NULL\n"); - ok(!*pcbRead || *pcbRead==sizeof(css_data)-1, "*pcbRead=%d\n", *pcbRead); + ok(!*pcbRead || *pcbRead == data_len, "*pcbRead=%d\n", *pcbRead); - if(protocol_read) + if(protocol_read) { + *pcbRead = 0; return S_FALSE; + } - protocol_read += *pcbRead = sizeof(css_data)-1; - memcpy(pv, css_data, sizeof(css_data)-1); + protocol_read += *pcbRead = data_len; + memcpy(pv, data, data_len); return S_OK; } @@ -5589,7 +5616,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) SET_EXPECT(OnChanged_READYSTATE); SET_EXPECT(Invoke_OnReadyStateChange_Loading); SET_EXPECT(IsSystemMoniker); - if(mon == &Moniker) + if(!is_mhtml && mon == &Moniker) SET_EXPECT(BindToStorage); SET_EXPECT(SetActiveObject); if(set_clientsite) { @@ -5602,6 +5629,14 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) } SET_EXPECT(Exec_ShellDocView_84); SET_EXPECT(GetPendingUrl); + if(is_mhtml) { + SET_EXPECT(CreateInstance); + SET_EXPECT(Start); + SET_EXPECT(Protocol_Read); + SET_EXPECT(LockRequest); + SET_EXPECT(Terminate); + SET_EXPECT(UnlockRequest); + } load_state = LD_DOLOAD; expect_LockContainer_fLock = TRUE; readystate_set_loading = TRUE; @@ -5636,7 +5671,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(Invoke_OnReadyStateChange_Loading); CLEAR_CALLED(IsSystemMoniker); /* IE7 */ - if(mon == &Moniker) + if(!is_mhtml && mon == &Moniker) CHECK_CALLED(BindToStorage); CLEAR_CALLED(SetActiveObject); /* FIXME */ if(set_clientsite) { @@ -5649,10 +5684,21 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) } CHECK_CALLED_BROKEN(Exec_ShellDocView_84); todo_wine CHECK_CALLED(GetPendingUrl); + if(is_mhtml) { + CHECK_CALLED(CreateInstance); + CHECK_CALLED(Start); + CHECK_CALLED(Protocol_Read); + CHECK_CALLED(LockRequest); + CHECK_CALLED(Terminate); + CHECK_CALLED(UnlockRequest); + } set_clientsite = container_locked = TRUE; - test_GetCurMoniker((IUnknown*)persist, mon, NULL, FALSE); + if(!is_mhtml) + test_GetCurMoniker((IUnknown*)persist, mon, NULL, FALSE); + else + test_GetCurMoniker((IUnknown*)persist, NULL, "mhtml:winetest:doc", FALSE); IBindCtx_Release(bind); @@ -5697,7 +5743,7 @@ static void test_download(DWORD flags) SET_EXPECT(Invoke_AMBIENT_SILENT); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); } - if(flags & (DWL_VERBDONE|DWL_HTTP)) + if(is_mhtml || (flags & (DWL_VERBDONE|DWL_HTTP))) SET_EXPECT(Exec_SETPROGRESSMAX); if(flags & DWL_EX_GETHOSTINFO) SET_EXPECT(GetHostInfo); @@ -5762,7 +5808,7 @@ static void test_download(DWORD flags) } if(!is_js && !is_extern) { if(!editmode && !(flags & DWL_REFRESH)) { - if(!(flags & DWL_EMPTY)) + if(!is_mhtml && !(flags & DWL_EMPTY)) SET_EXPECT(FireNavigateComplete2); SET_EXPECT(FireDocumentComplete); } @@ -5788,7 +5834,7 @@ static void test_download(DWORD flags) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); } - if(flags & DWL_VERBDONE) + if(is_mhtml || (flags & DWL_VERBDONE)) CHECK_CALLED(Exec_SETPROGRESSMAX); if(flags & DWL_HTTP) SET_CALLED(Exec_SETPROGRESSMAX); @@ -5874,7 +5920,7 @@ static void test_download(DWORD flags) } if(!is_js && !is_extern) { if(!editmode && !(flags & DWL_REFRESH)) { - if(!(flags & DWL_EMPTY)) { + if(!is_mhtml && !(flags & DWL_EMPTY)) { todo_wine_if(!support_wbapp) CHECK_CALLED(FireNavigateComplete2); } @@ -7484,6 +7530,7 @@ static void init_test(enum load_state_t ls) { complete = FALSE; testing_submit = FALSE; expect_uihandler_iface = &DocHostUIHandler; + is_mhtml = FALSE; } static void test_HTMLDocument(BOOL do_load, BOOL mime) @@ -7590,6 +7637,60 @@ static void test_HTMLDocument(BOOL do_load, BOOL mime) ok(!IsWindow(doc_hwnd), "hwnd is not destroyed\n"); } +static void test_MHTMLDocument(void) +{ + IHTMLDocument2 *doc; + IOleObject *oleobj; + HRESULT hres; + + if(!is_ie9plus) { + win_skip("Skipping MHTML document tests on too old IE.\n"); + return; + } + + trace("Testing MHTMLDocument...\n"); + + init_test(LD_DOLOAD); + is_mhtml = TRUE; + nav_url = nav_serv_url = "mhtml:winetest:doc"; + + hres = CoCreateInstance(&CLSID_MHTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IHTMLDocument2, (void**)&doc); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + + doc_unk = (IUnknown*)doc; + + test_QueryInterface(doc); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); + test_ViewAdviseSink(doc); + test_ConnectionPointContainer(doc); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "Could not get IOleObject iface: %08x\n", hres); + test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); + test_DoVerb(oleobj); + IOleObject_Release(oleobj); + + test_GetCurMoniker((IUnknown*)doc, NULL, NULL, FALSE); + test_Persist(doc, &Moniker); + set_custom_uihandler(doc, &CustomDocHostUIHandler); + test_GetCurMoniker((IUnknown*)doc, NULL, "mhtml:winetest:doc", FALSE); + test_download(0); + + test_exec_onunload(doc); + test_UIDeactivate(); + test_InPlaceDeactivate(doc, TRUE); + test_InPlaceDeactivate(doc, FALSE); + test_CloseView(); + test_Close(doc, TRUE); + + if(view) + IOleDocumentView_Release(view); + view = NULL; + + release_document(doc); +} + static void test_HTMLDocument_hlink(DWORD status) { IHTMLDocument2 *doc; @@ -8634,6 +8735,7 @@ START_TEST(htmldoc) test_HTMLDocument(TRUE, TRUE); test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamInitNew(); + test_MHTMLDocument(); test_editing_mode(FALSE, FALSE); test_editing_mode(TRUE, FALSE); test_editing_mode(TRUE, TRUE);

1 0

Jacek Caban : mshtml: Added MHTMLDocument object implementation.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: ebee2a8346afe9f92a51064bad17751d0b17e40c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebee2a8346afe9f92a51064ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 3 18:58:54 2017 +0100 mshtml: Added MHTMLDocument object implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 15 ++++++++++----- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/persist.c | 19 +++++++++++++++++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index e50b8f8..097ba70 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -1,7 +1,7 @@ MODULE = mshtml.dll IMPORTLIB = mshtml IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 -DELAYIMPORTS = wininet +DELAYIMPORTS = wininet inetcomm C_SRCS = \ conpoint.c \ diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 940519a..b672c2d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5075,7 +5075,7 @@ static dispex_static_data_t HTMLDocumentObj_dispex = { HTMLDocumentObj_iface_tids }; -HRESULT HTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) +static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID riid, void **ppv) { mozIDOMWindowProxy *mozwindow; HTMLDocumentObj *doc; @@ -5083,8 +5083,6 @@ HRESULT HTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) nsresult nsres; HRESULT hres; - TRACE("(%p %s %p)\n", outer, debugstr_mshtml_guid(riid), ppv); - if(outer && !IsEqualGUID(&IID_IUnknown, riid)) { *ppv = NULL; return E_INVALIDARG; @@ -5102,6 +5100,7 @@ HRESULT HTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) init_doc(&doc->basedoc, outer ? outer : &doc->IUnknown_outer, &doc->dispex.IDispatchEx_iface); TargetContainer_Init(doc); doc->basedoc.doc_obj = doc; + doc->is_mhtml = is_mhtml; doc->usermode = UNKNOWN_USERMODE; @@ -5149,8 +5148,14 @@ HRESULT HTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) return S_OK; } +HRESULT HTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) +{ + TRACE("(%p %s %p)\n", outer, debugstr_mshtml_guid(riid), ppv); + return create_document_object(FALSE, outer, riid, ppv); +} + HRESULT MHTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) { - FIXME("(%p %s %p)\n", outer, debugstr_mshtml_guid(riid), ppv); - return E_NOTIMPL; + TRACE("(%p %s %p)\n", outer, debugstr_mshtml_guid(riid), ppv); + return create_document_object(TRUE, outer, riid, ppv); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9c8b94c..f27b674 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -640,6 +640,7 @@ struct HTMLDocumentObj { HWND hwnd; HWND tooltips_hwnd; + BOOL is_mhtml; BOOL request_uiactivate; BOOL in_place_active; BOOL ui_active; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2735ab5..363a955 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "shlguid.h" #include "idispids.h" +#include "mimeole.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -587,6 +588,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva IMoniker *pimkName, LPBC pibc, DWORD grfMode) { HTMLDocument *This = impl_from_IPersistMoniker(iface); + IMoniker *mon; HRESULT hres; TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode); @@ -620,9 +622,22 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva } } - prepare_for_binding(This, pimkName, FALSE); + if(This->doc_obj->is_mhtml) { + IUnknown *unk; + + hres = MimeOleObjectFromMoniker(0, pimkName, pibc, &IID_IUnknown, (void**)&unk, &mon); + if(FAILED(hres)) + return hres; + IUnknown_Release(unk); + pibc = NULL; + }else { + IMoniker_AddRef(mon = pimkName); + } + + prepare_for_binding(This, mon, FALSE); call_docview_84(This->doc_obj); - hres = set_moniker(This->window, pimkName, NULL, pibc, NULL, TRUE); + hres = set_moniker(This->window, mon, NULL, pibc, NULL, TRUE); + IMoniker_Release(mon); if(FAILED(hres)) return hres;

1 0

Jacek Caban : inetcomm: Return S_FALSE if no data is returned in IInternetProtocol::Read.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 51e1a08893384183b8fda9d44a5b3d0e473a4d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e1a08893384183b8fda9d44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 3 18:58:43 2017 +0100 inetcomm: Return S_FALSE if no data is returned in IInternetProtocol::Read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/protocol.c | 10 +++++++++- dlls/inetcomm/tests/mimeole.c | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index 0b28930..c77cf26 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -564,10 +564,18 @@ static HRESULT WINAPI MimeHtmlProtocol_Resume(IInternetProtocol *iface) static HRESULT WINAPI MimeHtmlProtocol_Read(IInternetProtocol *iface, void* pv, ULONG cb, ULONG* pcbRead) { MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + ULONG read = 0; + HRESULT hres; TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); - return IStream_Read(This->stream, pv, cb, pcbRead); + hres = IStream_Read(This->stream, pv, cb, &read); + if(pcbRead) + *pcbRead = read; + if(hres != S_OK) + return hres; + + return read ? S_OK : S_FALSE; } static HRESULT WINAPI MimeHtmlProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index fbee6e1..5701af6 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -1368,6 +1368,8 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR buf[read] = 0; ok(!strcmp(buf, current_binding_test->data), "unexpected data: %s\n", buf); + hres = IInternetProtocol_Read(current_binding_protocol, buf, sizeof(buf), &read); + ok(hres == S_FALSE, "Read failed: %08x\n", hres); return S_OK; }

1 0

Nikolay Sivov : oleview: Remove application specific version string.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: a8cfe2eeb5f664cf70d292e45c7ff19b2ddcfc1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8cfe2eeb5f664cf70d292e45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 6 01:51:16 2017 +0300 oleview: Remove application specific version string. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 134 +++++++++++++++++++++---------------------- po/bg.po | 134 +++++++++++++++++++++---------------------- po/ca.po | 134 +++++++++++++++++++++---------------------- po/cs.po | 134 +++++++++++++++++++++---------------------- po/da.po | 134 +++++++++++++++++++++---------------------- po/de.po | 134 +++++++++++++++++++++---------------------- po/el.po | 134 +++++++++++++++++++++---------------------- po/en.po | 134 +++++++++++++++++++++---------------------- po/en_US.po | 134 +++++++++++++++++++++---------------------- po/eo.po | 134 +++++++++++++++++++++---------------------- po/es.po | 134 +++++++++++++++++++++---------------------- po/fa.po | 134 +++++++++++++++++++++---------------------- po/fi.po | 134 +++++++++++++++++++++---------------------- po/fr.po | 134 +++++++++++++++++++++---------------------- po/he.po | 134 +++++++++++++++++++++---------------------- po/hi.po | 134 +++++++++++++++++++++---------------------- po/hr.po | 134 +++++++++++++++++++++---------------------- po/hu.po | 134 +++++++++++++++++++++---------------------- po/it.po | 134 +++++++++++++++++++++---------------------- po/ja.po | 134 +++++++++++++++++++++---------------------- po/ko.po | 134 +++++++++++++++++++++---------------------- po/lt.po | 134 +++++++++++++++++++++---------------------- po/ml.po | 134 +++++++++++++++++++++---------------------- po/nb_NO.po | 134 +++++++++++++++++++++---------------------- po/nl.po | 134 +++++++++++++++++++++---------------------- po/or.po | 134 +++++++++++++++++++++---------------------- po/pa.po | 134 +++++++++++++++++++++---------------------- po/pl.po | 134 +++++++++++++++++++++---------------------- po/pt_BR.po | 134 +++++++++++++++++++++---------------------- po/pt_PT.po | 134 +++++++++++++++++++++---------------------- po/rm.po | 134 +++++++++++++++++++++---------------------- po/ro.po | 134 +++++++++++++++++++++---------------------- po/ru.po | 134 +++++++++++++++++++++---------------------- po/sk.po | 134 +++++++++++++++++++++---------------------- po/sl.po | 134 +++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 135 +++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 135 +++++++++++++++++++++----------------------- po/sv.po | 134 +++++++++++++++++++++---------------------- po/te.po | 134 +++++++++++++++++++++---------------------- po/th.po | 134 +++++++++++++++++++++---------------------- po/tr.po | 134 +++++++++++++++++++++---------------------- po/uk.po | 134 +++++++++++++++++++++---------------------- po/wa.po | 134 +++++++++++++++++++++---------------------- po/wine.pot | 134 +++++++++++++++++++++---------------------- po/zh_CN.po | 134 +++++++++++++++++++++---------------------- po/zh_TW.po | 134 +++++++++++++++++++++---------------------- programs/oleview/oleview.c | 5 +- programs/oleview/oleview.rc | 1 - programs/oleview/resource.h | 1 - 49 files changed, 2991 insertions(+), 3182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8cfe2eeb5f664cf70d29…

1 0

Nikolay Sivov : oleview: Use Treeview notifications to release created instances.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 4c55ea3e1c52410ceeb2093a25f2a67088669757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c55ea3e1c52410ceeb2093a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 6 01:28:01 2017 +0300 oleview: Use Treeview notifications to release created instances. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/oleview.c | 2 +- programs/oleview/tree.c | 48 ++++++++++++++-------------------------------- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index f1713b8..d1877b0 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -469,8 +469,8 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, MenuCommand(LOWORD(wParam), hWnd); break; case WM_DESTROY: - OleUninitialize(); EmptyTree(); + OleUninitialize(); PostQuitMessage(0); break; case WM_MENUSELECT: diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index decedc4..2a4ca65 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -604,40 +604,7 @@ static void AddBaseEntries(void) void EmptyTree(void) { - HTREEITEM cur, del; - TVITEMW tvi; - - tvi.mask = TVIF_PARAM; - cur = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, - TVGN_CHILD, (LPARAM)TVI_ROOT); - - while(TRUE) - { - del = cur; - cur = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, - TVGN_CHILD, (LPARAM)del); - - if(!cur) cur = (HTREEITEM)SendMessageW(globals.hTree, - TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)del); - if(!cur) - { - cur = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, - TVGN_PREVIOUS, (LPARAM)del); - if(!cur) cur = (HTREEITEM)SendMessageW(globals.hTree, - TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)del); - - tvi.hItem = del; - if(SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi) && tvi.lParam) - { - if(((ITEM_INFO *)tvi.lParam)->loaded) ReleaseInst(del); - HeapFree(GetProcessHeap(), 0, (ITEM_INFO *)tvi.lParam); - - SendMessageW(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)del); - } - - if(!cur) break; - } - } + SendMessageW(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); } void AddTreeEx(void) @@ -678,6 +645,19 @@ static LRESULT CALLBACK TreeProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPa RefreshMenu(((NMTREEVIEWW *)lParam)->itemNew.hItem); RefreshDetails(((NMTREEVIEWW *)lParam)->itemNew.hItem); break; + case TVN_DELETEITEMW: + { + NMTREEVIEWW *nm = (NMTREEVIEWW*)lParam; + ITEM_INFO *info = (ITEM_INFO*)nm->itemOld.lParam; + + if (info) + { + if (info->loaded) + ReleaseInst(nm->itemOld.hItem); + HeapFree(GetProcessHeap(), 0, info); + } + break; + } } break; case WM_SIZE:

1 0

Nikolay Sivov : xmllite: Handle char references within text nodes.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 455f5f2380f6375539593778d321064bc9381de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=455f5f2380f6375539593778d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 6 01:19:30 2017 +0300 xmllite: Handle char references within text nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 16 +++++++++------- dlls/xmllite/tests/reader.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1e3c7aa..9bb0d56 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2382,6 +2382,8 @@ static HRESULT reader_parse_chardata(xmlreader *reader) while (*ptr) { + static const WCHAR ampW[] = {'&',0}; + /* CDATA closing sequence ']]>' is not allowed */ if (ptr[0] == ']' && ptr[1] == ']' && ptr[2] == '>') return WC_E_CDSECTEND; @@ -2398,11 +2400,15 @@ static HRESULT reader_parse_chardata(xmlreader *reader) return S_OK; } - reader_skipn(reader, 1); - /* this covers a case when text has leading whitespace chars */ if (!is_wchar_space(*ptr)) reader->nodetype = XmlNodeType_Text; - ptr++; + + if (!reader_cmp(reader, ampW)) + reader_parse_reference(reader); + else + reader_skipn(reader, 1); + + ptr = reader_get_ptr(reader); } return S_OK; @@ -2413,7 +2419,6 @@ static HRESULT reader_parse_content(xmlreader *reader) { static const WCHAR cdstartW[] = {'<','!','[','C','D','A','T','A','[',0}; static const WCHAR etagW[] = {'<','/',0}; - static const WCHAR ampW[] = {'&',0}; if (reader->resumestate != XmlReadResumeState_Initial) { @@ -2448,9 +2453,6 @@ static HRESULT reader_parse_content(xmlreader *reader) if (!reader_cmp(reader, cdstartW)) return reader_parse_cdata(reader); - if (!reader_cmp(reader, ampW)) - return reader_parse_reference(reader); - if (!reader_cmp(reader, ltW)) return reader_parse_element(reader); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index dc586e8..f7f738e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2049,6 +2049,43 @@ static void test_namespaceuri(void) IXmlReader_Release(reader); } +static void test_read_charref(void) +{ + static const char testA[] = "<a b=\"c\">ǳă</a>"; + static const WCHAR chardataW[] = {0x01f3,0x0103,0}; + const WCHAR *value; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(testA, sizeof(testA)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Element, "Unexpected node type %d\n", type); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Text, "Unexpected node type %d\n", type); + + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(!lstrcmpW(value, chardataW), "Text value : %s\n", wine_dbgstr_w(value)); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_EndElement, "Unexpected node type %d\n", type); + + IXmlReader_Release(reader); + IStream_Release(stream); +} + START_TEST(reader) { test_reader_create(); @@ -2070,4 +2107,5 @@ START_TEST(reader) test_reader_properties(); test_prefix(); test_namespaceuri(); + test_read_charref(); }

1 0

Nikolay Sivov : shell32: Added a stub for IShellImageDataFactory.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 3f4999cc6a3fc54dffae69e31e2dd18953a0586e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4999cc6a3fc54dffae69e31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 5 22:25:09 2017 +0300 shell32: Added a stub for IShellImageDataFactory. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_classes.idl | 6 +++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shellole.c | 91 ++++++++++++++++++++++++++++++++++++++++ dlls/uuid/uuid.c | 3 ++ 4 files changed, 102 insertions(+) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index 68ce2b5..cc57b2b 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -154,3 +154,9 @@ coclass KnownFolderManager { interface IKnownFolderManager; } threading(apartment), uuid(77f10cf0-3db5-4966-b520-b7c54fd35ed6) ] coclass DestinationList { interface ICustomDestinationList; } + +[ + helpstring("Shell Image Data Factory"), + threading(apartment), + uuid(66e4e4fb-f385-4dd0-8d74-a2efd1bc6178) +] coclass ShellImageDataFactory { interface IShellImageDataFactory; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 642fab7..10cd3a4 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -44,6 +44,8 @@ extern HMODULE huser32 DECLSPEC_HIDDEN; extern HINSTANCE shell32_hInstance DECLSPEC_HIDDEN; +extern CLSID CLSID_ShellImageDataFactory; + /* Iconcache */ #define INVALID_INDEX -1 void SIC_Destroy(void) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index dd54900..a68e73d 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -36,6 +36,7 @@ #include "shlobj.h" #include "shlguid.h" #include "shldisp.h" +#include "shimgdata.h" #include "winreg.h" #include "winerror.h" @@ -50,6 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); extern INT WINAPI SHStringFromGUIDW(REFGUID guid, LPWSTR lpszDest, INT cchMax); /* shlwapi.24 */ +static HRESULT WINAPI ShellImageDataFactory_Constructor(IUnknown *outer, REFIID riid, void **obj); /************************************************************************** * Default ClassFactory types @@ -84,6 +86,7 @@ static const struct { {&CLSID_KnownFolderManager, KnownFolderManager_Constructor}, {&CLSID_Shell, IShellDispatch_Constructor}, {&CLSID_DestinationList, CustomDestinationList_Constructor}, + {&CLSID_ShellImageDataFactory, ShellImageDataFactory_Constructor}, {NULL, NULL} }; @@ -807,3 +810,91 @@ HRESULT WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker **moniker) if (!moniker) return E_INVALIDARG; return CreateClassMoniker(&CLSID_QueryCancelAutoPlay, moniker); } + +/* IShellImageDataFactory */ +static HRESULT WINAPI ShellImageDataFactory_QueryInterface(IShellImageDataFactory *iface, REFIID riid, void **obj) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(&IID_IShellImageDataFactory, riid) || IsEqualIID(&IID_IUnknown, riid)) + { + *obj = iface; + } + else + { + FIXME("not implemented for %s\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; +} + +static ULONG WINAPI ShellImageDataFactory_AddRef(IShellImageDataFactory *iface) +{ + TRACE("(%p)\n", iface); + + return 2; +} + +static ULONG WINAPI ShellImageDataFactory_Release(IShellImageDataFactory *iface) +{ + TRACE("(%p)\n", iface); + + return 1; +} + +static HRESULT WINAPI ShellImageDataFactory_CreateIShellImageData(IShellImageDataFactory *iface, IShellImageData **data) +{ + FIXME("%p, %p: stub\n", iface, data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellImageDataFactory_CreateImageFromFile(IShellImageDataFactory *iface, const WCHAR *path, + IShellImageData **data) +{ + FIXME("%p, %s, %p: stub\n", iface, debugstr_w(path), data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellImageDataFactory_CreateImageFromStream(IShellImageDataFactory *iface, IStream *stream, + IShellImageData **data) +{ + FIXME("%p, %p, %p: stub\n", iface, stream, data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellImageDataFactory_GetDataFormatFromPath(IShellImageDataFactory *iface, const WCHAR *path, + GUID *format) +{ + FIXME("%p, %s, %p: stub\n", iface, debugstr_w(path), format); + + return E_NOTIMPL; +} + +static const IShellImageDataFactoryVtbl ShellImageDataFactoryVtbl = +{ + ShellImageDataFactory_QueryInterface, + ShellImageDataFactory_AddRef, + ShellImageDataFactory_Release, + ShellImageDataFactory_CreateIShellImageData, + ShellImageDataFactory_CreateImageFromFile, + ShellImageDataFactory_CreateImageFromStream, + ShellImageDataFactory_GetDataFormatFromPath, +}; + +static IShellImageDataFactory ShellImageDataFactory = { &ShellImageDataFactoryVtbl }; + +HRESULT WINAPI ShellImageDataFactory_Constructor(IUnknown *outer, REFIID riid, void **obj) +{ + TRACE("%p %s %p\n", outer, debugstr_guid(riid), obj); + + if (outer) + return CLASS_E_NOAGGREGATION; + + return IShellImageDataFactory_QueryInterface(&ShellImageDataFactory, riid, obj); +} diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index af96221..4834dee 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -87,6 +87,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "tlogstg.h" #include "msdasc.h" #include "netcfgx.h" +#include "shimgdata.h" /* FIXME: cguids declares GUIDs but does not define their values */ @@ -141,5 +142,7 @@ DEFINE_GUID(GUID_COMPARTMENT_PERSISTMENUENABLED, 0x575f3783,0x70c8,0x47c8,0xa DEFINE_GUID(GUID_COMPARTMENT_EMPTYCONTEXT, 0xd7487dbf,0x804e,0x41c5,0x89,0x4d,0xad,0x96,0xfd,0x4e,0xea,0x13); DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS, 0x148ca3ec,0x0366,0x401c,0x8d,0x75,0xed,0x97,0x8d,0x85,0xfb,0xc9); +DEFINE_GUID(CLSID_ShellImageDataFactory, 0x66e4e4fb,0xf385,0x4dd0,0x8d,0x74,0xa2,0xef,0xd1,0xbc,0x61,0x78); + /* service identifiers not declared in headers */ DEFINE_GUID(SID_SContainerDispatch,0xb722be00,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70);

1 0

Nikolay Sivov : oleaut32/tests: Correctly return interface pointer.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 73a0ddfa4715defe3bc27c5f32f31e83db0f3208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a0ddfa4715defe3bc27c5f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 5 19:54:44 2017 +0300 oleaut32/tests: Correctly return interface pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index b716f25..4a81e2e 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1391,14 +1391,9 @@ static HRESULT WINAPI NoStatStreamImpl_QueryInterface( NoStatStreamImpl* const This = impl_from_IStream(iface); if (ppvObject==0) return E_INVALIDARG; *ppvObject = 0; - if (IsEqualIID(&IID_IUnknown, riid)) - { - *ppvObject = This; - } - else if (IsEqualIID(&IID_IStream, riid)) - { - *ppvObject = This; - } + + if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IStream, riid)) + *ppvObject = &This->IStream_iface; if ((*ppvObject)==0) return E_NOINTERFACE;

1 0

Nikolay Sivov : msctf: Return proper pointer to interface.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 7bcca927bc2d47fc9e6aec83221c996fb46cc89d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bcca927bc2d47fc9e6aec832… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 5 17:20:35 2017 +0300 msctf: Return proper pointer to interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 1982e2c..a19eaa1 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -180,7 +180,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl; This->ref = 1; This->ctor = ctor; - *ppvOut = This; + *ppvOut = &This->IClassFactory_iface; TRACE("Created class factory %p\n", This); return S_OK; }

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
84
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 February 2017