Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 72082: [MPR] Time to react (again!). Implement automatic local name redirection for new connection. This implements the behavior of the CONNECT_REDIRECT flag of WNetUseConnection. Alr...
by pschweitzer＠svn.reactos.org 02 Aug '16

02 Aug '16

Author: pschweitzer Date: Tue Aug 2 09:49:20 2016 New Revision: 72082 URL: http://svn.reactos.org/svn/reactos?rev=72082&view=rev Log: [MPR] Time to react (again!). Implement automatic local name redirection for new connection. This implements the behavior of the CONNECT_REDIRECT flag of WNetUseConnection. Already sent upstream. Patch 1/6 CORE-11757 ROSAPPS-303 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] Tue Aug 2 09:49:20 2016 @@ -1617,6 +1617,8 @@ { WNetProvider *provider; DWORD index, ret, caps; + BOOLEAN redirect = FALSE; + WCHAR letter[3] = {'z', ':', 0}; if (!providerTable || providerTable->numProviders == 0) return WN_NO_NETWORK; @@ -1624,41 +1626,74 @@ if (!ctxt->resource) return ERROR_INVALID_PARAMETER; + if (!ctxt->resource->lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) + { + if (ctxt->resource->dwType != RESOURCETYPE_DISK && ctxt->resource->dwType != RESOURCETYPE_PRINT) + { + return ERROR_BAD_DEV_TYPE; + } + + if (ctxt->resource->dwType == RESOURCETYPE_PRINT) + { + FIXME("Locale device selection is not implemented for printers.\n"); + return WN_NO_NETWORK; + } + + redirect = TRUE; + ctxt->resource->lpLocalName = letter; + } + if (!ctxt->resource->lpProvider) { FIXME("Networking provider selection is not implemented.\n"); - return WN_NO_NETWORK; - } - - if (!ctxt->resource->lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) - { - FIXME("Locale device selection is not implemented.\n"); - return WN_NO_NETWORK; + ret = WN_NO_NETWORK; + goto done; } if (ctxt->flags & CONNECT_INTERACTIVE) - return ERROR_BAD_NET_NAME; + { + ret = ERROR_BAD_NET_NAME; + goto done; + } index = _findProviderIndexW(ctxt->resource->lpProvider); if (index == BAD_PROVIDER_INDEX) - return ERROR_BAD_PROVIDER; + { + ret = ERROR_BAD_PROVIDER; + goto done; + } provider = &providerTable->table[index]; caps = provider->getCaps(WNNC_CONNECTION); if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) - return ERROR_BAD_PROVIDER; + { + ret = ERROR_BAD_PROVIDER; + goto done; + } if ((ret = ctxt->pre_set_accessname(ctxt))) - return ret; + { + goto done; + } ret = WN_ACCESS_DENIED; - if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) - ret = provider->addConnection3(ctxt->hwndOwner, ctxt->resource, ctxt->password, ctxt->userid, ctxt->flags); - else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) - ret = provider->addConnection(ctxt->resource, ctxt->password, ctxt->userid); + do + { + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(ctxt->hwndOwner, ctxt->resource, ctxt->password, ctxt->userid, ctxt->flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(ctxt->resource, ctxt->password, ctxt->userid); + + if (redirect) + letter[0] -= 1; + } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'c'); if (ret == WN_SUCCESS && ctxt->accessname) ctxt->set_accessname(ctxt); + +done: + if (redirect) + ctxt->resource->lpLocalName = NULL; return ret; }

1 0

[akhaldi] 72081: [TRANSLATIONS] Russian translation update by Sergey Stopkin and co, with some fixes by me. CORE-11752
by akhaldi＠svn.reactos.org 02 Aug '16

02 Aug '16

Author: akhaldi Date: Tue Aug 2 09:16:16 2016 New Revision: 72081 URL: http://svn.reactos.org/svn/reactos?rev=72081&view=rev Log: [TRANSLATIONS] Russian translation update by Sergey Stopkin and co, with some fixes by me. CORE-11752 Added: trunk/reactos/base/applications/clipbrd/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/charmap/lang/ru-RU.rc trunk/reactos/base/applications/clipbrd/clipbrd.rc trunk/reactos/base/applications/cmdutils/clip/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/taskkill/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/games/spider/lang/ru-RU.rc trunk/reactos/base/applications/magnify/lang/ru-RU.rc trunk/reactos/base/applications/mmc/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/lang/ru-RU.rc trunk/reactos/base/applications/network/ping/lang/ru-RU.rc trunk/reactos/base/applications/network/telnet/lang/ru-RU.rc trunk/reactos/base/applications/osk/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc trunk/reactos/base/applications/winhlp32/lang/Ru.rc trunk/reactos/base/applications/wordpad/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/system/diskpart/lang/ru-RU.rc trunk/reactos/base/system/subst/lang/ru-RU.rc trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/wined3dcfg/lang/ru-RU.rc trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Ru.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msi/msi_Ru.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc trunk/reactos/dll/win32/shdoclc/lang/Ru.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Added: trunk/reactos/base/applications/clipbrd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Modified: trunk/reactos/base/applications/cmdutils/clip/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/taskkill/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/games/spider/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/magnify/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mmc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/network/ping/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/telnet/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/osk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/winhlp32/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/wordpad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… Modified: trunk/reactos/base/system/diskpart/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/base/system/subst/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/ru-… Modified: trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/ru… Modified: trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… Modified: trunk/reactos/dll/win32/msi/msi_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Ru.rc?re… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/shdoclc/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/lang/Ru.… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-…

1 0

[jimtabor] 72080: [NtUser] - Fix crash while mouse cursor is moving over stress test window (RegEdit). This fixes VLC too. Tested SeaMonkey and it did not crash. See CORE-9169 and CORE-9836.
by jimtabor＠svn.reactos.org 02 Aug '16

02 Aug '16

Author: jimtabor Date: Tue Aug 2 04:05:16 2016 New Revision: 72080 URL: http://svn.reactos.org/svn/reactos?rev=72080&view=rev Log: [NtUser] - Fix crash while mouse cursor is moving over stress test window (RegEdit). This fixes VLC too. Tested SeaMonkey and it did not crash. See CORE-9169 and CORE-9836. Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/cursoricon.h trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Tue Aug 2 04:05:16 2016 @@ -224,6 +224,15 @@ ASSERT(CurIcon->head.cLockObj >= 1); return CurIcon; +} + +PCURICON_OBJECT +IntSystemSetCursor(PCURICON_OBJECT pcurNew) +{ + PCURICON_OBJECT pcurOld = UserSetCursor(pcurNew, FALSE); + UserReferenceObject(pcurNew); + if (pcurOld) UserDereferenceObject(pcurOld); + return pcurOld; } BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook) @@ -1062,9 +1071,12 @@ } pcurOld = UserSetCursor(pcurNew, FALSE); - if (pcurOld) - { - hOldCursor = pcurOld->head.h; + + // If returning an old cursor than validate it, Justin Case! + if ( pcurOld && + (pcurOld = UserGetObjectNoErr(gHandleTable, UserHMGetHandle(pcurOld), TYPE_CURSOR))) + { + hOldCursor = UserHMGetHandle(pcurOld); /* Problem: @@ -1078,12 +1090,12 @@ { TRACE("Returning Global Cursor hcur %p\n",hOldCursor); - if (pcurOld->head.cLockObj > 2) // Throttle down to 2. + /*if (pcurOld->head.cLockObj > 2) // Throttle down to 2. { UserDereferenceObject(pcurOld); } - goto leave; + goto leave;*/ } /* See if it was destroyed in the meantime */ Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] Tue Aug 2 04:05:16 2016 @@ -140,8 +140,6 @@ BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook); BOOL APIENTRY UserClipCursor(RECTL *prcl); PSYSTEM_CURSORINFO IntGetSysCursorInfo(VOID); - -#define IntReleaseCurIconObject(CurIconObj) \ - UserDereferenceObject(CurIconObj) +PCURICON_OBJECT IntSystemSetCursor(PCURICON_OBJECT); /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Tue Aug 2 04:05:16 2016 @@ -307,7 +307,7 @@ { if (pWnd->pcls->spcur) { - UserSetCursor(pWnd->pcls->spcur, FALSE); + IntSystemSetCursor(pWnd->pcls->spcur); } return FALSE; } @@ -319,7 +319,7 @@ { break; } - UserSetCursor(SYSTEMCUR(SIZEWE), FALSE); + IntSystemSetCursor(SYSTEMCUR(SIZEWE)); return TRUE; } @@ -330,7 +330,7 @@ { break; } - UserSetCursor(SYSTEMCUR(SIZENS), FALSE); + IntSystemSetCursor(SYSTEMCUR(SIZENS)); return TRUE; } @@ -341,7 +341,7 @@ { break; } - UserSetCursor(SYSTEMCUR(SIZENWSE), FALSE); + IntSystemSetCursor(SYSTEMCUR(SIZENWSE)); return TRUE; } @@ -352,11 +352,11 @@ { break; } - UserSetCursor(SYSTEMCUR(SIZENESW), FALSE); + IntSystemSetCursor(SYSTEMCUR(SIZENESW)); return TRUE; } } - UserSetCursor(SYSTEMCUR(ARROW), FALSE); + IntSystemSetCursor(SYSTEMCUR(ARROW)); return FALSE; } 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] Tue Aug 2 04:05:16 2016 @@ -1516,7 +1516,7 @@ if (pwndMsg == NULL || pwndMsg->head.pti->MessageQueue != MessageQueue) { // Crossing a boundary, so set cursor. See default message queue cursor. - UserSetCursor(SYSTEMCUR(ARROW), FALSE); + IntSystemSetCursor(SYSTEMCUR(ARROW)); /* Remove and ignore the message */ *RemoveMessages = TRUE; return FALSE;

1 0

[hbelusca] 72079: [EVENTVWR] - Reorganize the header inclusions; add a PCH. - Transform the event details dialog into a control that can be embedded: * in a resizable dialog, * or in a pane below t...
by hbelusca＠svn.reactos.org 01 Aug '16

01 Aug '16

Author: hbelusca Date: Mon Aug 1 23:29:55 2016 New Revision: 72079 URL: http://svn.reactos.org/svn/reactos?rev=72079&view=rev Log: [EVENTVWR] - Reorganize the header inclusions; add a PCH. - Transform the event details dialog into a control that can be embedded: * in a resizable dialog, * or in a pane below the window listing the events. CORE-11637 Added: trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.c (with props) trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.h (with props) Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.h trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…

1 0

[hbelusca] 72078: [NOTEPAD]: Fix danish menu shortcuts.
by hbelusca＠svn.reactos.org 01 Aug '16

01 Aug '16

Author: hbelusca Date: Mon Aug 1 23:01:58 2016 New Revision: 72078 URL: http://svn.reactos.org/svn/reactos?rev=72078&view=rev Log: [NOTEPAD]: Fix danish menu shortcuts. Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] Mon Aug 1 23:01:58 2016 @@ -23,8 +23,8 @@ POPUP "&Fil" BEGIN MENUITEM "&Ny\tCtrl+N", CMD_NEW - MENUITEM "Ã&bn\tEnter", CMD_OPEN - MENUITEM "&Gem", CMD_SAVE + MENUITEM "Ã&bn...\tCtrl+O", CMD_OPEN + MENUITEM "&Gem\tCtrl+S", CMD_SAVE MENUITEM "Gem so&m...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "Side&opsÃ¦tning...", CMD_PAGE_SETUP

1 0

[jgardou] 72077: [KDGDB] - Turn this thing into something useful - Pretend we are only one process to GDB (making it a kernel-only debugger...) until the GDB team sorts this out - This is a kernel ...
by jgardou＠svn.reactos.org 01 Aug '16

01 Aug '16

Author: jgardou Date: Mon Aug 1 22:16:58 2016 New Revision: 72077 URL: http://svn.reactos.org/svn/reactos?rev=72077&view=rev Log: [KDGDB] - Turn this thing into something useful - Pretend we are only one process to GDB (making it a kernel-only debugger...) until the GDB team sorts this out - This is a kernel debugger stub you know. You didn't seriously pretend that recursive functions would be fine, did you ? [NTOS:KD64] - Fix build Pix or it din't happen : https://jira.reactos.org/secure/attachment/36322/source_level_debugging_ros… Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c trunk/reactos/drivers/base/kdgdb/gdb_receive.c trunk/reactos/drivers/base/kdgdb/gdb_send.c trunk/reactos/drivers/base/kdgdb/i386_sup.c trunk/reactos/drivers/base/kdgdb/kdcom.c trunk/reactos/drivers/base/kdgdb/kdgdb.h trunk/reactos/drivers/base/kdgdb/kdpacket.c trunk/reactos/drivers/base/kdgdb/utils.c trunk/reactos/ntoskrnl/kd64/kdapi.c Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_inp… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] Mon Aug 1 22:16:58 2016 @@ -9,9 +9,7 @@ /* LOCALS *********************************************************************/ static ULONG_PTR gdb_run_tid; -/* Keep track of where we are for qfThreadInfo/qsThreadInfo */ -static LIST_ENTRY* CurrentProcessEntry; -static LIST_ENTRY* CurrentThreadEntry; + /* GLOBALS ********************************************************************/ UINT_PTR gdb_dbg_pid; @@ -69,6 +67,17 @@ break; case 'g': KDDBGPRINT("Setting debug thread: %s.\n", gdb_input); +#if MONOPROCESS + gdb_dbg_pid = 0; + if (strncmp(&gdb_input[2], "-1", 2) == 0) + { + gdb_dbg_tid = (UINT_PTR)-1; + } + else + { + gdb_dbg_tid = hex_to_tid(&gdb_input[2]); + } +#else if (strncmp(&gdb_input[2], "p-1", 3) == 0) { gdb_dbg_pid = (UINT_PTR)-1; @@ -83,6 +92,7 @@ else gdb_dbg_tid = hex_to_tid(ptr); } +#endif send_gdb_packet("OK"); break; default: @@ -91,20 +101,6 @@ } } -KDSTATUS -gdb_receive_and_interpret_packet( - _Out_ DBGKD_MANIPULATE_STATE64* State, - _Out_ PSTRING MessageData, - _Out_ PULONG MessageLength, - _Inout_ PKD_CONTEXT KdContext) -{ - KDSTATUS Status = gdb_receive_packet(KdContext); - - if (Status != KdPacketReceived) - return Status; - return gdb_interpret_input(State, MessageData, MessageLength, KdContext); -} - static void handle_gdb_thread_alive(void) @@ -112,12 +108,20 @@ ULONG_PTR Pid, Tid; PETHREAD Thread; +#if MONOPROCESS + Pid = 0; + Tid = hex_to_tid(&gdb_input[1]); + + KDDBGPRINT("Checking if %p is alive.\n", Tid); + +#else Pid = hex_to_pid(&gdb_input[2]); Tid = hex_to_tid(strstr(gdb_input, ".") + 1); /* We cannot use PsLookupProcessThreadByCid as we could be running at any IRQL. * So loop. */ KDDBGPRINT("Checking if p%p.%p is alive.\n", Pid, Tid); +#endif Thread = find_thread(Pid, Tid); @@ -129,40 +133,53 @@ /* q* packets */ static -KDSTATUS -handle_gdb_query( - _Out_ DBGKD_MANIPULATE_STATE64* State, - _Out_ PSTRING MessageData, - _Out_ PULONG MessageLength, - _Inout_ PKD_CONTEXT KdContext) +void +handle_gdb_query(void) { if (strncmp(gdb_input, "qSupported:", 11) == 0) { - send_gdb_packet("PacketSize=4096;multiprocess+;"); - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); +#if MONOPROCESS + send_gdb_packet("PacketSize=1000;"); +#else + send_gdb_packet("PacketSize=1000;multiprocess+;"); +#endif + return; } if (strncmp(gdb_input, "qAttached", 9) == 0) { - /* Say no: We didn't attach, we create the process! */ - send_gdb_packet("0"); - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); +#if MONOPROCESS + send_gdb_packet("1"); +#else + UINT_PTR queried_pid = hex_to_pid(&gdb_input[10]); + /* Let's say we created system process */ + if (gdb_pid_to_handle(queried_pid) == NULL) + send_gdb_packet("0"); + else + send_gdb_packet("1"); +#endif + return; } if (strncmp(gdb_input, "qRcmd,", 6) == 0) { send_gdb_packet("OK"); - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); + return; } if (strcmp(gdb_input, "qC") == 0) { char gdb_out[64]; +#if MONOPROCESS + sprintf(gdb_out, "QC:%"PRIxPTR";", + handle_to_gdb_tid(PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread))); +#else sprintf(gdb_out, "QC:p%"PRIxPTR".%"PRIxPTR";", handle_to_gdb_pid(PsGetThreadProcessId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)), handle_to_gdb_tid(PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread))); +#endif send_gdb_packet(gdb_out); - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); + return; } if ((strncmp(gdb_input, "qfThreadInfo", 12) == 0) @@ -174,82 +191,162 @@ char gdb_out[1024]; char* ptr = gdb_out; BOOLEAN Resuming = strncmp(gdb_input, "qsThreadInfo", 12) == 0; - - if (Resuming) - { - if (CurrentProcessEntry == (LIST_ENTRY*)1) + /* Keep track of where we are. */ + static LIST_ENTRY* CurrentProcessEntry; + static LIST_ENTRY* CurrentThreadEntry; + + ptr = gdb_out; + + *ptr++ = 'm'; + /* NULL terminate in case we got nothing more to iterate */ + *ptr = '\0'; + + if (!Resuming) + { + /* Initialize the entries */ + CurrentProcessEntry = ProcessListHead->Flink; + CurrentThreadEntry = NULL; + + /* Start with idle thread */ +#if MONOPROCESS + ptr = gdb_out + sprintf(gdb_out, "m1"); +#else + ptr = gdb_out + sprintf(gdb_out, "mp1.1"); +#endif + FirstThread = FALSE; + } + + if (CurrentProcessEntry == NULL) /* Ps is not initialized */ + { + send_gdb_packet(Resuming ? "l" : gdb_out); + return; + } + + /* List all the processes */ + for ( ; + CurrentProcessEntry != ProcessListHead; + CurrentProcessEntry = CurrentProcessEntry->Flink) + { + + Process = CONTAINING_RECORD(CurrentProcessEntry, EPROCESS, ActiveProcessLinks); + + if (CurrentThreadEntry != NULL) + CurrentThreadEntry = CurrentThreadEntry->Flink; + else + CurrentThreadEntry = Process->ThreadListHead.Flink; + + /* List threads from this process */ + for ( ; + CurrentThreadEntry != &Process->ThreadListHead; + CurrentThreadEntry = CurrentThreadEntry->Flink) { - /* We're done */ - send_gdb_packet("l"); - CurrentProcessEntry = NULL; - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); + Thread = CONTAINING_RECORD(CurrentThreadEntry, ETHREAD, ThreadListEntry); + + /* See if we should add a comma */ + if (FirstThread) + { + FirstThread = FALSE; + } + else + { + *ptr++ = ','; + } + +#if MONOPROCESS + ptr += _snprintf(ptr, 1024 - (ptr - gdb_out), + "%p", + handle_to_gdb_tid(Thread->Cid.UniqueThread)); +#else + ptr += _snprintf(ptr, 1024 - (ptr - gdb_out), + "p%p.%p", + handle_to_gdb_pid(Process->UniqueProcessId), + handle_to_gdb_tid(Thread->Cid.UniqueThread)); +#endif + if (ptr > (gdb_out + 1024)) + { + /* send what we got */ + send_gdb_packet(gdb_out); + /* GDB can ask anything at this point, it isn't necessarily a qsThreadInfo packet */ + return; + } } - - if (CurrentThreadEntry == NULL) - CurrentProcessEntry = CurrentProcessEntry->Flink; + /* We're done for this process */ + CurrentThreadEntry = NULL; + } + + if (gdb_out[1] == '\0') + { + /* We didn't iterate over anything, meaning we were already done */ + send_gdb_packet("l"); } else - CurrentProcessEntry = ProcessListHead->Flink; - - if ((CurrentProcessEntry == ProcessListHead) || - (CurrentProcessEntry == NULL)) /* Ps is not initialized */ - { - /* We're almost done. Tell GDB about the idle thread */ - send_gdb_packet("mp1.1"); - CurrentProcessEntry = (LIST_ENTRY*)1; - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); - } - - Process = CONTAINING_RECORD(CurrentProcessEntry, EPROCESS, ActiveProcessLinks); - - if (Resuming && CurrentThreadEntry != NULL) - CurrentThreadEntry = CurrentThreadEntry->Flink; + { + send_gdb_packet(gdb_out); + } + /* GDB can ask anything at this point, it isn't necessarily a qsThreadInfo packet */ + return; + } + + if (strncmp(gdb_input, "qThreadExtraInfo,", 17) == 0) + { + ULONG_PTR Pid, Tid; + PETHREAD Thread; + PEPROCESS Process; + char out_string[64]; + STRING String = {0, 64, out_string}; + + KDDBGPRINT("Giving extra info for"); + +#if MONOPROCESS + Pid = 0; + Tid = hex_to_tid(&gdb_input[17]); + + KDDBGPRINT(" %p.\n", Tid); + + Thread = find_thread(Pid, Tid); + Process = CONTAINING_RECORD(Thread->Tcb.Process, EPROCESS, Pcb); +#else + Pid = hex_to_pid(&gdb_input[2]); + Tid = hex_to_tid(strstr(gdb_input, ".") + 1); + + /* We cannot use PsLookupProcessThreadByCid as we could be running at any IRQL. + * So loop. */ + KDDBGPRINT(" p%p.%p.\n", Pid, Tid); + + Process = find_process(Pid); + Thread = find_thread(Pid, Tid); +#endif + + if (PsGetThreadProcessId(Thread) == 0) + { + String.Length = sprintf(out_string, "SYSTEM"); + } else - CurrentThreadEntry = Process->ThreadListHead.Flink; - - ptr = gdb_out; - - *ptr++ = 'm'; - /* List threads from this process */ - for ( ; - CurrentThreadEntry != &Process->ThreadListHead; - CurrentThreadEntry = CurrentThreadEntry->Flink) - { - Thread = CONTAINING_RECORD(CurrentThreadEntry, ETHREAD, ThreadListEntry); - - /* See if we should add a comma */ - if (FirstThread) - { - FirstThread = FALSE; - } - else - { - *ptr++ = ','; - } - - ptr += _snprintf(ptr, 1024 - (ptr - gdb_out), - "p%p.%p", - handle_to_gdb_pid(Process->UniqueProcessId), - handle_to_gdb_tid(Thread->Cid.UniqueThread)); - if (ptr > (gdb_out + 1024)) - { - /* send what we got */ - send_gdb_packet(gdb_out); - /* GDB can ask anything at this point, it isn't necessarily a qsThreadInfo packet */ - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); - } - } - - /* send the list for this process */ - send_gdb_packet(gdb_out); - CurrentThreadEntry = NULL; - /* GDB can ask anything at this point, it isn't necessarily a qsThreadInfo packet */ - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); + { + String.Length = sprintf(out_string, "%.*s", 16, Process->ImageFileName); + } + + gdb_send_debug_io(&String, FALSE); + return; + } + + if (strncmp(gdb_input, "qOffsets", 8) == 0) + { + /* We load ntoskrnl at 0x80800000 while compiling it at 0x00800000 base adress */ + send_gdb_packet("TextSeg=80000000"); + return; + } + + if (strcmp(gdb_input, "qTStatus") == 0) + { + /* No tracepoint support */ + send_gdb_packet("T0"); + return; } KDDBGPRINT("KDGDB: Unknown query: %s\n", gdb_input); send_gdb_packet(""); - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); + return; } #if 0 @@ -305,11 +402,13 @@ KdpSendPacketHandler = NULL; KdpManipulateStateHandler = NULL; +#if !MONOPROCESS /* Reset the TLB */ if ((gdb_dbg_pid != 0) && gdb_pid_to_handle(gdb_dbg_pid) != PsGetCurrentProcessId()) { __writecr3(PsGetCurrentProcess()->Pcb.DirectoryTableBase[0]); } +#endif } static @@ -328,6 +427,7 @@ MessageData->Length = 0; *MessageLength = 0; +#if !MONOPROCESS /* Set the TLB according to the process being read. Pid 0 means any process. */ if ((gdb_dbg_pid != 0) && gdb_pid_to_handle(gdb_dbg_pid) != PsGetCurrentProcessId()) { @@ -340,6 +440,7 @@ } __writecr3(AttachedProcess->Pcb.DirectoryTableBase[0]); } +#endif State->u.ReadMemory.TargetBaseAddress = hex_to_address(&gdb_input[1]); State->u.ReadMemory.TransferCount = hex_to_address(strstr(&gdb_input[1], ",") + 1); @@ -362,16 +463,12 @@ { if (gdb_input[5] == '?') { - KDSTATUS Status; /* Report what we support */ send_gdb_packet("vCont;c;C;s;S"); - Status = gdb_receive_packet(KdContext); - if (Status != KdPacketReceived) - return Status; - return gdb_interpret_input(State, MessageData, MessageLength, KdContext); - } - - if (strcmp(gdb_input, "vCont;c") == 0) + return (KDSTATUS)-1; + } + + if (strncmp(gdb_input, "vCont;c", 7) == 0) { DBGKM_EXCEPTION64* Exception = NULL; @@ -404,41 +501,63 @@ return KdPacketReceived; } -/* GLOBAL FUNCTIONS ***********************************************************/ KDSTATUS -gdb_interpret_input( +gdb_receive_and_interpret_packet( _Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext) { - switch (gdb_input[0]) - { - case '?': - /* Send the Status */ - gdb_send_exception(); - break; - case 'g': - return gdb_send_registers(State, MessageData, MessageLength, KdContext); - case 'H': - handle_gdb_set_thread(); - break; - case 'm': - return handle_gdb_read_mem(State, MessageData, MessageLength, KdContext); - case 'p': - return gdb_send_register(State, MessageData, MessageLength, KdContext); - case 'q': - return handle_gdb_query(State, MessageData, MessageLength, KdContext); - case 'T': - handle_gdb_thread_alive(); - break; - case 'v': - return handle_gdb_v(State, MessageData, MessageLength, KdContext); - default: - /* We don't know how to handle this request. Maybe this is something for KD */ - State->ReturnStatus = STATUS_NOT_SUPPORTED; - KDDBGPRINT("Unsupported GDB command: %s.\n", gdb_input); - return KdPacketReceived; - } - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); -} + KDSTATUS Status; + + do + { + Status = gdb_receive_packet(KdContext); + KDDBGPRINT("KDGBD: Packet received with status %u\n", Status); + + if (Status != KdPacketReceived) + return Status; + + Status = (KDSTATUS)-1; + + switch (gdb_input[0]) + { + case '?': + /* Send the Status */ + gdb_send_exception(TRUE); + break; + case '!': + send_gdb_packet("OK"); + break; + case 'g': + gdb_send_registers(); + break; + case 'H': + handle_gdb_set_thread(); + break; + case 'm': + Status = handle_gdb_read_mem(State, MessageData, MessageLength, KdContext); + break; + case 'p': + gdb_send_register(); + break; + case 'q': + handle_gdb_query(); + break; + case 'T': + handle_gdb_thread_alive(); + break; + case 'v': + Status = handle_gdb_v(State, MessageData, MessageLength, KdContext); + break; + default: + /* We don't know how to handle this request. Maybe this is something for KD */ + State->ReturnStatus = STATUS_NOT_SUPPORTED; + KDDBGPRINT("Unsupported GDB command: %s.\n", gdb_input); + return KdPacketReceived; + } + } while (Status == (KDSTATUS)-1); + + return Status; +} + Modified: trunk/reactos/drivers/base/kdgdb/gdb_receive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_rec… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_receive.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_receive.c [iso-8859-1] Mon Aug 1 22:16:58 2016 @@ -42,6 +42,7 @@ return Status; if (Byte == 0x03) { + KDDBGPRINT("BREAK!"); KdContext->KdpControlCPending = TRUE; return KdPacketNeedsResend; } Modified: trunk/reactos/drivers/base/kdgdb/gdb_send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_sen… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_send.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_send.c [iso-8859-1] Mon Aug 1 22:16:58 2016 @@ -123,22 +123,26 @@ void gdb_send_debug_io( - _In_ PSTRING String) + _In_ PSTRING String, + _In_ BOOLEAN WithPrefix) { UCHAR ack; do { CHAR* ptr = String->Buffer; - CHAR check_sum; + CHAR check_sum = 0; USHORT Length = String->Length; CHAR Byte; KdpSendByte('$'); - KdpSendByte('O'); + if (WithPrefix) + { + KdpSendByte('O'); + check_sum = 'O'; + } /* Send the data */ - check_sum = 'O'; while (Length--) { Byte = hex_chars[(*ptr >> 4) & 0xf]; @@ -164,7 +168,7 @@ } void -gdb_send_exception(void) +gdb_send_exception(BOOLEAN WithThread) { char gdb_out[1024]; char* ptr = gdb_out; @@ -180,11 +184,20 @@ } else ptr += sprintf(ptr, "05"); - - ptr += sprintf(ptr, "thread:p%" PRIxPTR ".%" PRIxPTR ";", - handle_to_gdb_pid(PsGetThreadProcessId(Thread)), - handle_to_gdb_tid(PsGetThreadId(Thread))); + if (WithThread) + { +#if MONOPROCESS + ptr += sprintf(ptr, "thread:%" PRIxPTR ";", + handle_to_gdb_tid(PsGetThreadId(Thread))); +#else + ptr += sprintf(ptr, "thread:p%" PRIxPTR ".%" PRIxPTR ";", + handle_to_gdb_pid(PsGetThreadProcessId(Thread)), + handle_to_gdb_tid(PsGetThreadId(Thread))); +#endif + } ptr += sprintf(ptr, "core:%x;", CurrentStateChange.Processor); + /* Add program counter */ + gdb_append_pc_to_exception(Thread, ptr); send_gdb_packet(gdb_out); } Modified: trunk/reactos/drivers/base/kdgdb/i386_sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/i386_su… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] Mon Aug 1 22:16:58 2016 @@ -93,6 +93,7 @@ case ESP: case EBP: case EIP: + KDDBGPRINT("Returning NULL for register %d.\n", reg_name); *size = 4; return &NullValue; default: @@ -143,12 +144,8 @@ return NULL; } -KDSTATUS -gdb_send_registers( - _Out_ DBGKD_MANIPULATE_STATE64* State, - _Out_ PSTRING MessageData, - _Out_ PULONG MessageLength, - _Inout_ PKD_CONTEXT KdContext) +void +gdb_send_registers(void) { CHAR Registers[16*8 + 1]; UCHAR* RegisterPtr; @@ -184,7 +181,7 @@ { /* Thread is dead */ send_gdb_packet("E03"); - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); + return; } for(i=0; i < 16; i++) @@ -209,15 +206,10 @@ } *ptr = '\0'; send_gdb_packet(Registers); - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); -} - -KDSTATUS -gdb_send_register( - _Out_ DBGKD_MANIPULATE_STATE64* State, - _Out_ PSTRING MessageData, - _Out_ PULONG MessageLength, - _Inout_ PKD_CONTEXT KdContext) +} + +void +gdb_send_register(void) { enum reg_name reg_name; void *ptr; @@ -242,7 +234,7 @@ { /* Thread is dead */ send_gdb_packet("E03"); - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); + return; } ptr = thread_to_reg(DbgThread, reg_name, &size); @@ -257,6 +249,30 @@ { send_gdb_memory(ptr, size); } - - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); -} +} + +char* +gdb_append_pc_to_exception( + _In_ PETHREAD Thread, + _Inout_ char* ptr) +{ + /* Get EIP */ + unsigned short ptrSize; + unsigned char* EipPtr = thread_to_reg(Thread, EIP, &ptrSize); + + /* Print it */ + ptr += sprintf(ptr, "08:"); + *ptr++ = hex_chars[EipPtr[0] >> 4]; + *ptr++ = hex_chars[EipPtr[0] & 0xF]; + *ptr++ = hex_chars[EipPtr[1] >> 4]; + *ptr++ = hex_chars[EipPtr[1] & 0xF]; + *ptr++ = hex_chars[EipPtr[2] >> 4]; + *ptr++ = hex_chars[EipPtr[2] & 0xF]; + *ptr++ = hex_chars[EipPtr[3] >> 4]; + *ptr++ = hex_chars[EipPtr[3] & 0xF]; + *ptr++ = ';'; + *ptr++ = '\0'; + + return ptr; +} + Modified: trunk/reactos/drivers/base/kdgdb/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdcom.c [iso-8859-1] Mon Aug 1 22:16:58 2016 @@ -296,15 +296,15 @@ NTAPI KdpReceiveByte(_Out_ PUCHAR OutByte) { + USHORT CpStatus = CpGetByte(&KdComPort, OutByte, TRUE, FALSE); /* Get the byte */ - if (CpGetByte(&KdComPort, OutByte, TRUE, FALSE) == CP_GET_SUCCESS) + if (CpStatus == CP_GET_SUCCESS) { return KdPacketReceived; } - else - { - return KdPacketTimedOut; - } + + KDDBGPRINT("CpGetByte returned %u.\n", CpStatus); + return KdPacketTimedOut; } KDSTATUS @@ -319,6 +319,7 @@ { if (Byte == 0x03) { + KDDBGPRINT("BreakIn Polled.\n"); return KdPacketReceived; } else if (Byte == '$') Modified: trunk/reactos/drivers/base/kdgdb/kdgdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdgdb.h… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] Mon Aug 1 22:16:58 2016 @@ -21,6 +21,9 @@ #define KDDEBUG /* uncomment to enable debugging this dll */ +/* To undefine once https://sourceware.org/bugzilla/show_bug.cgi?id=17397 is resolved */ +#define MONOPROCESS 1 + #ifndef KDDEBUG #define KDDBGPRINT(...) #else @@ -34,6 +37,7 @@ return (HANDLE)(Tid - 1); } #define gdb_pid_to_handle gdb_tid_to_handle + FORCEINLINE UINT_PTR handle_to_gdb_tid(HANDLE Handle) { return (UINT_PTR)Handle + 1; @@ -68,7 +72,6 @@ /* gdb_input.c */ extern UINT_PTR gdb_dbg_tid; extern UINT_PTR gdb_dbg_pid; -extern KDSTATUS gdb_interpret_input(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); extern KDSTATUS gdb_receive_and_interpret_packet(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); /* gdb_receive.c */ @@ -79,8 +82,8 @@ /* gdb_send.c */ void send_gdb_packet(_In_ CHAR* Buffer); void send_gdb_memory(_In_ VOID* Buffer, size_t Length); -void gdb_send_debug_io(_In_ PSTRING String); -void gdb_send_exception(void); +void gdb_send_debug_io(_In_ PSTRING String, _In_ BOOLEAN WithPrefix); +void gdb_send_exception(BOOLEAN WithThread); void send_gdb_ntstatus(_In_ NTSTATUS Status); extern const char hex_chars[]; @@ -108,8 +111,9 @@ extern PETHREAD find_thread(_In_ UINT_PTR Pid, _In_ UINT_PTR Tid); /* arch_sup.c */ -extern KDSTATUS gdb_send_register(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); -extern KDSTATUS gdb_send_registers(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); +extern void gdb_send_register(void); +extern void gdb_send_registers(void); +extern char* gdb_append_pc_to_exception(_In_ PETHREAD Thread, _Inout_ char* ptr); /* Architecture specific defines. See ntoskrnl/include/internal/arch/ke.h */ #ifdef _M_IX86 Modified: trunk/reactos/drivers/base/kdgdb/kdpacket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdpacke… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdpacket.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdpacket.c [iso-8859-1] Mon Aug 1 22:16:58 2016 @@ -94,6 +94,7 @@ || (State->ReturnStatus != STATUS_SUCCESS)) { /* Should we bugcheck ? */ + KDDBGPRINT("BAD BAD BAD not manipulating state for sending context.\n"); while (1); } @@ -116,6 +117,7 @@ if (MessageData->MaximumLength < sizeof(CurrentContext)) { + KDDBGPRINT("Wrong message length %u.\n", MessageData->MaximumLength); while (1); } @@ -153,14 +155,18 @@ PsGetThreadId(Thread)); /* Set the current debugged process/thread accordingly */ gdb_dbg_tid = handle_to_gdb_tid(PsGetThreadId(Thread)); +#if MONOPROCESS + gdb_dbg_pid = 0; +#else gdb_dbg_pid = handle_to_gdb_pid(PsGetThreadProcessId(Thread)); - gdb_send_exception(); +#endif + gdb_send_exception(FALSE); /* Next receive call will ask for the context */ KdpManipulateStateHandler = GetContextManipulateHandler; break; } default: - /* FIXME */ + KDDBGPRINT("Unknown StateChange %u.\n", StateChange->NewState); while (1); } } @@ -177,10 +183,10 @@ switch (DebugIO->ApiNumber) { case DbgKdPrintStringApi: - gdb_send_debug_io(String); + gdb_send_debug_io(String, TRUE); break; default: - /* FIXME */ + KDDBGPRINT("Unknown ApiNumber %u.\n", DebugIO->ApiNumber); while (1); } } @@ -200,7 +206,7 @@ return; #endif default: - /* FIXME */ + KDDBGPRINT("Unknown ApiNumber %u.\n", State->ApiNumber); while (1); } } @@ -314,7 +320,11 @@ /* Set up the current state */ CurrentStateChange = *StateChange; gdb_dbg_tid = handle_to_gdb_tid(PsGetThreadId(Thread)); +#if MONOPROCESS + gdb_dbg_pid = 0; +#else gdb_dbg_pid = handle_to_gdb_pid(PsGetThreadProcessId(Thread)); +#endif /* This is the idle process. Save it! */ TheIdleThread = Thread; TheIdleProcess = (PEPROCESS)Thread->Tcb.ApcState.Process; @@ -352,7 +362,6 @@ _Out_ PULONG DataLength, _Inout_ PKD_CONTEXT KdContext) { - KDSTATUS Status; DBGKD_MANIPULATE_STATE64* State; /* Special handling for breakin packet */ @@ -373,13 +382,8 @@ if (KdpManipulateStateHandler != NULL) return KdpManipulateStateHandler(State, MessageData, DataLength, KdContext); - /* Receive data from GDB */ - Status = gdb_receive_packet(KdContext); - if (Status != KdPacketReceived) - return Status; - - /* Interpret it */ - return gdb_interpret_input(State, MessageData, DataLength, KdContext); + /* Receive data from GDB and interpret it */ + return gdb_receive_and_interpret_packet(State, MessageData, DataLength, KdContext); } VOID @@ -409,7 +413,7 @@ send_kd_state_manipulate((DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer, MessageData); break; default: - /* FIXME */ + KDDBGPRINT("Unknown packet type %u.\n", PacketType); while (1); } } Modified: trunk/reactos/drivers/base/kdgdb/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/utils.c… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/utils.c [iso-8859-1] Mon Aug 1 22:16:58 2016 @@ -21,7 +21,7 @@ PEPROCESS Process; /* Special case for idle process */ - if (Pid == 1) + if (ProcessId == NULL) return TheIdleProcess; for (ProcessEntry = ProcessListHead->Flink; @@ -46,14 +46,43 @@ PETHREAD Thread; PEPROCESS Process; LIST_ENTRY* ThreadEntry; +#if MONOPROCESS + LIST_ENTRY* ProcessEntry; +#endif + + if ( +#if !MONOPROCESS + (Pid == 0) && +#endif + (Tid == 0)) + { + /* Zero means any, so use the current one */ + return (PETHREAD)(ULONG_PTR)CurrentStateChange.Thread; + } + +#if MONOPROCESS /* Special case for the idle thread */ - if ((Pid == 1) && (Tid == 1)) + if (Tid == 1) return TheIdleThread; + for (ProcessEntry = ProcessListHead->Flink; + ProcessEntry != ProcessListHead; + ProcessEntry = ProcessEntry->Flink) + { + Process = CONTAINING_RECORD(ProcessEntry, EPROCESS, ActiveProcessLinks); +#else + Process = find_process(Pid); + + /* Special case for the idle thread */ + if ((Process == TheIdleProcess) && (Tid == 1)) + return TheIdleThread; + if (!Process) return NULL; + +#endif for (ThreadEntry = Process->ThreadListHead.Flink; ThreadEntry != &Process->ThreadListHead; @@ -67,5 +96,9 @@ } } +#if MONOPROCESS + } +#endif + return NULL; } Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Mon Aug 1 22:16:58 2016 @@ -113,7 +113,7 @@ /* * We may have modified executable code, flush the instruction cache */ - KeSweepICache((PVOID)Address, TotalSize); + KeSweepICache((PVOID)(ULONG_PTR)Address, TotalSize); /* * Return the size we managed to copy

1 0

[jimtabor] 72076: [NtUser] - Fix a recursion issue while processing posted messages. Related to CORE-10471. Dedicated to Thomas Faber for Free before Use testing. - Pass extra information along wit...
by jimtabor＠svn.reactos.org 01 Aug '16

01 Aug '16

Author: jimtabor Date: Mon Aug 1 19:13:48 2016 New Revision: 72076 URL: http://svn.reactos.org/svn/reactos?rev=72076&view=rev Log: [NtUser] - Fix a recursion issue while processing posted messages. Related to CORE-10471. Dedicated to Thomas Faber for Free before Use testing. - Pass extra information along with posted messages. - Trigger an event when cursor position has changed. Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Mon Aug 1 19:13:48 2016 @@ -1078,6 +1078,10 @@ if (pMsg->message != WM_PAINT && pMsg->message != WM_QUIT) { + if (!RtlEqualMemory(&pti->ptLast, &pMsg->pt, sizeof(POINT))) + { + pti->TIF_flags |= TIF_MSGPOSCHANGED; + } pti->timeLast = pMsg->time; pti->ptLast = pMsg->pt; } @@ -1278,6 +1282,7 @@ LPARAM lParam ) { ULONG_PTR Result = 0; + if (co_IntSendMessageTimeout(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) { return (LRESULT)Result; 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] Mon Aug 1 19:13:48 2016 @@ -15,6 +15,7 @@ static PPAGED_LOOKASIDE_LIST pgMessageLookasideList; static PPAGED_LOOKASIDE_LIST pgSendMsgLookasideList; +INT PostMsgCount = 0; INT SendMsgCount = 0; PUSER_MESSAGE_QUEUE gpqCursor; ULONG_PTR gdwMouseMoveExtraInfo = 0; @@ -743,20 +744,23 @@ RtlZeroMemory(Message, sizeof(*Message)); RtlMoveMemory(&Message->Msg, Msg, sizeof(MSG)); - + PostMsgCount++; return Message; } VOID FASTCALL MsqDestroyMessage(PUSER_MESSAGE Message) { + TRACE("Post Destroy %d\n",PostMsgCount) if (Message->pti == NULL) { ERR("Double Free Message\n"); return; } + RemoveEntryList(&Message->ListEntry); Message->pti = NULL; ExFreeToPagedLookasideList(pgMessageLookasideList, Message); + PostMsgCount--; } PUSER_SENT_MESSAGE FASTCALL @@ -820,7 +824,6 @@ pti->QuitPosted = 1; pti->exitCode = PostedMessage->Msg.wParam; } - RemoveEntryList(&PostedMessage->ListEntry); ClearMsgBitsMask(pti, PostedMessage->QS_Flags); MsqDestroyMessage(PostedMessage); CurrentEntry = pti->PostedMessagesListHead.Flink; @@ -1374,6 +1377,7 @@ Message->QS_Flags = MessageBits; Message->pti = pti; MsqWakeQueue(pti, MessageBits, TRUE); + TRACE("Post Message %d\n",PostMsgCount); } VOID FASTCALL @@ -1468,7 +1472,7 @@ } } -BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, UINT first, UINT last) +BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, LONG_PTR ExtraInfo, UINT first, UINT last) { MSG clk_msg; POINT pt; @@ -1653,6 +1657,12 @@ } } + if (pti->TIF_flags & TIF_MSGPOSCHANGED) + { + pti->TIF_flags &= ~TIF_MSGPOSCHANGED; + IntNotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, NULL, OBJID_CLIENT, CHILDID_SELF, 0); + } + /* message is accepted now (but still get dropped) */ event.message = msg->message; @@ -1665,14 +1675,14 @@ hook.pt = msg->pt; hook.hwnd = msg->hwnd; hook.wHitTestCode = hittest; - hook.dwExtraInfo = 0 /* extra_info */ ; + hook.dwExtraInfo = ExtraInfo; if (co_HOOK_CallHooks( WH_MOUSE, *RemoveMessages ? HC_ACTION : HC_NOREMOVE, message, (LPARAM)&hook )) { hook.pt = msg->pt; hook.hwnd = msg->hwnd; hook.wHitTestCode = hittest; - hook.dwExtraInfo = 0 /* extra_info */ ; + hook.dwExtraInfo = ExtraInfo; co_HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook ); ERR("WH_MOUSE dropped mouse message!\n"); @@ -1860,11 +1870,11 @@ return Ret; } -BOOL co_IntProcessHardwareMessage(MSG* Msg, BOOL* RemoveMessages, BOOL* NotForUs, UINT first, UINT last) +BOOL co_IntProcessHardwareMessage(MSG* Msg, BOOL* RemoveMessages, BOOL* NotForUs, LONG_PTR ExtraInfo, UINT first, UINT last) { if ( IS_MOUSE_MESSAGE(Msg->message)) { - return co_IntProcessMouseMessage(Msg, RemoveMessages, NotForUs, first, last); + return co_IntProcessMouseMessage(Msg, RemoveMessages, NotForUs, ExtraInfo, first, last); } else if ( IS_KBD_MESSAGE(Msg->message)) { @@ -1916,6 +1926,7 @@ MSG msg; ULONG_PTR idSave; DWORD QS_Flags; + LONG_PTR ExtraInfo; BOOL Ret = FALSE; PUSER_MESSAGE_QUEUE MessageQueue = pti->MessageQueue; @@ -1964,18 +1975,18 @@ MessageQueue->idSysPeek = (ULONG_PTR)CurrentMessage; msg = CurrentMessage->Msg; + ExtraInfo = CurrentMessage->ExtraInfo; QS_Flags = CurrentMessage->QS_Flags; NotForUs = FALSE; UpdateKeyStateFromMsg(MessageQueue, &msg); - AcceptMessage = co_IntProcessHardwareMessage(&msg, &Remove, &NotForUs, MsgFilterLow, MsgFilterHigh); + AcceptMessage = co_IntProcessHardwareMessage(&msg, &Remove, &NotForUs, ExtraInfo, MsgFilterLow, MsgFilterHigh); if (Remove) { - if (CurrentMessage->pti != NULL) + if (CurrentMessage->pti != NULL && (MessageQueue->idSysPeek == (ULONG_PTR)CurrentMessage)) { - RemoveEntryList(&CurrentMessage->ListEntry); MsqDestroyMessage(CurrentMessage); } ClearMsgBitsMask(pti, QS_Flags); @@ -1999,7 +2010,7 @@ } pti->ptLast = msg.pt; pti->timeLast = msg.time; - //MessageQueue->ExtraInfo = ExtraInfo; + MessageQueue->ExtraInfo = ExtraInfo; Ret = TRUE; break; } @@ -2054,7 +2065,6 @@ { if (CurrentMessage->pti != NULL) { - RemoveEntryList(&CurrentMessage->ListEntry); MsqDestroyMessage(CurrentMessage); } ClearMsgBitsMask(pti, QS_Flags); @@ -2183,8 +2193,9 @@ /* cleanup posted messages */ while (!IsListEmpty(&pti->PostedMessagesListHead)) { - CurrentEntry = RemoveHeadList(&pti->PostedMessagesListHead); + CurrentEntry = pti->PostedMessagesListHead.Flink; CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); + ERR("Thread Cleanup Post Messages %p\n",CurrentMessage); if (CurrentMessage->dwQEvent) { if (CurrentMessage->dwQEvent == POSTEVENT_NWE) @@ -2271,6 +2282,8 @@ MsqCleanupMessageQueue(PTHREADINFO pti) { PUSER_MESSAGE_QUEUE MessageQueue; + PLIST_ENTRY CurrentEntry; + PUSER_MESSAGE CurrentMessage; MessageQueue = pti->MessageQueue; MessageQueue->cThreads--; @@ -2279,6 +2292,18 @@ { if (MessageQueue->ptiSysLock == pti) MessageQueue->ptiSysLock = NULL; } + + if (MessageQueue->cThreads == 0) //// Fix a crash related to CORE-10471 testing. + { + /* cleanup posted messages */ + while (!IsListEmpty(&MessageQueue->HardwareMessagesListHead)) + { + CurrentEntry = MessageQueue->HardwareMessagesListHead.Flink; + CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); + ERR("MQ Cleanup Post Messages %p\n",CurrentMessage); + MsqDestroyMessage(CurrentMessage); + } + } //// if (MessageQueue->CursorObject) {

1 0

[jimtabor] 72075: - Remove trace.
by jimtabor＠svn.reactos.org 01 Aug '16

01 Aug '16

Author: jimtabor Date: Mon Aug 1 18:15:45 2016 New Revision: 72075 URL: http://svn.reactos.org/svn/reactos?rev=72075&view=rev Log: - Remove trace. Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] Mon Aug 1 18:15:45 2016 @@ -1899,7 +1899,6 @@ //info.nMax = childRect.right - clientRect.right; //info.nPos = clientRect.left - childRect.left; SetScrollInfo(hwnd, SB_HORZ, &info, TRUE); - ERR("CalcChildScroll H\n"); } if (scroll == SB_HORZ) break; /* fall through */

1 0

[jimtabor] 72074: [User32] - Use correct value for win:test_mdi. Use post instead of send, fix message sequence. - Minor code changes.
by jimtabor＠svn.reactos.org 01 Aug '16

01 Aug '16

Author: jimtabor Date: Mon Aug 1 18:15:00 2016 New Revision: 72074 URL: http://svn.reactos.org/svn/reactos?rev=72074&view=rev Log: [User32] - Use correct value for win:test_mdi. Use post instead of send, fix message sequence. - Minor code changes. Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] Mon Aug 1 18:15:00 2016 @@ -87,9 +87,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mdi); #define MDI_MAXTITLELENGTH 0xa1 - +#ifdef __REACTOS__ +#define WM_MDICALCCHILDSCROLL 0x003F // ReactOS: Uses correct value. +#else // Really? ---v win:test_mdi looks for the above value. #define WM_MDICALCCHILDSCROLL 0x10ac /* this is exactly what Windows uses */ - +#endif /* "More Windows..." definitions */ #define MDI_MOREWINDOWSLIMIT 9 /* after this number of windows, a "More Windows..." option will appear under the Windows menu */ @@ -1236,7 +1238,11 @@ ci->mdiFlags |= MDIF_NEEDUPDATE; ArrangeIconicWindows( hwnd ); ci->sbRecalc = SB_BOTH+1; +#ifdef __REACTOS__ + PostMessageA( hwnd, WM_MDICALCCHILDSCROLL, 0, 0 ); //// ReactOS: Post not send! +#else SendMessageW( hwnd, WM_MDICALCCHILDSCROLL, 0, 0 ); +#endif return 0; case WM_MDIMAXIMIZE: @@ -1872,6 +1878,7 @@ /* set common info values */ info.cbSize = sizeof(info); info.fMask = SIF_POS | SIF_RANGE | SIF_PAGE; + info.nPos = 0; /* set the specific values and apply but only if window style allows */ /* Note how we set nPos to 0 because we scroll the clients instead of @@ -1888,11 +1895,11 @@ { info.nMin = childRect.left; info.nMax = childRect.right; - info.nPos = 0; info.nPage = 1 + clientRect.right - clientRect.left; //info.nMax = childRect.right - clientRect.right; //info.nPos = clientRect.left - childRect.left; SetScrollInfo(hwnd, SB_HORZ, &info, TRUE); + ERR("CalcChildScroll H\n"); } if (scroll == SB_HORZ) break; /* fall through */ @@ -1901,7 +1908,6 @@ { info.nMin = childRect.top; info.nMax = childRect.bottom; - info.nPos = 0; info.nPage = 1 + clientRect.bottom - clientRect.top; //info.nMax = childRect.bottom - clientRect.bottom; //info.nPos = clientRect.top - childRect.top;

1 0

[cwittich] 72073: [SHELL32] remove obsolete FIXME. was fixed in r68015
by cwittich＠svn.reactos.org 01 Aug '16

01 Aug '16

Author: cwittich Date: Mon Aug 1 14:37:27 2016 New Revision: 72073 URL: http://svn.reactos.org/svn/reactos?rev=72073&view=rev Log: [SHELL32] remove obsolete FIXME. was fixed in r68015 Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Mon Aug 1 14:37:27 2016 @@ -699,7 +699,6 @@ return E_NOTIMPL; } -/* FIXME: drive size >4GB is rolling over */ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { HRESULT hr;

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