Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 40522: - Use SEH in LdrGetProcedureAddress. It fixes an exception in "kernel32_winetest module" and some wine tests
by dchapyshev＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: dchapyshev Date: Wed Apr 15 13:27:59 2009 New Revision: 40522 URL: http://svn.reactos.org/svn/reactos?rev=40522&view=rev Log: - Use SEH in LdrGetProcedureAddress. It fixes an exception in "kernel32_winetest module" and some wine tests Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Wed Apr 15 13:27:59 2009 @@ -2486,7 +2486,9 @@ DPRINT("LdrGetProcedureAddress (BaseAddress %p Name %Z Ordinal %lu ProcedureAddress %p)\n", BaseAddress, Name, Ordinal, ProcedureAddress); - if (Name && Name->Length) + _SEH2_TRY + { + if (Name && Name->Length) { /* by name */ *ProcedureAddress = LdrGetExportByName(BaseAddress, (PUCHAR)Name->Buffer, 0xffff); @@ -2496,7 +2498,7 @@ } DPRINT("LdrGetProcedureAddress: Can't resolve symbol '%Z'\n", Name); } - else + else { /* by ordinal */ Ordinal &= 0x0000FFFF; @@ -2507,6 +2509,12 @@ } DPRINT("LdrGetProcedureAddress: Can't resolve symbol @%lu\n", Ordinal); } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Ignore exception and return */ + } + _SEH2_END; return STATUS_PROCEDURE_NOT_FOUND; }

1 0

[fireball] 40521: - Disable ACPI once again until bug 3363 and bug 4221 are fixed. See issue #3363 for more details.
by fireball＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: fireball Date: Wed Apr 15 13:19:24 2009 New Revision: 40521 URL: http://svn.reactos.org/svn/reactos?rev=40521&view=rev Log: - Disable ACPI once again until bug 3363 and bug 4221 are fixed. See issue #3363 for more details. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Apr 15 13:19:24 2009 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -#define ENABLE_ACPI +//#define ENABLE_ACPI /* GLOBALS *******************************************************************/

1 0

[cwittich] 40520: sync wininet urlcache.c with wine 1.1.19 - fixes memory corruptions
by cwittich＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: cwittich Date: Wed Apr 15 13:17:12 2009 New Revision: 40520 URL: http://svn.reactos.org/svn/reactos?rev=40520&view=rev Log: sync wininet urlcache.c with wine 1.1.19 - fixes memory corruptions Modified: trunk/reactos/dll/win32/wininet/urlcache.c Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… ============================================================================== --- trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Wed Apr 15 13:17:12 2009 @@ -2,7 +2,7 @@ * Wininet - Url Cache functions * * Copyright 2001,2002 CodeWeavers - * Copyright 2003 Robert Shearman + * Copyright 2003-2008 Robert Shearman * * Eric Kohl * Aric Stewart @@ -25,14 +25,22 @@ #include "config.h" #include "wine/port.h" +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#if defined(__MINGW32__) || defined (_MSC_VER) +#include <ws2tcpip.h> +#endif + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif #include <time.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" @@ -178,7 +186,7 @@ /* List of all containers available */ static struct list UrlContainers = LIST_INIT(UrlContainers); -static HASH_CACHEFILE_ENTRY *URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash); +static DWORD URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash, HASH_CACHEFILE_ENTRY **ppHash); /*********************************************************************** * URLCache_PathToObjectName (Internal) @@ -206,11 +214,11 @@ * Opens the index file and saves mapping handle in hCacheIndexMapping * * RETURNS - * TRUE if succeeded - * FALSE if failed - * - */ -static BOOL URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) + * ERROR_SUCCESS if succeeded + * Any other Win32 error code if failed + * + */ +static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) { HANDLE hFile; WCHAR wszFilePath[MAX_PATH]; @@ -220,7 +228,7 @@ static const WCHAR wszMappingFormat[] = {'%','s','%','s','_','%','l','u',0}; if (pContainer->hMapping) - return TRUE; + return ERROR_SUCCESS; strcpyW(wszFilePath, pContainer->path); strcatW(wszFilePath, wszIndex); @@ -235,7 +243,7 @@ if (hFile == INVALID_HANDLE_VALUE) { TRACE("Could not open or create cache index file \"%s\"\n", debugstr_w(wszFilePath)); - return FALSE; + return GetLastError(); } /* At this stage we need the mutex because we may be about to create the @@ -247,7 +255,7 @@ if (dwFileSize == INVALID_FILE_SIZE) { ReleaseMutex(pContainer->hMutex); - return FALSE; + return GetLastError(); } if (dwFileSize == 0) @@ -256,7 +264,7 @@ HKEY key; char achZeroes[0x1000]; DWORD dwOffset; - DWORD dwError = 0; + DWORD dwError = ERROR_SUCCESS; /* Write zeroes to the entire file so we can safely map it without * fear of getting a SEGV because the disk is full. @@ -282,7 +290,7 @@ } } - if (!dwError) + if (dwError == ERROR_SUCCESS) { HANDLE hMapping = CreateFileMappingW(hFile, NULL, PAGE_READWRITE, 0, NEWFILE_SIZE, NULL); @@ -296,6 +304,7 @@ WCHAR wszDirPath[MAX_PATH]; FILETIME ft; int i, j; + HASH_CACHEFILE_ENTRY *pHashEntry; dwFileSize = NEWFILE_SIZE; @@ -326,7 +335,7 @@ RegCloseKey(key); } - URLCache_CreateHashTable(pHeader, NULL); + URLCache_CreateHashTable(pHeader, NULL, &pHashEntry); /* Last step - create the directories */ @@ -416,8 +425,7 @@ CloseHandle(hFile); DeleteFileW(wszFilePath); ReleaseMutex(pContainer->hMutex); - SetLastError(dwError); - return FALSE; + return dwError; } } @@ -433,10 +441,10 @@ if (!pContainer->hMapping) { ERR("Couldn't create file mapping (error is %d)\n", GetLastError()); - return FALSE; - } - - return TRUE; + return GetLastError(); + } + + return ERROR_SUCCESS; } /*********************************************************************** @@ -579,7 +587,7 @@ ); } -static BOOL URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, URLCACHECONTAINER ** ppContainer) +static DWORD URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, URLCACHECONTAINER ** ppContainer) { URLCACHECONTAINER * pContainer; @@ -590,19 +598,18 @@ int prefix_len = strlenW(pContainer->cache_prefix); if (!strncmpW(pContainer->cache_prefix, lpwszUrl, prefix_len)) { - TRACE("found container with prefx %s for URL %s\n", debugstr_w(pContainer->cache_prefix), debugstr_w(lpwszUrl)); + TRACE("found container with prefix %s for URL %s\n", debugstr_w(pContainer->cache_prefix), debugstr_w(lpwszUrl)); *ppContainer = pContainer; - return TRUE; + return ERROR_SUCCESS; } } ERR("no container found\n"); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; -} - -static BOOL URLCacheContainers_FindContainerA(LPCSTR lpszUrl, URLCACHECONTAINER ** ppContainer) -{ - BOOL ret; + return ERROR_FILE_NOT_FOUND; +} + +static DWORD URLCacheContainers_FindContainerA(LPCSTR lpszUrl, URLCACHECONTAINER ** ppContainer) +{ + DWORD ret; LPWSTR lpwszUrl; int url_len = MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, NULL, 0); if (url_len && (lpwszUrl = HeapAlloc(GetProcessHeap(), 0, url_len * sizeof(WCHAR)))) @@ -612,7 +619,7 @@ HeapFree(GetProcessHeap(), 0, lpwszUrl); return ret; } - return FALSE; + return GetLastError(); } static BOOL URLCacheContainers_Enum(LPCWSTR lpwszSearchPattern, DWORD dwIndex, URLCACHECONTAINER ** ppContainer) @@ -654,12 +661,18 @@ /*********************************************************************** * URLCacheContainer_LockIndex (Internal) * + * Locks the index for system-wide exclusive access. + * + * RETURNS + * Cache file header if successful + * NULL if failed and calls SetLastError. */ static LPURLCACHE_HEADER URLCacheContainer_LockIndex(URLCACHECONTAINER * pContainer) { BYTE index; LPVOID pIndexData; URLCACHE_HEADER * pHeader; + DWORD error; /* acquire mutex */ WaitForSingleObject(pContainer->hMutex, INFINITE); @@ -670,7 +683,7 @@ { ReleaseMutex(pContainer->hMutex); ERR("Couldn't MapViewOfFile. Error: %d\n", GetLastError()); - return FALSE; + return NULL; } pHeader = (URLCACHE_HEADER *)pIndexData; @@ -680,10 +693,12 @@ if (pHeader->dwFileSize != pContainer->file_size) { URLCacheContainer_CloseIndex(pContainer); - if (!URLCacheContainer_OpenIndex(pContainer)) + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) { ReleaseMutex(pContainer->hMutex); - return FALSE; + SetLastError(error); + return NULL; } pIndexData = MapViewOfFile(pContainer->hMapping, FILE_MAP_WRITE, 0, 0, 0); @@ -691,7 +706,7 @@ { ReleaseMutex(pContainer->hMutex); ERR("Couldn't MapViewOfFile. Error: %d\n", GetLastError()); - return FALSE; + return NULL; } pHeader = (URLCACHE_HEADER *)pIndexData; } @@ -931,11 +946,11 @@ * Copies an entry from the cache index file to the Win32 structure * * RETURNS - * TRUE if the buffer was big enough - * FALSE if the buffer was too small - * - */ -static BOOL URLCache_CopyEntry( + * ERROR_SUCCESS if the buffer was big enough + * ERROR_INSUFFICIENT_BUFFER if the buffer was too small + * + */ +static DWORD URLCache_CopyEntry( URLCACHECONTAINER * pContainer, LPCURLCACHE_HEADER pHeader, LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, @@ -983,9 +998,9 @@ DWORD lenUrlBytes = (lenUrl+1) * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); lpCacheEntryInfo->lpszSourceUrlName = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenUrlBytes; - if (bUnicode) - MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); - else + if (bUnicode) + MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); + else memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, lenUrlBytes); } @@ -1000,7 +1015,7 @@ lpszLocalFileName = (LPSTR)lpCacheEntryInfo + dwRequiredSize; nLocalFilePathSize = *lpdwBufferSize - dwRequiredSize; if ((bUnicode && URLCache_LocalFileNameToPathW(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, (LPWSTR)lpszLocalFileName, &nLocalFilePathSize)) || - URLCache_LocalFileNameToPathA(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, lpszLocalFileName, &nLocalFilePathSize)) + (!bUnicode && URLCache_LocalFileNameToPathA(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, lpszLocalFileName, &nLocalFilePathSize))) { lpCacheEntryInfo->lpszLocalFileName = lpszLocalFileName; } @@ -1049,11 +1064,10 @@ if (dwRequiredSize > *lpdwBufferSize) { *lpdwBufferSize = dwRequiredSize; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; + return ERROR_INSUFFICIENT_BUFFER; } *lpdwBufferSize = dwRequiredSize; - return TRUE; + return ERROR_SUCCESS; } @@ -1064,11 +1078,11 @@ * according to the flags set by dwFieldControl. * * RETURNS - * TRUE if the buffer was big enough - * FALSE if the buffer was too small - * - */ -static BOOL URLCache_SetEntryInfo(URL_CACHEFILE_ENTRY * pUrlEntry, const INTERNET_CACHE_ENTRY_INFOW * lpCacheEntryInfo, DWORD dwFieldControl) + * ERROR_SUCCESS if the buffer was big enough + * ERROR_INSUFFICIENT_BUFFER if the buffer was too small + * + */ +static DWORD URLCache_SetEntryInfo(URL_CACHEFILE_ENTRY * pUrlEntry, const INTERNET_CACHE_ENTRY_INFOW * lpCacheEntryInfo, DWORD dwFieldControl) { if (dwFieldControl & CACHE_ENTRY_ACCTIME_FC) pUrlEntry->LastAccessTime = lpCacheEntryInfo->LastAccessTime; @@ -1087,7 +1101,7 @@ if (dwFieldControl & CACHE_ENTRY_SYNCTIME_FC) FileTimeToDosDateTime(&lpCacheEntryInfo->LastAccessTime, &pUrlEntry->wLastSyncDate, &pUrlEntry->wLastSyncTime); - return TRUE; + return ERROR_SUCCESS; } /*********************************************************************** @@ -1285,11 +1299,11 @@ * key are entered into the hash table. * * RETURNS - * TRUE if the entry was added - * FALSE if the entry could not be added - * - */ -static BOOL URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, DWORD dwOffsetEntry) + * ERROR_SUCCESS if the entry was added + * Any other Win32 error code if the entry could not be added + * + */ +static DWORD URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, DWORD dwOffsetEntry) { /* see URLCache_FindEntryInHash for structure of hash tables */ @@ -1297,6 +1311,7 @@ DWORD offset = (key % HASHTABLE_NUM_ENTRIES) * sizeof(struct _HASH_ENTRY); HASH_CACHEFILE_ENTRY * pHashEntry; DWORD dwHashTableNumber = 0; + DWORD error; key = (key / HASHTABLE_NUM_ENTRIES) * HASHTABLE_NUM_ENTRIES; @@ -1324,17 +1339,17 @@ { pHashElement->dwHashKey = key; pHashElement->dwOffsetEntry = dwOffsetEntry; - return TRUE; + return ERROR_SUCCESS; } } } - pHashEntry = URLCache_CreateHashTable(pHeader, pHashEntry); - if (!pHashEntry) - return FALSE; + error = URLCache_CreateHashTable(pHeader, pHashEntry, &pHashEntry); + if (error != ERROR_SUCCESS) + return error; pHashEntry->HashTable[offset].dwHashKey = key; pHashEntry->HashTable[offset].dwOffsetEntry = dwOffsetEntry; - return TRUE; + return ERROR_SUCCESS; } /*********************************************************************** @@ -1344,38 +1359,36 @@ * hash tables. * * RETURNS - * TRUE if the hash table was created - * FALSE if the hash table could not be created - * - */ -static HASH_CACHEFILE_ENTRY *URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash) -{ - HASH_CACHEFILE_ENTRY *pHash; + * ERROR_SUCCESS if the hash table was created + * ERROR_DISK_FULL if the hash table could not be created + * + */ +static DWORD URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash, HASH_CACHEFILE_ENTRY **ppHash) +{ DWORD dwOffset; int i; - if (!URLCache_FindFirstFreeEntry(pHeader, 0x20, (CACHEFILE_ENTRY **)&pHash)) + if (!URLCache_FindFirstFreeEntry(pHeader, 0x20, (CACHEFILE_ENTRY **)ppHash)) { FIXME("no free space for hash table\n"); - SetLastError(ERROR_DISK_FULL); - return NULL; - } - - dwOffset = (BYTE *)pHash - (BYTE *)pHeader; + return ERROR_DISK_FULL; + } + + dwOffset = (BYTE *)*ppHash - (BYTE *)pHeader; if (pPrevHash) pPrevHash->dwAddressNext = dwOffset; else pHeader->dwOffsetFirstHashTable = dwOffset; - pHash->CacheFileEntry.dwSignature = HASH_SIGNATURE; - pHash->CacheFileEntry.dwBlocksUsed = 0x20; - pHash->dwHashTableNumber = pPrevHash ? pPrevHash->dwHashTableNumber + 1 : 0; + (*ppHash)->CacheFileEntry.dwSignature = HASH_SIGNATURE; + (*ppHash)->CacheFileEntry.dwBlocksUsed = 0x20; + (*ppHash)->dwHashTableNumber = pPrevHash ? pPrevHash->dwHashTableNumber + 1 : 0; for (i = 0; i < HASHTABLE_SIZE; i++) { - pHash->HashTable[i].dwOffsetEntry = 0; - pHash->HashTable[i].dwHashKey = HASHTABLE_FREE; - } - return pHash; + (*ppHash)->HashTable[i].dwOffsetEntry = 0; + (*ppHash)->HashTable[i].dwHashKey = HASHTABLE_FREE; + } + return ERROR_SUCCESS; } /*********************************************************************** @@ -1488,14 +1501,23 @@ const CACHEFILE_ENTRY * pEntry; const URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; + DWORD error; TRACE("(%s, %p, %p)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize); - if (!URLCacheContainers_FindContainerA(lpszUrlName, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -1524,18 +1546,23 @@ if (lpdwCacheEntryInfoBufferSize) { - if (!URLCache_CopyEntry( + if (!lpCacheEntryInfo) + *lpdwCacheEntryInfoBufferSize = 0; + + error = URLCache_CopyEntry( pContainer, pHeader, lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, pUrlEntry, - FALSE /* ANSI */)) + FALSE /* ANSI */); + if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); + SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a(lpCacheEntryInfo->lpszLocalFileName)); + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); } URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1556,14 +1583,23 @@ const CACHEFILE_ENTRY * pEntry; const URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; + DWORD error; TRACE("(%s, %p, %p)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize); - if (!URLCacheContainers_FindContainerW(lpszUrl, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -1591,18 +1627,23 @@ if (lpdwCacheEntryInfoBufferSize) { - if (!URLCache_CopyEntry( + if (!lpCacheEntryInfo) + *lpdwCacheEntryInfoBufferSize = 0; + + error = URLCache_CopyEntry( pContainer, pHeader, (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, pUrlEntry, - TRUE /* UNICODE */)) + TRUE /* UNICODE */); + if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); + SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_w(lpCacheEntryInfo->lpszLocalFileName)); + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); } URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1657,14 +1698,23 @@ struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; URLCACHECONTAINER * pContainer; + DWORD error; TRACE("(%s, %p, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, dwFieldControl); - if (!URLCacheContainers_FindContainerA(lpszUrlName, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -1705,14 +1755,23 @@ struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; URLCACHECONTAINER * pContainer; + DWORD error; TRACE("(%s, %p, 0x%08x)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, dwFieldControl); - if (!URLCacheContainers_FindContainerW(lpszUrl, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -1760,6 +1819,7 @@ CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; + DWORD error; TRACE("(%s, %p, %p, 0x%08x)\n", debugstr_a(lpszUrlName), @@ -1767,11 +1827,26 @@ lpdwCacheEntryInfoBufferSize, dwReserved); - if (!URLCacheContainers_FindContainerA(lpszUrlName, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + if (!lpszUrlName || !lpdwCacheEntryInfoBufferSize || + (!lpCacheEntryInfo && *lpdwCacheEntryInfoBufferSize)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -1801,12 +1876,16 @@ pUrlEntry->dwUseCount++; URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); - if (!URLCache_CopyEntry(pContainer, pHeader, lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, pUrlEntry, FALSE)) + error = URLCache_CopyEntry(pContainer, pHeader, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, pUrlEntry, + FALSE); + if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - return FALSE; - } - TRACE("Local File Name: %s\n", lpCacheEntryInfo->lpszLocalFileName); + SetLastError(error); + return FALSE; + } + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1829,6 +1908,7 @@ CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; + DWORD error; TRACE("(%s, %p, %p, 0x%08x)\n", debugstr_w(lpszUrlName), @@ -1836,11 +1916,26 @@ lpdwCacheEntryInfoBufferSize, dwReserved); - if (!URLCacheContainers_FindContainerW(lpszUrlName, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + if (!lpszUrlName || !lpdwCacheEntryInfoBufferSize || + (!lpCacheEntryInfo && *lpdwCacheEntryInfoBufferSize)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -1870,18 +1965,20 @@ pUrlEntry->dwUseCount++; URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); - if (!URLCache_CopyEntry( + error = URLCache_CopyEntry( pContainer, pHeader, (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, pUrlEntry, - TRUE /* UNICODE */)) + TRUE /* UNICODE */); + if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - return FALSE; - } - TRACE("Local File Name: %s\n", debugstr_w(lpCacheEntryInfo->lpszLocalFileName)); + SetLastError(error); + return FALSE; + } + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1902,6 +1999,7 @@ CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; + DWORD error; TRACE("(%s, 0x%08x)\n", debugstr_a(lpszUrlName), dwReserved); @@ -1912,11 +2010,19 @@ return FALSE; } - if (!URLCacheContainers_FindContainerA(lpszUrlName, &pContainer)) + error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -1964,6 +2070,7 @@ CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; + DWORD error; TRACE("(%s, 0x%08x)\n", debugstr_w(lpszUrlName), dwReserved); @@ -1974,11 +2081,19 @@ return FALSE; } - if (!URLCacheContainers_FindContainerW(lpszUrlName, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -2095,6 +2210,7 @@ LONG lBufferSize; BOOL bFound = FALSE; int count; + DWORD error; static const WCHAR szWWW[] = {'w','w','w',0}; TRACE("(%s, 0x%08x, %s, %p, 0x%08x)\n", @@ -2144,6 +2260,8 @@ if (!len) return FALSE; szFile[len] = '\0'; + while(len && szFile[--len] == '/') szFile[len] = '\0'; + /* FIXME: get rid of illegal characters like \, / and : */ } else @@ -2153,11 +2271,19 @@ TRACE("File name: %s\n", debugstr_a(szFile)); - if (!URLCacheContainers_FindContainerW(lpszUrlName, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -2191,9 +2317,26 @@ for (i = 0; i < 255; i++) { - static const WCHAR szFormat[] = {'[','%','u',']','%','s',0}; + static const WCHAR szFormat[] = {'[','%','u',']','%','s',0}; HANDLE hFile; + WCHAR *p; + wsprintfW(lpszFileNameNoPath + countnoextension, szFormat, i, szExtension); + for (p = lpszFileNameNoPath + 1; *p; p++) + { + switch (*p) + { + case '<': case '>': + case ':': case '"': + case '/': case '\\': + case '|': case '?': + case '*': + *p = '_'; break; + default: break; + } + } + if (p[-1] == ' ' || p[-1] == '.') p[-1] = '_'; + TRACE("Trying: %s\n", debugstr_w(lpszFileName)); hFile = CreateFileW(lpszFileName, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); if (hFile != INVALID_HANDLE_VALUE) @@ -2221,7 +2364,7 @@ * result will lose data for arbitrary binary data. * */ -static BOOL WINAPI CommitUrlCacheEntryInternal( +static BOOL CommitUrlCacheEntryInternal( IN LPCWSTR lpszUrlName, IN LPCWSTR lpszLocalFileName, IN FILETIME ExpireTime, @@ -2250,7 +2393,7 @@ LPSTR lpszUrlNameA = NULL; LPSTR lpszFileExtensionA = NULL; char *pchLocalFileName = 0; - DWORD error = ERROR_SUCCESS; + DWORD error; TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n", debugstr_w(lpszUrlName), @@ -2287,11 +2430,19 @@ CloseHandle(hFile); } - if (!URLCacheContainers_FindContainerW(lpszUrlName, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -2436,13 +2587,10 @@ if (dwOffsetFileExtension) strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetFileExtension), lpszFileExtensionA); - if (!URLCache_AddEntryToHash(pHeader, lpszUrlNameA, (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader))) - { + error = URLCache_AddEntryToHash(pHeader, lpszUrlNameA, + (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader)); + if (error != ERROR_SUCCESS) URLCache_DeleteEntry(pHeader, &pUrlEntry->CacheFileEntry); - URLCacheContainer_UnlockIndex(pContainer, pHeader); - HeapFree(GetProcessHeap(), 0, lpszUrlNameA); - return FALSE; - } cleanup: URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -2675,7 +2823,7 @@ pStream->hFile = hFile; strcpy(pStream->lpszUrl, lpszUrlName); - return (HANDLE)pStream; + return pStream; } /*********************************************************************** @@ -2742,14 +2890,23 @@ LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; + DWORD error; TRACE("(%s)\n", debugstr_a(lpszUrlName)); - if (!URLCacheContainers_FindContainerA(lpszUrlName, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -2784,6 +2941,7 @@ CACHEFILE_ENTRY * pEntry; LPSTR urlA; int url_len; + DWORD error; TRACE("(%s)\n", debugstr_w(lpszUrlName)); @@ -2796,16 +2954,22 @@ } WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, urlA, url_len, NULL, NULL); - if (!URLCacheContainers_FindContainerW(lpszUrlName, &pContainer)) + error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + if (error != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, urlA); - return FALSE; - } - if (!URLCacheContainer_OpenIndex(pContainer)) + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, urlA); - return FALSE; - } + SetLastError(error); + return FALSE; + } + if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) { HeapFree(GetProcessHeap(), 0, urlA); @@ -3057,9 +3221,14 @@ { LPURLCACHE_HEADER pHeader; HASH_CACHEFILE_ENTRY *pHashTableEntry; - - if (!URLCacheContainer_OpenIndex(pContainer)) + DWORD error; + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -3081,18 +3250,20 @@ TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); - if (!URLCache_CopyEntry( + error = URLCache_CopyEntry( pContainer, pHeader, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize, pUrlEntry, - FALSE /* not UNICODE */)) + FALSE /* not UNICODE */); + if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); + SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a(lpNextCacheEntryInfo->lpszLocalFileName)); + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); /* increment the current index so that next time the function * is called the next entry is returned */ @@ -3109,6 +3280,9 @@ return FALSE; } +/*********************************************************************** + * FindNextUrlCacheEntryW (WININET.@) + */ BOOL WINAPI FindNextUrlCacheEntryW( HANDLE hEnumHandle, LPINTERNET_CACHE_ENTRY_INFOW lpNextCacheEntryInfo, @@ -3337,14 +3511,23 @@ const CACHEFILE_ENTRY * pEntry; const URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; + DWORD error; TRACE("(%s, %08x, %p)\n", debugstr_a(url), dwFlags, pftLastModified); - if (!URLCacheContainers_FindContainerA(url, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + error = URLCacheContainers_FindContainerA(url, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -3390,14 +3573,23 @@ const CACHEFILE_ENTRY * pEntry; const URL_CACHEFILE_ENTRY * pUrlEntry; URLCACHECONTAINER * pContainer; + DWORD error; TRACE("(%s, %08x, %p)\n", debugstr_w(url), dwFlags, pftLastModified); - if (!URLCacheContainers_FindContainerW(url, &pContainer)) - return FALSE; - - if (!URLCacheContainer_OpenIndex(pContainer)) - return FALSE; + error = URLCacheContainers_FindContainerW(url, &pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } + + error = URLCacheContainer_OpenIndex(pContainer); + if (error != ERROR_SUCCESS) + { + SetLastError(error); + return FALSE; + } if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; @@ -3427,3 +3619,21 @@ return TRUE; } + +/*********************************************************************** + * GetDiskInfoA (WININET.@) + */ +DWORD WINAPI GetDiskInfoA(void *p0, void *p1, void *p2, void *p3) +{ + FIXME("(%p, %p, %p, %p)\n", p0, p1, p2, p3); + return 0; +} + +/*********************************************************************** + * RegisterUrlCacheNotification (WININET.@) + */ +DWORD WINAPI RegisterUrlCacheNotification(LPVOID a, DWORD b, DWORD c, DWORD d, DWORD e, DWORD f) +{ + FIXME("(%p %x %x %x %x %x)\n", a, b, c, d, e, f); + return 0; +}

1 0

[cwittich] 40519: check for immutable bits in RtlSetControlSecurityDescriptor fixes >100 advapi32 security winetests
by cwittich＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: cwittich Date: Wed Apr 15 12:33:57 2009 New Revision: 40519 URL: http://svn.reactos.org/svn/reactos?rev=40519&view=rev Log: check for immutable bits in RtlSetControlSecurityDescriptor fixes >100 advapi32 security winetests Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=40519&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sd.c [iso-8859-1] Wed Apr 15 12:33:57 2009 @@ -667,6 +667,13 @@ IN SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, IN SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet) { + SECURITY_DESCRIPTOR_CONTROL const immutable + = SE_OWNER_DEFAULTED | SE_GROUP_DEFAULTED + | SE_DACL_PRESENT | SE_DACL_DEFAULTED + | SE_SACL_PRESENT | SE_SACL_DEFAULTED + | SE_RM_CONTROL_VALID | SE_SELF_RELATIVE + ; + PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; PAGED_CODE_RTL(); @@ -675,6 +682,9 @@ { return STATUS_UNKNOWN_REVISION; } + + if ((ControlBitsOfInterest | ControlBitsToSet) & immutable) + return STATUS_INVALID_PARAMETER; /* Zero the 'bits of interest' */ pSD->Control &= ~ControlBitsOfInterest;

1 0

[fireball] 40518: - Silence MmCanFileBeTruncated warning about not checking for outstanding write probes.
by fireball＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: fireball Date: Wed Apr 15 11:47:15 2009 New Revision: 40518 URL: http://svn.reactos.org/svn/reactos?rev=40518&view=rev Log: - Silence MmCanFileBeTruncated warning about not checking for outstanding write probes. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Apr 15 11:47:15 2009 @@ -4754,7 +4754,7 @@ } } - DPRINT1("FIXME: didn't check for outstanding write probes\n"); + DPRINT("FIXME: didn't check for outstanding write probes\n"); return TRUE; }

1 0

[dchapyshev] 40517: - Sync avifil32 with Wine 1.1.19
by dchapyshev＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: dchapyshev Date: Wed Apr 15 11:33:50 2009 New Revision: 40517 URL: http://svn.reactos.org/svn/reactos?rev=40517&view=rev Log: - Sync avifil32 with Wine 1.1.19 Removed: trunk/reactos/dll/win32/avifil32/avifile.spec Modified: trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/dll/win32/avifil32/wavfile.c Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] Wed Apr 15 11:33:50 2009 @@ -172,7 +172,6 @@ /*********************************************************************** * AVIFileInit (AVIFIL32.@) - * AVIFileInit (AVIFILE.100) */ void WINAPI AVIFileInit(void) { OleInitialize(NULL); @@ -180,7 +179,6 @@ /*********************************************************************** * AVIFileExit (AVIFIL32.@) - * AVIFileExit (AVIFILE.101) */ void WINAPI AVIFileExit(void) { /* need to free ole32.dll if we are the last exit call */ @@ -191,7 +189,6 @@ /*********************************************************************** * AVIFileOpen (AVIFIL32.@) * AVIFileOpenA (AVIFIL32.@) - * AVIFileOpen (AVIFILE.102) */ HRESULT WINAPI AVIFileOpenA(PAVIFILE *ppfile, LPCSTR szFile, UINT uMode, LPCLSID lpHandler) @@ -276,7 +273,6 @@ /*********************************************************************** * AVIFileAddRef (AVIFIL32.@) - * AVIFileAddRef (AVIFILE.140) */ ULONG WINAPI AVIFileAddRef(PAVIFILE pfile) { @@ -292,7 +288,6 @@ /*********************************************************************** * AVIFileRelease (AVIFIL32.@) - * AVIFileRelease (AVIFILE.141) */ ULONG WINAPI AVIFileRelease(PAVIFILE pfile) { @@ -309,7 +304,6 @@ /*********************************************************************** * AVIFileInfo (AVIFIL32.@) * AVIFileInfoA (AVIFIL32.@) - * AVIFileInfo (AVIFILE.142) */ HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile, LPAVIFILEINFOA afi, LONG size) { @@ -348,7 +342,6 @@ /*********************************************************************** * AVIFileGetStream (AVIFIL32.@) - * AVIFileGetStream (AVIFILE.143) */ HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile, PAVISTREAM *avis, DWORD fccType, LONG lParam) @@ -364,7 +357,6 @@ /*********************************************************************** * AVIFileCreateStream (AVIFIL32.@) * AVIFileCreateStreamA (AVIFIL32.@) - * AVIFileCreateStream (AVIFILE.144) */ HRESULT WINAPI AVIFileCreateStreamA(PAVIFILE pfile, PAVISTREAM *ppavi, LPAVISTREAMINFOA psi) @@ -400,7 +392,6 @@ /*********************************************************************** * AVIFileWriteData (AVIFIL32.@) - * AVIFileWriteData (AVIFILE.146) */ HRESULT WINAPI AVIFileWriteData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LONG size) { @@ -414,7 +405,6 @@ /*********************************************************************** * AVIFileReadData (AVIFIL32.@) - * AVIFileReadData (AVIFILE.147) */ HRESULT WINAPI AVIFileReadData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LPLONG size) { @@ -428,7 +418,6 @@ /*********************************************************************** * AVIFileEndRecord (AVIFIL32.@) - * AVIFileEndRecord (AVIFILE.148) */ HRESULT WINAPI AVIFileEndRecord(PAVIFILE pfile) { @@ -442,7 +431,6 @@ /*********************************************************************** * AVIStreamAddRef (AVIFIL32.@) - * AVIStreamAddRef (AVIFILE.160) */ ULONG WINAPI AVIStreamAddRef(PAVISTREAM pstream) { @@ -458,7 +446,6 @@ /*********************************************************************** * AVIStreamRelease (AVIFIL32.@) - * AVIStreamRelease (AVIFILE.161) */ ULONG WINAPI AVIStreamRelease(PAVISTREAM pstream) { @@ -474,7 +461,6 @@ /*********************************************************************** * AVIStreamCreate (AVIFIL32.@) - * AVIStreamCreate (AVIFILE.104) */ HRESULT WINAPI AVIStreamCreate(PAVISTREAM *ppavi, LONG lParam1, LONG lParam2, LPCLSID pclsidHandler) @@ -507,7 +493,6 @@ /*********************************************************************** * AVIStreamInfo (AVIFIL32.@) * AVIStreamInfoA (AVIFIL32.@) - * AVIStreamInfo (AVIFILE.162) */ HRESULT WINAPI AVIStreamInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi, LONG size) @@ -548,7 +533,6 @@ /*********************************************************************** * AVIStreamFindSample (AVIFIL32.@) - * AVIStreamFindSample (AVIFILE.163) */ LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags) { @@ -562,7 +546,6 @@ /*********************************************************************** * AVIStreamReadFormat (AVIFIL32.@) - * AVIStreamReadFormat (AVIFILE.164) */ HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM pstream, LONG pos, LPVOID format, LPLONG formatsize) @@ -577,7 +560,6 @@ /*********************************************************************** * AVIStreamSetFormat (AVIFIL32.@) - * AVIStreamSetFormat (AVIFILE.169) */ HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM pstream, LONG pos, LPVOID format, LONG formatsize) @@ -592,7 +574,6 @@ /*********************************************************************** * AVIStreamRead (AVIFIL32.@) - * AVIStreamRead (AVIFILE.167) */ HRESULT WINAPI AVIStreamRead(PAVISTREAM pstream, LONG start, LONG samples, LPVOID buffer, LONG buffersize, @@ -610,7 +591,6 @@ /*********************************************************************** * AVIStreamWrite (AVIFIL32.@) - * AVIStreamWrite (AVIFILE.168) */ HRESULT WINAPI AVIStreamWrite(PAVISTREAM pstream, LONG start, LONG samples, LPVOID buffer, LONG buffersize, DWORD flags, @@ -628,7 +608,6 @@ /*********************************************************************** * AVIStreamReadData (AVIFIL32.@) - * AVIStreamReadData (AVIFILE.165) */ HRESULT WINAPI AVIStreamReadData(PAVISTREAM pstream, DWORD fcc, LPVOID lp, LPLONG lpread) @@ -643,7 +622,6 @@ /*********************************************************************** * AVIStreamWriteData (AVIFIL32.@) - * AVIStreamWriteData (AVIFILE.166) */ HRESULT WINAPI AVIStreamWriteData(PAVISTREAM pstream, DWORD fcc, LPVOID lp, LONG size) @@ -658,7 +636,6 @@ /*********************************************************************** * AVIStreamGetFrameOpen (AVIFIL32.@) - * AVIStreamGetFrameOpen (AVIFILE.112) */ PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM pstream, LPBITMAPINFOHEADER lpbiWanted) @@ -684,7 +661,6 @@ /*********************************************************************** * AVIStreamGetFrame (AVIFIL32.@) - * AVIStreamGetFrame (AVIFILE.110) */ LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg, LONG pos) { @@ -698,7 +674,6 @@ /*********************************************************************** * AVIStreamGetFrameClose (AVIFIL32.@) - * AVIStreamGetFrameClose (AVIFILE.111) */ HRESULT WINAPI AVIStreamGetFrameClose(PGETFRAME pg) { @@ -782,7 +757,6 @@ /*********************************************************************** * AVIStreamOpenFromFile (AVIFIL32.@) * AVIStreamOpenFromFileA (AVIFIL32.@) - * AVIStreamOpenFromFile (AVIFILE.103) */ HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM *ppavi, LPCSTR szFile, DWORD fccType, LONG lParam, @@ -880,7 +854,6 @@ } /*********************************************************************** - * AVIStreamStart (AVIFILE.130) * AVIStreamStart (AVIFIL32.@) */ LONG WINAPI AVIStreamStart(PAVISTREAM pstream) @@ -899,7 +872,6 @@ } /*********************************************************************** - * AVIStreamLength (AVIFILE.131) * AVIStreamLength (AVIFIL32.@) */ LONG WINAPI AVIStreamLength(PAVISTREAM pstream) @@ -918,7 +890,6 @@ } /*********************************************************************** - * AVIStreamSampleToTime (AVIFILE.133) * AVIStreamSampleToTime (AVIFIL32.@) */ LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample) @@ -952,7 +923,6 @@ } /*********************************************************************** - * AVIStreamTimeToSample (AVIFILE.132) * AVIStreamTimeToSample (AVIFIL32.@) */ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime) @@ -988,7 +958,6 @@ /*********************************************************************** * AVIBuildFilter (AVIFIL32.@) * AVIBuildFilterA (AVIFIL32.@) - * AVIBuildFilter (AVIFILE.123) */ HRESULT WINAPI AVIBuildFilterA(LPSTR szFilter, LONG cbFilter, BOOL fSaving) { @@ -1515,7 +1484,6 @@ /*********************************************************************** * AVISaveOptionsFree (AVIFIL32.@) - * AVISaveOptionsFree (AVIFILE.124) */ HRESULT WINAPI AVISaveOptionsFree(INT nStreams,LPAVICOMPRESSOPTIONS*ppOptions) { Removed: trunk/reactos/dll/win32/avifil32/avifile.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile.spec (removed) @@ -1,64 +1,0 @@ -# I'm just using "long" instead of "ptr" for the interface pointers, -# because they are 32-bit pointers, not converted to 16-bit format, -# but the app doesn't really need to know, it should never need to -# dereference the interface pointer itself (if we're lucky)... - -#1 stub WEP -2 stub DLLGETCLASSOBJECT -3 stub DLLCANUNLOADNOW -4 stub ___EXPORTEDSTUB -10 stub _IID_IAVISTREAM -11 stub _IID_IAVIFILE -12 stub _IID_IAVIEDITSTREAM -13 stub _IID_IGETFRAME -14 stub _CLSID_AVISIMPLEUNMARSHAL -100 pascal AVIFileInit() AVIFileInit -101 pascal AVIFileExit() AVIFileExit -102 pascal AVIFileOpen(ptr str word ptr) AVIFileOpenA -103 pascal AVIStreamOpenFromFile(ptr str long long word ptr) AVIStreamOpenFromFileA -104 pascal AVIStreamCreate(ptr long long ptr) AVIStreamCreate -105 stub AVIMAKECOMPRESSEDSTREAM -106 stub AVIMAKEFILEFROMSTREAMS -107 stub AVIMAKESTREAMFROMCLIPBOARD -110 pascal AVIStreamGetFrame(long long) AVIStreamGetFrame -111 pascal AVIStreamGetFrameClose(long) AVIStreamGetFrameClose -112 pascal AVIStreamGetFrameOpen(long ptr) AVIStreamGetFrameOpen -120 stub _AVISAVE -121 stub AVISAVEV -122 stub AVISAVEOPTIONS -123 pascal AVIBuildFilter(str long word) AVIBuildFilterA -124 pascal AVISaveOptionsFree(word ptr) AVISaveOptionsFree -130 pascal AVIStreamStart(long) AVIStreamStart -131 pascal AVIStreamLength(long) AVIStreamLength -132 pascal AVIStreamTimeToSample(long long) AVIStreamTimeToSample -133 pascal AVIStreamSampleToTime(long long) AVIStreamSampleToTime -140 pascal AVIFileAddRef(long) AVIFileAddRef -141 pascal AVIFileRelease(long) AVIFileRelease -142 pascal AVIFileInfo(long ptr long) AVIFileInfoA -143 pascal AVIFileGetStream(long ptr long long) AVIFileGetStream -144 pascal AVIFileCreateStream(long ptr ptr) AVIFileCreateStreamA -146 pascal AVIFileWriteData(long long ptr long) AVIFileWriteData -147 pascal AVIFileReadData(long long ptr ptr) AVIFileReadData -148 pascal AVIFileEndRecord(long) AVIFileEndRecord -160 pascal AVIStreamAddRef(long) AVIStreamAddRef -161 pascal AVIStreamRelease(long) AVIStreamRelease -162 pascal AVIStreamInfo(long ptr long) AVIStreamInfoA -163 pascal AVIStreamFindSample(long long long) AVIStreamFindSample -164 pascal AVIStreamReadFormat(long long ptr ptr) AVIStreamReadFormat -165 pascal AVIStreamReadData(long long ptr ptr) AVIStreamReadData -166 pascal AVIStreamWriteData(long long ptr long) AVIStreamWriteData -167 pascal AVIStreamRead(long long long ptr long ptr ptr) AVIStreamRead -168 pascal AVIStreamWrite(long long long ptr long long ptr ptr) AVIStreamWrite -169 pascal AVIStreamSetFormat(long long ptr long) AVIStreamSetFormat -180 stub EDITSTREAMCOPY -181 stub EDITSTREAMCUT -182 stub EDITSTREAMPASTE -184 stub CREATEEDITABLESTREAM -185 stub AVIPUTFILEONCLIPBOARD -187 stub AVIGETFROMCLIPBOARD -188 stub AVICLEARCLIPBOARD -190 stub EDITSTREAMCLONE -191 stub EDITSTREAMSETNAME -192 stub EDITSTREAMSETINFO -200 stub AVISTREAMBEGINSTREAMING -201 stub AVISTREAMENDSTREAMING Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getfram… ============================================================================== --- trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] Wed Apr 15 11:33:50 2009 @@ -140,6 +140,7 @@ if (IsEqualGUID(&IID_IUnknown, refiid) || IsEqualGUID(&IID_IGetFrame, refiid)) { *obj = iface; + IGetFrame_AddRef(iface); return S_OK; } Modified: trunk/reactos/dll/win32/avifil32/wavfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] Wed Apr 15 11:33:50 2009 @@ -251,13 +251,16 @@ if (IsEqualGUID(&IID_IUnknown, refiid) || IsEqualGUID(&IID_IAVIFile, refiid)) { *obj = iface; + IAVIFile_AddRef(iface); return S_OK; } else if (This->fInfo.dwStreams == 1 && IsEqualGUID(&IID_IAVIStream, refiid)) { *obj = &This->iAVIStream; + IAVIFile_AddRef(iface); return S_OK; } else if (IsEqualGUID(&IID_IPersistFile, refiid)) { *obj = &This->iPersistFile; + IAVIFile_AddRef(iface); return S_OK; }

1 0

[dchapyshev] 40516: - Update Russian translation
by dchapyshev＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: dchapyshev Date: Wed Apr 15 11:29:19 2009 New Revision: 40516 URL: http://svn.reactos.org/svn/reactos?rev=40516&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Wed Apr 15 11:29:19 2009 @@ -53,7 +53,7 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Öâåòîâàÿ ñõåìà:", IDC_STATIC, 7, 139, 154, 10 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 155, 200 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "&Ýôôåêòû...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Äîïîëíèòåëüíî", IDC_APPEARANCE_ADVANCED, 168, 170, 70, 14 END @@ -98,24 +98,24 @@ IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effects" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "Ýôôåêòû" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Ïðèìåíÿòü ñëåäóþùèé ïåðåõîäíûé ýôôåêò äëÿ ìåíþ è ïîäñêàçîê:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "Ïð&èìåíÿòü ñëåäóþùèé ìåòîä ñãëàæèâàíèÿ äëÿ ýêðàííûõ øðèôòîâ:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "Ïðèìåíÿòü &êðóïíûå çíà÷êè",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "Îòîáðàæàòü &òåíè, îòáðàñûâàåìûå ìåíþ",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "&Îòîáðàæàòü ñîäåðæèìîå îêíà ïðè ïåðåòàñêèâàíèè",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "Ñêð&ûâàòü óêàçàòåëè âûçîâà ñ êëàâèàòóðû äî íàæàòèÿ <Alt>",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END @@ -178,13 +178,13 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STANDARDEFFECT "Standard" + IDS_SLIDEEFFECT "Ðàçâåðòûâàíèå" + IDS_FADEEFFECT "Çàòåìíåíèå" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Îáû÷íûé" IDS_CLEARTYPEEFFECT "ClearType" END @@ -248,7 +248,7 @@ IDS_ELEMENT_13 "Ñòðîêà çàãîëîâêà" IDS_ELEMENT_14 "Íåàêòèâíûå ïóíêòû ìåíþ" IDS_ELEMENT_15 "Äèàëîã" - IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_16 "Ïîëîñû ïðîêðóòêè" IDS_ELEMENT_17 "Ðàáî÷àÿ îáëàñòü ïðèëîæåíèÿ" IDS_ELEMENT_18 "Small captionbar" IDS_ELEMENT_19 "Èíòåðâàë ìåæäó çíà÷êàìè (ãîð.)" @@ -259,7 +259,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DISPLAY_SETTINGS "Display settings" - IDS_APPLY_FAILED "Failed to apply new settings..." - IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_DISPLAY_SETTINGS "Ïàðàìåòðû ýêðàíà" + IDS_APPLY_FAILED "Íå óäàëîñü ïðèìåíèòü íîâûå íàñòðîéêè..." + IDS_APPLY_NEEDS_RESTART "Âû äîëæíû ïåðåçàãðóçèòü êîìïüþòåð äëÿ ïðèìåíåíèÿ èçìåíåíèé." +END

1 0

[cwittich] 40515: try to fix the sysreg hangs
by cwittich＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: cwittich Date: Wed Apr 15 11:23:37 2009 New Revision: 40515 URL: http://svn.reactos.org/svn/reactos?rev=40515&view=rev Log: try to fix the sysreg hangs Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=40515&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Wed Apr 15 11:23:37 2009 @@ -98,6 +98,13 @@ if (*bp == '\33') goto cleanup; } + else + { + /* KDBG doesn't send a newline */ + if ((strstr(buf, "kdb:>")) || + (strstr(buf, "--- Press q"))) + break; + } ++bp; }

1 0

[dgoette] 369: * merge comp/comp_group.php and comp/comp_group_maintainer.php to HTML_Group.class.php * merge comp/comp_item_details.php and comp/comp_item_details_maintainer.php to Item_Details.class.php * get comp/comp_item_bugs.php, comp/comp_item_forum.php, comp/comp_item_screenshots.php, comp/comp_item_tests.php, comp/comp_item_tips.php to Item_* as class structure * move inc/comp to nocomp (will be deleted later) * get inc/comp/data to lib/get/List_* (will be a class structure later) * mer
by dgoette＠svn.reactos.org 15 Apr '09

15 Apr '09

1 0

[cwittich] 40514: check for ESC in the while loop otherwise we never reached the old check
by cwittich＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: cwittich Date: Wed Apr 15 08:36:50 2009 New Revision: 40514 URL: http://svn.reactos.org/svn/reactos?rev=40514&view=rev Log: check for ESC in the while loop otherwise we never reached the old check Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=40514&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Wed Apr 15 08:36:50 2009 @@ -92,6 +92,13 @@ if(*bp == '\n') break; + if (fds[i].fd == STDIN_FILENO) + { + /* break on ESC */ + if (*bp == '\33') + goto cleanup; + } + ++bp; } @@ -105,13 +112,7 @@ *(++bp) = 0; /* Now check the output */ - if (fds[i].fd == STDIN_FILENO) - { - /* Check whether the user pressed ESC and cancel in that case */ - if (strchr(buf, '\33')) - goto cleanup; - } - else + if (fds[i].fd != STDIN_FILENO) { /* Check for "magic" sequences */ if (strstr(buf, "kdb:>"))

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs