November 2010 - Wine-commits

Maarten Lankhorst : qedit: Try all possible splitter filters instead of only the first one.
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: b769a266cfc4ac2ccf178094a264be29ec4ac5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b769a266cfc4ac2ccf178094a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 26 00:04:13 2010 +0100 qedit: Try all possible splitter filters instead of only the first one. --- dlls/qedit/mediadet.c | 78 +++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 37 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 9aeb9c0..5ccccd6 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -378,52 +378,56 @@ static HRESULT GetSplitter(MediaDetImpl *This) if (FAILED(hr)) return hr; - hr = IEnumMoniker_Next(filters, 1, &mon, NULL); - IEnumMoniker_Release(filters); - if (hr != S_OK) /* No matches, what do we do? */ - return E_NOINTERFACE; + hr = E_NOINTERFACE; + while (IEnumMoniker_Next(filters, 1, &mon, NULL) == S_OK) + { + hr = GetFilterInfo(mon, &clsid, &var); + IMoniker_Release(mon); + if (FAILED(hr)) + continue; - hr = GetFilterInfo(mon, &clsid, &var); - IMoniker_Release(mon); - if (FAILED(hr)) - return hr; + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **) &splitter); + if (FAILED(hr)) + { + VariantClear(&var); + goto retry; + } - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IBaseFilter, (void **) &splitter); - if (FAILED(hr)) - { + hr = IGraphBuilder_AddFilter(This->graph, splitter, + V_UNION(&var, bstrVal)); VariantClear(&var); - return hr; - } + This->splitter = splitter; + if (FAILED(hr)) + goto retry; - hr = IGraphBuilder_AddFilter(This->graph, splitter, - V_UNION(&var, bstrVal)); - VariantClear(&var); - if (FAILED(hr)) - { - IBaseFilter_Release(splitter); - return hr; - } - This->splitter = splitter; + hr = IBaseFilter_EnumPins(This->source, &pins); + if (FAILED(hr)) + goto retry; + IEnumPins_Next(pins, 1, &source_pin, NULL); + IEnumPins_Release(pins); - hr = IBaseFilter_EnumPins(This->source, &pins); - if (FAILED(hr)) - return hr; - IEnumPins_Next(pins, 1, &source_pin, NULL); - IEnumPins_Release(pins); + hr = IBaseFilter_EnumPins(splitter, &pins); + if (FAILED(hr)) + { + IPin_Release(source_pin); + goto retry; + } + IEnumPins_Next(pins, 1, &splitter_pin, NULL); + IEnumPins_Release(pins); - hr = IBaseFilter_EnumPins(splitter, &pins); - if (FAILED(hr)) - { + hr = IPin_Connect(source_pin, splitter_pin, NULL); IPin_Release(source_pin); - return hr; + IPin_Release(splitter_pin); + if (SUCCEEDED(hr)) + break; + +retry: + IBaseFilter_Release(splitter); + This->splitter = NULL; } - IEnumPins_Next(pins, 1, &splitter_pin, NULL); - IEnumPins_Release(pins); - hr = IPin_Connect(source_pin, splitter_pin, NULL); - IPin_Release(source_pin); - IPin_Release(splitter_pin); + IEnumMoniker_Release(filters); if (FAILED(hr)) return hr;

1 0

Austin English : wineboot: Add a manpage.
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: 8d821bd933db1f0760601a3bd54aba028a962882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d821bd933db1f0760601a3bd… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 25 08:02:08 2010 -0800 wineboot: Add a manpage. --- .gitignore | 1 + programs/wineboot/Makefile.in | 12 ++++++++++++ programs/wineboot/wineboot.man.in | 31 +++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a505761..ab6c86d 100644 --- a/.gitignore +++ b/.gitignore @@ -269,6 +269,7 @@ programs/rpcss/irot.h programs/rpcss/irot_s.c programs/services/svcctl.h programs/services/svcctl_s.c +programs/wineboot/wineboot.man programs/winecfg/winecfg.man programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index ab79996..bd8632b 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -31,4 +31,16 @@ RC_SRCS = \ wineboot_Uk.rc \ wineboot_Zh.rc +MANPAGES = wineboot.man + @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) wineboot.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineboot.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wineboot.$(prog_manext) diff --git a/programs/wineboot/wineboot.man.in b/programs/wineboot/wineboot.man.in new file mode 100644 index 0000000..820ded3 --- /dev/null +++ b/programs/wineboot/wineboot.man.in @@ -0,0 +1,31 @@ +.TH WINEBOOT 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +wineboot \- perform Wine initialization, startup, and shutdown tasks +.SH SYNOPSIS +.BR "wineboot "\fI[OPTION]\fR " +.SH DESCRIPTION +.B wineboot +performs the initial creation and setup of a WINEPREFIX for wine(1). It can also perform a simulated +reboot or shutdown to any applications running within the WINEPREFIX. +.SH "SEE ALSO" +.BR wine(1) +.SH "OPTIONS" +.IP \-h,\ \-\-help +Display help message. +.IP \-e,\ \-\-end\-session +End the current session cleanly. +.IP \-f,\ \-\-force +Force exit for processes that don't exit cleanly +.IP \-i,\ \-\-init +Initialize the WINEPREFIX. +.IP \-k,\ \-\-kill +Kill running processes without any cleanup. +.IP \-r,\ \-\-restart +Restart only, don't do normal startup operations. +.IP \-s,\ \-\-shutdown +Shutdown only, don't reboot. +.IP \-u,\ \-\-update +Update the WINEPREFIX. + +.SH "SEE ALSO" +.BR wine(1)

1 0

Austin English : wineconsole: Add a manpage.
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: c43c31fe47078360beda03550344cdf2320ee312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43c31fe47078360beda03550… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 25 08:18:03 2010 -0800 wineconsole: Add a manpage. --- .gitignore | 1 + programs/wineconsole/Makefile.in | 12 ++++++++++++ programs/wineconsole/wineconsole.man.in | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index ab6c86d..834f256 100644 --- a/.gitignore +++ b/.gitignore @@ -271,6 +271,7 @@ programs/services/svcctl.h programs/services/svcctl_s.c programs/wineboot/wineboot.man programs/winecfg/winecfg.man +programs/wineconsole/wineconsole.man programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index 024b774..8238cc0 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -36,4 +36,16 @@ RC_SRCS = \ wineconsole_Uk.rc \ wineconsole_Zh.rc +MANPAGES = wineconsole.man + @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) wineconsole.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineconsole.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wineconsole.$(prog_manext) diff --git a/programs/wineconsole/wineconsole.man.in b/programs/wineconsole/wineconsole.man.in new file mode 100644 index 0000000..8ae52fa --- /dev/null +++ b/programs/wineconsole/wineconsole.man.in @@ -0,0 +1,15 @@ +.TH WINECONSOLE 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +wineconsole \- The Wine console +.SH SYNOPSIS +.BR "wineconsole "\fI[option]\fR " command +.SH DESCRIPTION +.B wineconsole +is the Wine console manager, used to run console commands and applications. It allows running the +console either in the current terminal (\fIcurses\fR) or in a newly made window (\fIuser\fR). +.SH "OPTIONS" +.IP \-\-backend=\fR{\fIuser\fR|\fIcurses\fR} +If \fIuser\fR is chosen, a new window will be created for the console. The \fIcurses\fR option will make +wineconsole try to setup the current terminal as a Wine console. +.SH "SEE ALSO" +.BR wine(1)

1 0

Alexander Morozov : crypt32/tests: Fix test failures on some Win95 and some NT4.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: f48b0aa6a2f75763a5ea1c092abc29109446a4cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48b0aa6a2f75763a5ea1c092… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Nov 25 17:38:59 2010 +0300 crypt32/tests: Fix test failures on some Win95 and some NT4. --- dlls/crypt32/tests/message.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 392ec47..69049b1 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -1322,10 +1322,15 @@ static void test_encrypt_message(void) ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), encryptedBlob, &encryptedBlobSize); todo_wine - ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); - todo_wine - ok(encryptedBlobSize == 55, - "unexpected size of encrypted blob %d\n", encryptedBlobSize); + ok(ret || + broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */ + "CryptEncryptMessage failed: %08x\n", GetLastError()); + if (ret) + { + todo_wine + ok(encryptedBlobSize == 55, + "unexpected size of encrypted blob %d\n", encryptedBlobSize); + } CryptMemFree(encryptedBlob); } } @@ -1345,7 +1350,9 @@ static void test_encrypt_message(void) ret = CryptEncryptMessage(&para, 2, certs, blob, sizeof(blob), encryptedBlob, &encryptedBlobSize); todo_wine - ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); + ok(ret || + broken(!ret), /* some Win95 and some NT4 */ + "CryptEncryptMessage failed: %08x\n", GetLastError()); CryptMemFree(encryptedBlob); } }

1 0

Austin English : wininet: Add a stub for InternetShowSecurityInfoByURL.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 1c7d349f26c89c9be410978148c64f59c987cf82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7d349f26c89c9be41097814… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 25 06:59:25 2010 -0800 wininet: Add a stub for InternetShowSecurityInfoByURL. --- dlls/wininet/http.c | 18 ++++++++++++++++++ dlls/wininet/wininet.spec | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 76cf41c..9a49a94 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5167,3 +5167,21 @@ BOOL WINAPI IsHostInProxyBypassList(DWORD flags, LPCSTR szHost, DWORD length) FIXME("STUB: flags=%d host=%s length=%d\n",flags,szHost,length); return FALSE; } + +/*********************************************************************** + * InternetShowSecurityInfoByURLA (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLA(LPCSTR url, HWND window) +{ + FIXME("stub: %s %p\n", url, window); + return FALSE; +} + +/*********************************************************************** + * InternetShowSecurityInfoByURLW (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) +{ + FIXME("stub: %s %p\n", debugstr_w(url), window); + return FALSE; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 1300c3d..583b7ba 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -195,9 +195,9 @@ @ stdcall InternetSetStatusCallback(ptr ptr) InternetSetStatusCallbackA @ stdcall InternetSetStatusCallbackA(ptr ptr) @ stdcall InternetSetStatusCallbackW(ptr ptr) -@ stub InternetShowSecurityInfoByURL -@ stub InternetShowSecurityInfoByURLA -@ stub InternetShowSecurityInfoByURLW +@ stdcall InternetShowSecurityInfoByURL(str ptr) InternetShowSecurityInfoByURLA +@ stdcall InternetShowSecurityInfoByURLA(str ptr) +@ stdcall InternetShowSecurityInfoByURLW(wstr ptr) @ stdcall InternetTimeFromSystemTime(ptr long ptr long) InternetTimeFromSystemTimeA @ stdcall InternetTimeFromSystemTimeA(ptr long ptr long) @ stdcall InternetTimeFromSystemTimeW(ptr long ptr long)

1 0

Jacek Caban : mshtml: Fixed ref count tests on broken IEs.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 387ed3c8557ac5beef44a6d68deb3f66ad7c3c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387ed3c8557ac5beef44a6d68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 25 14:32:31 2010 +0100 mshtml: Fixed ref count tests on broken IEs. Also some code clean up. --- dlls/mshtml/tests/htmldoc.c | 134 ++++++++++++++++++++----------------------- 1 files changed, 63 insertions(+), 71 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index e8ce9b4..ec55662 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4358,26 +4358,34 @@ static void test_Hide(void) ok(hres == S_OK, "Show failed: %08x\n", hres); } -static HRESULT create_document(IHTMLDocument2 **doc) +static IHTMLDocument2 *create_document(void) { - IHTMLDocument5 *doc5; + IHTMLDocument2 *doc; HRESULT hres; hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IHTMLDocument2, (void**)doc); + &IID_IHTMLDocument2, (void**)&doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); if(FAILED(hres)) - return hres; + return NULL; - hres = IHTMLDocument2_QueryInterface(*doc, &IID_IHTMLDocument5, (void**)&doc5); - if(SUCCEEDED(hres)) { - IHTMLDocument5_Release(doc5); - }else { - win_skip("Could not get IHTMLDocument5, probably too old IE\n"); - IHTMLDocument2_Release(*doc); - } + return doc; +} + +static void release_document(IHTMLDocument2 *doc) +{ + IUnknown *unk; + ULONG ref; + HRESULT hres; - return hres; + /* Some broken IEs don't like if the last released reference is IHTMLDocument2 iface. + * To workaround it, we release it via IUnknown iface */ + hres = IHTMLDocument2_QueryInterface(doc, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "Could not get IUnknown iface: %08x\n", hres); + + IHTMLDocument2_Release(doc); + ref = IUnknown_Release(unk); + ok(!ref, "ref = %d\n", ref); } static void test_Navigate(IHTMLDocument2 *doc) @@ -4555,16 +4563,12 @@ static void init_test(enum load_state_t ls) { static void test_HTMLDocument(BOOL do_load) { IHTMLDocument2 *doc; - HRESULT hres; - ULONG ref; trace("Testing HTMLDocument (%s)...\n", (do_load ? "load" : "no load")); init_test(do_load ? LD_DOLOAD : LD_NO); - hres = create_document(&doc); - if(FAILED(hres)) - return; + doc = create_document(); doc_unk = (IUnknown*)doc; test_QueryInterface(doc); @@ -4645,27 +4649,20 @@ static void test_HTMLDocument(BOOL do_load) view = NULL; ok(IsWindow(hwnd), "hwnd is destroyed\n"); - - ref = IHTMLDocument2_Release(doc); - ok(ref == 0, "ref=%d, expected 0\n", ref); - + release_document(doc); ok(!IsWindow(hwnd), "hwnd is not destroyed\n"); } static void test_HTMLDocument_hlink(void) { IHTMLDocument2 *doc; - HRESULT hres; - ULONG ref; trace("Testing HTMLDocument (hlink)...\n"); init_test(LD_DOLOAD); ipsex = TRUE; - hres = create_document(&doc); - if(FAILED(hres)) - return; + doc = create_document(); doc_unk = (IUnknown*)doc; test_ViewAdviseSink(doc); @@ -4696,8 +4693,7 @@ static void test_HTMLDocument_hlink(void) IOleDocumentView_Release(view); view = NULL; - ref = IHTMLDocument2_Release(doc); - ok(ref == 0, "ref=%d, expected 0\n", ref); + release_document(doc); } static void test_cookies(IHTMLDocument2 *doc) @@ -4768,9 +4764,7 @@ static void test_HTMLDocument_http(void) init_test(LD_DOLOAD); ipsex = TRUE; - hres = create_document(&doc); - if(FAILED(hres)) - return; + doc = create_document(); doc_unk = (IUnknown*)doc; hres = CreateURLMoniker(NULL, http_urlW, &http_mon); @@ -4804,8 +4798,7 @@ static void test_HTMLDocument_http(void) IOleDocumentView_Release(view); view = NULL; - ref = IHTMLDocument2_Release(doc); - ok(!ref, "ref=%d, expected 0\n", ref); + release_document(doc); ref = IMoniker_Release(http_mon); ok(!ref, "ref=%d, expected 0\n", ref); @@ -4860,16 +4853,13 @@ static void test_HTMLDocument_StreamLoad(void) IOleObject *oleobj; DWORD conn; HRESULT hres; - ULONG ref; trace("Testing HTMLDocument (IPersistStreamInit)...\n"); init_test(LD_DOLOAD); load_from_stream = TRUE; - hres = create_document(&doc); - if(FAILED(hres)) - return; + doc = create_document(); doc_unk = (IUnknown*)doc; hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); @@ -4907,9 +4897,7 @@ static void test_HTMLDocument_StreamLoad(void) view = NULL; } - - ref = IHTMLDocument2_Release(doc); - ok(ref == 0, "ref=%d, expected 0\n", ref); + release_document(doc); } static void test_HTMLDocument_StreamInitNew(void) @@ -4918,16 +4906,13 @@ static void test_HTMLDocument_StreamInitNew(void) IOleObject *oleobj; DWORD conn; HRESULT hres; - ULONG ref; trace("Testing HTMLDocument (IPersistStreamInit)...\n"); init_test(LD_DOLOAD); load_from_stream = TRUE; - hres = create_document(&doc); - if(FAILED(hres)) - return; + doc = create_document(); doc_unk = (IUnknown*)doc; hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); @@ -4963,9 +4948,7 @@ static void test_HTMLDocument_StreamInitNew(void) view = NULL; } - - ref = IHTMLDocument2_Release(doc); - ok(ref == 0, "ref=%d, expected 0\n", ref); + release_document(doc); } static void test_edit_uiactivate(IOleObject *oleobj) @@ -5002,16 +4985,13 @@ static void test_editing_mode(BOOL do_load) IOleObject *oleobj; DWORD conn; HRESULT hres; - ULONG ref; trace("Testing HTMLDocument (edit%s)...\n", do_load ? " load" : ""); init_test(do_load ? LD_DOLOAD : LD_NO); call_UIActivate = CallUIActivate_AfterShow; - hres = create_document(&doc); - if(FAILED(hres)) - return; + doc = create_document(); unk = doc_unk = (IUnknown*)doc; hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); @@ -5080,8 +5060,7 @@ static void test_editing_mode(BOOL do_load) view = NULL; } - ref = IUnknown_Release(unk); - ok(ref == 0, "ref=%d, expected 0\n", ref); + release_document(doc); } static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) @@ -5090,15 +5069,12 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) IOleObject *oleobj; IOleInPlaceSite *inplacesite; HRESULT hres; - ULONG ref; trace("Running OleDocumentView_UIActivate tests (%d %d %d)\n", do_load, use_ipsex, use_ipsw); init_test(do_load ? LD_DOLOAD : LD_NO); - hres = create_document(&doc); - if(FAILED(hres)) - return; + doc = create_document(); doc_unk = (IUnknown*)doc; ipsex = use_ipsex; @@ -5232,8 +5208,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) IOleDocumentView_Release(view); view = NULL; - ref = IHTMLDocument2_Release(doc); - ok(ref == 0, "ref=%d, expected 0\n", ref); + release_document(doc); } static void register_protocol(void) @@ -5258,11 +5233,8 @@ static void test_HTMLDoc_ISupportErrorInfo(void) IHTMLDocument2 *doc; HRESULT hres; ISupportErrorInfo *sinfo; - LONG ref; - hres = create_document(&doc); - if(FAILED(hres)) - return; + doc = create_document(); hres = IUnknown_QueryInterface(doc, &IID_ISupportErrorInfo, (void**)&sinfo); ok(hres == S_OK, "got %x\n", hres); @@ -5274,33 +5246,53 @@ static void test_HTMLDoc_ISupportErrorInfo(void) IUnknown_Release(sinfo); } - ref = IHTMLDocument2_Release(doc); - ok(ref == 0, "ref=%d, expected 0\n", ref); + release_document(doc); } static void test_IPersistHistory(void) { IHTMLDocument2 *doc; HRESULT hres; - LONG ref; IPersistHistory *phist; - hres = create_document(&doc); - if(FAILED(hres)) - return; + doc = create_document(); hres = IUnknown_QueryInterface(doc, &IID_IPersistHistory, (void**)&phist); ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); if(hres == S_OK) IPersistHistory_Release(phist); - ref = IHTMLDocument2_Release(doc); - ok(ref == 0, "ref=%d, expected 0\n", ref); + release_document(doc); +} + +static BOOL check_ie(void) +{ + IHTMLDocument2 *doc; + IHTMLDocument5 *doc5; + HRESULT hres; + + doc = create_document(); + if(!doc) + return FALSE; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); + if(SUCCEEDED(hres)) + IHTMLDocument5_Release(doc5); + + release_document(doc); + return SUCCEEDED(hres); } START_TEST(htmldoc) { CoInitialize(NULL); + + if(!check_ie()) { + CoUninitialize(); + win_skip("Too old IE\n"); + return; + } + container_hwnd = create_container_window(); register_protocol();

1 0

Jacek Caban : mshtml: Don't use wine_url in nsIURI::SchemeIs implementation .
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 5030554ccd5237ccc209172bdb7f7ceb7408261f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5030554ccd5237ccc209172bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 25 13:56:25 2010 +0100 mshtml: Don't use wine_url in nsIURI::SchemeIs implementation. --- dlls/mshtml/nsio.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 13085e6..412b1d4 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2037,15 +2037,20 @@ static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool * { nsWineURI *This = NSURI_THIS(iface); WCHAR buf[INTERNET_MAX_SCHEME_LENGTH]; - int len; + BSTR scheme_name; + HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_a(scheme), _retval); - len = MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR))-1; + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetSchemeName(This->uri, &scheme_name); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; - *_retval = lstrlenW(This->wine_url) > len - && This->wine_url[len] == ':' - && !memcmp(buf, This->wine_url, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR)); + *_retval = !strcmpW(scheme_name, buf); return NS_OK; }

1 0

Alexander Morozov : crypt32/tests: Skip more tests.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: b9c122f15e3aea9c481815a12b207711275b54a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c122f15e3aea9c481815a12… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Nov 25 01:06:32 2010 +0300 crypt32/tests: Skip more tests. --- dlls/crypt32/tests/msg.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 898b10c..d8b1b94 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2078,7 +2078,6 @@ static void test_enveloped_msg_open(void) "expected E_INVALIDARG, got %08x\n", GetLastError()); } - SetLastError(0xdeadbeef); context = CertCreateCertificateContext(X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey)); if (context) @@ -2090,23 +2089,21 @@ static void test_enveloped_msg_open(void) todo_wine ok(msg != NULL, "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); CryptMsgClose(msg); + SetLastError(0xdeadbeef); + ret = pCryptAcquireContextA(&envelopedInfo.hCryptProv, NULL, NULL, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + todo_wine + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + CryptReleaseContext(envelopedInfo.hCryptProv, 0); + CertFreeCertificateContext(context); } else - win_skip("failed to create certificate context, skipping a test\n"); - - SetLastError(0xdeadbeef); - ret = pCryptAcquireContextA(&envelopedInfo.hCryptProv, NULL, NULL, - PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); - SetLastError(0xdeadbeef); - msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, - &envelopedInfo, NULL, NULL); - todo_wine - ok(msg != NULL, "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); - CryptMsgClose(msg); - - CryptReleaseContext(envelopedInfo.hCryptProv, 0); - CertFreeCertificateContext(context); + win_skip("failed to create certificate context, skipping tests\n"); } static void test_enveloped_msg_update(void)

1 0

Eryk Wieliczko : msvcrt: Implement fprintf_s and fwprintf_s.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 91bc6c52017fbdb1ef3746b006678076f320f8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bc6c52017fbdb1ef3746b00… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Wed Nov 24 21:25:49 2010 +0100 msvcrt: Implement fprintf_s and fwprintf_s. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/file.c | 26 ++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- include/msvcrt/stdio.h | 2 ++ include/msvcrt/wchar.h | 1 + 7 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 25467ff..4cd7f3a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1459,7 +1459,7 @@ @ cdecl fopen(str str) msvcrt.fopen @ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf -@ stub fprintf_s +@ varargs fprintf_s(ptr str) msvcrt.fprintf_s @ cdecl fputc(long ptr) msvcrt.fputc @ cdecl fputs(str ptr) msvcrt.fputs @ cdecl fputwc(long ptr) msvcrt.fputwc @@ -1476,7 +1476,7 @@ @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos @ cdecl ftell(ptr) msvcrt.ftell @ varargs fwprintf(ptr wstr) msvcrt.fwprintf -@ stub fwprintf_s +@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite @ varargs fwscanf(ptr wstr) msvcrt.fwscanf @ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 742144d..ab74956 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1315,7 +1315,7 @@ @ cdecl fopen(str str) msvcrt.fopen @ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf -@ stub fprintf_s +@ varargs fprintf_s(ptr str) msvcrt.fprintf_s @ cdecl fputc(long ptr) msvcrt.fputc @ cdecl fputs(str ptr) msvcrt.fputs @ cdecl fputwc(long ptr) msvcrt.fputwc @@ -1332,7 +1332,7 @@ @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos @ cdecl ftell(ptr) msvcrt.ftell @ varargs fwprintf(ptr wstr) msvcrt.fwprintf -@ stub fwprintf_s +@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite @ varargs fwscanf(ptr wstr) msvcrt.fwscanf @ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3c0279f..e6da0da 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1299,7 +1299,7 @@ @ cdecl fopen(str str) msvcrt.fopen @ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf -@ stub fprintf_s +@ varargs fprintf_s(ptr str) msvcrt.fprintf_s @ cdecl fputc(long ptr) msvcrt.fputc @ cdecl fputs(str ptr) msvcrt.fputs @ cdecl fputwc(long ptr) msvcrt.fputwc @@ -1316,7 +1316,7 @@ @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos @ cdecl ftell(ptr) msvcrt.ftell @ varargs fwprintf(ptr wstr) msvcrt.fwprintf -@ stub fwprintf_s +@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite @ varargs fwscanf(ptr wstr) msvcrt.fwscanf @ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 866ea46..69ba4b8 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3500,6 +3500,19 @@ int CDECL MSVCRT_fprintf(MSVCRT_FILE* file, const char *format, ...) } /********************************************************************* + * fprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_fprintf_s(MSVCRT_FILE* file, const char *format, ...) +{ + __ms_va_list valist; + int res; + __ms_va_start(valist, format); + res = MSVCRT_vfprintf_s(file, format, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * fwprintf (MSVCRT.@) */ int CDECL MSVCRT_fwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...) @@ -3513,6 +3526,19 @@ int CDECL MSVCRT_fwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...) } /********************************************************************* + * fwprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_fwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ...) +{ + __ms_va_list valist; + int res; + __ms_va_start(valist, format); + res = MSVCRT_vfwprintf_s(file, format, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * printf (MSVCRT.@) */ int CDECL MSVCRT_printf(const char *format, ...) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d528e06..efa380a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1250,7 +1250,7 @@ @ cdecl fopen(str str) MSVCRT_fopen @ cdecl fopen_s(ptr str str) MSVCRT_fopen_s @ varargs fprintf(ptr str) MSVCRT_fprintf -# stub fprintf_s +@ varargs fprintf_s(ptr str) MSVCRT_fprintf_s @ cdecl fputc(long ptr) MSVCRT_fputc @ cdecl fputs(str ptr) MSVCRT_fputs @ cdecl fputwc(long ptr) MSVCRT_fputwc @@ -1267,7 +1267,7 @@ @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf -# stub fwprintf_s +@ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite @ varargs fwscanf(ptr wstr) MSVCRT_fwscanf @ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 31ba8ca..fa5290f 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -131,6 +131,7 @@ char* __cdecl fgets(char*,int,FILE*); FILE* __cdecl fopen(const char*,const char*); errno_t __cdecl fopen_s(FILE**,const char*,const char*); int __cdecl fprintf(FILE*,const char*,...); +int __cdecl fprintf_s(FILE*,const char*,...); int __cdecl fputc(int,FILE*); int __cdecl fputs(const char*,FILE*); size_t __cdecl fread(void*,size_t,size_t,FILE*); @@ -200,6 +201,7 @@ wchar_t* __cdecl fgetws(wchar_t*,int,FILE*); wint_t __cdecl fputwc(wint_t,FILE*); int __cdecl fputws(const wchar_t*,FILE*); int __cdecl fwprintf(FILE*,const wchar_t*,...); +int __cdecl fwprintf_s(FILE*,const wchar_t*,...); int __cdecl fputws(const wchar_t*,FILE*); int __cdecl fwscanf(FILE*,const wchar_t*,...); int __cdecl fwscanf_s(FILE*,const wchar_t*,...); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index e753e3f..285168a 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -295,6 +295,7 @@ wchar_t* __cdecl fgetws(wchar_t*,int,FILE*); wint_t __cdecl fputwc(wint_t,FILE*); int __cdecl fputws(const wchar_t*,FILE*); int __cdecl fwprintf(FILE*,const wchar_t*,...); +int __cdecl fwprintf_s(FILE*,const wchar_t*,...); int __cdecl fputws(const wchar_t*,FILE*); int __cdecl fwscanf(FILE*,const wchar_t*,...); int __cdecl fwscanf_s(FILE*,const wchar_t*,...);

1 0

Alexandre Julliard : cryptnet/tests: Don't import shlwapi.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 0a28308b9076b7a53c45dd2fb570915d9b5f2a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a28308b9076b7a53c45dd2fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 12:01:43 2010 +0100 cryptnet/tests: Don't import shlwapi. --- dlls/cryptnet/tests/Makefile.in | 2 +- dlls/cryptnet/tests/cryptnet.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/cryptnet/tests/Makefile.in b/dlls/cryptnet/tests/Makefile.in index 2cef5b6..7fe1e32 100644 --- a/dlls/cryptnet/tests/Makefile.in +++ b/dlls/cryptnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = cryptnet.dll -IMPORTS = cryptnet crypt32 shlwapi +IMPORTS = cryptnet crypt32 C_SRCS = \ cryptnet.c diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index aab3724..64491e7 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -24,7 +24,6 @@ #include <winbase.h> #include <winerror.h> #include <wincrypt.h> -#include <shlwapi.h> #include "wine/test.h" static const BYTE bigCert[] = { @@ -324,7 +323,6 @@ static void test_retrieveObjectByUrl(void) HCERTSTORE store; CRYPT_RETRIEVE_AUX_INFO aux = { 0 }; FILETIME ft = { 0 }; - DWORD urllen; SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL); @@ -334,8 +332,7 @@ static void test_retrieveObjectByUrl(void) GetLastError(), GetLastError()); make_tmp_file(tmpfile); - urllen = sizeof(url); - UrlCanonicalizeA(tmpfile, url, &urllen, URL_WININET_COMPATIBILITY); + snprintf(url, sizeof(url), "file://%s", tmpfile); pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray,

1 0