wine-commits May 2014

wine-commits@winehq.org

2 participants
404 discussions

Francois Gouget : testbot/RevertVM: Always pass the current VM to FatalError().
by Alexandre Julliard 21 May '14

21 May '14

Module: tools Branch: master Commit: 650414651caddff186c348913ee228b8594abbe0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=650414651caddff186c34891… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 19 00:06:17 2014 +0200 testbot/RevertVM: Always pass the current VM to FatalError(). Without this argument it devolves to a two line LogMsg()+exit() combination. --- testbot/bin/RevertVM.pl | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 60a13f8..b2ae902 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -48,16 +48,14 @@ sub FatalError LogMsg $ErrMessage, "\n"; - if ($VM) - { - $VM->Status("offline"); - $VM->ChildPid(undef); - $VM->Save(); - - my $VMKey = $VM->GetKey(); - my $VMSnapshot = $VM->IdleSnapshot; - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; + $VM->Status("offline"); + $VM->ChildPid(undef); + $VM->Save(); + + my $VMKey = $VM->GetKey(); + my $VMSnapshot = $VM->IdleSnapshot; + open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + print SENDMAIL <<"EOF"; From: $RobotEMail To: $AdminEMail Subject: VM $VMKey offline @@ -68,8 +66,7 @@ $ErrMessage The VM has been put offline. EOF - close(SENDMAIL); - } + close(SENDMAIL); exit 1; } @@ -86,7 +83,8 @@ if (! $VMKey) my $VM = CreateVMs()->GetItem($VMKey); if (! defined($VM)) { - FatalError "VM $VMKey doesn't exist"; + LogMsg "VM $VMKey doesn't exist\n"; + exit 1; } LogMsg "Reverting $VMKey to ", $VM->IdleSnapshot, "\n"; @@ -146,4 +144,4 @@ if (defined($ErrMessage)) LogMsg "Revert of $VMKey completed\n"; -exit; +exit 0;

1 0

Francois Gouget : testbot: Add prototypes to the Perl utility functions.
by Alexandre Julliard 21 May '14

21 May '14

Module: tools Branch: master Commit: 6518eb604c1b118d523b22cc649d8b82cff06f5f URL: http://source.winehq.org/git/tools.git/?a=commit;h=6518eb604c1b118d523b22cc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 19 00:05:52 2014 +0200 testbot: Add prototypes to the Perl utility functions. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. Also standardize the way we retrieve their arguments. --- testbot/lib/WineTestBot/Utils.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index acfabb5..1084abd 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,9 +33,9 @@ require Exporter; @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString &BuildEMailRecipient); -sub MakeSecureURL +sub MakeSecureURL($) { - my $URL = shift; + my ($URL) = @_; my $Protocol = "http"; if ($UseSSL || SecureConnection()) @@ -46,14 +46,14 @@ sub MakeSecureURL return $Protocol . "://" . $ENV{"HTTP_HOST"} . $URL; } -sub SecureConnection +sub SecureConnection() { return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; } -sub GenerateRandomString +sub GenerateRandomString($) { - my $Len = $_[0]; + my ($Len) = @_; my $RandomString = ""; while (length($RandomString) < $Len) @@ -65,15 +65,15 @@ sub GenerateRandomString return substr($RandomString, 0, $Len); } -sub DateTimeToString +sub DateTimeToString($) { - my $Time = $_[0]; + my ($Time) = @_; # my ($Sec, $Min, $Hour, $MDay, $Mon, $Year, $WDay, $YDay, $IsDst) = localtime($Time); return strftime("%Y/%m/%d %H:%M:%S", localtime($Time)); } -sub BuildEMailRecipient +sub BuildEMailRecipient($$) { my ($EMailAddress, $Name) = @_;

1 0

Andrew Eikum : riched20/tests: Allow conversions to non-English codepages.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 704d1695f3d0b14e8eee9a5f786dfce55589ecb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704d1695f3d0b14e8eee9a5f7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 20 14:09:45 2014 -0500 riched20/tests: Allow conversions to non-English codepages. --- dlls/riched20/tests/editor.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 309de7a..e14d7f6 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5071,7 +5071,7 @@ static void test_EM_STREAMIN(void) DWORD phase; LRESULT result; EDITSTREAM es; - char buffer[1024] = {0}; + char buffer[1024] = {0}, tmp[16]; const char * streamText0 = "{\\rtf1 TestSomeText}"; const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; @@ -5100,6 +5100,9 @@ static void test_EM_STREAMIN(void) "This text just needs to be long enough to cause run to be split onto " "two separate lines and make sure the null terminating character is " "handled properly.\0"; + + const WCHAR UTF8Split_exp[4] = {0xd6, 0xcf, 0xcb, 0}; + int length4 = strlen(streamText4) + 1; struct StringWithLength cookieForStream4 = { length4, @@ -5217,10 +5220,12 @@ static void test_EM_STREAMIN(void) result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); ok(result == 8, "got %ld\n", result); + WideCharToMultiByte(CP_ACP, 0, UTF8Split_exp, -1, tmp, sizeof(tmp), NULL, NULL); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok(result == 3, "EM_STREAMIN: Test UTF8Split returned %ld\n", result); - result = memcmp (buffer,"\xd6\xcf\xcb", 3); + result = memcmp (buffer, tmp, 3); ok(result == 0, "EM_STREAMIN: Test UTF8Split set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test UTF8Split set error %d, expected %d\n", es.dwError, 0);

1 0

Jacek Caban : ieframe: Added InternetExplore::get_HWND implementation.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 92841b3195276a12a320fa0b3dd854401cbef943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92841b3195276a12a320fa0b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 20 18:30:57 2014 +0200 ieframe: Added InternetExplore::get_HWND implementation. --- dlls/ieframe/ie.c | 7 +++++-- dlls/ieframe/tests/ie.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 454eb0f..5eb1d26 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -358,8 +358,11 @@ static HRESULT WINAPI InternetExplorer_get_Name(IWebBrowser2 *iface, BSTR *Name) static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, pHWND); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pHWND); + + *pHWND = (SHANDLE_PTR)This->frame_hwnd; + return S_OK; } static HRESULT WINAPI InternetExplorer_get_FullName(IWebBrowser2 *iface, BSTR *FullName) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index daf47f7..9ddd25c 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -205,6 +205,22 @@ static void test_html_window(IWebBrowser2 *wb) IHTMLWindow2_Release(html_window); } +static void test_window(IWebBrowser2 *wb) +{ + SHANDLE_PTR handle = 0; + HWND hwnd = NULL; + char buf[100]; + HRESULT hres; + + hres = IWebBrowser2_get_HWND(wb, &handle); + ok(hres == S_OK, "get_HWND faile: %08x\n", hres); + ok(handle, "handle == 0\n"); + + hwnd = (HWND)handle; + GetClassNameA(hwnd, buf, sizeof(buf)); + ok(!strcmp(buf, "IEFrame"), "Unexpected class name %s\n", buf); +} + static void test_navigate(IWebBrowser2 *wb, const char *url) { VARIANT urlv, emptyv; @@ -249,6 +265,7 @@ static void test_InternetExplorer(void) test_visible(wb); test_html_window(wb); + test_window(wb); test_navigate(wb, "http://test.winehq.org/tests/hello.html"); advise_cp(unk, FALSE);

1 0

Jacek Caban : urlmon: Fixed some occasionally failing tests.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 1687c5cd3a02adaed341de3d0d1812c38391c28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1687c5cd3a02adaed341de3d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 20 15:11:03 2014 +0200 urlmon: Fixed some occasionally failing tests. --- dlls/urlmon/tests/url.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 8460000..5861127 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2810,6 +2810,7 @@ static BOOL test_RegisterBindStatusCallback(void) #define BINDTEST_ABORT_START 0x0400 #define BINDTEST_ABORT_PROGRESS 0x0800 #define BINDTEST_ASYNC_SWITCH 0x1000 +#define BINDTEST_ALLOW_FINDINGRESOURCE 0x2000 static void init_bind_test(int protocol, DWORD flags, DWORD t) { @@ -2885,9 +2886,11 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) MSG msg; IBindStatusCallback *previousclb; IUnknown *unk = (IUnknown*)0x00ff00ff; + BOOL allow_finding_resource; IBinding *bind; init_bind_test(protocol, flags, t); + allow_finding_resource = (flags & BINDTEST_ALLOW_FINDINGRESOURCE) != 0; if(no_callback) { hres = CreateBindCtx(0, &bctx); @@ -2967,7 +2970,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) SET_EXPECT(BeginningTransaction); SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(GetRootSecurityId); - if(http_is_first) + if(http_is_first || allow_finding_resource) SET_EXPECT(OnProgress_FINDINGRESOURCE); SET_EXPECT(OnProgress_CONNECTING); } @@ -3125,6 +3128,8 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) CLEAR_CALLED(OnProgress_CONNECTING); } }else if(!abort_start) { + if(allow_finding_resource) + CLEAR_CALLED(OnProgress_FINDINGRESOURCE); /* IE7 does call this */ CLEAR_CALLED(OnProgress_CONNECTING); } @@ -3951,7 +3956,7 @@ START_TEST(url) test_BindToObject(HTTP_TEST, 0, S_OK); trace("http test (short response)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_ISTREAM); trace("http test (short response, to object)...\n"); test_BindToObject(HTTP_TEST, 0, S_OK); @@ -3965,7 +3970,7 @@ START_TEST(url) test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_START, TYMED_FILE); trace("http test (abort progress)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_PROGRESS, TYMED_FILE); + test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_PROGRESS|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_FILE); trace("emulated http test...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM);

1 0

Hans Leidekker : wbemprox: Add a partial implementation of CIM_Processor.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: a6374aad413a0e68b5c4b1fb2f2baee532da6fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6374aad413a0e68b5c4b1fb2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 20 15:33:13 2014 +0200 wbemprox: Add a partial implementation of CIM_Processor. --- dlls/wbemprox/builtin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1ca4137..ea54213 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -84,6 +84,8 @@ static const WCHAR class_process_getowner_outW[] = 'N','E','R','_','O','U','T',0}; static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR class_processor2W[] = + {'C','I','M','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; static const WCHAR class_videocontrollerW[] = @@ -2408,6 +2410,7 @@ static struct table builtin_classes[] = { class_physicalmemoryW, SIZEOF(col_physicalmemory), col_physicalmemory, 0, 0, NULL, fill_physicalmemory }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, + { class_processor2W, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0, (BYTE *)data_qualifier }, { class_serviceW, SIZEOF(col_service), col_service, 0, 0, NULL, fill_service }, { class_sounddeviceW, SIZEOF(col_sounddevice), col_sounddevice, SIZEOF(data_sounddevice), 0, (BYTE *)data_sounddevice },

1 0

Shuai Meng : vbscript: Implemented CCur.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 14f68a988bda797917f778a748ee8920531b734a URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f68a988bda797917f778a74… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue May 20 09:05:07 2014 +0800 vbscript: Implemented CCur. --- dlls/vbscript/global.c | 21 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 7c44661..f8c875d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -375,8 +375,25 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) static HRESULT Global_CCur(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_CY); + if(FAILED(hres)) + return hres; + + if(!res) { + VariantClear(&v); + return DISP_E_BADVARTYPE; + } + + *res = v; + return S_OK; } static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index d7af8e9..46c80d4 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -587,4 +587,51 @@ MyObject.myval = 0 Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +Sub testCCurError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CCur(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CCur(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CCur(Empty) = 0, "CCur(Empty) = " & CCur(Empty)) +Call ok(getVT(CCur(Empty)) = "VT_CY", "getVT(CCur(Empty)) = " & getVT(CCur(Empty))) +Call ok(CCur(-32768) = -32768, "CCur(-32768) = " & CCur(-32768)) +Call ok(getVT(CCur(-32768)) = "VT_CY", "getVT(CCur(-32768)) = " & getVT(CCur(-32768))) +Call ok(CCur(32768) = 32768, "CCur(32768) = " & CCur(32768)) +Call ok(getVT(CCur(32768)) = "VT_CY", "getVT(CCur(32768)) = " & getVT(CCur(32768))) +Call ok(CCur(0.000149) = 0.0001, "CCur(0.000149) = " & CCur(0.000149)) +Call ok(getVT(CCur(0.000149)) = "VT_CY", "getVT(CCur(0.000149)) = " & getVT(CCur(0.000149))) +Call ok(CCur(2147483647.99) = 2147483647.99, "CCur(2147483647.99) = " & CCur(2147483647.99)) +Call ok(getVT(CCur(2147483647.99)) = "VT_CY", "getVT(CCur(2147483647.99)) = " & getVT(CCur(2147483647.99))) +Call ok(CCur("-1") = -1, "CCur(""-1"") = " & CCur("-1")) +Call ok(getVT(CCur("-1")) = "VT_CY", "getVT(CCur(""-1"")) = " & getVT(CCur("-1"))) +If isEnglishLang Then + Call ok(CCur("-0.5") = -0.5, "CCur(""-0.5"") = " & CCur("-0.5")) + Call ok(getVT(CCur("-0.5")) = "VT_CY", "getVT(CCur(""-0.5"")) = " & getVT(CCur("-0.5"))) +End If +Call testCCurError("", 13, 13) +Call testCCurError("-1", 0, 458) +Call testCCurError("TRUE", 13, 13) +Call testCCurError("FALSE", 13, 13) +Call testCCurError("#TRue#", 13, 13) +Call testCCurError("#fAlSE#", 13, 13) +Call testCCurError(1, 0, 458) +Call ok(CCur(True) = -1, "CCur(True) = " & CCur(True)) +Call ok(getVT(CCur(True)) = "VT_CY", "getVT(CCur(True)) = " & getVT(CCur(True))) +Call ok(CCur(False) = 0, "CCur(False) = " & CCur(False)) +Call ok(getVT(CCur(False)) = "VT_CY", "getVT(CCur(False)) = " & getVT(CCur(False))) +MyObject.myval = 0.1 +Call ok(CCur(MyObject) = 0.1, "CCur(MyObject) = " & CCur(MyObject)) +Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +MyObject.myval = 0 +Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) +Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9620398..0188c12 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -169,6 +169,8 @@ static const char *vt2a(VARIANT *v) return "VT_I4"; case VT_R8: return "VT_R8"; + case VT_CY: + return "VT_CY"; case VT_DATE: return "VT_DATE"; case VT_BSTR:

1 0

Nikolay Sivov : scrrun: Return float type size when signed I4 limit exceeded.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: f82cb7003338f4614582d429fc68cc1a2ad87bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82cb7003338f4614582d429f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 15:17:24 2014 +0400 scrrun: Return float type size when signed I4 limit exceeded. --- dlls/scrrun/filesystem.c | 2 +- dlls/scrrun/tests/filesystem.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 9412491..6473210 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -892,7 +892,7 @@ static HRESULT variant_from_largeint(const ULARGE_INTEGER *src, VARIANT *v) { HRESULT hr = S_OK; - if (src->HighPart) + if (src->HighPart || src->LowPart > INT_MAX) { V_VT(v) = VT_R8; hr = VarR8FromUI8(src->QuadPart, &V_R8(v)); diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 61cadb9..c06b43d 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <stdio.h> +#include <limits.h> #include "windows.h" #include "ole2.h" @@ -1296,7 +1297,7 @@ static void test_DriveCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); if (V_VT(&size) == VT_R8) - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_R8(&size) > (double)INT_MAX, "got %f\n", V_R8(&size)); else ok(V_I4(&size) > 0, "got %d\n", V_I4(&size));

1 0

Nikolay Sivov : xmllite/writer: Implement ByteOrderMark property.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 086a1e370906b5cbb5df59edf96019bacd602ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=086a1e370906b5cbb5df59edf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 01:37:14 2014 +0400 xmllite/writer: Implement ByteOrderMark property. --- dlls/xmllite/tests/writer.c | 73 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 28 +++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index d617c43..6800cd2 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -405,6 +405,78 @@ static void test_omitxmldeclaration(void) IXmlWriter_Release(writer); } +static void test_bom(void) +{ + static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; + static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; + IXmlWriterOutput *output; + unsigned char *ptr; + IXmlWriter *writer; + IStream *stream; + HGLOBAL hglobal; + HRESULT hr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* BOM is on by default */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); + GlobalUnlock(hglobal); + + IStream_Release(stream); + IUnknown_Release(output); + + /* start with PI */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); + GlobalUnlock(hglobal); + + IUnknown_Release(output); + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { if (!init_pointers()) @@ -415,4 +487,5 @@ START_TEST(writer) test_writestartdocument(); test_flush(); test_omitxmldeclaration(); + test_bom(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index d1834b8..a1f409c 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -78,6 +78,7 @@ typedef struct _xmlwriter BOOL omitxmldecl; XmlConformanceLevel conformance; XmlWriterState state; + BOOL bomwritten; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -272,6 +273,26 @@ static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) return S_OK; } +static HRESULT write_encoding_bom(xmlwriter *writer) +{ + if (!writer->bom || writer->bomwritten) return S_OK; + + if (writer->output->encoding == XmlEncoding_UTF16) { + static const char utf16bom[] = {0xff, 0xfe}; + struct output_buffer *buffer = &writer->output->buffer; + int len = sizeof(utf16bom); + HRESULT hr; + + hr = grow_output_buffer(writer->output, len); + if (FAILED(hr)) return hr; + memcpy(buffer->data + buffer->written, utf16bom, len); + buffer->written += len; + } + + writer->bomwritten = TRUE; + return S_OK; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -329,6 +350,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; + This->bomwritten = FALSE; } /* just reset current output */ @@ -400,6 +422,9 @@ static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT property, LO switch (property) { + case XmlWriterProperty_ByteOrderMark: + This->bom = !!value; + break; case XmlWriterProperty_OmitXmlDeclaration: This->omitxmldecl = !!value; break; @@ -574,6 +599,7 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP if (This->state == XmlWriterState_DocStarted && !strcmpW(name, xmlW)) return WR_E_INVALIDACTION; + write_encoding_bom(This); write_output_buffer(This->output, openpiW, sizeof(openpiW)/sizeof(WCHAR)); write_output_buffer(This->output, name, -1); write_output_buffer(This->output, spaceW, 1); @@ -635,6 +661,7 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal ; } + write_encoding_bom(This); This->state = XmlWriterState_DocStarted; if (This->omitxmldecl) return S_OK; @@ -833,6 +860,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->omitxmldecl = FALSE; writer->conformance = XmlConformanceLevel_Document; writer->state = XmlWriterState_Initial; + writer->bomwritten = FALSE; *obj = &writer->IXmlWriter_iface;

1 0

Nikolay Sivov : xmllite/writer: Implement OmitXmlDeclaration property.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 9a2177ff538977d046fd998de03f1188b8669145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2177ff538977d046fd998de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 00:27:16 2014 +0400 xmllite/writer: Implement OmitXmlDeclaration property. --- dlls/xmllite/tests/writer.c | 94 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 20 +++++++-- 2 files changed, 110 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index d7cfe44..d617c43 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -312,6 +312,99 @@ static void test_flush(void) ok(g_write_len == 0, "got %d\n", g_write_len); } +static void test_omitxmldeclaration(void) +{ + static const char prologversion[] = "<?xml version=\"1.0\"?>"; + static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; + IXmlWriter *writer; + HGLOBAL hglobal; + IStream *stream; + HRESULT hr; + char *ptr; + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!ptr, "got %p\n", ptr); + GlobalUnlock(hglobal); + + /* one more time */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + IStream_Release(stream); + + /* now add PI manually, and try to start a document */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + /* another attempt to add 'xml' PI */ + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IStream_Release(stream); + IXmlWriter_Release(writer); +} + START_TEST(writer) { if (!init_pointers()) @@ -321,4 +414,5 @@ START_TEST(writer) test_writeroutput(); test_writestartdocument(); test_flush(); + test_omitxmldeclaration(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index de5f755..d1834b8 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -392,13 +392,23 @@ static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT property, LO return S_OK; } -static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR pValue) +static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT property, LONG_PTR value) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p %u %lu\n", This, nProperty, pValue); + TRACE("(%p)->(%s %lu)\n", This, debugstr_writer_prop(property), value); - return E_NOTIMPL; + switch (property) + { + case XmlWriterProperty_OmitXmlDeclaration: + This->omitxmldecl = !!value; + break; + default: + FIXME("Unimplemented property (%u)\n", property); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteAttributes(IXmlWriter *iface, IXmlReader *pReader, @@ -625,6 +635,9 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal ; } + This->state = XmlWriterState_DocStarted; + if (This->omitxmldecl) return S_OK; + /* version */ write_output_buffer(This->output, versionW, sizeof(versionW)/sizeof(WCHAR)); @@ -647,7 +660,6 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal write_output_buffer(This->output, noW, sizeof(noW)/sizeof(WCHAR)); } - This->state = XmlWriterState_DocStarted; return S_OK; }

1 0

← Newer
1
2
3
4
5
6
7
...
41
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 May 2014