Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[QMGR] Sync with Wine Staging 4.18. CORE-16441

Browse source
This commit is contained in:
Amine Khaldi 2019-11-23 12:10:04 +01:00
parent b1ad5055dc
commit e3bf841067
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/qmgr/file.c
View file

@ -459,7 +459,7 @@ static BOOL transfer_file_local(BackgroundCopyFileImpl *file, const WCHAR *tmpna
transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSFERRING);
if (strlenW(file->info.RemoteName) > 7 && !memicmpW(file->info.RemoteName, fileW, 7))
if (lstrlenW(file->info.RemoteName) > 7 && !_wcsnicmp(file->info.RemoteName, fileW, 7))
ptr = file->info.RemoteName + 7;
else
ptr = file->info.RemoteName;

4
dll/win32/qmgr/job.c
View file

@ -599,7 +599,7 @@ static HRESULT WINAPI BackgroundCopyJob_SetDescription(
if (!Val) return E_INVALIDARG;
len = strlenW(Val);
len = lstrlenW(Val);
if (len > max_description_len) return BG_E_STRING_TOO_LONG;
EnterCriticalSection(&This->cs);
@ -612,7 +612,7 @@ static HRESULT WINAPI BackgroundCopyJob_SetDescription(
{
HeapFree(GetProcessHeap(), 0, This->description);
if ((This->description = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR))))
strcpyW(This->description, Val);
lstrcpyW(This->description, Val);
else
hr = E_OUTOFMEMORY;
}

13
dll/win32/qmgr/qmgr.h
View file

@ -31,7 +31,6 @@
#include <string.h>
#include "wine/list.h"
#include "wine/unicode.h"
/* Background copy job vtbl and related data */
typedef struct
@ -118,15 +117,15 @@ BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_ST
/* Little helper functions */
static inline WCHAR *strdupW(const WCHAR *src)
{
WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(src) + 1) * sizeof(WCHAR));
if (dst) strcpyW(dst, src);
WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR));
if (dst) lstrcpyW(dst, src);
return dst;
}
static inline WCHAR *co_strdupW(const WCHAR *src)
{
WCHAR *dst = CoTaskMemAlloc((strlenW(src) + 1) * sizeof(WCHAR));
if (dst) strcpyW(dst, src);
WCHAR *dst = CoTaskMemAlloc((lstrlenW(src) + 1) * sizeof(WCHAR));
if (dst) lstrcpyW(dst, src);
return dst;
}
@ -136,10 +135,10 @@ static inline HRESULT return_strval(const WCHAR *str, WCHAR **ret)
if (!ret) return E_INVALIDARG;
len = strlenW(str);
len = lstrlenW(str);
*ret = CoTaskMemAlloc((len+1)*sizeof(WCHAR));
if (!*ret) return E_OUTOFMEMORY;
strcpyW(*ret, str);
lstrcpyW(*ret, str);
return S_OK;
}

2
media/doc/README.WINE
View file

@ -154,7 +154,7 @@ dll/win32/powrprof # Forked at Wine-1.0rc5
dll/win32/printui # Synced to WineStaging-4.18
dll/win32/propsys # Synced to WineStaging-4.18
dll/win32/pstorec # Synced to WineStaging-3.3
dll/win32/qmgr # Synced to WineStaging-4.0
dll/win32/qmgr # Synced to WineStaging-4.18
dll/win32/qmgrprxy # Synced to WineStaging-2.9
dll/win32/query # Synced to WineStaging-3.3
dll/win32/rasapi32 # Synced to WineStaging-3.3