Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[hbelusca] 74117: [PSDK][NDK]: Add AddVectoredContinueHandler, RemoveVectoredContinueHandler, and RtlRemoveVectoredExceptionHandler, RtlAddVectoredContinueHandler and RtlRemoveVectoredContinueHandl...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 6 19:04:17 2017 New Revision: 74117 URL: http://svn.reactos.org/svn/reactos?rev=74117&view=rev Log: [PSDK][NDK]: Add AddVectoredContinueHandler, RemoveVectoredContinueHandler, and RtlRemoveVectoredExceptionHandler, RtlAddVectoredContinueHandler and RtlRemoveVectoredContinueHandler to our headers. Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h trunk/reactos/sdk/include/psdk/winbase.h Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] Mon Mar 6 19:04:17 2017 @@ -619,6 +619,42 @@ _In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler ); +NTSYSAPI +ULONG +NTAPI +RtlRemoveVectoredExceptionHandler( + _In_ PVOID VectoredHandlerHandle +); + +NTSYSAPI +PVOID +NTAPI +RtlAddVectoredContinueHandler( + _In_ ULONG FirstHandler, + _In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler +); + +NTSYSAPI +ULONG +NTAPI +RtlRemoveVectoredContinueHandler( + _In_ PVOID VectoredHandlerHandle +); + +NTSYSAPI +VOID +NTAPI +RtlSetUnhandledExceptionFilter( + _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter +); + +NTSYSAPI +LONG +NTAPI +RtlUnhandledExceptionFilter( + _In_ struct _EXCEPTION_POINTERS* ExceptionInfo +); + __analysis_noreturn NTSYSAPI VOID @@ -628,20 +664,6 @@ _In_ PVOID FileName, _In_ ULONG LineNumber, _In_opt_z_ PCHAR Message -); - -NTSYSAPI -VOID -NTAPI -RtlSetUnhandledExceptionFilter( - _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter -); - -NTSYSAPI -LONG -NTAPI -RtlUnhandledExceptionFilter( - _In_ struct _EXCEPTION_POINTERS* ExceptionInfo ); NTSYSAPI Modified: trunk/reactos/sdk/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winbase.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winbase.h [iso-8859-1] Mon Mar 6 19:04:17 2017 @@ -1467,6 +1467,7 @@ #endif #if (_WIN32_WINNT >= 0x0500) _Ret_maybenull_ PVOID WINAPI AddVectoredExceptionHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER); +_Ret_maybenull_ PVOID WINAPI AddVectoredContinueHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER); #endif BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD); @@ -2882,6 +2883,7 @@ BOOL WINAPI RemoveDirectoryW(LPCWSTR); #if (_WIN32_WINNT >= 0x0500) ULONG WINAPI RemoveVectoredExceptionHandler(_In_ PVOID); +ULONG WINAPI RemoveVectoredContinueHandler(_In_ PVOID); #endif #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI ReplaceFileA(_In_ LPCSTR, _In_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD, _Reserved_ LPVOID, _Reserved_ LPVOID);

7 years, 6 months

[jimtabor] 74116: [NtUser] - Remove scroll bar search that sends another WM_NCCALCSIZE message. Use wine as an example. See CORE-12827.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Mar 6 18:28:03 2017 New Revision: 74116 URL: http://svn.reactos.org/svn/reactos?rev=74116&view=rev Log: [NtUser] - Remove scroll bar search that sends another WM_NCCALCSIZE message. Use wine as an example. See CORE-12827. Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c trunk/reactos/win32ss/user/ntuser/scrollbar.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Mon Mar 6 18:28:03 2017 @@ -1171,7 +1171,8 @@ LRESULT Result = 0; SIZE WindowBorders; RECT OrigRect; - DWORD Style = Wnd->style; + LONG Style = Wnd->style; + LONG exStyle = Wnd->ExStyle; if (Rect == NULL) { @@ -1239,83 +1240,30 @@ RECTL_vInflateRect(Rect, -2 * UserGetSystemMetrics(SM_CXBORDER), -2 * UserGetSystemMetrics(SM_CYBORDER)); } - if (Wnd->style & (WS_VSCROLL | WS_HSCROLL)) - { - SCROLLBARINFO sbi; - SETSCROLLBARINFO ssbi; - - sbi.cbSize = sizeof(SCROLLBARINFO); - if ((Style & WS_VSCROLL) && co_IntGetScrollBarInfo(Wnd, OBJID_VSCROLL, &sbi)) - { - int i; - LONG sx = Rect->right; - - Wnd->state |= WNDS_HASVERTICALSCROOLLBAR; - - sx -= UserGetSystemMetrics(SM_CXVSCROLL); - - for (i = 0; i <= CCHILDREN_SCROLLBAR; i++) - ssbi.rgstate[i] = sbi.rgstate[i]; - - if (sx <= Rect->left) - ssbi.rgstate[0] |= STATE_SYSTEM_OFFSCREEN; - else - ssbi.rgstate[0] &= ~STATE_SYSTEM_OFFSCREEN; - - co_IntSetScrollBarInfo(Wnd, OBJID_VSCROLL, &ssbi); - - if (ssbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN) - Style &= ~WS_VSCROLL; - } - else - Style &= ~WS_VSCROLL; - - if ((Style & WS_HSCROLL) && co_IntGetScrollBarInfo(Wnd, OBJID_HSCROLL, &sbi)) - { - int i; - LONG sy = Rect->bottom; - - Wnd->state |= WNDS_HASHORIZONTALSCROLLBAR; - - sy -= UserGetSystemMetrics(SM_CYHSCROLL); - - for (i = 0; i <= CCHILDREN_SCROLLBAR; i++) - ssbi.rgstate[i] = sbi.rgstate[i]; - - if (sy <= Rect->top) - ssbi.rgstate[0] |= STATE_SYSTEM_OFFSCREEN; - else - ssbi.rgstate[0] &= ~STATE_SYSTEM_OFFSCREEN; - - co_IntSetScrollBarInfo(Wnd, OBJID_HSCROLL, &ssbi); - - if (ssbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN) - Style &= ~WS_HSCROLL; - } - else - Style &= ~WS_HSCROLL; - } - - if ((Style & WS_VSCROLL) && (Style & WS_HSCROLL)) - { - if ((Wnd->ExStyle & WS_EX_LEFTSCROLLBAR) != 0) - Rect->left += UserGetSystemMetrics(SM_CXVSCROLL); - else - Rect->right -= UserGetSystemMetrics(SM_CXVSCROLL); - - Rect->bottom -= UserGetSystemMetrics(SM_CYHSCROLL); - } - else - { - if (Style & WS_VSCROLL) + if (Style & WS_VSCROLL) + { + if (Rect->right - Rect->left >= UserGetSystemMetrics(SM_CXVSCROLL)) { - if ((Wnd->ExStyle & WS_EX_LEFTSCROLLBAR) != 0) - Rect->left += UserGetSystemMetrics(SM_CXVSCROLL); - else - Rect->right -= UserGetSystemMetrics(SM_CXVSCROLL); + Wnd->state |= WNDS_HASVERTICALSCROOLLBAR; + + /* rectangle is in screen coords when wparam is false */ + if (!wparam && (exStyle & WS_EX_LAYOUTRTL)) exStyle ^= WS_EX_LEFTSCROLLBAR; + + if((exStyle & WS_EX_LEFTSCROLLBAR) != 0) + Rect->left += UserGetSystemMetrics(SM_CXVSCROLL); + else + Rect->right -= UserGetSystemMetrics(SM_CXVSCROLL); + } + } + + if (Style & WS_HSCROLL) + { + if( Rect->bottom - Rect->top > UserGetSystemMetrics(SM_CYHSCROLL)) + { + Wnd->state |= WNDS_HASHORIZONTALSCROLLBAR; + + Rect->bottom -= UserGetSystemMetrics(SM_CYHSCROLL); } - else if (Style & WS_HSCROLL) - Rect->bottom -= UserGetSystemMetrics(SM_CYHSCROLL); } if (Rect->top > Rect->bottom) Modified: trunk/reactos/win32ss/user/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] Mon Mar 6 18:28:03 2017 @@ -358,6 +358,106 @@ return (Mask & SIF_ALL) !=0; } +/************************************************************************* + * SCROLL_GetScrollBarInfo + * + * Internal helper for the API function + * + * PARAMS + * hwnd [I] Handle of window with scrollbar(s) + * idObject [I] One of OBJID_CLIENT, OBJID_HSCROLL, or OBJID_VSCROLL + * info [IO] cbSize specifies the size of the structure + * + * RETURNS + * FALSE if failed + */ +#if 0 +static BOOL SCROLL_GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO info) +{ + LPSCROLLBAR_INFO infoPtr; + INT nBar; + INT nDummy; + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + BOOL pressed; + RECT rect; + + switch (idObject) + { + case OBJID_CLIENT: nBar = SB_CTL; break; + case OBJID_HSCROLL: nBar = SB_HORZ; break; + case OBJID_VSCROLL: nBar = SB_VERT; break; + default: return FALSE; + } + + /* handle invalid data structure */ + if (info->cbSize != sizeof(*info)) + return FALSE; + + SCROLL_GetScrollBarRect(hwnd, nBar, &info->rcScrollBar, &nDummy, + &info->dxyLineButton, &info->xyThumbTop); + /* rcScrollBar needs to be in screen coordinates */ + GetWindowRect(hwnd, &rect); + OffsetRect(&info->rcScrollBar, rect.left, rect.top); + + info->xyThumbBottom = info->xyThumbTop + info->dxyLineButton; + + infoPtr = SCROLL_GetInternalInfo(hwnd, nBar, TRUE); + if (!infoPtr) + return FALSE; + + /* Scroll bar state */ + info->rgstate[0] = 0; + if ((nBar == SB_HORZ && !(style & WS_HSCROLL)) + || (nBar == SB_VERT && !(style & WS_VSCROLL))) + info->rgstate[0] |= STATE_SYSTEM_INVISIBLE; + if (infoPtr->minVal >= infoPtr->maxVal - max(infoPtr->page - 1, 0)) + { + if (!(info->rgstate[0] & STATE_SYSTEM_INVISIBLE)) + info->rgstate[0] |= STATE_SYSTEM_UNAVAILABLE; + else + info->rgstate[0] |= STATE_SYSTEM_OFFSCREEN; + } + if (nBar == SB_CTL && !IsWindowEnabled(hwnd)) + info->rgstate[0] |= STATE_SYSTEM_UNAVAILABLE; + + pressed = ((nBar == SB_VERT) == SCROLL_trackVertical && GetCapture() == hwnd); + + /* Top/left arrow button state. MSDN says top/right, but I don't believe it */ + info->rgstate[1] = 0; + if (pressed && SCROLL_trackHitTest == SCROLL_TOP_ARROW) + info->rgstate[1] |= STATE_SYSTEM_PRESSED; + if (infoPtr->flags & ESB_DISABLE_LTUP) + info->rgstate[1] |= STATE_SYSTEM_UNAVAILABLE; + + /* Page up/left region state. MSDN says up/right, but I don't believe it */ + info->rgstate[2] = 0; + if (infoPtr->curVal == infoPtr->minVal) + info->rgstate[2] |= STATE_SYSTEM_INVISIBLE; + if (pressed && SCROLL_trackHitTest == SCROLL_TOP_RECT) + info->rgstate[2] |= STATE_SYSTEM_PRESSED; + + /* Thumb state */ + info->rgstate[3] = 0; + if (pressed && SCROLL_trackHitTest == SCROLL_THUMB) + info->rgstate[3] |= STATE_SYSTEM_PRESSED; + + /* Page down/right region state. MSDN says down/left, but I don't believe it */ + info->rgstate[4] = 0; + if (infoPtr->curVal >= infoPtr->maxVal - 1) + info->rgstate[4] |= STATE_SYSTEM_INVISIBLE; + if (pressed && SCROLL_trackHitTest == SCROLL_BOTTOM_RECT) + info->rgstate[4] |= STATE_SYSTEM_PRESSED; + + /* Bottom/right arrow button state. MSDN says bottom/left, but I don't believe it */ + info->rgstate[5] = 0; + if (pressed && SCROLL_trackHitTest == SCROLL_BOTTOM_ARROW) + info->rgstate[5] |= STATE_SYSTEM_PRESSED; + if (infoPtr->flags & ESB_DISABLE_RTDN) + info->rgstate[5] |= STATE_SYSTEM_UNAVAILABLE; + + return TRUE; +} +#endif static DWORD FASTCALL co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) { @@ -575,6 +675,21 @@ IntGetScrollBarRect(Window, Bar, &(sbi->rcScrollBar)); IntCalculateThumb(Window, Bar, sbi, pSBData); + /* Scroll bar state */ + psbi->rgstate[0] = 0; + if ((Bar == SB_HORZ && !(Window->style & WS_HSCROLL)) + || (Bar == SB_VERT && !(Window->style & WS_VSCROLL))) + psbi->rgstate[0] |= STATE_SYSTEM_INVISIBLE; + if (pSBData->posMin >= pSBData->posMax - max(pSBData->page - 1, 0)) + { + if (!(psbi->rgstate[0] & STATE_SYSTEM_INVISIBLE)) + psbi->rgstate[0] |= STATE_SYSTEM_UNAVAILABLE; + else + psbi->rgstate[0] |= STATE_SYSTEM_OFFSCREEN; + } + if (Bar == SB_CTL && !(Window->style & WS_DISABLED)) + psbi->rgstate[0] |= STATE_SYSTEM_UNAVAILABLE; + RtlCopyMemory(psbi, sbi, sizeof(SCROLLBARINFO)); return TRUE;

7 years, 6 months

[hbelusca] 74115: [REACTOS-CLT2017]: Cherry-pick few trunk improvements/fixes: - [UXTHME] Implement drawing themed text with shadows, by Giannis (r74083) - [MKISOFS] Update mkisofs to schily-2017-0...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 6 00:13:43 2017 New Revision: 74115 URL: http://svn.reactos.org/svn/reactos?rev=74115&view=rev Log: [REACTOS-CLT2017]: Cherry-pick few trunk improvements/fixes: - [UXTHME] Implement drawing themed text with shadows, by Giannis (r74083) - [MKISOFS] Update mkisofs to schily-2017-02-16, by Colin (r74112) Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/draw.c branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/nonclient.c branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 6 00:13:43 2017 @@ -24,3 +24,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 +/trunk/reactos:74083,74112 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -1617,6 +1617,9 @@ return E_NOTIMPL; } +typedef int (WINAPI * DRAWSHADOWTEXT)(HDC hdc, LPCWSTR pszText, UINT cch, RECT *prc, DWORD dwFlags, + COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset); + /*********************************************************************** * DrawThemeText (UXTHEME.@) */ @@ -1630,34 +1633,89 @@ LOGFONTW logfont; COLORREF textColor; COLORREF oldTextColor; + COLORREF shadowColor; + POINT ptShadowOffset; int oldBkMode; RECT rt; - + int iShadowType; + TRACE("%d %d: stub\n", iPartId, iStateId); if(!hTheme) return E_HANDLE; - + hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hr)) + { hFont = CreateFontIndirectW(&logfont); if(!hFont) - TRACE("Failed to create font\n"); - } + { + ERR("Failed to create font\n"); + } + } + CopyRect(&rt, pRect); if(hFont) oldFont = SelectObject(hdc, hFont); - + + oldBkMode = SetBkMode(hdc, TRANSPARENT); + if(dwTextFlags2 & DTT_GRAYED) textColor = GetSysColor(COLOR_GRAYTEXT); else { if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTCOLOR, &textColor))) textColor = GetTextColor(hdc); } + + hr = GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_TEXTSHADOWTYPE, &iShadowType); + if (SUCCEEDED(hr)) + { + ERR("Got shadow type %d\n", iShadowType); + + hr = GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTSHADOWCOLOR, &shadowColor); + if (FAILED(hr)) + { + ERR("GetThemeColor failed\n"); + } + + hr = GetThemePosition(hTheme, iPartId, iStateId, TMT_TEXTSHADOWOFFSET, &ptShadowOffset); + if (FAILED(hr)) + { + ERR("GetThemePosition failed\n"); + } + + if (iShadowType == TST_SINGLE) + { + oldTextColor = SetTextColor(hdc, shadowColor); + OffsetRect(&rt, ptShadowOffset.x, ptShadowOffset.y); + DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + OffsetRect(&rt, -ptShadowOffset.x, -ptShadowOffset.y); + SetTextColor(hdc, oldTextColor); + } + else if (iShadowType == TST_CONTINUOUS) + { + HANDLE hcomctl32 = GetModuleHandleW(L"comctl32.dll"); + DRAWSHADOWTEXT pDrawShadowText; + if (!hcomctl32) + { + hcomctl32 = LoadLibraryW(L"comctl32.dll"); + if (!hcomctl32) + ERR("Failed to load comctl32\n"); + } + + pDrawShadowText = (DRAWSHADOWTEXT)GetProcAddress(hcomctl32, "DrawShadowText"); + if (pDrawShadowText) + { + pDrawShadowText(hdc, pszText, iCharCount, &rt, dwTextFlags, textColor, shadowColor, ptShadowOffset.x, ptShadowOffset.y); + goto cleanup; + } + } + } + oldTextColor = SetTextColor(hdc, textColor); - oldBkMode = SetBkMode(hdc, TRANSPARENT); DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + SetTextColor(hdc, oldTextColor); +cleanup: SetBkMode(hdc, oldBkMode); - SetTextColor(hdc, oldTextColor); if(hFont) { SelectObject(hdc, oldFont); Modified: branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -136,7 +136,7 @@ oldTextColor = SetTextColor(hdc, textColor); oldBkMode = SetBkMode(hdc, TRANSPARENT); - DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + DrawThemeText(hTheme, hdc, iPartId, iStateId, pszText, iCharCount, dwTextFlags, dwTextFlags, pRect); SetBkMode(hdc, oldBkMode); SetTextColor(hdc, oldTextColor); Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -1,6 +1,6 @@ -/* @(#)version.h 1.92 16/01/26 Copyright 2007-2016 J. Schilling */ +/* @(#)version.h 1.93 16/12/15 Copyright 2007-2016 J. Schilling */ /* * The version for cdrtools programs */ -#define VERSION "3.02a06" +#define VERSION "3.02a07" Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -1,4 +1,4 @@ -/* @(#)schily.h 1.121 16/11/04 Copyright 1985-2016 J. Schilling */ +/* @(#)schily.h 1.122 16/12/18 Copyright 1985-2016 J. Schilling */ /* * Definitions for libschily * @@ -543,7 +543,7 @@ #ifdef __never__ #undef error #define error js_error -#endif +#endif /* __never__ */ #undef dprintf #define dprintf js_dprintf #undef fprintf @@ -558,9 +558,9 @@ #ifndef HAVE_SNPRINTF #undef snprintf #define snprintf js_snprintf -#endif -#endif -#endif +#endif /* HAVE_SNPRINTF */ +#endif /* SCHILY_PRINT */ +#endif /* NO_SCHILY_PRINT */ #ifndef NO_SCHILY_GETLINE /* Define to disable *getline() redirect */ #undef getline Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -1,11 +1,11 @@ -/* @(#)dirent.c 1.3 12/03/20 Copyright 2011 J. Schilling */ +/* @(#)dirent.c 1.4 17/02/02 Copyright 2011-2017 J. Schilling */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)dirent.c 1.3 12/03/20 Copyright 2011 J. Schilling"; + "@(#)dirent.c 1.4 17/02/02 Copyright 2011-2017 J. Schilling"; #endif /* - * Copyright (c) 2011 J. Schilling + * Copyright (c) 2011-2017 J. Schilling */ /* * The contents of this file are subject to the terms of the @@ -14,6 +14,8 @@ * with the License. * * See the file CDDL.Schily.txt in this distribution for details. + * A copy of the CDDL is also available via the Internet at + * http://www.opensource.org/licenses/cddl1.txt * * When distributing Covered Code, include this CDDL HEADER in each * file and include the License file CDDL.Schily.txt from this distribution. @@ -84,7 +86,8 @@ dp->dd_dirname[len] = '\\'; len++; } - dp->dd_dirname[len] = '*'; + dp->dd_dirname[len++] = '*'; + dp->dd_dirname[len] = '\0'; dp->dd_handle = -1; dp->dd_state = 0; Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c [iso-8859-1] Mon Mar 6 00:13:43 2017 @@ -1,8 +1,8 @@ -/* @(#)mkisofs.c 1.288 16/12/13 joerg */ +/* @(#)mkisofs.c 1.289 17/01/05 joerg */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)mkisofs.c 1.288 16/12/13 joerg"; + "@(#)mkisofs.c 1.289 17/01/05 joerg"; #endif /* * Program mkisofs.c - generate iso9660 filesystem based upon directory @@ -11,7 +11,7 @@ * Written by Eric Youngdale (1993). * * Copyright 1993 Yggdrasil Computing, Incorporated - * Copyright (c) 1997-2016 J. Schilling + * Copyright (c) 1997-2017 J. Schilling * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -132,14 +132,13 @@ int all_files = 1; /* New default is to include all files */ BOOL Hflag = FALSE; /* Follow links on cmdline (-H) */ BOOL follow_links = FALSE; /* Follow all links (-L) */ -#if defined(IS_CYGWIN) || defined(__MINGW32__) || defined(_MSC_VER) +#if defined(__MINGW32__) || defined(_MSC_VER) /* - * Do not cache inodes on Cygwin by default - * See below in main(), cache for 64bit ino_t + * Never cache inodes on DOS or Win-DOS. */ int cache_inodes = 0; #else -int cache_inodes = 1; /* Cache inodes if OS has unique inodes */ +int cache_inodes = -1; /* Cache inodes if OS has unique inodes */ #endif int rationalize = 0; /* Need to call stat_fix() */ int rationalize_uid = 0; @@ -2088,14 +2087,6 @@ modification_date.l_usec = tv_begun.tv_usec; modification_date.l_gmtoff = -100; -#if defined(IS_CYGWIN) - /* - * If we have 64 bit inode numbers, Cygwin should be able to work - * correctly on NTFS. - */ - if (sizeof (ino_t) >= 8) - cache_inodes = 1; -#endif cac--; cav++; c = getvargs(&cac, &cav, GA_NO_PROPS, flags); @@ -2119,7 +2110,7 @@ if (pversion) { printf(_("mkisofs %s (%s-%s-%s)\n\n\ Copyright (C) 1993-1997 %s\n\ -Copyright (C) 1997-2016 %s\n"), +Copyright (C) 1997-2017 %s\n"), version_string, HOST_CPU, HOST_VENDOR, HOST_OS, _("Eric Youngdale"), @@ -2212,6 +2203,25 @@ (Llong)strlen(biblio)); } } +#ifdef DUPLICATES_ONCE + /* + * If -duplicates-once was specified, do not implicitly enable + * -cache-inodes. + */ + if (cache_inodes < 0 && duplicates_once) + cache_inodes = 0; +#endif +#if defined(IS_CYGWIN) + /* + * If we have 64 bit inode numbers, Cygwin should be able to work + * correctly on NTFS, otherwise disable caching unless it has + * been enforced via -cache-inodes. + */ + if (cache_inodes < 0 && sizeof (ino_t) < 8) + cache_inodes = 0; +#endif + if (cache_inodes < 0) + cache_inodes = 1; #ifdef DUPLICATES_ONCE if (!cache_inodes && !duplicates_once) { #else

7 years, 6 months

[hbelusca] 74114: [REACTOS-CLT2017]: Sync with ROS 0.4.4 release branch. In particular the following fixes/hacks: - Apply the Wordpad related hack from CORE-5823 by Jared Smudde (r73624). - Disable...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 6 00:05:13 2017 New Revision: 74114 URL: http://svn.reactos.org/svn/reactos?rev=74114&view=rev Log: [REACTOS-CLT2017]: Sync with ROS 0.4.4 release branch. In particular the following fixes/hacks: - Apply the Wordpad related hack from CORE-5823 by Jared Smudde (r73624). - Disable COMMAND.COM debugging messages. CORE-10710 (r73625). - Add a hack by Thomas to avoid MmGetPhysicalAddress failures during USB transfers. CORE-9224 (r73627). - Apply the patch that allows us to dynamically change the resolution by resizing in VirtualBox. CORE-6742 (r73628). - Mask WndProc exceptions CORE-11915 (r73631). Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/wordpad/res/formatbar.bmp branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/wordpad/res/toolbar.bmp branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/usb_request.cpp branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/usb_request.cpp branches/ReactOS-0.4.4-CLT2017/reactos/subsystems/mvdm/dos/command.S branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.c branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.h branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/pdevobj.c branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/ntuser/display.c branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/user32/windows/message.c Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 6 00:05:13 2017 @@ -16,6 +16,7 @@ /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/ros-branch-0_3_15-lt2013:59059 +/branches/ros-branch-0_4_4/reactos:73624-73625,73627-73628,73631 /branches/ros-csrss:57561-58762 /branches/shell-experiments:61927-65494 /branches/shell32_new-bringup:51893-53652,53661,53700 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/wordpad/res/formatbar.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/wordpad/res/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== Binary files - no diff available. Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 6 00:05:13 2017 @@ -19,6 +19,7 @@ /branches/ros-amd64-bringup/drivers/usb/usbehci_new:36852 /branches/ros-amd64-bringup/reactos/drivers/usb/usbehci:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/ros-amd64-bringup/reactos/drivers/usb/usbehci_new:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_4_4/reactos/drivers/usb/usbehci:73627-73628,73631 /branches/shell32_new-bringup/drivers/usb/usbehci:51893-53652,53661,53700 /branches/shell32_new-bringup/drivers/usb/usbehci_new:51893-53652,53661,53700 /branches/tcp-rewrite-branch/drivers/usb/usbehci:48720,48840-48841,49424-49426,49454 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -601,6 +601,7 @@ // // get address // + *(volatile char *)TransferBuffer; // HACK for CORE-9224 Address = MmGetPhysicalAddress(TransferBuffer); // Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 6 00:05:13 2017 @@ -14,6 +14,7 @@ /branches/ros-amd64-bringup/drivers/usb/usbohci:36852 /branches/ros-amd64-bringup/reactos/drivers/usb/usbehci_new:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/ros-amd64-bringup/reactos/drivers/usb/usbohci:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_4_4/reactos/drivers/usb/usbohci:73627-73628,73631 /branches/shell32_new-bringup/drivers/usb/usbohci:51893-53652,53661,53700 /branches/tcp-rewrite-branch/drivers/usb/usbohci:48720,48840-48841,49424-49426,49454 /branches/usb-bringup/drivers/usb/usbohci:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-51850,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -771,6 +771,7 @@ // // get physical page // + *(volatile char *)Buffer; // HACK for CORE-9224 Page = MmGetPhysicalAddress(Buffer).LowPart; // Modified: branches/ReactOS-0.4.4-CLT2017/reactos/subsystems/mvdm/dos/command.S URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -17,7 +17,7 @@ #include "asmxtras.inc" #include <isvbop.inc> -// #define NDEBUG +#define NDEBUG /* DEFINES ********************************************************************/ Modified: branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/w… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.c [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -30,99 +30,22 @@ return STATUS_SUCCESS; } - -PGRAPHICS_DEVICE -NTAPI -EngpRegisterGraphicsDevice( - _In_ PUNICODE_STRING pustrDeviceName, - _In_ PUNICODE_STRING pustrDiplayDrivers, - _In_ PUNICODE_STRING pustrDescription, +BOOLEAN +EngpPopulateDeviceModeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, _In_ PDEVMODEW pdmDefault) { - PGRAPHICS_DEVICE pGraphicsDevice; - PDEVICE_OBJECT pDeviceObject; - PFILE_OBJECT pFileObject; - NTSTATUS Status; PWSTR pwsz; - ULONG i, cj, cModes = 0; - SIZE_T cjWritten; - BOOL bEnable = TRUE; + PLDEVOBJ pldev; PDEVMODEINFO pdminfo; PDEVMODEW pdm, pdmEnd; - PLDEVOBJ pldev; + ULONG i, cModes = 0; BOOLEAN bModeMatch = FALSE; - TRACE("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName); - - /* Allocate a GRAPHICS_DEVICE structure */ - pGraphicsDevice = ExAllocatePoolWithTag(PagedPool, - sizeof(GRAPHICS_DEVICE), - GDITAG_GDEVICE); - if (!pGraphicsDevice) - { - ERR("ExAllocatePoolWithTag failed\n"); - return NULL; - } - - /* Try to open the driver */ - Status = IoGetDeviceObjectPointer(pustrDeviceName, - FILE_READ_DATA | FILE_WRITE_DATA, - &pFileObject, - &pDeviceObject); - if (!NT_SUCCESS(Status)) - { - ERR("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; - } - - /* Enable the device */ - EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cjWritten); - - /* Copy the device and file object pointers */ - pGraphicsDevice->DeviceObject = pDeviceObject; - pGraphicsDevice->FileObject = pFileObject; - - /* Copy device name */ - RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, - sizeof(pGraphicsDevice->szNtDeviceName), - pustrDeviceName->Buffer, - pustrDeviceName->Length); - - /* Create a win device name (FIXME: virtual devices!) */ - swprintf(pGraphicsDevice->szWinDeviceName, L"\\\\.\\DISPLAY%d", (int)giDevNum); - - /* Allocate a buffer for the strings */ - cj = pustrDiplayDrivers->Length + pustrDescription->Length + sizeof(WCHAR); - pwsz = ExAllocatePoolWithTag(PagedPool, cj, GDITAG_DRVSUP); - if (!pwsz) - { - ERR("Could not allocate string buffer\n"); - ASSERT(FALSE); // FIXME - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; - } - - /* Copy display driver names */ - pGraphicsDevice->pDiplayDrivers = pwsz; - RtlCopyMemory(pGraphicsDevice->pDiplayDrivers, - pustrDiplayDrivers->Buffer, - pustrDiplayDrivers->Length); - - /* Copy description */ - pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); - RtlCopyMemory(pGraphicsDevice->pwszDescription, - pustrDescription->Buffer, - pustrDescription->Length); - pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0; - - /* Initialize the pdevmodeInfo list and default index */ - pGraphicsDevice->pdevmodeInfo = NULL; - pGraphicsDevice->iDefaultMode = 0; - pGraphicsDevice->iCurrentMode = 0; - - // FIXME: initialize state flags - pGraphicsDevice->StateFlags = 0; + ASSERT(pGraphicsDevice->pdevmodeInfo == NULL); + ASSERT(pGraphicsDevice->pDevModeList == NULL); + + pwsz = pGraphicsDevice->pDiplayDrivers; /* Loop through the driver names * This is a REG_MULTI_SZ string */ @@ -138,7 +61,7 @@ } /* Get the mode list from the driver */ - pdminfo = LDEVOBJ_pdmiGetModes(pldev, pDeviceObject); + pdminfo = LDEVOBJ_pdmiGetModes(pldev, pGraphicsDevice->DeviceObject); if (!pdminfo) { ERR("Could not get mode list for '%ls'\n", pwsz); @@ -170,8 +93,7 @@ if (!pGraphicsDevice->pdevmodeInfo || cModes == 0) { ERR("No devmodes\n"); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; + return FALSE; } /* Allocate an index buffer */ @@ -182,8 +104,7 @@ if (!pGraphicsDevice->pDevModeList) { ERR("No devmode list\n"); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; + return FALSE; } TRACE("Looking for mode %lux%lux%lu(%lu Hz)\n", @@ -232,7 +153,106 @@ pGraphicsDevice->pDevModeList[i].pdm = pdm; i++; } - } + } + return TRUE; +} + +PGRAPHICS_DEVICE +NTAPI +EngpRegisterGraphicsDevice( + _In_ PUNICODE_STRING pustrDeviceName, + _In_ PUNICODE_STRING pustrDiplayDrivers, + _In_ PUNICODE_STRING pustrDescription, + _In_ PDEVMODEW pdmDefault) +{ + PGRAPHICS_DEVICE pGraphicsDevice; + PDEVICE_OBJECT pDeviceObject; + PFILE_OBJECT pFileObject; + NTSTATUS Status; + PWSTR pwsz; + ULONG cj; + SIZE_T cjWritten; + BOOL bEnable = TRUE; + + TRACE("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName); + + /* Allocate a GRAPHICS_DEVICE structure */ + pGraphicsDevice = ExAllocatePoolWithTag(PagedPool, + sizeof(GRAPHICS_DEVICE), + GDITAG_GDEVICE); + if (!pGraphicsDevice) + { + ERR("ExAllocatePoolWithTag failed\n"); + return NULL; + } + + /* Try to open the driver */ + Status = IoGetDeviceObjectPointer(pustrDeviceName, + FILE_READ_DATA | FILE_WRITE_DATA, + &pFileObject, + &pDeviceObject); + if (!NT_SUCCESS(Status)) + { + ERR("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } + + /* Enable the device */ + EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cjWritten); + + /* Copy the device and file object pointers */ + pGraphicsDevice->DeviceObject = pDeviceObject; + pGraphicsDevice->FileObject = pFileObject; + + /* Copy device name */ + RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, + sizeof(pGraphicsDevice->szNtDeviceName), + pustrDeviceName->Buffer, + pustrDeviceName->Length); + + /* Create a win device name (FIXME: virtual devices!) */ + swprintf(pGraphicsDevice->szWinDeviceName, L"\\\\.\\DISPLAY%d", (int)giDevNum); + + /* Allocate a buffer for the strings */ + cj = pustrDiplayDrivers->Length + pustrDescription->Length + sizeof(WCHAR); + pwsz = ExAllocatePoolWithTag(PagedPool, cj, GDITAG_DRVSUP); + if (!pwsz) + { + ERR("Could not allocate string buffer\n"); + ASSERT(FALSE); // FIXME + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } + + /* Copy display driver names */ + pGraphicsDevice->pDiplayDrivers = pwsz; + RtlCopyMemory(pGraphicsDevice->pDiplayDrivers, + pustrDiplayDrivers->Buffer, + pustrDiplayDrivers->Length); + + /* Copy description */ + pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); + RtlCopyMemory(pGraphicsDevice->pwszDescription, + pustrDescription->Buffer, + pustrDescription->Length); + pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0; + + /* Initialize the pdevmodeInfo list and default index */ + pGraphicsDevice->pdevmodeInfo = NULL; + pGraphicsDevice->iDefaultMode = 0; + pGraphicsDevice->iCurrentMode = 0; + + // FIXME: initialize state flags + pGraphicsDevice->StateFlags = 0; + + /* Create the mode list */ + pGraphicsDevice->pDevModeList = NULL; + if (!EngpPopulateDeviceModeList(pGraphicsDevice, pdmDefault)) + { + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } /* Lock loader */ EngAcquireSemaphore(ghsemGraphicsDeviceList); @@ -250,7 +270,7 @@ /* Unlock loader */ EngReleaseSemaphore(ghsemGraphicsDeviceList); - TRACE("Prepared %lu modes for %ls\n", cModes, pGraphicsDevice->pwszDescription); + TRACE("Prepared %lu modes for %ls\n", pGraphicsDevice->cDevModes, pGraphicsDevice->pwszDescription); return pGraphicsDevice; } Modified: branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/w… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/device.h [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -2,6 +2,11 @@ #pragma once #define TAG_GDEV 'gdev' + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev); extern PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; extern PGRAPHICS_DEVICE gpVgaGraphicsDevice; @@ -29,6 +34,11 @@ _In_ PUNICODE_STRING pustrDescription, _In_ PDEVMODEW pdmDefault); +BOOLEAN +EngpPopulateDeviceModeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, + _In_ PDEVMODEW pdmDefault); + INIT_FUNCTION NTSTATUS NTAPI Modified: branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/w… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -249,6 +249,45 @@ DPRINT("PDEVOBJ_pSurface() returning %p\n", ppdev->pSurface); return ppdev->pSurface; +} + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev) +{ + PGRAPHICS_DEVICE pGraphicsDevice; + PDEVMODEINFO pdminfo, pdmiNext; + DEVMODEW dmDefault; + + /* Lock the PDEV */ + EngAcquireSemaphore(ppdev->hsemDevLock); + + pGraphicsDevice = ppdev->pGraphicsDevice; + + /* Remember our default mode */ + dmDefault = *pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm; + + /* Clear out the modes */ + for (pdminfo = pGraphicsDevice->pdevmodeInfo; + pdminfo; + pdminfo = pdmiNext) + { + pdmiNext = pdminfo->pdmiNext; + ExFreePoolWithTag(pdminfo, GDITAG_DEVMODE); + } + pGraphicsDevice->pdevmodeInfo = NULL; + ExFreePoolWithTag(pGraphicsDevice->pDevModeList, GDITAG_GDEVICE); + pGraphicsDevice->pDevModeList = NULL; + + /* Now re-populate the list */ + if (!EngpPopulateDeviceModeList(pGraphicsDevice, &dmDefault)) + { + DPRINT1("FIXME: EngpPopulateDeviceModeList failed, we just destroyed a perfectly good mode list\n"); + } + + /* Unlock PDEV */ + EngReleaseSemaphore(ppdev->hsemDevLock); } PDEVMODEW Modified: branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/w… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -463,19 +463,27 @@ PGRAPHICS_DEVICE pGraphicsDevice; PDEVMODEENTRY pdmentry; ULONG i, iFoundMode; + PPDEVOBJ ppdev; TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n", pustrDevice, iModeNum); /* Ask GDI for the GRAPHICS_DEVICE */ pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0); - - if (!pGraphicsDevice) + ppdev = EngpGetPDEV(pustrDevice); + + if (!pGraphicsDevice || !ppdev) { /* No device found */ ERR("No device found!\n"); return STATUS_INVALID_PARAMETER_1; } + + /* let's politely ask the driver for an updated mode list, + just in case there's something new in there (vbox) */ + + PDEVOBJ_vRefreshModeList(ppdev); + PDEVOBJ_vRelease(ppdev); iFoundMode = 0; for (i = 0; i < pGraphicsDevice->cDevModes; i++) Modified: branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/w… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Mon Mar 6 00:05:13 2017 @@ -1464,20 +1464,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) { @@ -1518,20 +1513,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) { @@ -1611,20 +1601,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) { @@ -1672,20 +1657,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && MsgOverride) {

7 years, 6 months

[hbelusca] 74113: [EXPLORER]: Update the Start Menu banner for CLT 2017.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 5 23:05:49 2017 New Revision: 74113 URL: http://svn.reactos.org/svn/reactos?rev=74113&view=rev Log: [EXPLORER]: Update the Start Menu banner for CLT 2017. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/base/shell/explorer/res/bmp/158.bmp branches/ReactOS-0.4.4-CLT2017/reactos/base/shell/explorer/res/src/start_menu_banner.svg Modified: branches/ReactOS-0.4.4-CLT2017/reactos/base/shell/explorer/res/bmp/158.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/base/shell/explorer/res/src/start_menu_banner.svg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/base/shell/explorer/res/src/start_menu_banner.svg [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/base/shell/explorer/res/src/start_menu_banner.svg [iso-8859-1] Sun Mar 5 23:05:49 2017 @@ -16,8 +16,8 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="Logo.svg" - inkscape:export-filename="F:\reactos\Logo.png" + sodipodi:docname="start_menu_banner.svg" + inkscape:export-filename="start_menu_banner.png" inkscape:export-xdpi="72" inkscape:export-ydpi="72"> <defs @@ -79,9 +79,13 @@ <filter style="color-interpolation-filters:sRGB;" inkscape:label="Drop Shadow" - id="filter4197"> + id="filter4197" + x="-0.02" + y="-0.10" + width="1.05" + height="1.25"> <feFlood - flood-opacity="0.68999999999999995" + flood-opacity="0.7" flood-color="rgb(0,0,0)" result="flood" id="feFlood4199" /> @@ -93,11 +97,11 @@ id="feComposite4201" /> <feGaussianBlur in="composite1" - stdDeviation="1" + stdDeviation="0.5" result="blur" id="feGaussianBlur4203" /> <feOffset - dx="-0.1" + dx="0.5" dy="1" result="offset" id="feOffset4205" /> @@ -117,17 +121,17 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="2.4967109" - inkscape:cx="-34.214085" - inkscape:cy="142.13217" + inkscape:cx="-34.417137" + inkscape:cy="166.47739" inkscape:document-units="px" inkscape:current-layer="svg2" showgrid="false" units="pt" - inkscape:window-width="1397" - inkscape:window-height="974" - inkscape:window-x="437" - inkscape:window-y="214" - inkscape:window-maximized="0" /> + inkscape:window-width="1600" + inkscape:window-height="838" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" /> <metadata id="metadata7"> <rdf:RDF> @@ -162,20 +166,20 @@ id="text4707" y="34.69656" x="-1058.8489" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.14050674px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4197)" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.14050674px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.40488964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4197)" xml:space="preserve"><tspan y="34.69656" x="-1058.8489" id="tspan4709" sodipodi:role="line"><tspan - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.00007629px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.99142647px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start;stroke:#ffffff;stroke-width:0.40488964;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="tspan4213">ReactOS</tspan><tspan - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.50006676px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start" - id="tspan4209"> 0.5 - SVN</tspan></tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.20780945px;line-height:100%;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start;stroke:#ffffff;stroke-width:0.40488964;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="tspan4209"> 0.4.4 - CLT 2017</tspan></tspan></text> <g style="fill:#ffffff;fill-opacity:1" id="layer1-2" - transform="matrix(-4.4824609e-5,-0.056,0.05634648,-4.4824609e-5,-16.777709,291.46496)"> + transform="matrix(-4.4824609e-5,-0.056,0.05634648,-4.4824609e-5,-16.57728,291.46496)"> <g style="fill:#ffffff;fill-opacity:1" id="g5951"

7 years, 6 months

[cfinck] 74112: [MKISOFS] Update mkisofs to schily-2017-02-16, which comes with the following fixes: - Fix null termination in libschily's Win32 implementation of opendir (submitted upstream by me)...

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Mar 5 22:54:33 2017 New Revision: 74112 URL: http://svn.reactos.org/svn/reactos?rev=74112&view=rev Log: [MKISOFS] Update mkisofs to schily-2017-02-16, which comes with the following fixes: - Fix null termination in libschily's Win32 implementation of opendir (submitted upstream by me). The bug was triggered when building an ISO from a directory instead of a graft-points (.lst) file. - Prevent -duplicates-once from being used together with -cache-inodes. These options exclude each other. Modified: trunk/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c Modified: trunk/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… ============================================================================== --- trunk/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h [iso-8859-1] Sun Mar 5 22:54:33 2017 @@ -1,6 +1,6 @@ -/* @(#)version.h 1.92 16/01/26 Copyright 2007-2016 J. Schilling */ +/* @(#)version.h 1.93 16/12/15 Copyright 2007-2016 J. Schilling */ /* * The version for cdrtools programs */ -#define VERSION "3.02a06" +#define VERSION "3.02a07" Modified: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… ============================================================================== --- trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h [iso-8859-1] Sun Mar 5 22:54:33 2017 @@ -1,4 +1,4 @@ -/* @(#)schily.h 1.121 16/11/04 Copyright 1985-2016 J. Schilling */ +/* @(#)schily.h 1.122 16/12/18 Copyright 1985-2016 J. Schilling */ /* * Definitions for libschily * @@ -543,7 +543,7 @@ #ifdef __never__ #undef error #define error js_error -#endif +#endif /* __never__ */ #undef dprintf #define dprintf js_dprintf #undef fprintf @@ -558,9 +558,9 @@ #ifndef HAVE_SNPRINTF #undef snprintf #define snprintf js_snprintf -#endif -#endif -#endif +#endif /* HAVE_SNPRINTF */ +#endif /* SCHILY_PRINT */ +#endif /* NO_SCHILY_PRINT */ #ifndef NO_SCHILY_GETLINE /* Define to disable *getline() redirect */ #undef getline Modified: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… ============================================================================== --- trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c [iso-8859-1] Sun Mar 5 22:54:33 2017 @@ -1,11 +1,11 @@ -/* @(#)dirent.c 1.3 12/03/20 Copyright 2011 J. Schilling */ +/* @(#)dirent.c 1.4 17/02/02 Copyright 2011-2017 J. Schilling */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)dirent.c 1.3 12/03/20 Copyright 2011 J. Schilling"; + "@(#)dirent.c 1.4 17/02/02 Copyright 2011-2017 J. Schilling"; #endif /* - * Copyright (c) 2011 J. Schilling + * Copyright (c) 2011-2017 J. Schilling */ /* * The contents of this file are subject to the terms of the @@ -14,6 +14,8 @@ * with the License. * * See the file CDDL.Schily.txt in this distribution for details. + * A copy of the CDDL is also available via the Internet at + * http://www.opensource.org/licenses/cddl1.txt * * When distributing Covered Code, include this CDDL HEADER in each * file and include the License file CDDL.Schily.txt from this distribution. @@ -84,7 +86,8 @@ dp->dd_dirname[len] = '\\'; len++; } - dp->dd_dirname[len] = '*'; + dp->dd_dirname[len++] = '*'; + dp->dd_dirname[len] = '\0'; dp->dd_handle = -1; dp->dd_state = 0; Modified: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… ============================================================================== --- trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c [iso-8859-1] Sun Mar 5 22:54:33 2017 @@ -1,8 +1,8 @@ -/* @(#)mkisofs.c 1.288 16/12/13 joerg */ +/* @(#)mkisofs.c 1.289 17/01/05 joerg */ #include <schily/mconfig.h> #ifndef lint static UConst char sccsid[] = - "@(#)mkisofs.c 1.288 16/12/13 joerg"; + "@(#)mkisofs.c 1.289 17/01/05 joerg"; #endif /* * Program mkisofs.c - generate iso9660 filesystem based upon directory @@ -11,7 +11,7 @@ * Written by Eric Youngdale (1993). * * Copyright 1993 Yggdrasil Computing, Incorporated - * Copyright (c) 1997-2016 J. Schilling + * Copyright (c) 1997-2017 J. Schilling * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -132,14 +132,13 @@ int all_files = 1; /* New default is to include all files */ BOOL Hflag = FALSE; /* Follow links on cmdline (-H) */ BOOL follow_links = FALSE; /* Follow all links (-L) */ -#if defined(IS_CYGWIN) || defined(__MINGW32__) || defined(_MSC_VER) +#if defined(__MINGW32__) || defined(_MSC_VER) /* - * Do not cache inodes on Cygwin by default - * See below in main(), cache for 64bit ino_t + * Never cache inodes on DOS or Win-DOS. */ int cache_inodes = 0; #else -int cache_inodes = 1; /* Cache inodes if OS has unique inodes */ +int cache_inodes = -1; /* Cache inodes if OS has unique inodes */ #endif int rationalize = 0; /* Need to call stat_fix() */ int rationalize_uid = 0; @@ -2088,14 +2087,6 @@ modification_date.l_usec = tv_begun.tv_usec; modification_date.l_gmtoff = -100; -#if defined(IS_CYGWIN) - /* - * If we have 64 bit inode numbers, Cygwin should be able to work - * correctly on NTFS. - */ - if (sizeof (ino_t) >= 8) - cache_inodes = 1; -#endif cac--; cav++; c = getvargs(&cac, &cav, GA_NO_PROPS, flags); @@ -2119,7 +2110,7 @@ if (pversion) { printf(_("mkisofs %s (%s-%s-%s)\n\n\ Copyright (C) 1993-1997 %s\n\ -Copyright (C) 1997-2016 %s\n"), +Copyright (C) 1997-2017 %s\n"), version_string, HOST_CPU, HOST_VENDOR, HOST_OS, _("Eric Youngdale"), @@ -2212,6 +2203,25 @@ (Llong)strlen(biblio)); } } +#ifdef DUPLICATES_ONCE + /* + * If -duplicates-once was specified, do not implicitly enable + * -cache-inodes. + */ + if (cache_inodes < 0 && duplicates_once) + cache_inodes = 0; +#endif +#if defined(IS_CYGWIN) + /* + * If we have 64 bit inode numbers, Cygwin should be able to work + * correctly on NTFS, otherwise disable caching unless it has + * been enforced via -cache-inodes. + */ + if (cache_inodes < 0 && sizeof (ino_t) < 8) + cache_inodes = 0; +#endif + if (cache_inodes < 0) + cache_inodes = 1; #ifdef DUPLICATES_ONCE if (!cache_inodes && !duplicates_once) { #else

7 years, 6 months

[akhaldi] 74111: [OLEAUT32_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 5 21:51:44 2017 New Revision: 74111 URL: http://svn.reactos.org/svn/reactos?rev=74111&view=rev Log: [OLEAUT32_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/oleaut32/olepicture.c trunk/rostests/winetests/oleaut32/tmarshal.c trunk/rostests/winetests/oleaut32/typelib.c Modified: trunk/rostests/winetests/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olepic… ============================================================================== --- trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] Sun Mar 5 21:51:44 2017 @@ -1523,14 +1523,9 @@ NoStatStreamImpl* const This = impl_from_IStream(iface); if (ppvObject==0) return E_INVALIDARG; *ppvObject = 0; - if (IsEqualIID(&IID_IUnknown, riid)) - { - *ppvObject = This; - } - else if (IsEqualIID(&IID_IStream, riid)) - { - *ppvObject = This; - } + + if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IStream, riid)) + *ppvObject = &This->IStream_iface; if ((*ppvObject)==0) return E_NOINTERFACE; Modified: trunk/rostests/winetests/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… ============================================================================== --- trunk/rostests/winetests/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/tmarshal.c [iso-8859-1] Sun Mar 5 21:51:44 2017 @@ -1372,13 +1372,50 @@ ok(!lstrcmpW(bstr, szCat), "IWidget_get_Name should have returned string \"Cat\" instead of %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - /* call DoSomething */ + /* call DoSomething without optional arguments */ VariantInit(&vararg[0]); VariantInit(&vararg[1]); V_VT(&vararg[1]) = VT_R8; V_R8(&vararg[1]) = 3.141; dispparams.cNamedArgs = 0; dispparams.cArgs = 2; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + + /* call DoSomething with optional argument set to VT_EMPTY */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_R8; + V_R8(&vararg[2]) = 3.141; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 3; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + + /* call DoSomething with optional arguments set to VT_ERROR/DISP_E_PARAMNOTFOUND */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + VariantInit(&vararg[3]); + V_VT(&vararg[3]) = VT_R8; + V_R8(&vararg[3]) = 3.141; + V_VT(&vararg[1]) = VT_ERROR; + V_ERROR(&vararg[1]) = DISP_E_PARAMNOTFOUND; + V_VT(&vararg[0]) = VT_ERROR; + V_ERROR(&vararg[0]) = DISP_E_PARAMNOTFOUND; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 4; dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = vararg; VariantInit(&varresult); Modified: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… ============================================================================== --- trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] Sun Mar 5 21:51:44 2017 @@ -1086,11 +1086,41 @@ return S_FALSE; } -static const void *vtable[] = { NULL, NULL, NULL, inst_func }; +static const WCHAR testW[] = { 'T','e','s','t',0 }; + +static void WINAPI variant_func2(VARIANT *ret, VARIANT v1, VARIANT v2) +{ + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); + ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); + ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); + + V_VT(ret) = VT_UI4; + V_I4(ret) = 4321; +} + +static void WINAPI inst_func2(void *inst, VARIANT *ret, VARIANT v1, VARIANT v2) +{ + ok( (*(void ***)inst)[3] == inst_func2, "wrong ptr %p\n", inst ); + + ok(V_VT(ret) == VT_I4 || broken(V_VT(ret) == VT_VARIANT) /* win64 */, "unexpected %d\n", V_VT(ret)); + ok(V_I4(ret) == 1234, "unexpected %d\n", V_I4(ret)); + + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); + ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); + ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); + + V_VT(ret) = VT_UI4; + V_I4(ret) = 4321; +} + +static void *vtable[] = { NULL, NULL, NULL, inst_func }; +static void *vtable2[] = { NULL, NULL, NULL, inst_func2 }; static void test_DispCallFunc(void) { - const void **inst = vtable; + void **inst; HRESULT res; VARIANT result, args[5]; VARIANTARG *pargs[5]; @@ -1098,6 +1128,30 @@ int i; for (i = 0; i < 5; i++) pargs[i] = &args[i]; + + memset( args, 0x55, sizeof(args) ); + + types[0] = VT_VARIANT; + V_VT(&args[0]) = VT_I4; + V_I4(&args[0]) = 2; + types[1] = VT_VARIANT; + V_VT(&args[1]) = VT_BSTR; + V_BSTR(&args[1]) = SysAllocString(testW); + memset( &result, 0xcc, sizeof(result) ); + res = DispCallFunc(NULL, (ULONG_PTR)variant_func2, CC_STDCALL, VT_VARIANT, 2, types, pargs, &result); + ok(res == S_OK, "DispCallFunc error %#x\n", res); + ok(V_VT(&result) == VT_UI4, "wrong result type %d\n", V_VT(&result)); + ok(V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result)); + + V_VT(&result) = VT_I4; + V_UI4(&result) = 1234; + inst = vtable2; + res = DispCallFunc(&inst, 3 * sizeof(void *), CC_STDCALL, VT_VARIANT, 2, types, pargs, &result); + ok(res == S_OK, "DispCallFunc error %#x\n", res); + ok(V_VT(&result) == VT_UI4, "wrong result type %d\n", V_VT(&result)); + ok(V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result)); + + VariantClear(&args[1]); memset( args, 0x55, sizeof(args) ); types[0] = VT_UI4; @@ -1197,6 +1251,7 @@ types[0] = VT_I4; V_I4(&args[0]) = 3; memset( &result, 0xcc, sizeof(result) ); + inst = vtable; res = DispCallFunc( &inst, 3 * sizeof(void*), CC_STDCALL, VT_I4, 1, types, pargs, &result ); ok( res == S_OK, "DispCallFunc failed %x\n", res ); ok( V_VT(&result) == VT_I4, "wrong result type %d\n", V_VT(&result) ); @@ -5198,6 +5253,7 @@ ok(infos[0] && !infos[1] && !infos[2], "got wrong typeinfo\n"); ok(memids[0] == 0, "got wrong memid[0]\n"); ok(memids[1] == 0xdeadbeef && memids[2] == 0xdeadbeef, "got wrong memids\n"); + ITypeInfo_Release(infos[0]); found = 3; memset(infos, 0, sizeof(infos)); @@ -5210,6 +5266,8 @@ ok(infos[0] && infos[1] && infos[0] != infos[1], "got same typeinfo\n"); ok(memids[0] == 0, "got wrong memid[0]\n"); ok(memids[1] == 0, "got wrong memid[1]\n"); + ITypeInfo_Release(infos[0]); + ITypeInfo_Release(infos[1]); ITypeLib_Release(tl); ICreateTypeLib2_Release(ctl);

7 years, 6 months

[akhaldi] 74110: [OLEAUT32] Sync with Wine Staging 2.2. CORE-12823 43c59f0 oleaut32: Accept DISP_E_PARAMNOTFOUND for missing optional parameters in ITypeInfo::Invoke implementation. (v3) a4f9840 ol...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 5 21:50:37 2017 New Revision: 74110 URL: http://svn.reactos.org/svn/reactos?rev=74110&view=rev Log: [OLEAUT32] Sync with Wine Staging 2.2. CORE-12823 43c59f0 oleaut32: Accept DISP_E_PARAMNOTFOUND for missing optional parameters in ITypeInfo::Invoke implementation. (v3) a4f9840 oleaut32: Fix calling function with instance and VARIANT return type. (v2) 78ee7f5 oleaut32: Standardize the heap_xxx() functions. 9e54ae7 oleaut32: Return proper interface pointers. 655af6d oleaut32: Fix OleTranslateColor spec file entry. Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.spec trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/typelib.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.spec [iso-8859-1] Sun Mar 5 21:50:37 2017 @@ -373,7 +373,7 @@ 418 stdcall OleLoadPicture(ptr long long ptr ptr) 419 stdcall OleCreatePictureIndirect(ptr ptr long ptr) 420 stdcall OleCreateFontIndirect(ptr ptr ptr) -421 stdcall OleTranslateColor(long long long) +421 stdcall OleTranslateColor(long long ptr) 422 stdcall OleLoadPictureFile(int128 ptr) 423 stdcall OleSavePictureFile(ptr wstr) 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr) Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] Sun Mar 5 21:50:37 2017 @@ -457,7 +457,7 @@ *ppvObject = 0; if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPicture, riid)) - *ppvObject = This; + *ppvObject = &This->IPicture_iface; else if (IsEqualIID(&IID_IDispatch, riid)) *ppvObject = &This->IDispatch_iface; else if (IsEqualIID(&IID_IPictureDisp, riid)) @@ -1003,7 +1003,7 @@ BITMAPINFOHEADER bih; UINT width, height; UINT stride, buffersize; - BYTE *bits; + BYTE *bits, *mask = NULL; WICRect rc; IWICBitmapSource *real_source; UINT x, y; @@ -1031,6 +1031,13 @@ stride = 4 * width; buffersize = stride * height; + mask = HeapAlloc(GetProcessHeap(), 0, buffersize); + if (!mask) + { + hr = E_OUTOFMEMORY; + goto end; + } + This->desc.u.bmp.hbitmap = CreateDIBSection(0, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void **)&bits, NULL, 0); if (This->desc.u.bmp.hbitmap == 0) { @@ -1059,10 +1066,10 @@ if((*pixel & 0x80000000) == 0) { has_alpha = TRUE; - *pixel = black; + *(DWORD *)(mask + stride * y + 4 * x) = black; } else - *pixel = white; + *(DWORD *)(mask + stride * y + 4 * x) = white; } } @@ -1077,7 +1084,7 @@ hdcref, &bih, CBM_INIT, - bits, + mask, (BITMAPINFO*)&bih, DIB_RGB_COLORS ); @@ -1106,6 +1113,7 @@ } end: + HeapFree(GetProcessHeap(), 0, mask); IWICBitmapSource_Release(real_source); return hr; } Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] Sun Mar 5 21:50:37 2017 @@ -1590,30 +1590,6 @@ static void TLB_abort(void) { DebugBreak(); -} - -void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(unsigned size) -{ - void *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!ret) ERR("cannot allocate memory\n"); - return ret; -} - -void* __WINE_ALLOC_SIZE(1) heap_alloc(unsigned size) -{ - void *ret = HeapAlloc(GetProcessHeap(), 0, size); - if (!ret) ERR("cannot allocate memory\n"); - return ret; -} - -void* __WINE_ALLOC_SIZE(2) heap_realloc(void *ptr, unsigned size) -{ - return HeapReAlloc(GetProcessHeap(), 0, ptr, size); -} - -void heap_free(void *ptr) -{ - HeapFree(GetProcessHeap(), 0, ptr); } /* returns the size required for a deep copy of a typedesc into a @@ -5663,7 +5639,7 @@ if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid,&IID_ITypeInfo)|| IsEqualIID(riid,&IID_ITypeInfo2)) - *ppvObject = This; + *ppvObject = &This->ITypeInfo2_iface; else if(IsEqualIID(riid, &IID_ICreateTypeInfo) || IsEqualIID(riid, &IID_ICreateTypeInfo2)) *ppvObject = &This->ICreateTypeInfo2_iface; @@ -6861,8 +6837,17 @@ break; case VT_DECIMAL: case VT_VARIANT: - args[0] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */ - call_method( func, argspos, args, &stack_offset ); + if (pvInstance) + { + args[0] = (DWORD)pvInstance; /* arg 0 is a pointer to the instance */ + args[1] = (DWORD)pvargResult; /* arg 1 is a pointer to the result */ + call_method( func, argspos, args, &stack_offset ); + } + else + { + args[0] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */ + call_method( func, argspos, args, &stack_offset ); + } break; case VT_I8: case VT_UI8: @@ -6947,8 +6932,17 @@ break; case VT_DECIMAL: case VT_VARIANT: - args[0] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */ - call_method( func, argspos, args ); + if (pvInstance) + { + args[0] = (DWORD_PTR)pvInstance; /* arg 0 is a pointer to the instance */ + args[1] = (DWORD_PTR)pvargResult; /* arg 1 is a pointer to the result */ + call_method( func, argspos, args ); + } + else + { + args[0] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */ + call_method( func, argspos, args ); + } break; case VT_HRESULT: WARN("invalid return type %u\n", vtReturn); @@ -7154,7 +7148,8 @@ break; } } - else if (src_arg) + else if (src_arg && !((wParamFlags & PARAMFLAG_FOPT) && + V_VT(src_arg) == VT_ERROR && V_ERROR(src_arg) == DISP_E_PARAMNOTFOUND)) { TRACE("%s\n", debugstr_variant(src_arg)); Modified: trunk/reactos/dll/win32/oleaut32/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.h [iso-8859-1] Sun Mar 5 21:50:37 2017 @@ -590,11 +590,25 @@ #include "poppack.h" -/* heap allocation helpers */ -extern void* heap_alloc_zero(unsigned size) DECLSPEC_HIDDEN __WINE_ALLOC_SIZE(1); -extern void* heap_alloc(unsigned size) DECLSPEC_HIDDEN __WINE_ALLOC_SIZE(1); -extern void* heap_realloc(void *ptr, unsigned size) DECLSPEC_HIDDEN; -extern void heap_free(void *ptr) DECLSPEC_HIDDEN; +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); +} + +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc( LPVOID mem, SIZE_T size ) +{ + return HeapReAlloc( GetProcessHeap(), 0, mem, size ); +} + +static inline BOOL heap_free( LPVOID mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 5 21:50:37 2017 @@ -141,7 +141,7 @@ reactos/dll/win32/odbccp32 # Synced to WineStaging-1.9.11 reactos/dll/win32/ole32 # Synced to WineStaging-2.2 reactos/dll/win32/oleacc # Synced to WineStaging-1.9.11 -reactos/dll/win32/oleaut32 # Synced to WineStaging-1.9.23 +reactos/dll/win32/oleaut32 # Synced to WineStaging-2.2 reactos/dll/win32/olecli32 # Synced to WineStaging-1.9.11 reactos/dll/win32/oledlg # Synced to WineStaging-1.9.23 reactos/dll/win32/olepro32 # Synced to WineStaging-1.9.11

7 years, 6 months

[akhaldi] 74109: [RICHED20_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 5 21:44:19 2017 New Revision: 74109 URL: http://svn.reactos.org/svn/reactos?rev=74109&view=rev Log: [RICHED20_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/riched20/txtsrv.c Modified: trunk/rostests/winetests/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/txtsrv… ============================================================================== --- trunk/rostests/winetests/riched20/txtsrv.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/txtsrv.c [iso-8859-1] Sun Mar 5 21:44:19 2017 @@ -99,7 +99,7 @@ ITextHostTestImpl *This = impl_from_ITextHost(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, pIID_ITextHost)) { - *ppvObject = This; + *ppvObject = &This->ITextHost_iface; ITextHost_AddRef((ITextHost *)*ppvObject); return S_OK; } @@ -681,6 +681,16 @@ ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, "String returned differs\n"); + /* Null-pointer should behave the same as empty-string */ + + hres = ITextServices_TxSetText(txtserv, 0); + ok(hres == S_OK, "ITextServices_TxSetText failed (result = %x)\n", hres); + + hres = ITextServices_TxGetText(txtserv, &rettext); + ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); + ok(SysStringLen(rettext) == 0, + "String returned of wrong length (expected 0, got %d)\n", SysStringLen(rettext)); + SysFreeString(rettext); ITextServices_Release(txtserv); ITextHost_Release(host);

7 years, 6 months

[akhaldi] 74108: [RICHED20] Sync with Wine Staging 2.2. CORE-12823 440b921 riched20: Return proper interface pointers. e63cea5 riched20: A spelling fix in a comment. 9f37f6a riched20: Check for NUL...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 5 21:43:39 2017 New Revision: 74108 URL: http://svn.reactos.org/svn/reactos?rev=74108&view=rev Log: [RICHED20] Sync with Wine Staging 2.2. CORE-12823 440b921 riched20: Return proper interface pointers. e63cea5 riched20: A spelling fix in a comment. 9f37f6a riched20: Check for NULL in fnTextSrv_TxSetText and add test. Modified: trunk/reactos/dll/win32/riched20/clipboard.c trunk/reactos/dll/win32/riched20/style.c trunk/reactos/dll/win32/riched20/txthost.c trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/riched20/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/clipboa… ============================================================================== --- trunk/reactos/dll/win32/riched20/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/clipboard.c [iso-8859-1] Sun Mar 5 21:43:39 2017 @@ -64,7 +64,7 @@ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { IEnumFORMATETC_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IEnumFORMATETC_iface; return S_OK; } *ppvObj = NULL; @@ -181,7 +181,7 @@ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { IDataObject_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IDataObject_iface; return S_OK; } *ppvObj = NULL; Modified: trunk/reactos/dll/win32/riched20/style.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/style.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/style.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/style.c [iso-8859-1] Sun Mar 5 21:43:39 2017 @@ -183,7 +183,7 @@ } COPY_STYLE_ITEM(CFM_UNDERLINETYPE, bUnderlineType); - /* If the CFM_UNDERLINE effect is not specified set it appropiately */ + /* If the CFM_UNDERLINE effect is not specified, set it appropriately */ if ((mod->dwMask & CFM_UNDERLINETYPE) && !(mod->dwMask & CFM_UNDERLINE)) { fmt.dwMask |= CFM_UNDERLINE; Modified: trunk/reactos/dll/win32/riched20/txthost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txthost… ============================================================================== --- trunk/reactos/dll/win32/riched20/txthost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txthost.c [iso-8859-1] Sun Mar 5 21:43:39 2017 @@ -65,7 +65,7 @@ ITextHostImpl *This = impl_from_ITextHost(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextHost)) { - *ppvObject = This; + *ppvObject = &This->ITextHost_iface; ITextHost_AddRef((ITextHost *)*ppvObject); return S_OK; } Modified: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… ============================================================================== --- trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] Sun Mar 5 21:43:39 2017 @@ -274,10 +274,9 @@ ME_Cursor cursor; ME_SetCursorToStart(This->editor, &cursor); - ME_InternalDeleteText(This->editor, &cursor, - ME_GetTextLength(This->editor), FALSE); - ME_InsertTextFromCursor(This->editor, 0, pszText, -1, - This->editor->pBuffer->pDefaultStyle); + ME_InternalDeleteText(This->editor, &cursor, ME_GetTextLength(This->editor), FALSE); + if(pszText) + ME_InsertTextFromCursor(This->editor, 0, pszText, -1, This->editor->pBuffer->pDefaultStyle); ME_SetSelection(This->editor, 0, 0); This->editor->nModifyStep = 0; OleFlushClipboard(); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 5 21:43:39 2017 @@ -158,7 +158,7 @@ reactos/dll/win32/query # Synced to WineStaging-1.9.11 reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.11 reactos/dll/win32/resutils # Synced to WineStaging-1.9.11 -reactos/dll/win32/riched20 # Synced to WineStaging-1.9.23 +reactos/dll/win32/riched20 # Synced to WineStaging-2.2 reactos/dll/win32/riched32 # Synced to WineStaging-1.9.11 reactos/dll/win32/rpcrt4 # Synced to WineStaging-2.2 reactos/dll/win32/rsabase # Synced to WineStaging-1.9.11

7 years, 6 months

← Newer
1
...
12
13
14
15
16
17
18
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2017