Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 72202: [NtUser] - If focus window null use active.
by jimtabor＠svn.reactos.org 11 Aug '16

11 Aug '16

Author: jimtabor Date: Thu Aug 11 22:04:33 2016 New Revision: 72202 URL: http://svn.reactos.org/svn/reactos?rev=72202&view=rev Log: [NtUser] - If focus window null use active. Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Thu Aug 11 22:04:33 2016 @@ -410,6 +410,7 @@ co_UserActivateKbl(PTHREADINFO pti, PKL pKl, UINT Flags) { PKL pklPrev; + PWND pWnd; pklPrev = pti->KeyboardLayout; if (pklPrev) @@ -424,8 +425,13 @@ // FIXME } + if (!(pWnd = pti->MessageQueue->spwndFocus)) + { + pWnd = pti->MessageQueue->spwndActive; + } + // Send WM_INPUTLANGCHANGE to thread's focus window - co_IntSendMessage(pti->MessageQueue->spwndFocus ? UserHMGetHandle(pti->MessageQueue->spwndFocus) : 0, + co_IntSendMessage( pWnd ? UserHMGetHandle(pWnd) : 0, WM_INPUTLANGCHANGE, (WPARAM)pKl->iBaseCharset, // FIXME: How to set it? (LPARAM)pKl->hkl); // hkl

1 0

[jimtabor] 72201: [NtUser] - Fix registry update when turning on/off keyboard layout hotkey and selecting. VK_RSHIFT (WIP).
by jimtabor＠svn.reactos.org 11 Aug '16

11 Aug '16

Author: jimtabor Date: Thu Aug 11 21:36:55 2016 New Revision: 72201 URL: http://svn.reactos.org/svn/reactos?rev=72201&view=rev Log: [NtUser] - Fix registry update when turning on/off keyboard layout hotkey and selecting. VK_RSHIFT (WIP). Modified: trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Thu Aug 11 21:36:55 2016 @@ -1004,8 +1004,6 @@ return Status; } - gdwLanguageToggleKey = UserGetLanguageToggle(); - gusLanguageID = UserGetLanguageID(); return STATUS_SUCCESS; Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Thu Aug 11 21:36:55 2016 @@ -62,7 +62,7 @@ if (NT_SUCCESS(Status)) { dwValue = atoi((char *)&dwValue); - ERR("Layout Hotkey %d\n",dwValue); + TRACE("Layout Hotkey %d\n",dwValue); } return dwValue; } Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Thu Aug 11 21:36:55 2016 @@ -317,6 +317,7 @@ if (SPITESTPREF(UPM_COMBOBOXANIMATION)) gpsi->PUSIFlags |= PUSIF_COMBOBOXANIMATION; if (SPITESTPREF(UPM_LISTBOXSMOOTHSCROLLING)) gpsi->PUSIFlags |= PUSIF_LISTBOXSMOOTHSCROLLING; } + gdwLanguageToggleKey = UserGetLanguageToggle(); } BOOL

1 0

[zhu] 72200: Rewrite of many address.c functions to simplify locking and resolve deadlocks, special attention paid to whether AFD and lwIP have pointers to my data or not. Added deadlock resolution...
by zhu＠svn.reactos.org 11 Aug '16

11 Aug '16

Author: zhu Date: Thu Aug 11 19:40:13 2016 New Revision: 72200 URL: http://svn.reactos.org/svn/reactos?rev=72200&view=rev Log: Rewrite of many address.c functions to simplify locking and resolve deadlocks, special attention paid to whether AFD and lwIP have pointers to my data or not. Added deadlock resolution to MTSerialMutex acquisition macros. Better organization of TCP functions in source code. Removed unnecessary helper functions. Reduced number of types of pending requests and the number of possible TCP states. Removed uselessly flawed IRPSP debugging array. Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/interface.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/tcp.h branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/sys_arch.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/interface.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/sys_arch.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr…

1 0

[hbelusca] 72199: Remove extra ending semicolons in our C code base.
by hbelusca＠svn.reactos.org 11 Aug '16

11 Aug '16

Author: hbelusca Date: Thu Aug 11 16:50:41 2016 New Revision: 72199 URL: http://svn.reactos.org/svn/reactos?rev=72199&view=rev Log: Remove extra ending semicolons in our C code base. Modified: trunk/reactos/drivers/parallel/parport/fdo.c trunk/reactos/win32ss/user/ntuser/sysparams.c trunk/rosapps/applications/sysutils/utils/rosperf/gradient.c trunk/rostests/apitests/msgina/ShellDimScreen.cpp trunk/rostests/apitests/ntdll/SystemInfo.c trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp Modified: trunk/reactos/drivers/parallel/parport/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/f… ============================================================================== --- trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -607,7 +607,7 @@ LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; PoStartNextPowerIrp(Irp); IoSkipCurrentIrpStackLocation(Irp); - return PoCallDriver(LowerDevice, Irp);; + return PoCallDriver(LowerDevice, Irp); } /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -1209,7 +1209,7 @@ } case SPI_SETLANGTOGGLE: - gdwLanguageToggleKey = UserGetLanguageToggle();; + gdwLanguageToggleKey = UserGetLanguageToggle(); return gdwLanguageToggleKey; break; Modified: trunk/rosapps/applications/sysutils/utils/rosperf/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/rosperf/gradient.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/rosperf/gradient.c [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -36,7 +36,7 @@ vert[0].Green = 0; vert[0].Blue = 0; vert[0].Alpha = 0; - vert[1].x = PerfInfo->WndWidth;; + vert[1].x = PerfInfo->WndWidth; vert[1].y = 0; vert[1].Red = 0; vert[1].Green = 0xff00; Modified: trunk/rostests/apitests/msgina/ShellDimScreen.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msgina/ShellDimS… ============================================================================== --- trunk/rostests/apitests/msgina/ShellDimScreen.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/msgina/ShellDimScreen.cpp [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -50,7 +50,7 @@ ok(wnd != ((HWND)0xdeadbeef), "Expected a valid window ptr\n"); ok(IsWindow(wnd), "Expected a valid window\n"); ok(IsWindowVisible(wnd), "Expected the window to be visible\n"); - char classname[100] = {0};; + char classname[100] = {0}; int nRet = GetClassNameA(wnd, classname, 100); ok(nRet == 17, "Expected GetClassName to return 3 was %i\n", nRet); ok(!strcmp(classname, "DimmedWindowClass"), "Expected classname to be DimmedWindowClass, was %s\n", classname); Modified: trunk/rostests/apitests/ntdll/SystemInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/SystemInfo… ============================================================================== --- trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -259,7 +259,7 @@ /* Restore original values */ SetTimeInfo.TimeAdjustment = TimeInfoOrg.TimeAdjustment; - SetTimeInfo.Enable = TimeInfoOrg.Enable;; + SetTimeInfo.Enable = TimeInfoOrg.Enable; Status = NtSetSystemInformation(SystemTimeAdjustmentInformation, &SetTimeInfo, sizeof(SetTimeInfo)); Modified: trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/ntoskrnl/IoEaTest… ============================================================================== --- trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp [iso-8859-1] (original) +++ trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -474,7 +474,7 @@ ROSEaBuffer->EaValueLength = (UCHAR)strlen(ROSEaBuffer->EaName); ulROSError = RANDOM_INIT_ERROR; ROSEaBuffer->Flags = TestEaBufferFlags; - ROSEaBuffer->NextEntryOffset = ((ROSEaBuffer->EaNameLength+ROSEaBuffer->EaNameLength+9)+3)&0xFFFFFFFC;; + ROSEaBuffer->NextEntryOffset = ((ROSEaBuffer->EaNameLength+ROSEaBuffer->EaNameLength+9)+3)&0xFFFFFFFC; ROSStatus = IoCheckEaBufferValidityROS(ROSEaBuffer,TestEaLength,&ulROSError); printf("%i-",ROSEaBuffer->NextEntryOffset);

1 0

[pschweitzer] 72198: [MPR] Import Wine commit: - b452e6285915b1ad46920fc8551335ab28bfb4c0, Implement local name automatic redirection for disks. - a65c31e46fa354fc8fbf86c0b9f273f86132a571, Implemen...
by pschweitzer＠svn.reactos.org 11 Aug '16

11 Aug '16

Author: pschweitzer Date: Thu Aug 11 16:29:36 2016 New Revision: 72198 URL: http://svn.reactos.org/svn/reactos?rev=72198&view=rev Log: [MPR] Import Wine commit: - b452e6285915b1ad46920fc8551335ab28bfb4c0, Implement local name automatic redirection for disks. - a65c31e46fa354fc8fbf86c0b9f273f86132a571, Implement provider selection given remote name. CORE-11757 Modified: trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Thu Aug 11 16:29:36 2016 @@ -1798,54 +1798,38 @@ strcpyW(accessname, ctxt->resource->lpRemoteName); } -static WCHAR * select_provider(struct use_connection_context *ctxt) -{ - DWORD ret, prov_size = 0x1000, len; - LPNETRESOURCEW provider; - WCHAR * system; - WCHAR * provider_name; - - provider = HeapAlloc(GetProcessHeap(), 0, prov_size); - if (!provider) - { - return NULL; - } - - ret = WNetGetResourceInformationW(ctxt->resource, provider, &prov_size, &system); - if (ret == ERROR_MORE_DATA) - { - HeapFree(GetProcessHeap(), 0, provider); - provider = HeapAlloc(GetProcessHeap(), 0, prov_size); - if (!provider) - { - return NULL; - } - - ret = WNetGetResourceInformationW(ctxt->resource, provider, &prov_size, &system); - } - - if (ret != NO_ERROR) - { - HeapFree(GetProcessHeap(), 0, provider); - return NULL; - } - - len = WideCharToMultiByte(CP_ACP, 0, provider->lpProvider, -1, NULL, 0, NULL, NULL); - provider_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (provider_name) - memcpy(provider_name, provider->lpProvider, len * sizeof(WCHAR)); - - HeapFree(GetProcessHeap(), 0, provider); - - return provider_name; +static DWORD wnet_use_provider( struct use_connection_context *ctxt, NETRESOURCEW * netres, WNetProvider *provider, BOOLEAN redirect ) +{ + DWORD caps, ret; + + caps = provider->getCaps(WNNC_CONNECTION); + if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) + return ERROR_BAD_PROVIDER; + + ret = WN_ACCESS_DENIED; + do + { + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(ctxt->hwndOwner, netres, ctxt->password, ctxt->userid, ctxt->flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(netres, ctxt->password, ctxt->userid); + + if (ret == WN_ALREADY_CONNECTED && redirect) + netres->lpLocalName[0] -= 1; + } while (redirect && ret == WN_ALREADY_CONNECTED && netres->lpLocalName[0] >= 'C'); + + if (ret == WN_SUCCESS && ctxt->accessname) + ctxt->set_accessname(ctxt, netres->lpLocalName); + + return ret; } static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider; - DWORD index, ret, caps; - BOOLEAN redirect = FALSE, prov = FALSE; - WCHAR letter[3] = {'z', ':', 0}; + DWORD index, ret = WN_NO_NETWORK; + BOOL redirect = FALSE; + WCHAR letter[3] = {'Z', ':', 0}; NETRESOURCEW netres; if (!providerTable || providerTable->numProviders == 0) @@ -1858,13 +1842,11 @@ if (!netres.lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) { if (netres.dwType != RESOURCETYPE_DISK && netres.dwType != RESOURCETYPE_PRINT) - { return ERROR_BAD_DEV_TYPE; - } if (netres.dwType == RESOURCETYPE_PRINT) { - FIXME("Locale device selection is not implemented for printers.\n"); + FIXME("Local device selection is not implemented for printers.\n"); return WN_NO_NETWORK; } @@ -1873,62 +1855,30 @@ } if (ctxt->flags & CONNECT_INTERACTIVE) - { return ERROR_BAD_NET_NAME; - } - - if (ctxt->flags & CONNECT_UPDATE_PROFILE) - FIXME("Connection saving is not implemented\n"); - - if (!netres.lpProvider) - { - netres.lpProvider = select_provider(ctxt); - if (!netres.lpProvider) - { - return ERROR_NO_NET_OR_BAD_PATH; - } - - prov = TRUE; - } - - index = _findProviderIndexW(netres.lpProvider); - if (index == BAD_PROVIDER_INDEX) - { - ret = ERROR_BAD_PROVIDER; - goto done; - } - - provider = &providerTable->table[index]; - caps = provider->getCaps(WNNC_CONNECTION); - if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) - { - ret = ERROR_BAD_PROVIDER; - goto done; - } if ((ret = ctxt->pre_set_accessname(ctxt, netres.lpLocalName))) - { - goto done; - } - - ret = WN_ACCESS_DENIED; - do - { - if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) - ret = provider->addConnection3(ctxt->hwndOwner, &netres, ctxt->password, ctxt->userid, ctxt->flags); - else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) - ret = provider->addConnection(&netres, ctxt->password, ctxt->userid); - - if (ret != NO_ERROR && redirect) - letter[0] -= 1; - } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'c'); - - if (ret == WN_SUCCESS && ctxt->accessname) - ctxt->set_accessname(ctxt, netres.lpLocalName); - -done: - if (prov) - HeapFree(GetProcessHeap(), 0, netres.lpProvider); + return ret; + + if (netres.lpProvider) + { + index = _findProviderIndexW(netres.lpProvider); + if (index == BAD_PROVIDER_INDEX) + return ERROR_BAD_PROVIDER; + + provider = &providerTable->table[index]; + ret = wnet_use_provider(ctxt, &netres, provider, redirect); + } + else + { + for (index = 0; index < providerTable->numProviders; index++) + { + provider = &providerTable->table[index]; + ret = wnet_use_provider(ctxt, &netres, provider, redirect); + if (ret == WN_SUCCESS || ret == WN_ALREADY_CONNECTED) + break; + } + } return ret; }

1 0

[jimtabor] 72197: [NtUser] - Fix up Language Layout Hotkey Toggle support for the new Keyboard switching. Support registry settings. Dedicated to Dmitry Chapyshev. - The registry entry it reads fro...
by jimtabor＠svn.reactos.org 11 Aug '16

11 Aug '16

Author: jimtabor Date: Thu Aug 11 15:53:05 2016 New Revision: 72197 URL: http://svn.reactos.org/svn/reactos?rev=72197&view=rev Log: [NtUser] - Fix up Language Layout Hotkey Toggle support for the new Keyboard switching. Support registry settings. Dedicated to Dmitry Chapyshev. - The registry entry it reads from is the wrong (the short number) one. Someone with registry knowledge please help. Also VK_LSHIFT is passed all the time and not VK_RSHIFT (WIP). Support for Left Alt and Control work including SysParam. - Side Tracks : Fixed CORE-5683. ReactOS can switch from keyboard processing or from DeferWindowProc. Modified: trunk/reactos/win32ss/user/ntuser/input.h trunk/reactos/win32ss/user/ntuser/keyboard.c trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/ntuser.h trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] Thu Aug 11 15:53:05 2016 @@ -75,6 +75,8 @@ BOOL NTAPI UserSendKeyboardInput(KEYBDINPUT *pKbdInput, BOOL bInjected); PKL NTAPI UserHklToKbl(HKL hKl); BOOL NTAPI UserSetDefaultInputLang(HKL hKl); +extern int gLanguageToggleKeyState; +extern DWORD gdwLanguageToggleKey; /* Mouse */ WORD FASTCALL UserGetMouseButtonsState(VOID); Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Thu Aug 11 15:53:05 2016 @@ -15,6 +15,8 @@ static PKEYBOARD_INDICATOR_TRANSLATION gpKeyboardIndicatorTrans = NULL; static KEYBOARD_INDICATOR_PARAMETERS gIndicators = {0, 0}; KEYBOARD_ATTRIBUTES gKeyboardInfo; +int gLanguageToggleKeyState = 0; +DWORD gdwLanguageToggleKey = 0; /* FUNCTIONS *****************************************************************/ @@ -819,7 +821,7 @@ } /* Check if this is a hotkey */ - if (co_UserProcessHotKeys(wSimpleVk, bIsDown)) + if (co_UserProcessHotKeys(wSimpleVk, bIsDown)) //// Check if this is correct, refer to hotkey sequence message tests. { TRACE("HotKey Processed\n"); bPostMsg = FALSE; @@ -920,22 +922,6 @@ ERR("Set last input\n"); //ptiLastInput = pti; } - } - - // TODO: When initializing win32k: Reading from the registry hotkey combination - // to switch the keyboard layout and store it to global variable. - // Using this combination of hotkeys in this function - if (wVk == VK_LSHIFT && IS_KEY_DOWN(gafAsyncKeyState, VK_LMENU)) - { - PKL pkl = pti->KeyboardLayout; - - if (pkl != NULL) - { - UserPostMessage(UserHMGetHandle(Wnd), - WM_INPUTLANGCHANGEREQUEST, - INPUTLANGCHANGE_FORWARD, - (LPARAM)pkl->hkl); - } } /* If it is VK_PACKET, high word of wParam is used for wchar */ Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Thu Aug 11 15:53:05 2016 @@ -1004,6 +1004,8 @@ return Status; } + gdwLanguageToggleKey = UserGetLanguageToggle(); + gusLanguageID = UserGetLanguageID(); return STATUS_SUCCESS; Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Thu Aug 11 15:53:05 2016 @@ -49,6 +49,22 @@ _SEH2_END ObDereferenceObject(Thread); return pti; +} + +DWORD +FASTCALL +UserGetLanguageToggle(VOID) +{ + NTSTATUS Status; + DWORD dwValue = 0; + + Status = RegReadUserSetting(L"Keyboard Layout\\Toggle", L"Layout Hotkey", REG_SZ, &dwValue, sizeof(dwValue)); + if (NT_SUCCESS(Status)) + { + dwValue = atoi((char *)&dwValue); + ERR("Layout Hotkey %d\n",dwValue); + } + return dwValue; } SHORT Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu Aug 11 15:53:05 2016 @@ -1773,6 +1773,7 @@ PWND pWnd; UINT ImmRet; BOOL Ret = TRUE; + WPARAM wParam = Msg->wParam; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); if (Msg->message == VK_PACKET) @@ -1833,6 +1834,81 @@ } } + //// Key Down! + if ( *RemoveMessages && Msg->message == WM_SYSKEYDOWN ) + { + if ( HIWORD(Msg->lParam) & KF_ALTDOWN ) + { + if ( Msg->wParam == VK_ESCAPE || Msg->wParam == VK_TAB ) // Alt-Tab/ESC Alt-Shift-Tab/ESC + { + WPARAM wParamTmp; + + wParamTmp = UserGetKeyState(VK_SHIFT) & 0x8000 ? SC_PREVWINDOW : SC_NEXTWINDOW; + TRACE("Send WM_SYSCOMMAND Alt-Tab/ESC Alt-Shift-Tab/ESC\n"); + co_IntSendMessage( Msg->hwnd, WM_SYSCOMMAND, wParamTmp, Msg->wParam ); + + //// Keep looping. + Ret = FALSE; + //// Skip the rest. + goto Exit; + } + } + } + + if ( *RemoveMessages && (Msg->message == WM_SYSKEYDOWN || Msg->message == WM_KEYDOWN) ) + { + if (gdwLanguageToggleKey < 3) + { + if (IS_KEY_DOWN(gafAsyncKeyState, gdwLanguageToggleKey == 1 ? VK_LMENU : VK_CONTROL)) // L Alt 1 or Ctrl 2 . + { + if ( wParam == VK_LSHIFT ) gLanguageToggleKeyState = INPUTLANGCHANGE_FORWARD; // Left Alt - Left Shift, Next + //// FIXME : It seems to always be VK_LSHIFT. + if ( wParam == VK_RSHIFT ) gLanguageToggleKeyState = INPUTLANGCHANGE_BACKWARD; // Left Alt - Right Shift, Previous + } + } + } + + //// Key Up! Alt Key Ctrl Key + if ( *RemoveMessages && (Msg->message == WM_SYSKEYUP || Msg->message == WM_KEYUP) ) + { + // When initializing win32k: Reading from the registry hotkey combination + // to switch the keyboard layout and store it to global variable. + // Using this combination of hotkeys in this function + + if ( gdwLanguageToggleKey < 3 && + IS_KEY_DOWN(gafAsyncKeyState, gdwLanguageToggleKey == 1 ? VK_LMENU : VK_CONTROL) ) + { + if ( Msg->wParam == VK_SHIFT && !(IS_KEY_DOWN(gafAsyncKeyState, VK_SHIFT))) + { + PKL pkl = pti->KeyboardLayout; + + if (pWnd) UserDerefObjectCo(pWnd); + + //// Seems to override message window. + if (!(pWnd = pti->MessageQueue->spwndFocus)) + { + pWnd = pti->MessageQueue->spwndActive; + } + if (pWnd) UserRefObjectCo(pWnd, &Ref); + + if (pkl != NULL && gLanguageToggleKeyState) + { + TRACE("Posting WM_INPUTLANGCHANGEREQUEST KeyState %d\n", gLanguageToggleKeyState ); + UserPostMessage(UserHMGetHandle(pWnd), + WM_INPUTLANGCHANGEREQUEST, + gLanguageToggleKeyState, + (LPARAM)pkl->hkl); + + gLanguageToggleKeyState = 0; + //// Keep looping. + Ret = FALSE; + //// Skip the rest. + goto Exit; + } + } + } + } + if (co_HOOK_CallHooks( WH_KEYBOARD, *RemoveMessages ? HC_ACTION : HC_NOREMOVE, LOWORD(Msg->wParam), @@ -1865,7 +1941,7 @@ } } } - +Exit: if (pWnd) UserDerefObjectCo(pWnd); return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] Thu Aug 11 15:53:05 2016 @@ -26,5 +26,6 @@ VOID FASTCALL UserLeave(VOID); BOOL FASTCALL UserIsEntered(VOID); BOOL FASTCALL UserIsEnteredExclusive(VOID); +DWORD FASTCALL UserGetLanguageToggle(VOID); /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Thu Aug 11 15:53:05 2016 @@ -1209,7 +1209,8 @@ } case SPI_SETLANGTOGGLE: - ERR("SPI_SETLANGTOGGLE is unimplemented\n"); + gdwLanguageToggleKey = UserGetLanguageToggle();; + return gdwLanguageToggleKey; break; case SPI_GETWINDOWSEXTENSION:

1 0

[tfaber] 72196: [FASTFAT] - Fail invalid opens specifying FILE_DELETE_ON_CLOSE CORE-6931
by tfaber＠svn.reactos.org 11 Aug '16

11 Aug '16

Author: tfaber Date: Thu Aug 11 13:25:57 2016 New Revision: 72196 URL: http://svn.reactos.org/svn/reactos?rev=72196&view=rev Log: [FASTFAT] - Fail invalid opens specifying FILE_DELETE_ON_CLOSE CORE-6931 Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Thu Aug 11 13:25:57 2016 @@ -460,6 +460,23 @@ return STATUS_ACCESS_DENIED; } + if ((*Fcb->Attributes & FILE_ATTRIBUTE_READONLY) && + (RequestedOptions & FILE_DELETE_ON_CLOSE)) + { + vfatReleaseFCB(DeviceExt, Fcb); + return STATUS_CANNOT_DELETE; + } + + if ((vfatFCBIsRoot(Fcb) || + (Fcb->LongNameU.Length == sizeof(WCHAR) && Fcb->LongNameU.Buffer[0] == L'.') || + (Fcb->LongNameU.Length == 2 * sizeof(WCHAR) && Fcb->LongNameU.Buffer[0] == L'.' && Fcb->LongNameU.Buffer[1] == L'.')) && + (RequestedOptions & FILE_DELETE_ON_CLOSE)) + { + // we cannot delete a '.', '..' or the root directory + vfatReleaseFCB(DeviceExt, Fcb); + return STATUS_CANNOT_DELETE; + } + DPRINT("Attaching FCB to fileObject\n"); Status = vfatAttachFCBToFileObject(DeviceExt, Fcb, FileObject); if (!NT_SUCCESS(Status)) @@ -552,6 +569,11 @@ return STATUS_INVALID_PARAMETER; } + if (RequestedOptions & FILE_DELETE_ON_CLOSE) + { + return STATUS_CANNOT_DELETE; + } + pFcb = DeviceExt->VolumeFcb; if (pFcb->OpenHandleCount == 0) @@ -870,7 +892,8 @@ { if (Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_WRITE_DATA || RequestedDisposition == FILE_OVERWRITE || - RequestedDisposition == FILE_OVERWRITE_IF) + RequestedDisposition == FILE_OVERWRITE_IF || + (RequestedOptions & FILE_DELETE_ON_CLOSE)) { if (!MmFlushImageSection(&pFcb->SectionObjectPointers, MmFlushForWrite)) { @@ -878,7 +901,8 @@ DPRINT1("%d %d %d\n", Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_WRITE_DATA, RequestedDisposition == FILE_OVERWRITE, RequestedDisposition == FILE_OVERWRITE_IF); VfatCloseFile (DeviceExt, FileObject); - return STATUS_SHARING_VIOLATION; + return (RequestedOptions & FILE_DELETE_ON_CLOSE) ? STATUS_CANNOT_DELETE + : STATUS_SHARING_VIOLATION; } } }

1 0

[tfaber] 72195: [FASTFAT] - Cancel deletion of a directory if it is not empty when its last handle is closed CORE-6931
by tfaber＠svn.reactos.org 11 Aug '16

11 Aug '16

Author: tfaber Date: Thu Aug 11 11:41:25 2016 New Revision: 72195 URL: http://svn.reactos.org/svn/reactos?rev=72195&view=rev Log: [FASTFAT] - Cancel deletion of a directory if it is not empty when its last handle is closed CORE-6931 Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Thu Aug 11 11:41:25 2016 @@ -66,7 +66,7 @@ pFcb->OpenHandleCount--; DeviceExt->OpenHandleCount--; - if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) && + if (!vfatFCBIsDirectory(pFcb) && FsRtlAreThereCurrentFileLocks(&pFcb->FileLock)) { /* remove all locks this process have on this file */ @@ -84,18 +84,26 @@ if (pFcb->Flags & FCB_DELETE_PENDING && pFcb->OpenHandleCount == 0) { - PFILE_OBJECT tmpFileObject; - tmpFileObject = pFcb->FileObject; - if (tmpFileObject != NULL) + if (vfatFCBIsDirectory(pFcb) && + !VfatIsDirectoryEmpty(pFcb)) { - pFcb->FileObject = NULL; - CcUninitializeCacheMap(tmpFileObject, NULL, NULL); - ObDereferenceObject(tmpFileObject); + pFcb->Flags &= ~FCB_DELETE_PENDING; } + else + { + PFILE_OBJECT tmpFileObject; + tmpFileObject = pFcb->FileObject; + if (tmpFileObject != NULL) + { + pFcb->FileObject = NULL; + CcUninitializeCacheMap(tmpFileObject, NULL, NULL); + ObDereferenceObject(tmpFileObject); + } - pFcb->RFCB.ValidDataLength.QuadPart = 0; - pFcb->RFCB.FileSize.QuadPart = 0; - pFcb->RFCB.AllocationSize.QuadPart = 0; + pFcb->RFCB.ValidDataLength.QuadPart = 0; + pFcb->RFCB.FileSize.QuadPart = 0; + pFcb->RFCB.AllocationSize.QuadPart = 0; + } } /* Uninitialize the cache (should be done even if caching was never initialized) */

1 0

[jimtabor] 72194: - Fix Desktop hang if no windows open.
by jimtabor＠svn.reactos.org 11 Aug '16

11 Aug '16

Author: jimtabor Date: Thu Aug 11 00:29:26 2016 New Revision: 72194 URL: http://svn.reactos.org/svn/reactos?rev=72194&view=rev Log: - Fix Desktop hang if no windows open. Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] Thu Aug 11 00:29:26 2016 @@ -312,7 +312,7 @@ ResizeAndCenter(switchdialog, totalW, totalH); } -void ProcessHotKey(VOID) +BOOL ProcessHotKey(VOID) { if (!isOpen) { @@ -320,7 +320,7 @@ EnumWindowsZOrder(EnumerateCallback, 0); if (windowCount < 2) - return; + return FALSE; selectedWindow = 1; @@ -335,6 +335,7 @@ selectedWindow = (selectedWindow + 1)%windowCount; InvalidateRect(switchdialog, NULL, TRUE); } + return TRUE; } LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam ) @@ -359,7 +360,7 @@ case VK_TAB: if( !CreateSwitcherWindow(User32Instance) ) goto Exit; if( !GetDialogFont() ) goto Exit; - ProcessHotKey(); + if( !ProcessHotKey() ) goto Exit; break; case VK_ESCAPE:

1 0

[tfaber] 72193: [NTOS:FSRTL] - Use the correct parent node when replacing an identical cache entry in FsRtlAddToTunnelCache CORE-11819
by tfaber＠svn.reactos.org 10 Aug '16

10 Aug '16

Author: tfaber Date: Wed Aug 10 21:09:50 2016 New Revision: 72193 URL: http://svn.reactos.org/svn/reactos?rev=72193&view=rev Log: [NTOS:FSRTL] - Use the correct parent node when replacing an identical cache entry in FsRtlAddToTunnelCache CORE-11819 Modified: trunk/reactos/ntoskrnl/fsrtl/tunnel.c Modified: trunk/reactos/ntoskrnl/fsrtl/tunnel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/tunnel.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/tunnel.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/tunnel.c [iso-8859-1] Wed Aug 10 21:09:50 2016 @@ -467,21 +467,21 @@ else { /* update parent node */ - if (LastEntry->LeftChild == CurEntry) + if (RtlIsLeftChild(CurEntry)) { - RtlInsertAsLeftChild(LastEntry, NodeEntry); + RtlInsertAsLeftChild(RtlParent(CurEntry), NodeEntry); } else { - RtlInsertAsRightChild(LastEntry, NodeEntry); + RtlInsertAsRightChild(RtlParent(CurEntry), NodeEntry); } } /* remove entry */ - RemoveEntryList(&((PTUNNEL_NODE_ENTRY)LastEntry)->TimerQueueEntry); + RemoveEntryList(&((PTUNNEL_NODE_ENTRY)CurEntry)->TimerQueueEntry); /* free node entry */ - FsRtlFreeTunnelNode((PTUNNEL_NODE_ENTRY)LastEntry, &PoolList); + FsRtlFreeTunnelNode((PTUNNEL_NODE_ENTRY)CurEntry, &PoolList); /* decrement node count */ Cache->NumEntries--;

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