Hans Leidekker : webservices: Implement WsDateTimeToFileTime.

Alexandre Julliard julliard at wine.codeweavers.com
Mon May 2 09:52:30 CDT 2016


Module: wine
Branch: master
Commit: 2bcff80cda3eb95f2037db32cc5e03883310de89
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2bcff80cda3eb95f2037db32cc5e03883310de89

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Fri Apr 29 20:21:52 2016 +0200

webservices: Implement WsDateTimeToFileTime.

Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/webservices/reader.c         | 21 +++++++++++++++++
 dlls/webservices/tests/reader.c   | 48 +++++++++++++++++++++++++++++++++++++++
 dlls/webservices/webservices.spec |  2 +-
 3 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c
index d4d4dcc..454f4e9 100644
--- a/dlls/webservices/reader.c
+++ b/dlls/webservices/reader.c
@@ -2023,6 +2023,27 @@ static HRESULT str_to_datetime( const unsigned char *bytes, ULONG len, WS_DATETI
     return S_OK;
 }
 
+#define TICKS_1601_01_01    504911232000000000
+
+/**************************************************************************
+ *          WsDateTimeToFileTime               [webservices.@]
+ */
+HRESULT WINAPI WsDateTimeToFileTime( const WS_DATETIME *dt, FILETIME *ft, WS_ERROR *error )
+{
+    unsigned __int64 ticks;
+
+    TRACE( "%p %p %p\n", dt, ft, error );
+    if (error) FIXME( "ignoring error parameter\n" );
+
+    if (!dt || !ft) return E_INVALIDARG;
+
+    if (dt->ticks < TICKS_1601_01_01) return WS_E_INVALID_FORMAT;
+    ticks = dt->ticks - TICKS_1601_01_01;
+    ft->dwHighDateTime = ticks >> 32;
+    ft->dwLowDateTime  = (DWORD)ticks;
+    return S_OK;
+}
+
 static HRESULT read_get_node_text( struct reader *reader, WS_XML_UTF8_TEXT **ret )
 {
     WS_XML_TEXT_NODE *text;
diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c
index ced8a0f..ac25084 100644
--- a/dlls/webservices/tests/reader.c
+++ b/dlls/webservices/tests/reader.c
@@ -3009,6 +3009,53 @@ static void test_datetime(void)
     WsFreeHeap( heap );
 }
 
+static void test_WsDateTimeToFileTime(void)
+{
+    static const struct
+    {
+        WS_DATETIME dt;
+        HRESULT     hr;
+        FILETIME    ft;
+    }
+    tests[] =
+    {
+        { {0, WS_DATETIME_FORMAT_UTC}, WS_E_INVALID_FORMAT, {0, 0} },
+        { {0x701ce172276ffff, WS_DATETIME_FORMAT_UTC}, WS_E_INVALID_FORMAT, {0, 0} },
+        { {0x701ce1722770000, WS_DATETIME_FORMAT_UTC}, S_OK, {0, 0} },
+        { {0x2bca2875f4373fff, WS_DATETIME_FORMAT_UTC}, S_OK, {0xd1c03fff, 0x24c85a5e} },
+        { {0x2bca2875f4374000, WS_DATETIME_FORMAT_UTC}, S_OK, {0xd1c04000, 0x24c85a5e} },
+        { {0x2bca2875f4374000, WS_DATETIME_FORMAT_LOCAL}, S_OK, {0xd1c04000, 0x24c85a5e} },
+        { {~0, WS_DATETIME_FORMAT_UTC}, S_OK, {0xdd88ffff, 0xf8fe31e8} },
+    };
+    WS_DATETIME dt;
+    FILETIME ft;
+    HRESULT hr;
+    ULONG i;
+
+    hr = WsDateTimeToFileTime( NULL, NULL, NULL );
+    ok( hr == E_INVALIDARG, "got %08x\n", hr );
+
+    dt.ticks  = 0x701ce172277000;
+    dt.format = WS_DATETIME_FORMAT_UTC;
+    hr = WsDateTimeToFileTime( &dt, NULL, NULL );
+    ok( hr == E_INVALIDARG, "got %08x\n", hr );
+
+    hr = WsDateTimeToFileTime( NULL, &ft, NULL );
+    ok( hr == E_INVALIDARG, "got %08x\n", hr );
+
+    for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)
+    {
+        memset( &ft, 0, sizeof(ft) );
+        hr = WsDateTimeToFileTime( &tests[i].dt, &ft, NULL );
+        ok( hr == tests[i].hr, "%u: got %08x\n", i, hr );
+        if (hr == S_OK)
+        {
+            ok( ft.dwLowDateTime == tests[i].ft.dwLowDateTime, "%u: got %08x\n", i, ft.dwLowDateTime );
+            ok( ft.dwHighDateTime == tests[i].ft.dwHighDateTime, "%u: got %08x\n", i, ft.dwHighDateTime );
+        }
+    }
+}
+
 START_TEST(reader)
 {
     test_WsCreateError();
@@ -3035,4 +3082,5 @@ START_TEST(reader)
     test_repeating_element();
     test_WsResetHeap();
     test_datetime();
+    test_WsDateTimeToFileTime();
 }
diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec
index 3c38864..da8adbe 100644
--- a/dlls/webservices/webservices.spec
+++ b/dlls/webservices/webservices.spec
@@ -37,7 +37,7 @@
 @ stdcall WsCreateWriter(ptr long ptr ptr)
 @ stdcall WsCreateXmlBuffer(ptr ptr long ptr ptr)
 @ stub WsCreateXmlSecurityToken
-@ stub WsDateTimeToFileTime
+@ stdcall WsDateTimeToFileTime(ptr ptr ptr)
 @ stub WsDecodeUrl
 @ stub WsEncodeUrl
 @ stub WsEndReaderCanonicalization




More information about the wine-cvs mailing list