Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 63323: [SPEC2DEF] Fix def file generation on non-86
by tkreuzer＠svn.reactos.org 17 May '14

17 May '14

Author: tkreuzer Date: Sat May 17 10:58:10 2014 New Revision: 63323 URL: http://svn.reactos.org/svn/reactos?rev=63323&view=rev Log: [SPEC2DEF] Fix def file generation on non-86 Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sat May 17 10:58:10 2014 @@ -329,7 +329,7 @@ { /* Does the string already have stdcall decoration? */ pcAt = ScanToken(pcName, '@'); - if ((pcAt < (pcName + nNameLength)) && (pcName[0] == '_')) + if (pcAt && (pcAt < (pcName + nNameLength)) && (pcName[0] == '_')) { /* Skip leading underscore and remove trailing decoration */ pcName++; @@ -485,6 +485,7 @@ int OutputLine_def(FILE *fileDest, EXPORT *pexp) { + DbgPrint("OutputLine_def: '%.*s'...\n", pexp->strName.len, pexp->strName.buf); fprintf(fileDest, " "); if (gbMSComp) @@ -684,6 +685,7 @@ /* Get name */ exp.strName.buf = pc; exp.strName.len = TokenLength(pc); + DbgPrint("Got name: '%.*s'\n", exp.strName.len, exp.strName.buf); /* Check for autoname */ if ((exp.strName.len == 1) && (exp.strName.buf[0] == '@')) @@ -699,7 +701,6 @@ if (exp.nCallingConvention != CC_EXTERN && exp.nCallingConvention != CC_STUB) { - //fprintf(stderr, "info: options:'%.10s'\n", pc); /* Go to next token */ if (!(pc = NextToken(pc))) {

1 0

[akhaldi] 63322: [CRT] * Update _sopen_s(). * Fixes some msvcrt tests. CORE-8080
by akhaldi＠svn.reactos.org 17 May '14

17 May '14

Author: akhaldi Date: Sat May 17 10:41:36 2014 New Revision: 63322 URL: http://svn.reactos.org/svn/reactos?rev=63322&view=rev Log: [CRT] * Update _sopen_s(). * Fixes some msvcrt tests. CORE-8080 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sat May 17 10:41:36 2014 @@ -1842,94 +1842,15 @@ */ int CDECL _sopen_s( int *fd, const char *path, int oflags, int shflags, int pmode ) { - DWORD access = 0, creation = 0, attrib; - DWORD sharing; - int wxflag; - HANDLE hand; - SECURITY_ATTRIBUTES sa; - - TRACE("fd*: %p file: (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x\n", - fd, path, oflags, shflags, pmode); - - if (!fd) - { - MSVCRT_INVALID_PMT("null out fd pointer", EINVAL); - return EINVAL; - } - - *fd = -1; - wxflag = split_oflags(oflags); - switch (oflags & (_O_RDONLY | _O_WRONLY | _O_RDWR)) - { - case _O_RDONLY: access |= GENERIC_READ; break; - case _O_WRONLY: access |= GENERIC_WRITE; break; - case _O_RDWR: access |= GENERIC_WRITE | GENERIC_READ; break; - } - - if (oflags & _O_CREAT) - { - if(pmode & ~(_S_IREAD | _S_IWRITE)) - FIXME(": pmode 0x%04x ignored\n", pmode); - else - WARN(": pmode 0x%04x ignored\n", pmode); - - if (oflags & _O_EXCL) - creation = CREATE_NEW; - else if (oflags & _O_TRUNC) - creation = CREATE_ALWAYS; - else - creation = OPEN_ALWAYS; - } - else /* no _O_CREAT */ - { - if (oflags & _O_TRUNC) - creation = TRUNCATE_EXISTING; - else - creation = OPEN_EXISTING; - } - - switch( shflags ) - { - case _SH_DENYRW: - sharing = 0L; - break; - case _SH_DENYWR: - sharing = FILE_SHARE_READ; - break; - case _SH_DENYRD: - sharing = FILE_SHARE_WRITE; - break; - case _SH_DENYNO: - sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; - break; - default: - ERR( "Unhandled shflags 0x%x\n", shflags ); - return EINVAL; - } - attrib = FILE_ATTRIBUTE_NORMAL; - - if (oflags & _O_TEMPORARY) - { - attrib |= FILE_FLAG_DELETE_ON_CLOSE; - access |= DELETE; - sharing |= FILE_SHARE_DELETE; - } - - sa.nLength = sizeof( SECURITY_ATTRIBUTES ); - sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = (oflags & _O_NOINHERIT) ? FALSE : TRUE; - - hand = CreateFileA(path, access, sharing, &sa, creation, attrib, 0); - if (hand == INVALID_HANDLE_VALUE) { - WARN(":failed-last error (%d)\n", GetLastError()); - _dosmaperr(GetLastError()); - return *_errno(); - } - - *fd = alloc_fd(hand, wxflag); - - TRACE(":fd (%d) handle (%p)\n", *fd, hand); - return 0; + wchar_t *pathW; + int ret; + + if(!MSVCRT_CHECK_PMT(path && (pathW = msvcrt_wstrdupa(path)))) + return EINVAL; + + ret = _wsopen_s(fd, pathW, oflags, shflags, pmode); + free(pathW); + return ret; } /*********************************************************************

1 0

[akhaldi] 63321: [CRT] * Import _chsize_s(). * Update _chsize(). CORE-8080
by akhaldi＠svn.reactos.org 17 May '14

17 May '14

Author: akhaldi Date: Sat May 17 10:35:35 2014 New Revision: 63321 URL: http://svn.reactos.org/svn/reactos?rev=63321&view=rev Log: [CRT] * Import _chsize_s(). * Update _chsize(). CORE-8080 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sat May 17 10:35:35 2014 @@ -1198,15 +1198,17 @@ } /********************************************************************* - * _chsize (MSVCRT.@) - */ -int CDECL _chsize(int fd, long size) -{ - LONG cur, pos; + * _chsize_s (MSVCRT.@) + */ +int CDECL _chsize_s(int fd, __int64 size) +{ + __int64 cur, pos; HANDLE handle; BOOL ret = FALSE; - TRACE("(fd=%d, size=%d)\n", fd, size); + TRACE("(fd=%d, size=%s)\n", fd, wine_dbgstr_longlong(size)); + + if (!MSVCRT_CHECK_PMT(size >= 0)) return EINVAL; LOCK_FILES(); @@ -1214,10 +1216,10 @@ if (handle != INVALID_HANDLE_VALUE) { /* save the current file pointer */ - cur = _lseek(fd, 0, SEEK_CUR); + cur = _lseeki64(fd, 0, SEEK_CUR); if (cur >= 0) { - pos = _lseek(fd, size, SEEK_SET); + pos = _lseeki64(fd, size, SEEK_SET); if (pos >= 0) { ret = SetEndOfFile(handle); @@ -1225,12 +1227,21 @@ } /* restore the file pointer */ - _lseek(fd, cur, SEEK_SET); + _lseeki64(fd, cur, SEEK_SET); } } UNLOCK_FILES(); - return ret ? 0 : -1; + return ret ? 0 : *_errno(); +} + +/********************************************************************* + * _chsize (MSVCRT.@) + */ +int CDECL _chsize(int fd, long size) +{ + /* _chsize_s returns errno on failure but _chsize should return -1 */ + return _chsize_s( fd, size ) == 0 ? 0 : -1; } /*********************************************************************

1 0

[akhaldi] 63320: [CRT] * Update _fseeki64(). * Fixes some msvcrt tests. CORE-8080
by akhaldi＠svn.reactos.org 17 May '14

17 May '14

Author: akhaldi Date: Sat May 17 10:28:57 2014 New Revision: 63320 URL: http://svn.reactos.org/svn/reactos?rev=63320&view=rev Log: [CRT] * Update _fseeki64(). * Fixes some msvcrt tests. CORE-8080 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sat May 17 10:28:57 2014 @@ -1170,19 +1170,10 @@ flush_buffer(file); if(whence == SEEK_CUR && file->_flag & _IOREAD ) { - offset -= file->_cnt; - if (get_ioinfo(file->_file)->wxflag & WX_TEXT) { - /* Black magic correction for CR removal */ - int i; - for (i=0; i<file->_cnt; i++) { - if (file->_ptr[i] == '\n') - offset--; - } - /* Black magic when reading CR at buffer boundary*/ - if(get_ioinfo(file->_file)->wxflag & WX_READCR) - offset--; - } - } + whence = SEEK_SET; + offset += _ftelli64(file); + } + /* Discard buffered input */ file->_cnt = 0; file->_ptr = file->_base;

1 0

[jimtabor] 63319: [ConSrv] - Move Alt-Escape, Space and Tab to ConWndProc, disable GuiProcessKeyCallback. - Alt-Space was not getting launched out of GuiProcessKeyCallback. The key needed translate...
by jimtabor＠svn.reactos.org 17 May '14

17 May '14

Author: jimtabor Date: Sat May 17 02:15:50 2014 New Revision: 63319 URL: http://svn.reactos.org/svn/reactos?rev=63319&view=rev Log: [ConSrv] - Move Alt-Escape, Space and Tab to ConWndProc, disable GuiProcessKeyCallback. - Alt-Space was not getting launched out of GuiProcessKeyCallback. The key needed translated. - Reduce code for system menus. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Sat May 17 02:15:50 2014 @@ -255,7 +255,7 @@ { MENUITEMINFOW mii; WCHAR szMenuStringBack[255]; - const WCHAR *ptrTab; + WCHAR *ptrTab; HMENU hMenu = GetSystemMenu(hWnd, FALSE); if (hMenu != NULL) { @@ -269,9 +269,7 @@ ptrTab = wcschr(szMenuStringBack, '\t'); if (ptrTab) { - mii.cch = (int)( ptrTab - szMenuStringBack); - RtlZeroMemory((PVOID)ptrTab, mii.cch); - + *ptrTab = '\0'; mii.cch = wcslen(szMenuStringBack); SetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii); @@ -1926,6 +1924,11 @@ GuiConsoleSwitchFullScreen(GuiData); break; + } + /* Detect Alt-Esc/Space/Tab presses defer to DefWindowProc */ + if ( (HIWORD(lParam) & KF_ALTDOWN) && (wParam == VK_ESCAPE || wParam == VK_SPACE || wParam == VK_TAB)) + { + return DefWindowProcW(hWnd, msg, wParam, lParam); } OnKey(GuiData, msg, wParam, lParam); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sat May 17 02:15:50 2014 @@ -806,8 +806,9 @@ if ((ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED) || KeyStateMenu & 0x80) && (VirtualKeyCode == VK_ESCAPE || VirtualKeyCode == VK_TAB || VirtualKeyCode == VK_SPACE)) { - DefWindowProcW(msg->hwnd, msg->message, msg->wParam, msg->lParam); - return TRUE; + DPRINT1("GuiProcessKeyCallback\n"); + //DefWindowProcW(msg->hwnd, msg->message, msg->wParam, msg->lParam); + //return TRUE; } return FALSE;

1 0

[jimtabor] 63318: [ConSrv] - Readjust the bytes to wide character size.
by jimtabor＠svn.reactos.org 16 May '14

16 May '14

Author: jimtabor Date: Fri May 16 21:05:37 2014 New Revision: 63318 URL: http://svn.reactos.org/svn/reactos?rev=63318&view=rev Log: [ConSrv] - Readjust the bytes to wide character size. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Fri May 16 21:05:37 2014 @@ -262,7 +262,7 @@ mii.cbSize = sizeof(mii); mii.fMask = MIIM_STRING; mii.dwTypeData = szMenuStringBack; - mii.cch = sizeof(szMenuStringBack); + mii.cch = sizeof(szMenuStringBack)/sizeof(WCHAR); GetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii); @@ -271,6 +271,7 @@ { mii.cch = (int)( ptrTab - szMenuStringBack); RtlZeroMemory((PVOID)ptrTab, mii.cch); + mii.cch = wcslen(szMenuStringBack); SetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii);

1 0

[jimtabor] 63317: [NtUser|User32] - Fully strip the Atl-F4 from the Pop Up System Menu. - Fix menu.c:1418: Test failed: InsertMenuItem should have failed. Both A/W... - Fix menu key by Item when cl...
by jimtabor＠svn.reactos.org 16 May '14

16 May '14

Author: jimtabor Date: Fri May 16 20:43:23 2014 New Revision: 63317 URL: http://svn.reactos.org/svn/reactos?rev=63317&view=rev Log: [NtUser|User32] - Fully strip the Atl-F4 from the Pop Up System Menu. - Fix menu.c:1418: Test failed: InsertMenuItem should have failed. Both A/W... - Fix menu key by Item when cloning menus. Modified: trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/menu.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Fri May 16 20:43:23 2014 @@ -150,7 +150,6 @@ UINT i; if (!pMenu) return NULL; - ERR("VerifyMenu 1!\n"); _SEH2_TRY { hMenu = UserHMGetHandle(pMenu); @@ -167,10 +166,13 @@ _SEH2_YIELD(return NULL); } _SEH2_END - ERR("VerifyMenu 2!\n"); + if ( UserObjectInDestroy(hMenu)) + { + ERR("Menu is marked for destruction!\n"); return NULL; - ERR("VerifyMenu 3!\n"); + } + return pMenu; } @@ -533,28 +535,24 @@ NewMenuItem->hbmpChecked = MenuItem->hbmpChecked; NewMenuItem->hbmpUnchecked = MenuItem->hbmpUnchecked; NewMenuItem->dwItemData = MenuItem->dwItemData; - if((MENU_ITEM_TYPE(NewMenuItem->fType) == MF_STRING)) + if (MenuItem->lpstr.Length) { - if(MenuItem->lpstr.Length) + NewMenuItem->lpstr.Length = 0; + NewMenuItem->lpstr.MaximumLength = MenuItem->lpstr.MaximumLength; + NewMenuItem->lpstr.Buffer = DesktopHeapAlloc(Destination->head.rpdesk, MenuItem->lpstr.MaximumLength); + if (!NewMenuItem->lpstr.Buffer) { - NewMenuItem->lpstr.Length = 0; - NewMenuItem->lpstr.MaximumLength = MenuItem->lpstr.MaximumLength; - NewMenuItem->lpstr.Buffer = DesktopHeapAlloc(Destination->head.rpdesk, MenuItem->lpstr.MaximumLength); - if(!NewMenuItem->lpstr.Buffer) - { - DesktopHeapFree(Destination->head.rpdesk, NewMenuItem); - break; - } - RtlCopyUnicodeString(&NewMenuItem->lpstr, &MenuItem->lpstr); + DesktopHeapFree(Destination->head.rpdesk, NewMenuItem); + break; } - else - { - NewMenuItem->lpstr.Buffer = MenuItem->lpstr.Buffer; - } + RtlCopyUnicodeString(&NewMenuItem->lpstr, &MenuItem->lpstr); + NewMenuItem->lpstr.Buffer[MenuItem->lpstr.Length / sizeof(WCHAR)] = 0; + NewMenuItem->Xlpstr = NewMenuItem->lpstr.Buffer; } else { NewMenuItem->lpstr.Buffer = MenuItem->lpstr.Buffer; + NewMenuItem->Xlpstr = NewMenuItem->lpstr.Buffer; } NewMenuItem->hbmp = MenuItem->hbmp; } @@ -773,6 +771,7 @@ IntSetMenuItemInfo(PMENU MenuObject, PITEM MenuItem, PROSMENUITEMINFO lpmii, PUNICODE_STRING lpstr) { PMENU SubMenuObject; + BOOL circref = FALSE; if(!MenuItem || !MenuObject || !lpmii) { @@ -846,17 +845,28 @@ if(lpmii->fMask & MIIM_SUBMENU) { - /* Make sure the submenu is marked as a popup menu */ if (lpmii->hSubMenu) { SubMenuObject = UserGetMenuObject(lpmii->hSubMenu); - if (SubMenuObject != NULL) + if ( SubMenuObject && !(UserObjectInDestroy(lpmii->hSubMenu)) ) { - if ( MENU_depth( SubMenuObject, 0) > MAXMENUDEPTH) + //// wine Bug 12171 : Adding Popup Menu to itself! Could create endless loops. + //// CORE-7967. + if (MenuObject == SubMenuObject) + { + HANDLE hMenu; + ERR("Pop Up Menu Double Trouble!\n"); + SubMenuObject = IntCreateMenu(&hMenu, FALSE); // It will be marked. + if (!SubMenuObject) return FALSE; + circref = TRUE; + } + if ( MENU_depth( SubMenuObject, 0) > MAXMENUDEPTH ) { ERR( "Loop detected in menu hierarchy or maximum menu depth exceeded!\n"); + if (circref) IntDestroyMenuObject(SubMenuObject, FALSE, TRUE); return FALSE; } + /* Make sure the submenu is marked as a popup menu */ SubMenuObject->fFlags |= MNF_POPUP; // Now fix the test_subpopup_locked_by_menu tests.... if (MenuItem->spSubMenu) IntReleaseMenuObject(MenuItem->spSubMenu); @@ -1436,6 +1446,34 @@ } BOOL FASTCALL +IntMenuItemInfo( + PMENU Menu, + UINT Item, + BOOL ByPosition, + PROSMENUITEMINFO ItemInfo, + BOOL SetOrGet, + PUNICODE_STRING lpstr) +{ + PITEM MenuItem; + BOOL Ret; + + if (!(MenuItem = MENU_FindItem( &Menu, &Item, (ByPosition ? MF_BYPOSITION : MF_BYCOMMAND) ))) + { + EngSetLastError(ERROR_MENU_ITEM_NOT_FOUND); + return( FALSE); + } + if (SetOrGet) + { + Ret = IntSetMenuItemInfo(Menu, MenuItem, ItemInfo, lpstr); + } + else + { + Ret = IntGetMenuItemInfo(Menu, MenuItem, ItemInfo); + } + return( Ret); +} + +BOOL FASTCALL UserMenuItemInfo( PMENU Menu, UINT Item, @@ -1925,15 +1963,10 @@ //kmbi.fBarFocused = top_popup_hmenu == hMenu; if (idItem) { - //PITEM MenuItem; - //UINT nPos = idItem-1; kmbi.fFocused = Menu->iItem == idItem-1; if (kmbi.fFocused && (Menu->rgItems[idItem - 1].spSubMenu)) - //MenuItem = MENU_FindItem (&Menu, &nPos, MF_BYPOSITION); - //if ( MenuItem && kmbi.fFocused && MenuItem->spSubMenu ) { kmbi.hwndMenu = Menu->rgItems[idItem - 1].spSubMenu->hWnd; - //kmbi.hwndMenu = MenuItem->spSubMenu->hWnd; } } /* else Modified: trunk/reactos/win32ss/user/ntuser/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.h [iso-8859-1] Fri May 16 20:43:23 2014 @@ -47,3 +47,4 @@ UINT FASTCALL IntGetMenuState( HMENU hMenu, UINT uId, UINT uFlags); BOOL FASTCALL IntRemoveMenuItem(PMENU Menu, UINT uPosition, UINT uFlags, BOOL bRecurse); PITEM FASTCALL MENU_FindItem( PMENU *pmenu, UINT *nPos, UINT wFlags ); +BOOL FASTCALL IntMenuItemInfo(PMENU Menu, UINT Item, BOOL ByPosition, PROSMENUITEMINFO UnsafeItemInfo, BOOL SetOrGet, PUNICODE_STRING lpstr); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Fri May 16 20:43:23 2014 @@ -254,13 +254,27 @@ CreateSysMenu(HWND hWnd) { MENUITEMINFOW mii; + WCHAR szMenuStringBack[255]; + const WCHAR *ptrTab; HMENU hMenu = GetSystemMenu(hWnd, FALSE); if (hMenu != NULL) { mii.cbSize = sizeof(mii); mii.fMask = MIIM_STRING; - mii.dwTypeData = L"&Close"; - SetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii); + mii.dwTypeData = szMenuStringBack; + mii.cch = sizeof(szMenuStringBack); + + GetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii); + + ptrTab = wcschr(szMenuStringBack, '\t'); + if (ptrTab) + { + mii.cch = (int)( ptrTab - szMenuStringBack); + RtlZeroMemory((PVOID)ptrTab, mii.cch); + mii.cch = wcslen(szMenuStringBack); + + SetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii); + } AppendMenuItems(hMenu, GuiConsoleMainMenuItems); DrawMenuBar(hWnd);

1 0

[dquintana] 63316: [WIN32K/NTUSER] * HSHELL_WINDOWCREATED should only be sent for visible windows. CORE-8226 #resolve #comment Fixed in the latest commit. Thanks for reporting.
by dquintana＠svn.reactos.org 16 May '14

16 May '14

Author: dquintana Date: Fri May 16 19:13:12 2014 New Revision: 63316 URL: http://svn.reactos.org/svn/reactos?rev=63316&view=rev Log: [WIN32K/NTUSER] * HSHELL_WINDOWCREATED should only be sent for visible windows. CORE-8226 #resolve #comment Fixed in the latest commit. Thanks for reporting. Modified: branches/shell-experiments/win32ss/user/ntuser/window.c Modified: branches/shell-experiments/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/window.c [iso-8859-1] Fri May 16 19:13:12 2014 @@ -2430,6 +2430,7 @@ /* Notify the shell that a new window was created */ if (Window->spwndParent == UserGetDesktopWindow() && Window->spwndOwner == NULL && + (Window->style & WS_VISIBLE) && (!(Window->ExStyle & WS_EX_TOOLWINDOW) || (Window->ExStyle & WS_EX_APPWINDOW))) {

1 0

[jimtabor] 63315: [ConSrv] - Strip the Atl-F4 from the Pop Up System Menu since we do not support it.
by jimtabor＠svn.reactos.org 16 May '14

16 May '14

Author: jimtabor Date: Fri May 16 18:26:00 2014 New Revision: 63315 URL: http://svn.reactos.org/svn/reactos?rev=63315&view=rev Log: [ConSrv] - Strip the Atl-F4 from the Pop Up System Menu since we do not support it. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Fri May 16 18:26:00 2014 @@ -253,9 +253,15 @@ static VOID CreateSysMenu(HWND hWnd) { + MENUITEMINFOW mii; HMENU hMenu = GetSystemMenu(hWnd, FALSE); if (hMenu != NULL) { + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STRING; + mii.dwTypeData = L"&Close"; + SetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii); + AppendMenuItems(hMenu, GuiConsoleMainMenuItems); DrawMenuBar(hWnd); }

1 0

[khornicek] 63314: [OPENGL32] - don't try to free an invalid address
by khornicek＠svn.reactos.org 16 May '14

16 May '14

Author: khornicek Date: Fri May 16 15:52:15 2014 New Revision: 63314 URL: http://svn.reactos.org/svn/reactos?rev=63314&view=rev Log: [OPENGL32] - don't try to free an invalid address Modified: trunk/reactos/dll/opengl/opengl32/wgl_font.c Modified: trunk/reactos/dll/opengl/opengl32/wgl_font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/wgl_fo… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/wgl_font.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/wgl_font.c [iso-8859-1] Fri May 16 15:52:15 2014 @@ -347,7 +347,7 @@ BYTE *buf; TTPOLYGONHEADER *pph; TTPOLYCURVE *ppc; - GLdouble *vertices = NULL; + GLdouble *vertices = NULL, *vertices_temp = NULL; int vertex_total = -1; if(unicode) @@ -359,6 +359,9 @@ goto error; buf = HeapAlloc(GetProcessHeap(), 0, needed); + + if(!buf) + goto error; if(unicode) GetGlyphOutlineW(hdc, glyph, GGO_NATIVE, &gm, needed, buf, &identity); @@ -393,7 +396,7 @@ while(!vertices) { if(vertex_total != -1) - vertices = HeapAlloc(GetProcessHeap(), 0, vertex_total * 3 * sizeof(GLdouble)); + vertices_temp = vertices = HeapAlloc(GetProcessHeap(), 0, vertex_total * 3 * sizeof(GLdouble)); vertex_total = 0; pph = (TTPOLYGONHEADER*)buf; @@ -521,8 +524,11 @@ pgluTessEndPolygon(tess); funcs->Translated((GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0); funcs->EndList(); + HeapFree(GetProcessHeap(), 0, buf); - HeapFree(GetProcessHeap(), 0, vertices); + + if(vertices_temp) + HeapFree(GetProcessHeap(), 0, vertices_temp); } error:

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