wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Nikolay Sivov : prntvpt: Remove export ordinals.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 24fff52c8f32941a62ca0076414b585025062057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fff52c8f32941a62ca00764… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 16:06:18 2015 +0300 prntvpt: Remove export ordinals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/prntvpt.spec | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 2f20d3c..246443e 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,27 +1,27 @@ -1 stdcall PTQuerySchemaVersionSupport(wstr ptr) -2 stub PTOpenProvider -3 stub PTOpenProviderEx -4 stub PTCloseProvider -5 stub BindPTProviderThunk -6 stub PTGetPrintCapabilities -7 stub PTMergeAndValidatePrintTicket -8 stub PTConvertPrintTicketToDevMode -9 stub PTConvertDevModeToPrintTicket -10 stub PTReleaseMemory -11 stub ConvertDevModeToPrintTicketThunk2 -12 stub ConvertDevModeToPrintTicketThunk -13 stub ConvertPrintTicketToDevModeThunk2 -14 stub ConvertPrintTicketToDevModeThunk -15 stub DllCanUnloadNow -16 stub DllGetClassObject -17 stdcall -private DllMain(long long ptr) -18 stub DllRegisterServer -19 stub DllUnregisterServer -20 stub GetDeviceDefaultPrintTicketThunk -21 stub GetDeviceNamespacesThunk -22 stub GetPrintCapabilitiesThunk2 -23 stub GetPrintCapabilitiesThunk -24 stub GetSchemaVersionThunk -25 stub MergeAndValidatePrintTicketThunk2 -26 stub MergeAndValidatePrintTicketThunk -27 stub UnbindPTProviderThunk +@ stdcall PTQuerySchemaVersionSupport(wstr ptr) +@ stub PTOpenProvider +@ stub PTOpenProviderEx +@ stub PTCloseProvider +@ stub BindPTProviderThunk +@ stub PTGetPrintCapabilities +@ stub PTMergeAndValidatePrintTicket +@ stub PTConvertPrintTicketToDevMode +@ stub PTConvertDevModeToPrintTicket +@ stub PTReleaseMemory +@ stub ConvertDevModeToPrintTicketThunk2 +@ stub ConvertDevModeToPrintTicketThunk +@ stub ConvertPrintTicketToDevModeThunk2 +@ stub ConvertPrintTicketToDevModeThunk +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stdcall -private DllMain(long long ptr) +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub GetDeviceDefaultPrintTicketThunk +@ stub GetDeviceNamespacesThunk +@ stub GetPrintCapabilitiesThunk2 +@ stub GetPrintCapabilitiesThunk +@ stub GetSchemaVersionThunk +@ stub MergeAndValidatePrintTicketThunk2 +@ stub MergeAndValidatePrintTicketThunk +@ stub UnbindPTProviderThunk

1 0

Gerald Pfeifer : configure: Use the -Wshift-overflow= 2 compiler option if available.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: c4dee537c90b7011c5d406392a183be66df3569b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4dee537c90b7011c5d406392… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Oct 24 23:51:01 2015 +0200 configure: Use the -Wshift-overflow=2 compiler option if available. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+) diff --git a/configure b/configure index 139a32c..fd09324 100755 --- a/configure +++ b/configure @@ -14172,6 +14172,31 @@ $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 +$as_echo_n "checking whether the compiler supports -Wshift-overflow=2... " >&6; } +if ${ac_cv_cflags__Wshift_overflow_2+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wshift-overflow=2" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wshift_overflow_2=yes +else + ac_cv_cflags__Wshift_overflow_2=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wshift_overflow_2" >&5 +$as_echo "$ac_cv_cflags__Wshift_overflow_2" >&6; } +if test "x$ac_cv_cflags__Wshift_overflow_2" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wshift-overflow=2" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wstrict-prototypes" >&5 $as_echo_n "checking whether the compiler supports -Wstrict-prototypes... " >&6; } if ${ac_cv_cflags__Wstrict_prototypes+:} false; then : diff --git a/configure.ac b/configure.ac index c4ba1a3..3180407 100644 --- a/configure.ac +++ b/configure.ac @@ -1837,6 +1837,7 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) + WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits]) WINE_TRY_CFLAGS([-Wunused-but-set-parameter])

1 0

Andrew Eikum : mmdevapi: Fix win10 test failures.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: b1821266ca93af5e0a66986b0b3fadfb4a2072d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1821266ca93af5e0a66986b0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 26 08:37:38 2015 -0500 mmdevapi: Fix win10 test failures. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 35 ++++++----------------------------- dlls/mmdevapi/tests/render.c | 36 ++++++++++++++++++++++++------------ include/winerror.h | 1 + 3 files changed, 31 insertions(+), 41 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 702843c..afb99fc 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -38,6 +38,9 @@ #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) +/* undocumented error code */ +#define D3D11_ERROR_4E MAKE_HRESULT(SEVERITY_ERROR, FACILITY_DIRECT3D11, 0x4e) + static IMMDevice *dev = NULL; static const LARGE_INTEGER ullZero; @@ -83,7 +86,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) HRESULT hr; UINT32 frames, next, pad, sum = 0; BYTE *data; - DWORD flags, r; + DWORD flags; UINT64 pos, qpc; REFERENCE_TIME period; @@ -417,32 +420,6 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) IAudioCaptureClient_ReleaseBuffer(acc, frames); } - hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); - - ok(ResetEvent(handle), "ResetEvent\n"); - - /* Still receiving events! */ - r = WaitForSingleObject(handle, 20); - ok(r == WAIT_OBJECT_0, "Wait(event) after Stop gave %x\n", r); - - hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); - - ok(ResetEvent(handle), "ResetEvent\n"); - - r = WaitForSingleObject(handle, 120); - ok(r == WAIT_OBJECT_0, "Wait(event) after Reset gave %x\n", r); - - hr = IAudioClient_SetEventHandle(ac, NULL); - ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); - - r = WaitForSingleObject(handle, 70); - ok(r == WAIT_OBJECT_0, "Wait(NULL event) gave %x\n", r); - - hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); - IAudioCaptureClient_Release(acc); } @@ -593,7 +570,8 @@ static void test_audioclient(void) ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET, "Start before SetEventHandle returns %08x\n", hr); + ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || + hr == D3D11_ERROR_4E /* win10 */, "Start before SetEventHandle returns %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, handle); ok(hr == S_OK, "SetEventHandle returns %08x\n", hr); @@ -847,7 +825,6 @@ static void test_simplevolume(void) hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Master volume wasn't 1: %f\n", vol); hr = ISimpleAudioVolume_SetMasterVolume(sav, -1.f, NULL); ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 3a48c8d..be17a0d 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -54,9 +54,13 @@ static const unsigned int win_formats[][4] = { #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) +/* undocumented error code */ +#define D3D11_ERROR_4E MAKE_HRESULT(SEVERITY_ERROR, FACILITY_DIRECT3D11, 0x4e) + static IMMDeviceEnumerator *mme = NULL; static IMMDevice *dev = NULL; static HRESULT hexcl = S_OK; /* or AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED */ +static BOOL win10 = FALSE; static const LARGE_INTEGER ullZero; @@ -281,7 +285,8 @@ static void test_audioclient(void) fmtex->dwChannelMask = 0xffff; hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); + ok(hr == S_OK || + hr == AUDCLNT_E_UNSUPPORTED_FORMAT /* win10 */, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); IAudioClient_Release(ac); @@ -330,9 +335,12 @@ static void test_audioclient(void) ok(hr == S_OK, "Valid GetStreamLatency call returns %08x\n", hr); trace("Returned latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); - ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000), - "Latency < default period, delta %ldus\n", (long)((t2-t1)/10)); + ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000) || + broken(t2 == 0) /* (!) win10 */, + "Latency < default period, delta %ldus (%llu vs %llu)\n", (long)((t2-t1)/10), t2, t1); /* Native appears to add the engine period to the HW latency in shared mode */ + if(t2 == 0) + win10 = TRUE; hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); @@ -627,13 +635,15 @@ static void test_event(void) ok(event != NULL, "CreateEvent failed\n"); hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET, "Start failed: %08x\n", hr); + ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || + hr == D3D11_ERROR_4E /* win10 */, "Start failed: %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, event); ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, event); - ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "SetEventHandle returns %08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || + hr == E_UNEXPECTED /* win10 */, "SetEventHandle returns %08x\n", hr); r = WaitForSingleObject(event, 40); ok(r == WAIT_TIMEOUT, "Wait(event) before Start gave %x\n", r); @@ -733,10 +743,13 @@ static void test_padding(void) hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); ok(buf != NULL, "NULL buffer returned\n"); - for(i = 0; i < psize * pwfx->nBlockAlign; ++i){ - if(buf[i] != silence){ - ok(0, "buffer has data in it already\n"); - break; + if(!win10){ + /* win10 appears not to clear the buffer */ + for(i = 0; i < psize * pwfx->nBlockAlign; ++i){ + if(buf[i] != silence){ + ok(0, "buffer has data in it already, i: %u, valu: %f\n", i, *((float*)buf)); + break; + } } } @@ -910,7 +923,8 @@ static void test_clock(int share) hr = IAudioClient_GetStreamLatency(ac, &t2); ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); trace("Latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); - ok(t2 >= period || broken(t2 >= period/2 && share && pwfx->nSamplesPerSec > 48000), + ok(t2 >= period || broken(t2 >= period/2 && share && pwfx->nSamplesPerSec > 48000) || + broken(t2 == 0) /* win10 */, "Latency < default period, delta %ldus\n", (long)((t2-period)/10)); /** GetBufferSize @@ -1972,7 +1986,6 @@ static void test_session_creation(void) vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Got wrong volume: %f\n", vol); ISimpleAudioVolume_Release(cap_sav); IAudioSessionManager_Release(cap_sesm); @@ -2001,7 +2014,6 @@ static void test_session_creation(void) vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Got wrong volume: %f\n", vol); ISimpleAudioVolume_Release(cap_sav); } diff --git a/include/winerror.h b/include/winerror.h index e9cc7be..ba9e245 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -59,6 +59,7 @@ #define FACILITY_PLA 48 #define FACILITY_FVE 49 #define FACILITY_WINDOWS_DEFENDER 80 +#define FACILITY_DIRECT3D11 0x87c #define SEVERITY_SUCCESS 0 #define SEVERITY_ERROR 1

1 0

Francois Gouget : hidclass.sys: Make a few functions static.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: af0288d419dce9584e480cd8240dc00ed2198b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0288d419dce9584e480cd82… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 26 19:02:40 2015 +0100 hidclass.sys: Make a few functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 13ac99b..822de3d 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -401,7 +401,9 @@ static int getValue(int bsize, int source) return value; } -void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *feature_index, struct feature *feature) +static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, + unsigned int *feature_index, + struct feature *feature) { if (bSize <= 0) { @@ -430,7 +432,8 @@ void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *f } } -void parse_collection(unsigned int bSize, int itemVal, struct collection *collection) +static void parse_collection(unsigned int bSize, int itemVal, + struct collection *collection) { if (bSize <= 0) return; @@ -772,7 +775,7 @@ static void count_elements(struct feature* feature, USHORT *buttons, USHORT *val } } -WINE_HIDP_PREPARSED_DATA* build_PreparseData( +static WINE_HIDP_PREPARSED_DATA* build_PreparseData( struct feature **features, int feature_count, struct feature **input_features, int i_count, struct feature **output_features, int o_count,

1 0

Nikolay Sivov : dwrite/tests: Some tests for GetRecommendedRenderingMode() with different ppdip values.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 5e1c0315a174396a17b84deae3178414f5871f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1c0315a174396a17b84deae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 20:38:56 2015 +0300 dwrite/tests: Some tests for GetRecommendedRenderingMode() with different ppdip values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 56572f9..ae45e8b 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4278,7 +4278,7 @@ static void test_GetGdiCompatibleGlyphAdvances(void) IDWriteFactory_Release(factory); } -static WORD get_gasp_flags(IDWriteFontFace *fontface, FLOAT emsize) +static WORD get_gasp_flags(IDWriteFontFace *fontface, FLOAT emsize, FLOAT ppdip) { WORD num_recs, version; const WORD *ptr; @@ -4288,6 +4288,8 @@ static WORD get_gasp_flags(IDWriteFontFace *fontface, FLOAT emsize) void *ctxt; HRESULT hr; + emsize *= ppdip; + exists = FALSE; hr = IDWriteFontFace_TryGetFontTable(fontface, MS_GASP_TAG, (const void**)&ptr, &size, &ctxt, &exists); @@ -4436,18 +4438,52 @@ if (0) /* crashes on native */ g_is_vista = fontface1 == NULL; for (emsize = 1.0; emsize < 500.0; emsize += 1.0) { - WORD gasp = get_gasp_flags(fontface, emsize); DWRITE_RENDERING_MODE expected; + WORD gasp; int i; for (i = 0; i < sizeof(recmode_tests)/sizeof(recmode_tests[0]); i++) { + FLOAT ppdip; + + ppdip = 1.0f; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); + hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + + /* some ppdip variants */ + ppdip = 0.5f; mode = 10; - expected = get_expected_rendering_mode(emsize, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); - hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, 1.0, recmode_tests[i].measuring, params, &mode); + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); + hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, flags 0x%04x, expected %d\n", emsize, i, mode, gasp, expected); + ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + + /* Only test larger sizes to workaround Win7 differences, where unscaled natural emsize threshold is used; + Win8 and Win10 handle this as expected. */ + if (emsize > 20.0f) { + ppdip = 1.5f; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); + hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + + ppdip = 2.0f; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); + hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + } } + gasp = get_gasp_flags(fontface, emsize, 1.0f); /* IDWriteFontFace1 offers another variant of this method */ if (fontface1) { for (i = 0; i < sizeof(recmode_tests1)/sizeof(recmode_tests1[0]); i++) {

1 0

Francois Gouget : oleview: Remove an unneeded NONAMELESSUNION define.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: a96f7f13ced34c693c94a2b18f26c2188a3fa9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96f7f13ced34c693c94a2b18… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 27 11:58:32 2015 +0100 oleview: Remove an unneeded NONAMELESSUNION define. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/typelib.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 3a60348..04b9067 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "main.h" #include "wine/debug.h"

1 0

Francois Gouget : oleaut32: Add V_RECORD() and V_RECORDINFO() and use them for wine_dbgstr_variant().
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: be3fea546d2c0c99726074326e0189ddd829e792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3fea546d2c0c99726074326… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 27 11:58:14 2015 +0100 oleaut32: Add V_RECORD() and V_RECORDINFO() and use them for wine_dbgstr_variant(). This fixes the wine_dbgstr_variant() compatibility with non __STDC__ compilers and source code that defines _FORCENAMELESSUNION. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oleauto.h | 12 ++++++++---- include/wine/debug.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/oleauto.h b/include/oleauto.h index f9862e7..07c46ad 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -105,11 +105,15 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFGUID,IRecordIn /* Macros for accessing the fields of the VARIANT type */ #if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) -#define V_UNION(A,B) ((A)->n1.n2.n3.B) -#define V_VT(A) ((A)->n1.n2.vt) +#define V_VT(A) ((A)->n1.n2.vt) +#define V_UNION(A,B) ((A)->n1.n2.n3.B) +#define V_RECORD(A) (V_UNION(A,brecVal).pvRecord) +#define V_RECORDINFO(A) (V_UNION(A,brecVal).pRecInfo) #else -#define V_UNION(A,B) ((A)->B) -#define V_VT(A) ((A)->vt) +#define V_VT(A) ((A)->vt) +#define V_UNION(A,B) ((A)->B) +#define V_RECORD(A) ((A)->pvRecord) +#define V_RECORDINFO(A) ((A)->pRecInfo) #endif #define V_ISBYREF(A) (V_VT(A) & VT_BYREF) diff --git a/include/wine/debug.h b/include/wine/debug.h index 241e79b..af5483c 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -331,7 +331,7 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) case VT_VOID: return wine_dbg_sprintf( "%p {VT_VOID}", v ); case VT_RECORD: - return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo ); + return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_RECORD(v), V_RECORDINFO(v) ); default: return wine_dbg_sprintf( "%p {vt %s}", v, wine_dbgstr_vt(V_VT(v)) ); }

1 0

Gerald Pfeifer : ntdll: Avoid a case of shift overflow in get_cpuinfo.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: a7f124ae31698248ef76af57af32822baffebd90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f124ae31698248ef76af57a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 26 23:00:14 2015 +0100 ntdll: Avoid a case of shift overflow in get_cpuinfo. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0bcc8b0..d2ed9c5 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1002,7 +1002,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] >> 2) & 1; user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] >> 20) & 1; user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 31) & 1; - if(regs2[3] & (1 << 31)) info->FeatureSet |= CPU_FEATURE_3DNOW; + if (regs2[3] >> 31) info->FeatureSet |= CPU_FEATURE_3DNOW; } } else if (regs[1] == GENU && regs[3] == INEI && regs[2] == NTEL)

1 0

Ken Thomases : winemac: Fix how the user' s default display mode is determined.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: dbb0bacf6731304f074f492438982949449a5266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbb0bacf6731304f074f49243… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 26 23:39:06 2015 -0500 winemac: Fix how the user's default display mode is determined. The code had been checking the kDisplayModeDefaultFlag in the mode's IOFlags, but that doesn't do what I thought. That indicates which mode the driver considers to be the default for the hardware. It turns out there's no way to query the user's default mode. So, at the first opportunity during a given Wine session, the Mac driver queries the current display mode and assumes that's the user's default mode. It records that in a volatile registry key for use by subsequent processes during that same session. This doesn't use the existing registry key under HKEY_CURRENT_CONFIG\System\CurrentControlSet\Control\Video that records the mode when CDS_UPDATEREGISTRY is used with ChangeDisplaySettingsEx() -- which explorer.exe does during start-up -- because a) that doesn't support the distinction between pixel size and point size for Retina modes, and b) in theory, apps could overwrite that. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 282 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 278 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbb0bacf6731304f074f4…

1 0

Ken Thomases : winemac: Reorganize copy_display_modes() to clarify that the user's default mode is always included.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 02c6676864b0af2f0d6c999aec66c9bcba9b0a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c6676864b0af2f0d6c999ae… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 26 23:39:05 2015 -0500 winemac: Reorganize copy_display_modes() to clarify that the user's default mode is always included. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 95 +++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 10ecf67..d561e68 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -312,63 +312,64 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display) BOOL better = TRUE; CGDisplayModeRef new_mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); uint32_t new_flags = CGDisplayModeGetIOFlags(new_mode); - CFStringRef pixel_encoding; - size_t width_points; - size_t height_points; - CFDictionaryRef key; - CGDisplayModeRef old_mode; + CFDictionaryRef key = create_mode_dict(new_mode); - if (!(new_flags & kDisplayModeDefaultFlag) && (pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode))) + /* If a given mode is the user's default, then always list it in preference to any similar + modes that may exist. */ + if (new_flags & kDisplayModeDefaultFlag) + better = TRUE; + else { - BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); - CFRelease(pixel_encoding); - if (bpp30) + CFStringRef pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); + CGDisplayModeRef old_mode; + + if (pixel_encoding) { - /* This is an odd pixel encoding. It seems it's only returned - when using kCGDisplayShowDuplicateLowResolutionModes. It's - 32bpp in terms of the actual raster layout, but it's 10 - bits per component. I think that no Windows program is - likely to need it and they will probably be confused by it. - Skip it. */ - continue; + BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); + CFRelease(pixel_encoding); + if (bpp30) + { + /* This is an odd pixel encoding. It seems it's only returned + when using kCGDisplayShowDuplicateLowResolutionModes. It's + 32bpp in terms of the actual raster layout, but it's 10 + bits per component. I think that no Windows program is + likely to need it and they will probably be confused by it. + Skip it. */ + CFRelease(key); + continue; + } } - } - - width_points = CGDisplayModeGetWidth(new_mode); - height_points = CGDisplayModeGetHeight(new_mode); - key = create_mode_dict(new_mode); - old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); - if (old_mode) - { - uint32_t old_flags = CGDisplayModeGetIOFlags(old_mode); - - /* If a given mode is the user's default, then always list it in preference to any similar - modes that may exist. */ - if ((new_flags & kDisplayModeDefaultFlag) && !(old_flags & kDisplayModeDefaultFlag)) - better = TRUE; - else if (!(new_flags & kDisplayModeDefaultFlag) && (old_flags & kDisplayModeDefaultFlag)) - better = FALSE; - else + old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); + if (old_mode) { - /* Otherwise, prefer a mode whose pixel size equals its point size over one which - is scaled. */ - size_t new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); - size_t new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); - size_t old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); - size_t old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); - BOOL new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); - BOOL old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); - - if (new_size_same && !old_size_same) - better = TRUE; - else if (!new_size_same && old_size_same) + uint32_t old_flags = CGDisplayModeGetIOFlags(old_mode); + + if (old_flags & kDisplayModeDefaultFlag) better = FALSE; else { - /* Otherwise, prefer the mode with the smaller pixel size. */ - if (old_width_pixels < new_width_pixels || old_height_pixels < new_height_pixels) + /* Otherwise, prefer a mode whose pixel size equals its point size over one which + is scaled. */ + size_t width_points = CGDisplayModeGetWidth(new_mode); + size_t height_points = CGDisplayModeGetHeight(new_mode); + size_t new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); + size_t new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); + size_t old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); + size_t old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); + BOOL new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); + BOOL old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); + + if (new_size_same && !old_size_same) + better = TRUE; + else if (!new_size_same && old_size_same) better = FALSE; + else + { + /* Otherwise, prefer the mode with the smaller pixel size. */ + if (old_width_pixels < new_width_pixels || old_height_pixels < new_height_pixels) + better = FALSE; + } } } }

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
75
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 October 2015