Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[amunger] 18041: Fix getInterfaceInfoSet so GetInterfaceInfo returns only non-loopback adapters, however, we still return some incorrect info.

by amunger＠svn.reactos.com

Fix getInterfaceInfoSet so GetInterfaceInfo returns only non-loopback adapters, however, we still return some incorrect info. Silenced a DPRINT. Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-09-25 00:35:13 UTC (rev 18040) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-09-25 04:55:16 UTC (rev 18041) @@ -363,6 +363,7 @@ if( infoSetInt ) { for( i = 0; i < numEntities; i++ ) { if( isInterface( &entIDSet[i] ) ) { + infoSetInt[curInterf].entity_id = entIDSet[i]; status = tdiGetMibForIfEntity ( tcpFile, &entIDSet[i], @@ -769,7 +770,7 @@ sizeof(info.if_info) ); } - DPRINT1("entry->bDescr = %s\n", entry->bDescr); + DPRINT("entry->bDescr = %s\n", entry->bDescr); closeTcpFile( tcpFile ); } _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c --- trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2005-09-25 00:35:13 UTC (rev 18040) +++ trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2005-09-25 04:55:16 UTC (rev 18041) @@ -935,8 +935,9 @@ if (!dwOutBufLen) ret = ERROR_INVALID_PARAMETER; else { - DWORD numInterfaces = getNumInterfaces(); - ULONG size = sizeof(IP_INTERFACE_INFO) + (numInterfaces - 1) * + DWORD numNonLoopbackInterfaces = getNumNonLoopbackInterfaces(); + DPRINT("numNonLoopbackInterfaces == 0x%x\n", numNonLoopbackInterfaces); + ULONG size = sizeof(IP_INTERFACE_INFO) + (numNonLoopbackInterfaces) * sizeof(IP_ADAPTER_INDEX_MAP); if (!pIfTable || *dwOutBufLen < size) { @@ -944,10 +945,11 @@ ret = ERROR_INSUFFICIENT_BUFFER; } else { - InterfaceIndexTable *table = getInterfaceIndexTable(); + InterfaceIndexTable *table = getNonLoopbackInterfaceIndexTable(); + DPRINT("table->numIndexes == 0x%x\n", table->numIndexes); if (table) { - size = sizeof(IP_INTERFACE_INFO) + (table->numIndexes - 1) * + size = sizeof(IP_INTERFACE_INFO) + (table->numIndexes) * sizeof(IP_ADAPTER_INDEX_MAP); if (*dwOutBufLen < size) { *dwOutBufLen = size;

18 years, 11 months

[npwoods] 18040: 1. Moved windows styles pertaining to the edit control to main.h

by npwoods＠svn.reactos.com

1. Moved windows styles pertaining to the edit control to main.h 2. Stopped using WS_BORDER on the edit control Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/notepad/main.h _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-25 00:12:12 UTC (rev 18039) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-09-25 00:35:13 UTC (rev 18040) @@ -617,8 +617,7 @@ VOID DIALOG_EditWrap(VOID) { static const WCHAR editW[] = { 'e','d','i','t',0 }; - DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | - ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL; + DWORD dwStyle; RECT rc; DWORD size; LPWSTR pTemp; @@ -633,7 +632,7 @@ GetWindowText(Globals.hEdit, pTemp, size); DestroyWindow(Globals.hEdit); GetClientRect(Globals.hMainWnd, &rc); - if( Globals.bWrapLongLines ) dwStyle |= WS_HSCROLL | ES_AUTOHSCROLL; + dwStyle = Globals.bWrapLongLines ? EDIT_STYLE_WRAP : EDIT_STYLE; Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, dwStyle, 0, 0, rc.right, rc.bottom, Globals.hMainWnd, NULL, Globals.hInstance, NULL); _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-09-25 00:12:12 UTC (rev 18039) +++ trunk/reactos/subsys/system/notepad/main.c 2005-09-25 00:35:13 UTC (rev 18040) @@ -222,9 +222,7 @@ static const WCHAR editW[] = { 'e','d','i','t',0 }; RECT rc; GetClientRect(hWnd, &rc); - Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, - WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL | - ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL, + Globals.hEdit = CreateWindowEx(EDIT_EXSTYLE, editW, NULL, EDIT_STYLE, 0, 0, rc.right, rc.bottom, hWnd, NULL, Globals.hInstance, NULL); break; _____ Modified: trunk/reactos/subsys/system/notepad/main.h --- trunk/reactos/subsys/system/notepad/main.h 2005-09-25 00:12:12 UTC (rev 18039) +++ trunk/reactos/subsys/system/notepad/main.h 2005-09-25 00:35:13 UTC (rev 18040) @@ -23,6 +23,11 @@ #include "notepad_res.h" +#define EDIT_STYLE (WS_CHILD | WS_VISIBLE | WS_VSCROLL \ + | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL) +#define EDIT_STYLE_WRAP (EDIT_STYLE | WS_HSCROLL | ES_AUTOHSCROLL) +#define EDIT_EXSTYLE (WS_EX_CLIENTEDGE) + #define MAX_STRING_LEN 255 #define ENCODING_ANSI 0

18 years, 11 months

[npwoods] 18039: Fixed property svn:eol-style

by npwoods＠svn.reactos.com

Fixed property svn:eol-style Modified: trunk/reactos/subsys/system/notepad/text.c _____ Modified: trunk/reactos/subsys/system/notepad/text.c --- trunk/reactos/subsys/system/notepad/text.c 2005-09-25 00:00:03 UTC (rev 18038) +++ trunk/reactos/subsys/system/notepad/text.c 2005-09-25 00:12:12 UTC (rev 18039) @@ -1,389 +1,389 @@ -/* - * Notepad (text.c) - * - * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2002 Andriy Palamarchuk - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#define UNICODE - -#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> - -#include "main.h" - -static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, DWORD dwAppendLen) -{ - LPWSTR pszNewText; - - if (dwAppendLen > 0) - { - if (*ppszText) - { - pszNewText = (LPWSTR) HeapReAlloc(GetProcessHeap(), 0, *ppszText, (*pdwTextLen + dwAppendLen) * sizeof(WCHAR)); - } - else - { - pszNewText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, dwAppendLen * sizeof(WCHAR)); - } - - if (!pszNewText) - return FALSE; - - memcpy(pszNewText + *pdwTextLen, pszAppendText, dwAppendLen * sizeof(WCHAR)); - *ppszText = pszNewText; - *pdwTextLen += dwAppendLen; - } - return TRUE; -} - -BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln) -{ - DWORD dwSize; - LPBYTE pBytes = NULL; - LPCWSTR pszText; - LPWSTR pszAllocText = NULL; - DWORD dwPos, i; - DWORD dwCharCount; - BOOL bSuccess = FALSE; - BYTE b; - int iEncoding = ENCODING_ANSI; - int iCodePage; - WCHAR szCrlf[2] = { '\r', '\n' }; - DWORD adwEolnCount[3] = { 0, 0, 0 }; - - *ppszText = NULL; - *pdwTextLen = 0; - - dwSize = GetFileSize(hFile, NULL); - if (dwSize == INVALID_FILE_SIZE) - goto done; - - pBytes = HeapAlloc(GetProcessHeap(), 0, dwSize + 2); - if (!pBytes) - goto done; - - if (!ReadFile(hFile, pBytes, dwSize, &dwSize, NULL)) - goto done; - dwPos = 0; - - /* Make sure that there is a NUL character at the end, in any encoding */ - pBytes[dwSize + 0] = '\0'; - pBytes[dwSize + 1] = '\0'; - - /* Look for Byte Order Marks */ - if ((dwSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE)) - { - iEncoding = ENCODING_UNICODE; - dwPos += 2; - } - else if ((dwSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF)) - { - iEncoding = ENCODING_UNICODE_BE; - dwPos += 2; - } - else if ((dwSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) - { - iEncoding = ENCODING_UTF8; - dwPos += 3; - } - - switch(iEncoding) - { - case ENCODING_UNICODE_BE: - for (i = dwPos; i < dwSize-1; i += 2) - { - b = pBytes[i+0]; - pBytes[i+0] = pBytes[i+1]; - pBytes[i+1] = b; - } - /* fall through */ - - case ENCODING_UNICODE: - pszText = (LPCWSTR) &pBytes[dwPos]; - dwCharCount = (dwSize - dwPos) / sizeof(WCHAR); - break; - - case ENCODING_ANSI: - case ENCODING_UTF8: - if (iEncoding == ENCODING_ANSI) - iCodePage = CP_ACP; - else if (iEncoding == ENCODING_UTF8) - iCodePage = CP_UTF8; - else - goto done; - - dwCharCount = MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, NULL, 0); - if (dwCharCount == 0) - goto done; - - pszAllocText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (dwCharCount + 1) * sizeof(WCHAR)); - if (!pszAllocText) - goto done; - - if (!MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, pszAllocText, dwCharCount)) - goto done; - - pszAllocText[dwCharCount] = '\0'; - pszText = pszAllocText; - break; - } - - dwPos = 0; - for (i = 0; i < dwCharCount; i++) - { - switch(pszText[i]) - { - case '\r': - if ((i < dwCharCount-1) && (pszText[i+1] == '\n')) - { - i++; - adwEolnCount[EOLN_CRLF]++; - break; - } - /* fall through */ - - case '\n': - if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos)) - return FALSE; - if (!Append(ppszText, pdwTextLen, szCrlf, sizeof(szCrlf) / sizeof(szCrlf[0]))) - return FALSE; - dwPos = i + 1; - - if (pszText[i] == '\r') - adwEolnCount[EOLN_CR]++; - else - adwEolnCount[EOLN_LF]++; - break; - } - } - - if (!*ppszText && (pszText == pszAllocText)) - { - /* special case; don't need to reallocate */ - *ppszText = pszAllocText; - *pdwTextLen = dwCharCount; - pszAllocText = NULL; - } - else - { - /* append last remaining text */ - if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos + 1)) - return FALSE; - } - - /* chose which eoln to use */ - *piEoln = EOLN_CRLF; - if (adwEolnCount[EOLN_LF] > adwEolnCount[*piEoln]) - *piEoln = EOLN_LF; - if (adwEolnCount[EOLN_CR] > adwEolnCount[*piEoln]) - *piEoln = EOLN_CR; - *piEncoding = iEncoding; - - bSuccess = TRUE; - -done: - if (pBytes) - HeapFree(GetProcessHeap(), 0, pBytes); - if (pszAllocText) - HeapFree(GetProcessHeap(), 0, pszAllocText); - - if (!bSuccess && *ppszText) - { - HeapFree(GetProcessHeap(), 0, *ppszText); - *ppszText = NULL; - *pdwTextLen = 0; - } - return bSuccess; -} - -static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding) -{ - LPBYTE pBytes; - LPBYTE pAllocBuffer = NULL; - DWORD dwPos = 0; - DWORD dwByteCount; - BYTE buffer[1024]; - UINT iCodePage; - DWORD dwDummy, i; - BOOL bSuccess; - int iBufferSize, iRequiredBytes; - BYTE b; - - while(dwPos < dwTextLen) - { - switch(iEncoding) - { - case ENCODING_UNICODE: - pBytes = (LPBYTE) &pszText[dwPos]; - dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); - dwPos = dwTextLen; - break; - - case ENCODING_UNICODE_BE: - dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); - if (dwByteCount > sizeof(buffer)) - dwByteCount = sizeof(buffer); - - memcpy(buffer, &pszText[dwPos], dwByteCount); - for (i = 0; i < dwByteCount; i += 2) - { - b = buffer[i+0]; - buffer[i+0] = buffer[i+1]; - buffer[i+1] = b; - } - dwPos += dwByteCount / sizeof(WCHAR); - break; - - case ENCODING_ANSI: - case ENCODING_UTF8: - if (iEncoding == ENCODING_ANSI) - 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) - { - goto done; - } - else if (iRequiredBytes < sizeof(buffer)) - { - pBytes = buffer; - iBufferSize = sizeof(buffer); - } - else - { - pAllocBuffer = (LPBYTE) HeapAlloc(GetProcessHeap(), 0, iRequiredBytes); - if (!pAllocBuffer) - return FALSE; - pBytes = pAllocBuffer; - iBufferSize = iRequiredBytes; - } - - dwByteCount = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, (LPSTR) pBytes, iBufferSize, NULL, NULL); - if (!dwByteCount) - goto done; - - dwPos = dwTextLen; - break; - - default: - goto done; - } - - if (!WriteFile(hFile, pBytes, dwByteCount, &dwDummy, NULL)) - goto done; - - /* free the buffer, if we have allocated one */ - if (pAllocBuffer) - { - HeapFree(GetProcessHeap(), 0, pAllocBuffer); - pAllocBuffer = NULL; - } - } - bSuccess = TRUE; - -done: - if (pAllocBuffer) - HeapFree(GetProcessHeap(), 0, pAllocBuffer); - return bSuccess; -} - -BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln) -{ - WCHAR wcBom; - WCHAR wcEoln; - BYTE bEoln; - LPBYTE pbEoln = NULL; - DWORD dwDummy, dwPos, dwNext, dwEolnSize = 0; - - /* Write the proper byte order marks if not ANSI */ - if (iEncoding != ENCODING_ANSI) - { - wcBom = 0xFEFF; - if (!WriteEncodedText(hFile, &wcBom, 1, iEncoding)) - return FALSE; - } - - /* Identify the proper eoln to use */ - switch(iEoln) - { - case EOLN_LF: - bEoln = '\n'; - pbEoln = &bEoln; - dwEolnSize = sizeof(bEoln); - break; - case EOLN_CR: - bEoln = '\r'; - pbEoln = &bEoln; - dwEolnSize = sizeof(bEoln); - break; - } - - /* If we have an eoln, make sure it is of the proper encoding */ - if (pbEoln && ((iEncoding == ENCODING_UNICODE) || (iEncoding == ENCODING_UNICODE_BE))) - { - wcEoln = bEoln; - pbEoln = (LPBYTE) &wcEoln; - dwEolnSize = sizeof(wcEoln); - } - - dwPos = 0; - - while(dwPos < dwTextLen) - { - if (pbEoln) - { - /* Find the next eoln */ - dwNext = dwPos; - while(dwNext < dwTextLen-1) - { - if ((pszText[dwNext] == '\r') && (pszText[dwNext+1] == '\n')) - break; - dwNext++; - } - } - else - { - /* No eoln conversion is necessary */ - dwNext = dwTextLen; - } - - if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) - return FALSE; - dwPos = dwNext; - - /* are we at an eoln? */ - while ((dwPos < dwTextLen-1) && - ((pszText[dwPos] == '\r') && (pszText[dwPos+1] == '\n'))) - { - if (!WriteFile(hFile, pbEoln, dwEolnSize, &dwDummy, NULL)) - return FALSE; - dwPos += 2; - } - } - while(dwPos < dwTextLen); - - return TRUE; -} - +/* + * Notepad (text.c) + * + * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define UNICODE + +#include <assert.h> +#include <stdio.h> +#include <windows.h> +#include <commdlg.h> + +#include "main.h" + +static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, DWORD dwAppendLen) +{ + LPWSTR pszNewText; + + if (dwAppendLen > 0) + { + if (*ppszText) + { + pszNewText = (LPWSTR) HeapReAlloc(GetProcessHeap(), 0, *ppszText, (*pdwTextLen + dwAppendLen) * sizeof(WCHAR)); + } + else + { + pszNewText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, dwAppendLen * sizeof(WCHAR)); + } + + if (!pszNewText) + return FALSE; + + memcpy(pszNewText + *pdwTextLen, pszAppendText, dwAppendLen * sizeof(WCHAR)); + *ppszText = pszNewText; + *pdwTextLen += dwAppendLen; + } + return TRUE; +} + +BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln) +{ + DWORD dwSize; + LPBYTE pBytes = NULL; + LPCWSTR pszText; + LPWSTR pszAllocText = NULL; + DWORD dwPos, i; + DWORD dwCharCount; + BOOL bSuccess = FALSE; + BYTE b; + int iEncoding = ENCODING_ANSI; + int iCodePage; + WCHAR szCrlf[2] = { '\r', '\n' }; + DWORD adwEolnCount[3] = { 0, 0, 0 }; + + *ppszText = NULL; + *pdwTextLen = 0; + + dwSize = GetFileSize(hFile, NULL); + if (dwSize == INVALID_FILE_SIZE) + goto done; + + pBytes = HeapAlloc(GetProcessHeap(), 0, dwSize + 2); + if (!pBytes) + goto done; + + if (!ReadFile(hFile, pBytes, dwSize, &dwSize, NULL)) + goto done; + dwPos = 0; + + /* Make sure that there is a NUL character at the end, in any encoding */ + pBytes[dwSize + 0] = '\0'; + pBytes[dwSize + 1] = '\0'; + + /* Look for Byte Order Marks */ + if ((dwSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE)) + { + iEncoding = ENCODING_UNICODE; + dwPos += 2; + } + else if ((dwSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF)) + { + iEncoding = ENCODING_UNICODE_BE; + dwPos += 2; + } + else if ((dwSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) + { + iEncoding = ENCODING_UTF8; + dwPos += 3; + } + + switch(iEncoding) + { + case ENCODING_UNICODE_BE: + for (i = dwPos; i < dwSize-1; i += 2) + { + b = pBytes[i+0]; + pBytes[i+0] = pBytes[i+1]; + pBytes[i+1] = b; + } + /* fall through */ + + case ENCODING_UNICODE: + pszText = (LPCWSTR) &pBytes[dwPos]; + dwCharCount = (dwSize - dwPos) / sizeof(WCHAR); + break; + + case ENCODING_ANSI: + case ENCODING_UTF8: + if (iEncoding == ENCODING_ANSI) + iCodePage = CP_ACP; + else if (iEncoding == ENCODING_UTF8) + iCodePage = CP_UTF8; + else + goto done; + + dwCharCount = MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, NULL, 0); + if (dwCharCount == 0) + goto done; + + pszAllocText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (dwCharCount + 1) * sizeof(WCHAR)); + if (!pszAllocText) + goto done; + + if (!MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, pszAllocText, dwCharCount)) + goto done; + + pszAllocText[dwCharCount] = '\0'; + pszText = pszAllocText; + break; + } + + dwPos = 0; + for (i = 0; i < dwCharCount; i++) + { + switch(pszText[i]) + { + case '\r': + if ((i < dwCharCount-1) && (pszText[i+1] == '\n')) + { + i++; + adwEolnCount[EOLN_CRLF]++; + break; + } + /* fall through */ + + case '\n': + if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos)) + return FALSE; + if (!Append(ppszText, pdwTextLen, szCrlf, sizeof(szCrlf) / sizeof(szCrlf[0]))) + return FALSE; + dwPos = i + 1; + + if (pszText[i] == '\r') + adwEolnCount[EOLN_CR]++; + else + adwEolnCount[EOLN_LF]++; + break; + } + } + + if (!*ppszText && (pszText == pszAllocText)) + { + /* special case; don't need to reallocate */ + *ppszText = pszAllocText; + *pdwTextLen = dwCharCount; + pszAllocText = NULL; + } + else + { + /* append last remaining text */ + if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos + 1)) + return FALSE; + } + + /* chose which eoln to use */ + *piEoln = EOLN_CRLF; + if (adwEolnCount[EOLN_LF] > adwEolnCount[*piEoln]) + *piEoln = EOLN_LF; + if (adwEolnCount[EOLN_CR] > adwEolnCount[*piEoln]) + *piEoln = EOLN_CR; + *piEncoding = iEncoding; + + bSuccess = TRUE; + +done: + if (pBytes) + HeapFree(GetProcessHeap(), 0, pBytes); + if (pszAllocText) + HeapFree(GetProcessHeap(), 0, pszAllocText); + + if (!bSuccess && *ppszText) + { + HeapFree(GetProcessHeap(), 0, *ppszText); + *ppszText = NULL; + *pdwTextLen = 0; + } + return bSuccess; +} + +static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding) +{ + LPBYTE pBytes; + LPBYTE pAllocBuffer = NULL; + DWORD dwPos = 0; + DWORD dwByteCount; + BYTE buffer[1024]; + UINT iCodePage; + DWORD dwDummy, i; + BOOL bSuccess; + int iBufferSize, iRequiredBytes; + BYTE b; + + while(dwPos < dwTextLen) + { + switch(iEncoding) + { + case ENCODING_UNICODE: + pBytes = (LPBYTE) &pszText[dwPos]; + dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); + dwPos = dwTextLen; + break; + + case ENCODING_UNICODE_BE: + dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); + if (dwByteCount > sizeof(buffer)) + dwByteCount = sizeof(buffer); + + memcpy(buffer, &pszText[dwPos], dwByteCount); + for (i = 0; i < dwByteCount; i += 2) + { + b = buffer[i+0]; + buffer[i+0] = buffer[i+1]; + buffer[i+1] = b; + } + dwPos += dwByteCount / sizeof(WCHAR); + break; + + case ENCODING_ANSI: + case ENCODING_UTF8: + if (iEncoding == ENCODING_ANSI) + 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) + { + goto done; + } + else if (iRequiredBytes < sizeof(buffer)) + { + pBytes = buffer; + iBufferSize = sizeof(buffer); + } + else + { + pAllocBuffer = (LPBYTE) HeapAlloc(GetProcessHeap(), 0, iRequiredBytes); + if (!pAllocBuffer) + return FALSE; + pBytes = pAllocBuffer; + iBufferSize = iRequiredBytes; + } + + dwByteCount = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, (LPSTR) pBytes, iBufferSize, NULL, NULL); + if (!dwByteCount) + goto done; + + dwPos = dwTextLen; + break; + + default: + goto done; + } + + if (!WriteFile(hFile, pBytes, dwByteCount, &dwDummy, NULL)) + goto done; + + /* free the buffer, if we have allocated one */ + if (pAllocBuffer) + { + HeapFree(GetProcessHeap(), 0, pAllocBuffer); + pAllocBuffer = NULL; + } + } + bSuccess = TRUE; + +done: + if (pAllocBuffer) + HeapFree(GetProcessHeap(), 0, pAllocBuffer); + return bSuccess; +} + +BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln) +{ + WCHAR wcBom; + WCHAR wcEoln; + BYTE bEoln; + LPBYTE pbEoln = NULL; + DWORD dwDummy, dwPos, dwNext, dwEolnSize = 0; + + /* Write the proper byte order marks if not ANSI */ + if (iEncoding != ENCODING_ANSI) + { + wcBom = 0xFEFF; + if (!WriteEncodedText(hFile, &wcBom, 1, iEncoding)) + return FALSE; + } + + /* Identify the proper eoln to use */ + switch(iEoln) + { + case EOLN_LF: + bEoln = '\n'; + pbEoln = &bEoln; + dwEolnSize = sizeof(bEoln); + break; + case EOLN_CR: + bEoln = '\r'; + pbEoln = &bEoln; + dwEolnSize = sizeof(bEoln); + break; + } + + /* If we have an eoln, make sure it is of the proper encoding */ + if (pbEoln && ((iEncoding == ENCODING_UNICODE) || (iEncoding == ENCODING_UNICODE_BE))) + { + wcEoln = bEoln; + pbEoln = (LPBYTE) &wcEoln; + dwEolnSize = sizeof(wcEoln); + } + + dwPos = 0; + + while(dwPos < dwTextLen) + { + if (pbEoln) + { + /* Find the next eoln */ + dwNext = dwPos; + while(dwNext < dwTextLen-1) + { + if ((pszText[dwNext] == '\r') && (pszText[dwNext+1] == '\n')) + break; + dwNext++; + } + } + else + { + /* No eoln conversion is necessary */ + dwNext = dwTextLen; + } + + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) + return FALSE; + dwPos = dwNext; + + /* are we at an eoln? */ + while ((dwPos < dwTextLen-1) && + ((pszText[dwPos] == '\r') && (pszText[dwPos+1] == '\n'))) + { + if (!WriteFile(hFile, pbEoln, dwEolnSize, &dwDummy, NULL)) + return FALSE; + dwPos += 2; + } + } + while(dwPos < dwTextLen); + + return TRUE; +} + Property changes on: trunk/reactos/subsys/system/notepad/text.c ___________________________________________________________________ Name: svn:eol-style + native

18 years, 11 months

[gvg] 18038: Fix GDB backtrace

by gvg＠svn.reactos.com

Fix GDB backtrace Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-09-24 23:45:05 UTC (rev 18037) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-09-25 00:00:03 UTC (rev 18038) @@ -255,6 +255,22 @@ mov ebx, [ebp+KTRAP_FRAME_EBP] mov edi, [ebp+KTRAP_FRAME_EIP] +#ifdef DBG + /* + * We want to know the address from where the syscall stub was called. + * If PrevMode is KernelMode, that address is stored in our own (kernel) + * stack, at location KTRAP_FRAME_ESP. + * If we're coming from UserMode, we load the usermode stack pointer + * and go back two frames (first frame is the syscall stub, second call + * is the caller of the stub). + */ + mov edi, [ebp+KTRAP_FRAME_ESP] + test byte ptr [esi+KTHREAD_PREVIOUS_MODE], 0x01 + jz PrevWasKernelMode + mov edi, [edi+4] +PrevWasKernelMode: +#endif + /* Write the debug data */ mov [ebp+KTRAP_FRAME_DEBUGPOINTER], edx mov dword ptr [ebp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 @@ -334,6 +350,22 @@ mov edi, esp rep movsd +#ifdef DBG + /* + * The following lines are for the benefit of GDB. It will see the return + * address of the "call ebx" below, find the last label before it and + * thinks that that's the start of the function. It will then check to see + * if it starts with a standard function prolog (push ebp, mov ebp,esp). + * When that standard function prolog is not found, it will stop the + * stack backtrace. Since we do want to backtrace into usermode, let's + * make GDB happy and create a standard prolog. + */ +KiSystemService: + push ebp + mov ebp,esp + pop ebp +#endif + /* Do the System Call */ call ebx

18 years, 12 months

[npwoods] 18037: Notepad enhancements:

by npwoods＠svn.reactos.com

Notepad enhancements: 1. Added line ending handling, so that Notepad can handle line endings other than CR/LF. This is specified in a dropdown menu similar to the text encoding. Consequently, I've moved text handling to a new file, text.c 2. Implemented the Find command 3. Changed some dialog titles to be 'Notepad' instead of 'ERROR', in line with how Windows notepad works. 4. The edit control now has the style ES_NOHIDESEL specified Modified: trunk/reactos/subsys/system/notepad/En.rc Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/notepad/main.h Modified: trunk/reactos/subsys/system/notepad/notepad.xml Modified: trunk/reactos/subsys/system/notepad/notepad_res.h Added: trunk/reactos/subsys/system/notepad/text.c _____ Modified: trunk/reactos/subsys/system/notepad/En.rc --- trunk/reactos/subsys/system/notepad/En.rc 2005-09-24 20:37:53 UTC (rev 18036) +++ trunk/reactos/subsys/system/notepad/En.rc 2005-09-24 23:45:05 UTC (rev 18037) @@ -95,7 +95,7 @@ } /* Dialog `Encoding' */ -DIALOG_ENCODING DIALOG 0, 0, 256, 26 +DIALOG_ENCODING DIALOG 0, 0, 256, 44 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -103,6 +103,8 @@ { COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Encoding:",0x155,5,2,41,12 +COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "Endlines:",0x156,5,20,41,12 } STRINGTABLE DISCARDABLE @@ -140,4 +142,7 @@ STRING_UNICODE, "Unicode" STRING_UNICODE_BE, "Unicode (big endian)" STRING_UTF8, "UTF-8" +STRING_CRLF, "Windows" +STRING_LF, "Unix" +STRING_CR, "Mac" } _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-24 20:37:53 UTC (rev 18036) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-09-24 23:45:05 UTC (rev 18037) @@ -93,7 +93,7 @@ wsprintf(szMessage, szResource, szFileName); /* Load szCaption */ - LoadString(Globals.hInstance, STRING_ERROR, szResource, SIZEOF(szResource)); + LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); /* Display Modal Dialog */ MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION); @@ -112,7 +112,7 @@ wsprintf(szMessage, szResource, szFileName[0] ? szFileName : szUntitled); /* Load Caption */ - LoadString(Globals.hInstance, STRING_ERROR, szResource, SIZEOF(szResource)); + LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); /* Display modal */ return MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION|MB_YESNOCANCEL); @@ -138,15 +138,8 @@ static VOID DoSaveFile(VOID) { HANDLE hFile; - DWORD dwNumWrite; LPWSTR pTemp; - LPVOID pConverted = NULL; DWORD size; - BYTE bom[3]; - int iBomSize = 0; - int iCodePage = -1; - int iNewSize; - int i; hFile = CreateFile(Globals.szFileName, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -166,72 +159,13 @@ } size = GetWindowTextW(Globals.hEdit, pTemp, size); - switch(Globals.iEncoding) - { - case ENCODING_ANSI: - iCodePage = CP_ACP; - break; - - case ENCODING_UNICODE: - pConverted = pTemp; - iBomSize = 2; - bom[0] = 0xFF; - bom[1] = 0xFE; - break; - - case ENCODING_UNICODE_BE: - pConverted = pTemp; - iBomSize = 2; - bom[0] = 0xFE; - bom[1] = 0xFF; - - /* flip the endianness */ - for (i = 0; i < size; i++) - { - pTemp[i] = ((pTemp[i] & 0x00FF) << 8) - | ((pTemp[i] & 0xFF00) >> 8); - } - break; - - case ENCODING_UTF8: - iCodePage = CP_UTF8; - iBomSize = 3; - bom[0] = 0xEF; - bom[1] = 0xBB; - bom[2] = 0xBF; - break; - } - - if (iCodePage >= 0) - { - iNewSize = WideCharToMultiByte(iCodePage, 0, pTemp, size, NULL, 0, NULL, NULL); - pConverted = HeapAlloc(GetProcessHeap(), 0, iNewSize); - if (!pConverted) - { - HeapFree(GetProcessHeap(), 0, pTemp); - CloseHandle(hFile); - ShowLastError(); - return; - } - WideCharToMultiByte(iCodePage, 0, pTemp, size, pConverted, iNewSize, NULL, NULL); - } - else - { - iNewSize = size * sizeof(WCHAR); - } - - if ((iBomSize > 0) && !WriteFile(hFile, bom, iBomSize, &dwNumWrite, NULL)) + if (!WriteText(hFile, pTemp, size, Globals.iEncoding, Globals.iEoln)) ShowLastError(); - else if (!WriteFile(hFile, pConverted, iNewSize, &dwNumWrite, NULL)) - ShowLastError(); else SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); CloseHandle(hFile); HeapFree(GetProcessHeap(), 0, pTemp); - - if (iCodePage >= 0) - HeapFree(GetProcessHeap(), 0, pConverted); } /** @@ -273,15 +207,9 @@ { static const WCHAR dotlog[] = { '.','L','O','G',0 }; HANDLE hFile; - LPSTR pTemp; - LPWSTR pTemp2 = NULL; - DWORD size; - DWORD dwNumRead; + LPWSTR pszText; + DWORD dwTextLen; WCHAR log[5]; - LPWSTR p; - LPBYTE p2; - int iCodePage; - int iNewSize; /* Close any files and prompt to save changes */ if (!DoCloseFile()) @@ -289,91 +217,20 @@ hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(hFile == INVALID_HANDLE_VALUE) + if (hFile == INVALID_HANDLE_VALUE) { ShowLastError(); - return; + goto done; } - size = GetFileSize(hFile, NULL); - if (size == INVALID_FILE_SIZE) + if (!ReadText(hFile, &pszText, &dwTextLen, &Globals.iEncoding, &Globals.iEoln)) { - CloseHandle(hFile); ShowLastError(); - return; + goto done; } - pTemp = HeapAlloc(GetProcessHeap(), 0, size + sizeof(WCHAR)); - if (!pTemp) - { - CloseHandle(hFile); - ShowLastError(); - return; - } + SetWindowTextW(Globals.hEdit, pszText); - if (!ReadFile(hFile, pTemp, size, &dwNumRead, NULL)) - { - CloseHandle(hFile); - HeapFree(GetProcessHeap(), 0, pTemp); - ShowLastError(); - return; - } - - CloseHandle(hFile); - pTemp[dwNumRead] = 0; - - if (IsTextUnicode(pTemp, dwNumRead, NULL)) - { - p = (LPWSTR)pTemp; - p[dwNumRead / 2] = 0; - - /* We need to strip BOM Unicode character, SetWindowTextW won't do it for us. */ - if (*p == 0xFEFF) - { - Globals.iEncoding = ENCODING_UNICODE_BE; - p++; - } - else if (*p == 0xFFFE) - { - Globals.iEncoding = ENCODING_UNICODE; - p++; - } - } - else - { - p2 = (LPBYTE)pTemp; - if ((p2[0] == 0xEF) && (p2[1] == 0xBB) && (p2[2] == 0xBF)) - { - iCodePage = CP_UTF8; - Globals.iEncoding = ENCODING_UTF8; - p2 += 3; - dwNumRead -= 3; - } - else - { - iCodePage = CP_ACP; - Globals.iEncoding = ENCODING_ANSI; - } - - iNewSize = MultiByteToWideChar(iCodePage, 0, (LPCSTR)p2, dwNumRead, NULL, 0); - pTemp2 = HeapAlloc(GetProcessHeap(), 0, (iNewSize + 1) * sizeof(*pTemp2)); - if (!pTemp2) - { - CloseHandle(hFile); - HeapFree(GetProcessHeap(), 0, pTemp); - ShowLastError(); - return; - } - MultiByteToWideChar(iCodePage, 0, (LPCSTR)p2, dwNumRead, pTemp2, iNewSize); - pTemp2[iNewSize] = 0; - p = pTemp2; - } - SetWindowTextW(Globals.hEdit, p); - - HeapFree(GetProcessHeap(), 0, pTemp); - if (pTemp2) - HeapFree(GetProcessHeap(), 0, pTemp2); - SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SetFocus(Globals.hEdit); @@ -392,6 +249,12 @@ SetFileName(szFileName); UpdateWindowCaption(); + +done: + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle(hFile); + if (pszText) + HeapFree(GetProcessHeap(), 0, pszText); } VOID DIALOG_FileNew(VOID) @@ -475,14 +338,33 @@ SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); SendMessage(hCombo, CB_SETCURSEL, Globals.iEncoding, 0); + + hCombo = GetDlgItem(hDlg, ID_EOLN); + + LoadString(Globals.hInstance, STRING_CRLF, szText, SIZEOF(szText)); + SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); + + LoadString(Globals.hInstance, STRING_LF, szText, SIZEOF(szText)); + SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); + + LoadString(Globals.hInstance, STRING_CR, szText, SIZEOF(szText)); + SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); + + SendMessage(hCombo, CB_SETCURSEL, Globals.iEoln, 0); break; case WM_NOTIFY: if (((NMHDR *) lParam)->code == CDN_FILEOK) { pNotify = (OFNOTIFY *) lParam; + hCombo = GetDlgItem(hDlg, ID_ENCODING); - Globals.iEncoding = SendMessage(hCombo, CB_GETCURSEL, 0, 0); + if (hCombo) + Globals.iEncoding = SendMessage(hCombo, CB_GETCURSEL, 0, 0); + + hCombo = GetDlgItem(hDlg, ID_EOLN); + if (hCombo) + Globals.iEoln = SendMessage(hCombo, CB_GETCURSEL, 0, 0); } break; } @@ -736,7 +618,7 @@ { static const WCHAR editW[] = { 'e','d','i','t',0 }; DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | - ES_AUTOVSCROLL | ES_MULTILINE; + ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL; RECT rc; DWORD size; LPWSTR pTemp; _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-09-24 20:37:53 UTC (rev 18036) +++ trunk/reactos/subsys/system/notepad/main.c 2005-09-24 23:45:05 UTC (rev 18037) @@ -23,9 +23,11 @@ */ #define UNICODE +#define _UNICODE #include <windows.h> #include <stdio.h> +#include <tchar.h> #include "main.h" #include "dialog.h" @@ -94,6 +96,78 @@ } /*********************************************************************** + * + * NOTEPAD_FindNext + */ + +static VOID NOTEPAD_FindNext(FINDREPLACE *pFindReplace) +{ + int iTextLength, iTargetLength; + LPTSTR pszText = NULL; + DWORD dwPosition, dwDummy; + BOOL bMatches = FALSE; + + iTargetLength = _tcslen(pFindReplace->lpstrFindWhat); + + iTextLength = GetWindowTextLength(Globals.hEdit); + + if (iTextLength > 0) + { + pszText = (LPTSTR) HeapAlloc(GetProcessHeap(), 0, (iTextLength + 1) * sizeof(TCHAR)); + if (!pszText) + return; + + GetWindowText(Globals.hEdit, pszText, iTextLength + 1); + } + + SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM) &dwDummy, (LPARAM) &dwPosition); + + while(dwPosition < iTextLength) + { + /* Make proper comparison */ + if (pFindReplace->Flags & FR_MATCHCASE) + bMatches = !_tcsncmp(&pszText[dwPosition], pFindReplace->lpstrFindWhat, iTargetLength); + else + bMatches = !_tcsnicmp(&pszText[dwPosition], pFindReplace->lpstrFindWhat, iTargetLength); + + if (bMatches && pFindReplace->Flags & FR_WHOLEWORD) + { + if ((dwPosition > 0) && !_istspace(pszText[dwPosition-1])) + bMatches = FALSE; + if ((dwPosition < iTextLength - 1) && !_istspace(pszText[dwPosition+1])) + bMatches = FALSE; + } + + if (bMatches) + break; + + if (pFindReplace->Flags & FR_DOWN) + dwPosition++; + else + dwPosition--; + } + + if (bMatches) + { + SendMessage(Globals.hEdit, EM_SETSEL, dwPosition, dwPosition + iTargetLength); + SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0); + } + + if (pszText) + HeapFree(GetProcessHeap(), 0, pszText); +} + +/********************************************************************** * + * + * NOTEPAD_FindTerm + */ + +static VOID NOTEPAD_FindTerm(VOID) +{ + Globals.hFindReplaceDlg = NULL; +} + +/********************************************************************** * * Data Initialization */ static VOID NOTEPAD_InitData(VOID) @@ -150,7 +224,7 @@ GetClientRect(hWnd, &rc); Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL | - ES_AUTOVSCROLL | ES_MULTILINE, + ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL, 0, 0, rc.right, rc.bottom, hWnd, NULL, Globals.hInstance, NULL); break; @@ -205,6 +279,17 @@ break; default: + if (msg == aFINDMSGSTRING) + { + FINDREPLACE *pFindReplace = (FINDREPLACE *) lParam; + + if (pFindReplace->Flags & FR_FINDNEXT) + NOTEPAD_FindNext(pFindReplace); + else if (pFindReplace->Flags & FR_DIALOGTERM) + NOTEPAD_FindTerm(); + break; + } + return DefWindowProc(hWnd, msg, wParam, lParam); } return 0; @@ -219,7 +304,7 @@ LoadString(Globals.hInstance, STRING_DOESNOTEXIST, szResource, SIZEOF(szResource)); wsprintf(szMessage, szResource, szFileName); - LoadString(Globals.hInstance, STRING_ERROR, szResource, SIZEOF(szResource)); + LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); nResult = MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION | MB_YESNO); _____ Modified: trunk/reactos/subsys/system/notepad/main.h --- trunk/reactos/subsys/system/notepad/main.h 2005-09-24 20:37:53 UTC (rev 18036) +++ trunk/reactos/subsys/system/notepad/main.h 2005-09-24 23:45:05 UTC (rev 18037) @@ -30,6 +30,10 @@ #define ENCODING_UNICODE_BE 2 #define ENCODING_UTF8 3 +#define EOLN_CRLF 0 +#define EOLN_LF 1 +#define EOLN_CR 2 + typedef struct { HANDLE hInstance; @@ -50,6 +54,7 @@ WCHAR szHeader[MAX_PATH]; WCHAR szFooter[MAX_PATH]; int iEncoding; + int iEoln; FINDREPLACE find; } NOTEPAD_GLOBALS; @@ -57,3 +62,9 @@ extern NOTEPAD_GLOBALS Globals; VOID SetFileName(LPCWSTR szFileName); + +/* from text.c */ +BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln); +BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln); + + _____ Modified: trunk/reactos/subsys/system/notepad/notepad.xml --- trunk/reactos/subsys/system/notepad/notepad.xml 2005-09-24 20:37:53 UTC (rev 18036) +++ trunk/reactos/subsys/system/notepad/notepad.xml 2005-09-24 23:45:05 UTC (rev 18037) @@ -10,5 +10,6 @@ <file>dialog.c</file> <file>license.c</file> <file>main.c</file> + <file>text.c</file> <file>rsrc.rc</file> </module> _____ Modified: trunk/reactos/subsys/system/notepad/notepad_res.h --- trunk/reactos/subsys/system/notepad/notepad_res.h 2005-09-24 20:37:53 UTC (rev 18036) +++ trunk/reactos/subsys/system/notepad/notepad_res.h 2005-09-24 23:45:05 UTC (rev 18037) @@ -24,6 +24,7 @@ #define ID_ACCEL 0x203 #define DIALOG_ENCODING 0x204 #define ID_ENCODING 0x205 +#define ID_EOLN 0x206 /* Commands */ #define CMD_NEW 0x100 @@ -84,3 +85,6 @@ #define STRING_UNICODE_BE 0x17F #define STRING_UTF8 0x180 +#define STRING_CRLF 0x181 +#define STRING_LF 0x182 +#define STRING_CR 0x183 _____ Added: trunk/reactos/subsys/system/notepad/text.c --- trunk/reactos/subsys/system/notepad/text.c 2005-09-24 20:37:53 UTC (rev 18036) +++ trunk/reactos/subsys/system/notepad/text.c 2005-09-24 23:45:05 UTC (rev 18037) @@ -0,0 +1,389 @@ +/* + * Notepad (text.c) + * + * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define UNICODE + +#include <assert.h> +#include <stdio.h> +#include <windows.h> +#include <commdlg.h> + +#include "main.h" + +static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, DWORD dwAppendLen) +{ + LPWSTR pszNewText; + + if (dwAppendLen > 0) + { + if (*ppszText) + { + pszNewText = (LPWSTR) HeapReAlloc(GetProcessHeap(), 0, *ppszText, (*pdwTextLen + dwAppendLen) * sizeof(WCHAR)); + } + else + { + pszNewText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, dwAppendLen * sizeof(WCHAR)); + } + + if (!pszNewText) + return FALSE; + + memcpy(pszNewText + *pdwTextLen, pszAppendText, dwAppendLen * sizeof(WCHAR)); + *ppszText = pszNewText; + *pdwTextLen += dwAppendLen; + } + return TRUE; +} + +BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln) +{ + DWORD dwSize; + LPBYTE pBytes = NULL; + LPCWSTR pszText; + LPWSTR pszAllocText = NULL; + DWORD dwPos, i; + DWORD dwCharCount; + BOOL bSuccess = FALSE; + BYTE b; + int iEncoding = ENCODING_ANSI; + int iCodePage; + WCHAR szCrlf[2] = { '\r', '\n' }; + DWORD adwEolnCount[3] = { 0, 0, 0 }; + + *ppszText = NULL; + *pdwTextLen = 0; + + dwSize = GetFileSize(hFile, NULL); + if (dwSize == INVALID_FILE_SIZE) + goto done; + + pBytes = HeapAlloc(GetProcessHeap(), 0, dwSize + 2); + if (!pBytes) + goto done; + + if (!ReadFile(hFile, pBytes, dwSize, &dwSize, NULL)) + goto done; + dwPos = 0; + + /* Make sure that there is a NUL character at the end, in any encoding */ + pBytes[dwSize + 0] = '\0'; + pBytes[dwSize + 1] = '\0'; + + /* Look for Byte Order Marks */ + if ((dwSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE)) + { + iEncoding = ENCODING_UNICODE; + dwPos += 2; + } + else if ((dwSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF)) + { + iEncoding = ENCODING_UNICODE_BE; + dwPos += 2; + } + else if ((dwSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) + { + iEncoding = ENCODING_UTF8; + dwPos += 3; + } + + switch(iEncoding) + { + case ENCODING_UNICODE_BE: + for (i = dwPos; i < dwSize-1; i += 2) + { + b = pBytes[i+0]; + pBytes[i+0] = pBytes[i+1]; + pBytes[i+1] = b; + } + /* fall through */ + + case ENCODING_UNICODE: + pszText = (LPCWSTR) &pBytes[dwPos]; + dwCharCount = (dwSize - dwPos) / sizeof(WCHAR); + break; + + case ENCODING_ANSI: + case ENCODING_UTF8: + if (iEncoding == ENCODING_ANSI) + iCodePage = CP_ACP; + else if (iEncoding == ENCODING_UTF8) + iCodePage = CP_UTF8; + else + goto done; + + dwCharCount = MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, NULL, 0); + if (dwCharCount == 0) + goto done; + + pszAllocText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (dwCharCount + 1) * sizeof(WCHAR)); + if (!pszAllocText) + goto done; + + if (!MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, pszAllocText, dwCharCount)) + goto done; + + pszAllocText[dwCharCount] = '\0'; + pszText = pszAllocText; + break; + } + + dwPos = 0; + for (i = 0; i < dwCharCount; i++) + { + switch(pszText[i]) + { + case '\r': + if ((i < dwCharCount-1) && (pszText[i+1] == '\n')) + { + i++; + adwEolnCount[EOLN_CRLF]++; + break; + } + /* fall through */ + + case '\n': + if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos)) + return FALSE; + if (!Append(ppszText, pdwTextLen, szCrlf, sizeof(szCrlf) / sizeof(szCrlf[0]))) + return FALSE; + dwPos = i + 1; + + if (pszText[i] == '\r') + adwEolnCount[EOLN_CR]++; + else + adwEolnCount[EOLN_LF]++; + break; + } + } + + if (!*ppszText && (pszText == pszAllocText)) + { + /* special case; don't need to reallocate */ + *ppszText = pszAllocText; + *pdwTextLen = dwCharCount; + pszAllocText = NULL; + } + else + { + /* append last remaining text */ + if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos + 1)) + return FALSE; + } + + /* chose which eoln to use */ + *piEoln = EOLN_CRLF; + if (adwEolnCount[EOLN_LF] > adwEolnCount[*piEoln]) + *piEoln = EOLN_LF; + if (adwEolnCount[EOLN_CR] > adwEolnCount[*piEoln]) + *piEoln = EOLN_CR; + *piEncoding = iEncoding; + + bSuccess = TRUE; + +done: + if (pBytes) + HeapFree(GetProcessHeap(), 0, pBytes); + if (pszAllocText) + HeapFree(GetProcessHeap(), 0, pszAllocText); + + if (!bSuccess && *ppszText) + { + HeapFree(GetProcessHeap(), 0, *ppszText); + *ppszText = NULL; + *pdwTextLen = 0; + } + return bSuccess; +} + +static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding) +{ + LPBYTE pBytes; + LPBYTE pAllocBuffer = NULL; + DWORD dwPos = 0; + DWORD dwByteCount; + BYTE buffer[1024]; + UINT iCodePage; + DWORD dwDummy, i; + BOOL bSuccess; + int iBufferSize, iRequiredBytes; + BYTE b; + + while(dwPos < dwTextLen) + { + switch(iEncoding) + { + case ENCODING_UNICODE: + pBytes = (LPBYTE) &pszText[dwPos]; + dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); + dwPos = dwTextLen; + break; + + case ENCODING_UNICODE_BE: + dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); + if (dwByteCount > sizeof(buffer)) + dwByteCount = sizeof(buffer); + + memcpy(buffer, &pszText[dwPos], dwByteCount); + for (i = 0; i < dwByteCount; i += 2) + { + b = buffer[i+0]; + buffer[i+0] = buffer[i+1]; + buffer[i+1] = b; + } + dwPos += dwByteCount / sizeof(WCHAR); + break; + + case ENCODING_ANSI: + case ENCODING_UTF8: + if (iEncoding == ENCODING_ANSI) + 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) + { + goto done; + } + else if (iRequiredBytes < sizeof(buffer)) + { + pBytes = buffer; + iBufferSize = sizeof(buffer); + } + else + { + pAllocBuffer = (LPBYTE) HeapAlloc(GetProcessHeap(), 0, iRequiredBytes); + if (!pAllocBuffer) + return FALSE; + pBytes = pAllocBuffer; + iBufferSize = iRequiredBytes; + } + + dwByteCount = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, (LPSTR) pBytes, iBufferSize, NULL, NULL); + if (!dwByteCount) + goto done; + + dwPos = dwTextLen; + break; + + default: + goto done; + } + + if (!WriteFile(hFile, pBytes, dwByteCount, &dwDummy, NULL)) + goto done; + + /* free the buffer, if we have allocated one */ + if (pAllocBuffer) + { + HeapFree(GetProcessHeap(), 0, pAllocBuffer); + pAllocBuffer = NULL; + } + } + bSuccess = TRUE; + +done: + if (pAllocBuffer) + HeapFree(GetProcessHeap(), 0, pAllocBuffer); + return bSuccess; +} + +BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln) +{ + WCHAR wcBom; + WCHAR wcEoln; + BYTE bEoln; + LPBYTE pbEoln = NULL; + DWORD dwDummy, dwPos, dwNext, dwEolnSize = 0; + + /* Write the proper byte order marks if not ANSI */ + if (iEncoding != ENCODING_ANSI) + { + wcBom = 0xFEFF; + if (!WriteEncodedText(hFile, &wcBom, 1, iEncoding)) + return FALSE; + } + + /* Identify the proper eoln to use */ + switch(iEoln) + { + case EOLN_LF: + bEoln = '\n'; + pbEoln = &bEoln; + dwEolnSize = sizeof(bEoln); + break; + case EOLN_CR: + bEoln = '\r'; + pbEoln = &bEoln; + dwEolnSize = sizeof(bEoln); + break; + } + + /* If we have an eoln, make sure it is of the proper encoding */ + if (pbEoln && ((iEncoding == ENCODING_UNICODE) || (iEncoding == ENCODING_UNICODE_BE))) + { + wcEoln = bEoln; + pbEoln = (LPBYTE) &wcEoln; + dwEolnSize = sizeof(wcEoln); + } + + dwPos = 0; + + while(dwPos < dwTextLen) + { + if (pbEoln) + { + /* Find the next eoln */ + dwNext = dwPos; + while(dwNext < dwTextLen-1) + { + if ((pszText[dwNext] == '\r') && (pszText[dwNext+1] == '\n')) + break; + dwNext++; + } + } + else + { + /* No eoln conversion is necessary */ + dwNext = dwTextLen; + } + + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) + return FALSE; + dwPos = dwNext; + + /* are we at an eoln? */ + while ((dwPos < dwTextLen-1) && + ((pszText[dwPos] == '\r') && (pszText[dwPos+1] == '\n'))) + { + if (!WriteFile(hFile, pbEoln, dwEolnSize, &dwDummy, NULL)) + return FALSE; + dwPos += 2; + } + } + while(dwPos < dwTextLen); + + return TRUE; +} +

18 years, 12 months

[weiden] 18036: removed obsolete goto statement

by weiden＠svn.reactos.com

removed obsolete goto statement Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-09-24 19:34:54 UTC (rev 18035) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-09-24 20:37:53 UTC (rev 18036) @@ -518,7 +518,6 @@ NtClose(NewKeyHandle); Status2 = STATUS_INSUFFICIENT_RESOURCES; - goto GoNextKey; } } else @@ -527,7 +526,6 @@ } } -GoNextKey: if (!NT_SUCCESS(Status2) && NT_SUCCESS(Status)) { Status = Status2;

18 years, 12 months

[hbirr] 18035: Allow the system process and a process without a parent process to use all cpus on a smp machine, even if only the boot cpu is running.

by hbirr＠svn.reactos.com

Allow the system process and a process without a parent process to use all cpus on a smp machine, even if only the boot cpu is running. Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-09-24 19:30:12 UTC (rev 18034) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-09-24 19:34:54 UTC (rev 18035) @@ -220,7 +220,14 @@ else { pParentProcess = NULL; +#ifdef CONFIG_SMP + /* FIXME: + * Only the boot cpu is initialized in the early boot phase. + */ + Affinity = 0xffffffff; +#else Affinity = KeActiveProcessors; +#endif } /* Add the debug port */ _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-09-24 19:30:12 UTC (rev 18034) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-09-24 19:34:54 UTC (rev 18035) @@ -220,7 +220,15 @@ /* System threads may run on any processor. */ RtlZeroMemory(PsInitialSystemProcess, sizeof(EPROCESS)); +#ifdef CONFIG_SMP + /* FIXME: + * Only the boot cpu is initialized. Threads of the + * system process should be able to run on all cpus. + */ + PsInitialSystemProcess->Pcb.Affinity = 0xffffffff; +#else PsInitialSystemProcess->Pcb.Affinity = KeActiveProcessors; +#endif PsInitialSystemProcess->Pcb.IopmOffset = 0xffff; PsInitialSystemProcess->Pcb.BasePriority = PROCESS_PRIORITY_NORMAL; PsInitialSystemProcess->Pcb.QuantumReset = 6;

18 years, 12 months

[gvg] 18034: This NtGdiCreateCompatableDC misspelling has annoyed me long enough now

by gvg＠svn.reactos.com

This NtGdiCreateCompatableDC misspelling has annoyed me long enough now Modified: trunk/reactos/include/win32k/dc.h Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/include/win32k/dc.h --- trunk/reactos/include/win32k/dc.h 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/include/win32k/dc.h 2005-09-24 19:30:12 UTC (rev 18034) @@ -173,7 +173,7 @@ /* User entry points */ BOOL STDCALL NtGdiCancelDC(HDC hDC); -HDC STDCALL NtGdiCreateCompatableDC(HDC hDC); +HDC STDCALL NtGdiCreateCompatibleDC(HDC hDC); HDC STDCALL NtGdiCreateDC(PUNICODE_STRING Driver, PUNICODE_STRING Device, PUNICODE_STRING Output, _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/lib/gdi32/gdi32.def 2005-09-24 19:30:12 UTC (rev 18034) @@ -53,7 +53,7 @@ CreateColorSpaceA@4 CreateColorSpaceW@4 CreateCompatibleBitmap@12=NtGdiCreateCompatibleBitmap@12 -CreateCompatibleDC@4=NtGdiCreateCompatableDC@4 +CreateCompatibleDC@4=NtGdiCreateCompatibleDC@4 CreateDCA@16 CreateDCW@16 CreateDIBPatternBrush@8 _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-24 19:30:12 UTC (rev 18034) @@ -1360,7 +1360,7 @@ r.right = cxWidth; r.bottom = cyWidth; - hdcOff = NtGdiCreateCompatableDC(hdc); + hdcOff = NtGdiCreateCompatibleDC(hdc); if(!hdcOff) goto done; @@ -1376,7 +1376,7 @@ NtGdiSelectObject(hdcOff, hbmOff); } - hdcMem = NtGdiCreateCompatableDC(hdc); + hdcMem = NtGdiCreateCompatibleDC(hdc); if(!hdcMem) goto cleanup; _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-09-24 19:30:12 UTC (rev 18034) @@ -1232,7 +1232,7 @@ x = (sz.cx / 2) - (WinSta->cxWallpaper / 2); y = (sz.cy / 2) - (WinSta->cyWallpaper / 2); - hWallpaperDC = NtGdiCreateCompatableDC(hDC); + hWallpaperDC = NtGdiCreateCompatibleDC(hDC); if(hWallpaperDC != NULL) { HBITMAP hOldBitmap; _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-09-24 19:30:12 UTC (rev 18034) @@ -661,7 +661,7 @@ if ( bInRect && Result == CLR_INVALID ) { // FIXME: create a 1x1 32BPP DIB, and blit to it - HDC hDCTmp = NtGdiCreateCompatableDC(hDC); + HDC hDCTmp = NtGdiCreateCompatibleDC(hDC); if ( hDCTmp ) { static const BITMAPINFOHEADER bih = { sizeof(BITMAPINFOHEADER), 1, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0 }; @@ -860,13 +860,13 @@ return NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop)); /* 1. make mask bitmap's dc */ - hDCMask = NtGdiCreateCompatableDC(hdcDest); + hDCMask = NtGdiCreateCompatibleDC(hdcDest); hOldMaskBitmap = (HBITMAP)NtGdiSelectObject(hDCMask, hbmMask); /* 2. make masked Background bitmap */ /* 2.1 make bitmap */ - hDC1 = NtGdiCreateCompatableDC(hdcDest); + hDC1 = NtGdiCreateCompatibleDC(hdcDest); hBitmap2 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); hOldBitmap2 = (HBITMAP)NtGdiSelectObject(hDC1, hBitmap2); @@ -878,7 +878,7 @@ /* 3. make masked Foreground bitmap */ /* 3.1 make bitmap */ - hDC2 = NtGdiCreateCompatableDC(hdcDest); + hDC2 = NtGdiCreateCompatibleDC(hdcDest); hBitmap3 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); hOldBitmap3 = (HBITMAP)NtGdiSelectObject(hDC2, hBitmap3); _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-09-24 19:30:12 UTC (rev 18034) @@ -139,7 +139,7 @@ } HDC STDCALL -NtGdiCreateCompatableDC(HDC hDC) +NtGdiCreateCompatibleDC(HDC hDC) { PDC NewDC, OrigDC; HBITMAP hBitmap; @@ -808,7 +808,7 @@ if ((hNewDC = DC_FindOpenDC(Driver)) != NULL) { hDC = hNewDC; - return NtGdiCreateCompatableDC(hDC); + return NtGdiCreateCompatibleDC(hDC); } if (Driver != NULL && Driver->Buffer != NULL) _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-09-24 19:30:12 UTC (rev 18034) @@ -544,7 +544,7 @@ return 0; } - hdcMem = NtGdiCreateCompatableDC(hDC); + hdcMem = NtGdiCreateCompatibleDC(hDC); hBitmap = NtGdiCreateCompatibleBitmap(hDC, BitsInfo->bmiHeader.biWidth, BitsInfo->bmiHeader.biHeight); hOldBitmap = NtGdiSelectObject(hdcMem, hBitmap); @@ -772,7 +772,7 @@ // If the reference hdc is null, take the desktop dc if (hDC == 0) { - hDC = NtGdiCreateCompatableDC(0); + hDC = NtGdiCreateCompatibleDC(0); bDesktopDC = TRUE; } _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2005-09-24 19:17:00 UTC (rev 18033) +++ trunk/reactos/tools/nci/w32ksvc.db 2005-09-24 19:30:12 UTC (rev 18034) @@ -24,7 +24,7 @@ NtGdiCreateBitmapIndirect 1 NtGdiCreateColorSpace 1 NtGdiCreateCompatibleBitmap 3 -NtGdiCreateCompatableDC 1 +NtGdiCreateCompatibleDC 1 NtGdiCreateDC 4 NtGdiCreateDIBitmap 6 NtGdiCreateDIBBrush 4

18 years, 12 months

[hbirr] 18033: Set the MaximumLength of the returned string in IntGetFullWindowStationName.

by hbirr＠svn.reactos.com

Set the MaximumLength of the returned string in IntGetFullWindowStationName. Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-09-24 19:15:24 UTC (rev 18032) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-09-24 19:17:00 UTC (rev 18033) @@ -259,6 +259,7 @@ FullName->Length += WinStaName->Length + sizeof(WCHAR); if (DesktopName != NULL) FullName->Length += DesktopName->Length + sizeof(WCHAR); + FullName->MaximumLength = FullName->Length; FullName->Buffer = ExAllocatePoolWithTag(PagedPool, FullName->Length, TAG_STRING); if (FullName->Buffer == NULL) {

18 years, 12 months

[hbirr] 18032: Do also alert the mouse thread in UserAcquireOrReleaseInputOwnership.

by hbirr＠svn.reactos.com

Do also alert the mouse thread in UserAcquireOrReleaseInputOwnership. Modified: trunk/reactos/subsys/win32k/ntuser/input.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-24 18:42:37 UTC (rev 18031) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-24 19:15:24 UTC (rev 18032) @@ -716,6 +716,7 @@ InputThreadsRunning = FALSE; NtAlertThread(KeyboardThreadHandle); + NtAlertThread(MouseThreadHandle); } else if (!Release && !InputThreadsRunning) {

18 years, 12 months

← Newer
1
...
12
13
14
15
16
17
18
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005