[akhaldi] 74783: [ADVPACK] Sync with Wine Staging 2.9. CORE-13362 a059696 advpack: Sort specfile. c0b3703 advpack: Don't trace the contents of an output buffer (Valgrind). 31c1895 advpack: Fix some...
Author: akhaldi Date: Sat Jun 3 18:36:59 2017 New Revision: 74783
URL: http://svn.reactos.org/svn/reactos?rev=74783&view=rev Log: [ADVPACK] Sync with Wine Staging 2.9. CORE-13362
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().
Modified: trunk/reactos/dll/win32/advpack/advpack.c trunk/reactos/dll/win32/advpack/advpack.spec trunk/reactos/dll/win32/advpack/advpack_private.h trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.c... ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] Sat Jun 3 18:36:59 2017 @@ -749,9 +749,9 @@ 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 @@ 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;
Modified: trunk/reactos/dll/win32/advpack/advpack.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.s... ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack.spec [iso-8859-1] Sat Jun 3 18:36:59 2017 @@ -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)
Modified: trunk/reactos/dll/win32/advpack/advpack_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack_p... ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack_private.h [iso-8859-1] Sat Jun 3 18:36:59 2017 @@ -45,9 +45,9 @@
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)
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jun 3 18:36:59 2017 @@ -44,7 +44,7 @@
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
-
akhaldi＠svn.reactos.org