Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 64373: [INETMIB1_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: akhaldi Date: Sun Sep 28 18:32:39 2014 New Revision: 64373 URL: http://svn.reactos.org/svn/reactos?rev=64373&view=rev Log: [INETMIB1_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/inetmib1/main.c Modified: trunk/rostests/winetests/inetmib1/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetmib1/main.c… ============================================================================== --- trunk/rostests/winetests/inetmib1/main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/inetmib1/main.c [iso-8859-1] Sun Sep 28 18:32:39 2014 @@ -23,38 +23,63 @@ #include "wine/test.h" -static HMODULE inetmib1; +static BOOL (WINAPI *pSnmpExtensionInit)(DWORD, HANDLE*, AsnObjectIdentifier*); +static BOOL (WINAPI *pSnmpExtensionQuery)(BYTE, SnmpVarBindList*, AsnInteger32*, AsnInteger32*); + +static HMODULE init_test_functions(void) +{ + HMODULE mod = LoadLibraryA("inetmib1"); + + ok(mod != NULL, "failed to load inetmib1.dll\n"); + + if (!mod) return NULL; + + pSnmpExtensionInit = (void *)GetProcAddress(mod, "SnmpExtensionInit"); + pSnmpExtensionQuery = (void *)GetProcAddress(mod, "SnmpExtensionQuery"); + + return mod; +} + +static void uninit_test_functions(HMODULE mod) +{ + FreeLibrary(mod); +} static void testInit(void) { - BOOL (WINAPI *pInit)(DWORD, HANDLE *, AsnObjectIdentifier *); BOOL ret; HANDLE event; AsnObjectIdentifier oid; - pInit = (void *)GetProcAddress(inetmib1, "SnmpExtensionInit"); - if (!pInit) + if (!pSnmpExtensionInit) { win_skip("no SnmpExtensionInit\n"); return; } - /* Crash - ret = pInit(0, NULL, NULL); - ret = pInit(0, NULL, &oid); - ret = pInit(0, &event, NULL); - */ - ret = pInit(0, &event, &oid); + +if (0) /* crashes on native */ +{ + ret = pSnmpExtensionInit(0, NULL, NULL); + ret = pSnmpExtensionInit(0, NULL, &oid); + ret = pSnmpExtensionInit(0, &event, NULL); +} + + ret = pSnmpExtensionInit(0, &event, &oid); ok(ret, "SnmpExtensionInit failed: %d\n", GetLastError()); ok(!strcmp("1.3.6.1.2.1.1", SnmpUtilOidToA(&oid)), "Expected 1.3.6.1.2.1.1, got %s\n", SnmpUtilOidToA(&oid)); + +if (0) +{ + /* Fails when called on win8, documentation suggests that + extension itself is responsible for freeing this oid */ SnmpUtilOidFree(&oid); } +} static void testQuery(void) { - BOOL (WINAPI *pQuery)(BYTE, SnmpVarBindList *, AsnInteger32 *, - AsnInteger32 *); BOOL ret, moreData, noChange; SnmpVarBindList list; AsnInteger32 error, index; @@ -71,25 +96,25 @@ SnmpVarBind vars[3], vars2[3], vars3[3]; UINT entry; - pQuery = (void *)GetProcAddress(inetmib1, "SnmpExtensionQuery"); - if (!pQuery) + if (!pSnmpExtensionQuery) { win_skip("couldn't find SnmpExtensionQuery\n"); return; } - /* Crash - ret = pQuery(0, NULL, NULL, NULL); - ret = pQuery(0, NULL, &error, NULL); - ret = pQuery(0, NULL, NULL, &index); - ret = pQuery(0, &list, NULL, NULL); - ret = pQuery(0, &list, &error, NULL); - */ - + +if (0) /* crashes on native */ +{ + ret = pSnmpExtensionQuery(0, NULL, NULL, NULL); + ret = pSnmpExtensionQuery(0, NULL, &error, NULL); + ret = pSnmpExtensionQuery(0, NULL, NULL, &index); + ret = pSnmpExtensionQuery(0, &list, NULL, NULL); + ret = pSnmpExtensionQuery(0, &list, &error, NULL); +} /* An empty list succeeds */ list.len = 0; error = 0xdeadbeef; index = 0xdeadbeef; - ret = pQuery(SNMP_PDU_GET, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); @@ -106,7 +131,7 @@ SetLastError(0xdeadbeef); error = 0xdeadbeef; index = 0xdeadbeef; - ret = pQuery(SNMP_PDU_GET, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR || broken(error == ERROR_FILE_NOT_FOUND) /* NT4 */, @@ -126,7 +151,7 @@ SetLastError(0xdeadbeef); error = 0xdeadbeef; index = 0xdeadbeef; - ret = pQuery(SNMP_PDU_GET, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOSUCHNAME, "expected SNMP_ERRORSTATUS_NOSUCHNAME, got %d\n", error); @@ -148,7 +173,7 @@ SetLastError(0xdeadbeef); error = 0xdeadbeef; index = 0xdeadbeef; - ret = pQuery(SNMP_PDU_GET, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GET, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOSUCHNAME, "expected SNMP_ERRORSTATUS_NOSUCHNAME, got %d\n", error); @@ -170,7 +195,7 @@ SetLastError(0xdeadbeef); error = 0xdeadbeef; index = 0xdeadbeef; - ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); @@ -252,7 +277,7 @@ list.len = 1; list.list = vars2; noChange = FALSE; - ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); @@ -274,7 +299,7 @@ list.list = vars2; moreData = TRUE; do { - ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); @@ -340,7 +365,7 @@ moreData = TRUE; noChange = FALSE; do { - ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); @@ -406,7 +431,7 @@ moreData = TRUE; noChange = FALSE; do { - ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + ret = pSnmpExtensionQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); /* FIXME: error and index aren't checked here because the UDP table is * the last OID currently supported by Wine, so the last GetNext fails. @@ -471,8 +496,13 @@ START_TEST(main) { - inetmib1 = LoadLibraryA("inetmib1"); + HMODULE mod; + + if (!(mod = init_test_functions())) + return; + testInit(); testQuery(); - FreeLibrary(inetmib1); -} + + uninit_test_functions(mod); +}

1 0

[akhaldi] 64372: [IMM32_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: akhaldi Date: Sun Sep 28 18:28:09 2014 New Revision: 64372 URL: http://svn.reactos.org/svn/reactos?rev=64372&view=rev Log: [IMM32_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/imm32/imm32.c Modified: trunk/rostests/winetests/imm32/imm32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/imm32.c?r… ============================================================================== --- trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] Sun Sep 28 18:28:09 2014 @@ -753,7 +753,7 @@ count = ImmGetIMCLockCount(0x00000000); ok(count == 0, "NULL IMC should return 0\n"); ret = GetLastError(); - ok(ret == 0xdeadbeef, "Last Error should remain unchangedi %08x\n",ret); + ok(ret == 0xdeadbeef, "Last Error should remain unchanged: %08x\n",ret); count = ImmGetIMCLockCount(imc); ok(count == 0, "Destroyed IMC should return 0\n"); ret = GetLastError();

1 0

[akhaldi] 64371: [IMM32] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: akhaldi Date: Sun Sep 28 18:27:58 2014 New Revision: 64371 URL: http://svn.reactos.org/svn/reactos?rev=64371&view=rev Log: [IMM32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] Sun Sep 28 18:27:58 2014 @@ -35,6 +35,7 @@ #include <winnls.h> #include <winreg.h> #include <wine/list.h> +#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -75,7 +76,10 @@ ImmHkl *immKbd; UINT lastVK; + DWORD magic; } InputContextData; + +#define WINE_IMC_VALID_MAGIC 0x56434D49 typedef struct _tagTRANSMSG { UINT message; @@ -243,35 +247,36 @@ } } -static HMODULE LoadDefaultWineIME(void) -{ - char buffer[MAX_PATH], libname[32], *name, *next; - HMODULE module = 0; +static HMODULE load_graphics_driver(void) +{ + static const WCHAR display_device_guid_propW[] = { + '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', + 'd','e','v','i','c','e','_','g','u','i','d',0 }; + static const WCHAR key_pathW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\','{',0}; + static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; + static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + + HMODULE ret = 0; HKEY hkey; - - TRACE("Attempting to fall back to wine default IME\n"); - - strcpy( buffer, "x11" ); /* default value */ - /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) - { - DWORD type, count = sizeof(buffer); - RegQueryValueExA( hkey, "Ime", 0, &type, (LPBYTE) buffer, &count ); - RegCloseKey( hkey ); - } - - name = buffer; - while (name) - { - next = strchr( name, ',' ); - if (next) *next++ = 0; - - snprintf( libname, sizeof(libname), "wine%s.drv", name ); - if ((module = LoadLibraryA( libname )) != 0) break; - name = next; - } - - return module; + DWORD size; + WCHAR path[MAX_PATH]; + WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + + if (!guid_atom) return 0; + memcpy( key, key_pathW, sizeof(key_pathW) ); + if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; + strcatW( key, displayW ); + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; + size = sizeof(path); + if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + RegCloseKey( hkey ); + TRACE( "%s %p\n", debugstr_w(path), ret ); + return ret; } /* ImmHkl loading and freeing */ @@ -294,8 +299,7 @@ ptr->hkl = hkl; if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename); - if (!ptr->hIME) - ptr->hIME = LoadDefaultWineIME(); + if (!ptr->hIME) ptr->hIME = load_graphics_driver(); if (ptr->hIME) { LOAD_FUNCPTR(ImeInquire); @@ -452,15 +456,33 @@ return rc; } +static InputContextData* get_imc_data(HIMC hIMC) +{ + InputContextData *data = hIMC; + + if (hIMC == NULL) + return NULL; + + if(IsBadReadPtr(data, sizeof(InputContextData)) || data->magic != WINE_IMC_VALID_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + return data; +} + /*********************************************************************** * ImmAssociateContext (IMM32.@) */ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { HIMC old = NULL; - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %p):\n", hWnd, hIMC); + + if(hIMC && !data) + return NULL; if (!IMM_GetThreadData()->defaultContext) IMM_GetThreadData()->defaultContext = ImmCreateContext(); @@ -642,6 +664,7 @@ InputContextData *new_context; LPGUIDELINE gl; LPCANDIDATEINFO ci; + int i; new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); @@ -669,8 +692,14 @@ gl->dwSize = sizeof(GUIDELINE); ImmUnlockIMCC(new_context->IMC.hGuideLine); + for (i = 0; i < sizeof(new_context->IMC.cfCandForm) / sizeof(CANDIDATEFORM); i++) + new_context->IMC.cfCandForm[i].dwIndex = ~0u; + /* Initialize the IME Private */ new_context->IMC.hPrivate = ImmCreateIMCC(new_context->immKbd->imeInfo.dwPrivateDataSize); + + new_context->IMC.fdwConversion = new_context->immKbd->imeInfo.fdwConversionCaps; + new_context->IMC.fdwSentence = new_context->immKbd->imeInfo.fdwSentenceCaps; if (!new_context->immKbd->pImeSelect(new_context, TRUE)) { @@ -683,29 +712,32 @@ new_context->immKbd->uSelected++; TRACE("Created context %p\n",new_context); + new_context->magic = WINE_IMC_VALID_MAGIC; return new_context; } static BOOL IMM_DestroyContext(HIMC hIMC) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("Destroying %p\n",hIMC); - if (hIMC) - { - data->immKbd->uSelected --; - data->immKbd->pImeSelect(hIMC, FALSE); - SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0)); - - ImmDestroyIMCC(data->IMC.hCompStr); - ImmDestroyIMCC(data->IMC.hCandInfo); - ImmDestroyIMCC(data->IMC.hGuideLine); - ImmDestroyIMCC(data->IMC.hPrivate); - ImmDestroyIMCC(data->IMC.hMsgBuf); - - HeapFree(GetProcessHeap(),0,data); - } + if (!data) + return FALSE; + + data->immKbd->uSelected --; + data->immKbd->pImeSelect(hIMC, FALSE); + SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0)); + + ImmDestroyIMCC(data->IMC.hCompStr); + ImmDestroyIMCC(data->IMC.hCandInfo); + ImmDestroyIMCC(data->IMC.hGuideLine); + ImmDestroyIMCC(data->IMC.hPrivate); + ImmDestroyIMCC(data->IMC.hMsgBuf); + + data->magic = 0; + HeapFree(GetProcessHeap(),0,data); + return TRUE; } @@ -885,7 +917,7 @@ HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); LPCANDIDATEINFO candinfo; LPCANDIDATELIST candlist; DWORD ret = 0; @@ -924,7 +956,7 @@ DWORD WINAPI ImmGetCandidateListCountA( HIMC hIMC, LPDWORD lpdwListCount) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); LPCANDIDATEINFO candinfo; DWORD ret, count; @@ -956,7 +988,7 @@ DWORD WINAPI ImmGetCandidateListCountW( HIMC hIMC, LPDWORD lpdwListCount) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); LPCANDIDATEINFO candinfo; DWORD ret, count; @@ -989,7 +1021,7 @@ HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); LPCANDIDATEINFO candinfo; LPCANDIDATELIST candlist; DWORD ret = 0; @@ -1028,7 +1060,7 @@ BOOL WINAPI ImmGetCandidateWindow( HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandidate) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("%p, %d, %p\n", hIMC, dwIndex, lpCandidate); @@ -1036,6 +1068,9 @@ return FALSE; if ( dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + return FALSE; + + if (data->IMC.cfCandForm[dwIndex].dwIndex != dwIndex) return FALSE; *lpCandidate = data->IMC.cfCandForm[dwIndex]; @@ -1068,7 +1103,7 @@ */ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %p):\n", hIMC, lplf); @@ -1247,7 +1282,7 @@ DWORD dwBufLen, BOOL unicode) { LONG rc = 0; - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); LPCOMPOSITIONSTRING compstr; LPBYTE compdata; @@ -1359,7 +1394,7 @@ */ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %p)\n", hIMC, lpCompForm); @@ -1367,7 +1402,7 @@ return FALSE; *lpCompForm = data->IMC.cfCompForm; - return 1; + return TRUE; } /*********************************************************************** @@ -1486,7 +1521,7 @@ BOOL WINAPI ImmGetConversionStatus( HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("%p %p %p\n", hIMC, lpfdwConversion, lpfdwSentence); @@ -1526,6 +1561,8 @@ /* find out how many characters in the unicode buffer */ len = ImmGetDescriptionW( hKL, NULL, 0 ); + if (!len) + return 0; /* allocate a buffer of that size */ buf = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof (WCHAR) ); @@ -1541,7 +1578,10 @@ HeapFree( GetProcessHeap(), 0, buf ); - return len; + if (len == 0) + return 0; + + return len - 1; } /*********************************************************************** @@ -1553,6 +1593,7 @@ FIXME("(%p, %p, %d): semi stub\n", hKL, lpszDescription, uBufLen); + if (!hKL) return 0; if (!uBufLen) return lstrlenW( name ); lstrcpynW( lpszDescription, name, uBufLen ); return lstrlenW( lpszDescription ); @@ -1667,7 +1708,7 @@ */ BOOL WINAPI ImmGetOpenStatus(HIMC hIMC) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); static int i; if (!data) @@ -1770,7 +1811,7 @@ */ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %p)\n", hIMC, lpptPos); @@ -1966,13 +2007,21 @@ BOOL WINAPI ImmNotifyIME( HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %d, %d, %d)\n", hIMC, dwAction, dwIndex, dwValue); + if (hIMC == NULL) + { + SetLastError(ERROR_SUCCESS); + return FALSE; + } + if (!data || ! data->immKbd->pNotifyIME) - return FALSE; + { + return FALSE; + } return data->immKbd->pNotifyIME(hIMC,dwAction,dwIndex,dwValue); } @@ -2042,11 +2091,11 @@ */ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) { - static int shown = 0; + static BOOL shown = FALSE; if (!shown) { FIXME("(%p, %p): stub\n", hWnd, hIMC); - shown = 1; + shown = TRUE; } return TRUE; } @@ -2056,9 +2105,11 @@ */ LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("%p %ld %ld\n", hIMC, wParam, wParam); + if (!data) + SetLastError(ERROR_INVALID_HANDLE); if (data && IsWindow(data->IMC.hWnd)) return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); @@ -2071,9 +2122,12 @@ */ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("%p %ld %ld\n", hIMC, wParam, wParam); + + if (!data) + SetLastError(ERROR_INVALID_HANDLE); if (data && IsWindow(data->IMC.hWnd)) return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); @@ -2087,7 +2141,7 @@ BOOL WINAPI ImmSetCandidateWindow( HIMC hIMC, LPCANDIDATEFORM lpCandidate) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %p)\n", hIMC, lpCandidate); @@ -2115,11 +2169,14 @@ */ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %p)\n", hIMC, lplf); if (!data || !lplf) - return FALSE; + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } memcpy(&data->IMC.lfFont.W,lplf,sizeof(LOGFONTA)); MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->IMC.lfFont.W.lfFaceName, @@ -2135,11 +2192,14 @@ */ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %p)\n", hIMC, lplf); if (!data || !lplf) - return FALSE; + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } data->IMC.lfFont.W = *lplf; ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); @@ -2161,7 +2221,7 @@ WCHAR *CompBuffer = NULL; WCHAR *ReadBuffer = NULL; BOOL rc; - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %d, %p, %d, %p, %d):\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); @@ -2216,7 +2276,7 @@ CHAR *CompBuffer = NULL; CHAR *ReadBuffer = NULL; BOOL rc; - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %d, %p, %d, %p, %d):\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); @@ -2269,7 +2329,7 @@ HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) { BOOL reshow = FALSE; - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %p)\n", hIMC, lpCompForm); TRACE("\t%x, (%i,%i), (%i,%i - %i,%i)\n",lpCompForm->dwStyle, @@ -2277,7 +2337,10 @@ lpCompForm->rcArea.left, lpCompForm->rcArea.bottom, lpCompForm->rcArea.right); if (!data) - return FALSE; + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } data->IMC.cfCompForm = *lpCompForm; @@ -2303,12 +2366,15 @@ HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { DWORD oldConversion, oldSentence; - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("%p %d %d\n", hIMC, fdwConversion, fdwSentence); if (!data) - return FALSE; + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } if ( fdwConversion != data->IMC.fdwConversion ) { @@ -2333,12 +2399,15 @@ */ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("%p %d\n", hIMC, fOpen); if (!data) - return FALSE; + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } if (data->immKbd->UIWnd == NULL) { @@ -2366,12 +2435,15 @@ */ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %p)\n", hIMC, lpptPos); if (!data || !lpptPos) - return FALSE; + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } TRACE("\t(%i,%i)\n", lpptPos->x, lpptPos->y); @@ -2489,9 +2561,16 @@ LPIMEMENUITEMINFOA lpImeParentMenu, LPIMEMENUITEMINFOA lpImeMenu, DWORD dwSize) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize); + + if (!data) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems) { if (!is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu)) @@ -2553,9 +2632,16 @@ LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize); + + if (!data) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems) { if (is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu)) @@ -2613,7 +2699,7 @@ */ LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC hIMC) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); if (!data) return NULL; @@ -2626,7 +2712,10 @@ */ BOOL WINAPI ImmUnlockIMC(HIMC hIMC) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); + + if (!data) + return FALSE; if (data->dwLock) data->dwLock--; return TRUE; @@ -2637,7 +2726,9 @@ */ DWORD WINAPI ImmGetIMCLockCount(HIMC hIMC) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); + if (!data) + return 0; return data->dwLock; } @@ -2702,7 +2793,13 @@ */ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) { - InputContextData *data = hIMC; + InputContextData *data = get_imc_data(hIMC); + + if (!data) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } TRACE("%i messages queued\n",data->IMC.dwNumMsgBuf); if (data->IMC.dwNumMsgBuf > 0) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 28 18:27:58 2014 @@ -85,7 +85,7 @@ reactos/dll/win32/ieframe # Synced to Wine-1.7.27 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.17 reactos/dll/win32/imagehlp # Synced to Wine-1.7.17 -reactos/dll/win32/imm32 # Synced to Wine-1.7.17 +reactos/dll/win32/imm32 # Synced to Wine-1.7.27 reactos/dll/win32/inetcomm # Synced to Wine-1.7.17 reactos/dll/win32/inetmib1 # Synced to Wine-1.7.1 reactos/dll/win32/initpki # Synced to Wine-1.7.17

1 0

[tkreuzer] 64370: [GDI32_APITEST] - Add tests for OffsetClipRgn - Imporve ExcludeClipRect tests
by tkreuzer＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: tkreuzer Date: Sun Sep 28 18:24:58 2014 New Revision: 64370 URL: http://svn.reactos.org/svn/reactos?rev=64370&view=rev Log: [GDI32_APITEST] - Add tests for OffsetClipRgn - Imporve ExcludeClipRect tests Added: trunk/rostests/apitests/gdi32/OffsetClipRgn.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/ExcludeClipRect.c trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Sun Sep 28 18:24:58 2014 @@ -48,6 +48,7 @@ GetTextExtentExPoint.c GetTextFace.c MaskBlt.c + OffsetClipRgn.c PatBlt.c Rectangle.c SelectObject.c Modified: trunk/rostests/apitests/gdi32/ExcludeClipRect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExcludeCli… ============================================================================== --- trunk/rostests/apitests/gdi32/ExcludeClipRect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/ExcludeClipRect.c [iso-8859-1] Sun Sep 28 18:24:58 2014 @@ -44,12 +44,12 @@ hrgn = CreateRectRgn(10, 10, 20, 30); ok_int(SelectClipRgn(hdc, hrgn), NULLREGION); // yeah... it's NULLREGION ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); - ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); // but in fact it's a rect region! + ok_int(EqualRgn(hrgn, hrgn2), TRUE); // but in fact it's the region we set /* Exclude something outside of the clip region */ ok_int(ExcludeClipRect(hdc, 0, 0, 1, 1), COMPLEXREGION); // in reality it's a rect region ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); - ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); + ok_int(EqualRgn(hrgn, hrgn2), TRUE); /* Exclude something on one side of the clip rect */ ok_int(ExcludeClipRect(hdc, 0, 0, 13, 50), COMPLEXREGION); @@ -85,7 +85,8 @@ ok_int(ExcludeClipRect(hdc, 100000, 100000, 100010, 100010), COMPLEXREGION); // this time it's a complex region? ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); hrgn = CreateRectRgn(0, 0, 1, 1); - ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); + ok_int(EqualRgn(hrgn, hrgn2), TRUE); + DeleteObject(hrgn); /* Test reversed rect negative, but still above 0 */ ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); Added: trunk/rostests/apitests/gdi32/OffsetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/OffsetClip… ============================================================================== --- trunk/rostests/apitests/gdi32/OffsetClipRgn.c (added) +++ trunk/rostests/apitests/gdi32/OffsetClipRgn.c [iso-8859-1] Sun Sep 28 18:24:58 2014 @@ -0,0 +1,79 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for OffsetClipRgn + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> +#include <wingdi.h> + +#define CLIPRGN 1 + +void Test_OffsetClipRgn() +{ + HDC hdc; + HRGN hrgn, hrgn2; + //RECT rect; + + hdc = CreateCompatibleDC(NULL); + ok(hdc != 0, "CreateCompatibleDC failed, skipping tests.\n"); + if (!hdc) return; + + hrgn2 = CreateRectRgn(0, 0, 0, 0); + + /* Test NULL DC */ + SetLastError(0x12345); + ok_int(OffsetClipRgn(NULL, 0, 0), ERROR); + ok_int(GetLastError(), ERROR_INVALID_HANDLE); + + /* Test invalid DC */ + SetLastError(0x12345); + ok_int(OffsetClipRgn((HDC)(ULONG_PTR)0x12345, 0, 0), ERROR); + ok_int(GetLastError(), 0x12345); + SetLastError(0x12345); + + /* Test without a clip region set */ + SetLastError(0x12345); + ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); + ok_int(OffsetClipRgn(hdc, 0, 0), SIMPLEREGION); + ok_int(GetLastError(), 0x12345); + SetLastError(0x12345); + + /* Set a clip region */ + hrgn = CreateRectRgn(10, 10, 20, 30); + ok_int(SelectClipRgn(hdc, hrgn), NULLREGION); + DeleteObject(hrgn); + ok_int(OffsetClipRgn(hdc, 10, 10), SIMPLEREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(20, 20, 30, 40); + ok_int(EqualRgn(hrgn, hrgn2), TRUE); + + /* Set different scaling */ + SetMapMode(hdc, MM_ANISOTROPIC); + ok_int(SetViewportExtEx(hdc, 100, 100, NULL), 1); + ok_int(SetWindowExtEx(hdc, 200, 50, NULL), 1); + ok_int(OffsetClipRgn(hdc, 10, 10), SIMPLEREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(25, 40, 35, 60); + ok_int(EqualRgn(hrgn, hrgn2), TRUE); + +#if 0 + /* Set different scaling */ + SetMapMode(hdc, MM_ANISOTROPIC); + ok_int(SetViewportExtEx(hdc, 100, 100, NULL), 1); + ok_int(SetWindowExtEx(hdc, 80, 350, NULL), 1); + ok_int(OffsetClipRgn(hdc, 10, 10), SIMPLEREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(33, 23, 43, 43); + ok_int(EqualRgn(hrgn, hrgn2), TRUE); +#endif + + ok_int(GetLastError(), 0x12345); + +} + +START_TEST(OffsetClipRgn) +{ + Test_OffsetClipRgn(); +} Propchange: trunk/rostests/apitests/gdi32/OffsetClipRgn.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Sun Sep 28 18:24:58 2014 @@ -49,6 +49,7 @@ extern void func_GetTextExtentExPoint(void); extern void func_GetTextFace(void); extern void func_MaskBlt(void); +extern void func_OffsetClipRgn(void); extern void func_PatBlt(void); extern void func_Rectangle(void); extern void func_SelectObject(void); @@ -110,6 +111,7 @@ { "GetTextExtentExPoint", func_GetTextExtentExPoint }, { "GetTextFace", func_GetTextFace }, { "MaskBlt", func_MaskBlt }, + { "OffsetClipRgn", func_OffsetClipRgn }, { "PatBlt", func_PatBlt }, { "Rectangle", func_Rectangle }, { "SelectObject", func_SelectObject },

1 0

[tkreuzer] 64369: [NTOSKNRL] Improve performance of FsRtlIsNameInExpression by using a stack buffer for backtracking of wildcard expressions. See also CR-60
by tkreuzer＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: tkreuzer Date: Sun Sep 28 18:17:14 2014 New Revision: 64369 URL: http://svn.reactos.org/svn/reactos?rev=64369&view=rev Log: [NTOSKNRL] Improve performance of FsRtlIsNameInExpression by using a stack buffer for backtracking of wildcard expressions. See also CR-60 Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Sep 28 18:17:14 2014 @@ -24,7 +24,10 @@ IN PWCHAR UpcaseTable OPTIONAL) { SHORT StarFound = -1, DosStarFound = -1; - PUSHORT BackTracking = NULL, DosBackTracking = NULL; + USHORT BackTrackingBuffer[5], DosBackTrackingBuffer[5]; + PUSHORT BackTracking = BackTrackingBuffer, DosBackTracking = DosBackTrackingBuffer; + SHORT BackTrackingSize = RTL_NUMBER_OF(BackTrackingBuffer); + SHORT DosBackTrackingSize = RTL_NUMBER_OF(DosBackTrackingBuffer); UNICODE_STRING IntExpression; USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, LastDot; WCHAR CompareChar; @@ -127,23 +130,28 @@ ExpressionPosition++; } - /* Save star position */ - if (!BackTracking) - { - BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length / sizeof(WCHAR)) * sizeof(USHORT), - 'nrSF'); - } - BackTracking[++StarFound] = ExpressionPosition++; - /* If star is at the end, then eat all rest and leave */ if (ExpressionPosition == Expression->Length / sizeof(WCHAR)) { NamePosition = Name->Length / sizeof(WCHAR); break; } + + /* Save star position */ + StarFound++; + if (StarFound >= BackTrackingSize) + { + BackTrackingSize = Expression->Length / sizeof(WCHAR); + BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + BackTrackingSize * sizeof(USHORT), + 'nrSF'); + RtlCopyMemory(BackTracking, BackTrackingBuffer, sizeof(BackTrackingBuffer)); + + } + BackTracking[StarFound] = ExpressionPosition++; + /* Allow null matching */ - else if (Expression->Buffer[ExpressionPosition] != L'?' && + if (Expression->Buffer[ExpressionPosition] != L'?' && Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) { NamePosition++; @@ -179,10 +187,16 @@ */ if (MatchingChars != Name->Length || LastDot == (USHORT)-1) { - if (!DosBackTracking) DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - (Expression->Length / sizeof(WCHAR)) * sizeof(USHORT), - 'nrSF'); - DosBackTracking[++DosStarFound] = ExpressionPosition++; + DosStarFound++; + if (DosStarFound >= DosBackTrackingSize) + { + DosBackTrackingSize = Expression->Length / sizeof(WCHAR); + DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + DosBackTrackingSize * sizeof(USHORT), + 'nrSF'); + RtlCopyMemory(DosBackTracking, DosBackTrackingBuffer, sizeof(DosBackTrackingBuffer)); + } + DosBackTracking[DosStarFound] = ExpressionPosition++; /* Not the same char, start exploring */ if (Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) @@ -206,7 +220,7 @@ NamePosition++; } /* Try to explore later on for null matching */ - else if ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) && + else if ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) && (Name->Buffer[NamePosition] == Expression->Buffer[ExpressionPosition + 1])) { NamePosition++; @@ -262,11 +276,11 @@ } } - if (BackTracking) + if (BackTracking != BackTrackingBuffer) { ExFreePoolWithTag(BackTracking, 'nrSF'); } - if (DosBackTracking) + if (DosBackTracking != DosBackTrackingBuffer) { ExFreePoolWithTag(DosBackTracking, 'nrSF'); }

1 0

[aandrejevic] 64368: [NTVDM] Fix the calculation of TotalSize in DosCopyEnvironmentBlock. Return the correct error code in DosLoadExecutable.
by aandrejevic＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: aandrejevic Date: Sun Sep 28 17:27:54 2014 New Revision: 64368 URL: http://svn.reactos.org/svn/reactos?rev=64368&view=rev Log: [NTVDM] Fix the calculation of TotalSize in DosCopyEnvironmentBlock. Return the correct error code in DosLoadExecutable. Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Sep 28 17:27:54 2014 @@ -418,6 +418,9 @@ /* Add the string buffer size */ TotalSize += strlen(ProgramName) + 1; + + /* Add the two extra bytes */ + TotalSize += 2; /* Allocate the memory for the environment block */ DestSegment = DosAllocateMemory((WORD)((TotalSize + 0x0F) >> 4), NULL); @@ -1012,7 +1015,7 @@ /* Check if at least the lowest allocation was successful */ if (Segment == 0) { - Result = ERROR_NOT_ENOUGH_MEMORY; + Result = DosLastError; goto Cleanup; } @@ -1081,7 +1084,7 @@ Segment = DosAllocateMemory(MaxAllocSize, NULL); if (Segment == 0) { - Result = ERROR_ARENA_TRASHED; + Result = DosLastError; goto Cleanup; }

1 0

[hbelusca] 64367: [NTVDM] - Add the possibility to dump the VM memory either in text or binary mode. - Initialize the VM memory to 0xFF to track potential memory misuses (diagnostics purposes). Thi...
by hbelusca＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: hbelusca Date: Sun Sep 28 16:27:30 2014 New Revision: 64367 URL: http://svn.reactos.org/svn/reactos?rev=64367&view=rev Log: [NTVDM] - Add the possibility to dump the VM memory either in text or binary mode. - Initialize the VM memory to 0xFF to track potential memory misuses (diagnostics purposes). Things may crash, or not! Modified: trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/emulator.h trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc trunk/reactos/subsystems/ntvdm/lang/de-DE.rc trunk/reactos/subsystems/ntvdm/lang/en-US.rc trunk/reactos/subsystems/ntvdm/lang/es-ES.rc trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc trunk/reactos/subsystems/ntvdm/lang/it-IT.rc trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/ntvdm/resource.h Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -430,13 +430,22 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -VOID DumpMemory(VOID) -{ - static ULONG DumpNumber = 0; - - HANDLE hFile; - WCHAR FileName[MAX_PATH]; - +static VOID +DumpMemoryRaw(HANDLE hFile) +{ + PVOID Buffer; + SIZE_T Size; + + /* Dump the VM memory */ + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + Buffer = REAL_TO_PHYS(NULL); + Size = MAX_ADDRESS - (ULONG_PTR)(NULL); + WriteFile(hFile, Buffer, Size, &Size, NULL); +} + +static VOID +DumpMemoryTxt(HANDLE hFile) +{ #define LINE_SIZE 75 + 2 ULONG i; PBYTE Ptr1, Ptr2; @@ -444,8 +453,61 @@ PCHAR Line; SIZE_T LineSize; + /* Dump the VM memory */ + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + Ptr1 = Ptr2 = REAL_TO_PHYS(NULL); + while (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr1) > 0) + { + Ptr1 = Ptr2; + Line = LineBuffer; + + /* Print the address */ + Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, "%08x ", PHYS_TO_REAL(Ptr1)); + + /* Print up to 16 bytes... */ + + /* ... in hexadecimal form first... */ + i = 0; + while (i++ <= 0x0F && (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr1) > 0)) + { + Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, " %02x", *Ptr1); + ++Ptr1; + } + + /* ... align with spaces if needed... */ + RtlFillMemory(Line, 0x0F + 4 - i, ' '); + Line += 0x0F + 4 - i; + + /* ... then in character form. */ + i = 0; + while (i++ <= 0x0F && (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr2) > 0)) + { + *Line++ = ((*Ptr2 >= 0x20 && *Ptr2 <= 0x7E) || (*Ptr2 >= 0x80 && *Ptr2 < 0xFF) ? *Ptr2 : '.'); + ++Ptr2; + } + + /* Newline */ + *Line++ = '\r'; + *Line++ = '\n'; + + /* Finally write the line to the file */ + LineSize = Line - LineBuffer; + WriteFile(hFile, LineBuffer, LineSize, &LineSize, NULL); + } +} + +VOID DumpMemory(BOOLEAN TextFormat) +{ + static ULONG DumpNumber = 0; + + HANDLE hFile; + WCHAR FileName[MAX_PATH]; + /* Build a suitable file name */ - _snwprintf(FileName, MAX_PATH, L"memdump%lu.txt", DumpNumber); + _snwprintf(FileName, MAX_PATH, + L"memdump%lu.%s", + DumpNumber, + TextFormat ? L"txt" : L"dat"); ++DumpNumber; DPRINT1("Creating memory dump file '%S'...\n", FileName); @@ -466,47 +528,11 @@ return; } - /* Dump the VM memory */ - SetFilePointer(hFile, 0, NULL, FILE_BEGIN); - Ptr1 = Ptr2 = REAL_TO_PHYS(NULL); - while (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr1) > 0) - { - Ptr1 = Ptr2; - Line = LineBuffer; - - /* Print the address */ - Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, "%08x ", PHYS_TO_REAL(Ptr1)); - - /* Print up to 16 bytes... */ - - /* ... in hexadecimal form first... */ - i = 0; - while (i++ <= 0x0F && (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr1) > 0)) - { - Line += snprintf(Line, LINE_SIZE + LineBuffer - Line, " %02x", *Ptr1); - ++Ptr1; - } - - /* ... align with spaces if needed... */ - RtlFillMemory(Line, 0x0F + 4 - i, ' '); - Line += 0x0F + 4 - i; - - /* ... then in character form. */ - i = 0; - while (i++ <= 0x0F && (MAX_ADDRESS - (ULONG_PTR)PHYS_TO_REAL(Ptr2) > 0)) - { - *Line++ = ((*Ptr2 >= 0x20 && *Ptr2 <= 0x7E) || (*Ptr2 >= 0x80 && *Ptr2 < 0xFF) ? *Ptr2 : '.'); - ++Ptr2; - } - - /* Newline */ - *Line++ = '\r'; - *Line++ = '\n'; - - /* Finally write the line to the file */ - LineSize = Line - LineBuffer; - WriteFile(hFile, LineBuffer, LineSize, &LineSize, NULL); - } + /* Dump the VM memory in the chosen format */ + if (TextFormat) + DumpMemoryTxt(hFile); + else + DumpMemoryRaw(hFile); /* Close the file */ CloseHandle(hFile); @@ -517,12 +543,14 @@ BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput) { /* Allocate memory for the 16-bit address space */ - BaseAddress = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_ADDRESS); + BaseAddress = HeapAlloc(GetProcessHeap(), /*HEAP_ZERO_MEMORY*/ 0, MAX_ADDRESS); if (BaseAddress == NULL) { wprintf(L"FATAL: Failed to allocate VDM memory.\n"); return FALSE; } + // For diagnostics purposes!! + FillMemory(BaseAddress, MAX_ADDRESS, 0xFF); /* Initialize I/O ports */ /* Initialize RAM */ Modified: trunk/reactos/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -98,7 +98,7 @@ /* FUNCTIONS ******************************************************************/ -VOID DumpMemory(VOID); +VOID DumpMemory(BOOLEAN TextFormat); VOID WINAPI EmulatorReadMemory ( Modified: trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/cs-C… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -15,6 +15,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Dump &Memory" - IDS_VDM_QUIT , "&UkonÄit ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&UkonÄit ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/de-D… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/de-DE.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Dump &Memory" - IDS_VDM_QUIT , "ReactOS VDM b&eenden" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "ReactOS VDM b&eenden" END Modified: trunk/reactos/subsystems/ntvdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/en-U… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/en-US.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Dump &Memory" - IDS_VDM_QUIT , "&Quit the ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&Quit the ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/es-E… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/es-ES.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Dump &Memory" - IDS_VDM_QUIT , "&Salir de ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&Salir de ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/fr-F… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Vidage &MÃ©moire" - IDS_VDM_QUIT , "&Quitter la ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Vidage MÃ©moire (&Texte)" + IDS_VDM_DUMPMEM_BIN, "Vidage MÃ©moire (&Binaire)" + IDS_VDM_QUIT , "&Quitter la ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/it-I… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/it-IT.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Dump &Memory" - IDS_VDM_QUIT , "&Esci da ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&Esci da ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/pl-P… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -11,6 +11,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "Zrzut &PamiÄci" - IDS_VDM_QUIT , "&WyjdÅº z ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&WyjdÅº z ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ro-R… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,5 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_QUIT, "I&eÈire din ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "I&eÈire din ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ru-R… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -9,6 +9,7 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM, "ÐÐ°Ð¼Ð¿ &Ð¿Ð°Ð¼ÑÑÐ¸" - IDS_VDM_QUIT , "&ÐÑÐ¹ÑÐ¸ Ð¸Ð· ReactOS VDM" + IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" + IDS_VDM_QUIT , "&ÐÑÐ¹ÑÐ¸ Ð¸Ð· ReactOS VDM" END Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -51,8 +51,9 @@ static const VDM_MENUITEM VdmMenuItems[] = { - { IDS_VDM_DUMPMEM, NULL, ID_VDM_DUMPMEM }, - { IDS_VDM_QUIT , NULL, ID_VDM_QUIT }, + { IDS_VDM_DUMPMEM_TXT, NULL, ID_VDM_DUMPMEM_TXT }, + { IDS_VDM_DUMPMEM_BIN, NULL, ID_VDM_DUMPMEM_BIN }, + { IDS_VDM_QUIT , NULL, ID_VDM_QUIT }, { 0, NULL, 0 } /* End of list */ }; @@ -337,8 +338,12 @@ ShowPointer = !ShowPointer; break; - case ID_VDM_DUMPMEM: - DumpMemory(); + case ID_VDM_DUMPMEM_TXT: + DumpMemory(TRUE); + break; + + case ID_VDM_DUMPMEM_BIN: + DumpMemory(FALSE); break; case ID_VDM_QUIT: Modified: trunk/reactos/subsystems/ntvdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/resource.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/resource.h [iso-8859-1] Sun Sep 28 16:27:30 2014 @@ -2,16 +2,18 @@ /* Menu IDs */ #define ID_SHOWHIDE_MOUSE 1000 -#define ID_VDM_DUMPMEM 1001 -#define ID_VDM_QUIT 1002 +#define ID_VDM_DUMPMEM_TXT 1001 +#define ID_VDM_DUMPMEM_BIN 1002 +#define ID_VDM_QUIT 1003 /* String IDs */ #define IDS_HIDE_MOUSE 100 #define IDS_SHOW_MOUSE 101 #define IDS_VDM_MENU 102 -#define IDS_VDM_DUMPMEM 200 -#define IDS_VDM_QUIT 201 +#define IDS_VDM_DUMPMEM_TXT 200 +#define IDS_VDM_DUMPMEM_BIN 201 +#define IDS_VDM_QUIT 202 /* Icon */ #define IDI_APPICON 1

1 0

[ekohl] 64366: [INCLUDE] Add LsaGetLogonSessionData prototype.
by ekohl＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: ekohl Date: Sun Sep 28 15:30:50 2014 New Revision: 64366 URL: http://svn.reactos.org/svn/reactos?rev=64366&view=rev Log: [INCLUDE] Add LsaGetLogonSessionData prototype. Modified: trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Sun Sep 28 15:30:50 2014 @@ -709,6 +709,7 @@ PVOID*,ULONG,PULONG); NTSTATUS NTAPI LsaFreeMemory(PVOID); NTSTATUS NTAPI LsaFreeReturnBuffer(PVOID); +NTSTATUS NTAPI LsaGetLogonSessionData(PLUID,PSECURITY_LOGON_SESSION_DATA*); NTSTATUS NTAPI LsaGetQuotasForAccount(LSA_HANDLE,PQUOTA_LIMITS); NTSTATUS NTAPI LsaGetRemoteUserName(PLSA_UNICODE_STRING, PLSA_UNICODE_STRING*, PLSA_UNICODE_STRING*);

1 0

[hbelusca] 64365: [FAST486]: Improve the trace.
by hbelusca＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: hbelusca Date: Sun Sep 28 15:11:33 2014 New Revision: 64365 URL: http://svn.reactos.org/svn/reactos?rev=64365&view=rev Log: [FAST486]: Improve the trace. Modified: trunk/reactos/lib/fast486/fast486.c Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sun Sep 28 15:11:33 2014 @@ -299,81 +299,83 @@ NTAPI Fast486DumpState(PFAST486_STATE State) { - DPRINT1("\nCPU currently executing in %s mode at %04X:%08X\n", + DbgPrint("\nFast486DumpState -->\n"); + DbgPrint("\nCPU currently executing in %s mode at %04X:%08X\n", (State->ControlRegisters[0] & FAST486_CR0_PE) ? "protected" : "real", - State->SegmentRegs[FAST486_REG_CS].Selector, - State->InstPtr.Long); - DPRINT1("\nGeneral purpose registers:\n" - "EAX = %08X\tECX = %08X\tEDX = %08X\tEBX = %08X\n" - "ESP = %08X\tEBP = %08X\tESI = %08X\tEDI = %08X\n", - State->GeneralRegs[FAST486_REG_EAX].Long, - State->GeneralRegs[FAST486_REG_ECX].Long, - State->GeneralRegs[FAST486_REG_EDX].Long, - State->GeneralRegs[FAST486_REG_EBX].Long, - State->GeneralRegs[FAST486_REG_ESP].Long, - State->GeneralRegs[FAST486_REG_EBP].Long, - State->GeneralRegs[FAST486_REG_ESI].Long, - State->GeneralRegs[FAST486_REG_EDI].Long); - DPRINT1("\nSegment registers:\n" - "ES = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "CS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "SS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "DS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "FS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "GS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n", - State->SegmentRegs[FAST486_REG_ES].Selector, - State->SegmentRegs[FAST486_REG_ES].Base, - State->SegmentRegs[FAST486_REG_ES].Limit, - State->SegmentRegs[FAST486_REG_ES].Dpl, - State->SegmentRegs[FAST486_REG_CS].Selector, - State->SegmentRegs[FAST486_REG_CS].Base, - State->SegmentRegs[FAST486_REG_CS].Limit, - State->SegmentRegs[FAST486_REG_CS].Dpl, - State->SegmentRegs[FAST486_REG_SS].Selector, - State->SegmentRegs[FAST486_REG_SS].Base, - State->SegmentRegs[FAST486_REG_SS].Limit, - State->SegmentRegs[FAST486_REG_SS].Dpl, - State->SegmentRegs[FAST486_REG_DS].Selector, - State->SegmentRegs[FAST486_REG_DS].Base, - State->SegmentRegs[FAST486_REG_DS].Limit, - State->SegmentRegs[FAST486_REG_DS].Dpl, - State->SegmentRegs[FAST486_REG_FS].Selector, - State->SegmentRegs[FAST486_REG_FS].Base, - State->SegmentRegs[FAST486_REG_FS].Limit, - State->SegmentRegs[FAST486_REG_FS].Dpl, - State->SegmentRegs[FAST486_REG_GS].Selector, - State->SegmentRegs[FAST486_REG_GS].Base, - State->SegmentRegs[FAST486_REG_GS].Limit, - State->SegmentRegs[FAST486_REG_GS].Dpl); - DPRINT1("\nFlags: %08X (%s %s %s %s %s %s %s %s %s %s %s %s) Iopl: %u\n", - State->Flags.Long, - State->Flags.Cf ? "CF" : "cf", - State->Flags.Pf ? "PF" : "pf", - State->Flags.Af ? "AF" : "af", - State->Flags.Zf ? "ZF" : "zf", - State->Flags.Sf ? "SF" : "sf", - State->Flags.Tf ? "TF" : "tf", - State->Flags.If ? "IF" : "if", - State->Flags.Df ? "DF" : "df", - State->Flags.Of ? "OF" : "of", - State->Flags.Nt ? "NT" : "nt", - State->Flags.Rf ? "RF" : "rf", - State->Flags.Vm ? "VM" : "vm", - State->Flags.Iopl); - DPRINT1("\nControl Registers:\n" - "CR0 = %08X\tCR2 = %08X\tCR3 = %08X\n", - State->ControlRegisters[FAST486_REG_CR0], - State->ControlRegisters[FAST486_REG_CR2], - State->ControlRegisters[FAST486_REG_CR3]); - DPRINT1("\nDebug Registers:\n" - "DR0 = %08X\tDR1 = %08X\tDR2 = %08X\n" - "DR3 = %08X\tDR4 = %08X\tDR5 = %08X\n", - State->DebugRegisters[FAST486_REG_DR0], - State->DebugRegisters[FAST486_REG_DR1], - State->DebugRegisters[FAST486_REG_DR2], - State->DebugRegisters[FAST486_REG_DR3], - State->DebugRegisters[FAST486_REG_DR4], - State->DebugRegisters[FAST486_REG_DR5]); + State->SegmentRegs[FAST486_REG_CS].Selector, + State->InstPtr.Long); + DbgPrint("\nGeneral purpose registers:\n" + "EAX = %08X\tECX = %08X\tEDX = %08X\tEBX = %08X\n" + "ESP = %08X\tEBP = %08X\tESI = %08X\tEDI = %08X\n", + State->GeneralRegs[FAST486_REG_EAX].Long, + State->GeneralRegs[FAST486_REG_ECX].Long, + State->GeneralRegs[FAST486_REG_EDX].Long, + State->GeneralRegs[FAST486_REG_EBX].Long, + State->GeneralRegs[FAST486_REG_ESP].Long, + State->GeneralRegs[FAST486_REG_EBP].Long, + State->GeneralRegs[FAST486_REG_ESI].Long, + State->GeneralRegs[FAST486_REG_EDI].Long); + DbgPrint("\nSegment registers:\n" + "ES = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "CS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "SS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "DS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "FS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" + "GS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n", + State->SegmentRegs[FAST486_REG_ES].Selector, + State->SegmentRegs[FAST486_REG_ES].Base, + State->SegmentRegs[FAST486_REG_ES].Limit, + State->SegmentRegs[FAST486_REG_ES].Dpl, + State->SegmentRegs[FAST486_REG_CS].Selector, + State->SegmentRegs[FAST486_REG_CS].Base, + State->SegmentRegs[FAST486_REG_CS].Limit, + State->SegmentRegs[FAST486_REG_CS].Dpl, + State->SegmentRegs[FAST486_REG_SS].Selector, + State->SegmentRegs[FAST486_REG_SS].Base, + State->SegmentRegs[FAST486_REG_SS].Limit, + State->SegmentRegs[FAST486_REG_SS].Dpl, + State->SegmentRegs[FAST486_REG_DS].Selector, + State->SegmentRegs[FAST486_REG_DS].Base, + State->SegmentRegs[FAST486_REG_DS].Limit, + State->SegmentRegs[FAST486_REG_DS].Dpl, + State->SegmentRegs[FAST486_REG_FS].Selector, + State->SegmentRegs[FAST486_REG_FS].Base, + State->SegmentRegs[FAST486_REG_FS].Limit, + State->SegmentRegs[FAST486_REG_FS].Dpl, + State->SegmentRegs[FAST486_REG_GS].Selector, + State->SegmentRegs[FAST486_REG_GS].Base, + State->SegmentRegs[FAST486_REG_GS].Limit, + State->SegmentRegs[FAST486_REG_GS].Dpl); + DbgPrint("\nFlags: %08X (%s %s %s %s %s %s %s %s %s %s %s %s) Iopl: %u\n", + State->Flags.Long, + State->Flags.Cf ? "CF" : "cf", + State->Flags.Pf ? "PF" : "pf", + State->Flags.Af ? "AF" : "af", + State->Flags.Zf ? "ZF" : "zf", + State->Flags.Sf ? "SF" : "sf", + State->Flags.Tf ? "TF" : "tf", + State->Flags.If ? "IF" : "if", + State->Flags.Df ? "DF" : "df", + State->Flags.Of ? "OF" : "of", + State->Flags.Nt ? "NT" : "nt", + State->Flags.Rf ? "RF" : "rf", + State->Flags.Vm ? "VM" : "vm", + State->Flags.Iopl); + DbgPrint("\nControl Registers:\n" + "CR0 = %08X\tCR2 = %08X\tCR3 = %08X\n", + State->ControlRegisters[FAST486_REG_CR0], + State->ControlRegisters[FAST486_REG_CR2], + State->ControlRegisters[FAST486_REG_CR3]); + DbgPrint("\nDebug Registers:\n" + "DR0 = %08X\tDR1 = %08X\tDR2 = %08X\n" + "DR3 = %08X\tDR4 = %08X\tDR5 = %08X\n", + State->DebugRegisters[FAST486_REG_DR0], + State->DebugRegisters[FAST486_REG_DR1], + State->DebugRegisters[FAST486_REG_DR2], + State->DebugRegisters[FAST486_REG_DR3], + State->DebugRegisters[FAST486_REG_DR4], + State->DebugRegisters[FAST486_REG_DR5]); + DbgPrint("\n<-- Fast486DumpState\n\n"); } VOID

1 0

[ekohl] 64364: [SERVICES] Log service start, control and status change events.
by ekohl＠svn.reactos.org 28 Sep '14

28 Sep '14

Author: ekohl Date: Sun Sep 28 14:10:16 2014 New Revision: 64364 URL: http://svn.reactos.org/svn/reactos?rev=64364&view=rev Log: [SERVICES] Log service start, control and status change events. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Sep 28 14:10:16 2014 @@ -1456,6 +1456,19 @@ return dwError; } } + else + { + if (dwProcessId != Service->lpImage->dwProcessId) + { +/* + LPWSTR Strings[3] + + ScmLogError(EVENT_SERVICE_DIFFERENT_PID_CONNECTED, + 3, + lpStrings); +*/ + } + } DPRINT("ScmWaitForServiceConnect() done\n"); @@ -1578,7 +1591,7 @@ { PSERVICE_GROUP Group = Service->lpGroup; DWORD dwError = ERROR_SUCCESS; - LPCWSTR ErrorLogStrings[2]; + LPCWSTR lpErrorStrings[2]; WCHAR szErrorBuffer[32]; DPRINT("ScmLoadService() called\n"); @@ -1633,6 +1646,14 @@ { Group->ServicesRunning = TRUE; } + + /* Log a successful service start */ + lpErrorStrings[0] = Service->lpDisplayName; + lpErrorStrings[1] = L"start"; + ScmLogEvent(EVENT_SERVICE_CONTROL_SUCCESS, + EVENTLOG_INFORMATION_TYPE, + 2, + lpErrorStrings); } else { @@ -1640,11 +1661,12 @@ { /* Log a failed service start */ swprintf(szErrorBuffer, L"%lu", dwError); - ErrorLogStrings[0] = Service->lpServiceName; - ErrorLogStrings[1] = szErrorBuffer; - ScmLogError(EVENT_SERVICE_START_FAILED, + lpErrorStrings[0] = Service->lpServiceName; + lpErrorStrings[1] = szErrorBuffer; + ScmLogEvent(EVENT_SERVICE_START_FAILED, + EVENTLOG_ERROR_TYPE, 2, - ErrorLogStrings); + lpErrorStrings); } #if 0 Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Sep 28 14:10:16 2014 @@ -1085,6 +1085,7 @@ DWORD dwControlsAccepted; DWORD dwCurrentState; HKEY hServicesKey = NULL; + LPCWSTR lpErrorStrings[2]; DPRINT("RControlService() called\n"); @@ -1240,6 +1241,39 @@ RtlCopyMemory(lpServiceStatus, &lpService->Status, sizeof(SERVICE_STATUS)); + } + + if (dwError == ERROR_SUCCESS) + { + if (dwControl != SERVICE_CONTROL_INTERROGATE) + { + /* Log a sucessful send control */ + lpErrorStrings[0] = lpService->lpDisplayName; + + switch(dwControl) + { + case SERVICE_CONTROL_STOP: + lpErrorStrings[1] = L"stop"; + break; + + case SERVICE_CONTROL_PAUSE: + lpErrorStrings[1] = L"pause"; + break; + + case SERVICE_CONTROL_CONTINUE: + lpErrorStrings[1] = L"continue"; + break; + + default: + lpErrorStrings[1] = L"other"; + break; + } + + ScmLogEvent(EVENT_SERVICE_CONTROL_SUCCESS, + EVENTLOG_INFORMATION_TYPE, + 2, + lpErrorStrings); + } } return dwError; @@ -1691,20 +1725,47 @@ /* Unlock the service database */ ScmUnlockDatabase(); - /* Log a failed service stop */ if ((lpServiceStatus->dwCurrentState == SERVICE_STOPPED) && - (dwPreviousState != SERVICE_STOPPED)) - { - if (lpServiceStatus->dwWin32ExitCode != ERROR_SUCCESS) - { - swprintf(szErrorBuffer, L"%lu", lpServiceStatus->dwWin32ExitCode); - lpErrorStrings[0] = lpService->lpDisplayName; - lpErrorStrings[1] = szErrorBuffer; - - ScmLogError(EVENT_SERVICE_EXIT_FAILED, - 2, - lpErrorStrings); - } + (dwPreviousState != SERVICE_STOPPED) && + (lpServiceStatus->dwWin32ExitCode != ERROR_SUCCESS)) + { + /* Log a failed service stop */ + swprintf(szErrorBuffer, L"%lu", lpServiceStatus->dwWin32ExitCode); + lpErrorStrings[0] = lpService->lpDisplayName; + lpErrorStrings[1] = szErrorBuffer; + + ScmLogEvent(EVENT_SERVICE_EXIT_FAILED, + EVENTLOG_ERROR_TYPE, + 2, + lpErrorStrings); + } + else if (lpServiceStatus->dwCurrentState != dwPreviousState && + (lpServiceStatus->dwCurrentState == SERVICE_STOPPED || + lpServiceStatus->dwCurrentState == SERVICE_RUNNING || + lpServiceStatus->dwCurrentState == SERVICE_PAUSED)) + { + /* Log a successful service status change */ + lpErrorStrings[0] = lpService->lpDisplayName; + + switch(lpServiceStatus->dwCurrentState) + { + case SERVICE_STOPPED: + lpErrorStrings[1] = L"stopped"; + break; + + case SERVICE_RUNNING: + lpErrorStrings[1] = L"running"; + break; + + case SERVICE_PAUSED: + lpErrorStrings[1] = L"paused"; + break; + } + + ScmLogEvent(EVENT_SERVICE_STATUS_SUCCESS, + EVENTLOG_INFORMATION_TYPE, + 2, + lpErrorStrings); } DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState); Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Sun Sep 28 14:10:16 2014 @@ -53,7 +53,8 @@ VOID -ScmLogError(DWORD dwEventId, +ScmLogEvent(DWORD dwEventId, + WORD wType, WORD wStrings, LPCWSTR *lpStrings) { @@ -68,10 +69,10 @@ } if (!ReportEventW(hLog, - EVENTLOG_ERROR_TYPE, + wType, 0, dwEventId, - NULL, // Sid, + NULL, wStrings, 0, lpStrings, Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Sep 28 14:10:16 2014 @@ -175,6 +175,7 @@ /* lock.c */ + DWORD ScmAcquireServiceStartLock(IN BOOL IsServiceController, OUT LPSC_RPC_LOCK lpLock); DWORD ScmReleaseServiceStartLock(IN OUT LPSC_RPC_LOCK lpLock); @@ -190,7 +191,8 @@ /* services.c */ VOID PrintString(LPCSTR fmt, ...); -VOID ScmLogError(DWORD dwEventId, +VOID ScmLogEvent(DWORD dwEventId, + WORD wType, WORD wStrings, LPCWSTR *lpStrings); VOID ScmWaitForLsa(VOID);

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