November 2013 - Wine-commits

Qian Hong : arp: Added stub exe.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: 0635c67251663a1362bdfe204471af4f0f95b6f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0635c67251663a1362bdfe204… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sun Nov 24 03:02:55 2013 +0800 arp: Added stub exe. --- configure | 2 ++ configure.ac | 1 + programs/arp/Makefile.in | 7 +++++++ programs/arp/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 84a04b4..5bcf17c 100755 --- a/configure +++ b/configure @@ -1267,6 +1267,7 @@ enable_libs_port enable_libs_wine enable_libs_wpp enable_loader +enable_arp enable_aspnet_regiis enable_attrib enable_cabarc @@ -17339,6 +17340,7 @@ wine_fn_config_makefile libs/port enable_libs_port wine_fn_config_makefile libs/wine enable_libs_wine clean,install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp wine_fn_config_makefile loader enable_loader clean,install-lib,manpage +wine_fn_config_program arp enable_arp install wine_fn_config_program aspnet_regiis enable_aspnet_regiis install wine_fn_config_program attrib enable_attrib install,po wine_fn_config_program cabarc enable_cabarc install diff --git a/configure.ac b/configure.ac index 2c15f52..16fc74f 100644 --- a/configure.ac +++ b/configure.ac @@ -3320,6 +3320,7 @@ WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine],,[clean,install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) WINE_CONFIG_MAKEFILE([loader],,[clean,install-lib,manpage]) +WINE_CONFIG_PROGRAM(arp,,[install]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) WINE_CONFIG_PROGRAM(attrib,,[install,po]) WINE_CONFIG_PROGRAM(cabarc,,[install]) diff --git a/programs/arp/Makefile.in b/programs/arp/Makefile.in new file mode 100644 index 0000000..ab4803d --- /dev/null +++ b/programs/arp/Makefile.in @@ -0,0 +1,7 @@ +MODULE = arp.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/arp/main.c b/programs/arp/main.c new file mode 100644 index 0000000..cfcff46 --- /dev/null +++ b/programs/arp/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2013 Qian Hong for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(arp); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Nikolay Sivov : urlmon/tests: Accept another failure error code.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: d1cda1d4bee42370e31c731bc26198c091198b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1cda1d4bee42370e31c731bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 25 18:16:02 2013 +0400 urlmon/tests: Accept another failure error code. --- dlls/urlmon/tests/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index d4e9663..7ba375b 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -3319,7 +3319,7 @@ static void test_gopher_protocol(void) hres = CoGetClassObject(&CLSID_GopherProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK || - hres == REGDB_E_CLASSNOTREG, /* Gopher protocol has been removed as of Vista */ + broken(hres == REGDB_E_CLASSNOTREG || hres == CLASS_E_CLASSNOTAVAILABLE), /* Gopher protocol has been removed as of Vista */ "CoGetClassObject failed: %08x\n", hres); if(FAILED(hres)) return;

1 0

Jacek Caban : mshtml/tests: Ignore QI(&IID_IWebBrowserPriv2IE8XP) calls.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: b1367f8a2cef654a87bb5af8f4c6fb5bb55859e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1367f8a2cef654a87bb5af8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 25 16:21:55 2013 +0100 mshtml/tests: Ignore QI(&IID_IWebBrowserPriv2IE8XP) calls. --- dlls/mshtml/tests/htmldoc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 1e872f3..c3990bf 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4947,6 +4947,8 @@ static IWebBrowser2 WebBrowser2 = { &WebBrowser2Vtbl }; static HRESULT wb_qi(REFIID riid, void **ppv) { + static const IID IID_IWebBrowserPriv2IE8XP = {0x486f6159,0x9f3f,0x4827,{0x82,0xd4,0x28,0x3c,0xef,0x39,0x77,0x33}}; + *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IWebBrowser, riid) @@ -4973,6 +4975,11 @@ static HRESULT wb_qi(REFIID riid, void **ppv) return S_OK; } + if(IsEqualGUID(riid, &IID_IWebBrowserPriv2IE8XP)) { + trace("QI(IID_IWebBrowserPriv2IE8XP)\n"); + return E_NOINTERFACE; + } + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Piotr Caban : qcap: Add AVI Mux output pin stub.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: 2c945b01e04e3d8b507b938341f53fd5f0a032f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c945b01e04e3d8b507b93834… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 25 16:25:06 2013 +0100 qcap: Add AVI Mux output pin stub. --- dlls/qcap/avimux.c | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 337 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c945b01e04e3d8b507b9…

1 0

Piotr Caban : include: Add IAMStreamControl definition.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: e9cc54268ce7d22b8db7e105dfa4e41bda71c114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9cc54268ce7d22b8db7e105d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 25 16:25:32 2013 +0100 include: Add IAMStreamControl definition. --- include/axextend.idl | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/include/axextend.idl b/include/axextend.idl index 8c7d8dc..207dbce 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -1106,6 +1106,44 @@ interface IResourceManager : IUnknown } +typedef enum AM_STREAM_INFO_FLAGS +{ + AM_STREAM_INFO_START_DEFINED = 0x01, + AM_STREAM_INFO_STOP_DEFINED = 0x02, + AM_STREAM_INFO_DISCARDING = 0x04, + AM_STREAM_INFO_STOP_SEND_EXTRA = 0x10 +} AM_STREAM_INFO_FLAGS; + +typedef struct AM_STREAM_INFO +{ + REFERENCE_TIME tStart; + REFERENCE_TIME tStop; + DWORD dwStartCookie; + DWORD dwStopCookie; + DWORD dwFlags; +} AM_STREAM_INFO; + +[ + local, + object, + uuid(36b73881-c2c8-11cf-8b46-00805f6cef60), + pointer_default(unique) +] +interface IAMStreamControl : IUnknown +{ + HRESULT StartAt( + [in] const REFERENCE_TIME *ptStart, + [in] DWORD dwCookie); + + HRESULT StopAt( + [in] const REFERENCE_TIME *ptStop, + [in] BOOL bSendExtra, + [in] DWORD dwCookie); + + HRESULT GetInfo( + [out] AM_STREAM_INFO *pInfo); +} + cpp_quote("#ifndef _IKsPropertySet_") cpp_quote("#define _IKsPropertySet_") cpp_quote("#define KSPROPERTY_SUPPORT_GET 1")

1 0

Piotr Caban : strmbase: Add structure size parameter in BaseInputPin_Construct function.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: 5c8339df4a8d9cd095827a8f57b65823c3edf58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8339df4a8d9cd095827a8f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 25 16:28:50 2013 +0100 strmbase: Add structure size parameter in BaseInputPin_Construct function. --- dlls/amstream/mediastreamfilter.c | 3 ++- dlls/strmbase/pin.c | 5 +++-- dlls/strmbase/renderer.c | 3 ++- dlls/strmbase/transform.c | 3 ++- include/wine/strmbase.h | 4 +++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 49ee6fe..defabd9 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -367,7 +367,8 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i /* Pin name is "I{guid MSPID_PrimaryVideo or MSPID_PrimaryAudio}" */ info.achName[0] = 'I'; StringFromGUID2(&purpose_id, info.achName + 1, 40); - hr = BaseInputPin_Construct(&MediaStreamFilter_InputPin_Vtbl, &info, &input_BaseFuncTable, &input_BaseInputFuncTable, &This->filter.csFilter, NULL, &This->pins[This->nb_streams]); + hr = BaseInputPin_Construct(&MediaStreamFilter_InputPin_Vtbl, sizeof(BaseInputPin), &info, &input_BaseFuncTable, + &input_BaseInputFuncTable, &This->filter.csFilter, NULL, &This->pins[This->nb_streams]); if (FAILED(hr)) return hr; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 750752e..d99a0bb 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -1237,7 +1237,7 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi return S_OK; } -HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, +HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo, const BasePinFuncTable* pBaseFuncsTable, const BaseInputPinFuncTable* pBaseInputFuncsTable, LPCRITICAL_SECTION pCritSec, IMemAllocator *allocator, IPin ** ppPin) { @@ -1245,6 +1245,7 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * p *ppPin = NULL; + assert(inputpin_size >= sizeof(BaseInputPin)); assert(pBaseFuncsTable->pfnCheckMediaType); if (pPinInfo->dir != PINDIR_INPUT) @@ -1253,7 +1254,7 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * p return E_INVALIDARG; } - pPinImpl = CoTaskMemAlloc(sizeof(*pPinImpl)); + pPinImpl = CoTaskMemAlloc(inputpin_size); if (!pPinImpl) return E_OUTOFMEMORY; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 8bbb1f8..56f72f1 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -253,7 +253,8 @@ HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtb piInput.pFilter = &This->filter.IBaseFilter_iface; lstrcpynW(piInput.achName, wcsInputPinName, sizeof(piInput.achName) / sizeof(piInput.achName[0])); - hr = BaseInputPin_Construct(&BaseRenderer_InputPin_Vtbl, &piInput, &input_BaseFuncTable, &input_BaseInputFuncTable, &This->filter.csFilter, NULL, (IPin **)&This->pInputPin); + hr = BaseInputPin_Construct(&BaseRenderer_InputPin_Vtbl, sizeof(BaseInputPin), &piInput, &input_BaseFuncTable, + &input_BaseInputFuncTable, &This->filter.csFilter, NULL, (IPin **)&This->pInputPin); if (SUCCEEDED(hr)) { diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index df72d99..2290bed 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -225,7 +225,8 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p piOutput.pFilter = &pTransformFilter->filter.IBaseFilter_iface; lstrcpynW(piOutput.achName, wcsOutputPinName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0])); - hr = BaseInputPin_Construct(&TransformFilter_InputPin_Vtbl, &piInput, &tf_input_BaseFuncTable, &tf_input_BaseInputFuncTable, &pTransformFilter->filter.csFilter, NULL, &pTransformFilter->ppPins[0]); + hr = BaseInputPin_Construct(&TransformFilter_InputPin_Vtbl, sizeof(BaseInputPin), &piInput, &tf_input_BaseFuncTable, + &tf_input_BaseInputFuncTable, &pTransformFilter->filter.csFilter, NULL, &pTransformFilter->ppPins[0]); if (SUCCEEDED(hr)) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index ecb53c4..b2046d4 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -145,7 +145,9 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface); HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface); HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); -HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, const BasePinFuncTable* pBaseFuncsTable, const BaseInputPinFuncTable* pBaseInputFuncsTable, LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); +HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo, + const BasePinFuncTable* pBaseFuncsTable, const BaseInputPinFuncTable* pBaseInputFuncsTable, + LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); typedef struct BaseFilter {

1 0

Piotr Caban : qcap: Add AVI Mux input pin stub.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: 85730046ef600023a4406fda75c6b11cd3979f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=85730046ef600023a4406fda7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 25 16:29:04 2013 +0100 qcap: Add AVI Mux input pin stub. --- dlls/qcap/avimux.c | 617 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 610 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85730046ef600023a4406…

1 0

Stefan Dösinger : d3d9/tests: Read the result before swapping in volume_v16u16_test.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: c96092f83130e79561d7ed4a1a26f6d4fab9005d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96092f83130e79561d7ed4a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 24 00:18:56 2013 +0100 d3d9/tests: Read the result before swapping in volume_v16u16_test. --- dlls/d3d9/tests/visual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7f750bb..522ac50 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14759,9 +14759,6 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); - color = getPixelColor(device, 120, 160); ok (color_match(color, 0x000080ff, 2), "Expected color 0x000080ff, got 0x%08x, V16U16 input -32768, 0.\n", color); @@ -14775,6 +14772,9 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) ok (color_match(color, 0x0040c0ff, 2), "Expected color 0x0040c0ff, got 0x%08x, V16U16 input -16384, 16384.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + IDirect3DVolumeTexture9_Release(texture); }

1 0

Stefan Dösinger : d3d8/tests: Read the result before swapping in volume_v16u16_test.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: f65f951cbab91c407dd97f2a7b983f72734f0a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65f951cbab91c407dd97f2a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 24 00:18:57 2013 +0100 d3d8/tests: Read the result before swapping in volume_v16u16_test. --- dlls/d3d8/tests/visual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index d963a73..1913e6e 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4283,9 +4283,6 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); - color = getPixelColor(device, 120, 160); ok (color_match(color, 0x000080ff, 2), "Expected color 0x000080ff, got 0x%08x, V16U16 input -32768, 0.\n", color); @@ -4299,6 +4296,9 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) ok (color_match(color, 0x0040c0ff, 2), "Expected color 0x0040c0ff, got 0x%08x, V16U16 input -16384, 16384.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + IDirect3DVolumeTexture8_Release(texture); }

1 0

Daniel Lehman : msvcrt: Return wall-clock time from clock().
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: 15b35f4d37e4bdd8d2b44b772e800a8ffade7ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b35f4d37e4bdd8d2b44b772… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jul 27 16:42:53 2011 -0700 msvcrt: Return wall-clock time from clock(). --- dlls/msvcrt/tests/time.c | 17 +++++++++++++++++ dlls/msvcrt/time.c | 25 +++++++++++++++---------- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index a3e5c07..71e58ba 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -852,6 +852,22 @@ static void test__tzset(void) _putenv(TZ_env); } +static void test_clock(void) +{ + static const int THRESH = 50; + clock_t s, e; + int i; + + for (i = 0; i < 10; i++) + { + s = clock(); + Sleep(1000); + e = clock(); + + ok(abs((e-s) - 1000) < THRESH, "clock off on loop %i: %i\n", i, e-s); + } +} + START_TEST(time) { init(); @@ -870,4 +886,5 @@ START_TEST(time) test_localtime64_s(); test_daylight(); test_asctime(); + test_clock(); } diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index e227b84..2b5fe8d 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -30,6 +30,7 @@ #include "mtdll.h" #include "winbase.h" #include "winnls.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -709,19 +710,23 @@ int CDECL _wstrtime_s(MSVCRT_wchar_t* time, MSVCRT_size_t size) */ MSVCRT_clock_t CDECL MSVCRT_clock(void) { - FILETIME ftc, fte, ftk, ftu; - ULONGLONG utime, ktime; - - MSVCRT_clock_t clock; + static LONGLONG start_time; + LARGE_INTEGER systime; - GetProcessTimes(GetCurrentProcess(), &ftc, &fte, &ftk, &ftu); + if(!start_time) { + KERNEL_USER_TIMES pti; - ktime = ((ULONGLONG)ftk.dwHighDateTime << 32) | ftk.dwLowDateTime; - utime = ((ULONGLONG)ftu.dwHighDateTime << 32) | ftu.dwLowDateTime; - - clock = (utime + ktime) / (TICKSPERSEC / MSVCRT_CLOCKS_PER_SEC); + /* while Linux's clock returns user time, Windows' clock + * returns wall-clock time from process start. cache the + * process start time since it won't change and to avoid + * wineserver round-trip overhead */ + if(NtQueryInformationProcess(GetCurrentProcess(), ProcessTimes, &pti, sizeof(pti), NULL)) + return -1; + start_time = pti.CreateTime.QuadPart; + } - return clock; + NtQuerySystemTime(&systime); + return (systime.QuadPart - start_time) * MSVCRT_CLOCKS_PER_SEC / TICKSPERSEC; } /*********************************************************************

1 0