Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[gadamopoulos] 74247: [UXTHEME] -Implement painting windows with WS_MINIMIZE. Such windows are minimized mdi windows.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Mar 31 11:26:20 2017 New Revision: 74247 URL: http://svn.reactos.org/svn/reactos?rev=74247&view=rev Log: [UXTHEME] -Implement painting windows with WS_MINIMIZE. Such windows are minimized mdi windows. Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c trunk/reactos/dll/win32/uxtheme/themehooks.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Fri Mar 31 11:26:20 2017 @@ -245,7 +245,7 @@ iStateId = BUTTON_DISABLED; } - iPartId = WP_MINBUTTON; + iPartId = pcontext->wi.dwStyle & WS_MINIMIZE ? WP_RESTOREBUTTON : WP_MINBUTTON; break; default: @@ -329,7 +329,9 @@ CaptionText = UserGetWindowCaption(pcontext->hWnd); /* Get the caption part and state id */ - if (pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW) + if (pcontext->wi.dwStyle & WS_MINIMIZE) + iPart = WP_MINCAPTION; + else if (pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW) iPart = WP_SMALLCAPTION; else if (pcontext->wi.dwStyle & WS_MAXIMIZE) iPart = WP_MAXCAPTION; @@ -630,12 +632,6 @@ if(!(pcontext->wi.dwStyle & WS_VISIBLE)) return; - if(pcontext->wi.dwStyle & WS_MINIMIZE) - { - ThemeDrawTitle(pcontext, prcCurrent); - return; - } - if((pcontext->wi.dwStyle & WS_CAPTION)==WS_CAPTION) { if (bDoDoubleBuffering) @@ -649,6 +645,9 @@ { DrawClassicFrame(pcontext, prcCurrent); } + + if(pcontext->wi.dwStyle & WS_MINIMIZE) + return; if(HAS_MENU(pcontext->hWnd, pcontext->wi.dwStyle)) ThemeDrawMenuBar(pcontext, prcCurrent); Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Fri Mar 31 11:26:20 2017 @@ -97,7 +97,9 @@ GetWindowInfo(hWnd, &wi); /* Get the caption part id */ - if (wi.dwExStyle & WS_EX_TOOLWINDOW) + if (wi.dwStyle & WS_MINIMIZE) + iPart = WP_MINCAPTION; + else if (wi.dwExStyle & WS_EX_TOOLWINDOW) iPart = WP_SMALLCAPTION; else if (wi.dwStyle & WS_MAXIMIZE) iPart = WP_MAXCAPTION;

7 years, 5 months

[tfaber] 74246: [USBEHCI][USBOHCI][USBUHCI] - Avoid leaking CUSBRequest::m_CompletionEvent. Based on a patch by ReactCoder. CORE-12984 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 31 09:16:45 2017 New Revision: 74246 URL: http://svn.reactos.org/svn/reactos?rev=74246&view=rev Log: [USBEHCI][USBOHCI][USBUHCI] - Avoid leaking CUSBRequest::m_CompletionEvent. Based on a patch by ReactCoder. CORE-12984 #resolve Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp trunk/reactos/drivers/usb/usbohci/usb_request.cpp trunk/reactos/drivers/usb/usbuhci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Fri Mar 31 09:16:45 2017 @@ -56,8 +56,8 @@ VOID DumpQueueHead(IN PQUEUE_HEAD QueueHead); // constructor / destructor - CUSBRequest(IUnknown *OuterUnknown){} - virtual ~CUSBRequest(){} + CUSBRequest(IUnknown *OuterUnknown); + virtual ~CUSBRequest(); protected: LONG m_Ref; @@ -136,6 +136,22 @@ USB_DEVICE_SPEED m_Speed; }; + +//---------------------------------------------------------------------------------------- +CUSBRequest::CUSBRequest(IUnknown *OuterUnknown) : + m_CompletionEvent(NULL) +{ + UNREFERENCED_PARAMETER(OuterUnknown); +} + +//---------------------------------------------------------------------------------------- +CUSBRequest::~CUSBRequest() +{ + if (m_CompletionEvent != NULL) + { + ExFreePoolWithTag(m_CompletionEvent, TAG_USBEHCI); + } +} //---------------------------------------------------------------------------------------- NTSTATUS Modified: trunk/reactos/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Fri Mar 31 09:16:45 2017 @@ -59,10 +59,9 @@ NTSTATUS BuildTransferDescriptorChain(IN PVOID TransferBuffer, IN ULONG TransferBufferLength, IN UCHAR PidCode, OUT POHCI_GENERAL_TD * OutFirstDescriptor, OUT POHCI_GENERAL_TD * OutLastDescriptor, OUT PULONG OutTransferBufferOffset); VOID InitDescriptor(IN POHCI_GENERAL_TD CurrentDescriptor, IN PVOID TransferBuffer, IN ULONG TransferBufferLength, IN UCHAR PidCode); - // constructor / destructor - CUSBRequest(IUnknown *OuterUnknown){} - virtual ~CUSBRequest(){} + CUSBRequest(IUnknown *OuterUnknown); + virtual ~CUSBRequest(); protected: LONG m_Ref; @@ -144,6 +143,22 @@ // PVOID m_Base; }; + +//---------------------------------------------------------------------------------------- +CUSBRequest::CUSBRequest(IUnknown *OuterUnknown) : + m_CompletionEvent(NULL) +{ + UNREFERENCED_PARAMETER(OuterUnknown); +} + +//---------------------------------------------------------------------------------------- +CUSBRequest::~CUSBRequest() +{ + if (m_CompletionEvent != NULL) + { + ExFreePoolWithTag(m_CompletionEvent, TAG_USBOHCI); + } +} //---------------------------------------------------------------------------------------- NTSTATUS Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Fri Mar 31 09:16:45 2017 @@ -54,11 +54,9 @@ VOID FreeDescriptor(IN PUHCI_TRANSFER_DESCRIPTOR Descriptor); NTSTATUS BuildTransferDescriptorChain(IN PVOID TransferBuffer, IN ULONG TransferBufferLength, IN UCHAR PidCode, IN UCHAR InitialDataToggle, OUT PUHCI_TRANSFER_DESCRIPTOR * OutFirstDescriptor, OUT PUHCI_TRANSFER_DESCRIPTOR * OutLastDescriptor, OUT PULONG OutTransferBufferOffset, OUT PUCHAR OutDataToggle); - - // constructor / destructor - CUSBRequest(IUnknown *OuterUnknown){} - virtual ~CUSBRequest(){} + CUSBRequest(IUnknown *OuterUnknown); + virtual ~CUSBRequest(); protected: LONG m_Ref; @@ -134,6 +132,22 @@ PVOID m_Base; }; + +//---------------------------------------------------------------------------------------- +CUSBRequest::CUSBRequest(IUnknown *OuterUnknown) : + m_CompletionEvent(NULL) +{ + UNREFERENCED_PARAMETER(OuterUnknown); +} + +//---------------------------------------------------------------------------------------- +CUSBRequest::~CUSBRequest() +{ + if (m_CompletionEvent != NULL) + { + ExFreePoolWithTag(m_CompletionEvent, TAG_USBUHCI); + } +} //---------------------------------------------------------------------------------------- NTSTATUS

7 years, 5 months

[tfaber] 74245: [USBSTOR] - Addendum to r73892: Don't free the output buffer on success in USBSTOR_SendIrp. Spotted (again) by curiousone CORE-12970 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Mar 31 09:02:43 2017 New Revision: 74245 URL: http://svn.reactos.org/svn/reactos?rev=74245&view=rev Log: [USBSTOR] - Addendum to r73892: Don't free the output buffer on success in USBSTOR_SendIrp. Spotted (again) by curiousone CORE-12970 #resolve Modified: trunk/reactos/drivers/usb/usbstor/pdo.c Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Fri Mar 31 09:02:43 2017 @@ -40,7 +40,7 @@ // // FIXME: use constant - derived from http://en.wikipedia.org/wiki/SCSI_Peripheral_Device_Type - // + // switch (InquiryData->DeviceType) { case 1: @@ -114,7 +114,7 @@ // // FIXME: use constant - derived from http://en.wikipedia.org/wiki/SCSI_Peripheral_Device_Type - // + // switch (InquiryData->DeviceType) { case 1: @@ -628,7 +628,7 @@ Irp->IoStatus.Information = 0; return STATUS_INSUFFICIENT_RESOURCES; } - + USBSTOR_ConvertToUnicodeString(Buffer, Length, 0, InstanceId, &Offset); USBSTOR_ConvertToUnicodeString(&Buffer[Offset], Length, Offset, InstanceId, &Offset); @@ -701,7 +701,7 @@ Irp->IoStatus.Information = 0; return STATUS_INSUFFICIENT_RESOURCES; } - + // // copy instance id // @@ -1170,11 +1170,18 @@ // *OutData = Request->DataBuffer; } + else + { + // + // free the data + // + ExFreePoolWithTag(Request->DataBuffer, USB_STOR_TAG); + *OutData = NULL; + } // // free resources // - ExFreePoolWithTag(Request->DataBuffer, USB_STOR_TAG); ExFreePoolWithTag(Request, USB_STOR_TAG); IoFreeIrp(Irp); return Status; @@ -1215,7 +1222,7 @@ DPRINT1("Reserved %p\n", Response->Reserved); DPRINT1("Vendor %c%c%c%c%c%c%c%c\n", Response->Vendor[0], Response->Vendor[1], Response->Vendor[2], Response->Vendor[3], Response->Vendor[4], Response->Vendor[5], Response->Vendor[6], Response->Vendor[7]); DPRINT1("Product %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n", Response->Product[0], Response->Product[1], Response->Product[2], Response->Product[3], - Response->Product[4], Response->Product[5], Response->Product[6], Response->Product[7], + Response->Product[4], Response->Product[5], Response->Product[6], Response->Product[7], Response->Product[8], Response->Product[9], Response->Product[10], Response->Product[11], Response->Product[12], Response->Product[13], Response->Product[14], Response->Product[15]);

7 years, 5 months

[gadamopoulos] 74244: [UXTHEME} -Fix usage of uninitialized variable. CORE-11204

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Mar 29 20:50:56 2017 New Revision: 74244 URL: http://svn.reactos.org/svn/reactos?rev=74244&view=rev Log: [UXTHEME} -Fix usage of uninitialized variable. CORE-11204 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Wed Mar 29 20:50:56 2017 @@ -813,6 +813,8 @@ pWndContext->lastHitTest = wParam; SetCapture(hWnd); + + ht = wParam; for (;;) {

7 years, 5 months

[rnaumann] 74243: [EXPLORER] -implement showing the start menu preview

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Wed Mar 29 18:37:06 2017 New Revision: 74243 URL: http://svn.reactos.org/svn/reactos?rev=74243&view=rev Log: [EXPLORER] -implement showing the start menu preview Modified: trunk/reactos/base/shell/explorer/explorer.rc trunk/reactos/base/shell/explorer/trayprop.cpp Modified: trunk/reactos/base/shell/explorer/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] Wed Mar 29 18:37:06 2017 @@ -51,6 +51,7 @@ IDB_SYSTRAYPROP_SHOW_SECONDS BITMAP "res/bmp/154.bmp" IDB_SYSTRAYPROP_HIDE_SECONDS BITMAP "res/bmp/155.bmp" IDB_STARTMENU BITMAP "res/bmp/158.bmp" +IDB_STARTPREVIEW BITMAP "res/bmp/171.bmp" // We don't have a proper preview image for the modern start menu yet. Use the classic one so far. IDB_STARTPREVIEW_CLASSIC BITMAP "res/bmp/171.bmp" IDB_SYSTRAYPROP_HIDE_CLOCK BITMAP "res/bmp/180.bmp" IDB_SYSTRAYPROP_HIDE_NOCLOCK BITMAP "res/bmp/181.bmp" Modified: trunk/reactos/base/shell/explorer/trayprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traypr… ============================================================================== --- trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] Wed Mar 29 18:37:06 2017 @@ -28,17 +28,18 @@ HBITMAP hTaskbarBitmap; HBITMAP hTrayBitmap; + HBITMAP hStartBitmap; } PROPSHEET_INFO, *PPROPSHEET_INFO; static BOOL -UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo) -{ - HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive; - HWND hwndTaskbarBitmap, hwndTrayBitmap; - HWND hwndAdvancedButton; +UpdateBitmaps(PPROPSHEET_INFO pPropInfo) +{ + HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive, hwndModernStart, hwndClassicStart; + HWND hwndTaskbarBitmap, hwndTrayBitmap, hwndStartBitmap; + HWND hwndCustomizeNotifyButton, hwndCustomizeClassicStartButton, hwndCustomizeModernStartButton; BOOL bLock, bHide, bGroup, bShowQL, bShowClock, bShowSeconds, bHideInactive; - LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL; + LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL, lpStartImageName = NULL; BOOL bRet = FALSE; hwndLock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_LOCK); @@ -50,7 +51,15 @@ hwndSeconds = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SECONDS); hwndHideInactive = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDEICONS); - hwndAdvancedButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_ICONCUST); + hwndCustomizeNotifyButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_ICONCUST); + + hwndModernStart = GetDlgItem(pPropInfo->hStartWnd, IDC_TASKBARPROP_STARTMENU); + hwndClassicStart = GetDlgItem(pPropInfo->hStartWnd, IDC_TASKBARPROP_STARTMENUCLASSIC); + + hwndCustomizeClassicStartButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_STARTMENUCLASSICCUST); + hwndCustomizeModernStartButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_STARTMENUCUST); + + if (hwndLock && hwndHide && hwndGroup && hwndShowQL && hwndClock && hwndSeconds && hwndHideInactive) { @@ -112,7 +121,7 @@ if (bHideInactive) { - EnableWindow(hwndAdvancedButton, TRUE); + EnableWindow(hwndCustomizeNotifyButton, TRUE); if (bShowClock) { EnableWindow(hwndSeconds, TRUE); @@ -130,7 +139,7 @@ } else { - EnableWindow(hwndAdvancedButton, FALSE); + EnableWindow(hwndCustomizeNotifyButton, FALSE); if (bShowClock) { EnableWindow(hwndSeconds, TRUE); @@ -174,6 +183,49 @@ } } } + + if(hwndClassicStart && hwndModernStart) + { + if(SendMessage(hwndModernStart, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + EnableWindow(hwndCustomizeModernStartButton, TRUE); + EnableWindow(hwndCustomizeClassicStartButton, FALSE); + lpStartImageName = MAKEINTRESOURCEW(IDB_STARTPREVIEW); + } + else + { + EnableWindow(hwndCustomizeModernStartButton, FALSE); + EnableWindow(hwndCustomizeClassicStartButton, TRUE); + lpStartImageName = MAKEINTRESOURCEW(IDB_STARTPREVIEW_CLASSIC); + } + + if (lpStartImageName) + { + if (pPropInfo->hStartBitmap) + { + DeleteObject(pPropInfo->hStartBitmap); + } + + pPropInfo->hStartBitmap = (HBITMAP)LoadImageW(hExplorerInstance, + lpStartImageName, + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + if (pPropInfo->hStartBitmap) + { + hwndStartBitmap = GetDlgItem(pPropInfo->hStartWnd, + IDC_TASKBARPROP_STARTMENU_BITMAP); + if (hwndStartBitmap) + { + SendMessage(hwndStartBitmap, + STM_SETIMAGE, + IMAGE_BITMAP, + (LPARAM)pPropInfo->hStartBitmap); + } + } + } + } return bRet; } @@ -191,7 +243,18 @@ // FIXME: check buttons CheckDlgButton(hwnd, IDC_TASKBARPROP_SECONDS, AdvancedSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); - UpdateTaskbarBitmap(pPropInfo); + UpdateBitmaps(pPropInfo); +} + +static VOID +OnCreateStartPage(HWND hwnd, + PPROPSHEET_INFO pPropInfo) +{ + pPropInfo->hStartWnd = hwnd; + + CheckDlgButton(hwnd, IDC_TASKBARPROP_STARTMENUCLASSIC, 1); // HACK: This has to be read from registry! + + UpdateBitmaps(pPropInfo); } INT_PTR CALLBACK @@ -228,7 +291,7 @@ case IDC_TASKBARPROP_SECONDS: if (HIWORD(wParam) == BN_CLICKED) { - UpdateTaskbarBitmap(pPropInfo); + UpdateBitmaps(pPropInfo); /* Enable the 'Apply' button */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); @@ -286,6 +349,7 @@ switch (uMsg) { case WM_INITDIALOG: + OnCreateStartPage(hwndDlg, (PPROPSHEET_INFO)((LPPROPSHEETPAGE)lParam)->lParam); break; case WM_COMMAND:

7 years, 5 months

[hbelusca] 74242: [NDK][XDK]: Add some forgotten RTL bitmap functions.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 29 16:36:13 2017 New Revision: 74242 URL: http://svn.reactos.org/svn/reactos?rev=74242&view=rev Log: [NDK][XDK]: Add some forgotten RTL bitmap functions. Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h trunk/reactos/sdk/include/xdk/rtlfuncs.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] Wed Mar 29 16:36:13 2017 @@ -3230,6 +3230,14 @@ NTSYSAPI VOID NTAPI +RtlClearBit( + _In_ PRTL_BITMAP BitMapHeader, + _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitNumber +); + +NTSYSAPI +VOID +NTAPI RtlClearBits( _In_ PRTL_BITMAP BitMapHeader, _In_range_(0, BitMapHeader->SizeOfBitMap - NumberToClear) ULONG StartingIndex, @@ -3289,6 +3297,14 @@ ); NTSYSAPI +ULONG +NTAPI +RtlFindLongestRunClear( + _In_ PRTL_BITMAP BitMapHeader, + _Out_ PULONG StartingIndex +); + +NTSYSAPI CCHAR NTAPI RtlFindMostSignificantBit( @@ -3390,6 +3406,20 @@ _In_ PRTL_BITMAP BitMapHeader, _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitNumber ); + +#if defined(_M_AMD64) +_Must_inspect_result_ +FORCEINLINE +BOOLEAN +RtlCheckBit( + _In_ PRTL_BITMAP BitMapHeader, + _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitPosition) +{ + return BitTest64((LONG64 CONST*)BitMapHeader->Buffer, (LONG64)BitPosition); +} +#else +#define RtlCheckBit(BMH,BP) (((((PLONG)(BMH)->Buffer)[(BP)/32]) >> ((BP)%32)) & 0x1) +#endif /* defined(_M_AMD64) */ // // Timer Functions Modified: trunk/reactos/sdk/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/rtlfuncs.h [iso-8859-1] Wed Mar 29 16:36:13 2017 @@ -949,6 +949,12 @@ _Out_ PTIME_FIELDS TimeFields); NTSYSAPI +USHORT +FASTCALL +RtlUshortByteSwap( + _In_ USHORT Source); + +NTSYSAPI ULONG FASTCALL RtlUlongByteSwap( @@ -1018,12 +1024,6 @@ NTAPI RtlUpcaseUnicodeChar( _In_ WCHAR SourceCharacter); - -NTSYSAPI -USHORT -FASTCALL -RtlUshortByteSwap( - _In_ USHORT Source); _IRQL_requires_max_(APC_LEVEL) _Must_inspect_result_

7 years, 5 months

[gadamopoulos] 74241: [UXTHEME] -Draw the background glyph inside the content margins. CORE-6000

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Mar 29 10:01:00 2017 New Revision: 74241 URL: http://svn.reactos.org/svn/reactos?rev=74241&view=rev Log: [UXTHEME] -Draw the background glyph inside the content margins. CORE-6000 Modified: trunk/reactos/dll/win32/uxtheme/draw.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Wed Mar 29 10:01:00 2017 @@ -1051,7 +1051,19 @@ hr = E_FAIL; } if(SUCCEEDED(hr)) - hr = UXTHEME_DrawGlyph(hTheme, hdc, iPartId, iStateId, &rt, opts); + { + RECT rcGlyph = *pRect; + MARGINS margin; + hr = GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_CONTENTMARGINS, NULL, &margin); + if(SUCCEEDED(hr)) + { + rcGlyph.left += margin.cxLeftWidth; + rcGlyph.right -= margin.cxRightWidth; + rcGlyph.top += margin.cyTopHeight; + rcGlyph.bottom -= margin.cyBottomHeight; + } + hr = UXTHEME_DrawGlyph(hTheme, hdc, iPartId, iStateId, &rcGlyph, opts); + } if(opts->dwFlags & DTBG_CLIPRECT) { if(hasClip == 0) SelectClipRgn(hdc, NULL);

7 years, 5 months

[gadamopoulos] 74240: [UXTHEME] -Slightly improve the width of the caption buttons by scaling it based on the height of the caption buttons. CORE-6000

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Mar 28 21:31:16 2017 New Revision: 74240 URL: http://svn.reactos.org/svn/reactos?rev=74240&view=rev Log: [UXTHEME] -Slightly improve the width of the caption buttons by scaling it based on the height of the caption buttons. CORE-6000 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Tue Mar 28 21:31:16 2017 @@ -216,9 +216,7 @@ { RECT rcPart; INT ButtonWidth, ButtonHeight, iPartId; - - ButtonHeight = GetSystemMetrics( pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); - ButtonWidth = GetSystemMetrics( pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CXSMSIZE : SM_CXSIZE); + SIZE ButtonSize; switch(buttonId) { @@ -254,6 +252,11 @@ //FIXME: Implement Help Button return; } + + GetThemePartSize(pcontext->theme, pcontext->hDC, iPartId, 0, NULL, TS_MIN, &ButtonSize); + + ButtonHeight = GetSystemMetrics( pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); + ButtonWidth = MulDiv(ButtonSize.cx, ButtonHeight, ButtonSize.cy); ButtonHeight -= 4; ButtonWidth -= 4;

7 years, 5 months

[ekohl] 74239: [TRANSLATIONS] Minor corrections in Uzbek. Patch by Kudratov Olimjon. CORE-12907 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Mar 28 18:28:05 2017 New Revision: 74239 URL: http://svn.reactos.org/svn/reactos?rev=74239&view=rev Log: [TRANSLATIONS] Minor corrections in Uzbek. Patch by Kudratov Olimjon. CORE-12907 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc trunk/reactos/dll/win32/kernel32/winnls/nls/uzb.nls Modified: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/uz-UZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/uz-UZ.rc [iso-8859-1] Tue Mar 28 18:28:05 2017 @@ -1,4 +1,4 @@ -LANGUAGE LANG_UZBEK, SUBLANG_DEFAULT +LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_LATIN ID_ACCEL ACCELERATORS BEGIN @@ -130,10 +130,10 @@ IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS" +CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Bloknot ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "Bloknot ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "ÐÐ°ÐºÑÑÑÑ", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 @@ -149,14 +149,14 @@ BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ STRING_PAGESETUP_FOOTERVALUE "Sahifa &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 Ð¼Ð¼" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 Ð¼Ð¼" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 Ð¼Ð¼" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 Ð¼Ð¼" /* FIXME */ + STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ STRING_NOTEPAD "Bloknot" - STRING_ERROR "ÐÐ¨ÐÐÐÐ" - STRING_WARNING "ÐÐÐÐÐÐÐÐ" - STRING_INFO "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" + STRING_ERROR "XATO" + STRING_WARNING "DIQQAT" + STRING_INFO "Axborot" STRING_UNTITLED "Nomsiz" STRING_ALL_FILES "Barcha fayllar(*.*)" STRING_TEXT_FILES_TXT "Matn hujjatlari (*.txt)" Modified: trunk/reactos/dll/win32/kernel32/winnls/nls/uzb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/nls/uzb.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/nls/uzb.nls [iso-8859-1] Tue Mar 28 18:28:05 2017 @@ -125,7 +125,7 @@ LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "uz-UZ" LOCALE_SNATIVECTRYNAME "¡çáåêèñòîí" - LOCALE_SNATIVECURRNAME "ðóáëü" + LOCALE_SNATIVECURRNAME "ñ¢ì" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVELANGNAME "¡çáåê" LOCALE_SNEGATIVESIGN "-"

7 years, 5 months

[gadamopoulos] 74238: [EXPLORER] -Remove a debug print that wasn't supposed to be committed.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Mar 28 10:22:54 2017 New Revision: 74238 URL: http://svn.reactos.org/svn/reactos?rev=74238&view=rev Log: [EXPLORER] -Remove a debug print that wasn't supposed to be committed. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Tue Mar 28 10:22:54 2017 @@ -1641,7 +1641,6 @@ case ABE_BOTTOM: rebarRect.top = rebarRect.bottom - (pRect->bottom - pRect->top - margins.cy); ::SendMessageW(m_Rebar, RB_SIZETORECT, RBSTR_CHANGERECT, (LPARAM)&rebarRect); - ERR("rebarRect: %d, %d, %d,%d\n", rebarRect.top, rebarRect.left, rebarRect.right, rebarRect.bottom); pRect->top = pRect->bottom - (rebarRect.bottom - rebarRect.top + margins.cy); break; case ABE_LEFT:

7 years, 5 months

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