Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-28 19:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] setupapi: Move strdupW and strdupWtoA to the setupapi_private.h header.

Browse source 
wine commit id 44ab294e0b6f285f1aab5fc8533a36e852be38fa by Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
winesync 2023-09-28 17:44:59 +02:00 committed by Hermès Bélusca-Maïto
parent 8ffb29a268
commit 00356397b2
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dll/win32/setupapi/queue.c
View file

@ -69,29 +69,6 @@ struct file_queue
};
static inline WCHAR *strdupW( const WCHAR *str )
{
WCHAR *ret = NULL;
if (str)
{
int len = (strlenW(str) + 1) * sizeof(WCHAR);
if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) memcpy( ret, str, len );
}
return ret;
}
static inline char *strdupWtoA( const WCHAR *str )
{
char *ret = NULL;
if (str)
{
DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL );
if ((ret = HeapAlloc( GetProcessHeap(), 0, len )))
WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL );
}
return ret;
}
/* append a file operation to a queue */
static inline void queue_file_op( struct file_op_queue *queue, struct file_op *op )
{

25
dll/win32/setupapi/setupapi_private.h
View file

@ -268,7 +268,30 @@ extern DWORD GlobalSetupFlags;
#define REGPART_RENAME "\\Rename"
#define REG_VERSIONCONFLICT "Software\\Microsoft\\VersionConflictManager"
inline static WCHAR *strdupAtoW( const char *str )
static inline WCHAR *strdupW( const WCHAR *str )
{
WCHAR *ret = NULL;
if (str)
{
int len = (strlenW(str) + 1) * sizeof(WCHAR);
if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) memcpy( ret, str, len );
}
return ret;
}
static inline char *strdupWtoA( const WCHAR *str )
{
char *ret = NULL;
if (str)
{
DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL );
if ((ret = HeapAlloc( GetProcessHeap(), 0, len )))
WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL );
}
return ret;
}
static inline WCHAR *strdupAtoW( const char *str )
{
WCHAR *ret = NULL;
if (str)

2
sdk/tools/winesync/setupapi.cfg
View file

@ -6,4 +6,4 @@ files:
dlls/setupapi/stringtable.c: dll/win32/setupapi/stringtable.c
include/setupapi.h: sdk/include/psdk/setupapi.h
tags:
wine: wine-0.9.59
wine: 44ab294e0b6f285f1aab5fc8533a36e852be38fa