December 2019 - Wine-Commits

Michael Stefaniuc : dmband: Use only the 'dmfile' debug channel in dmutils.c.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: f8f41d815233a4cb046a599faea8032075e62f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8f41d815233a4cb046a599f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 12 01:10:57 2019 +0100 dmband: Use only the 'dmfile' debug channel in dmutils.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmutils.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 1309c7c318..39d6358211 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -42,8 +42,7 @@ #include "dmutils.h" #include "dmobject.h" -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); +WINE_DEFAULT_DEBUG_CHANNEL(dmfile); /* generic flag-dumping function */ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ @@ -127,37 +126,37 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* p switch (pChunk->fccID) { case DMUS_FOURCC_GUID_CHUNK: { - TRACE_(dmfile)(": GUID chunk\n"); + TRACE(": GUID chunk\n"); pDesc->dwValidData |= DMUS_OBJ_OBJECT; IStream_Read (pStm, &pDesc->guidObject, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_DATE_CHUNK: { - TRACE_(dmfile)(": file date chunk\n"); + TRACE(": file date chunk\n"); pDesc->dwValidData |= DMUS_OBJ_DATE; IStream_Read (pStm, &pDesc->ftDate, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_NAME_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); + TRACE(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_FILE_CHUNK: { - TRACE_(dmfile)(": file name chunk\n"); + TRACE(": file name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_FILENAME; IStream_Read (pStm, pDesc->wszFileName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { - TRACE_(dmfile)(": version chunk\n"); + TRACE(": version chunk\n"); pDesc->dwValidData |= DMUS_OBJ_VERSION; IStream_Read (pStm, &pDesc->vVersion, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { - TRACE_(dmfile)(": category chunk\n"); + TRACE(": category chunk\n"); pDesc->dwValidData |= DMUS_OBJ_CATEGORY; IStream_Read (pStm, pDesc->wszCategory, pChunk->dwSize, NULL); break; @@ -182,37 +181,37 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* p case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); + TRACE(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); - TRACE_(dmfile)(" - wszName: %s\n", debugstr_w(pDesc->wszName)); + TRACE(" - wszName: %s\n", debugstr_w(pDesc->wszName)); break; } case mmioFOURCC('I','A','R','T'): case DMUS_FOURCC_UART_CHUNK: { - TRACE_(dmfile)(": artist chunk (ignored)\n"); + TRACE(": artist chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','C','O','P'): case DMUS_FOURCC_UCOP_CHUNK: { - TRACE_(dmfile)(": copyright chunk (ignored)\n"); + TRACE(": copyright chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','S','B','J'): case DMUS_FOURCC_USBJ_CHUNK: { - TRACE_(dmfile)(": subject chunk (ignored)\n"); + TRACE(": subject chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } case mmioFOURCC('I','C','M','T'): case DMUS_FOURCC_UCMT_CHUNK: { - TRACE_(dmfile)(": comment chunk (ignored)\n"); + TRACE(": comment chunk (ignored)\n"); liMove.QuadPart = pChunk->dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; @@ -248,7 +247,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc); if (FAILED(hr)) return hr; @@ -256,29 +255,29 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, if (hr == S_FALSE) { switch (Chunk.fccID) { case DMUS_FOURCC_REF_CHUNK: { - TRACE_(dmfile)(": Reference chunk\n"); + TRACE(": Reference chunk\n"); if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL; IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL); - TRACE_(dmfile)(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); - TRACE_(dmfile)(" - dwValidData: %u\n", ref.dwValidData); + TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); + TRACE(" - dwValidData: %u\n", ref.dwValidData); break; } default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); + TRACE(": unknown chunk (irrelevant & skipping)\n"); liMove.QuadPart = Chunk.dwSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } } } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); ref_desc.dwValidData |= DMUS_OBJ_CLASS; ref_desc.guidClass = ref.guidClassID; - TRACE_(dmfile)("** DM Reference Begin of Load ***\n"); - TRACE_(dmfile)("With Desc:\n"); + TRACE("** DM Reference Begin of Load ***\n"); + TRACE("With Desc:\n"); debug_DMUS_OBJECTDESC(&ref_desc); { @@ -292,7 +291,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, hr = IDirectMusicLoader_GetObject (pLoader, &ref_desc, &IID_IDirectMusicObject, (LPVOID*)ppObject); IDirectMusicLoader_Release (pLoader); /* release loader */ } - TRACE_(dmfile)("** DM Reference End of Load ***\n"); + TRACE("** DM Reference End of Load ***\n"); return hr; }

1 0

Michael Stefaniuc : dmband: Move debugstr_dmguid() to dmobject.c.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 864e373c7541d99827d319f50d59aca67336c050 URL: https://source.winehq.org/git/wine.git/?a=commit;h=864e373c7541d99827d319f5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 12 01:10:56 2019 +0100 dmband: Move debugstr_dmguid() to dmobject.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmband_main.c | 1 + dlls/dmband/dmobject.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmband/dmobject.h | 1 + dlls/dmband/dmutils.c | 184 -------------------------------------------- dlls/dmband/dmutils.h | 9 --- 5 files changed, 191 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=864e373c7541d99827d3…

1 0

Francois Gouget : testbot/Build: Update the Gecko download URL.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: tools Branch: master Commit: 9cbf7af1a19236133047c9131859bc4c930e815f URL: https://source.winehq.org/git/tools.git/?a=commit;h=9cbf7af1a19236133047c91… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 12 13:31:30 2019 +0100 testbot/Build: Update the Gecko download URL. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 15acf67..a8e5a0e 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -314,8 +314,7 @@ sub _UpdateAddOn($$$) return 0; } - $AddOn->{filename} = "wine". ($Name eq "gecko" ? "_" : "-") . - "$Name-$AddOn->{version}". + $AddOn->{filename} = "wine-$Name-$AddOn->{version}". ($Arch eq "" ? "" : "-$Arch") .".msi"; return 1 if (!_VerifyAddOn($AddOn, $Arch));

1 0

Jacek Caban : winegecko.php: Update for new file name scheme.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: tools Branch: master Commit: 9a1950329d1a27956c96b0841204a63aba5d0899 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9a1950329d1a27956c96b08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 12 17:06:09 2019 +0100 winegecko.php: Update for new file name scheme. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winegecko.php | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/winegecko.php b/winegecko.php index 5afaa1f..b4c0aed 100644 --- a/winegecko.php +++ b/winegecko.php @@ -32,6 +32,9 @@ if(isset($_GET['v'])) { if(!$sFileSuffix) $sFileSuffix = $sVersion; +$sFile = 'wine-gecko'; +$sExt = 'msi'; + switch($sVersion) { case '0.0.1': case '0.1.0': @@ -39,14 +42,29 @@ case '0.9.0': case '0.9.1': case '1.0.0': case '1.1.0': - $sExt = 'cab'; - break; -default: - $sExt = 'msi'; + $sExt = 'cab'; + /* fall through */ +case '1.2.0': +case '1.3': +case '1.4': +case '1.5': +case '1.6': +case '1.7': +case '1.8': +case '1.9': +case '2.21': +case '2.24': +case '2.34': +case '2.36': +case '2.40': +case '2.44': +case '2.47': + $sFile = 'wine_gecko'; + break; } // Name of the file -$sFileName = sprintf('%s/%s/wine_gecko-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); +$sFileName = sprintf('%s/%s/%s-%s.%s', $sFolder, $sVersion, $sFile, $sFileSuffix, $sExt); // Common code for Wine downloader scripts require("download.inc.php");

1 0

Jacek Caban : mshtml: Update to Wine Gecko 2.47.1.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 5f0b5d350566a46f0f999e4cff7ad9e280fcfa05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f0b5d350566a46f0f999e4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 10 15:28:42 2019 +0100 mshtml: Update to Wine Gecko 2.47.1. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 8 ++++---- dlls/mshtml/nsiface.idl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 8d4be64930..48a84f3958 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -45,14 +45,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); -#define GECKO_VERSION "2.47" +#define GECKO_VERSION "2.47.1" #ifdef __i386__ #define ARCH_STRING "x86" -#define GECKO_SHA "3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a" +#define GECKO_SHA "f00b0e2892404827e8ce6811dedfc25ae699a09955bb3df1bbb31753e51da051" #elif defined(__x86_64__) #define ARCH_STRING "x86_64" -#define GECKO_SHA "c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d" +#define GECKO_SHA "69312e79a988da3e7d292382005e92bc4d4b2a52a23c34440ae3007feb57474a" #else #define ARCH_STRING "" #define GECKO_SHA "???" @@ -79,7 +79,7 @@ typedef struct { static const addon_info_t addons_info[] = { { GECKO_VERSION, - L"wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", + L"wine-gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", L"gecko", GECKO_SHA, "http://source.winehq.org/winegecko.php", diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 6074edebca..af83b6a438 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -25,7 +25,7 @@ #pragma makedep header -cpp_quote("#define GECKO_VERSION \"2.47\"") +cpp_quote("#define GECKO_VERSION \"2.47.1\"") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl";

1 0

Alexandre Julliard : kernelbase: Avoid using OpenFile().
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: d1bc340fce7249dd08c278825437d2e4fc23c854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1bc340fce7249dd08c27882… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 22:46:04 2019 +0100 kernelbase: Avoid using OpenFile(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/version.c | 72 ++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 45 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index b09004075a..920511ff09 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1104,34 +1104,24 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, */ static BOOL file_existsA( char const * path, char const * file, BOOL excl ) { - char filename[1024]; - int filenamelen; - OFSTRUCT fileinfo; - - fileinfo.cBytes = sizeof(OFSTRUCT); + DWORD sharing = excl ? 0 : FILE_SHARE_READ | FILE_SHARE_WRITE; + char filename[MAX_PATH]; + int len; + HANDLE handle; if (path) { - strcpy(filename, path); - filenamelen = strlen(filename); - - /* Add a trailing \ if necessary */ - if(filenamelen) - { - if(filename[filenamelen - 1] != '\\') - strcat(filename, "\\"); - } - else /* specify the current directory */ - strcpy(filename, ".\\"); + strcpy( filename, path ); + len = strlen(filename); + if (len && filename[len - 1] != '\\') strcat( filename, "\\" ); + strcat( filename, file ); } - else - filename[0] = 0; - - /* Create the full pathname */ - strcat(filename, file); + else if (!SearchPathA( NULL, file, NULL, MAX_PATH, filename, NULL )) return FALSE; - return (OpenFile(filename, &fileinfo, - OF_EXIST | (excl ? OF_SHARE_EXCLUSIVE : 0)) != HFILE_ERROR); + handle = CreateFileA( filename, 0, sharing, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 ); + if (handle == INVALID_HANDLE_VALUE) return FALSE; + CloseHandle( handle ); + return TRUE; } /****************************************************************************** @@ -1139,32 +1129,24 @@ static BOOL file_existsA( char const * path, char const * file, BOOL excl ) */ static BOOL file_existsW( const WCHAR *path, const WCHAR *file, BOOL excl ) { - char *filename; - DWORD pathlen, filelen; - int ret; - OFSTRUCT fileinfo; + DWORD sharing = excl ? 0 : FILE_SHARE_READ | FILE_SHARE_WRITE; + WCHAR filename[MAX_PATH]; + int len; + HANDLE handle; - fileinfo.cBytes = sizeof(OFSTRUCT); - - pathlen = WideCharToMultiByte( CP_ACP, 0, path, -1, NULL, 0, NULL, NULL ); - filelen = WideCharToMultiByte( CP_ACP, 0, file, -1, NULL, 0, NULL, NULL ); - filename = HeapAlloc( GetProcessHeap(), 0, pathlen+filelen+2 ); - - WideCharToMultiByte( CP_ACP, 0, path, -1, filename, pathlen, NULL, NULL ); - /* Add a trailing \ if necessary */ - if (pathlen > 1) + if (path) { - if (filename[pathlen-2] != '\\') strcpy( &filename[pathlen-1], "\\" ); + lstrcpyW( filename, path ); + len = lstrlenW(filename); + if (len && filename[len - 1] != '\\') lstrcatW( filename, L"\\" ); + lstrcatW( filename, file ); } - else /* specify the current directory */ - strcpy(filename, ".\\"); + else if (!SearchPathW( NULL, file, NULL, MAX_PATH, filename, NULL )) return FALSE; - WideCharToMultiByte( CP_ACP, 0, file, -1, filename+strlen(filename), filelen, NULL, NULL ); - - ret = (OpenFile(filename, &fileinfo, - OF_EXIST | (excl ? OF_SHARE_EXCLUSIVE : 0)) != HFILE_ERROR); - HeapFree( GetProcessHeap(), 0, filename ); - return ret; + handle = CreateFileW( filename, 0, sharing, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 ); + if (handle == INVALID_HANDLE_VALUE) return FALSE; + CloseHandle( handle ); + return TRUE; } /*****************************************************************************

1 0

Alexandre Julliard : kernelbase: Use exception handlers instead of IsBad* functions.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: a76518c186ac0893ea460cd3b061096f1b05c8cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a76518c186ac0893ea460cd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 22:22:43 2019 +0100 kernelbase: Use exception handlers instead of IsBad* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 15 ++++++++++++++- dlls/kernelbase/path.c | 25 ++++++++++++++++++------- dlls/kernelbase/registry.c | 11 ++++++++++- dlls/kernelbase/sync.c | 11 +++++++---- 4 files changed, 49 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 83805ece45..1bce74a636 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -688,7 +688,20 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL hmem ) { void *ret = NULL; - if (is_pointer( hmem )) return IsBadReadPtr( hmem, 1 ) ? NULL : hmem; + if (is_pointer( hmem )) + { + __TRY + { + volatile char *p = hmem; + *p |= 0; + } + __EXCEPT_PAGE_FAULT + { + return NULL; + } + __ENDTRY + return hmem; + } RtlLockHeap( GetProcessHeap() ); __TRY diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 23476694db..9b016a882e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -30,6 +30,7 @@ #include "winternl.h" #include "kernelbase.h" +#include "wine/exception.h" #include "wine/debug.h" #include "wine/heap.h" @@ -5049,10 +5050,15 @@ HRESULT WINAPI HashData(const unsigned char *src, DWORD src_len, unsigned char * HRESULT WINAPI UrlHashA(const char *url, unsigned char *dest, DWORD dest_len) { - if (IsBadStringPtrA(url, -1) || IsBadWritePtr(dest, dest_len)) + __TRY + { + HashData((const BYTE *)url, (int)strlen(url), dest, dest_len); + } + __EXCEPT_PAGE_FAULT + { return E_INVALIDARG; - - HashData((const BYTE *)url, (int)strlen(url), dest, dest_len); + } + __ENDTRY return S_OK; } @@ -5062,11 +5068,16 @@ HRESULT WINAPI UrlHashW(const WCHAR *url, unsigned char *dest, DWORD dest_len) TRACE("%s, %p, %d\n", debugstr_w(url), dest, dest_len); - if (IsBadStringPtrW(url, -1) || IsBadWritePtr(dest, dest_len)) + __TRY + { + WideCharToMultiByte(CP_ACP, 0, url, -1, urlA, MAX_PATH, NULL, NULL); + HashData((const BYTE *)urlA, (int)strlen(urlA), dest, dest_len); + } + __EXCEPT_PAGE_FAULT + { return E_INVALIDARG; - - WideCharToMultiByte(CP_ACP, 0, url, -1, urlA, MAX_PATH, NULL, NULL); - HashData((const BYTE *)urlA, (int)strlen(urlA), dest, dest_len); + } + __ENDTRY return S_OK; } diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 80f5ffef02..ad9a2a3366 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -41,6 +41,7 @@ #include "kernelbase.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/heap.h" #include "wine/list.h" @@ -3432,8 +3433,16 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, const WCHAR *value, DWORD type, vo TRACE("%p, %s, %d, %p, %d, %#x\n", hUSKey, debugstr_w(value), type, data, data_len, flags); - if (!hUSKey || IsBadWritePtr(hUSKey, sizeof(struct USKEY)) || !(flags & (SHREGSET_FORCE_HKCU|SHREGSET_FORCE_HKLM))) + __TRY + { + dummy = hKey->HKCUkey || hKey->HKLMkey; + } + __EXCEPT_PAGE_FAULT + { return ERROR_INVALID_PARAMETER; + } + __ENDTRY + if (!(flags & (SHREGSET_FORCE_HKCU|SHREGSET_FORCE_HKLM))) return ERROR_INVALID_PARAMETER; if (flags & (SHREGSET_FORCE_HKCU | SHREGSET_HKCU)) { diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 781a729ae9..b64c43dc05 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -36,6 +36,7 @@ #include "kernelbase.h" #include "wine/asm.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(sync); @@ -336,14 +337,16 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateEventExW( SECURITY_ATTRIBUTES *sa, LPCWSTR /* one buggy program needs this * ("Van Dale Groot woordenboek der Nederlandse taal") */ - if (sa && IsBadReadPtr(sa,sizeof(SECURITY_ATTRIBUTES))) + __TRY + { + get_create_object_attributes( &attr, &nameW, sa, name ); + } + __EXCEPT_PAGE_FAULT { - ERR("Bad security attributes pointer %p\n",sa); SetLastError( ERROR_INVALID_PARAMETER); return 0; } - - get_create_object_attributes( &attr, &nameW, sa, name ); + __ENDTRY status = NtCreateEvent( &ret, access, &attr, (flags & CREATE_EVENT_MANUAL_RESET) ? NotificationEvent : SynchronizationEvent,

1 0

Alexandre Julliard : kernel32: Remove heap function replacements.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: f88404bfb0401268dac45fc8974687ba6a227c66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f88404bfb0401268dac45fc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 22:21:54 2019 +0100 kernel32: Remove heap function replacements. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 3027a6ee17..6c5219b624 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -143,34 +143,6 @@ BOOL WINAPI HeapDestroy( HANDLE heap /* [in] Handle of heap */ ) } - - - -/* These are needed so that we can call the functions from inside kernel itself */ - -/*********************************************************************** - * HeapAlloc (KERNEL32.@) - */ -LPVOID WINAPI HeapAlloc( HANDLE heap, DWORD flags, SIZE_T size ) -{ - return RtlAllocateHeap( heap, flags, size ); -} - -BOOL WINAPI HeapFree( HANDLE heap, DWORD flags, LPVOID ptr ) -{ - return RtlFreeHeap( heap, flags, ptr ); -} - -LPVOID WINAPI HeapReAlloc( HANDLE heap, DWORD flags, LPVOID ptr, SIZE_T size ) -{ - return RtlReAllocateHeap( heap, flags, ptr, size ); -} - -SIZE_T WINAPI HeapSize( HANDLE heap, DWORD flags, LPCVOID ptr ) -{ - return RtlSizeHeap( heap, flags, ptr ); -} - /* * Win32 Global heap functions (GlobalXXX). * These functions included in Win32 for compatibility with 16 bit Windows

1 0

Alexandre Julliard : kernelbase: Avoid calling some kernel32 functions.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: a3b8e944e676706bf834f2a4f46e5dbaa1d64baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b8e944e676706bf834f2a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 21:53:09 2019 +0100 kernelbase: Avoid calling some kernel32 functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/registry.c | 10 +++++----- dlls/kernelbase/thread.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 1fee41ec5e..80f5ffef02 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -2687,10 +2687,10 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, return ERROR_NOT_ENOUGH_MEMORY; GetFullPathNameW(file_name, size, full_name, NULL); - EnterCriticalSection(&reg_mui_cs); + RtlEnterCriticalSection(&reg_mui_cs); size = reg_mui_cache_get(full_name, res_id, &string); if (!size) { - LeaveCriticalSection(&reg_mui_cs); + RtlLeaveCriticalSection(&reg_mui_cs); /* Load the file */ hModule = LoadLibraryExW(full_name, NULL, @@ -2705,9 +2705,9 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, goto cleanup; } - EnterCriticalSection(&reg_mui_cs); + RtlEnterCriticalSection(&reg_mui_cs); reg_mui_cache_put(full_name, res_id, string, size); - LeaveCriticalSection(&reg_mui_cs); + RtlLeaveCriticalSection(&reg_mui_cs); } *req_chars = size + 1; @@ -2739,7 +2739,7 @@ cleanup: if (hModule) FreeLibrary(hModule); else - LeaveCriticalSection(&reg_mui_cs); + RtlLeaveCriticalSection(&reg_mui_cs); heap_free(full_name); return result; } diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 2f0bcb7dde..f669c9d873 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -866,7 +866,7 @@ static void CDECL start_fiber(void) __TRY { start( fiber->param ); - ExitThread( 1 ); + RtlExitUserThread( 1 ); } __EXCEPT(UnhandledExceptionFilter) { @@ -996,7 +996,7 @@ void WINAPI DECLSPEC_HOTPATCH DeleteFiber( LPVOID fiber_ptr ) if (fiber == NtCurrentTeb()->Tib.u.FiberData) { HeapFree( GetProcessHeap(), 0, fiber ); - ExitThread(1); + RtlExitUserThread( 1 ); } RtlFreeUserStack( fiber->stack_allocation ); HeapFree( GetProcessHeap(), 0, fiber->fls_slots );

1 0

Alexandre Julliard : kernelbase: Redirect heap allocation functions to ntdll.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 22b225083415a0c930abedd30b3cd823f6242c67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22b225083415a0c930abedd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 22:21:17 2019 +0100 kernelbase: Redirect heap allocation functions to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.h | 5 +++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 2 +- dlls/kernelbase/path.c | 1 + dlls/kernelbase/string.c | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index d7de53c412..459ae88c71 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -54,4 +54,9 @@ static inline BOOL set_ntstatus( NTSTATUS status ) return !status; } +/* make the kernel32 names available */ +#define HeapAlloc(heap, flags, size) RtlAllocateHeap(heap, flags, size) +#define HeapReAlloc(heap, flags, ptr, size) RtlReAllocateHeap(heap, flags, ptr, size) +#define HeapFree(heap, flags, ptr) RtlFreeHeap(heap, flags, ptr) + #endif /* __WINE_KERNELBASE_H */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 032e379dc0..8e5e81d564 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -775,7 +775,7 @@ @ stdcall HeapCompact(long long) @ stdcall HeapCreate(long long long) @ stdcall HeapDestroy(long) -@ stdcall HeapFree(long long ptr) +@ stdcall HeapFree(long long ptr) ntdll.RtlFreeHeap @ stdcall HeapLock(long) @ stdcall HeapQueryInformation(long long ptr long ptr) @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index b735e7dee9..1c8c83d229 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -28,8 +28,8 @@ #include "winternl.h" #include "wine/debug.h" -#include "wine/heap.h" #include "kernelbase.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(kernelbase); diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index e9182a764d..23476694db 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -29,6 +29,7 @@ #include "intshcut.h" #include "winternl.h" +#include "kernelbase.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 9a4d8c0827..7c484e2858 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -24,6 +24,7 @@ #include "shlwapi.h" #include "winternl.h" +#include "kernelbase.h" #include "wine/debug.h" #include "wine/exception.h"

1 0