Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 41107: - AbortDoc, Clear the correct flags.
by jimtabor＠svn.reactos.org 25 May '09

25 May '09

Author: jimtabor Date: Mon May 25 07:54:34 2009 New Revision: 41107 URL: http://svn.reactos.org/svn/reactos?rev=41107&view=rev Log: - AbortDoc, Clear the correct flags. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon May 25 07:54:34 2009 @@ -594,7 +594,7 @@ else Ret = SP_ERROR; - pldc->Flags &= ~(LDC_INFODC|LDC_META_PRINT|LDC_INIT_PAGE|LDC_INIT_DOCUMENT|LDC_SAPCALLBACK); + pldc->Flags &= ~(LDC_META_PRINT|LDC_STARTPAGE|LDC_INIT_PAGE|LDC_INIT_DOCUMENT|LDC_SAPCALLBACK); return Ret; }

1 0

[cgutman] 41105: - Fix a bug that could result in Dma32BitAddresses being set if the caller specifies NDIS_DMA_24BITS
by cgutman＠svn.reactos.org 24 May '09

24 May '09

Author: cgutman Date: Mon May 25 00:25:11 2009 New Revision: 41105 URL: http://svn.reactos.org/svn/reactos?rev=41105&view=rev Log: - Fix a bug that could result in Dma32BitAddresses being set if the caller specifies NDIS_DMA_24BITS Modified: trunk/reactos/drivers/network/ndis/ndis/io.c 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] Mon May 25 00:25:11 2009 @@ -308,7 +308,7 @@ if(DmaSize == NDIS_DMA_64BITS) Description.Dma64BitAddresses = TRUE; - else + else if(DmaSize == NDIS_DMA_32BITS) Description.Dma32BitAddresses = TRUE; AdapterObject = IoGetDmaAdapter(

1 0

[cwittich] 41104: revert a part of r41093 - A functions should call the W functions instead of the Nt functions
by cwittich＠svn.reactos.org 24 May '09

24 May '09

Author: cwittich Date: Sun May 24 22:57:28 2009 New Revision: 41104 URL: http://svn.reactos.org/svn/reactos?rev=41104&view=rev Log: revert a part of r41093 - A functions should call the W functions instead of the Nt functions 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] Sun May 24 22:57:28 2009 @@ -3964,96 +3964,110 @@ * * @implemented */ -LSTATUS WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD type, - LPBYTE data, LPDWORD count ) -{ - NTSTATUS status; - ANSI_STRING nameA; - DWORD total_size, datalen = 0; - 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_a(name), reserved, type, data, count, count ? *count : 0 ); - - if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; - - status = MapDefaultKey( (PHANDLE)&hkey, hkey); - if (!NT_SUCCESS(status)) - { - return RtlNtStatusToDosError(status); - } - - if (count) datalen = *count; - if (!data && count) *count = 0; - - /* this matches Win9x behaviour - NT sets *type to a random value */ - if (type) *type = REG_NONE; - - RtlInitAnsiString( &nameA, name ); - if ((status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString, - &nameA, FALSE ))) - return RtlNtStatusToDosError(status); - - status = NtQueryValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString, - KeyValuePartialInformation, buffer, sizeof(buffer), &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; - - /* we need to fetch the contents for a string type even if not requested, - * because we need to compute the length of the ASCII string. */ - if (data || is_string(info->Type)) - { - /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) - { - if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); - if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size ))) +LONG WINAPI +RegQueryValueExA(HKEY hKey, + LPCSTR lpValueName, + LPDWORD lpReserved, + LPDWORD lpType, + LPBYTE lpData, + LPDWORD lpcbData) +{ + UNICODE_STRING ValueName; + UNICODE_STRING ValueData; + ANSI_STRING AnsiString; + LONG ErrorCode; + DWORD Length; + DWORD Type; + + TRACE("hKey 0x%X lpValueName %s lpData 0x%X lpcbData %d\n", + hKey, lpValueName, lpData, lpcbData ? *lpcbData : 0); + + if (lpData != NULL && lpcbData == NULL) + { + return ERROR_INVALID_PARAMETER; + } + + if (lpData) + { + ValueData.Length = 0; + ValueData.MaximumLength = (*lpcbData + 1) * sizeof(WCHAR); + ValueData.Buffer = RtlAllocateHeap(ProcessHeap, + 0, + ValueData.MaximumLength); + if (!ValueData.Buffer) + { + return ERROR_OUTOFMEMORY; + } + } + else + { + ValueData.Buffer = NULL; + ValueData.Length = 0; + ValueData.MaximumLength = 0; + + if (lpcbData) + *lpcbData = 0; + } + + RtlCreateUnicodeStringFromAsciiz(&ValueName, + (LPSTR)lpValueName); + + Length = (lpcbData == NULL) ? 0 : *lpcbData * sizeof(WCHAR); + ErrorCode = RegQueryValueExW(hKey, + ValueName.Buffer, + lpReserved, + &Type, + (lpData == NULL) ? NULL : (LPBYTE)ValueData.Buffer, + &Length); + TRACE("ErrorCode %lu\n", ErrorCode); + RtlFreeUnicodeString(&ValueName); + + if (ErrorCode == ERROR_SUCCESS || + ErrorCode == ERROR_MORE_DATA) + { + if (lpType != NULL) + { + *lpType = Type; + } + + if ((Type == REG_SZ) || (Type == REG_MULTI_SZ) || (Type == REG_EXPAND_SZ)) + { + if (ErrorCode == ERROR_SUCCESS && ValueData.Buffer != NULL) { - status = STATUS_NO_MEMORY; - goto done; + RtlInitAnsiString(&AnsiString, NULL); + AnsiString.Buffer = (LPSTR)lpData; + AnsiString.MaximumLength = *lpcbData; + ValueData.Length = Length; + ValueData.MaximumLength = ValueData.Length + sizeof(WCHAR); + RtlUnicodeStringToAnsiString(&AnsiString, &ValueData, FALSE); } - info = (KEY_VALUE_PARTIAL_INFORMATION *)buf_ptr; - status = NtQueryValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString, - KeyValuePartialInformation, buf_ptr, total_size, &total_size ); - } - - if (status) goto done; - - if (is_string(info->Type)) - { - DWORD len; - - RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info_size), - total_size - info_size ); - if (data && len) + + Length = Length / sizeof(WCHAR); + } + else if (ErrorCode == ERROR_SUCCESS && ValueData.Buffer != NULL) + { + if (*lpcbData < Length) { - if (len > datalen) status = STATUS_BUFFER_OVERFLOW; - else - { - RtlUnicodeToMultiByteN( (char*)data, len, NULL, (WCHAR *)(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 (len < datalen && data[len-1]) data[len] = 0; - } + ErrorCode = ERROR_MORE_DATA; } - total_size = len + info_size; - } - else if (data) - { - if (total_size - info_size > datalen) status = STATUS_BUFFER_OVERFLOW; - else memcpy( data, buf_ptr + info_size, total_size - info_size ); - } - } - 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 ); - return RtlNtStatusToDosError(status); + else + { + RtlMoveMemory(lpData, ValueData.Buffer, Length); + } + } + + if (lpcbData != NULL) + { + *lpcbData = Length; + } + } + + if (ValueData.Buffer != NULL) + { + RtlFreeHeap(ProcessHeap, 0, ValueData.Buffer); + } + + return ErrorCode; } @@ -4692,43 +4706,86 @@ * * @implemented */ -LSTATUS WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, - CONST BYTE *data, DWORD count ) -{ - ANSI_STRING nameA; - WCHAR *dataW = NULL; - NTSTATUS status; - - if (count && is_string(type)) - { - /* if user forgot to count terminating null, add it (yes NT does this) */ - if (data[count-1] && !data[count]) count++; - } - - status = MapDefaultKey( (PHANDLE)&hkey, hkey); - if (!NT_SUCCESS(status)) - { - return RtlNtStatusToDosError(status); - } - - if (is_string( type )) /* need to convert to Unicode */ - { - DWORD lenW; - RtlMultiByteToUnicodeSize( &lenW, (const char *)data, count ); - if (!(dataW = HeapAlloc( GetProcessHeap(), 0, lenW ))) return ERROR_OUTOFMEMORY; - RtlMultiByteToUnicodeN( dataW, lenW, NULL, (const char *)data, count ); - count = lenW; - data = (BYTE *)dataW; - } - - RtlInitAnsiString( &nameA, name ); - if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString, - &nameA, FALSE ))) - { - status = NtSetValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString, 0, type, (PVOID)data, count ); - } - HeapFree( GetProcessHeap(), 0, dataW ); - return RtlNtStatusToDosError( status ); +LONG WINAPI +RegSetValueExA(HKEY hKey, + LPCSTR lpValueName, + DWORD Reserved, + DWORD dwType, + CONST BYTE* lpData, + DWORD cbData) +{ + UNICODE_STRING ValueName; + LPWSTR pValueName; + ANSI_STRING AnsiString; + UNICODE_STRING Data; + LONG ErrorCode; + LPBYTE pData; + DWORD DataSize; + + if (lpValueName != NULL && + strlen(lpValueName) != 0) + { + RtlCreateUnicodeStringFromAsciiz(&ValueName, + (PSTR)lpValueName); + } + else + { + ValueName.Buffer = NULL; + } + + pValueName = (LPWSTR)ValueName.Buffer; + + if (((dwType == REG_SZ) || + (dwType == REG_MULTI_SZ) || + (dwType == REG_EXPAND_SZ)) && + (cbData != 0)) + { + /* NT adds one if the caller forgot the NULL-termination character */ + if (lpData[cbData - 1] != '\0') + { + cbData++; + } + + RtlInitAnsiString(&AnsiString, + NULL); + AnsiString.Buffer = (PSTR)lpData; + AnsiString.Length = cbData - 1; + AnsiString.MaximumLength = cbData; + RtlAnsiStringToUnicodeString(&Data, + &AnsiString, + TRUE); + pData = (LPBYTE)Data.Buffer; + DataSize = cbData * sizeof(WCHAR); + } + else + { + RtlInitUnicodeString(&Data, + NULL); + pData = (LPBYTE)lpData; + DataSize = cbData; + } + + ErrorCode = RegSetValueExW(hKey, + pValueName, + Reserved, + dwType, + pData, + DataSize); + if (pValueName != NULL) + { + RtlFreeHeap(ProcessHeap, + 0, + ValueName.Buffer); + } + + if (Data.Buffer != NULL) + { + RtlFreeHeap(ProcessHeap, + 0, + Data.Buffer); + } + + return ErrorCode; }

1 0

[jimtabor] 41103: - Implement SetAbortProc and halfplement AbortDoc.
by jimtabor＠svn.reactos.org 24 May '09

24 May '09

Author: jimtabor Date: Sun May 24 22:04:10 2009 New Revision: 41103 URL: http://svn.reactos.org/svn/reactos?rev=41103&view=rev Log: - Implement SetAbortProc and halfplement AbortDoc. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Sun May 24 22:04:10 2009 @@ -558,14 +558,50 @@ HDC hdc ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented + PLDC pldc; + int Ret = SP_ERROR; + ULONG hType = GDI_HANDLE_GET_TYPE(hdc); + + if (hType == GDILoObjType_LO_DC_TYPE || hType == GDILoObjType_LO_METADC16_TYPE) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + pldc = GdiGetLDC(hdc); + if ( !pldc ) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + if ( !(pldc->Flags & LDC_INIT_DOCUMENT) ) return 1; + + /* winspool:DocumentEvent printer driver */ + + ((PW32CLIENTINFO)NtCurrentTeb()->Win32ClientInfo)->cSpins = 0; + + if ( pldc->Flags & LDC_META_PRINT) + { + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return Ret; + } + + if (NtGdiAbortDoc(hdc)) + { + /* winspool:AbortPrinter driver */ + Ret = 1; + } + else + Ret = SP_ERROR; + + pldc->Flags &= ~(LDC_INFODC|LDC_META_PRINT|LDC_INIT_PAGE|LDC_INIT_DOCUMENT|LDC_SAPCALLBACK); + + return Ret; +} + + +/* + * @implemented */ int WINAPI @@ -573,9 +609,35 @@ HDC hdc, ABORTPROC lpAbortProc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + PLDC pldc; + ULONG hType = GDI_HANDLE_GET_TYPE(hdc); + + if (hType == GDILoObjType_LO_DC_TYPE || hType == GDILoObjType_LO_METADC16_TYPE) + return SP_ERROR; + + pldc = GdiGetLDC(hdc); + if ( pldc ) + { + if ( lpAbortProc ) + { + if ( pldc->Flags & LDC_INIT_DOCUMENT ) + { + pldc->Flags |= LDC_SAPCALLBACK; + pldc->CallBackTick = GetTickCount(); + } + } + else + { + pldc->Flags &= ~LDC_SAPCALLBACK; + } + pldc->pAbortProc = lpAbortProc; + return 1; + } + else + { + SetLastError(ERROR_INVALID_HANDLE); + } + return SP_ERROR; } /* Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Sun May 24 22:04:10 2009 @@ -183,6 +183,7 @@ #define LDC_CLOCKWISE 0x00002000 #define LDC_KILL_DOCUMENT 0x00010000 #define LDC_META_PRINT 0x00020000 +#define LDC_INFODC 0x01000000 /* If CreateIC was passed. */ #define LDC_DEVCAPS 0x02000000 /* DC_ATTR Xform Flags */

1 0

[khornicek] 41102: - autoregister ddraw and dplayx
by khornicek＠svn.reactos.org 24 May '09

24 May '09

Author: khornicek Date: Sun May 24 20:10:57 2009 New Revision: 41102 URL: http://svn.reactos.org/svn/reactos?rev=41102&view=rev Log: - autoregister ddraw and dplayx Modified: trunk/reactos/dll/directx/dplayx/dplayx.rbuild trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild Modified: trunk/reactos/dll/directx/dplayx/dplayx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.… ============================================================================== --- trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] Sun May 24 20:10:57 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" unicode="yes"> -  + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dplayx.spec" /> <include base="dplayx">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Sun May 24 20:10:57 2009 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ddraw.spec" /> <include base="ddraw">.</include> <include base="ReactOS">include/reactos/wine</include>

1 0

[cgutman] 41090: - MajorFunction has IRP_MJ_MAXIMUM_FUNCTION positions - Sorry for so many commits on the same function
by cgutman＠svn.reactos.org 24 May '09

24 May '09

Author: cgutman Date: Sun May 24 04:49:02 2009 New Revision: 41090 URL: http://svn.reactos.org/svn/reactos?rev=41090&view=rev Log: - MajorFunction has IRP_MJ_MAXIMUM_FUNCTION positions - Sorry for so many commits on the same function Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun May 24 04:49:02 2009 @@ -2788,7 +2788,7 @@ return NDIS_STATUS_RESOURCES; } - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverBlock->DriverObject->MajorFunction[i] = MajorFunctions[i]; DriverBlock->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp;

2 1

[tkreuzer] 41101: wdmaud.drv: don't cast DWORD to PVOID, use UlongToPtr instead
by tkreuzer＠svn.reactos.org 24 May '09

24 May '09

Author: tkreuzer Date: Sun May 24 16:53:47 2009 New Revision: 41101 URL: http://svn.reactos.org/svn/reactos?rev=41101&view=rev Log: wdmaud.drv: don't cast DWORD to PVOID, use UlongToPtr instead Modified: branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/wdmaud.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Sun May 24 16:53:47 2009 @@ -344,7 +344,7 @@ for ( i = 0; i < DeviceCount; ++ i ) { - Result = ListSoundDevice(DeviceType, (PVOID) i, &SoundDevice); + Result = ListSoundDevice(DeviceType, UlongToPtr(i), &SoundDevice); if ( ! MMSUCCESS(Result) ) {

1 0

[cwittich] 41100: a little bit of wine syncing - no real code changes - just to make syncing a bit easier next time
by cwittich＠svn.reactos.org 24 May '09

24 May '09

Author: cwittich Date: Sun May 24 16:14:42 2009 New Revision: 41100 URL: http://svn.reactos.org/svn/reactos?rev=41100&view=rev Log: a little bit of wine syncing - no real code changes - just to make syncing a bit easier next time Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Sun May 24 16:14:42 2009 @@ -70,6 +70,7 @@ #define IS_ENTRY_COMMENT(str) ((str)[0] == ';') static const WCHAR emptystringW[] = {0}; +static const WCHAR wininiW[] = { 'w','i','n','.','i','n','i',0 }; static RTL_CRITICAL_SECTION PROFILE_CritSect; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = @@ -158,7 +159,6 @@ break; } } - static void PROFILE_WriteLine( HANDLE hFile, WCHAR * szLine, int len, ENCODING encoding) { @@ -198,7 +198,6 @@ } } - /*********************************************************************** * PROFILE_Save * @@ -279,14 +278,12 @@ } } - /* returns 1 if a character white space else 0 */ static __inline int PROFILE_isspaceW(WCHAR c) { /* ^Z (DOS EOF) is a space too (found on CD-ROMs) */ return isspace(c) || c == 0x1a; } - static __inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len) { @@ -729,7 +726,6 @@ ZeroMemory(&CurProfile->LastWriteTime, sizeof(CurProfile->LastWriteTime)); } - /*********************************************************************** * * Compares a file time with the current time. If the file time is @@ -749,7 +745,6 @@ DPRINT("%08x;%08x\n",(unsigned)ftll+21000000,(unsigned)nowll); return ftll + 21000000 < nowll; } - /*********************************************************************** * PROFILE_Open @@ -784,7 +779,7 @@ GetWindowsDirectoryW( windirW, MAX_PATH ); if (!filename) - filename = L"win.ini"; + filename = wininiW; if ((RtlDetermineDosPathNameType_U(filename) == RtlPathTypeRelative) && !wcschr(filename, '\\') && !wcschr(filename, '/')) @@ -1139,14 +1134,13 @@ static int PROFILE_GetPrivateProfileString( LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, LPWSTR buffer, UINT len, LPCWSTR filename, - BOOL win32 ) + BOOL win32 ) { int ret; LPWSTR defval_tmp = NULL; DPRINT("%S, %S, %S, %p, %u, %S\n", - section, entry, - def_val, buffer, len, filename); + section, entry, def_val, buffer, len, filename); /* strip any trailing ' ' of def_val. */ if (def_val) @@ -1235,7 +1229,6 @@ HeapFree(GetProcessHeap(), 0, bufferW); return ret; } - /*********************************************************************** * GetPrivateProfileStringW (KERNEL32.@) @@ -1348,7 +1341,6 @@ return res; } - /*********************************************************************** * GetPrivateProfileSectionW (KERNEL32.@) */ @@ -1363,8 +1355,7 @@ return 0; } - DPRINT("(%S, %p, %ld, %S)\n", - section, buffer, len, filename); + DPRINT("(%S, %p, %ld, %S)\n", section, buffer, len, filename); RtlEnterCriticalSection( &PROFILE_CritSect ); @@ -1375,7 +1366,6 @@ return ret; } - /*********************************************************************** * GetPrivateProfileSectionA (KERNEL32.@) @@ -1597,7 +1587,7 @@ */ BOOL WINAPI WriteProfileSectionW( LPCWSTR section, LPCWSTR keys_n_values) { - return WritePrivateProfileSectionW(section, keys_n_values, L"win.ini"); + return WritePrivateProfileSectionW(section, keys_n_values, wininiW); }

1 0

[mkupfer] 41099: - better question icon in tango look (as long as tango icon set doesn't provide this icon) - source in reactos/media/graphics
by mkupfer＠svn.reactos.org 24 May '09

24 May '09

Author: mkupfer Date: Sun May 24 15:49:03 2009 New Revision: 41099 URL: http://svn.reactos.org/svn/reactos?rev=41099&view=rev Log: - better question icon in tango look (as long as tango icon set doesn't provide this icon) - source in reactos/media/graphics Modified: trunk/reactos/dll/win32/user32/resources/oic_ques.ico Modified: trunk/reactos/dll/win32/user32/resources/oic_ques.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available.

1 0

[tkreuzer] 41098: usermgr: fix 2 POINTER<->DWORD casts
by tkreuzer＠svn.reactos.org 24 May '09

24 May '09

Author: tkreuzer Date: Sun May 24 15:32:59 2009 New Revision: 41098 URL: http://svn.reactos.org/svn/reactos?rev=41098&view=rev Log: usermgr: fix 2 POINTER<->DWORD casts Modified: branches/ros-amd64-bringup/reactos/dll/cpl/usrmgr/groups.c branches/ros-amd64-bringup/reactos/dll/cpl/usrmgr/userprops.c Modified: branches/ros-amd64-bringup/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] Sun May 24 15:32:59 2009 @@ -51,7 +51,7 @@ PLOCALGROUP_INFO_1 pBuffer; DWORD entriesread; DWORD totalentries; - DWORD resume_handle = 0; + DWORD_PTR resume_handle = 0; DWORD i; LV_ITEM lvi; INT iItem; Modified: branches/ros-amd64-bringup/reactos/dll/cpl/usrmgr/userprops.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] Sun May 24 15:32:59 2009 @@ -377,7 +377,7 @@ PLOCALGROUP_INFO_1 pBuffer; DWORD entriesread; DWORD totalentries; - DWORD resume_handle = 0; + DWORD_PTR resume_handle = 0; DWORD i; LV_ITEM lvi; INT iItem;

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