May 2020 - Wine-Commits - list.winehq.org

Paul Gofman : ntoskrnl.exe: Implement KeRevertToUserAffinityThread() function.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: cda4fa293e26e788e95dc5d4656c15fb41cf6350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda4fa293e26e788e95dc5d4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 26 13:05:10 2020 +0300 ntoskrnl.exe: Implement KeRevertToUserAffinityThread() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fc7828cf15..c4f2180c4c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2485,7 +2485,7 @@ KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity) */ void WINAPI KeRevertToUserAffinityThread(void) { - FIXME("() stub\n"); + KeRevertToUserAffinityThreadEx(0); } void WINAPI KeRevertToUserAffinityThreadEx(KAFFINITY affinity) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 458815a0f2..356c60a2e7 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1766,7 +1766,17 @@ static void test_affinity(void) mask = pKeSetSystemAffinityThreadEx(0x1); ok(mask == mask_all_cpus, "Got unexpected mask %#lx.\n", mask); - pKeRevertToUserAffinityThreadEx(mask_all_cpus); + pKeRevertToUserAffinityThreadEx(0); + + mask = pKeSetSystemAffinityThreadEx(0x1); + ok(!mask, "Got unexpected mask %#lx.\n", mask); + + KeRevertToUserAffinityThread(); + + mask = pKeSetSystemAffinityThreadEx(0x1); + ok(!mask, "Got unexpected mask %#lx.\n", mask); + + KeRevertToUserAffinityThread(); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)

1 0

Alexandre Julliard : kernel32: Remove cpu.c.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 1b653e020d4ac5bc0a356c643e2f573ae8a6977d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b653e020d4ac5bc0a356c64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:39:36 2020 +0200 kernel32: Remove cpu.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/cpu.c | 95 ----------------------------------------------- dlls/kernel32/process.c | 46 ++++++++++++++++++++--- 3 files changed, 41 insertions(+), 101 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index c32cb5e53f..38c5b55de7 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -10,7 +10,6 @@ C_SRCS = \ comm.c \ computername.c \ console.c \ - cpu.c \ debugger.c \ editline.c \ environ.c \ diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c deleted file mode 100644 index 63014ea1c9..0000000000 --- a/dlls/kernel32/cpu.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * What processor? - * - * Copyright 1995,1997 Morten Welinder - * Copyright 1997-1998 Marcus Meissner - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif - - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winnt.h" -#include "winternl.h" -#include "psapi.h" -#include "ddk/wdm.h" -#include "wine/unicode.h" -#include "kernel_private.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(reg); - -/*********************************************************************** - * GetActiveProcessorGroupCount (KERNEL32.@) - */ -WORD WINAPI GetActiveProcessorGroupCount(void) -{ - FIXME("semi-stub, always returning 1\n"); - return 1; -} - -/*********************************************************************** - * GetActiveProcessorCount (KERNEL32.@) - */ -DWORD WINAPI GetActiveProcessorCount(WORD group) -{ - SYSTEM_INFO si; - DWORD cpus; - - GetSystemInfo( &si ); - cpus = si.dwNumberOfProcessors; - - FIXME("semi-stub, returning %u\n", cpus); - return cpus; -} - -/*********************************************************************** - * GetMaximumProcessorCount (KERNEL32.@) - */ -DWORD WINAPI GetMaximumProcessorCount(WORD group) -{ - SYSTEM_INFO si; - DWORD cpus; - - GetSystemInfo( &si ); - cpus = si.dwNumberOfProcessors; - - FIXME("semi-stub, returning %u\n", cpus); - return cpus; -} - -/*********************************************************************** - * GetEnabledXStateFeatures (KERNEL32.@) - */ -DWORD64 WINAPI GetEnabledXStateFeatures(void) -{ - FIXME("\n"); - return 0; -} diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9adf25ab48..66fa4ad506 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -53,7 +53,6 @@ #include "kernel_private.h" #include "psapi.h" #include "wine/exception.h" -#include "wine/library.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/asm.h" @@ -702,6 +701,46 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK return S_OK; } +/*********************************************************************** + * GetActiveProcessorGroupCount (KERNEL32.@) + */ +WORD WINAPI GetActiveProcessorGroupCount(void) +{ + FIXME("semi-stub, always returning 1\n"); + return 1; +} + +/*********************************************************************** + * GetActiveProcessorCount (KERNEL32.@) + */ +DWORD WINAPI GetActiveProcessorCount(WORD group) +{ + DWORD cpus = system_info.NumberOfProcessors; + + FIXME("semi-stub, returning %u\n", cpus); + return cpus; +} + +/*********************************************************************** + * GetMaximumProcessorCount (KERNEL32.@) + */ +DWORD WINAPI GetMaximumProcessorCount(WORD group) +{ + DWORD cpus = system_info.NumberOfProcessors; + + FIXME("semi-stub, returning %u\n", cpus); + return cpus; +} + +/*********************************************************************** + * GetEnabledXStateFeatures (KERNEL32.@) + */ +DWORD64 WINAPI GetEnabledXStateFeatures(void) +{ + FIXME("\n"); + return 0; +} + /********************************************************************** * GetNumaNodeProcessorMask (KERNEL32.@) */ @@ -737,12 +776,9 @@ BOOL WINAPI GetNumaAvailableMemoryNodeEx(USHORT node, PULONGLONG available_bytes */ BOOL WINAPI GetNumaProcessorNode(UCHAR processor, PUCHAR node) { - SYSTEM_INFO si; - TRACE("(%d, %p)\n", processor, node); - GetSystemInfo( &si ); - if (processor < si.dwNumberOfProcessors) + if (processor < system_info.NumberOfProcessors) { *node = 0; return TRUE;

1 0

Paul Gofman : ntoskrnl.exe: Implement KeSetSystemAffinityThread() function.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 631227563bf52b2f30a576286b8d8299f2f54ed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=631227563bf52b2f30a57628… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 26 13:05:08 2020 +0300 ntoskrnl.exe: Implement KeSetSystemAffinityThread() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index dc6bbe866c..a0657b52c5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2450,9 +2450,9 @@ KPRIORITY WINAPI KeSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority ) /*********************************************************************** * KeSetSystemAffinityThread (NTOSKRNL.EXE.@) */ -VOID WINAPI KeSetSystemAffinityThread(KAFFINITY Affinity) +VOID WINAPI KeSetSystemAffinityThread(KAFFINITY affinity) { - FIXME("(%lx) stub\n", Affinity); + KeSetSystemAffinityThreadEx(affinity); } KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity)

1 0

Paul Gofman : ntoskrnl.exe: Fix KeQueryActiveProcessors() function.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 25f4da665d4b552bc4fa1dc0a3cb0b6debb4940c URL: https://source.winehq.org/git/wine.git/?a=commit;h=25f4da665d4b552bc4fa1dc0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 26 13:05:06 2020 +0300 ntoskrnl.exe: Fix KeQueryActiveProcessors() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6d9ae44808..c10c830738 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2379,10 +2379,10 @@ LONG WINAPI KeInsertQueue(PRKQUEUE Queue, PLIST_ENTRY Entry) */ KAFFINITY WINAPI KeQueryActiveProcessors( void ) { - DWORD_PTR AffinityMask; + DWORD_PTR affinity_mask; - GetProcessAffinityMask( GetCurrentProcess(), &AffinityMask, NULL); - return AffinityMask; + GetProcessAffinityMask( GetCurrentProcess(), NULL, &affinity_mask); + return affinity_mask; } ULONG WINAPI KeQueryActiveProcessorCountEx(USHORT group_number)

1 0

Alexandre Julliard : kernel32: Remove environ.c.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 3c9cf9b65f14baa8e439c82cbff3be937f1f8534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c9cf9b65f14baa8e439c82c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:42:49 2020 +0200 kernel32: Remove environ.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/environ.c | 115 ----------------------------------------- dlls/kernel32/kernel_main.c | 45 ++++++++++++++-- dlls/kernel32/kernel_private.h | 6 --- dlls/kernel32/process.c | 20 +++++++ 5 files changed, 62 insertions(+), 125 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 38c5b55de7..801d8dd7fc 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -12,7 +12,6 @@ C_SRCS = \ console.c \ debugger.c \ editline.c \ - environ.c \ file.c \ heap.c \ kernel_main.c \ diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c deleted file mode 100644 index 2d80600f78..0000000000 --- a/dlls/kernel32/environ.c +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Process environment management - * - * Copyright 1996, 1998 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> -#include <assert.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/library.h" -#include "winternl.h" -#include "wine/unicode.h" -#include "wine/debug.h" - -#include "kernel_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(environ); - -/* Notes: - * - contrary to Microsoft docs, the environment strings do not appear - * to be sorted on Win95 (although they are on NT); so we don't bother - * to sort them either. - */ - -static STARTUPINFOA startup_infoA; - -/*********************************************************************** - * GetStartupInfoA (KERNEL32.@) - */ -VOID WINAPI GetStartupInfoA( LPSTARTUPINFOA info ) -{ - *info = startup_infoA; -} - -/****************************************************************** - * ENV_CopyStartupInformation (internal) - * - * Creates the STARTUPINFO information from the ntdll information - */ -void ENV_CopyStartupInformation(void) -{ - RTL_USER_PROCESS_PARAMETERS* rupp; - ANSI_STRING ansi; - - RtlAcquirePebLock(); - - rupp = NtCurrentTeb()->Peb->ProcessParameters; - - startup_infoA.cb = sizeof(startup_infoA); - startup_infoA.lpReserved = NULL; - startup_infoA.lpDesktop = RtlUnicodeStringToAnsiString( &ansi, &rupp->Desktop, TRUE ) == STATUS_SUCCESS ? - ansi.Buffer : NULL; - startup_infoA.lpTitle = RtlUnicodeStringToAnsiString( &ansi, &rupp->WindowTitle, TRUE ) == STATUS_SUCCESS ? - ansi.Buffer : NULL; - startup_infoA.dwX = rupp->dwX; - startup_infoA.dwY = rupp->dwY; - startup_infoA.dwXSize = rupp->dwXSize; - startup_infoA.dwYSize = rupp->dwYSize; - startup_infoA.dwXCountChars = rupp->dwXCountChars; - startup_infoA.dwYCountChars = rupp->dwYCountChars; - startup_infoA.dwFillAttribute = rupp->dwFillAttribute; - startup_infoA.dwFlags = rupp->dwFlags; - startup_infoA.wShowWindow = rupp->wShowWindow; - startup_infoA.cbReserved2 = rupp->RuntimeInfo.MaximumLength; - startup_infoA.lpReserved2 = rupp->RuntimeInfo.MaximumLength ? (void*)rupp->RuntimeInfo.Buffer : NULL; - startup_infoA.hStdInput = rupp->hStdInput ? rupp->hStdInput : INVALID_HANDLE_VALUE; - startup_infoA.hStdOutput = rupp->hStdOutput ? rupp->hStdOutput : INVALID_HANDLE_VALUE; - startup_infoA.hStdError = rupp->hStdError ? rupp->hStdError : INVALID_HANDLE_VALUE; - - RtlReleasePebLock(); -} - -/*********************************************************************** - * GetFirmwareEnvironmentVariableA (KERNEL32.@) - */ -DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size) -{ - FIXME("stub: %s %s %p %u\n", debugstr_a(name), debugstr_a(guid), buffer, size); - SetLastError(ERROR_INVALID_FUNCTION); - return 0; -} - -/*********************************************************************** - * GetFirmwareEnvironmentVariableW (KERNEL32.@) - */ -DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size) -{ - FIXME("stub: %s %s %p %u\n", debugstr_w(name), debugstr_w(guid), buffer, size); - SetLastError(ERROR_INVALID_FUNCTION); - return 0; -} diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index fbc2e8daee..d312f11081 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -33,7 +33,6 @@ #include "wincon.h" #include "winternl.h" -#include "wine/library.h" #include "kernel_private.h" #include "console_private.h" #include "wine/debug.h" @@ -42,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); extern int CDECL __wine_set_signal_handler(unsigned, int (*)(unsigned)); +static STARTUPINFOA startup_infoA; + /*********************************************************************** * set_entry_point */ @@ -77,6 +78,45 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) } +/*********************************************************************** + * GetStartupInfoA (KERNEL32.@) + */ +VOID WINAPI GetStartupInfoA( LPSTARTUPINFOA info ) +{ + *info = startup_infoA; +} + +static void copy_startup_info(void) +{ + RTL_USER_PROCESS_PARAMETERS* rupp; + ANSI_STRING ansi; + + RtlAcquirePebLock(); + + rupp = NtCurrentTeb()->Peb->ProcessParameters; + + startup_infoA.cb = sizeof(startup_infoA); + startup_infoA.lpReserved = NULL; + startup_infoA.lpDesktop = !RtlUnicodeStringToAnsiString( &ansi, &rupp->Desktop, TRUE ) ? ansi.Buffer : NULL; + startup_infoA.lpTitle = !RtlUnicodeStringToAnsiString( &ansi, &rupp->WindowTitle, TRUE ) ? ansi.Buffer : NULL; + startup_infoA.dwX = rupp->dwX; + startup_infoA.dwY = rupp->dwY; + startup_infoA.dwXSize = rupp->dwXSize; + startup_infoA.dwYSize = rupp->dwYSize; + startup_infoA.dwXCountChars = rupp->dwXCountChars; + startup_infoA.dwYCountChars = rupp->dwYCountChars; + startup_infoA.dwFillAttribute = rupp->dwFillAttribute; + startup_infoA.dwFlags = rupp->dwFlags; + startup_infoA.wShowWindow = rupp->wShowWindow; + startup_infoA.cbReserved2 = rupp->RuntimeInfo.MaximumLength; + startup_infoA.lpReserved2 = rupp->RuntimeInfo.MaximumLength ? (void*)rupp->RuntimeInfo.Buffer : NULL; + startup_infoA.hStdInput = rupp->hStdInput ? rupp->hStdInput : INVALID_HANDLE_VALUE; + startup_infoA.hStdOutput = rupp->hStdOutput ? rupp->hStdOutput : INVALID_HANDLE_VALUE; + startup_infoA.hStdError = rupp->hStdError ? rupp->hStdError : INVALID_HANDLE_VALUE; + + RtlReleasePebLock(); +} + /*********************************************************************** * KERNEL process initialisation routine */ @@ -94,8 +134,7 @@ static BOOL process_attach( HMODULE module ) CONSOLE_Init(params); - /* copy process information from ntdll */ - ENV_CopyStartupInformation(); + copy_startup_info(); if (!(GetVersion() & 0x80000000)) { diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index d845623265..7c1d548ff1 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -66,13 +66,7 @@ extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) extern BOOL NLS_IsUnicodeOnlyLcid(LCID) DECLSPEC_HIDDEN; -/* environ.c */ -extern void ENV_CopyStartupInformation(void) DECLSPEC_HIDDEN; - /* computername.c */ extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN; -/* oldconfig.c */ -extern void convert_old_config(void) DECLSPEC_HIDDEN; - #endif diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 66fa4ad506..8f506fcf13 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -741,6 +741,26 @@ DWORD64 WINAPI GetEnabledXStateFeatures(void) return 0; } +/*********************************************************************** + * GetFirmwareEnvironmentVariableA (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size) +{ + FIXME("stub: %s %s %p %u\n", debugstr_a(name), debugstr_a(guid), buffer, size); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} + +/*********************************************************************** + * GetFirmwareEnvironmentVariableW (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size) +{ + FIXME("stub: %s %s %p %u\n", debugstr_w(name), debugstr_w(guid), buffer, size); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} + /********************************************************************** * GetNumaNodeProcessorMask (KERNEL32.@) */

1 0

Henri Verbeet : wined3d: Move the swapchain logo texture blit to wined3d_cs_exec_present().
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 4bae47cf17269479d70f4fe28e4c389fea0ee561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bae47cf17269479d70f4fe2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:09 2020 +0430 wined3d: Move the swapchain logo texture blit to wined3d_cs_exec_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 11 +++++++++++ dlls/wined3d/swapchain.c | 11 +---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 89e59b5373..b5a34a6ab6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -521,13 +521,24 @@ static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { + struct wined3d_texture *logo_texture, *back_buffer; const struct wined3d_cs_present *op = data; struct wined3d_swapchain *swapchain; unsigned int i; swapchain = op->swapchain; + back_buffer = swapchain->back_buffers[0]; wined3d_swapchain_set_window(swapchain, op->dst_window_override); + if ((logo_texture = swapchain->device->logo_texture)) + { + RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; + + /* Blit the logo into the upper left corner of the back-buffer. */ + wined3d_texture_blt(back_buffer, 0, &rect, logo_texture, 0, + &rect, WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); + } + swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->swap_interval, op->flags); if (TRACE_ON(fps)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9020a99520..a48b98aac3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -469,7 +469,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->state.fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - struct wined3d_texture *logo_texture, *cursor_texture; + struct wined3d_texture *cursor_texture; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; @@ -488,15 +488,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, swapchain_gl_set_swap_interval(swapchain, context_gl, swap_interval); - if ((logo_texture = swapchain->device->logo_texture)) - { - RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; - - /* Blit the logo into the upper left corner of the drawable. */ - wined3d_texture_blt(back_buffer, 0, &rect, logo_texture, 0, &rect, - WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); - } - if ((cursor_texture = swapchain->device->cursor_texture) && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) {

1 0

Henri Verbeet : wined3d: Implement occlusion queries for the Vulkan adapter.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 8cb3d29cf0a3a15ff2b7203ac20ede26f3daae7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cb3d29cf0a3a15ff2b7203a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:11 2020 +0430 wined3d: Implement occlusion queries for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 15 ++- dlls/wined3d/context_vk.c | 157 +++++++++++++++++++++- dlls/wined3d/query.c | 287 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 86 ++++++++++++ 4 files changed, 539 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8cb3d29cf0a3a15ff2b7…

1 0

Henri Verbeet : wined3d: Implement timestamp disjoint queries for the Vulkan adapter.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 23ad2662c3a23b1a1ddb406a11ad84bb7f6f9d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ad2662c3a23b1a1ddb406a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:13 2020 +0430 wined3d: Implement timestamp disjoint queries for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 3b6f442f4a..69fc5e7474 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1660,12 +1660,21 @@ static const struct wined3d_query_ops wined3d_query_timestamp_vk_ops = .query_destroy = wined3d_query_vk_destroy, }; +static const struct wined3d_query_ops wined3d_query_timestamp_disjoint_vk_ops = +{ + .query_poll = wined3d_timestamp_disjoint_query_ops_poll, + .query_issue = wined3d_timestamp_disjoint_query_ops_issue, + .query_destroy = wined3d_query_vk_destroy, +}; + HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) { + struct wined3d_query_data_timestamp_disjoint *disjoint_data; const struct wined3d_query_ops *ops = &wined3d_query_vk_ops; struct wined3d_query_vk *query_vk; unsigned int data_size; + void *data; TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", device, type, parent, parent_ops, query); @@ -1686,6 +1695,16 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data_size = sizeof(uint64_t); break; + case WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT: + if (!wined3d_device_vk(device)->timestamp_bits) + { + WARN("Timestamp queries not supported.\n"); + return WINED3DERR_NOTAVAILABLE; + } + ops = &wined3d_query_timestamp_disjoint_vk_ops; + data_size = sizeof(struct wined3d_query_data_timestamp_disjoint); + break; + default: FIXME("Unhandled query type %#x.\n", type); return WINED3DERR_NOTAVAILABLE; @@ -1693,11 +1712,26 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer if (!(query_vk = heap_alloc_zero(sizeof(*query_vk) + data_size))) return E_OUTOFMEMORY; + data = query_vk + 1; - wined3d_query_init(&query_vk->q, device, type, query_vk + 1, data_size, ops, parent, parent_ops); + wined3d_query_init(&query_vk->q, device, type, data, data_size, ops, parent, parent_ops); list_init(&query_vk->entry); - if (type == WINED3D_QUERY_TYPE_OCCLUSION) - query_vk->control_flags = VK_QUERY_CONTROL_PRECISE_BIT; + + switch (type) + { + case WINED3D_QUERY_TYPE_OCCLUSION: + query_vk->control_flags = VK_QUERY_CONTROL_PRECISE_BIT; + break; + + case WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT: + disjoint_data = data; + disjoint_data->frequency = 1000000000 / wined3d_adapter_vk(device->adapter)->device_limits.timestampPeriod; + disjoint_data->disjoint = FALSE; + break; + + default: + break; + } TRACE("Created query %p.\n", query_vk); *query = &query_vk->q;

1 0

Alexandre Julliard : kernel32: Remove time.c.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: f41e205dfcdbadc1f44a358310a692523bb91cab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f41e205dfcdbadc1f44a3583… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:51:16 2020 +0200 kernel32: Remove time.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/kernel_private.h | 2 - dlls/kernel32/lcformat.c | 36 ++++++++++- dlls/kernel32/locale.c | 11 ++++ dlls/kernel32/sync.c | 29 +++++++++ dlls/kernel32/time.c | 135 ----------------------------------------- 6 files changed, 75 insertions(+), 139 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 801d8dd7fc..28a15f8bbe 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -29,7 +29,6 @@ C_SRCS = \ tape.c \ term.c \ thread.c \ - time.c \ toolhelp.c \ version.c \ virtual.c \ diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 7c1d548ff1..bcf2ee9a52 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -64,8 +64,6 @@ extern void FILE_SetDosError(void) DECLSPEC_HIDDEN; extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; -extern BOOL NLS_IsUnicodeOnlyLcid(LCID) DECLSPEC_HIDDEN; - /* computername.c */ extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 165cb07dd4..91fab3dc45 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -320,7 +320,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) * * Determine if a locale is Unicode only, and thus invalid in ASCII calls. */ -BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) +static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) { lcid = ConvertDefaultLocale(lcid); @@ -1767,3 +1767,37 @@ int WINAPI GetCurrencyFormatEx(LPCWSTR localename, DWORD flags, LPCWSTR value, return GetCurrencyFormatW( LocaleNameToLCID(localename, 0), flags, value, format, str, len); } + +/********************************************************************* + * GetCalendarInfoA (KERNEL32.@) + */ +int WINAPI GetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPSTR data, int size, DWORD *val ) +{ + int ret, sizeW = size; + LPWSTR dataW = NULL; + + if (NLS_IsUnicodeOnlyLcid(lcid)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!size && !(type & CAL_RETURN_NUMBER)) sizeW = GetCalendarInfoW( lcid, id, type, NULL, 0, NULL ); + if (!(dataW = HeapAlloc(GetProcessHeap(), 0, sizeW * sizeof(WCHAR)))) return 0; + + ret = GetCalendarInfoW( lcid, id, type, dataW, sizeW, val ); + if(ret && dataW && data) + ret = WideCharToMultiByte( CP_ACP, 0, dataW, -1, data, size, NULL, NULL ); + else if (type & CAL_RETURN_NUMBER) + ret *= sizeof(WCHAR); + HeapFree( GetProcessHeap(), 0, dataW ); + return ret; +} + +/********************************************************************* + * SetCalendarInfoA (KERNEL32.@) + */ +int WINAPI SetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPCSTR data) +{ + FIXME("(%08x,%08x,%08x,%s): stub\n", lcid, id, type, debugstr_a(data)); + return 0; +} diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 58389f6697..0ca4f39d26 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -172,6 +172,17 @@ BOOL WINAPI GetCPInfoExA( UINT codepage, DWORD dwFlags, LPCPINFOEXA cpinfo ) return TRUE; } + +/********************************************************************* + * GetDaylightFlag (KERNEL32.@) + */ +BOOL WINAPI GetDaylightFlag(void) +{ + TIME_ZONE_INFORMATION tzinfo; + return GetTimeZoneInformation( &tzinfo) == TIME_ZONE_ID_DAYLIGHT; +} + + /*********************************************************************** * EnumSystemCodePagesA (KERNEL32.@) */ diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d0301e484d..4032315750 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -49,6 +49,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync); +static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; + + static void get_create_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *nameW, SECURITY_ATTRIBUTES *sa, const WCHAR *name ) { @@ -100,6 +103,32 @@ static HANDLE normalize_handle_if_console(HANDLE handle) return handle; } +/****************************************************************************** + * GetTickCount64 (KERNEL32.@) + */ +ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) +{ + ULONG high, low; + + do + { + high = user_shared_data->u.TickCount.High1Time; + low = user_shared_data->u.TickCount.LowPart; + } + while (high != user_shared_data->u.TickCount.High2Time); + /* note: we ignore TickCountMultiplier */ + return (ULONGLONG)high << 32 | low; +} + +/*********************************************************************** + * GetTickCount (KERNEL32.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) +{ + /* note: we ignore TickCountMultiplier */ + return user_shared_data->u.TickCount.LowPart; +} + /*********************************************************************** * RegisterWaitForSingleObject (KERNEL32.@) */ diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c deleted file mode 100644 index 94ccbfb2b9..0000000000 --- a/dlls/kernel32/time.c +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Win32 kernel time functions - * - * Copyright 1995 Martin von Loewis and Cameron Heide - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <stdarg.h> -#include <stdlib.h> -#include <time.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winternl.h" -#include "ddk/wdm.h" -#include "kernel_private.h" -#include "wine/unicode.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(time); - -static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; - - -/********************************************************************* - * GetCalendarInfoA (KERNEL32.@) - * - */ -int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, - LPSTR lpCalData, int cchData, LPDWORD lpValue) -{ - int ret, cchDataW = cchData; - LPWSTR lpCalDataW = NULL; - - if (NLS_IsUnicodeOnlyLcid(lcid)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!cchData && !(CalType & CAL_RETURN_NUMBER)) - cchDataW = GetCalendarInfoW(lcid, Calendar, CalType, NULL, 0, NULL); - if (!(lpCalDataW = HeapAlloc(GetProcessHeap(), 0, cchDataW*sizeof(WCHAR)))) - return 0; - - ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchDataW, lpValue); - if(ret && lpCalDataW && lpCalData) - ret = WideCharToMultiByte(CP_ACP, 0, lpCalDataW, -1, lpCalData, cchData, NULL, NULL); - else if (CalType & CAL_RETURN_NUMBER) - ret *= sizeof(WCHAR); - HeapFree(GetProcessHeap(), 0, lpCalDataW); - - return ret; -} - -/********************************************************************* - * SetCalendarInfoA (KERNEL32.@) - * - */ -int WINAPI SetCalendarInfoA(LCID Locale, CALID Calendar, CALTYPE CalType, LPCSTR lpCalData) -{ - FIXME("(%08x,%08x,%08x,%s): stub\n", - Locale, Calendar, CalType, debugstr_a(lpCalData)); - return 0; -} - -/********************************************************************* - * GetDaylightFlag (KERNEL32.@) - * - * Specifies if daylight savings time is in operation. - * - * NOTES - * This function is called from the Win98's control applet timedate.cpl. - * - * RETURNS - * TRUE if daylight savings time is in operation. - * FALSE otherwise. - */ -BOOL WINAPI GetDaylightFlag(void) -{ - TIME_ZONE_INFORMATION tzinfo; - return GetTimeZoneInformation( &tzinfo) == TIME_ZONE_ID_DAYLIGHT; -} - -/****************************************************************************** - * GetTickCount64 (KERNEL32.@) - */ -ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) -{ - ULONG high, low; - - do - { - high = user_shared_data->u.TickCount.High1Time; - low = user_shared_data->u.TickCount.LowPart; - } - while (high != user_shared_data->u.TickCount.High2Time); - /* note: we ignore TickCountMultiplier */ - return (ULONGLONG)high << 32 | low; -} - -/*********************************************************************** - * GetTickCount (KERNEL32.@) - */ -DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) -{ - /* note: we ignore TickCountMultiplier */ - return user_shared_data->u.TickCount.LowPart; -}

1 0

Alexandre Julliard : kernel32: Remove string.c.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: c7760ce7a247eeb9f15b51d0ec68ca0961efc0b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7760ce7a247eeb9f15b51d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:57:31 2020 +0200 kernel32: Remove string.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/string.c | 113 ---------------------------------------------- dlls/kernel32/virtual.c | 79 ++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 114 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 28a15f8bbe..7822309de5 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -24,7 +24,6 @@ C_SRCS = \ process.c \ profile.c \ resource.c \ - string.c \ sync.c \ tape.c \ term.c \ diff --git a/dlls/kernel32/string.c b/dlls/kernel32/string.c deleted file mode 100644 index 9e1450ca58..0000000000 --- a/dlls/kernel32/string.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Kernel string functions - * - * Copyright 1993 Yngvi Sigurjonsson - * Copyright 1996 Alexandre Julliard - * Copyright 2001 Dmitry Timoshkov for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <ctype.h> -#include <stdarg.h> -#include <string.h> - -#define WINE_NO_INLINE_STRING -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" -#include "wine/exception.h" - - -/*********************************************************************** - * lstrcatA (KERNEL32.@) - * lstrcat (KERNEL32.@) - */ -LPSTR WINAPI lstrcatA( LPSTR dst, LPCSTR src ) -{ - __TRY - { - strcat( dst, src ); - } - __EXCEPT_PAGE_FAULT - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - __ENDTRY - return dst; -} - - -/*********************************************************************** - * lstrcatW (KERNEL32.@) - */ -LPWSTR WINAPI lstrcatW( LPWSTR dst, LPCWSTR src ) -{ - __TRY - { - strcatW( dst, src ); - } - __EXCEPT_PAGE_FAULT - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - __ENDTRY - return dst; -} - - -/*********************************************************************** - * lstrcpyA (KERNEL32.@) - * lstrcpy (KERNEL32.@) - */ -LPSTR WINAPI lstrcpyA( LPSTR dst, LPCSTR src ) -{ - __TRY - { - /* this is how Windows does it */ - memmove( dst, src, strlen(src)+1 ); - } - __EXCEPT_PAGE_FAULT - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - __ENDTRY - return dst; -} - - -/*********************************************************************** - * lstrcpyW (KERNEL32.@) - */ -LPWSTR WINAPI lstrcpyW( LPWSTR dst, LPCWSTR src ) -{ - __TRY - { - strcpyW( dst, src ); - } - __EXCEPT_PAGE_FAULT - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - __ENDTRY - return dst; -} diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 183a3fe05a..97581a5db1 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -30,6 +30,7 @@ # include <unistd.h> #endif +#define WINE_NO_INLINE_STRING #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION @@ -40,6 +41,7 @@ #include "winerror.h" #include "psapi.h" #include "wine/exception.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "kernel_private.h" @@ -256,3 +258,80 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) __ENDTRY return FALSE; } +/*********************************************************************** + * lstrcatA (KERNEL32.@) + * lstrcat (KERNEL32.@) + */ +LPSTR WINAPI lstrcatA( LPSTR dst, LPCSTR src ) +{ + __TRY + { + strcat( dst, src ); + } + __EXCEPT( badptr_handler ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + __ENDTRY + return dst; +} + + +/*********************************************************************** + * lstrcatW (KERNEL32.@) + */ +LPWSTR WINAPI lstrcatW( LPWSTR dst, LPCWSTR src ) +{ + __TRY + { + strcatW( dst, src ); + } + __EXCEPT( badptr_handler ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + __ENDTRY + return dst; +} + + +/*********************************************************************** + * lstrcpyA (KERNEL32.@) + * lstrcpy (KERNEL32.@) + */ +LPSTR WINAPI lstrcpyA( LPSTR dst, LPCSTR src ) +{ + __TRY + { + /* this is how Windows does it */ + memmove( dst, src, strlen(src)+1 ); + } + __EXCEPT( badptr_handler ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + __ENDTRY + return dst; +} + + +/*********************************************************************** + * lstrcpyW (KERNEL32.@) + */ +LPWSTR WINAPI lstrcpyW( LPWSTR dst, LPCWSTR src ) +{ + __TRY + { + strcpyW( dst, src ); + } + __EXCEPT( badptr_handler ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + __ENDTRY + return dst; +}

1 0