December 2019 - Wine-commits

Gabriel Ivăncescu : vbscript/tests: Add initial tests for the script TypeInfo.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 46ccea7649703b5fe4a0e6b5c47cd7809241b715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46ccea7649703b5fe4a0e6b5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:46:37 2019 +0100 vbscript/tests: Add initial tests for the script TypeInfo. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 271 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 271 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46ccea7649703b5fe4a0…

1 0

Jeff Smith : kernel32/tests: Allow for differing fpu_cw returned on Windows XP.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 7cbabed51f3c0e242897435a646291642b045ac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cbabed51f3c0e242897435a… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Dec 5 23:47:42 2019 -0600 kernel32/tests: Allow for differing fpu_cw returned on Windows XP. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 9a8ad9151c..8c27024cf2 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1745,14 +1745,16 @@ static unsigned int get_thread_fpu_cw( unsigned long *fpu_cw ) static void test_thread_fpu_cw(void) { - static const struct { unsigned int cw; unsigned long fpu_cw; } expected_cw[6] = + static const struct { + unsigned int cw; unsigned long fpu_cw; unsigned long fpu_cw_broken; + } expected_cw[6] = { #ifdef __i386__ { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, - { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ) }, + { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ), MAKELONG( 0xc60, 0x1f80 ) }, { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, - { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ) }, + { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ), MAKELONG( 0xc60, 0x1f80 ) }, { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) } #elif defined(__x86_64__) { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) }, @@ -1788,7 +1790,9 @@ static void test_thread_fpu_cw(void) cw = _control87( 0, 0 ); fpu_cw = get_fpu_cw(); ok(cw == expected_cw[2].cw, "expected %#x got %#x\n", expected_cw[2].cw, cw); - ok(fpu_cw == expected_cw[2].fpu_cw, "expected %#lx got %#lx\n", expected_cw[2].fpu_cw, fpu_cw); + ok(fpu_cw == expected_cw[2].fpu_cw || + broken(expected_cw[2].fpu_cw_broken && fpu_cw == expected_cw[2].fpu_cw_broken), + "expected %#lx got %#lx\n", expected_cw[2].fpu_cw, fpu_cw); cw = get_thread_fpu_cw( &fpu_cw ); ok(cw == expected_cw[3].cw, "expected %#x got %#x\n", expected_cw[3].cw, cw); @@ -1797,7 +1801,9 @@ static void test_thread_fpu_cw(void) cw = _control87( 0, 0 ); fpu_cw = get_fpu_cw(); ok(cw == expected_cw[4].cw, "expected %#x got %#x\n", expected_cw[4].cw, cw); - ok(fpu_cw == expected_cw[4].fpu_cw, "expected %#lx got %#lx\n", expected_cw[4].fpu_cw, fpu_cw); + ok(fpu_cw == expected_cw[4].fpu_cw || + broken(expected_cw[4].fpu_cw_broken && fpu_cw == expected_cw[4].fpu_cw_broken), + "expected %#lx got %#lx\n", expected_cw[4].fpu_cw, fpu_cw); _control87( initial_cw, _MCW_EM | _MCW_RC | _MCW_PC ); cw = _control87( 0, 0 );

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_multiply_transform().
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 77a6fa4fa26193c3a6ee969ab9caebc70e098c40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77a6fa4fa26193c3a6ee969a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:23:22 2019 -0600 wined3d: Introduce wined3d_stateblock_multiply_transform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 24134b8f3e..f6d36f8c25 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1505,6 +1505,20 @@ void CDECL wined3d_stateblock_set_transform(struct wined3d_stateblock *statebloc stateblock->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); } +void CDECL wined3d_stateblock_multiply_transform(struct wined3d_stateblock *stateblock, + enum wined3d_transform_state d3dts, const struct wined3d_matrix *matrix) +{ + struct wined3d_matrix *mat = &stateblock->stateblock_state.transforms[d3dts]; + + TRACE("stateblock %p, state %s, matrix %p.\n", stateblock, debug_d3dtstype(d3dts), matrix); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_11, matrix->_12, matrix->_13, matrix->_14); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_21, matrix->_22, matrix->_23, matrix->_24); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_31, matrix->_32, matrix->_33, matrix->_34); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_41, matrix->_42, matrix->_43, matrix->_44); + + multiply_matrix(mat, mat, matrix); +} + HRESULT CDECL wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, UINT plane_idx, const struct wined3d_vec4 *plane) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 716b902f31..e03c57055b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -262,6 +262,7 @@ @ cdecl wined3d_stateblock_get_state(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_init_contained_states(ptr) +@ cdecl wined3d_stateblock_multiply_transform(ptr long ptr) @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_base_vertex_index(ptr long) @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fd8c56bf78..4b5d4e02f9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2724,6 +2724,8 @@ ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); const struct wined3d_stateblock_state * __cdecl wined3d_stateblock_get_state(const struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_multiply_transform(struct wined3d_stateblock *stateblock, + enum wined3d_transform_state state, const struct wined3d_matrix *matrix); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index); HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock,

1 0

Zebediah Figura : ddraw: Update the primary stateblock in d3d_device7_MultiplyTransform().
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 98472693b00ee5a4e276ce6f73de27d727b97f43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98472693b00ee5a4e276ce6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:23:23 2019 -0600 ddraw: Update the primary stateblock in d3d_device7_MultiplyTransform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d4dd74f8ae..0999c01cb2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3349,6 +3349,8 @@ static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); + wined3d_stateblock_multiply_transform(device->state, + wined3d_state, (struct wined3d_matrix *)matrix); wined3d_device_multiply_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix); wined3d_mutex_unlock();

1 0

Alexandre Julliard : ntdll: Fix DBCS mappings in RtlCustomCPToUnicodeN().
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 117dbfa2cf4e831c6eccad982c82cf9ae808eccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=117dbfa2cf4e831c6eccad98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 6 17:17:52 2019 +0100 ntdll: Fix DBCS mappings in RtlCustomCPToUnicodeN(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 31 ++++++++++++++++++++++++++++--- dlls/ntdll/locale.c | 8 ++++---- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index de1d4fca22..e43eee2788 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -89,6 +89,7 @@ static NTSTATUS (WINAPI *pRtlNormalizeString)(ULONG, LPCWSTR, INT, LPWSTR, INT*) static NTSTATUS (WINAPI *pRtlIsNormalizedString)(ULONG, LPCWSTR, INT, BOOLEAN*); static NTSTATUS (WINAPI *pNtGetNlsSectionPtr)(ULONG,ULONG,void*,void**,SIZE_T*); static void (WINAPI *pRtlInitCodePageTable)(USHORT*,CPTABLEINFO*); +static NTSTATUS (WINAPI *pRtlCustomCPToUnicodeN)(CPTABLEINFO*,WCHAR*,DWORD,DWORD*,const char*,DWORD); static void InitFunctionPointers(void) { @@ -134,6 +135,7 @@ static void InitFunctionPointers(void) X(RtlIsNormalizedString); X(NtGetNlsSectionPtr); X(RtlInitCodePageTable); + X(RtlCustomCPToUnicodeN); #undef X } @@ -4196,17 +4198,40 @@ static void test_GetCPInfo(void) ret = UnmapViewOfFile( ptr ); todo_wine ok( ret, "UnmapViewOfFile failed err %u\n", GetLastError() ); - status = pNtGetNlsSectionPtr( 11, 932, NULL, &ptr, &size ); + status = pNtGetNlsSectionPtr( 11, 936, NULL, &ptr, &size ); ok( !status, "failed %x\n", status ); - ok( size > 0x20000 && size <= 0x30000, "wrong size %lx\n", size ); + ok( size > 0x30000 && size <= 0x40000, "wrong size %lx\n", size ); memset( &table, 0xcc, sizeof(table) ); if (pRtlInitCodePageTable) { pRtlInitCodePageTable( ptr, &table ); - ok( table.CodePage == 932, "wrong codepage %u\n", table.CodePage ); + ok( table.CodePage == 936, "wrong codepage %u\n", table.CodePage ); ok( table.MaximumCharacterSize == 2, "wrong char size %u\n", table.MaximumCharacterSize ); ok( table.DefaultChar == '?', "wrong default char %x\n", table.DefaultChar ); ok( table.DBCSCodePage == TRUE, "wrong dbcs %u\n", table.DBCSCodePage ); + + if (pRtlCustomCPToUnicodeN) + { + static const unsigned char buf[] = { 0xbf, 0xb4, 0xc7, 0, 0x78 }; + static const WCHAR expect[][4] = { { 0xcccc, 0xcccc, 0xcccc, 0xcccc }, + { 0x0000, 0xcccc, 0xcccc, 0xcccc }, + { 0x770b, 0xcccc, 0xcccc, 0xcccc }, + { 0x770b, 0x0000, 0xcccc, 0xcccc }, + { 0x770b, 0x003f, 0xcccc, 0xcccc }, + { 0x770b, 0x003f, 0x0078, 0xcccc } }; + WCHAR wbuf[5]; + DWORD i, j, reslen; + + for (i = 0; i <= sizeof(buf); i++) + { + memset( wbuf, 0xcc, sizeof(wbuf) ); + RtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i ); + for (j = 0; j < 4; j++) if (expect[i][j] == 0xcccc) break; + ok( reslen == j * sizeof(WCHAR), "%u: wrong len %u\n", i, reslen ); + for (j = 0; j < 4; j++) + ok( wbuf[j] == expect[i][j], "%u: char %u got %04x\n", i, j, wbuf[j] ); + } + } } ret = UnmapViewOfFile( ptr ); todo_wine ok( ret, "UnmapViewOfFile failed err %u\n", GetLastError() ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index f5faada578..d505a36ba8 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -841,10 +841,10 @@ WCHAR WINAPI RtlAnsiCharToUnicodeChar( char **ansi ) if (nls_info.AnsiTableInfo.DBCSOffsets) { USHORT off = nls_info.AnsiTableInfo.DBCSOffsets[(unsigned char)**ansi]; - if (off && (*ansi)[1]) + if (off) { (*ansi)++; - return nls_info.AnsiTableInfo.MultiByteTable[off + (unsigned char)*(*ansi)++]; + return nls_info.AnsiTableInfo.DBCSOffsets[off + (unsigned char)*(*ansi)++]; } } return nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)*(*ansi)++]; @@ -919,11 +919,11 @@ NTSTATUS WINAPI RtlCustomCPToUnicodeN( CPTABLEINFO *info, WCHAR *dst, DWORD dstl for (i = dstlen; srclen && i; i--, srclen--, src++, dst++) { USHORT off = info->DBCSOffsets[(unsigned char)*src]; - if (off && srclen > 1 && src[1]) + if (off && srclen > 1) { src++; srclen--; - *dst = info->MultiByteTable[off + (unsigned char)*src]; + *dst = info->DBCSOffsets[off + (unsigned char)*src]; } else *dst = info->MultiByteTable[(unsigned char)*src]; }

1 0

Alexandre Julliard : ntdll: Fix contents of the glyph table in generated codepage data.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 5de7b6a159f814e67ea2c181185f6080d0e07338 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5de7b6a159f814e67ea2c181… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 6 22:29:43 2019 +0100 ntdll: Fix contents of the glyph table in generated codepage data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index d505a36ba8..4c95169366 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -350,7 +350,7 @@ static USHORT *build_cptable( const union cptable *src, SIZE_T *size ) if (src->sbcs.cp2uni_glyphs != src->sbcs.cp2uni) { *ptr++ = 256; - memcpy( ptr + 1, src->sbcs.cp2uni_glyphs, 256 ); + memcpy( ptr, src->sbcs.cp2uni_glyphs, 256 * sizeof(USHORT) ); ptr += 256; } else *ptr++ = 0;

1 0

Alexandre Julliard : kernelbase: Reimplement MultiByteToWideChar() using Win32-format codepage tables.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 7e8f1dac30267058cf3b36d49b6ed3c440087024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e8f1dac30267058cf3b36d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 5 11:22:19 2019 +0100 kernelbase: Reimplement MultiByteToWideChar() using Win32-format codepage tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/decompose.c | 948 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 452 +++++++++++++++++++ libs/port/decompose.c | 4 +- tools/make_unicode | 42 +- 6 files changed, 1439 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e8f1dac30267058cf3b…

1 0

Alexandre Julliard : kernelbase: Reimplement WideCharToMultiByte using Win32-format codepage tables.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 328ec3a768f60c6107e978f14820380a7a554d52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=328ec3a768f60c6107e978f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 5 21:40:48 2019 +0100 kernelbase: Reimplement WideCharToMultiByte using Win32-format codepage tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/compose.c | 405 ++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 578 +++++++++++++++++++++++++++++++++++++++- tools/make_unicode | 1 + 5 files changed, 984 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=328ec3a768f60c6107e9…

1 0

Gijs Vermeulen : secur32: Avoid compiler warning.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: fa38f34b0f156d4ddb006e6df6b52c060175ee23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa38f34b0f156d4ddb006e6d… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Fri Dec 6 11:42:33 2019 +0100 secur32: Avoid compiler warning. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 050e8c5cce..d06267773a 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1202,7 +1202,7 @@ BOOL schan_imp_init(void) supported_protocols = SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT; #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 - if(SSLGetProtocolVersionMax != NULL) { + if(&SSLGetProtocolVersionMax != NULL) { SSLProtocol max_protocol; SSLContextRef ctx; OSStatus status;

1 0

Gijs Vermeulen : winemac: Avoid some compiler warnings.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 8cd44ecf4c89ed5fbc5e280ae06a0be0e092dea0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd44ecf4c89ed5fbc5e280a… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Fri Dec 6 11:42:34 2019 +0100 winemac: Avoid some compiler warnings. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 9 ++++----- dlls/winemac.drv/display.c | 7 +++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b5658eab08..87a73b6da9 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -769,9 +769,9 @@ static NSString* WineLocalizedString(unsigned int stringID) if (CGDisplayModeGetHeight(mode1) != CGDisplayModeGetHeight(mode2)) return FALSE; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (CGDisplayModeGetPixelWidth != NULL && + if (&CGDisplayModeGetPixelWidth != NULL && CGDisplayModeGetPixelWidth(mode1) != CGDisplayModeGetPixelWidth(mode2)) return FALSE; - if (CGDisplayModeGetPixelHeight != NULL && + if (&CGDisplayModeGetPixelHeight != NULL && CGDisplayModeGetPixelHeight(mode1) != CGDisplayModeGetPixelHeight(mode2)) return FALSE; #endif @@ -801,9 +801,8 @@ static NSString* WineLocalizedString(unsigned int stringID) NSDictionary* options = nil; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (&kCGDisplayShowDuplicateLowResolutionModes != NULL) - options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:TRUE] - forKey:(NSString*)kCGDisplayShowDuplicateLowResolutionModes]; + options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:TRUE] + forKey:(NSString*)kCGDisplayShowDuplicateLowResolutionModes]; #endif NSArray *modes = [(NSArray*)CGDisplayCopyAllDisplayModes(displayID, (CFDictionaryRef)options) autorelease]; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index cc5e9beaff..bafdb42589 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -268,7 +268,7 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID goto fail; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (CGDisplayModeGetPixelWidth != NULL && CGDisplayModeGetPixelHeight != NULL) + if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL) { val = CGDisplayModeGetPixelWidth(display_mode); if (RegSetValueExA(display_hkey, "PixelWidth", 0, REG_DWORD, (const BYTE*)&val, sizeof(val))) @@ -456,7 +456,7 @@ static BOOL display_mode_matches_descriptor(CGDisplayModeRef mode, const struct return FALSE; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (CGDisplayModeGetPixelWidth != NULL && CGDisplayModeGetPixelHeight != NULL) + if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL) { if (CGDisplayModeGetPixelWidth(mode) != desc->pixel_width || CGDisplayModeGetPixelHeight(mode) != desc->pixel_height) @@ -616,8 +616,7 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display) CFArrayRef modes = NULL; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (&kCGDisplayShowDuplicateLowResolutionModes != NULL && - CGDisplayModeGetPixelWidth != NULL && CGDisplayModeGetPixelHeight != NULL) + if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL) { CFDictionaryRef options; struct display_mode_descriptor* desc;

1 0