wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Austin English : evr: Add stub dll.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: 63c087f1c36ab33fd1fea505f54e996d7305da53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c087f1c36ab33fd1fea505f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 4 00:32:04 2015 -0600 evr: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/evr/Makefile.in | 4 ++++ dlls/evr/evr.spec | 28 ++++++++++++++++++++++++++++ dlls/evr/main.c | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+) diff --git a/configure b/configure index ae5e327..acee984 100755 --- a/configure +++ b/configure @@ -1044,6 +1044,7 @@ enable_dwrite enable_dxdiagn enable_dxgi enable_dxva2 +enable_evr enable_explorerframe enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_faultrep @@ -17226,6 +17227,7 @@ wine_fn_config_dll dxgi enable_dxgi implib wine_fn_config_test dlls/dxgi/tests dxgi_test wine_fn_config_lib dxguid wine_fn_config_dll dxva2 enable_dxva2 +wine_fn_config_dll evr enable_evr wine_fn_config_dll explorerframe enable_explorerframe clean wine_fn_config_test dlls/explorerframe/tests explorerframe_test wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 diff --git a/configure.ac b/configure.ac index e8c2ae3..3647406 100644 --- a/configure.ac +++ b/configure.ac @@ -2940,6 +2940,7 @@ WINE_CONFIG_DLL(dxgi,,[implib]) WINE_CONFIG_TEST(dlls/dxgi/tests) WINE_CONFIG_LIB(dxguid) WINE_CONFIG_DLL(dxva2) +WINE_CONFIG_DLL(evr) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in new file mode 100644 index 0000000..25cc961 --- /dev/null +++ b/dlls/evr/Makefile.in @@ -0,0 +1,4 @@ +MODULE = evr.dll + +C_SRCS = \ + main.c diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec new file mode 100644 index 0000000..3f609b6 --- /dev/null +++ b/dlls/evr/evr.spec @@ -0,0 +1,28 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub MFConvertColorInfoFromDXVA +@ stub MFConvertColorInfoToDXVA +@ stub MFConvertFromFP16Array +@ stub MFConvertToFP16Array +@ stub MFCopyImage +@ stub MFCreateDXSurfaceBuffer +@ stub MFCreateVideoMediaType +@ stub MFCreateVideoMediaTypeFromBitMapInfoHeader +@ stub MFCreateVideoMediaTypeFromSubtype +@ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 +@ stub MFCreateVideoMediaTypeFromVideoInfoHeader +@ stub MFCreateVideoMixer +@ stub MFCreateVideoMixerAndPresenter +@ stub MFCreateVideoOTA +@ stub MFCreateVideoPresenter2 +@ stub MFCreateVideoPresenter +@ stub MFCreateVideoSampleAllocator +@ stub MFCreateVideoSampleFromSurface +@ stub MFGetPlaneSize +@ stub MFGetStrideForBitmapInfoHeader +@ stub MFGetUncompressedVideoFormat +@ stub MFInitVideoFormat +@ stub MFInitVideoFormat_RGB +@ stub MFIsFormatYUV diff --git a/dlls/evr/main.c b/dlls/evr/main.c new file mode 100644 index 0000000..1b223ad --- /dev/null +++ b/dlls/evr/main.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Austin English + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Austin English : msi: Add stubs for MsiEnumClientsExA/W.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: f8089da4b3c3715530b4dd2662a433bc17ab0267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8089da4b3c3715530b4dd266… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 3 22:56:29 2015 -0600 msi: Add stubs for MsiEnumClientsExA/W. --- dlls/msi/msi.spec | 4 ++-- dlls/msi/registry.c | 18 ++++++++++++++++++ include/msi.h | 4 ++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 4438721..0ea9a27 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -284,8 +284,8 @@ 288 stub MsiSetOfflineContextW 289 stdcall MsiEnumComponentsExA(str long long ptr ptr ptr ptr) 290 stdcall MsiEnumComponentsExW(wstr long long ptr ptr ptr ptr) -291 stub MsiEnumClientsExA -292 stub MsiEnumClientsExW +291 stdcall MsiEnumClientsExA(str str long long ptr ptr ptr ptr) +292 stdcall MsiEnumClientsExW(wstr wstr long long ptr ptr ptr ptr) 293 stub MsiGetComponentPathExA 294 stub MsiGetComponentPathExW 295 stub QueryInstanceCount diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 4dde285..3dc989f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1503,6 +1503,24 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) return r; } +UINT WINAPI MsiEnumClientsExA(LPCSTR component, LPCSTR usersid, DWORD ctx, DWORD index, + CHAR installed_product[GUID_SIZE], + MSIINSTALLCONTEXT *installed_ctx, LPSTR sid, LPDWORD sid_len) +{ + FIXME("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_a(component), debugstr_a(usersid), + ctx, index, installed_product, installed_ctx, sid, sid_len); + return ERROR_ACCESS_DENIED; +} + +UINT WINAPI MsiEnumClientsExW(LPCWSTR component, LPCWSTR usersid, DWORD ctx, DWORD index, + WCHAR installed_product[GUID_SIZE], + MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len) +{ + FIXME("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_w(component), debugstr_w(usersid), + ctx, index, installed_product, installed_ctx, sid, sid_len); + return ERROR_ACCESS_DENIED; +} + static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, awstring *lpQualBuf, LPDWORD pcchQual, awstring *lpAppBuf, LPDWORD pcchAppBuf ) diff --git a/include/msi.h b/include/msi.h index 033ed90..16189b0 100644 --- a/include/msi.h +++ b/include/msi.h @@ -463,6 +463,10 @@ UINT WINAPI MsiEnumClientsA(LPCSTR, DWORD, LPSTR); UINT WINAPI MsiEnumClientsW(LPCWSTR, DWORD, LPWSTR); #define MsiEnumClients WINELIB_NAME_AW(MsiEnumClients) +UINT WINAPI MsiEnumClientsExA(LPCSTR, LPCSTR, DWORD, DWORD, CHAR*, MSIINSTALLCONTEXT*, LPSTR, LPDWORD); +UINT WINAPI MsiEnumClientsExW(LPCWSTR, LPCWSTR, DWORD, DWORD, WCHAR*, MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); +#define MsiEnumClientsEx WINELIB_NAME_AW(MsiEnumClientsEx) + UINT WINAPI MsiOpenPackageA(LPCSTR, MSIHANDLE*); UINT WINAPI MsiOpenPackageW(LPCWSTR, MSIHANDLE*); #define MsiOpenPackage WINELIB_NAME_AW(MsiOpenPackage)

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: d2d2d6080079f5ab7bde6084e3e8667f21ae2a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d2d6080079f5ab7bde6084e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 3 21:54:24 2015 +0300 po: Update Russian translation. --- po/ru.po | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/po/ru.po b/po/ru.po index e5557fc..f785eab 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13092,20 +13092,16 @@ msgid "&Test Sound" msgstr "&Проверить звук" #: winecfg.rc:275 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Настройка Wine" +msgstr "Конфигурация каналов" #: winecfg.rc:276 -#, fuzzy -#| msgid "De&vice:" msgid "Device:" -msgstr "У&стройство:" +msgstr "Устройство:" #: winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "Каналы:" #: winecfg.rc:286 msgid "Appearance" @@ -13201,7 +13197,7 @@ msgstr "Выбранный драйвер: %s" #: winecfg.rc:85 msgid "(None)" -msgstr "(Нет)" +msgstr "(нет)" #: winecfg.rc:86 msgid "Audio test failed!" @@ -13209,25 +13205,23 @@ msgstr "Сбой при тесте звуковой системы!" #: winecfg.rc:88 msgid "(System default)" -msgstr "(По умолчанию)" +msgstr "(по умолчанию)" #: winecfg.rc:89 msgid "5.1 Surround" -msgstr "" +msgstr "Объёмное звучание 5.1" #: winecfg.rc:90 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "изображение" +msgstr "Квадрофония" #: winecfg.rc:91 msgid "Stereo" -msgstr "" +msgstr "Стерео" #: winecfg.rc:92 msgid "Mono" -msgstr "" +msgstr "Моно" #: winecfg.rc:54 msgid ""

1 0

Mark Harmstone : winecfg: Fix bug causing 5.1 speakers to appear as stereo.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: d3d4739513cca8f823cbf10e0bada4ca88fb47ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d4739513cca8f823cbf10e0… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 3 18:40:02 2015 +0000 winecfg: Fix bug causing 5.1 speakers to appear as stereo. --- programs/winecfg/audio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index ca674f4..6446a67 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -122,7 +122,7 @@ static BOOL load_device(IMMDevice *dev, struct DeviceInfo *info) hr = IPropertyStore_GetValue(ps, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); - info->speaker_config = 0; + info->speaker_config = -1; if(SUCCEEDED(hr) && pv.vt == VT_UI4){ i = 0; while (speaker_configs[i].text_id != 0) { @@ -135,7 +135,7 @@ static BOOL load_device(IMMDevice *dev, struct DeviceInfo *info) } /* fallback to stereo */ - if(info->speaker_config == 0) + if(info->speaker_config == -1) info->speaker_config = 2; IPropertyStore_Release(ps);

1 0

Jacek Caban : jscript: Added support for VT_UI4 variants.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: b0632af980a431034f8fe8757d6439bb0f9d30dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0632af980a431034f8fe8757… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 3 19:37:07 2015 +0100 jscript: Added support for VT_UI4 variants. --- dlls/jscript/jsutils.c | 3 +++ dlls/jscript/tests/run.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a44168d..20e659c 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -288,6 +288,9 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) case VT_INT: *r = jsval_number(V_INT(var)); return S_OK; + case VT_UI4: + *r = jsval_number(V_UI4(var)); + return S_OK; case VT_UNKNOWN: if(V_UNKNOWN(var)) { IDispatch *disp; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 1b895bb..2044789 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1211,7 +1211,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[4]; + VARIANT args[5]; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1247,6 +1247,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_UNKNOWN(args+2) = (IUnknown*)&testObj; V_VT(args+3) = VT_UNKNOWN; V_UNKNOWN(args+3) = NULL; + V_VT(args+4) = VT_UI4; + V_UI4(args+4) = 0xffffffff; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); ok(hres == S_OK, "Invoke failed: %08x\n", hres); @@ -2410,12 +2412,14 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(nullunk,d,i,s) {" + parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(ui4,nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" " ok(getVT(nullunk) === 'VT_DISPATCH', 'getVT(nullunk) = ' + getVT(nullunk));" " ok(nullunk === null, 'nullunk !== null');" + " ok(getVT(ui4) === 'VT_R8', 'getVT(s) = ' + getVT(s));" + " ok(ui4 > 0, 'ui4 = ' + ui4);" "});"); CHECK_CALLED(global_testargtypes_i);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: 8d764d5cf1de26874a13c809bc7da5278c1037b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d764d5cf1de26874a13c809b… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Feb 3 19:02:31 2015 +0200 po: Update Lithuanian translation. --- po/lt.po | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/po/lt.po b/po/lt.po index 98c790c..d1c03fe 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-10-04 10:00+0300\n" +"PO-Revision-Date: 2015-02-03 19:00+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -13098,20 +13098,16 @@ msgid "&Test Sound" msgstr "&Testuoti garsą" #: winecfg.rc:275 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "„Wine“ konfigūravimas" +msgstr "Garsiakalbių konfigūravimas" #: winecfg.rc:276 -#, fuzzy -#| msgid "De&vice:" msgid "Device:" -msgstr "Įtai&sas:" +msgstr "Įtaisas:" #: winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "Garsiakalbiai:" #: winecfg.rc:286 msgid "Appearance" @@ -13219,21 +13215,19 @@ msgstr "(Sistemos numatytasis)" #: winecfg.rc:89 msgid "5.1 Surround" -msgstr "" +msgstr "Erdvinis 5.1" #: winecfg.rc:90 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "grafika" +msgstr "Kvadrofoninis" #: winecfg.rc:91 msgid "Stereo" -msgstr "" +msgstr "Stereofoninis" #: winecfg.rc:92 msgid "Mono" -msgstr "" +msgstr "Monofoninis" #: winecfg.rc:54 msgid ""

1 0

Jacek Caban : mshtml: Added IHTMLDocument2:: ondblclick property implementation.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: 7a89732f738d99df2797be57bcc4f9c46749b3ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a89732f738d99df2797be57b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 3 16:19:55 2015 +0100 mshtml: Added IHTMLDocument2::ondblclick property implementation. --- dlls/mshtml/htmldoc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 907e2bd..79dc5c1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1320,15 +1320,19 @@ static HRESULT WINAPI HTMLDocument_get_onclick(IHTMLDocument2 *iface, VARIANT *p static HRESULT WINAPI HTMLDocument_put_ondblclick(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_DBLCLICK, &v); } static HRESULT WINAPI HTMLDocument_get_ondblclick(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_DBLCLICK, p); } static HRESULT WINAPI HTMLDocument_put_onkeyup(IHTMLDocument2 *iface, VARIANT v)

1 0

Nikolay Sivov : dwrite: Implement GetCaretMetrics().
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 8f9bca910362460716ceecccf6eaa1637135417a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9bca910362460716ceecccf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 3 13:27:24 2015 +0300 dwrite: Implement GetCaretMetrics(). --- dlls/dwrite/dwrite_private.h | 5 +- dlls/dwrite/font.c | 46 ++++++------------ dlls/dwrite/opentype.c | 31 ++++++++++-- dlls/dwrite/tests/font.c | 113 ++++++++++++++++++++++++++++++++++++------- 4 files changed, 139 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f9bca910362460716cee…

1 0

Nikolay Sivov : dwrite: Forward GetGdiCompatibleMetrics() to newer call.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: fbeb8295842669c865000bf0953687b77f56a401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbeb8295842669c865000bf09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 3 11:20:06 2015 +0300 dwrite: Forward GetGdiCompatibleMetrics() to newer call. --- dlls/dwrite/font.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d0c109d..c949687 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -556,8 +556,17 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleMetrics(IDWriteFontFace2 *i DWRITE_MATRIX const *transform, DWRITE_FONT_METRICS *metrics) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%f %f %p %p): stub\n", This, emSize, pixels_per_dip, transform, metrics); - return E_NOTIMPL; + DWRITE_FONT_METRICS1 metrics1; + HRESULT hr; + + TRACE("(%p)->(%.2f %.2f %p %p)\n", This, emSize, pixels_per_dip, transform, metrics); + + hr = IDWriteFontFace2_GetGdiCompatibleMetrics(iface, emSize, pixels_per_dip, transform, &metrics1); + if (FAILED(hr)) + return hr; + + memcpy(metrics, &metrics1, sizeof(*metrics)); + return hr; } static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFace2 *iface, FLOAT emSize, FLOAT pixels_per_dip,

1 0

Nikolay Sivov : kernel32/tests: Remove a couple of duplicated constants.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: d1243bcc85a154459f79421be4f5db3788b03e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1243bcc85a154459f79421be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 2 19:14:56 2015 +0300 kernel32/tests: Remove a couple of duplicated constants. --- dlls/kernel32/tests/loader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 3a15087..4922035 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1035,8 +1035,6 @@ static void test_section_access(void) { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE } }; - static const char filler[0x1000]; - static const char section_data[0x10] = "section data"; char buf[256]; int i; DWORD dummy, file_align;

1 0

← Newer
1
...
35
36
37
38
39
40
41
42
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 February 2015