November 2023 - Wine-commits

Rémi Bernon : win32u: Allow KBDTABLES conversion from CTRL + ALT to WCHAR.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: ed9f1d071549296f218a8a38817051a13813ad8e URL: https://gitlab.winehq.org/wine/wine/-/commit/ed9f1d071549296f218a8a38817051… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 15 09:58:18 2023 +0200 win32u: Allow KBDTABLES conversion from CTRL + ALT to WCHAR. --- dlls/win32u/input.c | 2 +- include/kbd.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index ae03f99adc9..fa64de881cf 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -514,7 +514,7 @@ static WCHAR kbd_tables_vkey_to_wchar( const KBDTABLES *tables, UINT vkey, const ctrl = state[VK_CONTROL] & 0x80; caps = state[VK_CAPITAL] & 1; - if (ctrl && alt) return WCH_NONE; + if (ctrl && alt && !(tables->fLocaleFlags & KLLF_ALTGR)) return WCH_NONE; if (!ctrl && vkey == VK_ESCAPE) return VK_ESCAPE; if (ctrl && !alt) { diff --git a/include/kbd.h b/include/kbd.h index 9bbcd886b1c..da805b7cefc 100644 --- a/include/kbd.h +++ b/include/kbd.h @@ -40,6 +40,10 @@ #define KANALOK 0x08 #define GRPSELTAP 0x80 +#define KLLF_ALTGR 0x0001 +#define KLLF_SHIFTLOCK 0x0002 +#define KLLF_LRM_RLM 0x0004 + typedef struct { BYTE Vk;

1 0

Rémi Bernon : winewayland.drv: Translate Xkb keyboard layouts to KBDTABLES.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: df4cae2e30c2c061bc8b061e8d44207746c9fe48 URL: https://gitlab.winehq.org/wine/wine/-/commit/df4cae2e30c2c061bc8b061e8d4420… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 14:50:29 2023 +0100 winewayland.drv: Translate Xkb keyboard layouts to KBDTABLES. --- dlls/winewayland.drv/wayland_keyboard.c | 281 +++++++++++++++++++++++++++++++- dlls/winewayland.drv/waylanddrv.h | 2 + dlls/winewayland.drv/waylanddrv_main.c | 2 + 3 files changed, 277 insertions(+), 8 deletions(-)

1 0

Rémi Bernon : winewayland.drv: Add scan2vk tables for azerty, qwertz and dvorak.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: b2d16b920431820121c849e8bbc462c23e9af3d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b2d16b920431820121c849e8bbc462… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 22:32:55 2023 +0100 winewayland.drv: Add scan2vk tables for azerty, qwertz and dvorak. --- dlls/winewayland.drv/wayland_keyboard.c | 37 ++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/wayland_keyboard.c b/dlls/winewayland.drv/wayland_keyboard.c index 2afaf323bed..3230ca2f264 100644 --- a/dlls/winewayland.drv/wayland_keyboard.c +++ b/dlls/winewayland.drv/wayland_keyboard.c @@ -119,6 +119,33 @@ static const USHORT scan2vk_qwerty[0x280] = EXTRA_SCAN2VK }; +static const USHORT scan2vk_azerty[0x280] = +{ + T00, T01, T02, T03, T04, T05, T06, T07, T08, T09, T0A, T0B, VK_OEM_4, T0D, T0E, + T0F, 'A', 'Z', T12, T13, T14, T15, T16, T17, T18, T19, VK_OEM_6, VK_OEM_1, T1C, + T1D, 'Q', T1F, T20, T21, T22, T23, T24, T25, T26, 'M', VK_OEM_3, VK_OEM_7, + T2A, T2B, 'W', T2D, T2E, T2F, T30, T31, VK_OEM_COMMA, VK_OEM_PERIOD, VK_OEM_2, VK_OEM_8, + EXTRA_SCAN2VK +}; + +static const USHORT scan2vk_qwertz[0x280] = +{ + T00, T01, T02, T03, T04, T05, T06, T07, T08, T09, T0A, T0B, VK_OEM_4, VK_OEM_6, T0E, + T0F, T10, T11, T12, T13, T14, 'Z', T16, T17, T18, T19, VK_OEM_1, VK_OEM_3, T1C, + T1D, T1E, T1F, T20, T21, T22, T23, T24, T25, T26, VK_OEM_7, VK_OEM_5, VK_OEM_2, + T2A, VK_OEM_8, 'Y', T2D, T2E, T2F, T30, T31, T32, T33, T34, VK_OEM_MINUS, + EXTRA_SCAN2VK +}; + +static const USHORT scan2vk_dvorak[0x280] = +{ + T00, T01, T02, T03, T04, T05, T06, T07, T08, T09, T0A, T0B, VK_OEM_4, VK_OEM_6, T0E, + T0F, VK_OEM_7, VK_OEM_COMMA, VK_OEM_PERIOD, 'P', 'Y', 'F', 'G', 'C', 'R', 'L', VK_OEM_2, VK_OEM_PLUS, T1C, + T1D, T1E, 'O', 'E', 'U', 'I', 'D', 'H', 'T', 'N', 'S', VK_OEM_MINUS, T29, + T2A, T2B, VK_OEM_1, 'Q', 'J', 'K', 'X', 'B', 'M', 'W', 'V', 'Z', + EXTRA_SCAN2VK +}; + static WORD key2scan(UINT key) { /* base keys can be mapped directly */ @@ -373,7 +400,15 @@ static void add_xkb_layout(const char *xkb_layout, struct xkb_keymap *xkb_keymap layout->index = index; if (index) layout->layout_id = next_layout_id++; layout->key_names_str = names_str = (void *)ptr; - scan2vk = scan2vk_qwerty; + + switch (lang) + { + case MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT): scan2vk = scan2vk_azerty; + case MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT): scan2vk = scan2vk_qwertz; + case MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN_SWISS): scan2vk = scan2vk_qwertz; + default: scan2vk = scan2vk_qwerty; + } + if (strstr(xkb_layout, "dvorak")) scan2vk = scan2vk_dvorak; layout->tables.pKeyNames = layout->key_names; layout->tables.pKeyNamesExt = layout->key_names_ext;

1 0

Rémi Bernon : win32u: Support SGCAPS attributes in KBDTABLES.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 968fc333565bdca42ea6b6d88e6c6a93ead905b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/968fc333565bdca42ea6b6d88e6c6a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 15:18:58 2023 +0100 win32u: Support SGCAPS attributes in KBDTABLES. --- dlls/win32u/input.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index fa64de881cf..3ee46f0bfcf 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -531,6 +531,11 @@ static WCHAR kbd_tables_vkey_to_wchar( const KBDTABLES *tables, UINT vkey, const for (entry = table->pVkToWchars; entry->VirtualKey; entry = NEXT_ENTRY(table, entry)) { if (entry->VirtualKey != vkey) continue; + /* SGCAPS attribute may be set on entries where VK_CAPITAL and VK_SHIFT behave differently. + * The entry corresponds to the mapping when Caps Lock is on, and a second entry follows it + * with the mapping when Caps Lock is off. + */ + if ((entry->Attributes & SGCAPS) && !caps) entry = NEXT_ENTRY(table, entry); if ((entry->Attributes & CAPLOK) && table->nModifications > caps_mod) return entry->wch[caps_mod]; return entry->wch[mod]; }

1 0

Rémi Bernon : winewayland.drv: Implement CAPLOK and SGCAPS in KBDTABLES.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: de01c2cfb60ae92eeaabf0c739a4845432db18e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/de01c2cfb60ae92eeaabf0c739a484… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 15:28:17 2023 +0100 winewayland.drv: Implement CAPLOK and SGCAPS in KBDTABLES. --- dlls/winewayland.drv/wayland_keyboard.c | 34 +++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/winewayland.drv/wayland_keyboard.c b/dlls/winewayland.drv/wayland_keyboard.c index 3230ca2f264..26cf3e8a7af 100644 --- a/dlls/winewayland.drv/wayland_keyboard.c +++ b/dlls/winewayland.drv/wayland_keyboard.c @@ -59,7 +59,7 @@ struct layout VSC_VK vsc2vk_e1[0x100]; VK_TO_WCHAR_TABLE vk_to_wchar_table[2]; - VK_TO_WCHARS8 vk_to_wchars8[0x100]; + VK_TO_WCHARS8 vk_to_wchars8[0x100 * 2 /* SGCAPS */]; VK_TO_BIT vk2bit[4]; union { @@ -357,7 +357,7 @@ static void add_xkb_layout(const char *xkb_layout, struct xkb_keymap *xkb_keymap unsigned int mod, keyc, len, names_len, min_keycode, max_keycode; struct xkb_state *xkb_state = xkb_state_new(xkb_keymap); - xkb_mod_mask_t shift_mask, control_mask, altgr_mask; + xkb_mod_mask_t shift_mask, control_mask, altgr_mask, capslock_mask; VSC_LPWSTR *names_entry, *names_ext_entry; VSC_VK *vsc2vk_e0_entry, *vsc2vk_e1_entry; VK_TO_WCHARS8 *vk2wchars_entry; @@ -490,13 +490,15 @@ static void add_xkb_layout(const char *xkb_layout, struct xkb_keymap *xkb_keymap shift_mask = 1 << xkb_keymap_mod_get_index(xkb_keymap, XKB_MOD_NAME_SHIFT); control_mask = 1 << xkb_keymap_mod_get_index(xkb_keymap, XKB_MOD_NAME_CTRL); + capslock_mask = 1 << xkb_keymap_mod_get_index(xkb_keymap, XKB_MOD_NAME_CAPS); altgr_mask = 1 << xkb_keymap_mod_get_index(xkb_keymap, "Mod5"); for (keyc = min_keycode; keyc <= max_keycode; keyc++) { WORD scan = key2scan(keyc - 8), vkey = scan2vk[scan]; - VK_TO_WCHARS8 vkey2wch = {.VirtualKey = vkey}; - BOOL found = FALSE; + VK_TO_WCHARS8 vkey2wch = {.VirtualKey = vkey}, caps_vkey2wch = vkey2wch; + BOOL found = FALSE, caps_found = FALSE; + uint32_t caps_ret, shift_ret; unsigned int mod; for (mod = 0; mod < 8; ++mod) @@ -516,10 +518,34 @@ static void add_xkb_layout(const char *xkb_layout, struct xkb_keymap *xkb_keymap else vkey2wch.wch[mod] = ret; if (vkey2wch.wch[mod] != WCH_NONE) found = TRUE; + + xkb_state_update_mask(xkb_state, 0, 0, mod_mask | capslock_mask, 0, 0, xkb_group); + + if (mod_mask & control_mask) caps_vkey2wch.wch[mod] = WCH_NONE; /* on Windows CTRL+key behave specifically */ + else if (!(ret = xkb_state_key_get_utf32(xkb_state, keyc))) caps_vkey2wch.wch[mod] = WCH_NONE; + else if (ret == vkey2wch.wch[mod]) caps_vkey2wch.wch[mod] = WCH_NONE; + else caps_vkey2wch.wch[mod] = ret; + + if (caps_vkey2wch.wch[mod] != WCH_NONE) caps_found = TRUE; } if (!found) continue; + if (caps_found) + { + TRACE("vkey %#06x + CAPS -> %s\n", caps_vkey2wch.VirtualKey, debugstr_wn(caps_vkey2wch.wch, 8)); + caps_vkey2wch.Attributes = SGCAPS; + *vk2wchars_entry++ = caps_vkey2wch; + } + else + { + xkb_state_update_mask(xkb_state, 0, 0, capslock_mask, 0, 0, xkb_group); + caps_ret = xkb_state_key_get_utf32(xkb_state, keyc); + xkb_state_update_mask(xkb_state, 0, 0, shift_mask, 0, 0, xkb_group); + shift_ret = xkb_state_key_get_utf32(xkb_state, keyc); + if (caps_ret && caps_ret == shift_ret) vkey2wch.Attributes |= CAPLOK; + } + TRACE("vkey %#06x -> %s\n", vkey2wch.VirtualKey, debugstr_wn(vkey2wch.wch, 8)); *vk2wchars_entry++ = vkey2wch; }

1 0

Louis Lenders : shcore: Add stub for CreateRandomAccessStreamOverStream.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 9a80befba38a93cda15aaf4268558a3960c2d78d URL: https://gitlab.winehq.org/wine/wine/-/commit/9a80befba38a93cda15aaf4268558a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Nov 30 09:08:30 2023 +0100 shcore: Add stub for CreateRandomAccessStreamOverStream. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55867 --- dlls/shcore/main.c | 10 ++++++++++ dlls/shcore/shcore.spec | 2 +- include/Makefile.in | 1 + include/shcore.h | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 494da202283..653694a04dc 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -29,6 +29,7 @@ #include "ocidl.h" #include "featurestagingapi.h" #include "shellscalingapi.h" +#include "shcore.h" #define WINSHLWAPI #include "shlwapi.h" @@ -2529,3 +2530,12 @@ HRESULT WINAPI RegisterScaleChangeEvent(HANDLE handle, DWORD_PTR *cookie) FIXME("(%p, %p) stub\n", handle, cookie); return E_NOTIMPL; } + +/************************************************************************* + * CreateRandomAccessStreamOverStream [SHCORE.@] + */ +HRESULT WINAPI CreateRandomAccessStreamOverStream(IStream *stream, BSOS_OPTIONS options, REFIID riid, void **ppv) +{ + FIXME("(%p, %d, %s, %p) stub\n", stream, options, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index c5de17de590..fc265d8215a 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -1,7 +1,7 @@ 1 stub -noname SHCreateReadOnlySharedMemoryStream @ stdcall CommandLineToArgvW(wstr ptr) @ stub CreateRandomAccessStreamOnFile -@ stub CreateRandomAccessStreamOverStream +@ stdcall CreateRandomAccessStreamOverStream(ptr long ptr ptr) @ stub CreateStreamOverRandomAccessStream @ stdcall -private DllCanUnloadNow() @ stub DllGetActivationFactory diff --git a/include/Makefile.in b/include/Makefile.in index 97b4d0e90f6..d4a166e265c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -695,6 +695,7 @@ SOURCES = \ sesprp.idl \ setupapi.h \ sfc.h \ + shcore.h \ shdeprecated.idl \ shdispid.h \ shellapi.h \ diff --git a/include/shcore.h b/include/shcore.h new file mode 100644 index 00000000000..7893261b953 --- /dev/null +++ b/include/shcore.h @@ -0,0 +1,32 @@ +/* + * Copyright 2023 Louis Lenders + * + * 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 + */ + +#ifndef SHCORE_H +#define SHCORE_H + +#include <objidl.h> + +typedef enum BSOS_OPTIONS +{ + BSOS_DEFAULT, + BSOS_PREFERDESTINATIONSTREAM +} BSOS_OPTIONS; + +HRESULT WINAPI CreateRandomAccessStreamOverStream(IStream *stream, BSOS_OPTIONS options, REFIID riid, void **ppv); + +#endif

1 0

Alex Henrie : d3drm: Suppress a use-after-free warning in d3drm_image_palettise (GCC).
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: abbf0524a4ea460bdc906102fa7382a9a67550ac URL: https://gitlab.winehq.org/wine/wine/-/commit/abbf0524a4ea460bdc906102fa7382… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 28 21:36:03 2023 -0700 d3drm: Suppress a use-after-free warning in d3drm_image_palettise (GCC). --- dlls/d3drm/texture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index f0983d53e24..0922837255c 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -153,7 +153,8 @@ static BOOL d3drm_image_palettise(D3DRMIMAGE *image, unsigned char *src_data, image->green_mask = 0xff; image->blue_mask = 0xff; image->palette_size = colour_count; - if (!(image->palette = realloc(palette, colour_count * sizeof(*palette)))) + image->palette = palette; + if ((palette = realloc(palette, colour_count * sizeof(*palette)))) image->palette = palette; return TRUE;

1 0

Nikolay Sivov : vbscript: Implement TypeName(Nothing).
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 00057128a3ad636528bb8ed124817eeb5d014dee URL: https://gitlab.winehq.org/wine/wine/-/commit/00057128a3ad636528bb8ed124817e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 30 17:23:30 2023 +0100 vbscript: Implement TypeName(Nothing). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 2 ++ dlls/vbscript/tests/api.vbs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0baab7e4420..3d36cba6341 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2505,6 +2505,8 @@ static HRESULT Global_TypeName(BuiltinDisp *This, VARIANT *arg, unsigned args_cn case VT_NULL: return return_string(res, L"Null"); case VT_DISPATCH: + if (!V_DISPATCH(arg)) + return return_string(res, L"Nothing"); if (SUCCEEDED(IDispatch_GetTypeInfo(V_DISPATCH(arg), 0, GetUserDefaultLCID(), &typeinfo))) { hres = ITypeInfo_GetDocumentation(typeinfo, MEMBERID_NIL, &name, NULL, NULL, NULL); diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 842cce33f83..8d9e0e3e7d1 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1566,7 +1566,9 @@ MyObject.myval = 0 Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) -Call ok(TypeName(Empty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) +Call ok(TypeName(Nothing) = "Nothing", "TypeName(Nothing) = " & TypeName(Nothing)) +Call ok(getVT(TypeName(Nothing)) = "VT_BSTR", "getVT(TypeName(Nothing)) = " & getVT(TypeName(Nothing))) +Call ok(TypeName(Empty) = "Empty", "TypeName(Empty) = " & TypeName(Empty)) Call ok(getVT(TypeName(Empty)) = "VT_BSTR", "getVT(TypeName(Empty)) = " & getVT(TypeName(Empty))) Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) Call ok(getVT(TypeName(Null)) = "VT_BSTR", "getVT(TypeName(Null)) = " & getVT(TypeName(Null)))

1 0

Eric Pouech : kernel32/tests: Introduce a new infrastructure for testing CreateProcess().
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: a55598b142d8971599b709362b5380bdf373eae5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a55598b142d8971599b709362b5380… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 30 18:38:53 2023 +0100 kernel32/tests: Introduce a new infrastructure for testing CreateProcess(). Move a couple of existing tests to this infrastructure. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 398 ++++++++++++++++++++++++++++++------------ 1 file changed, 282 insertions(+), 116 deletions(-)

1 0

Eric Pouech : kernel32/tests: Enable CreateProcess() tests on 64bit compilation.
by Alexandre Julliard 30 Nov '23

30 Nov '23

Module: wine Branch: master Commit: 84079a62db16a5757c94564f080f01d397a18ea5 URL: https://gitlab.winehq.org/wine/wine/-/commit/84079a62db16a5757c94564f080f01… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 30 18:38:53 2023 +0100 kernel32/tests: Enable CreateProcess() tests on 64bit compilation. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9386135e54a..ee2ba99d8f4 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -636,13 +636,11 @@ static void ok_child_int( int line, const char *sect, const char *key, UINT expe ok_(__FILE__, line)( result == expect, "%s:%s expected %u, but got %u\n", sect, key, expect, result ); } -#ifndef _WIN64 static void ok_child_hexint( int line, const char *sect, const char *key, UINT expect, UINT is_broken ) { UINT result = GetPrivateProfileIntA( sect, key, !expect, resfile ); ok_(__FILE__, line)( result == expect || broken( is_broken && result == is_broken ), "%s:%s expected %#x, but got %#x\n", sect, key, expect, result ); } -#endif #define okChildString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 1 ) #define okChildIString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 0 ) @@ -3107,7 +3105,6 @@ static void test_BreakawayOk(HANDLE parent_job) ok(ret, "SetInformationJobObject error %lu\n", GetLastError()); } -#ifndef _WIN64 /* copy an executable, but changing its subsystem */ static void copy_change_subsystem(const char* in, const char* out, DWORD subsyst) { @@ -3215,7 +3212,6 @@ static BOOL build_startupinfo( STARTUPINFOA *startup, unsigned args, HANDLE hstd } return needs_close; } -#endif struct std_handle_test { @@ -3229,7 +3225,6 @@ struct std_handle_test static void test_StdHandleInheritance(void) { -#ifndef _WIN64 HANDLE hsavestd[3]; static char guiexec[MAX_PATH]; static char cuiexec[MAX_PATH]; @@ -3344,7 +3339,6 @@ static void test_StdHandleInheritance(void) SetStdHandle(STD_INPUT_HANDLE, hsavestd[0]); SetStdHandle(STD_OUTPUT_HANDLE, hsavestd[1]); SetStdHandle(STD_ERROR_HANDLE, hsavestd[2]); -#endif } #if defined(__i386__) || defined(__x86_64__)

1 0