December 2012 - Wine-Commits

Alexandre Julliard : gdi32: Avoid duplicate computation of text extents in ExtTextOut.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 57f84bc7bb108c7ef3e0d533db7141c7ce18e297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f84bc7bb108c7ef3e0d533d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 15:08:23 2012 +0100 gdi32: Avoid duplicate computation of text extents in ExtTextOut. --- dlls/gdi32/font.c | 43 +++++++++---------------------------------- 1 files changed, 9 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 51a6c23..fe32167 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2097,7 +2097,6 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, INT char_extra; SIZE sz; RECT rc; - BOOL done_extents = FALSE; POINT *deltas = NULL, width = {0, 0}; DWORD type; DC * dc = get_dc_ptr( hdc ); @@ -2125,9 +2124,6 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, return ret; } - if (!lprect) - flags &= ~ETO_CLIPPED; - if (flags & ETO_RTLREADING) align |= TA_RTLREADING; if (layout & LAYOUT_RTL) { @@ -2189,32 +2185,15 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, sinEsc = 0; } - if(flags & (ETO_CLIPPED | ETO_OPAQUE)) + if (lprect) { - if(!lprect) - { - if(flags & ETO_GLYPH_INDEX) - GetTextExtentPointI(hdc, glyphs, count, &sz); - else - GetTextExtentPointW(hdc, reordered_str, count, &sz); - - done_extents = TRUE; - rc.left = x; - rc.top = y; - rc.right = x + sz.cx; - rc.bottom = y + sz.cy; - } - else - { - rc = *lprect; - } - + rc = *lprect; LPtoDP(hdc, (POINT*)&rc, 2); order_rect( &rc ); + if (flags & ETO_OPAQUE) + physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL ); } - - if (lprect && (flags & ETO_OPAQUE)) - physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL ); + else flags &= ~ETO_CLIPPED; if(count == 0) { @@ -2306,14 +2285,10 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, { POINT desired[2]; - if(!done_extents) - { - if(flags & ETO_GLYPH_INDEX) - GetTextExtentPointI(hdc, glyphs, count, &sz); - else - GetTextExtentPointW(hdc, reordered_str, count, &sz); - done_extents = TRUE; - } + if(flags & ETO_GLYPH_INDEX) + GetTextExtentPointI(hdc, glyphs, count, &sz); + else + GetTextExtentPointW(hdc, reordered_str, count, &sz); desired[0].x = desired[0].y = 0; desired[1].x = sz.cx; desired[1].y = 0;

1 0

Detlef Riekenberg : api-ms-win-downlevel-version-l1-1-0: Add dll.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: f8c041fef40b573b8f3ebfb33afa0870d37e6e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c041fef40b573b8f3ebfb33… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:49:58 2012 +0100 api-ms-win-downlevel-version-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 +++ .../api-ms-win-downlevel-version-l1-1-0.spec | 6 ++++++ tools/make_specfiles | 4 ++++ 5 files changed, 15 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f852ed9..595ea7d 100755 --- a/configure +++ b/configure @@ -15352,6 +15352,7 @@ wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po diff --git a/configure.ac b/configure.ac index e05dfe1..6e99a46 100644 --- a/configure.ac +++ b/configure.ac @@ -2531,6 +2531,7 @@ WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[po]) diff --git a/dlls/api-ms-win-downlevel-version-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-version-l1-1-0/Makefile.in new file mode 100644 index 0000000..44b316b --- /dev/null +++ b/dlls/api-ms-win-downlevel-version-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-version-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec new file mode 100644 index 0000000..e99d8a0 --- /dev/null +++ b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec @@ -0,0 +1,6 @@ +@ stub GetFileVersionInfoExW +@ stub GetFileVersionInfoSizeExW +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA +@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW +@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA +@ stdcall VerQueryValueW(ptr wstr ptr ptr) version.VerQueryValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index e582810..b5937be 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -124,6 +124,10 @@ my @dll_groups = "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", ], + [ + "version", + "api-ms-win-downlevel-version-l1-1-0", + ], ); my $update_flags = 0;

1 0

Austin English : widl: write_array_element_type shouldn't return a value.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 554a2ccb117817c869ab5643aa5de67b09c3d165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=554a2ccb117817c869ab5643a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 19 14:55:46 2012 -0600 widl: write_array_element_type shouldn't return a value. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 280bd05..cab4276 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2343,7 +2343,7 @@ static void write_array_element_type(FILE *file, const type_t *type, return; } } - return write_member_type(file, type, cont_is_complex, NULL, elem, NULL, tfsoff); + write_member_type(file, type, cont_is_complex, NULL, elem, NULL, tfsoff); } static void write_end(FILE *file, unsigned int *tfsoff)

1 0

André Hentschel : msvcrt/tests: Don' t test function directly when reporting errno.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 61a12130788569e91913808d58d5e5b32ae83add URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a12130788569e91913808d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 19 20:33:23 2012 +0100 msvcrt/tests: Don't test function directly when reporting errno. --- dlls/msvcrt/tests/data.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index 0723093..cdd65a7 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -197,12 +197,14 @@ static void test___getmainargs_parent(char *name) STARTUPINFO startup; PROCESS_INFORMATION proc; FILE *f; + int ret; ok(GetTempPathA(MAX_PATH, tmppath) != 0, "GetTempPath failed\n"); sprintf(cmdline, "%s data %s*\\* %swine_test/*", name, tmppath, tmppath); sprintf(filepath, "%swine_test", tmppath); - ok(!_mkdir(filepath), "_mkdir failed: %d\n", errno); + ret = _mkdir(filepath); + ok(!ret, "_mkdir failed: %d\n", errno); sprintf(filepath, "%swine_test\\a", tmppath); f = fopen(filepath, "w"); ok(f != NULL, "fopen(%s) failed: %d\n", filepath, errno);

1 0

Detlef Riekenberg : api-ms-win-downlevel-shlwapi-l1-1-0: Add dll.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 8ca7a068f4982a8c261604a8c4f7d1c3acbd8edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca7a068f4982a8c261604a8c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 17 11:37:46 2012 +0100 api-ms-win-downlevel-shlwapi-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 155 ++++++++++++++++++++ tools/make_specfiles | 4 + 5 files changed, 164 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ca7a068f4982a8c26160…

1 0

Jacek Caban : atl80: Updated spec file.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: f28324a69c1ec3eaa81609d0138060150dad648d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28324a69c1ec3eaa81609d01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 19 14:17:16 2012 +0100 atl80: Updated spec file. --- dlls/atl80/atl80.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 1c940dd..c6e589e 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -29,7 +29,7 @@ 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl 42 stdcall AtlAxWinInit() atl100.AtlAxWinInit 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData -44 stub AtlWinModuleExtractCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl @@ -49,5 +49,5 @@ 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA 64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc -65 stub AtlWinModuleInit +65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit 66 stub AtlWinModuleTerm

1 0

Jacek Caban : atl100: Added AtlWinModuleExtractCreateWndData implementation .
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: c0456aea76bcd8ce77d7c91dfc95a5ff8670e344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0456aea76bcd8ce77d7c91df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 19 14:16:57 2012 +0100 atl100: Added AtlWinModuleExtractCreateWndData implementation. --- dlls/atl100/atl.c | 28 ++++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 1 + 3 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index bd3fbf1..570fe5c 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -319,6 +319,34 @@ void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pM, _AtlCreateWndData } /*********************************************************************** + * AtlWinModuleExtractCreateWndData [atl100.44] + */ +void* WINAPI AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE *winmod) +{ + _AtlCreateWndData *iter, *prev = NULL; + DWORD thread_id; + + TRACE("(%p)\n", winmod); + + thread_id = GetCurrentThreadId(); + + EnterCriticalSection(&winmod->m_csWindowCreate); + + for(iter = winmod->m_pCreateWndList; iter && iter->m_dwThreadID != thread_id; iter = iter->m_pNext) + prev = iter; + if(iter) { + if(prev) + prev->m_pNext = iter->m_pNext; + else + winmod->m_pCreateWndList = iter->m_pNext; + } + + LeaveCriticalSection(&winmod->m_csWindowCreate); + + return iter ? iter->m_pThis : NULL; +} + +/*********************************************************************** * AtlComModuleGetClassObject [atl100.15] */ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, REFIID riid, void **ppv) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 11cac7d..0c27070 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -27,7 +27,7 @@ 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) -44 stub AtlWinModuleExtractCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) diff --git a/include/atlbase.h b/include/atlbase.h index 95b1f2a..831150d 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -223,6 +223,7 @@ HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppS void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE*); void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE*,_AtlCreateWndData*,void*); +void* WINAPI AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE*); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); void WINAPI AtlCallTermFunc(_ATL_MODULE*); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM);

1 0

Jacek Caban : atl100: Added AtlWinModuleExtractCreateWndData tests.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 5f4f215c2d9dd9465b8a96e00e6e9b10ec84a515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4f215c2d9dd9465b8a96e00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 19 14:17:07 2012 +0100 atl100: Added AtlWinModuleExtractCreateWndData tests. --- dlls/atl100/tests/atl.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 43d9bd5..7e6a7e0 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -27,7 +27,9 @@ static void test_winmodule(void) { + _AtlCreateWndData create_data[3]; _ATL_WIN_MODULE winmod; + void *p; HRESULT hres; winmod.cbSize = 0xdeadbeef; @@ -51,6 +53,46 @@ static void test_winmodule(void) winmod.m_rgWindowClassAtoms.m_nSize); ok(winmod.m_rgWindowClassAtoms.m_nAllocSize == 0xdeadbeef, "winmod.m_rgWindowClassAtoms.m_nAllocSize = %d\n", winmod.m_rgWindowClassAtoms.m_nAllocSize); + + InitializeCriticalSection(&winmod.m_csWindowCreate); + + AtlWinModuleAddCreateWndData(&winmod, create_data, (void*)0xdead0001); + ok(winmod.m_pCreateWndList == create_data, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[0].m_pThis == (void*)0xdead0001, "unexpected create_data[0].m_pThis %p\n", create_data[0].m_pThis); + ok(create_data[0].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[0].m_dwThreadID %x\n", + create_data[0].m_dwThreadID); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + + AtlWinModuleAddCreateWndData(&winmod, create_data+1, (void*)0xdead0002); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[1].m_pThis == (void*)0xdead0002, "unexpected create_data[1].m_pThis %p\n", create_data[1].m_pThis); + ok(create_data[1].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[1].m_dwThreadID %x\n", + create_data[1].m_dwThreadID); + ok(create_data[1].m_pNext == create_data, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + AtlWinModuleAddCreateWndData(&winmod, create_data+2, (void*)0xdead0003); + ok(winmod.m_pCreateWndList == create_data+2, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pThis == (void*)0xdead0003, "unexpected create_data[2].m_pThis %p\n", create_data[2].m_pThis); + ok(create_data[2].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[2].m_dwThreadID %x\n", + create_data[2].m_dwThreadID); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + p = AtlWinModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0003, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + create_data[1].m_dwThreadID = 0xdeadbeef; + + p = AtlWinModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0001, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + ok(!create_data[1].m_pNext+1, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + p = AtlWinModuleExtractCreateWndData(&winmod); + ok(!p, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); } START_TEST(atl)

1 0

Detlef Riekenberg : api-ms-win-downlevel-advapi32-l1-1-0: Add dll.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 52a231c5b78e7c49c00c51cf8dbd6f52f6b7af0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a231c5b78e7c49c00c51cf8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 17 11:37:45 2012 +0100 api-ms-win-downlevel-advapi32-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 145 ++++++++++++++++++++ tools/make_specfiles | 4 + 5 files changed, 154 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52a231c5b78e7c49c00c5…

1 0

Jacek Caban : propvarutil.h: Added InitPropVariantFromInt64 declaration and inline implementation.
by Alexandre Julliard Dec. 19, 2012

Dec. 19, 2012

Module: wine Branch: master Commit: 9f781a06dc435bc63be463fdd158098fc0b31fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f781a06dc435bc63be463fdd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 19 12:41:55 2012 +0100 propvarutil.h: Added InitPropVariantFromInt64 declaration and inline implementation. --- include/propvarutil.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/propvarutil.h b/include/propvarutil.h index 4618efe..4791543 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -81,6 +81,7 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT InitPropVariantFromBoolean(BOOL fVal, PROPVARIANT *ppropvar); HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromInt64(LONGLONG llVal, PROPVARIANT *ppropvar); #ifndef NO_PROPVAR_INLINES @@ -104,6 +105,13 @@ inline HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar) return hres; } +inline HRESULT InitPropVariantFromInt64(LONGLONG llVal, PROPVARIANT *ppropvar) +{ + ppropvar->vt = VT_I8; + ppropvar->hVal.QuadPart = llVal; + return S_OK; +} + #endif #endif

1 0