Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 36624: - Add missing APIENTRY to ntgdi.h, syscalls are always stdcall. - Update gdi32 after NtGdiDoPalette change - Add parameters for NtGdiGetSpoolMessage
by sginsberg＠svn.reactos.org 02 Oct '08

02 Oct '08

Author: sginsberg Date: Thu Oct 2 08:33:51 2008 New Revision: 36624 URL: http://svn.reactos.org/svn/reactos?rev=36624&view=rev Log: - Add missing APIENTRY to ntgdi.h, syscalls are always stdcall. - Update gdi32 after NtGdiDoPalette change - Add parameters for NtGdiGetSpoolMessage Modified: branches/nwin32/dll/win32/gdi32/objects/palette.c branches/nwin32/include/psdk/ntgdi.h branches/nwin32/include/reactos/win32k/ntgdityp.h branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c Modified: branches/nwin32/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/objects/… ============================================================================== --- branches/nwin32/dll/win32/gdi32/objects/palette.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/objects/palette.c [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -50,7 +50,7 @@ UINT cEntries, LPPALETTEENTRY ppe) { - return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); + return NtGdiDoPalette((HPALETTE)hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); } UINT @@ -60,7 +60,7 @@ UINT cEntries, RGBQUAD *pColors) { - return NtGdiDoPalette(hDC, iStartIndex, cEntries, pColors, GdiPalGetColorTable, FALSE); + return NtGdiDoPalette((HPALETTE)hDC, iStartIndex, cEntries, (PALETTEENTRY*)pColors, GdiPalGetColorTable, FALSE); } /* @@ -116,7 +116,7 @@ if (cEntries) { - retValue = NtGdiDoPalette(hDC, iStartIndex, cEntries, (RGBQUAD*)pColors, GdiPalSetColorTable, TRUE); + retValue = NtGdiDoPalette((HPALETTE)hDC, iStartIndex, cEntries, (PALETTEENTRY*)pColors, GdiPalSetColorTable, TRUE); } return retValue; Modified: branches/nwin32/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/psdk/ntgdi.h?rev… ============================================================================== --- branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] (original) +++ branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -3539,6 +3539,7 @@ W32KAPI BOOL +APIENTRY NtGdiUpdateTransform( IN HDC hdc ); @@ -3568,6 +3569,7 @@ W32KAPI BOOL +APIENTRY NtGdiSetPUMPDOBJ( IN HUMPD humpd, IN BOOL bStoreID, @@ -3577,6 +3579,7 @@ W32KAPI BOOL +APIENTRY NtGdiBRUSHOBJ_DeleteRbrush( IN BRUSHOBJ *pbo, IN BRUSHOBJ *pboB @@ -3584,6 +3587,7 @@ W32KAPI BOOL +APIENTRY NtGdiUMPDEngFreeUserMem( IN KERNEL_PVOID *ppv ); Modified: branches/nwin32/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n… ============================================================================== --- branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -189,14 +189,15 @@ VOID ); -/* FIXME: prototypes */ W32KAPI INT APIENTRY -NtGdiGetSpoolMessage(DWORD u1, - DWORD u2, - DWORD u3, - DWORD u4); +NtGdiGetSpoolMessage( + IN PVOID InputBuffer, + IN ULONG InputBufferSize, + OUT PVOID OutputBuffer, + IN ULONG OutputBufferSize +); #define GDIBATCHBUFSIZE 0x136*4 #define GDI_BATCH_LIMIT 20 Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -110,7 +110,7 @@ } BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiBRUSHOBJ_DeleteRbrush(IN BRUSHOBJ *pbo, IN BRUSHOBJ *pboB) { Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -121,9 +121,8 @@ } - BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiUpdateTransform(IN HDC hdc) { UNIMPLEMENTED; Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -101,20 +101,19 @@ return FALSE; } -/* FIXME: Parameters! */ INT APIENTRY -NtGdiGetSpoolMessage( DWORD u1, - DWORD u2, - DWORD u3, - DWORD u4) +NtGdiGetSpoolMessage(IN PVOID InputBuffer, + IN ULONG InputBufferSize, + OUT PVOID OutputBuffer, + IN ULONG OutputBufferSize) { UNIMPLEMENTED; return 0; } BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiSetPUMPDOBJ(IN HUMPD humpd, IN BOOL bStoreID, OUT HUMPD *phumpd, @@ -125,7 +124,7 @@ } BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiUMPDEngFreeUserMem(IN KERNEL_PVOID *ppv) { UNIMPLEMENTED;

1 0

[fireball] 36623: - Sync RegGetValueA/W implementation (no functional changes though, mostly comments). - Port RegQueryValueExW from Wine (but leaving RegQueryValueExA as a wrapper, with a fix). - Implement RegSetValueA/W based on Wine's implementation, and removing old, different (A and W) versions of RegSetValue.
by fireball＠svn.reactos.org 02 Oct '08

02 Oct '08

Author: fireball Date: Thu Oct 2 06:30:44 2008 New Revision: 36623 URL: http://svn.reactos.org/svn/reactos?rev=36623&view=rev Log: - Sync RegGetValueA/W implementation (no functional changes though, mostly comments). - Port RegQueryValueExW from Wine (but leaving RegQueryValueExA as a wrapper, with a fix). - Implement RegSetValueA/W based on Wine's implementation, and removing old, different (A and W) versions of RegSetValue. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Thu Oct 2 06:30:44 2008 @@ -1809,8 +1809,8 @@ /****************************************************************************** * RegGetValueW [ADVAPI32.@] * - * Retrieves the type and data for a value name associated with a key - * optionally expanding it's content and restricting it's type. + * Retrieves the type and data for a value name associated with a key, + * optionally expanding its content and restricting its type. * * PARAMS * hKey [I] Handle to an open key. @@ -1819,23 +1819,25 @@ * dwFlags [I] Flags restricting the value type to retrieve. * pdwType [O] Destination for the values type, may be NULL. * pvData [O] Destination for the values content, may be NULL. - * pcbData [I/O] Size of pvData, updated with the size required to - * retrieve the whole content. + * pcbData [I/O] Size of pvData, updated with the size in bytes required to + * retrieve the whole content, including the trailing '\0' + * for strings. * * RETURNS * Success: ERROR_SUCCESS * Failure: nonzero error code from Winerror.h * * NOTES - * - Unless RRF_NOEXPAND is specified REG_EXPAND_SZ is automatically expanded - * and REG_SZ is retrieved instead. - * - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ + * - Unless RRF_NOEXPAND is specified, REG_EXPAND_SZ values are automatically + * expanded and pdwType is set to REG_SZ instead. + * - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ * without RRF_NOEXPAND is thus not allowed. - */ -LONG WINAPI -RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, - DWORD dwFlags, LPDWORD pdwType, PVOID pvData, - LPDWORD pcbData ) + * An exception is the case where RRF_RT_ANY is specified, because then + * RRF_NOEXPAND is allowed. + */ +LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, + DWORD dwFlags, LPDWORD pdwType, PVOID pvData, + LPDWORD pcbData ) { DWORD dwType, cbData = pcbData ? *pcbData : 0; PVOID pvBuf = NULL; @@ -1847,7 +1849,6 @@ if (pvData && !pcbData) return ERROR_INVALID_PARAMETER; - if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND) && ((dwFlags & RRF_RT_ANY) != RRF_RT_ANY)) return ERROR_INVALID_PARAMETER; @@ -1864,7 +1865,7 @@ * if the passed buffer was too small as the expanded string might be * smaller than the unexpanded one and could fit into cbData bytes. */ if ((ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && - (dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND))) + dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND)) { do { HeapFree(GetProcessHeap(), 0, pvBuf); @@ -1930,10 +1931,9 @@ * * See RegGetValueW. */ -LONG WINAPI -RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, - DWORD dwFlags, LPDWORD pdwType, PVOID pvData, - LPDWORD pcbData ) +LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, + DWORD dwFlags, LPDWORD pdwType, PVOID pvData, + LPDWORD pcbData ) { DWORD dwType, cbData = pcbData ? *pcbData : 0; PVOID pvBuf = NULL; @@ -1945,7 +1945,6 @@ if (pvData && !pcbData) return ERROR_INVALID_PARAMETER; - if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND) && ((dwFlags & RRF_RT_ANY) != RRF_RT_ANY)) return ERROR_INVALID_PARAMETER; @@ -3793,120 +3792,84 @@ * * @implemented */ -LONG STDCALL -RegQueryValueExW (HKEY hKey, - LPCWSTR lpValueName, - LPDWORD lpReserved, - LPDWORD lpType, - LPBYTE lpData, - LPDWORD lpcbData) -{ - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - UNICODE_STRING ValueName; - NTSTATUS Status; - ULONG BufferSize; - ULONG ResultSize; - HANDLE KeyHandle; - LONG ErrorCode = ERROR_SUCCESS; - ULONG MaxCopy = lpcbData != NULL && lpData != NULL ? *lpcbData : 0; - - TRACE("hKey 0x%X lpValueName %S lpData 0x%X lpcbData %d\n", - hKey, lpValueName, lpData, lpcbData ? *lpcbData : 0); - - Status = MapDefaultKey (&KeyHandle, - hKey); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError (Status); - } - - if (lpData != NULL && lpcbData == NULL) - { - ErrorCode = ERROR_INVALID_PARAMETER; - goto Cleanup; - } - - RtlInitUnicodeString (&ValueName, - lpValueName); - BufferSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MaxCopy; - ValueInfo = RtlAllocateHeap (ProcessHeap, - 0, - BufferSize); - if (ValueInfo == NULL) - { - ErrorCode = ERROR_OUTOFMEMORY; - goto Cleanup; - } - - Status = NtQueryValueKey (KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueInfo, - BufferSize, - &ResultSize); - TRACE("Status 0x%X\n", Status); - if (Status == STATUS_BUFFER_OVERFLOW) - { - /* Return ERROR_SUCCESS and the buffer space needed for a successful call */ - MaxCopy = 0; - ErrorCode = lpData ? ERROR_MORE_DATA : ERROR_SUCCESS; - } - else if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError (Status); - MaxCopy = 0; - if (lpcbData != NULL) - { - ResultSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + *lpcbData; - } - } - - if ((lpType != NULL) && (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW))) - { - *lpType = ValueInfo->Type; - } - - if (NT_SUCCESS(Status) && lpData != NULL) - { - RtlMoveMemory (lpData, - ValueInfo->Data, - min(ValueInfo->DataLength, MaxCopy)); - } - - if ((ValueInfo->Type == REG_SZ) || - (ValueInfo->Type == REG_MULTI_SZ) || - (ValueInfo->Type == REG_EXPAND_SZ)) - { - if (lpData != NULL && MaxCopy > ValueInfo->DataLength) - { - ((PWSTR)lpData)[ValueInfo->DataLength / sizeof(WCHAR)] = 0; - } - - if (lpcbData != NULL) - { - *lpcbData = (ResultSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0])); - TRACE("(string) Returning Size: %lu\n", *lpcbData); - } - } - else - { - if (lpcbData != NULL) - { - *lpcbData = ResultSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); - TRACE("(other) Returning Size: %lu\n", *lpcbData); - } - } - - TRACE("Type %d Size %d\n", ValueInfo->Type, ValueInfo->DataLength); - - RtlFreeHeap (ProcessHeap, - 0, - ValueInfo); - -Cleanup: - ClosePredefKey(KeyHandle); - - return ErrorCode; +LONG +WINAPI +RegQueryValueExW(HKEY hkeyorg, + LPCWSTR name, + LPDWORD reserved, + LPDWORD type, + LPBYTE data, + LPDWORD count) +{ + HANDLE hkey; + NTSTATUS status; + UNICODE_STRING name_str; + DWORD total_size; + char buffer[256], *buf_ptr = buffer; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); + + TRACE("(%p,%s,%p,%p,%p,%p=%d)\n", + hkey, debugstr_w(name), reserved, type, data, count, + (count && data) ? *count : 0 ); + + if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; + //if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + + status = MapDefaultKey(&hkey, hkeyorg); + if (!NT_SUCCESS(status)) + { + return RtlNtStatusToDosError(status); + } + + RtlInitUnicodeString( &name_str, name ); + + if (data) total_size = min( sizeof(buffer), *count + info_size ); + else + { + total_size = info_size; + if (count) *count = 0; + } + + status = NtQueryValueKey( hkey, &name_str, KeyValuePartialInformation, + buffer, total_size, &total_size ); + if (status && status != STATUS_BUFFER_OVERFLOW) goto done; + + if (data) + { + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW && total_size - info_size <= *count) + { + if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); + if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size ))) + return ERROR_NOT_ENOUGH_MEMORY; + info = (KEY_VALUE_PARTIAL_INFORMATION *)buf_ptr; + status = NtQueryValueKey( hkey, &name_str, KeyValuePartialInformation, + buf_ptr, total_size, &total_size ); + } + + if (!status) + { + memcpy( data, buf_ptr + info_size, total_size - info_size ); + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + if (total_size - info_size <= *count-sizeof(WCHAR) && is_string(info->Type)) + { + WCHAR *ptr = (WCHAR *)(data + total_size - info_size); + if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; + } + } + else if (status != STATUS_BUFFER_OVERFLOW) goto done; + } + else status = STATUS_SUCCESS; + + if (type) *type = info->Type; + if (count) *count = total_size - info_size; + + done: + if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); + ClosePredefKey(hkey); + return RtlNtStatusToDosError(status); } @@ -3955,6 +3918,9 @@ ValueData.Buffer = NULL; ValueData.Length = 0; ValueData.MaximumLength = 0; + + if (lpcbData) + *lpcbData = 0; } RtlCreateUnicodeStringFromAsciiz (&ValueName, @@ -4754,47 +4720,39 @@ * @implemented */ LONG STDCALL -RegSetValueA (HKEY hKey, +RegSetValueA (HKEY hKeyOriginal, LPCSTR lpSubKey, DWORD dwType, LPCSTR lpData, DWORD cbData) { - LONG ret; - HKEY hSubKey; - - if (dwType != REG_SZ) - { - return ERROR_INVALID_PARAMETER; - } - - if (lpSubKey != NULL && lpSubKey[0] != '\0') - { - ret = RegCreateKeyA(hKey, - lpSubKey, - &hSubKey); - - if (ret != ERROR_SUCCESS) - { - return ret; - } - } - else - hSubKey = hKey; - - ret = RegSetValueExA(hSubKey, - NULL, - 0, - REG_SZ, - (CONST BYTE*)lpData, - strlen(lpData) + 1); - - if (hSubKey != hKey) - { - RegCloseKey(hSubKey); - } - - return ret; + HKEY subkey; + HANDLE hKey; + DWORD ret; + NTSTATUS Status; + + TRACE("(%p,%s,%d,%s,%d)\n", hKey, debugstr_a(lpSubKey), dwType, debugstr_a(lpData), cbData ); + + if (dwType != REG_SZ || !lpData) return ERROR_INVALID_PARAMETER; + + Status = MapDefaultKey(&hKey, hKeyOriginal); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError (Status); + } + subkey = hKey; + + if (lpSubKey && lpSubKey[0]) /* need to create the subkey */ + { + if ((ret = RegCreateKeyA( hKey, lpSubKey, &subkey )) != ERROR_SUCCESS) goto Cleanup; + } + ret = RegSetValueExA( subkey, NULL, 0, REG_SZ, (const BYTE*)lpData, strlen(lpData)+1 ); + if (subkey != hKey) RegCloseKey( subkey ); + +Cleanup: + ClosePredefKey(hKey); + + return ret; } @@ -4804,67 +4762,41 @@ * @implemented */ LONG STDCALL -RegSetValueW (HKEY hKey, +RegSetValueW (HKEY hKeyOriginal, LPCWSTR lpSubKey, DWORD dwType, LPCWSTR lpData, DWORD cbData) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING SubKeyString; - HANDLE KeyHandle; - HANDLE RealKey; - BOOL CloseRealKey; - NTSTATUS Status; - LONG ErrorCode; - - Status = MapDefaultKey (&KeyHandle, - hKey); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError (Status); - } - - if ((lpSubKey) && (wcslen(lpSubKey) != 0)) - { - RtlInitUnicodeString (&SubKeyString, - (LPWSTR)lpSubKey); - InitializeObjectAttributes (&ObjectAttributes, - &SubKeyString, - OBJ_CASE_INSENSITIVE, - KeyHandle, - NULL); - Status = NtOpenKey (&RealKey, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError (Status); - goto Cleanup; - } - CloseRealKey = TRUE; - } - else - { - RealKey = hKey; - CloseRealKey = FALSE; - } - - ErrorCode = RegSetValueExW (RealKey, - NULL, - 0, - dwType, - (LPBYTE)lpData, - cbData); - if (CloseRealKey == TRUE) - { - NtClose (RealKey); - } + HKEY subkey; + HANDLE hKey; + DWORD ret; + NTSTATUS Status; + + TRACE("(%p,%s,%d,%s,%d)\n", hKeyOriginal, debugstr_w(lpSubKey), dwType, debugstr_w(lpData), cbData ); + + if (dwType != REG_SZ || !lpData) return ERROR_INVALID_PARAMETER; + + Status = MapDefaultKey(&hKey, hKeyOriginal); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError (Status); + } + subkey = hKey; + + if (lpSubKey && lpSubKey[0]) /* need to create the subkey */ + { + if ((ret = RegCreateKeyW( hKey, lpSubKey, &subkey )) != ERROR_SUCCESS) goto Cleanup; + } + + ret = RegSetValueExW( subkey, NULL, 0, REG_SZ, (const BYTE*)lpData, + (wcslen( lpData ) + 1) * sizeof(WCHAR) ); + if (subkey != hKey) RegCloseKey( subkey ); Cleanup: - ClosePredefKey(KeyHandle); - - return ErrorCode; + ClosePredefKey(hKey); + + return ret; }

1 0

[cgutman] 36622: - Merge aicom-network-fixes up to r36621
by cgutman＠svn.reactos.org 02 Oct '08

02 Oct '08

Author: cgutman Date: Thu Oct 2 04:42:08 2008 New Revision: 36622 URL: http://svn.reactos.org/svn/reactos?rev=36622&view=rev Log: - Merge aicom-network-fixes up to r36621 Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Thu Oct 2 04:42:08 2008 @@ -57,20 +57,20 @@ NDIS_STATUS EXPORT NdisMPciAssignResources( - IN NDIS_HANDLE MiniportHandle, + IN NDIS_HANDLE MiniportAdapterHandle, IN ULONG SlotNumber, OUT PNDIS_RESOURCE_LIST *AssignedResources) { - PNDIS_MINIPORT_BLOCK MiniportBlock = (PNDIS_MINIPORT_BLOCK)MiniportHandle; - - if (MiniportBlock->BusType != PCIBus || - MiniportBlock->AllocatedResources == NULL) + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + + if (Adapter->NdisMiniportBlock.BusType != PCIBus || + Adapter->NdisMiniportBlock.AllocatedResources == NULL) { *AssignedResources = NULL; return NDIS_STATUS_FAILURE; } - *AssignedResources = &MiniportBlock->AllocatedResources->List[0].PartialResourceList; + *AssignedResources = &Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList; return NDIS_STATUS_SUCCESS; } @@ -99,7 +99,7 @@ */ { PNDIS_WRAPPER_CONTEXT WrapperContext = (PNDIS_WRAPPER_CONTEXT)WrapperConfigurationContext; - PNDIS_MINIPORT_BLOCK MiniportBlock = WrapperContext->DeviceObject->DeviceExtension; + PLOGICAL_ADAPTER Adapter = WrapperContext->DeviceObject->DeviceExtension; ULONG ResourceListSize; PAGED_CODE(); @@ -107,7 +107,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Called\n")); - if (MiniportBlock->AllocatedResources == NULL) + if (Adapter->NdisMiniportBlock.AllocatedResources == NULL) { NDIS_DbgPrint(MIN_TRACE, ("No allocated resources!\n")); *Status = NDIS_STATUS_FAILURE; @@ -116,13 +116,13 @@ ResourceListSize = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors) + - MiniportBlock->AllocatedResources->List[0].PartialResourceList.Count * + Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); if (*BufferSize >= ResourceListSize) { RtlCopyMemory(ResourceList, - &MiniportBlock->AllocatedResources->List[0].PartialResourceList, + &Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList, ResourceListSize); *BufferSize = ResourceListSize; *Status = NDIS_STATUS_SUCCESS; @@ -196,10 +196,10 @@ IN PVOID Buffer, IN ULONG Length) { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)NdisAdapterHandle; + PLOGICAL_ADAPTER Adapter = NdisAdapterHandle; /* Slot number is ignored since W2K for all NDIS drivers. */ return HalGetBusDataByOffset(PCIConfiguration, - Adapter->BusNumber, Adapter->SlotNumber, + Adapter->NdisMiniportBlock.BusNumber, Adapter->NdisMiniportBlock.SlotNumber, Buffer, Offset, Length); } @@ -216,10 +216,10 @@ IN PVOID Buffer, IN ULONG Length) { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)NdisAdapterHandle; + PLOGICAL_ADAPTER Adapter = NdisAdapterHandle; /* Slot number is ignored since W2K for all NDIS drivers. */ return HalSetBusDataByOffset(PCIConfiguration, - Adapter->BusNumber, Adapter->SlotNumber, + Adapter->NdisMiniportBlock.BusNumber, Adapter->NdisMiniportBlock.SlotNumber, Buffer, Offset, Length); } Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Thu Oct 2 04:42:08 2008 @@ -60,22 +60,31 @@ * TRUE if a miniport controlled device generated the interrupt */ { - BOOLEAN InterruptRecognized; - BOOLEAN QueueMiniportHandleInterrupt; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)ServiceContext; + BOOLEAN InterruptRecognized = FALSE; + BOOLEAN QueueMiniportHandleInterrupt = FALSE; + PLOGICAL_ADAPTER Adapter = ServiceContext; NDIS_DbgPrint(MAX_TRACE, ("Called. Adapter (0x%X)\n", Adapter)); - (*Adapter->DriverHandle->MiniportCharacteristics.ISRHandler)( - &InterruptRecognized, - &QueueMiniportHandleInterrupt, - Adapter->MiniportAdapterContext); + if (Adapter->NdisMiniportBlock.Interrupt->IsrRequested) { + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ISRHandler)( + &InterruptRecognized, + &QueueMiniportHandleInterrupt, + Adapter->NdisMiniportBlock.MiniportAdapterContext); + + } else if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler) { + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext); + QueueMiniportHandleInterrupt = TRUE; + InterruptRecognized = TRUE; + } + if (QueueMiniportHandleInterrupt) - { - NDIS_DbgPrint(MAX_TRACE, ("Queueing DPC.\n")); - KeInsertQueueDpc(&Adapter->Interrupt->InterruptDpc, NULL, NULL); - } + { + NDIS_DbgPrint(MAX_TRACE, ("Queuing DPC.\n")); + KeInsertQueueDpc(&Adapter->NdisMiniportBlock.Interrupt->InterruptDpc, NULL, NULL); + } NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); @@ -207,15 +216,15 @@ * - Called at IRQL = DISPATCH_LEVEL */ { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)Context; - - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - Adapter->MapRegisters[Adapter->CurrentMapRegister].MapRegister = MapRegisterBase; + PLOGICAL_ADAPTER Adapter = Context; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + Adapter->NdisMiniportBlock.MapRegisters[Adapter->NdisMiniportBlock.CurrentMapRegister].MapRegister = MapRegisterBase; NDIS_DbgPrint(MAX_TRACE, ("setting event and leaving.\n")); - KeSetEvent(Adapter->AllocationEvent, 0, FALSE); + KeSetEvent(Adapter->NdisMiniportBlock.AllocationEvent, 0, FALSE); /* this is only the thing to do for busmaster NICs */ return DeallocateObjectKeepRegisters; @@ -767,6 +776,7 @@ KeInitializeEvent(&Interrupt->DpcsCompletedEvent, NotificationEvent, FALSE); Interrupt->SharedInterrupt = SharedInterrupt; + Interrupt->IsrRequested = RequestIsr; Adapter->NdisMiniportBlock.Interrupt = Interrupt;

1 0

[cgutman] 36621: - Adapter is PLOGICAL_ADAPTER not PNDIS_MINIPORT_BLOCK
by cgutman＠svn.reactos.org 02 Oct '08

02 Oct '08

Author: cgutman Date: Wed Oct 1 21:13:19 2008 New Revision: 36621 URL: http://svn.reactos.org/svn/reactos?rev=36621&view=rev Log: - Adapter is PLOGICAL_ADAPTER not PNDIS_MINIPORT_BLOCK Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Wed Oct 1 21:13:19 2008 @@ -57,20 +57,20 @@ NDIS_STATUS EXPORT NdisMPciAssignResources( - IN NDIS_HANDLE MiniportHandle, + IN NDIS_HANDLE MiniportAdapterHandle, IN ULONG SlotNumber, OUT PNDIS_RESOURCE_LIST *AssignedResources) { - PNDIS_MINIPORT_BLOCK MiniportBlock = (PNDIS_MINIPORT_BLOCK)MiniportHandle; - - if (MiniportBlock->BusType != PCIBus || - MiniportBlock->AllocatedResources == NULL) + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + + if (Adapter->NdisMiniportBlock.BusType != PCIBus || + Adapter->NdisMiniportBlock.AllocatedResources == NULL) { *AssignedResources = NULL; return NDIS_STATUS_FAILURE; } - *AssignedResources = &MiniportBlock->AllocatedResources->List[0].PartialResourceList; + *AssignedResources = &Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList; return NDIS_STATUS_SUCCESS; } @@ -99,7 +99,7 @@ */ { PNDIS_WRAPPER_CONTEXT WrapperContext = (PNDIS_WRAPPER_CONTEXT)WrapperConfigurationContext; - PNDIS_MINIPORT_BLOCK MiniportBlock = WrapperContext->DeviceObject->DeviceExtension; + PLOGICAL_ADAPTER Adapter = WrapperContext->DeviceObject->DeviceExtension; ULONG ResourceListSize; PAGED_CODE(); @@ -107,7 +107,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Called\n")); - if (MiniportBlock->AllocatedResources == NULL) + if (Adapter->NdisMiniportBlock.AllocatedResources == NULL) { NDIS_DbgPrint(MIN_TRACE, ("No allocated resources!\n")); *Status = NDIS_STATUS_FAILURE; @@ -116,13 +116,13 @@ ResourceListSize = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors) + - MiniportBlock->AllocatedResources->List[0].PartialResourceList.Count * + Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); if (*BufferSize >= ResourceListSize) { RtlCopyMemory(ResourceList, - &MiniportBlock->AllocatedResources->List[0].PartialResourceList, + &Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList, ResourceListSize); *BufferSize = ResourceListSize; *Status = NDIS_STATUS_SUCCESS; @@ -196,10 +196,10 @@ IN PVOID Buffer, IN ULONG Length) { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)NdisAdapterHandle; + PLOGICAL_ADAPTER Adapter = NdisAdapterHandle; /* Slot number is ignored since W2K for all NDIS drivers. */ return HalGetBusDataByOffset(PCIConfiguration, - Adapter->BusNumber, Adapter->SlotNumber, + Adapter->NdisMiniportBlock.BusNumber, Adapter->NdisMiniportBlock.SlotNumber, Buffer, Offset, Length); } @@ -216,10 +216,10 @@ IN PVOID Buffer, IN ULONG Length) { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)NdisAdapterHandle; + PLOGICAL_ADAPTER Adapter = NdisAdapterHandle; /* Slot number is ignored since W2K for all NDIS drivers. */ return HalSetBusDataByOffset(PCIConfiguration, - Adapter->BusNumber, Adapter->SlotNumber, + Adapter->NdisMiniportBlock.BusNumber, Adapter->NdisMiniportBlock.SlotNumber, Buffer, Offset, Length); } Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] Wed Oct 1 21:13:19 2008 @@ -216,15 +216,15 @@ * - Called at IRQL = DISPATCH_LEVEL */ { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)Context; - - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - Adapter->MapRegisters[Adapter->CurrentMapRegister].MapRegister = MapRegisterBase; + PLOGICAL_ADAPTER Adapter = Context; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + Adapter->NdisMiniportBlock.MapRegisters[Adapter->NdisMiniportBlock.CurrentMapRegister].MapRegister = MapRegisterBase; NDIS_DbgPrint(MAX_TRACE, ("setting event and leaving.\n")); - KeSetEvent(Adapter->AllocationEvent, 0, FALSE); + KeSetEvent(Adapter->NdisMiniportBlock.AllocationEvent, 0, FALSE); /* this is only the thing to do for busmaster NICs */ return DeallocateObjectKeepRegisters;

1 0

[cgutman] 36620: - Only call MiniportISR if the miniport driver called NdisMRegisterInterrupt with RequestIsr TRUE - If RequestIsr is FALSE call the MiniportDisableInterrupt handler
by cgutman＠svn.reactos.org 02 Oct '08

02 Oct '08

Author: cgutman Date: Wed Oct 1 21:04:57 2008 New Revision: 36620 URL: http://svn.reactos.org/svn/reactos?rev=36620&view=rev Log: - Only call MiniportISR if the miniport driver called NdisMRegisterInterrupt with RequestIsr TRUE - If RequestIsr is FALSE call the MiniportDisableInterrupt handler Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] Wed Oct 1 21:04:57 2008 @@ -60,22 +60,31 @@ * TRUE if a miniport controlled device generated the interrupt */ { - BOOLEAN InterruptRecognized; - BOOLEAN QueueMiniportHandleInterrupt; + BOOLEAN InterruptRecognized = FALSE; + BOOLEAN QueueMiniportHandleInterrupt = FALSE; PLOGICAL_ADAPTER Adapter = ServiceContext; NDIS_DbgPrint(MAX_TRACE, ("Called. Adapter (0x%X)\n", Adapter)); - (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ISRHandler)( - &InterruptRecognized, - &QueueMiniportHandleInterrupt, - Adapter->NdisMiniportBlock.MiniportAdapterContext); + if (Adapter->NdisMiniportBlock.Interrupt->IsrRequested) { + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ISRHandler)( + &InterruptRecognized, + &QueueMiniportHandleInterrupt, + Adapter->NdisMiniportBlock.MiniportAdapterContext); + + } else if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler) { + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext); + QueueMiniportHandleInterrupt = TRUE; + InterruptRecognized = TRUE; + } + if (QueueMiniportHandleInterrupt) - { - NDIS_DbgPrint(MAX_TRACE, ("Queueing DPC.\n")); + { + NDIS_DbgPrint(MAX_TRACE, ("Queuing DPC.\n")); KeInsertQueueDpc(&Adapter->NdisMiniportBlock.Interrupt->InterruptDpc, NULL, NULL); - } + } NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); @@ -767,6 +776,7 @@ KeInitializeEvent(&Interrupt->DpcsCompletedEvent, NotificationEvent, FALSE); Interrupt->SharedInterrupt = SharedInterrupt; + Interrupt->IsrRequested = RequestIsr; Adapter->NdisMiniportBlock.Interrupt = Interrupt;

1 0

[cgutman] 36619: - Adapter not NdisMiniportBlock is passed to ServiceRoutine
by cgutman＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: cgutman Date: Wed Oct 1 18:10:00 2008 New Revision: 36619 URL: http://svn.reactos.org/svn/reactos?rev=36619&view=rev Log: - Adapter not NdisMiniportBlock is passed to ServiceRoutine Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] Wed Oct 1 18:10:00 2008 @@ -62,19 +62,19 @@ { BOOLEAN InterruptRecognized; BOOLEAN QueueMiniportHandleInterrupt; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)ServiceContext; + PLOGICAL_ADAPTER Adapter = ServiceContext; NDIS_DbgPrint(MAX_TRACE, ("Called. Adapter (0x%X)\n", Adapter)); - (*Adapter->DriverHandle->MiniportCharacteristics.ISRHandler)( + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ISRHandler)( &InterruptRecognized, &QueueMiniportHandleInterrupt, - Adapter->MiniportAdapterContext); + Adapter->NdisMiniportBlock.MiniportAdapterContext); if (QueueMiniportHandleInterrupt) { NDIS_DbgPrint(MAX_TRACE, ("Queueing DPC.\n")); - KeInsertQueueDpc(&Adapter->Interrupt->InterruptDpc, NULL, NULL); + KeInsertQueueDpc(&Adapter->NdisMiniportBlock.Interrupt->InterruptDpc, NULL, NULL); } NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n"));

1 0

[gschneider] 36618: Initialize iCodePage to 0, because if might be used uninitialized.
by gschneider＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: gschneider Date: Wed Oct 1 15:08:50 2008 New Revision: 36618 URL: http://svn.reactos.org/svn/reactos?rev=36618&view=rev Log: Initialize iCodePage to 0, because if might be used uninitialized. Modified: trunk/reactos/base/applications/notepad/text.c Modified: trunk/reactos/base/applications/notepad/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/text.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/text.c [iso-8859-1] Wed Oct 1 15:08:50 2008 @@ -58,7 +58,7 @@ BOOL bSuccess = FALSE; BYTE b = 0; int iEncoding = ENCODING_ANSI; - int iCodePage; + int iCodePage = 0; WCHAR szCrlf[2] = { '\r', '\n' }; DWORD adwEolnCount[3] = { 0, 0, 0 }; @@ -223,7 +223,7 @@ DWORD dwPos = 0; DWORD dwByteCount; BYTE buffer[1024]; - UINT iCodePage; + UINT iCodePage = 0; DWORD dwDummy, i; BOOL bSuccess = FALSE; int iBufferSize, iRequiredBytes;

1 0

[gschneider] 36617: After entering a case on iEncoding for ANSI/UTF, iEncoding can only have those two values. Fixes Coverity CIDS 19, 20.
by gschneider＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: gschneider Date: Wed Oct 1 14:56:51 2008 New Revision: 36617 URL: http://svn.reactos.org/svn/reactos?rev=36617&view=rev Log: After entering a case on iEncoding for ANSI/UTF, iEncoding can only have those two values. Fixes Coverity CIDS 19, 20. Modified: trunk/reactos/base/applications/notepad/text.c Modified: trunk/reactos/base/applications/notepad/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/text.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/text.c [iso-8859-1] Wed Oct 1 14:56:51 2008 @@ -120,8 +120,6 @@ iCodePage = CP_ACP; else if (iEncoding == ENCODING_UTF8) iCodePage = CP_UTF8; - else - goto done; if ((dwSize - dwPos) > 0) { @@ -263,8 +261,6 @@ iCodePage = CP_ACP; else if (iEncoding == ENCODING_UTF8) iCodePage = CP_UTF8; - else - goto done; iRequiredBytes = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, NULL, 0, NULL, NULL); if (iRequiredBytes <= 0)

1 0

[cwittich] 36616: fix formatting
by cwittich＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: cwittich Date: Wed Oct 1 13:19:42 2008 New Revision: 36616 URL: http://svn.reactos.org/svn/reactos?rev=36616&view=rev Log: fix formatting Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Oct 1 13:19:42 2008 @@ -354,43 +354,43 @@ } #ifdef CPU_TRANSMETA - if (Vendor == CPU_TRANSMETA) - { - /* Enable CMPXCHG8B if the family (>= 5), model and stepping (>= 4.2) support it */ - if ((Reg[0] & 0x0F00) >= 0x0500 && (Reg[0] & 0x00FF) >= 0x0042) - { - WRMSR(0x80860004, RDMSR(0x80860004) | 0x0100); - FeatureBits |= KF_CMPXCHG8B; - } - } + if (Vendor == CPU_TRANSMETA) + { + /* Enable CMPXCHG8B if the family (>= 5), model and stepping (>= 4.2) support it */ + if ((Reg[0] & 0x0F00) >= 0x0500 && (Reg[0] & 0x00FF) >= 0x0042) + { + WRMSR(0x80860004, RDMSR(0x80860004) | 0x0100); + FeatureBits |= KF_CMPXCHG8B; + } + } #endif #ifdef CPU_CENTAUR - if (Vendor == CPU_CENTAUR) - { - /* If CMPXCHG8B is not detected, try to enable it */ - if (!(CpuFeatures & 0x00000100)) - { - if ((Reg[0] & 0x0F00) == 0x0500) - { - WRMSR(0x0107, RDMSR(0x0107) | 0x02); - FeatureBits |= KF_CMPXCHG8B; - } - else if ((Reg[0] & 0x0F00) >= 0x0600) - { - WRMSR(0x1107, (RDMSR(0x1107) | 0x02) & ~((LONGLONG)0x01)); - FeatureBits |= KF_CMPXCHG8B; - } - } - } + if (Vendor == CPU_CENTAUR) + { + /* If CMPXCHG8B is not detected, try to enable it */ + if (!(CpuFeatures & 0x00000100)) + { + if ((Reg[0] & 0x0F00) == 0x0500) + { + WRMSR(0x0107, RDMSR(0x0107) | 0x02); + FeatureBits |= KF_CMPXCHG8B; + } + else if ((Reg[0] & 0x0F00) >= 0x0600) + { + WRMSR(0x1107, (RDMSR(0x1107) | 0x02) & ~((LONGLONG)0x01)); + FeatureBits |= KF_CMPXCHG8B; + } + } + } #endif #ifdef CPU_RISE - if (Vendor == CPU_RISE) - { - /* Windows Vista assumes CMPXCHG8B is always supported on Rise */ - FeatureBits |= KF_CMPXCHG8B; - } + if (Vendor == CPU_RISE) + { + /* Windows Vista assumes CMPXCHG8B is always supported on Rise */ + FeatureBits |= KF_CMPXCHG8B; + } #endif /* Convert all CPUID Feature bits into our format */

1 0

[dreimer] 36615: Be a bit more friendly to ppl who want different RosBE Versions installed. Don't force a unistallation to continue setup.
by dreimer＠svn.reactos.org 01 Oct '08

01 Oct '08

Author: dreimer Date: Wed Oct 1 13:02:19 2008 New Revision: 36615 URL: http://svn.reactos.org/svn/reactos?rev=36615&view=rev Log: Be a bit more friendly to ppl who want different RosBE Versions installed. Don't force a unistallation to continue setup. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Oct 1 13:02:19 2008 @@ -398,8 +398,7 @@ "DisplayVersion" ${If} $R1 == "${PRODUCT_VERSION}" messageBox MB_OK|MB_ICONEXCLAMATION \ - "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. Please manually uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." - Quit + "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. You should uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." ${EndIf} ${If} $R0 == "" ReadRegStr $R0 HKLM \ @@ -413,18 +412,17 @@ ${EndIf} ${EndIf} MessageBox MB_YESNO|MB_ICONQUESTION \ - "A previous version of the ${PRODUCT_NAME} was found. You must uninstall it before installing this version.$\n$\nDo you want to do that now?" \ + "A previous version of the ${PRODUCT_NAME} was found. You should uninstall it before installing this version.$\n$\nDo you want to do that now?" \ IDNO UninstallPrevious_no \ IDYES UninstallPrevious_yes Abort - UninstallPrevious_no: - Quit UninstallPrevious_yes: Var /global PREVIOUSINSTDIR Push $R0 Call GetParent Pop $PREVIOUSINSTDIR ExecWait '$R0 _?=$PREVIOUSINSTDIR' + UninstallPrevious_no: FunctionEnd Function GetParent Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Wed Oct 1 13:02:19 2008 @@ -212,8 +212,7 @@ "DisplayVersion" ${If} $R1 == "${PRODUCT_VERSION}" messageBox MB_OK|MB_ICONEXCLAMATION \ - "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. Please manually uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." - Quit + "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. You should uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." ${EndIf} ${If} $R0 == "" ReadRegStr $R0 HKLM \ @@ -227,18 +226,17 @@ ${EndIf} ${EndIf} MessageBox MB_YESNO|MB_ICONQUESTION \ - "A previous version of the ${PRODUCT_NAME} was found. You must uninstall it before installing this version.$\n$\nDo you want to do that now?" \ + "A previous version of the ${PRODUCT_NAME} was found. You should uninstall it before installing this version.$\n$\nDo you want to do that now?" \ IDNO UninstallPrevious_no \ IDYES UninstallPrevious_yes Abort - UninstallPrevious_no: - Quit UninstallPrevious_yes: Var /global PREVIOUSINSTDIR Push $R0 Call GetParent Pop $PREVIOUSINSTDIR ExecWait '$R0 _?=$PREVIOUSINSTDIR' + UninstallPrevious_no: FunctionEnd Function GetParent

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