February 2022 - Wine-Commits

Eric Pouech : ctapi32: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 3bdb20f3c1e2accd624da4ee6335357e7191ddc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bdb20f3c1e2accd624da4ee… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:59:49 2022 +0100 ctapi32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctapi32/Makefile.in | 1 - dlls/ctapi32/ctapi32.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ctapi32/Makefile.in b/dlls/ctapi32/Makefile.in index 69e8728873b..fa13d24540c 100644 --- a/dlls/ctapi32/Makefile.in +++ b/dlls/ctapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ctapi32.dll UNIXLIB = ctapi32.so IMPORTS = advapi32 diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index 5d5060ace47..0f0ee399e1c 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -98,7 +98,7 @@ IS8 WINAPI CT_close(IU16 ctn) */ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) {

1 0

Alexandre Julliard : ntdll: Add a global variable for the WoW PEB.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: a31f3374e65c02f97829eb9ed712a35f484c4461 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a31f3374e65c02f97829eb9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 21 11:41:44 2022 +0100 ntdll: Add a global variable for the WoW PEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 44 ++++++++++++++++++++---------------------- dlls/ntdll/unix/server.c | 1 + dlls/ntdll/unix/unix_private.h | 4 ++++ 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index c7e0674e083..3f9f7f1b3b7 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -60,6 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(environ); PEB *peb = NULL; +WOW_PEB *wow_peb = NULL; USHORT *uctable = NULL, *lctable = NULL; SIZE_T startup_info_size = 0; BOOL is_prefix_bootstrap = FALSE; @@ -2129,37 +2130,34 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) { NtCurrentTeb()->WowTebOffset = teb_offset; NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset); + wow_peb = (PEB32 *)((char *)peb + page_size); set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); } #endif load_global_options( &params->ImagePathName ); - if (NtCurrentTeb()->WowTebOffset) + if (wow_peb) { void *wow64_params = build_wow64_parameters( params ); -#ifdef _WIN64 - PEB32 *wow64_peb = (PEB32 *)((char *)peb + page_size); -#else - PEB64 *wow64_peb = (PEB64 *)((char *)peb - page_size); -#endif - wow64_peb->ImageBaseAddress = PtrToUlong( peb->ImageBaseAddress ); - wow64_peb->ProcessParameters = PtrToUlong( wow64_params ); - wow64_peb->NumberOfProcessors = peb->NumberOfProcessors; - wow64_peb->NtGlobalFlag = peb->NtGlobalFlag; - wow64_peb->CriticalSectionTimeout.QuadPart = peb->CriticalSectionTimeout.QuadPart; - wow64_peb->HeapSegmentReserve = peb->HeapSegmentReserve; - wow64_peb->HeapSegmentCommit = peb->HeapSegmentCommit; - wow64_peb->HeapDeCommitTotalFreeThreshold = peb->HeapDeCommitTotalFreeThreshold; - wow64_peb->HeapDeCommitFreeBlockThreshold = peb->HeapDeCommitFreeBlockThreshold; - wow64_peb->OSMajorVersion = peb->OSMajorVersion; - wow64_peb->OSMinorVersion = peb->OSMinorVersion; - wow64_peb->OSBuildNumber = peb->OSBuildNumber; - wow64_peb->OSPlatformId = peb->OSPlatformId; - wow64_peb->ImageSubSystem = peb->ImageSubSystem; - wow64_peb->ImageSubSystemMajorVersion = peb->ImageSubSystemMajorVersion; - wow64_peb->ImageSubSystemMinorVersion = peb->ImageSubSystemMinorVersion; - wow64_peb->SessionId = peb->SessionId; + + wow_peb->ImageBaseAddress = PtrToUlong( peb->ImageBaseAddress ); + wow_peb->ProcessParameters = PtrToUlong( wow64_params ); + wow_peb->NumberOfProcessors = peb->NumberOfProcessors; + wow_peb->NtGlobalFlag = peb->NtGlobalFlag; + wow_peb->CriticalSectionTimeout.QuadPart = peb->CriticalSectionTimeout.QuadPart; + wow_peb->HeapSegmentReserve = peb->HeapSegmentReserve; + wow_peb->HeapSegmentCommit = peb->HeapSegmentCommit; + wow_peb->HeapDeCommitTotalFreeThreshold = peb->HeapDeCommitTotalFreeThreshold; + wow_peb->HeapDeCommitFreeBlockThreshold = peb->HeapDeCommitFreeBlockThreshold; + wow_peb->OSMajorVersion = peb->OSMajorVersion; + wow_peb->OSMinorVersion = peb->OSMinorVersion; + wow_peb->OSBuildNumber = peb->OSBuildNumber; + wow_peb->OSPlatformId = peb->OSPlatformId; + wow_peb->ImageSubSystem = peb->ImageSubSystem; + wow_peb->ImageSubSystemMajorVersion = peb->ImageSubSystemMajorVersion; + wow_peb->ImageSubSystemMinorVersion = peb->ImageSubSystemMinorVersion; + wow_peb->SessionId = peb->SessionId; } } diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 9d0594d3374..ab9d99c4f47 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1518,6 +1518,7 @@ size_t server_init_process(void) is_wow64 = TRUE; NtCurrentTeb()->GdiBatchCount = PtrToUlong( (char *)NtCurrentTeb() - teb_offset ); NtCurrentTeb()->WowTebOffset = -teb_offset; + wow_peb = (PEB64 *)((char *)peb - page_size); #endif } else diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 75f03706401..b1595c792c0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -393,12 +393,16 @@ static inline client_ptr_t iosb_client_ptr( IO_STATUS_BLOCK *io ) #ifdef _WIN64 typedef TEB32 WOW_TEB; +typedef PEB32 WOW_PEB; static inline TEB64 *NtCurrentTeb64(void) { return NULL; } #else typedef TEB64 WOW_TEB; +typedef PEB64 WOW_PEB; static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiBatchCount; } #endif +extern WOW_PEB *wow_peb DECLSPEC_HIDDEN; + static inline WOW_TEB *get_wow_teb( TEB *teb ) { return teb->WowTebOffset ? (WOW_TEB *)((char *)teb + teb->WowTebOffset) : NULL;

1 0

Alexandre Julliard : include: Add API set definitions.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 0d09268558e4ad26a74d0554af3e7a9671ee3681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d09268558e4ad26a74d0554… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 21 11:40:43 2022 +0100 include: Add API set definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 81fd5f45665..ae331562026 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -321,7 +321,7 @@ typedef struct _PEB PVOID KernelCallbackTable; /* 02c/058 */ ULONG Reserved; /* 030/060 */ ULONG AtlThunkSListPtr32; /* 034/064 */ - PVOID /*PPEB_FREE_BLOCK*/ FreeList; /* 038/068 */ + PVOID ApiSetMap; /* 038/068 */ ULONG TlsExpansionCounter; /* 03c/070 */ PRTL_BITMAP TlsBitmap; /* 040/078 */ ULONG TlsBitmapBits[2]; /* 044/080 */ @@ -731,7 +731,7 @@ typedef struct _PEB32 ULONG KernelCallbackTable; /* 002c */ ULONG Reserved; /* 0030 */ ULONG AtlThunkSListPtr32; /* 0034 */ - ULONG FreeList; /* 0038 */ + ULONG ApiSetMap; /* 0038 */ ULONG TlsExpansionCounter; /* 003c */ ULONG TlsBitmap; /* 0040 */ ULONG TlsBitmapBits[2]; /* 0044 */ @@ -822,7 +822,7 @@ typedef struct _PEB64 ULONG64 KernelCallbackTable; /* 0058 */ ULONG Reserved; /* 0060 */ ULONG AtlThunkSListPtr32; /* 0064 */ - ULONG64 FreeList; /* 0068 */ + ULONG64 ApiSetMap; /* 0068 */ ULONG TlsExpansionCounter; /* 0070 */ ULONG64 TlsBitmap; /* 0078 */ ULONG TlsBitmapBits[2]; /* 0080 */ @@ -3824,6 +3824,44 @@ typedef struct BYTE *ArgumentTable; } SYSTEM_SERVICE_TABLE; +/* ApiSet structures (format for version 6) */ + +typedef struct _API_SET_NAMESPACE +{ + ULONG Version; + ULONG Size; + ULONG Flags; + ULONG Count; + ULONG EntryOffset; + ULONG HashOffset; + ULONG HashFactor; +} API_SET_NAMESPACE; + +typedef struct _API_SET_HASH_ENTRY +{ + ULONG Hash; + ULONG Index; +} API_SET_HASH_ENTRY; + +typedef struct _API_SET_NAMESPACE_ENTRY +{ + ULONG Flags; + ULONG NameOffset; + ULONG NameLength; + ULONG HashedLength; + ULONG ValueOffset; + ULONG ValueCount; +} API_SET_NAMESPACE_ENTRY; + +typedef struct _API_SET_VALUE_ENTRY +{ + ULONG Flags; + ULONG NameOffset; + ULONG NameLength; + ULONG ValueOffset; + ULONG ValueLength; +} API_SET_VALUE_ENTRY; + /*********************************************************************** * Function declarations */

1 0

Eric Pouech : advapi32/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: ec494887781bd6b5c0d50b5429093ca637024fe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec494887781bd6b5c0d50b54… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:07:45 2022 +0100 advapi32/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 009a941c700..e0a86acd5df 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5522,9 +5522,9 @@ static void test_mutex_security(HANDLE token) SetLastError(0xdeadbeef); dup = OpenMutexA(0, FALSE, "WineTestMutex"); -todo_wine + todo_wine ok(!dup, "OpenMutex should fail\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); } @@ -5579,9 +5579,9 @@ static void test_event_security(HANDLE token) SetLastError(0xdeadbeef); dup = OpenEventA(0, FALSE, "WineTestEvent"); -todo_wine + todo_wine ok(!dup, "OpenEvent should fail\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); }

1 0

Eric Pouech : shell32/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 0fc80c7db107a9a7bbf21fbdb3b79377b03b168e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc80c7db107a9a7bbf21fbd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:08:15 2022 +0100 shell32/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 2 +- dlls/shell32/tests/shlfolder.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index f243ba053d0..860024ae6fa 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1146,7 +1146,7 @@ static void test_ShellWindows(void) IDispatch_Release(app); hr = IWebBrowser2_get_Document(wb, &doc); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { test_dispatch_typeinfo(doc, viewdual_riids); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f593f8b821d..13108f92246 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4423,7 +4423,7 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) cmi.lpVerb = "foobar_wine_test"; hr = IContextMenu_InvokeCommand(menu, &cmi); - todo_wine_if(background) + todo_wine_if(background) ok((hr == E_INVALIDARG) || (hr == E_FAIL /* Win7 */) || (hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Vista */), "Unexpected hr %#x.\n", hr);

1 0

Eric Pouech : nsi: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 4481d0359c7e246271c5b6aaa0078aad4f52d70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4481d0359c7e246271c5b6aa… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:59:55 2022 +0100 nsi: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/Makefile.in | 1 - dlls/nsi/nsi.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in index 8fac9224923..2d3d98f69d0 100644 --- a/dlls/nsi/Makefile.in +++ b/dlls/nsi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = nsi.dll IMPORTLIB = nsi diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 08aec49257a..efb10c0f615 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -44,7 +44,7 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR DWORD sizes[4] = { key_size, rw_size, dynamic_size, static_size }; int i, attempt; - TRACE( "%d %p %d %p %d %p %d %p %d %p %d %p %d\n", unk, module, table, key_data, key_size, + TRACE( "%ld %p %ld %p %ld %p %ld %p %ld %p %ld %p %ld\n", unk, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 ); for (attempt = 0; attempt < 5; attempt++) @@ -95,7 +95,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ struct nsi_enumerate_all_ex params; DWORD err; - TRACE( "%d %d %p %d %p %d %p %d %p %d %p %d %p\n", unk, unk2, module, table, key_data, key_size, + TRACE( "%ld %ld %p %ld %p %ld %p %ld %p %ld %p %ld %p\n", unk, unk2, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); params.unknown[0] = 0; @@ -184,7 +184,7 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t { struct nsi_get_all_parameters_ex params; - TRACE( "%d %p %d %p %d %p %d %p %d %p %d\n", unk, module, table, key, key_size, + TRACE( "%ld %p %ld %p %ld %p %ld %p %ld %p %ld\n", unk, module, table, key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); params.unknown[0] = 0; @@ -257,7 +257,7 @@ DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table { struct nsi_get_parameter_ex params; - TRACE( "%d %p %d %p %d %d %p %d %d\n", unk, module, table, key, key_size, + TRACE( "%ld %p %ld %p %ld %ld %p %ld %ld\n", unk, module, table, key, key_size, param_type, data, data_size, data_offset ); params.unknown[0] = 0;

1 0

Eric Pouech : wevtsvc: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 338e4ca0cfa7a32410a9ee0f52c0eab173a2f501 URL: https://source.winehq.org/git/wine.git/?a=commit;h=338e4ca0cfa7a32410a9ee0f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:59:43 2022 +0100 wevtsvc: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtsvc/Makefile.in | 1 - dlls/wevtsvc/wevtsvc.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wevtsvc/Makefile.in b/dlls/wevtsvc/Makefile.in index 6480c4ecdbf..729089463f9 100644 --- a/dlls/wevtsvc/Makefile.in +++ b/dlls/wevtsvc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wevtsvc.dll IMPORTS = rpcrt4 advapi32 diff --git a/dlls/wevtsvc/wevtsvc.c b/dlls/wevtsvc/wevtsvc.c index 14c30791ff6..2e303045740 100644 --- a/dlls/wevtsvc/wevtsvc.c +++ b/dlls/wevtsvc/wevtsvc.c @@ -48,7 +48,7 @@ static void eventlog_update_status(DWORD state) static void WINAPI eventlog_handler(DWORD control) { - TRACE("%#x\n", control); + TRACE("%#lx\n", control); switch (control) { @@ -71,7 +71,7 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) svc_handle = RegisterServiceCtrlHandlerW(L"EventLog", eventlog_handler); if (!svc_handle) { - ERR("RegisterServiceCtrlHandler error %u\n", GetLastError()); + ERR("RegisterServiceCtrlHandler error %lu\n", GetLastError()); return; }

1 0

Eric Pouech : w32sys.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 07b55d299ac8b3453154fd58e8918ae656f7d408 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07b55d299ac8b3453154fd58… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:59:25 2022 +0100 w32sys.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/w32sys.dll16/Makefile.in | 1 - dlls/w32sys.dll16/w32sys.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/w32sys.dll16/Makefile.in b/dlls/w32sys.dll16/Makefile.in index 08c67ad3ad4..73691b2fa5d 100644 --- a/dlls/w32sys.dll16/Makefile.in +++ b/dlls/w32sys.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = w32sys.dll16 EXTRADLLFLAGS = -m16 -Wb,--main-module,w32skrnl.dll diff --git a/dlls/w32sys.dll16/w32sys.c b/dlls/w32sys.dll16/w32sys.c index 43e9344474e..bab0a83604e 100644 --- a/dlls/w32sys.dll16/w32sys.c +++ b/dlls/w32sys.dll16/w32sys.c @@ -78,7 +78,7 @@ WORD WINAPI GetPEResourceTable16( * LoadPeResource (W32SYS.11) */ DWORD WINAPI LoadPeResource16(WORD x,SEGPTR y) { - FIXME("(0x%04x,0x%08x),stub!\n",x,y); + FIXME("(0x%04x,0x%08lx),stub!\n",x,y); return 0; }

1 0

Eric Pouech : vnetbios.vxd: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: e0a0b6ab6066fb6ea45c8fe4e6cbd72d4017bcae URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a0b6ab6066fb6ea45c8fe4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:59:01 2022 +0100 vnetbios.vxd: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vnetbios.vxd/Makefile.in | 1 - dlls/vnetbios.vxd/vnetbios.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vnetbios.vxd/Makefile.in b/dlls/vnetbios.vxd/Makefile.in index d1f77cb78e8..8e8cb60481c 100644 --- a/dlls/vnetbios.vxd/Makefile.in +++ b/dlls/vnetbios.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vnetbios.vxd IMPORTS = netapi32 diff --git a/dlls/vnetbios.vxd/vnetbios.c b/dlls/vnetbios.vxd/vnetbios.c index 3bbd0f9d809..c3adf615395 100644 --- a/dlls/vnetbios.vxd/vnetbios.c +++ b/dlls/vnetbios.vxd/vnetbios.c @@ -39,7 +39,7 @@ BOOL WINAPI VNETBIOS_DeviceIoControl( DWORD code, LPVOID lpvInBuffer, DWORD cbIn Netbios(lpvInBuffer); return TRUE; default: - FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n", + FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n", code, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer, lpcbBytesReturned, lpOverlapped); return FALSE;

1 0

Eric Pouech : version: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: ad8fbedad1f9506810c8ff9d3483124e8d413591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad8fbedad1f9506810c8ff9d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:38 2022 +0100 version: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/Makefile.in | 1 - dlls/version/version.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index 8bb38e37075..e26069e18c4 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = version.dll IMPORTLIB = version IMPORTS = kernelbase diff --git a/dlls/version/version.c b/dlls/version/version.c index 5cb4fcd0457..61e79aef146 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -72,7 +72,7 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) { if ((*vffi)->dwSignature == 0x004f0049) /* hack to detect unicode */ *vffi = (VS_FIXEDFILEINFO*)(buf+0x28); if ((*vffi)->dwSignature != VS_FFI_SIGNATURE) - WARN("Bad VS_FIXEDFILEINFO signature 0x%08x\n",(*vffi)->dwSignature); + WARN("Bad VS_FIXEDFILEINFO signature 0x%08lx\n",(*vffi)->dwSignature); return buf; } } @@ -106,7 +106,7 @@ DWORD WINAPI VerInstallFileA( LPBYTE buf1,buf2; OFSTRUCT ofs; - TRACE("(%x,%s,%s,%s,%s,%s,%p,%d)\n", + TRACE("(%lx,%s,%s,%s,%s,%s,%p,%d)\n", flags,debugstr_a(srcfilename),debugstr_a(destfilename), debugstr_a(srcdir),debugstr_a(destdir),debugstr_a(curdir), tmpfile,*tmpfilelen); @@ -174,7 +174,7 @@ DWORD WINAPI VerInstallFileA( xret = VIF_OUTOFMEMORY; break; default: /* unknown error, should not happen */ - FIXME("Unknown LZCopy error %d, ignoring.\n", ret); + FIXME("Unknown LZCopy error %ld, ignoring.\n", ret); xret = 0; break; }

1 0