Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[pschweitzer] 60601: [PSAPI_APITEST] Add tests for GetDeviceDriverBaseName Replace 0x00000000 -> NULL. Dedicated to Thomas ; -)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Oct 10 19:18:43 2013 New Revision: 60601 URL: http://svn.reactos.org/svn/reactos?rev=60601&view=rev Log: [PSAPI_APITEST] Add tests for GetDeviceDriverBaseName Replace 0x00000000 -> NULL. Dedicated to Thomas ;-) Modified: trunk/rostests/apitests/psapi/psapi.c trunk/rostests/apitests/psapi/testlist.c Modified: trunk/rostests/apitests/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/psapi/psapi.c?re… ============================================================================== --- trunk/rostests/apitests/psapi/psapi.c [iso-8859-1] (original) +++ trunk/rostests/apitests/psapi/psapi.c [iso-8859-1] Thu Oct 10 19:18:43 2013 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Test for GetDeviceDriverFileName + * PURPOSE: Test for GetDeviceDriverFileName & GetDeviceDriverBaseName * PROGRAMMER: Pierre Schweitzer */ @@ -25,14 +25,14 @@ Snap = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, 0); if (Snap == INVALID_HANDLE_VALUE) { - return (LPVOID)0x00000000; + return NULL; } Module.dwSize = sizeof(MODULEENTRY32); if(!Module32First(Snap, &Module)) { CloseHandle(Snap); - return (LPVOID)0x00000000; + return NULL; } do @@ -45,10 +45,10 @@ } while(Module32Next(Snap, &Module)); CloseHandle(Snap); - return (LPVOID)0x00000000; -} - -static BOOLEAN IntGetModuleInformation(LPCSTR Module, BOOLEAN IsDriver, BOOLEAN IsProcMod, TEST_MODULE_INFO * Info) + return NULL; +} + +static BOOLEAN IntGetModuleInformation(LPCSTR Module, BOOLEAN IsDriver, BOOLEAN IsProcMod, BOOLEAN BaseName, TEST_MODULE_INFO * Info) { CHAR System[255]; UINT Len; @@ -85,9 +85,17 @@ return FALSE; } - /* Skip disk */ - strcpy(Info->Path, System + 2); - Info->Len = strlen(Info->Path); + if (BaseName) + { + strcpy(Info->Path, Module); + Info->Len = strlen(Info->Path); + } + else + { + /* Skip disk */ + strcpy(Info->Path, System + 2); + Info->Len = strlen(Info->Path); + } return TRUE; } @@ -103,7 +111,7 @@ ok(Len == 0, "Len: %lu\n", Len); ok(GetLastError() == ERROR_INVALID_HANDLE, "Error: %lx\n", GetLastError()); - if (IntGetModuleInformation("ntdll.dll", FALSE, TRUE, &ModInfo)) + if (IntGetModuleInformation("ntdll.dll", FALSE, TRUE, FALSE, &ModInfo)) { SetLastError(0xDEADBEEF); Len = GetDeviceDriverFileNameA(ModInfo.ImageBase, FileName, 255); @@ -126,7 +134,7 @@ skip("Couldn't find info about ntdll.dll\n"); } - if (IntGetModuleInformation("msvcrt.dll", FALSE, TRUE, &ModInfo)) + if (IntGetModuleInformation("msvcrt.dll", FALSE, TRUE, FALSE, &ModInfo)) { SetLastError(0xDEADBEEF); Len = GetDeviceDriverFileNameA(ModInfo.ImageBase, FileName, 255); @@ -138,7 +146,7 @@ skip("Couldn't find info about msvcrt.dll\n"); } - if (IntGetModuleInformation("psapi.dll", FALSE, TRUE, &ModInfo)) + if (IntGetModuleInformation("psapi.dll", FALSE, TRUE, FALSE, &ModInfo)) { SetLastError(0xDEADBEEF); Len = GetDeviceDriverFileNameA(ModInfo.ImageBase, FileName, 255); @@ -150,3 +158,62 @@ skip("Couldn't find info about psapi.dll\n"); } } + +START_TEST(GetDeviceDriverBaseName) +{ + DWORD Len; + CHAR FileName[255]; + TEST_MODULE_INFO ModInfo; + + SetLastError(0xDEADBEEF); + Len = GetDeviceDriverBaseNameA(0, FileName, 255); + ok(Len == 0, "Len: %lu\n", Len); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Error: %lx\n", GetLastError()); + + if (IntGetModuleInformation("ntdll.dll", FALSE, TRUE, TRUE, &ModInfo)) + { + SetLastError(0xDEADBEEF); + Len = GetDeviceDriverBaseNameA(ModInfo.ImageBase, FileName, 255); + ok(Len == ModInfo.Len, "Len: %lu\n", Len); + ok(GetLastError() == 0xDEADBEEF, "Error: %lx\n", GetLastError()); + ok(lstrcmpiA(ModInfo.Path, FileName) == 0, "File name: %s\n", FileName); + + /* Test with too small buffer */ + SetLastError(0xDEADBEEF); + ModInfo.Len--; + ModInfo.Path[ModInfo.Len] = 0; + FileName[ModInfo.Len] = 0; + Len = GetDeviceDriverBaseNameA(ModInfo.ImageBase, FileName, ModInfo.Len); + ok(Len == ModInfo.Len, "Len: %lu\n", Len); + ok(GetLastError() == 0xDEADBEEF, "Error: %lx\n", GetLastError()); + ok(lstrcmpiA(ModInfo.Path, FileName) == 0, "File name: %s\n", FileName); + } + else + { + skip("Couldn't find info about ntdll.dll\n"); + } + + if (IntGetModuleInformation("msvcrt.dll", FALSE, TRUE, TRUE, &ModInfo)) + { + SetLastError(0xDEADBEEF); + Len = GetDeviceDriverBaseNameA(ModInfo.ImageBase, FileName, 255); + ok(Len == 0, "Len: %lu\n", Len); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Error: %lx\n", GetLastError()); + } + else + { + skip("Couldn't find info about msvcrt.dll\n"); + } + + if (IntGetModuleInformation("psapi.dll", FALSE, TRUE, TRUE, &ModInfo)) + { + SetLastError(0xDEADBEEF); + Len = GetDeviceDriverBaseNameA(ModInfo.ImageBase, FileName, 255); + ok(Len == 0, "Len: %lu\n", Len); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Error: %lx\n", GetLastError()); + } + else + { + skip("Couldn't find info about psapi.dll\n"); + } +} Modified: trunk/rostests/apitests/psapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/psapi/testlist.c… ============================================================================== --- trunk/rostests/apitests/psapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/psapi/testlist.c [iso-8859-1] Thu Oct 10 19:18:43 2013 @@ -4,10 +4,12 @@ #include <wine/test.h> extern void func_GetDeviceDriverFileName(void); +extern void func_GetDeviceDriverBaseName(void); const struct test winetest_testlist[] = { { "GetDeviceDriverFileName", func_GetDeviceDriverFileName }, + { "GetDeviceDriverBaseName", func_GetDeviceDriverBaseName }, { 0, 0 } };

11 years, 2 months

[aandrejevic] 60600: [SOFT386] Implement the REP prefix for the INS instruction.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Oct 10 19:01:41 2013 New Revision: 60600 URL: http://svn.reactos.org/svn/reactos?rev=60600&view=rev Log: [SOFT386] Implement the REP prefix for the INS instruction. Modified: branches/ntvdm/lib/soft386/common.h branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.h [iso-8859-1] Thu Oct 10 19:01:41 2013 @@ -33,6 +33,9 @@ #define SIGN_FLAG_LONG 0x80000000 #define REAL_MODE_FLAGS_MASK 0x17FD5 #define PROT_MODE_FLAGS_MASK 0x10DD5 + +/* Block size for string operations */ +#define STRING_BLOCK_SIZE 4096 #define GET_SEGMENT_RPL(s) ((s) & 3) #define GET_SEGMENT_INDEX(s) ((s) & 0xFFF8) Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Oct 10 19:01:41 2013 @@ -6311,7 +6311,6 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeIns) { - ULONG Data = 0; ULONG DataSize; BOOLEAN OperandSize, AddressSize; @@ -6330,48 +6329,114 @@ { /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; - } - - if ((State->PrefixFlags & SOFT386_PREFIX_REP) - || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) - { - // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! - Soft386Exception(State, SOFT386_EXCEPTION_UD); - return FALSE; } /* Calculate the size */ if (Opcode == 0x6C) DataSize = sizeof(UCHAR); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); - /* Read from the I/O port */ - State->IoReadCallback(State, - State->GeneralRegs[SOFT386_REG_EDX].LowWord, - &Data, - DataSize); - - /* Write to the destination operand */ - if (!Soft386WriteMemory(State, - SOFT386_REG_ES, - AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long - : State->GeneralRegs[SOFT386_REG_EDI].LowWord, - &Data, - DataSize)) - { - /* Exception occurred */ - return FALSE; - } - - /* Increment/decrement EDI */ - if (OperandSize) - { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; - else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + if (State->PrefixFlags & SOFT386_PREFIX_REP) + { + UCHAR Block[STRING_BLOCK_SIZE]; + ULONG Count = OperandSize ? State->GeneralRegs[SOFT386_REG_ECX].Long + : State->GeneralRegs[SOFT386_REG_ECX].LowWord; + + /* Transfer until finished */ + while (Count) + { + ULONG Processed = min(Count, STRING_BLOCK_SIZE / DataSize); + + /* Read from the I/O port */ + State->IoReadCallback(State, + State->GeneralRegs[SOFT386_REG_EDX].LowWord, + Block, + Processed * DataSize); + + if (State->Flags.Df) + { + ULONG i, j; + + /* Reduce EDI by the number of bytes to transfer */ + if (AddressSize) State->GeneralRegs[SOFT386_REG_EDI].Long -= Processed * DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= Processed * DataSize; + + /* Reverse the block data */ + for (i = 0; i < Processed / 2; i++) + { + /* Swap the values */ + for (j = 0; j < DataSize; j++) + { + UCHAR Temp = Block[i * DataSize + j]; + Block[i * DataSize + j] = Block[(Processed - i - 1) * DataSize + j]; + Block[(Processed - i - 1) * DataSize + j] = Temp; + } + } + } + + /* Write to memory */ + if (!Soft386WriteMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + Block, + Processed * DataSize)) + { + /* Set ECX */ + if (OperandSize) State->GeneralRegs[SOFT386_REG_ECX].Long = Count; + else State->GeneralRegs[SOFT386_REG_ECX].LowWord = LOWORD(Count); + + /* Exception occurred */ + return FALSE; + } + + if (!State->Flags.Df) + { + /* Increase EDI by the number of bytes transfered */ + if (AddressSize) State->GeneralRegs[SOFT386_REG_EDI].Long += Processed * DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord += Processed * DataSize; + } + + /* Reduce the total count by the number processed in this run */ + Count -= Processed; + } + + /* Clear ECX */ + if (OperandSize) State->GeneralRegs[SOFT386_REG_ECX].Long = 0; + else State->GeneralRegs[SOFT386_REG_ECX].LowWord = 0; } else { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; - else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + ULONG Data = 0; + + /* Read from the I/O port */ + State->IoReadCallback(State, + State->GeneralRegs[SOFT386_REG_EDX].LowWord, + &Data, + DataSize); + + /* Write to the destination operand */ + if (!Soft386WriteMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + &Data, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Increment/decrement EDI */ + if (OperandSize) + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } + else + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } } /* Return success */

11 years, 2 months

[jimtabor] 60599: [Win32k] - Fix applications exit before the release of class atoms.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Oct 10 12:40:30 2013 New Revision: 60599 URL: http://svn.reactos.org/svn/reactos?rev=60599&view=rev Log: [Win32k] - Fix applications exit before the release of class atoms. Modified: trunk/reactos/win32ss/user/ntuser/class.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Thu Oct 10 12:40:30 2013 @@ -8,6 +8,9 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserClass); + +BOOL FASTCALL IntClassDestroyIcon(HANDLE hCurIcon); +static NTSTATUS IntDeregisterClassAtom(IN RTL_ATOM Atom); REGISTER_SYSCLASS DefaultServerClasses[] = { @@ -227,6 +230,13 @@ CallProc = NextCallProc; } + // Fixes running the static test then run class test issue. + // Some applications do not use UnregisterClass before exiting. + // Keep from reusing the same atom with case insensitive + // comparisons, remove registration of the atom if not zeroed. + if (Class->atomClassName) + IntDeregisterClassAtom(Class->atomClassName); + if (Class->pdce) { DceFreeClassDCE(((PDCE)Class->pdce)->hDC); @@ -235,6 +245,9 @@ IntFreeClassMenuName(Class); } + + if (Class->hIconSmIntern) + IntClassDestroyIcon(Class->hIconSmIntern); pDesk = Class->rpdeskParent; Class->rpdeskParent = NULL; @@ -1481,6 +1494,7 @@ { TRACE("Class 0x%p\n", Class); TRACE("UserUnregisterClass: Good Exit!\n"); + Class->atomClassName = 0; // Don't let it linger... /* Finally free the resources */ IntDestroyClass(Class); return TRUE;

11 years, 2 months

[gadamopoulos] 60598: - fix build for linux

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Oct 10 09:44:57 2013 New Revision: 60598 URL: http://svn.reactos.org/svn/reactos?rev=60598&view=rev Log: - fix build for linux Modified: trunk/rostests/apitests/shell32/shelltest.h Modified: trunk/rostests/apitests/shell32/shelltest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/shelltes… ============================================================================== --- trunk/rostests/apitests/shell32/shelltest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/shelltest.h [iso-8859-1] Thu Oct 10 09:44:57 2013 @@ -9,7 +9,7 @@ #include <winuser.h> #include <winreg.h> -#include <CommCtrl.h> +#include <commctrl.h> #include <shellapi.h> #include <shlobj.h> #include <shlwapi.h>

11 years, 2 months

[gadamopoulos] 60597: fix build

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Oct 10 09:39:15 2013 New Revision: 60597 URL: http://svn.reactos.org/svn/reactos?rev=60597&view=rev Log: fix build Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Thu Oct 10 09:39:15 2013 @@ -13,7 +13,8 @@ add_subdirectory(msvcrt) add_subdirectory(ntdll) add_subdirectory(powrprof) -add_subdirectory(shell32)add_subdirectory(psapi) +add_subdirectory(shell32) +add_subdirectory(psapi) add_subdirectory(user32) if((NOT MSVC) AND (ARCH STREQUAL "i386")) add_subdirectory(w32kdll)

11 years, 2 months

[gadamopoulos] 60596: [shell32_apitest] - Add tests for shell menu classes ( so far only CShellMenu is tested)

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Oct 10 09:36:13 2013 New Revision: 60596 URL: http://svn.reactos.org/svn/reactos?rev=60596&view=rev Log: [shell32_apitest] - Add tests for shell menu classes ( so far only CShellMenu is tested) Added: trunk/rostests/apitests/shell32/ trunk/rostests/apitests/shell32/CMakeLists.txt (with props) trunk/rostests/apitests/shell32/menu.cpp (with props) trunk/rostests/apitests/shell32/shelltest.h (with props) trunk/rostests/apitests/shell32/testlist.c (with props) Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Thu Oct 10 09:36:13 2013 @@ -13,7 +13,7 @@ add_subdirectory(msvcrt) add_subdirectory(ntdll) add_subdirectory(powrprof) -add_subdirectory(psapi) +add_subdirectory(shell32)add_subdirectory(psapi) add_subdirectory(user32) if((NOT MSVC) AND (ARCH STREQUAL "i386")) add_subdirectory(w32kdll) Added: trunk/rostests/apitests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeLis… ============================================================================== --- trunk/rostests/apitests/shell32/CMakeLists.txt (added) +++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Thu Oct 10 09:36:13 2013 @@ -0,0 +1,12 @@ + +set_cpp(WITH_RUNTIME) + +list(APPEND SOURCE + menu.cpp + testlist.c) + +add_executable(shell32_apitest ${SOURCE}) +target_link_libraries(shell32_apitest wine uuid) +set_module_type(shell32_apitest win32cui) +add_importlibs(shell32_apitest msvcrt kernel32 user32 gdi32 shell32 ole32 shlwapi) +add_cd_file(TARGET shell32_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/shell32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/shell32/menu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/menu.cpp… ============================================================================== --- trunk/rostests/apitests/shell32/menu.cpp (added) +++ trunk/rostests/apitests/shell32/menu.cpp [iso-8859-1] Thu Oct 10 09:36:13 2013 @@ -0,0 +1,418 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for shell menu objects + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include "shelltest.h" + +BOOL CheckWindowClass(HWND hwnd, PCWSTR className) +{ + ULONG size = (wcslen(className) + 1)* sizeof(WCHAR); + PWCHAR buffer = (PWCHAR)malloc(size); + if (GetClassNameW(hwnd, buffer, size ) == 0) return FALSE; + int res = wcscmp(buffer, className); + free(buffer); + return res == 0; +} + +class CDummyWindow : public CUnknownBase<IOleWindow> +{ +protected: + HWND m_hwnd; + + const QITAB* GetQITab() + { + static const QITAB tab[] = {{ &IID_IOleWindow, OFFSETOFCLASS(IOleWindow, CDummyWindow) }, {0}}; + return tab; + } + +public: + CDummyWindow(HWND hwnd) + { + m_hwnd = hwnd; + } + + HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd) + { + *phwnd = m_hwnd; + return S_OK; + } + + HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode) + { + return S_OK; + } +}; + +BOOL CreateCShellMenu(IShellMenu** shellMenu, IDockingWindow** dockingMenu, IObjectWithSite **menuWithSite) +{ + HRESULT hResult; + hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, IID_IShellMenu, reinterpret_cast<void **>(shellMenu)); + test_S_OK(hResult, "Failed to instantiate CLSID_MenuBand"); + if (!shellMenu) return FALSE; + + hResult = (*shellMenu)->QueryInterface(IID_IDockingWindow, reinterpret_cast<void **>(dockingMenu)); + test_S_OK(hResult, "Failed to query IID_IDockingWindow"); + hResult = (*shellMenu)->QueryInterface(IID_IObjectWithSite, reinterpret_cast<void **>(menuWithSite)); + test_S_OK(hResult, "Failed to query IID_IObjectWithSite"); + if (!dockingMenu || !menuWithSite) return FALSE; + return TRUE; +} + + +void test_CShellMenu_params() +{ + HRESULT hResult; + IShellMenu* shellMenu; + IDockingWindow* dockingMenu; + IObjectWithSite* menuWithSite; + + IShellMenuCallback *psmc; + UINT uId; + UINT uIdAncestor; + DWORD dwFlags; + HWND hwndToolbar; + HMENU hmenu; + HWND hwndOwner; + DWORD menuFlagss; + IShellFolder *shellFolder; + + if (!CreateCShellMenu(&shellMenu, &dockingMenu, &menuWithSite)) + { + skip("failed to create CShellMenuObject\n"); + return; + } + + hResult = shellMenu->Initialize(NULL, 11, 22, 0xdeadbeef); + test_S_OK(hResult, "Initialize failed"); + + hResult = shellMenu->GetMenuInfo(&psmc, &uId, &uIdAncestor, &dwFlags); + test_S_OK(hResult, "GetMenuInfo failed"); + ok (psmc == NULL, "wrong psmc\n"); + ok (uId == 11, "wrong uid\n"); + ok (uIdAncestor == 22, "wrong uIdAncestor\n"); + ok (dwFlags == 0xdeadbeef, "wrong dwFlags\n"); + + hResult = shellMenu->Initialize(NULL, 0, ANCESTORDEFAULT, SMINIT_TOPLEVEL|SMINIT_VERTICAL); + test_S_OK(hResult, "Initialize failed"); + + hResult = dockingMenu->GetWindow(&hwndToolbar); + test_HRES(hResult, E_FAIL, "GetWindow should fail"); + + hResult = shellMenu->GetMenu(&hmenu, &hwndOwner, &menuFlagss); + test_HRES(hResult, E_FAIL, "GetMenu should fail"); + + hmenu = CreatePopupMenu(); + hResult = shellMenu->SetMenu(hmenu, NULL, 0); + test_S_OK(hResult, "SetMenu failed"); + + hwndToolbar = (HWND)0xdeadbeef; + hResult = dockingMenu->GetWindow(&hwndToolbar); + test_S_OK(hResult, "GetWindow failed"); + ok (hwndToolbar == NULL, "Expected NULL window\n"); + + hResult = shellMenu->SetMenu(NULL, NULL, 0); + test_S_OK(hResult, "SetMenu failed"); + + hResult = shellMenu->GetMenu(&hmenu, &hwndOwner, &menuFlagss); + test_S_OK(hResult, "GetMenu failed"); + ok (hmenu == NULL, "Got a menu\n"); + + hResult = dockingMenu->GetWindow(&hwndToolbar); + test_S_OK(hResult, "GetWindow failed"); + + hResult = SHGetDesktopFolder(&shellFolder); + test_S_OK(hResult, "SHGetDesktopFolder failed"); + + hResult = shellMenu->SetShellFolder(shellFolder, NULL, 0, 0); + test_S_OK(hResult, "SetShellFolder failed"); + + hResult = shellMenu->SetShellFolder(NULL, NULL, 0, 0); + test_HRES(hResult, E_INVALIDARG, "SetShellFolder should fail"); + + hwndToolbar = (HWND)0xdeadbeef; + hResult = dockingMenu->GetWindow(&hwndToolbar); + test_S_OK(hResult, "GetWindow failed"); + ok (hwndToolbar == NULL, "Expected NULL window\n"); + + hResult = dockingMenu->ShowDW(TRUE); + test_HRES(hResult, S_FALSE, "ShowDW should fail"); + + menuWithSite->Release(); + dockingMenu->Release(); + shellMenu->Release(); +} + +void test_CShellMenu() +{ + HRESULT hResult; + IShellMenu* shellMenu; + IDockingWindow* dockingMenu; + IShellFolder *shellFolder; + IObjectWithSite *menuWithSite; + HWND hwndToolbar; + + HWND hWndParent = CreateWindowExW(0, L"EDIT", L"miau", 0, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandle(NULL), NULL); + CDummyWindow* dummyWindow = new CDummyWindow(hWndParent); + + if (!CreateCShellMenu(&shellMenu, &dockingMenu, &menuWithSite)) + { + skip("failed to create CShellMenuObject\n"); + return; + } + + hResult = SHGetDesktopFolder(&shellFolder); + test_S_OK(hResult, "SHGetDesktopFolder failed"); + + hResult = shellMenu->Initialize(NULL, 0, ANCESTORDEFAULT, SMINIT_TOPLEVEL|SMINIT_VERTICAL); + test_S_OK(hResult, "Initialize failed"); + + hResult = shellMenu->SetShellFolder(shellFolder, NULL, NULL, 0); + test_S_OK(hResult, "SetShellFolder failed"); + + hResult = menuWithSite->SetSite(dummyWindow); + test_S_OK(hResult, "SetSite failed"); + + hResult = dockingMenu->GetWindow(&hwndToolbar); + test_S_OK(hResult, "GetWindow failed"); + ok(hwndToolbar != NULL, "GetWindow should return a window\n"); + + HWND hwndRealParent = GetParent(hwndToolbar); + ok(GetParent(hwndRealParent) == hWndParent, "Wrong parent\n"); + ok(CheckWindowClass(hwndToolbar, L"ToolbarWindow32"), "Wrong class\n"); + ok(CheckWindowClass(hwndRealParent, L"SysPager"), "Wrong class\n"); + + menuWithSite->Release(); + dockingMenu->Release(); + shellMenu->Release(); + ok(!IsWindow(hwndToolbar), "The toolbar window should not exist\n"); + + DestroyWindow(hWndParent); +} + +/* The folowing struct holds info about the order callbacks are called */ +/* By passing different arrays of results to CMenuCallback, we can test different sequenses of callbacks */ + struct _test_info{ + int iTest; + UINT uMsg;}; + +class CMenuCallback : public CUnknownBase<IShellMenuCallback> +{ +protected: + int m_iTest; + int m_iCallback; + struct _test_info *m_results; + int m_testsCount; + + const QITAB* GetQITab() + { + static const QITAB tab[] = {{ &IID_IShellMenuCallback, OFFSETOFCLASS(IShellMenuCallback, CMenuCallback) }, {0}}; + return tab; + } + +public: + CMenuCallback(struct _test_info *testResults, int testsCount) + { + m_iTest = 0; + m_iCallback = 0; + m_results = testResults; + m_testsCount = testsCount; + } + + void SetTest(int i) + { + m_iTest = i; + } + + HRESULT STDMETHODCALLTYPE CallbackSM(LPSMDATA psmd, UINT uMsg, WPARAM wParam, LPARAM lParam) + { + /*trace ("callback type %d\n", uMsg);*/ + + /* + * it seems callback 0x10000000 is called for every item added so + * we will ignore consecutive callbacks of this type + * Note: this callback is invoked by shell32.dll!CMenuSFToolbar::_FilterPidl + */ + if (uMsg == 0x10000000 && m_results[m_iCallback-1].uMsg == 0x10000000) + { + return S_OK; + } + + m_iCallback++; + if (m_iCallback > m_testsCount) + { + ok(0, "Got more callbacks than expected! (%d not %d). uMsg: %d\n", m_iCallback, m_testsCount, uMsg); + return S_OK; + } + + struct _test_info *result = &m_results[m_iCallback-1]; + + ok(psmd != S_OK, "Got NULL psmd\n"); + ok(m_iTest == result->iTest, "Wrong test number (%d not %d)\n", m_iTest, result->iTest); + ok(result->uMsg == uMsg, "%d: Got wrong uMsg (%d instead of %d)\n", m_iCallback, uMsg, result->uMsg); + + if(uMsg == SMC_CREATE) + { + ok(psmd->dwFlags == 0, "wrong dwFlags\n"); + ok(psmd->dwMask == 0, "wrong dwMask\n"); + ok(psmd->hmenu == 0, "wrong hmenu\n"); + ok(psmd->hwnd == 0, "wrong hwnd\n"); + ok(psmd->punk != NULL, "punk is null\n"); + } + + if (uMsg == SMC_GETSFOBJECT) + { + ok(psmd->psf != 0, "wrong dwFlags\n"); + } + + return S_FALSE; + } +}; + +void test_CShellMenu_callbacks(IShellFolder *shellFolder, HMENU hmenu) +{ + HRESULT hResult; + IShellMenu* shellMenu; + IDockingWindow* dockingMenu; + IObjectWithSite *menuWithSite; + CMenuCallback *callback; + + HWND hWndParent = CreateWindowExW(0, L"EDIT", L"miau", 0, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandle(NULL), NULL); + CDummyWindow* dummyWindow = new CDummyWindow(hWndParent); + ShowWindow(hWndParent, SW_SHOW); + + if (!CreateCShellMenu(&shellMenu, &dockingMenu, &menuWithSite)) + { + skip("failed to create CShellMenuObject\n"); + return; + } + + struct _test_info cbtest_info[] = { {1, SMC_CREATE}, + {2, SMC_GETSFOBJECT}, + {3, 0x31}, + {4, SMC_INITMENU}, + {4, 53}, + {4, 19}, + {4, 0x10000000}, + {4, SMC_NEWITEM}, + {4, 20}, + {4, 19}, + {4, 6}, + {4, 20}, + {4, 8}, + {4, 24}, + {4, 5}, + {4, 5}, + {4, 5}}; + + callback = new CMenuCallback(cbtest_info,18); + + callback->SetTest(1); + hResult = shellMenu->Initialize(callback, 0,ANCESTORDEFAULT, SMINIT_TOPLEVEL|SMINIT_VERTICAL); + test_S_OK(hResult, "Initialize failed"); + + callback->SetTest(2); + hResult = shellMenu->SetShellFolder(shellFolder, NULL, NULL, 0); + test_S_OK(hResult, "SetShellFolder failed"); + + callback->SetTest(3); + hResult = shellMenu->SetMenu(hmenu, hWndParent, SMSET_TOP); + test_S_OK(hResult, "SetMenu failed"); + + hResult = menuWithSite->SetSite(dummyWindow); + test_S_OK(hResult, "SetSite failed"); + + callback->SetTest(4); + hResult = dockingMenu->ShowDW(TRUE); + test_HRES(hResult, S_FALSE, "ShowDW failed"); +} + +void test_CShellMenu_with_DeskBar(IShellFolder *shellFolder, HMENU hmenu) +{ + HRESULT hResult; + IShellMenu* shellMenu; + IDockingWindow* dockingMenu; + IObjectWithSite *menuWithSite; + IMenuPopup* menuPopup; + IBandSite* bandSite; + + /* Create the tree objects and query the nescesary interfaces */ + BOOL bCreated = CreateCShellMenu(&shellMenu, &dockingMenu, &menuWithSite); + hResult = CoCreateInstance(CLSID_MenuDeskBar, NULL, CLSCTX_INPROC_SERVER, IID_IMenuPopup, reinterpret_cast<void **>(&menuPopup)); + test_S_OK(hResult, "Failed to instantiate CLSID_MenuDeskBar"); + hResult = CoCreateInstance(CLSID_MenuBandSite, NULL, CLSCTX_INPROC_SERVER, IID_IBandSite, reinterpret_cast<void **>(&bandSite)); + test_S_OK(hResult, "Failed to instantiate CLSID_MenuBandSite"); + if (!bCreated || !menuPopup || !bandSite) + { + skip("failed to create MenuBandSite object\n"); + return; + } + + /* Create the popup menu */ + hResult = shellMenu->Initialize(NULL, 0, ANCESTORDEFAULT, SMINIT_TOPLEVEL|SMINIT_VERTICAL); + test_S_OK(hResult, "Initialize failed"); + hResult = shellMenu->SetMenu( hmenu, NULL, SMSET_TOP); + test_S_OK(hResult, "SetMenu failed"); + hResult = menuPopup->SetClient(bandSite); + test_S_OK(hResult, "SetClient failed"); + hResult = bandSite->AddBand(shellMenu); + test_S_OK(hResult, "AddBand failed"); + + /* Show the popum menu */ + POINTL p = {10,10}; + hResult = menuPopup->Popup(&p, NULL, 0); + test_HRES(hResult, S_FALSE, "Popup failed"); + + HWND hWndToolbar, hWndToplevel; + + /* Ensure that the created windows are correct */ + hResult = dockingMenu->GetWindow(&hWndToolbar); + test_S_OK(hResult, "GetWindow failed"); + ok(hWndToolbar != NULL, "GetWindow should return a window\n"); + + hResult = menuPopup->GetWindow(&hWndToplevel); + test_S_OK(hResult, "GetWindow failed"); + ok(hWndToolbar != NULL, "GetWindow should return a window\n"); + + HWND hwndRealParent = GetParent(hWndToolbar); + ok(GetParent(hwndRealParent) == hWndToplevel, "Wrong parent\n"); + ok(CheckWindowClass(hWndToolbar, L"ToolbarWindow32"), "Wrong class\n"); + ok(CheckWindowClass(hwndRealParent, L"MenuSite"), "Wrong class\n"); + ok(CheckWindowClass(hWndToplevel, L"BaseBar"), "Wrong class\n"); + + ok(GetAncestor (hWndToplevel, GA_PARENT) == GetDesktopWindow(), "Expected the BaseBar window to be top level\n"); +} + +START_TEST(menu) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + IShellFolder *shellFolder; + HRESULT hResult; + hResult = SHGetDesktopFolder(&shellFolder); + test_S_OK(hResult, "SHGetDesktopFolder failed"); + + HMENU hSubMenu = CreatePopupMenu(); + AppendMenuW(hSubMenu, 0,0, L"Submenu item1"); + AppendMenuW(hSubMenu, 0,0, L"Submenu item2"); + HMENU hmenu = CreatePopupMenu(); + AppendMenuW(hmenu, 0,0, L"test"); + AppendMenuW(hmenu, 0,1, L"test1"); + MENUITEMINFOW iteminfo = {0}; + iteminfo.cbSize = sizeof(iteminfo); + iteminfo.hSubMenu = hSubMenu; + iteminfo.fMask = MIIM_STRING | MIIM_SUBMENU; + iteminfo.dwTypeData = const_cast<LPWSTR>(L"submenu"); + iteminfo.cch = 7; + InsertMenuItemW(hmenu, 0, TRUE, &iteminfo); + + test_CShellMenu_params(); + test_CShellMenu(); + test_CShellMenu_callbacks(shellFolder, hmenu); + test_CShellMenu_with_DeskBar(shellFolder, hmenu); +} + Propchange: trunk/rostests/apitests/shell32/menu.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/shell32/shelltest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/shelltes… ============================================================================== --- trunk/rostests/apitests/shell32/shelltest.h (added) +++ trunk/rostests/apitests/shell32/shelltest.h [iso-8859-1] Thu Oct 10 09:36:13 2013 @@ -0,0 +1,65 @@ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <stdio.h> +#include <wine/test.h> + + +#include <winuser.h> +#include <winreg.h> + +#include <CommCtrl.h> +#include <shellapi.h> +#include <shlobj.h> +#include <shlwapi.h> + +#include <stdlib.h> +#include <malloc.h> +#include <memory.h> +#include <string.h> +#include <tchar.h> + +#include <initguid.h> + +#define test_S_OK(hres, message) ok(hres == S_OK, "%s (0x%lx instead of S_OK)\n",message, hResult); +#define test_HRES(hres, hresExpected, message) ok(hres == hresExpected, "%s (0x%lx instead of 0x%lx)\n",message, hResult,hresExpected); + +DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); +DEFINE_GUID(CLSID_MenuBandSite, 0xE13EF4E4, 0xD2F2, 0x11D0, 0x98, 0x16, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72); + +template<typename Interface> +class CUnknownBase : public Interface +{ + LONG m_lRef; +protected: + virtual const QITAB* GetQITab() = 0; +public: + + CUnknownBase() + { + m_lRef = 0; + } + + ULONG STDMETHODCALLTYPE AddRef () + { + return InterlockedIncrement( &m_lRef ); + } + + ULONG STDMETHODCALLTYPE Release() + { + long newref = InterlockedDecrement( &m_lRef ); + if (newref<=0) delete this; + return newref; + } + + HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppv) + { + HRESULT hresult = QISearch(this, GetQITab(), riid, ppv); + if(SUCCEEDED(hresult)) AddRef(); + return hresult; + } + + virtual ~CUnknownBase() {} +}; + Propchange: trunk/rostests/apitests/shell32/shelltest.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/testlist… ============================================================================== --- trunk/rostests/apitests/shell32/testlist.c (added) +++ trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] Thu Oct 10 09:36:13 2013 @@ -0,0 +1,13 @@ +#define __ROS_LONG64__ + +#define STANDALONE +#include <wine/test.h> + +extern void func_menu(void); + +const struct test winetest_testlist[] = +{ + { "menu", func_menu }, + + { 0, 0 } +}; Propchange: trunk/rostests/apitests/shell32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 2 months

[gadamopoulos] 60595: [shlwapi] - QISearch should be exported by ordinal just like win2003 - Add OFFSETOFCLASS macro

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Oct 10 09:19:45 2013 New Revision: 60595 URL: http://svn.reactos.org/svn/reactos?rev=60595&view=rev Log: [shlwapi] - QISearch should be exported by ordinal just like win2003 - Add OFFSETOFCLASS macro Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec trunk/reactos/include/psdk/shlwapi.h Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Thu Oct 10 09:19:45 2013 @@ -216,7 +216,7 @@ 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -ordinal SHUnicodeToAnsi(wstr ptr ptr) 218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr long) -219 stdcall QISearch(long long long long) +219 stdcall -noname QISearch(long long long long) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) 222 stdcall -noname SHGlobalCounterCreate(long) Modified: trunk/reactos/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] Thu Oct 10 09:19:45 2013 @@ -2038,6 +2038,9 @@ _In_ REFIID riid, _Outptr_ void **ppv); +#define OFFSETOFCLASS(base, derived) \ + ((DWORD)(DWORD_PTR)(static_cast<base*>((derived*)8))-8) + #include <poppack.h> #ifdef __cplusplus

11 years, 2 months

[hbelusca] 60594: Fix a comment.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Oct 10 01:20:07 2013 New Revision: 60594 URL: http://svn.reactos.org/svn/reactos?rev=60594&view=rev Log: Fix a comment. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Thu Oct 10 01:20:07 2013 @@ -2580,7 +2580,7 @@ * - If ScreenBuffer (== GuiData->ActiveBuffer) IS NOT the console * active screen buffer, then we can safely switch to it. * - If ScreenBuffer IS the console active screen buffer, we must release - * it BUT and that's all. + * it ONLY. */ if (ScreenBuffer != GuiData->Console->ActiveBuffer)

11 years, 2 months

[hbelusca] 60593: [CONSRV] - Macros renaming. - When switching active screen buffers, do it a bit more properly, i.e. announce it to the terminal emulator (aka. frontend) so that it will be able to...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Oct 10 01:16:02 2013 New Revision: 60593 URL: http://svn.reactos.org/svn/reactos?rev=60593&view=rev Log: [CONSRV] - Macros renaming. - When switching active screen buffers, do it a bit more properly, i.e. announce it to the terminal emulator (aka. frontend) so that it will be able to change the associated console palette, be able to support displaying multi screen buffers or displaying another screen buffer than the active one (for debugging purposes or whatever), etc... There are still some hacks and commented code, which whill be cleaned when I'll be sure that everything works and is not broken somewhere. Added: trunk/reactos/win32ss/user/winsrv/consrv/include/term.h - copied, changed from r60589, trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h Removed: trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c trunk/reactos/win32ss/user/winsrv/consrv/settings.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -11,7 +11,7 @@ #include "consrv.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "handle.h" #include "lineinput.h" @@ -128,6 +128,11 @@ CloseHandle(Console->InputBuffer.ActiveEvent); } +/* + * This function explicitely references Console->ActiveBuffer + * (and also makes use of keyboard functions...). + * It is possible that it will move into frontends... + */ VOID NTAPI ConDrvProcessKey(IN PCONSOLE Console, IN BOOLEAN Down, Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -12,7 +12,7 @@ #include "consrv.h" #include "console.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "conoutput.h" #include "handle.h" @@ -84,14 +84,12 @@ if (BufferType == CONSOLE_TEXTMODE_BUFFER) { - Status = TEXTMODE_BUFFER_Initialize(Buffer, - Console, + Status = TEXTMODE_BUFFER_Initialize(Buffer, Console, (PTEXTMODE_BUFFER_INFO)ScreenBufferInfo); } else if (BufferType == CONSOLE_GRAPHICS_BUFFER) { - Status = GRAPHICS_BUFFER_Initialize(Buffer, - Console, + Status = GRAPHICS_BUFFER_Initialize(Buffer, Console, (PGRAPHICS_BUFFER_INFO)ScreenBufferInfo); } else @@ -115,18 +113,33 @@ PCONSOLE Console = Buffer->Header.Console; PCONSOLE_SCREEN_BUFFER NewBuffer; + /* + * We should notify temporarily the frontend because we are susceptible + * to delete the screen buffer it is using (which may be different from + * the active screen buffer in some cases), and because, if it actually + * uses the active screen buffer, we are going to nullify its pointer to + * change it. + */ + TermReleaseScreenBuffer(Console, Buffer); + RemoveEntryList(&Buffer->ListEntry); if (Buffer == Console->ActiveBuffer) { /* Delete active buffer; switch to most recently created */ - Console->ActiveBuffer = NULL; if (!IsListEmpty(&Console->BufferList)) { NewBuffer = CONTAINING_RECORD(Console->BufferList.Flink, CONSOLE_SCREEN_BUFFER, ListEntry); + + /* Tie console to new buffer and signal the change to the frontend */ ConioSetActiveScreenBuffer(NewBuffer); } + else + { + Console->ActiveBuffer = NULL; + // InterlockedExchangePointer(&Console->ActiveBuffer, NULL); + } } CONSOLE_SCREEN_BUFFER_Destroy(Buffer); @@ -141,7 +154,7 @@ if (ActiveBuffer) { ConioInitRect(&Region, 0, 0, ActiveBuffer->ViewSize.Y - 1, ActiveBuffer->ViewSize.X - 1); - ConioDrawRegion(Console, &Region); + TermDrawRegion(Console, &Region); } } @@ -150,8 +163,8 @@ { PCONSOLE Console = Buffer->Header.Console; Console->ActiveBuffer = Buffer; - ConioResizeTerminal(Console); - // ConioDrawConsole(Console); + // InterlockedExchangePointer(&Console->ActiveBuffer, Buffer); + TermSetActiveScreenBuffer(Console); } NTSTATUS NTAPI @@ -172,7 +185,7 @@ ConioDeleteScreenBuffer(Console->ActiveBuffer); } - /* Tie console to new buffer */ + /* Tie console to new buffer and signal the change to the frontend */ ConioSetActiveScreenBuffer(Buffer); return STATUS_SUCCESS; @@ -198,7 +211,7 @@ ASSERT(Console == Buffer->Header.Console); /* If the output buffer is the current one, redraw the correct portion of the screen */ - if (Buffer == Console->ActiveBuffer) ConioDrawRegion(Console, Region); + if (Buffer == Console->ActiveBuffer) TermDrawRegion(Console, Region); return STATUS_SUCCESS; } @@ -255,7 +268,7 @@ Buffer->CursorInfo.dwSize = Size; Buffer->CursorInfo.bVisible = Visible; - Success = ConioSetCursorInfo(Console, (PCONSOLE_SCREEN_BUFFER)Buffer); + Success = TermSetCursorInfo(Console, (PCONSOLE_SCREEN_BUFFER)Buffer); } return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); @@ -286,7 +299,7 @@ // Buffer->CursorPosition.X = Position->X; // Buffer->CursorPosition.Y = Position->Y; if ( ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer) && - (!ConioSetScreenInfo(Console, (PCONSOLE_SCREEN_BUFFER)Buffer, OldCursorX, OldCursorY)) ) + (!TermSetScreenInfo(Console, (PCONSOLE_SCREEN_BUFFER)Buffer, OldCursorX, OldCursorY)) ) { return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -12,7 +12,7 @@ #include "consrv.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "handle.h" #include "procinit.h" #include "alias.h" @@ -1010,7 +1010,7 @@ RtlCopyMemory(Console->Title.Buffer, Title, Console->Title.Length); Console->Title.Buffer[Console->Title.Length / sizeof(WCHAR)] = L'\0'; - // ConioChangeTitle(Console); + // TermChangeTitle(Console); return STATUS_SUCCESS; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -64,6 +64,17 @@ static VOID NTAPI DummyResizeTerminal(IN OUT PFRONTEND This) +{ +} + +static VOID NTAPI +DummySetActiveScreenBuffer(IN OUT PFRONTEND This) +{ +} + +static VOID NTAPI +DummyReleaseScreenBuffer(IN OUT PFRONTEND This, + IN PCONSOLE_SCREEN_BUFFER ScreenBuffer) { } @@ -158,6 +169,8 @@ DummySetCursorInfo, DummySetScreenInfo, DummyResizeTerminal, + DummySetActiveScreenBuffer, + DummyReleaseScreenBuffer, DummyProcessKeyCallback, DummyRefreshInternalInfo, DummyChangeTitle, Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -13,7 +13,7 @@ #include "consrv.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "conoutput.h" #include "handle.h" Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -11,7 +11,7 @@ #include "consrv.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "conoutput.h" #include "handle.h" @@ -584,8 +584,8 @@ if (!ConioIsRectEmpty(&UpdateRect) && (PCONSOLE_SCREEN_BUFFER)Buff == Console->ActiveBuffer) { - ConioWriteStream(Console, &UpdateRect, CursorStartX, CursorStartY, - ScrolledLines, Buffer, Length); + TermWriteStream(Console, &UpdateRect, CursorStartX, CursorStartY, + ScrolledLines, Buffer, Length); } return STATUS_SUCCESS; @@ -731,7 +731,7 @@ } } - ConioDrawRegion(Console, &CapturedWriteRegion); + TermDrawRegion(Console, &CapturedWriteRegion); WriteRegion->Left = CapturedWriteRegion.Left; WriteRegion->Top = CapturedWriteRegion.Top ; @@ -1053,7 +1053,7 @@ if ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer) { ConioComputeUpdateRect(Buffer, &UpdateRect, WriteCoord, NumCodesToWrite); - ConioDrawRegion(Console, &UpdateRect); + TermDrawRegion(Console, &UpdateRect); } // EndCoord->X = X; @@ -1151,7 +1151,7 @@ if ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer) { ConioComputeUpdateRect(Buffer, &UpdateRect, WriteCoord, NumCodesToWrite); - ConioDrawRegion(Console, &UpdateRect); + TermDrawRegion(Console, &UpdateRect); } // CodesWritten = Written; // NumCodesToWrite; @@ -1212,7 +1212,7 @@ ASSERT(Console == Buffer->Header.Console); Status = ConioResizeBuffer(Console, Buffer, *Size); - if (NT_SUCCESS(Status)) ConioResizeTerminal(Console); + if (NT_SUCCESS(Status)) TermResizeTerminal(Console); return Status; } @@ -1292,7 +1292,7 @@ if (ConioGetIntersection(&UpdateRegion, &UpdateRegion, &CapturedClipRectangle)) { /* Draw update region */ - ConioDrawRegion(Console, &UpdateRegion); + TermDrawRegion(Console, &UpdateRegion); } } Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -11,7 +11,7 @@ #include "consrv.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "handle.h" #include "lineinput.h" Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -12,7 +12,7 @@ #include "consrv.h" #include "console.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "conoutput.h" #include "handle.h" Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -40,7 +40,7 @@ VOID WINAPI ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); // VOID FASTCALL ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); -PCONSOLE_SCREEN_BUFFER -ConDrvGetActiveScreenBuffer(IN PCONSOLE Console); +// PCONSOLE_SCREEN_BUFFER +// ConDrvGetActiveScreenBuffer(IN PCONSOLE Console); /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -12,7 +12,7 @@ #include "consrv.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "handle.h" #include "procinit.h" #include "alias.h" @@ -545,7 +545,7 @@ TitleRequest->Title, TitleRequest->Length); - if (NT_SUCCESS(Status)) ConioChangeTitle(Console); + if (NT_SUCCESS(Status)) TermChangeTitle(Console); ConSrvReleaseConsole(Console, TRUE); return Status; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -10,7 +10,7 @@ #include "consrv.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "conoutput.h" #include "console.h" #include "handle.h" @@ -132,7 +132,7 @@ &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; - GetDisplayModeRequest->DisplayMode = ConioGetDisplayMode(Console); + GetDisplayModeRequest->DisplayMode = TermGetDisplayMode(Console); ConSrvReleaseConsole(Console, TRUE); return STATUS_SUCCESS; @@ -154,7 +154,7 @@ Console = Buff->Header.Console; - if (ConioSetDisplayMode(Console, SetDisplayModeRequest->DisplayMode)) + if (TermSetDisplayMode(Console, SetDisplayModeRequest->DisplayMode)) { SetDisplayModeRequest->NewSBDim = Buff->ScreenBufferSize; Status = STATUS_SUCCESS; @@ -183,7 +183,7 @@ if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; - ConioGetLargestConsoleWindowSize(Console, &GetLargestWindowSizeRequest->Size); + TermGetLargestConsoleWindowSize(Console, &GetLargestWindowSizeRequest->Size); ConSrvReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; @@ -205,7 +205,7 @@ Console = Buff->Header.Console; - ShowCursorRequest->RefCount = ConioShowMouseCursor(Console, ShowCursorRequest->Show); + ShowCursorRequest->RefCount = TermShowMouseCursor(Console, ShowCursorRequest->Show); ConSrvReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; @@ -231,7 +231,7 @@ Console = Buff->Header.Console; - Success = ConioSetMouseCursor(Console, SetCursorRequest->hCursor); + Success = TermSetMouseCursor(Console, SetCursorRequest->hCursor); ConSrvReleaseScreenBuffer(Buff, TRUE); return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); @@ -253,9 +253,9 @@ Console = Buff->Header.Console; - MenuControlRequest->hMenu = ConioMenuControl(Console, - MenuControlRequest->dwCmdIdLow, - MenuControlRequest->dwCmdIdHigh); + MenuControlRequest->hMenu = TermMenuControl(Console, + MenuControlRequest->dwCmdIdLow, + MenuControlRequest->dwCmdIdHigh); ConSrvReleaseScreenBuffer(Buff, TRUE); return STATUS_SUCCESS; @@ -272,7 +272,7 @@ &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; - Success = ConioSetMenuClose(Console, SetMenuCloseRequest->Enable); + Success = TermSetMenuClose(Console, SetMenuCloseRequest->Enable); ConSrvReleaseConsole(Console, TRUE); return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); @@ -287,7 +287,7 @@ Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; - GetWindowRequest->WindowHandle = ConioGetConsoleWindowHandle(Console); + GetWindowRequest->WindowHandle = TermGetConsoleWindowHandle(Console); ConSrvReleaseConsole(Console, TRUE); return STATUS_SUCCESS; @@ -302,7 +302,7 @@ Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; - Status = (ConioChangeIcon(Console, SetIconRequest->WindowIcon) + Status = (TermChangeIcon(Console, SetIconRequest->WindowIcon) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -227,7 +227,7 @@ { NTSTATUS Status; PCONSOLE Console = GuiData->Console; - PCONSOLE_SCREEN_BUFFER ActiveBuffer = Console->ActiveBuffer; + PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer; PCONSOLE_PROCESS_DATA ProcessData; HANDLE hSection = NULL, hClientSection = NULL; LARGE_INTEGER SectionSize; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -65,6 +65,7 @@ UINT CharHeight; PCONSOLE Console; /* Pointer to the owned console */ + PCONSOLE_SCREEN_BUFFER ActiveBuffer; /* Pointer to the active screen buffer (then maybe the previous Console member is redundant?? Or not...) */ GUI_CONSOLE_INFO GuiInfo; /* GUI terminal settings */ } GUI_CONSOLE_DATA, *PGUI_CONSOLE_DATA; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -64,16 +64,18 @@ #define GWLP_CONSOLE_LEADER_PID 0 #define GWLP_CONSOLE_LEADER_TID 4 -#define SetConsoleWndConsoleLeaderCID(GuiData) \ -do { \ - PCONSOLE_PROCESS_DATA ProcessData; \ - CLIENT_ID ConsoleLeaderCID; \ +#define SetConsoleWndConsoleLeaderCID(GuiData) \ +do { \ + PCONSOLE_PROCESS_DATA ProcessData; \ + CLIENT_ID ConsoleLeaderCID; \ ProcessData = CONTAINING_RECORD((GuiData)->Console->ProcessList.Blink, \ CONSOLE_PROCESS_DATA, \ ConsoleLink); \ ConsoleLeaderCID = ProcessData->Process->ClientId; \ - SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_PID, (LONG_PTR)(ConsoleLeaderCID.UniqueProcess)); \ - SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_TID, (LONG_PTR)(ConsoleLeaderCID.UniqueThread )); \ + SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_PID, \ + (LONG_PTR)(ConsoleLeaderCID.UniqueProcess)); \ + SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_TID, \ + (LONG_PTR)(ConsoleLeaderCID.UniqueThread )); \ } while (0) /**************************************************************/ @@ -264,7 +266,8 @@ Ret = FALSE; goto Quit; } - ActiveBuffer = ConDrvGetActiveScreenBuffer(Console); + // ActiveBuffer = ConDrvGetActiveScreenBuffer(Console); + ActiveBuffer = GuiData->ActiveBuffer; /* * In case the selected menu item belongs to the user-reserved menu id range, @@ -392,8 +395,8 @@ static VOID GuiConsoleResizeWindow(PGUI_CONSOLE_DATA GuiData) { - PCONSOLE Console = GuiData->Console; - PCONSOLE_SCREEN_BUFFER Buff = ConDrvGetActiveScreenBuffer(Console); + // PCONSOLE Console = GuiData->Console; + PCONSOLE_SCREEN_BUFFER Buff = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(Console); SCROLLINFO sInfo; DWORD Width, Height; @@ -471,8 +474,8 @@ memset(&dmScreenSettings, 0, sizeof(dmScreenSettings)); dmScreenSettings.dmSize = sizeof(dmScreenSettings); dmScreenSettings.dmDisplayFixedOutput = DMDFO_CENTER; // DMDFO_STRETCH // DMDFO_DEFAULT - dmScreenSettings.dmPelsWidth = 640; // Console->ActiveBuffer->ViewSize.X * GuiData->CharWidth; - dmScreenSettings.dmPelsHeight = 480; // Console->ActiveBuffer->ViewSize.Y * GuiData->CharHeight; + dmScreenSettings.dmPelsWidth = 640; // GuiData->ActiveBuffer->ViewSize.X * GuiData->CharWidth; + dmScreenSettings.dmPelsHeight = 480; // GuiData->ActiveBuffer->ViewSize.Y * GuiData->CharHeight; dmScreenSettings.dmBitsPerPel = 32; dmScreenSettings.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; ChangeDisplaySettings(&dmScreenSettings, CDS_FULLSCREEN); @@ -588,8 +591,8 @@ static VOID SmallRectToRect(PGUI_CONSOLE_DATA GuiData, PRECT Rect, PSMALL_RECT SmallRect) { - PCONSOLE Console = GuiData->Console; - PCONSOLE_SCREEN_BUFFER Buffer = ConDrvGetActiveScreenBuffer(Console); + // PCONSOLE Console = GuiData->Console; + PCONSOLE_SCREEN_BUFFER Buffer = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(Console); UINT WidthUnit, HeightUnit; GetScreenBufferSizeUnits(Buffer, GuiData, &WidthUnit, &HeightUnit); @@ -687,7 +690,8 @@ Success = FALSE; goto Quit; } - ActiveBuffer = ConDrvGetActiveScreenBuffer(Console); + // ActiveBuffer = ConDrvGetActiveScreenBuffer(Console); + ActiveBuffer = GuiData->ActiveBuffer; hDC = BeginPaint(GuiData->hWindow, &ps); if (hDC != NULL && @@ -768,7 +772,8 @@ if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; - ActiveBuffer = ConDrvGetActiveScreenBuffer(Console); + // ActiveBuffer = ConDrvGetActiveScreenBuffer(Console); + ActiveBuffer = GuiData->ActiveBuffer; if (Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) { @@ -940,7 +945,7 @@ if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; - Buff = ConDrvGetActiveScreenBuffer(Console); + Buff = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(Console); if (GetType(Buff) == TEXTMODE_BUFFER) { @@ -1063,8 +1068,8 @@ static COORD PointToCoord(PGUI_CONSOLE_DATA GuiData, LPARAM lParam) { - PCONSOLE Console = GuiData->Console; - PCONSOLE_SCREEN_BUFFER Buffer = ConDrvGetActiveScreenBuffer(Console); + // PCONSOLE Console = GuiData->Console; + PCONSOLE_SCREEN_BUFFER Buffer = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(Console); COORD Coord; UINT WidthUnit, HeightUnit; @@ -1343,7 +1348,7 @@ if (OpenClipboard(GuiData->hWindow) == TRUE) { PCONSOLE Console = GuiData->Console; - PCONSOLE_SCREEN_BUFFER Buffer = ConDrvGetActiveScreenBuffer(Console); + PCONSOLE_SCREEN_BUFFER Buffer = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(Console); if (GetType(Buffer) == TEXTMODE_BUFFER) { @@ -1370,8 +1375,8 @@ { if (OpenClipboard(GuiData->hWindow) == TRUE) { - PCONSOLE Console = GuiData->Console; - PCONSOLE_SCREEN_BUFFER Buffer = ConDrvGetActiveScreenBuffer(Console); + // PCONSOLE Console = GuiData->Console; + PCONSOLE_SCREEN_BUFFER Buffer = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(Console); if (GetType(Buffer) == TEXTMODE_BUFFER) { @@ -1396,7 +1401,8 @@ if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; - ActiveBuffer = ConDrvGetActiveScreenBuffer(Console); + // ActiveBuffer = ConDrvGetActiveScreenBuffer(Console); + ActiveBuffer = GuiData->ActiveBuffer; GetScreenBufferSizeUnits(ActiveBuffer, GuiData, &WidthUnit, &HeightUnit); @@ -1428,7 +1434,7 @@ if ((GuiData->WindowSizeLock == FALSE) && (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED)) { - PCONSOLE_SCREEN_BUFFER Buff = ConDrvGetActiveScreenBuffer(Console); + PCONSOLE_SCREEN_BUFFER Buff = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(Console); DWORD windx, windy, charx, chary; UINT WidthUnit, HeightUnit; @@ -1522,7 +1528,7 @@ if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return 0; - Buff = ConDrvGetActiveScreenBuffer(Console); + Buff = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(Console); if (uMsg == WM_HSCROLL) { @@ -1646,6 +1652,9 @@ */ GuiData = GuiGetGuiData(hWnd); if (GuiData == NULL) return DefWindowProcW(hWnd, msg, wParam, lParam); + + // TEMPORARY HACK until all of the functions can deal with a NULL GuiData->ActiveBuffer ... + if (GuiData->ActiveBuffer == NULL) return DefWindowProcW(hWnd, msg, wParam, lParam); /* * Just retrieve a pointer to the console in case somebody needs it. @@ -1865,14 +1874,16 @@ { if (ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) { + BOOL SetFocus = (msg == WM_SETFOCUS); INPUT_RECORD er; + er.EventType = FOCUS_EVENT; - er.Event.FocusEvent.bSetFocus = (msg == WM_SETFOCUS); + er.Event.FocusEvent.bSetFocus = SetFocus; ConioProcessInputEvent(Console, &er); - if (msg == WM_SETFOCUS) + if (SetFocus) DPRINT1("TODO: Create console caret\n"); - else // if (msg == WM_KILLFOCUS) + else DPRINT1("TODO: Destroy console caret\n"); LeaveCriticalSection(&Console->Lock); @@ -2247,7 +2258,8 @@ return STATUS_UNSUCCESSFUL; } /* HACK */ Console->TermIFace.Data = (PVOID)GuiData; /* HACK */ - GuiData->Console = Console; + GuiData->Console = Console; + GuiData->ActiveBuffer = Console->ActiveBuffer; GuiData->hWindow = NULL; /* The console can be resized */ @@ -2441,7 +2453,7 @@ if (NULL == GuiData || NULL == GuiData->hWindow) return; - Buff = ConDrvGetActiveScreenBuffer(GuiData->Console); + Buff = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(GuiData->Console); if (GetType(Buff) != TEXTMODE_BUFFER) return; if (0 != ScrolledLines) @@ -2490,7 +2502,7 @@ { PGUI_CONSOLE_DATA GuiData = This->Data; - if (ConDrvGetActiveScreenBuffer(GuiData->Console) == Buff) + if (/*ConDrvGetActiveScreenBuffer(GuiData->Console)*/GuiData->ActiveBuffer == Buff) { GuiInvalidateCell(This, Buff->CursorPosition.X, Buff->CursorPosition.Y); } @@ -2506,7 +2518,7 @@ { PGUI_CONSOLE_DATA GuiData = This->Data; - if (ConDrvGetActiveScreenBuffer(GuiData->Console) == Buff) + if (/*ConDrvGetActiveScreenBuffer(GuiData->Console)*/GuiData->ActiveBuffer == Buff) { /* Redraw char at old position (remove cursor) */ GuiInvalidateCell(This, OldCursorX, OldCursorY); @@ -2529,6 +2541,62 @@ // NOTE: This code ^^ causes deadlocks... PostMessageW(GuiData->hWindow, PM_RESIZE_TERMINAL, 0, 0); +} + +static VOID WINAPI +GuiSetActiveScreenBuffer(IN OUT PFRONTEND This) +{ + PGUI_CONSOLE_DATA GuiData = This->Data; + + EnterCriticalSection(&GuiData->Lock); + GuiData->WindowSizeLock = TRUE; + + InterlockedExchangePointer(&GuiData->ActiveBuffer, + GuiData->Console->ActiveBuffer); + + GuiData->WindowSizeLock = FALSE; + LeaveCriticalSection(&GuiData->Lock); + + GuiResizeTerminal(This); + // ConioDrawConsole(Console); + + // FIXME: Change the palette. +} + +static VOID WINAPI +GuiReleaseScreenBuffer(IN OUT PFRONTEND This, + IN PCONSOLE_SCREEN_BUFFER ScreenBuffer) +{ + PGUI_CONSOLE_DATA GuiData = This->Data; + + /* + * If we were notified to release a screen buffer that is not actually + * ours, then just ignore the notification... + */ + if (ScreenBuffer != GuiData->ActiveBuffer) return; + + /* + * ... else, we must release our active buffer. Two cases are present: + * - If ScreenBuffer (== GuiData->ActiveBuffer) IS NOT the console + * active screen buffer, then we can safely switch to it. + * - If ScreenBuffer IS the console active screen buffer, we must release + * it BUT and that's all. + */ + + if (ScreenBuffer != GuiData->Console->ActiveBuffer) + { + GuiSetActiveScreenBuffer(This); + } + else + { + EnterCriticalSection(&GuiData->Lock); + GuiData->WindowSizeLock = TRUE; + + InterlockedExchangePointer(&GuiData->ActiveBuffer, NULL); + + GuiData->WindowSizeLock = FALSE; + LeaveCriticalSection(&GuiData->Lock); + } } static BOOL WINAPI @@ -2653,7 +2721,8 @@ return; } - ActiveBuffer = ConDrvGetActiveScreenBuffer(GuiData->Console); + // ActiveBuffer = ConDrvGetActiveScreenBuffer(GuiData->Console); + ActiveBuffer = GuiData->ActiveBuffer; if (ActiveBuffer) { GetScreenBufferSizeUnits(ActiveBuffer, GuiData, &WidthUnit, &HeightUnit); @@ -2783,6 +2852,8 @@ GuiSetCursorInfo, GuiSetScreenInfo, GuiResizeTerminal, + GuiSetActiveScreenBuffer, + GuiReleaseScreenBuffer, GuiProcessKeyCallback, GuiRefreshInternalInfo, GuiChangeTitle, Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -11,7 +11,7 @@ #include "consrv.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "coninput.h" #define NDEBUG @@ -104,12 +104,12 @@ UnicodeChar = (1 == RetChars ? Chars[0] : 0); } - if (ConioProcessKeyCallback(Console, - msg, - KeyState[VK_MENU], - ShiftState, - VirtualKeyCode, - Down)) + if (TermProcessKeyCallback(Console, + msg, + KeyState[VK_MENU], + ShiftState, + VirtualKeyCode, + Down)) { return; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -482,7 +482,7 @@ // /* The console cannot be resized anymore */ // Console->FixedSize = TRUE; // MUST be placed AFTER the call to ConioResizeBuffer !! - // // ConioResizeTerminal(Console); + // // TermResizeTerminal(Console); /* * Contrary to what we do in the GUI front-end, here we create Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -12,7 +12,7 @@ #include "consrv.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "handle.h" #include "include/console.h" #include "console.h" @@ -551,7 +551,7 @@ _InterlockedIncrement(&Console->ReferenceCount); /* Update the internal info of the terminal */ - ConioRefreshInternalInfo(Console); + TermRefreshInternalInfo(Console); return STATUS_SUCCESS; } @@ -629,7 +629,7 @@ _InterlockedIncrement(&Console->ReferenceCount); /* Update the internal info of the terminal */ - ConioRefreshInternalInfo(Console); + TermRefreshInternalInfo(Console); Status = STATUS_SUCCESS; @@ -666,7 +666,7 @@ RemoveEntryList(&ProcessData->ConsoleLink); /* Update the internal info of the terminal */ - ConioRefreshInternalInfo(Console); + TermRefreshInternalInfo(Console); /* Release the console */ DPRINT("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount); Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -203,6 +203,9 @@ SHORT OldCursorX, SHORT OldCursorY); VOID (WINAPI *ResizeTerminal)(IN OUT PFRONTEND This); + VOID (WINAPI *SetActiveScreenBuffer)(IN OUT PFRONTEND This); + VOID (WINAPI *ReleaseScreenBuffer)(IN OUT PFRONTEND This, + IN PCONSOLE_SCREEN_BUFFER ScreenBuffer); BOOL (WINAPI *ProcessKeyCallback)(IN OUT PFRONTEND This, MSG* msg, BYTE KeyStateMenu, Removed: trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h (removed) @@ -1,50 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/conio.h - * PURPOSE: Internal Console I/O Interface - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) - */ - -#pragma once - -/* Macros used to call functions in the FRONTEND_VTBL virtual table */ - -#define ConioDrawRegion(Console, Region) \ - (Console)->TermIFace.Vtbl->DrawRegion(&(Console)->TermIFace, (Region)) -#define ConioWriteStream(Console, Block, CurStartX, CurStartY, ScrolledLines, Buffer, Length) \ - (Console)->TermIFace.Vtbl->WriteStream(&(Console)->TermIFace, (Block), (CurStartX), (CurStartY), \ - (ScrolledLines), (Buffer), (Length)) -#define ConioSetCursorInfo(Console, Buff) \ - (Console)->TermIFace.Vtbl->SetCursorInfo(&(Console)->TermIFace, (Buff)) -#define ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY) \ - (Console)->TermIFace.Vtbl->SetScreenInfo(&(Console)->TermIFace, (Buff), (OldCursorX), (OldCursorY)) -#define ConioResizeTerminal(Console) \ - (Console)->TermIFace.Vtbl->ResizeTerminal(&(Console)->TermIFace) -#define ConioProcessKeyCallback(Console, Msg, KeyStateMenu, ShiftState, VirtualKeyCode, Down) \ - (Console)->TermIFace.Vtbl->ProcessKeyCallback(&(Console)->TermIFace, (Msg), (KeyStateMenu), (ShiftState), (VirtualKeyCode), (Down)) -#define ConioRefreshInternalInfo(Console) \ - (Console)->TermIFace.Vtbl->RefreshInternalInfo(&(Console)->TermIFace) - -#define ConioChangeTitle(Console) \ - (Console)->TermIFace.Vtbl->ChangeTitle(&(Console)->TermIFace) -#define ConioChangeIcon(Console, hWindowIcon) \ - (Console)->TermIFace.Vtbl->ChangeIcon(&(Console)->TermIFace, (hWindowIcon)) -#define ConioGetConsoleWindowHandle(Console) \ - (Console)->TermIFace.Vtbl->GetConsoleWindowHandle(&(Console)->TermIFace) -#define ConioGetLargestConsoleWindowSize(Console, pSize) \ - (Console)->TermIFace.Vtbl->GetLargestConsoleWindowSize(&(Console)->TermIFace, (pSize)) -#define ConioGetDisplayMode(Console) \ - (Console)->TermIFace.Vtbl->GetDisplayMode(&(Console)->TermIFace) -#define ConioSetDisplayMode(Console, NewMode) \ - (Console)->TermIFace.Vtbl->SetDisplayMode(&(Console)->TermIFace, (NewMode)) -#define ConioShowMouseCursor(Console, Show) \ - (Console)->TermIFace.Vtbl->ShowMouseCursor(&(Console)->TermIFace, (Show)) -#define ConioSetMouseCursor(Console, hCursor) \ - (Console)->TermIFace.Vtbl->SetMouseCursor(&(Console)->TermIFace, (hCursor)) -#define ConioMenuControl(Console, CmdIdLow, CmdIdHigh) \ - (Console)->TermIFace.Vtbl->MenuControl(&(Console)->TermIFace, (CmdIdLow), (CmdIdHigh)) -#define ConioSetMenuClose(Console, Enable) \ - (Console)->TermIFace.Vtbl->SetMenuClose(&(Console)->TermIFace, (Enable)) - -/* EOF */ Copied: trunk/reactos/win32ss/user/winsrv/consrv/include/term.h (from r60589, trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/conio.h - * PURPOSE: Internal Console I/O Interface + * FILE: win32ss/user/winsrv/consrv/include/term.h + * PURPOSE: Internal Frontend Interface * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ @@ -10,41 +10,45 @@ /* Macros used to call functions in the FRONTEND_VTBL virtual table */ -#define ConioDrawRegion(Console, Region) \ +#define TermDrawRegion(Console, Region) \ (Console)->TermIFace.Vtbl->DrawRegion(&(Console)->TermIFace, (Region)) -#define ConioWriteStream(Console, Block, CurStartX, CurStartY, ScrolledLines, Buffer, Length) \ +#define TermWriteStream(Console, Block, CurStartX, CurStartY, ScrolledLines, Buffer, Length) \ (Console)->TermIFace.Vtbl->WriteStream(&(Console)->TermIFace, (Block), (CurStartX), (CurStartY), \ (ScrolledLines), (Buffer), (Length)) -#define ConioSetCursorInfo(Console, Buff) \ - (Console)->TermIFace.Vtbl->SetCursorInfo(&(Console)->TermIFace, (Buff)) -#define ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY) \ - (Console)->TermIFace.Vtbl->SetScreenInfo(&(Console)->TermIFace, (Buff), (OldCursorX), (OldCursorY)) -#define ConioResizeTerminal(Console) \ +#define TermSetCursorInfo(Console, ScreenBuffer) \ + (Console)->TermIFace.Vtbl->SetCursorInfo(&(Console)->TermIFace, (ScreenBuffer)) +#define TermSetScreenInfo(Console, ScreenBuffer, OldCursorX, OldCursorY) \ + (Console)->TermIFace.Vtbl->SetScreenInfo(&(Console)->TermIFace, (ScreenBuffer), (OldCursorX), (OldCursorY)) +#define TermResizeTerminal(Console) \ (Console)->TermIFace.Vtbl->ResizeTerminal(&(Console)->TermIFace) -#define ConioProcessKeyCallback(Console, Msg, KeyStateMenu, ShiftState, VirtualKeyCode, Down) \ +#define TermSetActiveScreenBuffer(Console) \ + (Console)->TermIFace.Vtbl->SetActiveScreenBuffer(&(Console)->TermIFace) +#define TermReleaseScreenBuffer(Console, ScreenBuffer) \ + (Console)->TermIFace.Vtbl->ReleaseScreenBuffer(&(Console)->TermIFace, (ScreenBuffer)) +#define TermProcessKeyCallback(Console, Msg, KeyStateMenu, ShiftState, VirtualKeyCode, Down) \ (Console)->TermIFace.Vtbl->ProcessKeyCallback(&(Console)->TermIFace, (Msg), (KeyStateMenu), (ShiftState), (VirtualKeyCode), (Down)) -#define ConioRefreshInternalInfo(Console) \ +#define TermRefreshInternalInfo(Console) \ (Console)->TermIFace.Vtbl->RefreshInternalInfo(&(Console)->TermIFace) -#define ConioChangeTitle(Console) \ +#define TermChangeTitle(Console) \ (Console)->TermIFace.Vtbl->ChangeTitle(&(Console)->TermIFace) -#define ConioChangeIcon(Console, hWindowIcon) \ +#define TermChangeIcon(Console, hWindowIcon) \ (Console)->TermIFace.Vtbl->ChangeIcon(&(Console)->TermIFace, (hWindowIcon)) -#define ConioGetConsoleWindowHandle(Console) \ +#define TermGetConsoleWindowHandle(Console) \ (Console)->TermIFace.Vtbl->GetConsoleWindowHandle(&(Console)->TermIFace) -#define ConioGetLargestConsoleWindowSize(Console, pSize) \ +#define TermGetLargestConsoleWindowSize(Console, pSize) \ (Console)->TermIFace.Vtbl->GetLargestConsoleWindowSize(&(Console)->TermIFace, (pSize)) -#define ConioGetDisplayMode(Console) \ +#define TermGetDisplayMode(Console) \ (Console)->TermIFace.Vtbl->GetDisplayMode(&(Console)->TermIFace) -#define ConioSetDisplayMode(Console, NewMode) \ +#define TermSetDisplayMode(Console, NewMode) \ (Console)->TermIFace.Vtbl->SetDisplayMode(&(Console)->TermIFace, (NewMode)) -#define ConioShowMouseCursor(Console, Show) \ +#define TermShowMouseCursor(Console, Show) \ (Console)->TermIFace.Vtbl->ShowMouseCursor(&(Console)->TermIFace, (Show)) -#define ConioSetMouseCursor(Console, hCursor) \ +#define TermSetMouseCursor(Console, hCursor) \ (Console)->TermIFace.Vtbl->SetMouseCursor(&(Console)->TermIFace, (hCursor)) -#define ConioMenuControl(Console, CmdIdLow, CmdIdHigh) \ +#define TermMenuControl(Console, CmdIdLow, CmdIdHigh) \ (Console)->TermIFace.Vtbl->MenuControl(&(Console)->TermIFace, (CmdIdLow), (CmdIdHigh)) -#define ConioSetMenuClose(Console, Enable) \ +#define TermSetMenuClose(Console, Enable) \ (Console)->TermIFace.Vtbl->SetMenuClose(&(Console)->TermIFace, (Enable)) /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -4,6 +4,8 @@ * FILE: win32ss/user/winsrv/consrv/lineinput.c * PURPOSE: Console line input functions * PROGRAMMERS: Jeffrey Morlan + * + * NOTE: It's something frontend-related... (--> read my mind... ;) ) */ /* INCLUDES *******************************************************************/ @@ -11,7 +13,7 @@ #include "consrv.h" #include "console.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #define NDEBUG #include <debug.h> @@ -184,7 +186,7 @@ Buffer->CursorPosition.X = XY % Buffer->ScreenBufferSize.X; Buffer->CursorPosition.Y = XY / Buffer->ScreenBufferSize.X; - ConioSetScreenInfo(Console, Buffer, OldCursorX, OldCursorY); + TermSetScreenInfo(Console, Buffer, OldCursorX, OldCursorY); } Console->LinePos = Pos; @@ -309,7 +311,7 @@ case VK_INSERT: /* Toggle between insert and overstrike */ Console->LineInsertToggle = !Console->LineInsertToggle; - ConioSetCursorInfo(Console, Console->ActiveBuffer); + TermSetCursorInfo(Console, Console->ActiveBuffer); return; case VK_DELETE: /* Remove character to right of cursor */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] Thu Oct 10 01:16:02 2013 @@ -11,7 +11,7 @@ #include "consrv.h" #include "include/conio.h" -#include "include/conio2.h" +#include "include/term.h" #include "include/settings.h" #include <stdio.h> // for swprintf @@ -440,6 +440,11 @@ } } + +/* + * NOTE: This function explicitely references Console->ActiveBuffer. + * It is possible that it should go into some frontend... + */ VOID ConSrvApplyUserSettings(IN PCONSOLE Console, IN PCONSOLE_INFO ConsoleInfo) @@ -534,7 +539,7 @@ SizeChanged = TRUE; } - if (SizeChanged) ConioResizeTerminal(Console); + if (SizeChanged) TermResizeTerminal(Console); } } else // if (GetType(ActiveBuffer) == GRAPHICS_BUFFER)

11 years, 2 months

[jimtabor] 60592: [Win32ss] - Setup small icon support from create window not in register class. - Remove flags if not inside the current version control. Version control is still FIXME.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Oct 9 23:04:07 2013 New Revision: 60592 URL: http://svn.reactos.org/svn/reactos?rev=60592&view=rev Log: [Win32ss] - Setup small icon support from create window not in register class. - Remove flags if not inside the current version control. Version control is still FIXME. Modified: trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/windows/class.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Wed Oct 9 23:04:07 2013 @@ -997,19 +997,11 @@ Class->cbclsExtra = lpwcx->cbClsExtra; Class->cbwndExtra = lpwcx->cbWndExtra; Class->hModule = lpwcx->hInstance; + //// FIXME handles to pointers Class->hIcon = lpwcx->hIcon; Class->hIconSm = lpwcx->hIconSm; - //// Sure W2k3 does not do this..... wine test inconclusive. - if (lpwcx->hIcon && !lpwcx->hIconSm) - { - Class->hIconSmIntern = co_IntCopyImage( lpwcx->hIcon, IMAGE_ICON, - UserGetSystemMetrics( SM_CXSMICON ), - UserGetSystemMetrics( SM_CYSMICON ), 0 ); - ERR("IntCreateClass hIconSmIntern %p\n",Class->hIconSmIntern); - Class->CSF_flags |= CSF_CACHEDSMICON; - } + Class->hCursor = lpwcx->hCursor; //// - Class->hCursor = lpwcx->hCursor; Class->hbrBackground = lpwcx->hbrBackground; /* Make a copy of the string */ @@ -1838,6 +1830,11 @@ } break; + // MSDN: + // hIconSm, A handle to a small icon that is associated with the window class. + // If this member is NULL, the system searches the icon resource specified by + // the hIcon member for an icon of the appropriate size to use as the small icon. + // case GCLP_HICON: /* FIXME: Get handle from pointer to ICON object */ Ret = (ULONG_PTR)Class->hIcon; Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Wed Oct 9 23:04:07 2013 @@ -1762,6 +1762,15 @@ pWnd->HideAccel = pWnd->spwndParent->HideAccel; } + if (Class->hIcon && !Class->hIconSm) + { + Class->hIconSmIntern = co_IntCopyImage( Class->hIcon, IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), 0 ); + ERR("IntCreateWindow hIconSmIntern %p\n",Class->hIconSmIntern); + Class->CSF_flags |= CSF_CACHEDSMICON; + } + if (pWnd->pcls->CSF_flags & CSF_SERVERSIDEPROC) pWnd->state |= WNDS_SERVERSIDEWINDOWPROC; @@ -2221,6 +2230,13 @@ IntLinkHwnd(Window, HWND_BOTTOM); else IntLinkHwnd(Window, hwndInsertAfter); + } + + // Remove flags that are retro. + if (!(Window->state2 & WNDS2_WIN31COMPAT)) // FIXME: support version flags. + { + if (Class->style & CS_PARENTDC && !(ParentWindow->style & WS_CLIPCHILDREN)) + Window->style &= ~(WS_CLIPSIBLINGS | WS_CLIPCHILDREN); } if ((Window->style & (WS_CHILD | WS_POPUP)) == WS_CHILD) Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Wed Oct 9 23:04:07 2013 @@ -1104,6 +1104,7 @@ /* * Create a small icon based on a standard icon */ +#if 0 // Keep vintage code from revision 18764 by GvG! static HICON CreateSmallIcon(HICON StdIcon) { @@ -1249,7 +1250,7 @@ return SmallIcon; } - +#endif ATOM WINAPI RegisterClassExWOWW(WNDCLASSEXW *lpwcx, @@ -1299,12 +1300,12 @@ ((WNDCLASSEXW*)lpwcx)->hInstance = GetModuleHandleW(NULL); RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW)); - +/* if (NULL == WndClass.hIconSm) { WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon); } - +*/ if (WndClass.lpszMenuName != NULL) { if (!IS_INTRESOURCE(WndClass.lpszMenuName))

11 years, 2 months

← Newer
1
...
19
20
21
22
23
24
25
...
33
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 October 2013