Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ADVPACK] Sync with Wine Staging 2.9. CORE-13362

Browse source 
a059696 advpack: Sort specfile.
c0b3703 advpack: Don't trace the contents of an output buffer (Valgrind).
31c1895 advpack: Fix some spec file entries.
2ed059a advpack: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().

svn path=/trunk/; revision=74783
This commit is contained in:
Amine Khaldi 2017-06-03 18:36:59 +00:00
parent 3e73825c04
commit f91f6781d9
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/win32/advpack/advpack.c
View file

@ -749,9 +749,9 @@ HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename,
HRESULT res;
DWORD len = 0;
TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename),
TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename),
debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey),
debugstr_a(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved);
pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved);
if (!pszInfFilename || !pszTranslateSection ||
!pszTranslateKey || !pdwRequiredSize)
@ -829,9 +829,9 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename,
LPWSTR pszBuffer, DWORD dwBufferSize,
PDWORD pdwRequiredSize, PVOID pvReserved)
{
TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename),
TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename),
debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey),
debugstr_w(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved);
pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved);
if (!hInf || !pszInfFilename || !pszTranslateSection || !pszTranslateKey)
return E_INVALIDARG;

6
reactos/dll/win32/advpack/advpack.spec
View file

@ -24,9 +24,9 @@
24 stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA
25 stdcall ExecuteCabA(ptr ptr ptr)
26 stdcall ExecuteCabW(ptr ptr ptr)
27 stdcall ExtractFiles(str str long ptr ptr long) ExtractFilesA
28 stdcall ExtractFilesA(str str long ptr ptr long)
29 stdcall ExtractFilesW(wstr wstr long ptr ptr long)
27 stdcall ExtractFiles(str str long str ptr long) ExtractFilesA
28 stdcall ExtractFilesA(str str long str ptr long)
29 stdcall ExtractFilesW(wstr wstr long wstr ptr long)
30 stdcall FileSaveMarkNotExist(str str str) FileSaveMarkNotExistA
31 stdcall FileSaveMarkNotExistA(str str str)
32 stdcall FileSaveMarkNotExistW(wstr wstr wstr)

4
reactos/dll/win32/advpack/advpack_private.h
View file

@ -45,9 +45,9 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECL
HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN;
static inline void *heap_alloc(size_t len)
static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
{
return HeapAlloc(GetProcessHeap(), 0, len);
return HeapAlloc(GetProcessHeap(), 0, size);
}
static inline BOOL heap_free(void *mem)

2
reactos/media/doc/README.WINE
View file

@ -44,7 +44,7 @@ reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4
reactos/dll/win32/activeds # Synced to WineStaging-1.9.11
reactos/dll/win32/actxprxy # Synced to WineStaging-1.9.11
reactos/dll/win32/advpack # Synced to WineStaging-1.9.11
reactos/dll/win32/advpack # Synced to WineStaging-2.9
reactos/dll/win32/atl # Synced to WineStaging-2.2
reactos/dll/win32/atl80 # Synced to WineStaging-1.9.11
reactos/dll/win32/atl100 # Synced to WineStaging-1.9.11