[ros-diffs] 01/01: Revert "[OLEAUT32] Sync with Wine 3.0. CORE-14225"
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b57c9f47d3a943706179de14791747b5169bc9d commit 2b57c9f47d3a943706179de14791747b5169bc9d Author: Timo KreuzerAuthorDate: Sun Jan 28 17:05:15 2018 +0100 Commit: Timo Kreuzer CommitDate: Mon Jan 29 23:31:08 2018 +0100 Revert "[OLEAUT32] Sync with Wine 3.0. CORE-14225" This reverts commit 13fd286c1840f80c0fca1dbfedd600a0f8a4478b. The "sync" zapped a lot of fixes, in particular 64 bit compatibility. --- dll/win32/oleaut32/oleaut.c | 2 +- dll/win32/oleaut32/olepicture.c | 355 -- dll/win32/oleaut32/tmarshal.c | 216 dll/win32/oleaut32/typelib.c| 536 +++- dll/win32/oleaut32/typelib.h| 6 +- dll/win32/oleaut32/variant.c| 14 +- dll/win32/oleaut32/vartype.c| 2 +- media/doc/README.WINE | 2 +- 8 files changed, 659 insertions(+), 474 deletions(-) diff --git a/dll/win32/oleaut32/oleaut.c b/dll/win32/oleaut32/oleaut.c index 0c3679491c..349a64da61 100644 --- a/dll/win32/oleaut32/oleaut.c +++ b/dll/win32/oleaut32/oleaut.c @@ -100,7 +100,7 @@ static inline size_t bstr_alloc_size(size_t size) static inline bstr_t *bstr_from_str(BSTR str) { -return CONTAINING_RECORD(str, bstr_t, u.str); +return CONTAINING_RECORD((void *)str, bstr_t, u.str); } static inline bstr_cache_entry_t *get_cache_entry_from_idx(unsigned cache_idx) diff --git a/dll/win32/oleaut32/olepicture.c b/dll/win32/oleaut32/olepicture.c index b687fdf201..878fd18292 100644 --- a/dll/win32/oleaut32/olepicture.c +++ b/dll/win32/oleaut32/olepicture.c @@ -246,6 +246,18 @@ static void OLEPictureImpl_SetIcon(OLEPictureImpl * This) } } +static void OLEPictureImpl_SetEMF(OLEPictureImpl *This) +{ +ENHMETAHEADER emh; + +GetEnhMetaFileHeader(This->desc.u.emf.hemf, sizeof(emh), ); + +This->origWidth = 0; +This->origHeight = 0; +This->himetricWidth = emh.rclFrame.right - emh.rclFrame.left; +This->himetricHeight = emh.rclFrame.bottom - emh.rclFrame.top; +} + / * OLEPictureImpl_Construct * @@ -327,7 +339,11 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) case PICTYPE_ICON: OLEPictureImpl_SetIcon(newObject); break; + case PICTYPE_ENHMETAFILE: +OLEPictureImpl_SetEMF(newObject); +break; + default: FIXME("Unsupported type %d\n", pictDesc->picType); newObject->himetricWidth = newObject->himetricHeight = 0; @@ -813,19 +829,6 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface) return S_OK; } -/ - * OLEPictureImpl_SaveAsFile - */ -static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, - IStream *pstream, - BOOL SaveMemCopy, - LONG *pcbSize) -{ - OLEPictureImpl *This = impl_from_IPicture(iface); - FIXME("(%p)->(%p, %d, %p), hacked stub.\n", This, pstream, SaveMemCopy, pcbSize); - return IStream_Write(pstream,This->data,This->datalen,(ULONG*)pcbSize); -} - / * OLEPictureImpl_get_Attributes */ @@ -975,40 +978,13 @@ static HRESULT WINAPI OLEPictureImpl_IsDirty( return E_NOTIMPL; } -static HRESULT OLEPictureImpl_LoadDIB(OLEPictureImpl *This, BYTE *xbuf, ULONG xread) -{ -BITMAPFILEHEADER *bfh = (BITMAPFILEHEADER*)xbuf; -BITMAPINFO *bi = (BITMAPINFO*)(bfh+1); -HDChdcref; - -/* Does not matter whether this is a coreheader or not, we only use - * components which are in both - */ -hdcref = GetDC(0); -This->desc.u.bmp.hbitmap = CreateDIBitmap( - hdcref, - &(bi->bmiHeader), - CBM_INIT, - xbuf+bfh->bfOffBits, - bi, - DIB_RGB_COLORS -); -ReleaseDC(0, hdcref); -if (This->desc.u.bmp.hbitmap == 0) -return E_FAIL; -This->desc.picType = PICTYPE_BITMAP; -OLEPictureImpl_SetBitmap(This); -return S_OK; -} - static HRESULT OLEPictureImpl_LoadWICSource(OLEPictureImpl *This, IWICBitmapSource *src) { HRESULT hr; BITMAPINFOHEADER bih; -HDC hdcref; UINT width, height; UINT stride, buffersize; -LPBYTE bits=NULL; +BYTE *bits, *mask = NULL; WICRect rc; IWICBitmapSource *real_source; UINT x, y; @@ -1036,34 +1012,28 @@ static HRESULT OLEPictureImpl_LoadWICSource(OLEPictureImpl *This, IWICBitmapSour stride = 4 * width; buffersize = stride * height; -bits = HeapAlloc(GetProcessHeap(), 0, buffersize); -if (!bits) +mask = HeapAlloc(GetProcessHeap(), 0, buffersize); +if (!mask) { hr =
[ros-diffs] 01/01: [DESK.CPL] Fix dialog appearance in 640x480 resolution
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2595538558f59671b6b68536c4e23d040e7bfc5c commit 2595538558f59671b6b68536c4e23d040e7bfc5c Author: Stanislav MotylkovAuthorDate: Mon Jan 29 21:27:03 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO CommitDate: Mon Jan 29 22:32:01 2018 +0100 [DESK.CPL] Fix dialog appearance in 640x480 resolution CORE-14274 --- dll/cpl/desk/lang/bg-BG.rc | 40 dll/cpl/desk/lang/cs-CZ.rc | 40 dll/cpl/desk/lang/de-DE.rc | 40 dll/cpl/desk/lang/el-GR.rc | 40 dll/cpl/desk/lang/en-GB.rc | 40 dll/cpl/desk/lang/en-US.rc | 40 dll/cpl/desk/lang/es-ES.rc | 40 dll/cpl/desk/lang/fr-FR.rc | 40 dll/cpl/desk/lang/he-IL.rc | 40 dll/cpl/desk/lang/hu-HU.rc | 40 dll/cpl/desk/lang/id-ID.rc | 40 dll/cpl/desk/lang/it-IT.rc | 40 dll/cpl/desk/lang/ja-JP.rc | 40 dll/cpl/desk/lang/nl-NL.rc | 40 dll/cpl/desk/lang/no-NO.rc | 40 dll/cpl/desk/lang/pl-PL.rc | 40 dll/cpl/desk/lang/pt-BR.rc | 40 dll/cpl/desk/lang/ro-RO.rc | 40 dll/cpl/desk/lang/ru-RU.rc | 40 dll/cpl/desk/lang/sk-SK.rc | 40 dll/cpl/desk/lang/sq-AL.rc | 40 dll/cpl/desk/lang/sv-SE.rc | 40 dll/cpl/desk/lang/tr-TR.rc | 40 dll/cpl/desk/lang/uk-UA.rc | 40 dll/cpl/desk/lang/zh-CN.rc | 40 dll/cpl/desk/lang/zh-TW.rc | 40 26 files changed, 520 insertions(+), 520 deletions(-) diff --git a/dll/cpl/desk/lang/bg-BG.rc b/dll/cpl/desk/lang/bg-BG.rc index e946ca5983..d859103cbe 100644 --- a/dll/cpl/desk/lang/bg-BG.rc +++ b/dll/cpl/desk/lang/bg-BG.rc @@ -1,21 +1,21 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDD_BACKGROUND DIALOGEX 0, 0, 246, 204 +IDD_BACKGROUND DIALOGEX 0, 0, 246, 202 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Работна площ" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 80, 0 +CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | -LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 -LTEXT "Изберете изображение за украса на работната си площ", IDC_STATIC, 8, 103, 230, 9 -PUSHBUTTON "&Обзор...", IDC_BROWSE_BUTTON, 188, 114, 55, 15 -PUSHBUTTON "&Цвят...", IDC_COLOR_BUTTON, 188, 177, 55, 15 -LTEXT "Разположение", IDC_STATIC, 188, 138, 55, 9 -COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 78 +LTEXT "Изберете изображение за украса на работната си площ", IDC_STATIC, 8, 93, 230, 9 +PUSHBUTTON "&Обзор...", IDC_BROWSE_BUTTON, 188, 104, 55, 15 +PUSHBUTTON "&Цвят...", IDC_COLOR_BUTTON, 188, 167, 55, 15 +LTEXT "Разположение", IDC_STATIC, 188, 128, 55, 9 +COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Екранен предпазител" FONT 8, "MS Shell Dlg", 0, 0 @@ -32,25 +32,25 @@ BEGIN LTEXT "минути", IDC_MINTEXT, 70, 125, 26, 9 CONTROL "Искане на парола при изход", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 -GROUPBOX "&Енергоспестяващи възможности на монитора", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 -LTEXT "За настройка захранването на монитора, натиснете „Захранване...“.", IDC_STATIC, 14, 166, 146, 27 -PUSHBUTTON "Захранване...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13 +GROUPBOX "&Енергоспестяващи възможности на монитора", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 +LTEXT "За настройка захранването на монитора, натиснете „Захранване...“.", IDC_STATIC, 16, 161, 146, 27 +
[ros-diffs] 01/01: [TRANSLATION][CLIPBRD] Italian translation implemented (#344)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a5b30ee1f322ba47ca5d3b9f885a162f4e3a1f5 commit 4a5b30ee1f322ba47ca5d3b9f885a162f4e3a1f5 Author: Bișoc GeorgeAuthorDate: Mon Jan 29 22:33:22 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO CommitDate: Mon Jan 29 22:33:22 2018 +0100 [TRANSLATION][CLIPBRD] Italian translation implemented (#344) --- base/applications/clipbrd/clipbrd.rc| 3 ++ base/applications/clipbrd/lang/it-IT.rc | 72 + 2 files changed, 75 insertions(+) diff --git a/base/applications/clipbrd/clipbrd.rc b/base/applications/clipbrd/clipbrd.rc index 2d0b3750de..5f3e293bc4 100644 --- a/base/applications/clipbrd/clipbrd.rc +++ b/base/applications/clipbrd/clipbrd.rc @@ -34,6 +34,9 @@ CLPFILE_ICON ICON "res/clpfile.ico" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_IT_IT +#include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/base/applications/clipbrd/lang/it-IT.rc b/base/applications/clipbrd/lang/it-IT.rc new file mode 100644 index 00..93ecdc0874 --- /dev/null +++ b/base/applications/clipbrd/lang/it-IT.rc @@ -0,0 +1,72 @@ +/* + * PROJECT: ReactOS Clipboard Viewer + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Implementation of Italian language for Clipboard Viewer + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +ID_ACCEL ACCELERATORS +BEGIN +VK_DELETE, CMD_DELETE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN +POPUP "" +BEGIN +MENUITEM "", CMD_OPEN +MENUITEM "Salva ", CMD_SAVE_AS +MENUITEM SEPARATOR +MENUITEM "U", CMD_EXIT +END +POPUP "" +BEGIN +MENUITEM "\tDel", CMD_DELETE +END +POPUP "" +BEGIN +MENUITEM "", CMD_AUTOMATIC +END +POPUP "" +BEGIN +MENUITEM " Guida", CMD_HELP +MENUITEM SEPARATOR +MENUITEM "", CMD_ABOUT +END +END + +STRINGTABLE +BEGIN +STRING_CLIPBOARD "Visualizzatore di Clipboard" +STRING_CLIPFILE "Elemento Clipboard" +STRING_DELETE_MSG "Cancella i contenuti del Clipboard?" +STRING_DELETE_TITLE "Cancella Clipboard" +STRING_FORMAT_NT "I file del Clipboard di ReactOS (*.clp)" +STRING_FORMAT_GEN "I file Clipboard (*.clp)" +END + +STRINGTABLE +BEGIN +STRING_CF_UNKNOWN "Formato Sconosciuto" +STRING_CF_TEXT "Testo" +STRING_CF_BITMAP "Bitmap" +STRING_CF_OEMTEXT "Testo OEM" +STRING_CF_UNICODETEXT "Testo Unicode" +STRING_CF_DIB "DIB Bitmap" +STRING_CF_LOCALE "Data Locale" +STRING_CF_ENHMETAFILE "Metafile Arricchito" +STRING_CF_METAFILEPICT "Metafile" +STRING_CF_PALETTE "Palette di Colori" +STRING_CF_DIBV5 "DIB Bitmap (Versione 5)" +STRING_CF_SYLK "Formato a Collegamento Simbolico" +STRING_CF_DIF "Formato di Data di Interscambio" +STRING_CF_HDROP "Abbandona le Informazioni" +END + +STRINGTABLE +BEGIN +ERROR_UNSUPPORTED_FORMAT "Il Clipboard contiene informazioni in formato data, che non può essere visualizzato." +ERROR_INVALID_FILE_FORMAT "Il file selezionato non è un file di tipo clipboard valido." +END
[ros-diffs] 01/02: [ACPPAGE] Hide shims handled by the main ui.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c7ce469bb5abbd5c7fd2e0a5648ca78580618e1 commit 5c7ce469bb5abbd5c7fd2e0a5648ca78580618e1 Author: Mark JansenAuthorDate: Sat Jan 27 17:41:58 2018 +0100 Commit: Mark Jansen CommitDate: Mon Jan 29 22:05:17 2018 +0100 [ACPPAGE] Hide shims handled by the main ui. --- dll/shellext/acppage/CLayerStringList.hpp | 28 ++-- dll/shellext/acppage/CLayerUIPropPage.cpp | 22 ++ dll/shellext/acppage/precomp.h| 2 ++ 3 files changed, 38 insertions(+), 14 deletions(-) diff --git a/dll/shellext/acppage/CLayerStringList.hpp b/dll/shellext/acppage/CLayerStringList.hpp index 204ec40f52..af8c04fe95 100644 --- a/dll/shellext/acppage/CLayerStringList.hpp +++ b/dll/shellext/acppage/CLayerStringList.hpp @@ -36,24 +36,24 @@ public: while (celt && m_layer) { TAGID nameid = SdbFindFirstTag(m_db, m_layer, TAG_NAME); -if (!nameid) -return S_FALSE; - -LPWSTR name = SdbGetStringTagPtr(m_db, nameid); -if (!name) -return S_FALSE; - -ULONG Size = wcslen(name) + 1; +if (nameid) +{ +LPWSTR name = SdbGetStringTagPtr(m_db, nameid); +if (name && !IsBuiltinLayer(name)) +{ +ULONG Size = wcslen(name) + 1; -*rgelt = (LPOLESTR)::CoTaskMemAlloc(Size * sizeof(WCHAR)); -StringCchCopyW(*rgelt, Size, name); +*rgelt = (LPOLESTR)::CoTaskMemAlloc(Size * sizeof(WCHAR)); +StringCchCopyW(*rgelt, Size, name); -if (pceltFetched) -(*pceltFetched)++; +if (pceltFetched) +(*pceltFetched)++; +celt--; +rgelt++; +} +} m_layer = SdbFindNextTag(m_db, m_root, m_layer); -celt--; -rgelt++; } return celt ? S_FALSE : S_OK; } diff --git a/dll/shellext/acppage/CLayerUIPropPage.cpp b/dll/shellext/acppage/CLayerUIPropPage.cpp index 116c8621b0..bbd4c3d837 100644 --- a/dll/shellext/acppage/CLayerUIPropPage.cpp +++ b/dll/shellext/acppage/CLayerUIPropPage.cpp @@ -67,6 +67,28 @@ static const WCHAR* g_AllowedExtensions[] = { 0 }; +BOOL IsBuiltinLayer(PCWSTR Name) +{ +size_t n; + +for (n = 0; g_Layers[n].Name; ++n) +{ +if (!wcsicmp(g_Layers[n].Name, Name)) +{ +return TRUE; +} +} + +for (n = 0; g_CompatModes[n].Name; ++n) +{ +if (!wcsicmp(g_CompatModes[n].Name, Name)) +{ +return TRUE; +} +} +return FALSE; +} + void ACDBG_FN(PCSTR FunctionName, PCWSTR Format, ...) { diff --git a/dll/shellext/acppage/precomp.h b/dll/shellext/acppage/precomp.h index 21dd0c159c..5fd81bda48 100644 --- a/dll/shellext/acppage/precomp.h +++ b/dll/shellext/acppage/precomp.h @@ -28,6 +28,8 @@ extern LONG g_ModuleRefCnt; EXTERN_C BOOL WINAPI GetExeFromLnk(PCWSTR pszLnk, PWSTR pszExe, size_t cchSize); +BOOL IsBuiltinLayer(PCWSTR Name); + #include "resource.h" #include "CLayerStringList.hpp" #include "CLayerUIPropPage.hpp"
[ros-diffs] 01/01: [EXPLORER] Improve the width of the taskbar clock Don't take into account TRAY_CLOCK_WND_SPACING_X twice Increase TRAY_CLOCK_WND_SPACING_X
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=556c485c8b7b9313af0b0b2aa03aa7304b991447 commit 556c485c8b7b9313af0b0b2aa03aa7304b991447 Author: Giannis AdamopoulosAuthorDate: Mon Jan 29 22:32:17 2018 +0200 Commit: Giannis Adamopoulos CommitDate: Mon Jan 29 22:32:17 2018 +0200 [EXPLORER] Improve the width of the taskbar clock Don't take into account TRAY_CLOCK_WND_SPACING_X twice Increase TRAY_CLOCK_WND_SPACING_X --- base/shell/explorer/trayclock.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index 5236a9809c..0f7b36352c 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -146,7 +146,7 @@ const WCHAR szTrayClockWndClass[] = L"TrayClockWClass"; #define ID_TRAYCLOCK_TIMER 0 #define ID_TRAYCLOCK_TIMER_INIT 1 -#define TRAY_CLOCK_WND_SPACING_X3 +#define TRAY_CLOCK_WND_SPACING_X6 #define TRAY_CLOCK_WND_SPACING_Y0 CTrayClockWnd::CTrayClockWnd() : @@ -307,8 +307,8 @@ WORD CTrayClockWnd::GetMinimumSize(IN BOOL Horizontal, IN OUT PSIZE pSize) /* Increase maximum rectangle */ szMax.cy += LineSizes[i].cy; -if (LineSizes[i].cx > szMax.cx - (2 * TRAY_CLOCK_WND_SPACING_X)) -szMax.cx = LineSizes[i].cx + (2 * TRAY_CLOCK_WND_SPACING_X); +if (LineSizes[i].cx > szMax.cx) +szMax.cx = LineSizes[i].cx; } }
[ros-diffs] 01/01: [EXPLORER] Center the text of the clock CTrayClockWnd: Fix the calculation that centered the text of the clock. CTrayNotifyWnd: Restore the 1 pixel margin between the clock and the
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d11e7af5f2539c417e980ba1b3a622f8da450603 commit d11e7af5f2539c417e980ba1b3a622f8da450603 Author: Giannis AdamopoulosAuthorDate: Mon Jan 29 21:50:33 2018 +0200 Commit: Giannis Adamopoulos CommitDate: Mon Jan 29 21:50:33 2018 +0200 [EXPLORER] Center the text of the clock CTrayClockWnd: Fix the calculation that centered the text of the clock. CTrayNotifyWnd: Restore the 1 pixel margin between the clock and the pager. --- base/shell/explorer/trayclock.cpp | 5 + base/shell/explorer/trayntfy.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index b16a2151a1..5236a9809c 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -534,9 +534,7 @@ LRESULT CTrayClockWnd::OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bH hPrevFont = (HFONT) SelectObject(hDC, hFont); -rcClient.left = (rcClient.right / 2) - (CurrentSize.cx / 2); rcClient.top = (rcClient.bottom / 2) - (CurrentSize.cy / 2); -rcClient.right = rcClient.left + CurrentSize.cx; rcClient.bottom = rcClient.top + CurrentSize.cy; for (i = 0, line = 0; @@ -546,8 +544,7 @@ LRESULT CTrayClockWnd::OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bH if (LineSizes[i].cx != 0) { TextOut(hDC, -rcClient.left + (CurrentSize.cx / 2) - (LineSizes[i].cx / 2) + -TRAY_CLOCK_WND_SPACING_X, +(rcClient.right - LineSizes[i].cx) / 2, rcClient.top + TRAY_CLOCK_WND_SPACING_Y, szLines[i], wcslen(szLines[i])); diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index a59423ac76..4326ca727e 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -27,7 +27,7 @@ static const WCHAR szTrayNotifyWndClass [] = TEXT("TrayNotifyWnd"); -#define TRAY_NOTIFY_WND_SPACING_X 0 +#define TRAY_NOTIFY_WND_SPACING_X 1 #define TRAY_NOTIFY_WND_SPACING_Y 1 class CTrayNotifyWnd :
[ros-diffs] 01/01: [EXPLORER] Tweak x-margins surrounding the clock
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c109dc9f24b69c5d0c69939d45691b6eb1af9034 commit c109dc9f24b69c5d0c69939d45691b6eb1af9034 Author: Joachim HenzeAuthorDate: Mon Jan 29 19:15:50 2018 +0100 Commit: Joachim Henze CommitDate: Mon Jan 29 19:15:50 2018 +0100 [EXPLORER] Tweak x-margins surrounding the clock To look more like XP/2k3. Not pixel-perfect yet, that would require asymmetric margins. CORE-14272 --- base/shell/explorer/trayclock.cpp | 2 +- base/shell/explorer/trayntfy.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index fe1b199cc3..b16a2151a1 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -146,7 +146,7 @@ const WCHAR szTrayClockWndClass[] = L"TrayClockWClass"; #define ID_TRAYCLOCK_TIMER 0 #define ID_TRAYCLOCK_TIMER_INIT 1 -#define TRAY_CLOCK_WND_SPACING_X0 +#define TRAY_CLOCK_WND_SPACING_X3 #define TRAY_CLOCK_WND_SPACING_Y0 CTrayClockWnd::CTrayClockWnd() : diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 4326ca727e..a59423ac76 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -27,7 +27,7 @@ static const WCHAR szTrayNotifyWndClass [] = TEXT("TrayNotifyWnd"); -#define TRAY_NOTIFY_WND_SPACING_X 1 +#define TRAY_NOTIFY_WND_SPACING_X 0 #define TRAY_NOTIFY_WND_SPACING_Y 1 class CTrayNotifyWnd :
[ros-diffs] 01/01: [TRACERT] Translation for Italian and Romanian language (#333)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7169c7703dc25d581e76b1f25952a29f4635f45c commit 7169c7703dc25d581e76b1f25952a29f4635f45c Author: Bișoc GeorgeAuthorDate: Mon Jan 29 18:23:52 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO CommitDate: Mon Jan 29 18:23:52 2018 +0100 [TRACERT] Translation for Italian and Romanian language (#333) --- base/applications/network/tracert/lang/it-IT.rc | 42 ++--- base/applications/network/tracert/lang/ro-RO.rc | 42 ++--- 2 files changed, 48 insertions(+), 36 deletions(-) diff --git a/base/applications/network/tracert/lang/it-IT.rc b/base/applications/network/tracert/lang/it-IT.rc index a4e710b6a4..bdd4f9d6a7 100644 --- a/base/applications/network/tracert/lang/it-IT.rc +++ b/base/applications/network/tracert/lang/it-IT.rc @@ -1,26 +1,32 @@ +/* + * PROJECT: ReactOS trace route utility + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: TRACERT translation file in Italian + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "\r\n\ -Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ -Options:\r\n\ --d Do not resolve addresses to hostnames.\r\n\ --h maximum_hopsMaximum number of hops to search for target.\r\n\ --j host-list Loose source route along host-list.\r\n\ --w timeout Wait timeout milliseconds for each reply.\r\n\ --4 Force using IPv4.\r\n\ --6 Force using IPv6.\r\n\ +Uso: tracert [-d] [-h salti_massime] [-j lista-ospiti] [-w timeout] nome_bersaglio \r\n\r\n\ +Opzioni:\r\n\ +-d Non risolvi gli indirizzi a nomi host.\r\n\ +-h salti_massime Numero massimo di salti per cercare il bersaglio.\r\n\ +-j lista-ospitiFonte route libera lungo lista-ospiti.\r\n\ +-w timeout Aspetta il timeout in millisecondi per ogni risposta.\r\n\ +-4 Forza l'uso del IPv4.\r\n\ +-6 Forza l'uso del IPv6.\r\n\ \r\n" -IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" -IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" -IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" -IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" +IDS_INVALID_OPTION "%1 non è un opzione di commando valido.\r\n" +IDS_TRACE_INFO "\r\nTraccia route a %1 [%2]\r\noltre il massimo di %3!u! salti:\r\n\r\n" +IDS_TRACE_COMPLETE "\r\nTraccia completa.\r\n" +IDS_UNABLE_RESOLVE "Impossibile risolvere il nome bersaglio di sistema %1.\r\n" -IDS_GEN_FAILURE "General failure.\r\n" -IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" +IDS_GEN_FAILURE "Fallimento generale.\r\n" +IDS_TRANSMIT_FAILED "Transmissione fallita. (Errore %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" IDS_HOP_TIME"%1!4lu! ms %0\r\n" @@ -29,9 +35,9 @@ Options:\r\n\ IDS_HOP_RES_INFO"%1 [%2]" IDS_HOP_IP_INFO "%1" IDS_LINEBREAK "\r\n" -IDS_REQ_TIMED_OUT "Request timed out.\r\n" -IDS_HOP_RESPONSE" reports: " -IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" -IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" +IDS_REQ_TIMED_OUT "Richiesta fallita (time out).\r\n" +IDS_HOP_RESPONSE" rapporti: " +IDS_DEST_HOST_UNREACHABLE "Destinazione ospite irraggiungibile.\r\n" +IDS_DEST_NET_UNREACHABLE "Destinazione rete irraggiungibile.\r\n" END diff --git a/base/applications/network/tracert/lang/ro-RO.rc b/base/applications/network/tracert/lang/ro-RO.rc index 2811f1495e..0f795788c0 100644 --- a/base/applications/network/tracert/lang/ro-RO.rc +++ b/base/applications/network/tracert/lang/ro-RO.rc @@ -1,26 +1,32 @@ +/* + * PROJECT: ReactOS trace route utility + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: TRACERT translation file in Romanian + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_USAGE "\r\n\ -Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ -Options:\r\n\ --d Do not resolve addresses to hostnames.\r\n\ --h maximum_hopsMaximum number of hops to search for target.\r\n\ --j host-list Loose source route along host-list.\r\n\ --w timeout Wait timeout milliseconds for each reply.\r\n\ --4 Force using IPv4.\r\n\ --6 Force using IPv6.\r\n\ +Uz: tracert [-d] [-h sărituri_maxime] [-j lista-gazdă] [-w timeout] nume_ţintă \r\n\r\n\ +Opțiuni:\r\n\ +-d Nu rezolva
[ros-diffs] 01/01: [TRANSLATION] Update Simplified Chinese Translations of SHELL32 and USRMGR (#340)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=09168aae12fc981e53c33bc92da05439384d1f14 commit 09168aae12fc981e53c33bc92da05439384d1f14 Author: Luo YufanAuthorDate: Tue Jan 30 01:21:20 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO CommitDate: Mon Jan 29 18:21:20 2018 +0100 [TRANSLATION] Update Simplified Chinese Translations of SHELL32 and USRMGR (#340) --- dll/cpl/usrmgr/lang/zh-CN.rc| 33 + dll/win32/shell32/lang/zh-CN.rc | 22 +++--- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dll/cpl/usrmgr/lang/zh-CN.rc b/dll/cpl/usrmgr/lang/zh-CN.rc index c014e9340c..e5dc6a3d8f 100644 --- a/dll/cpl/usrmgr/lang/zh-CN.rc +++ b/dll/cpl/usrmgr/lang/zh-CN.rc @@ -1,4 +1,5 @@ /* Simplified Chinese translation by Henry Tang Ih 2015 (henryta...@hotmail.com) */ +/* Improved by Luo Yufan (njlyf2...@hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -7,7 +8,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_USERS DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "用户" -FONT 8, "宋体" +FONT 9, "宋体" BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE @@ -20,8 +21,8 @@ END IDD_GROUPS DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "小组" -FONT 8, "宋体" +CAPTION "组" +FONT 9, "宋体" BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE @@ -33,15 +34,15 @@ END IDD_EXTRA DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "额外" -FONT 8, "宋体" +FONT 9, "宋体" BEGIN -LTEXT "这个空间是故意留空", IDC_STATIC, 66, 90, 112, 8 +LTEXT "此区域有意留空", IDC_STATIC, 66, 90, 112, 8 END IDD_USER_GENERAL DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常规" -FONT 8, "宋体" +FONT 9, "宋体" BEGIN LTEXT "", IDC_USER_GENERAL_NAME, 7, 12, 112, 8 LTEXT "全名:", -1, 7, 46, 63, 8 @@ -57,8 +58,8 @@ END IDD_USER_MEMBERSHIP DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "会员" -FONT 8, "宋体" +CAPTION "成员" +FONT 9, "宋体" BEGIN LTEXT "成员:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | @@ -70,7 +71,7 @@ END IDD_USER_PROFILE DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "配置文件" -FONT 8, "宋体" +FONT 9, "宋体" BEGIN GROUPBOX "用户配置文件", -1, 7, 7, 238, 54 LTEXT "配置文件路径:", -1, 16, 22, 55, 8 @@ -90,7 +91,7 @@ END IDD_GROUP_GENERAL DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常规" -FONT 8, "宋体" +FONT 9, "宋体" BEGIN LTEXT "", IDC_GROUP_GENERAL_NAME, 7, 12, 112, 8 LTEXT "描述:", -1, 7, 45, 46, 8 @@ -104,8 +105,8 @@ END IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 267, 74 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT -CAPTION "更换密码" -FONT 8, "宋体" +CAPTION "更改密码" +FONT 9, "宋体" BEGIN EDITTEXT IDC_EDIT_PASSWORD1, 107, 7, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD RTEXT "新密码:", -1, 7, 10, 96, 8 @@ -118,7 +119,7 @@ END IDD_USER_NEW DIALOGEX 0, 0, 267, 200 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "新用户" -FONT 8, "宋体" +FONT 9, "宋体" BEGIN EDITTEXT IDC_USER_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL RTEXT "用户名称:", -1, 7, 10, 96, 8 @@ -141,7 +142,7 @@ END IDD_GROUP_NEW DIALOGEX 0, 0, 267, 74 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "新组" -FONT 8, "宋体" +FONT 9, "宋体" BEGIN EDITTEXT IDC_GROUP_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL RTEXT "组名:", -1, 7, 10, 96, 8 @@ -154,7 +155,7 @@ END IDD_USER_ADD_MEMBERSHIP DIALOGEX 0, 0, 252, 223 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "组成员身份" -FONT 8, "宋体" +FONT 9, "宋体" BEGIN LTEXT "成员:", -1, 7, 7, 56, 8 CONTROL "", IDC_USER_ADD_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | @@ -190,7 +191,7 @@ BEGIN END POPUP "" BEGIN -MENUITEM "更换密码", IDM_USER_CHANGE_PASSWORD +MENUITEM "更改密码", IDM_USER_CHANGE_PASSWORD MENUITEM SEPARATOR MENUITEM "取除", IDM_USER_DELETE MENUITEM "重命名", IDM_USER_RENAME diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 8072464090..693970903f 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -56,7 +56,7 @@ MENU_003 MENU BEGIN MENUITEM "撤消()\tCtrl+Z", FCIDM_SHVIEW_UNDO MENUITEM SEPARATOR -MENUITEM "剪下()\tCtrl+X",
[ros-diffs] 01/01: [EXPLORER] Fix showing the lock status in the taskbar popup menu
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fabf069daf030d0ddc32b094e2445d61e4834a9b commit fabf069daf030d0ddc32b094e2445d61e4834a9b Author: Giannis AdamopoulosAuthorDate: Mon Jan 29 18:13:22 2018 +0200 Commit: Giannis Adamopoulos CommitDate: Mon Jan 29 18:15:31 2018 +0200 [EXPLORER] Fix showing the lock status in the taskbar popup menu --- base/shell/explorer/traywnd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 9ca7b25781..bf71ad0e17 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2993,7 +2993,7 @@ public: MF_BYCOMMAND); } -CheckMenuItem(hPopup, +CheckMenuItem(menubase, ID_LOCKTASKBAR, MF_BYCOMMAND | (g_TaskbarSettings.bLock ? MF_CHECKED : MF_UNCHECKED));
[ros-diffs] 01/01: [COMCTL32] toolbar: Use szBarPadding.cy as the default top margin
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c4b7b0747b49e4ee8bbd5fc27c964a41450d9f2 commit 8c4b7b0747b49e4ee8bbd5fc27c964a41450d9f2 Author: Giannis AdamopoulosAuthorDate: Mon Jan 29 17:51:06 2018 +0200 Commit: Giannis Adamopoulos CommitDate: Mon Jan 29 17:51:06 2018 +0200 [COMCTL32] toolbar: Use szBarPadding.cy as the default top margin --- dll/win32/comctl32/toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/comctl32/toolbar.c b/dll/win32/comctl32/toolbar.c index c2befb228c..949eadb8d7 100644 --- a/dll/win32/comctl32/toolbar.c +++ b/dll/win32/comctl32/toolbar.c @@ -256,7 +256,7 @@ static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { #ifdef __REACTOS__ if (infoPtr->iVersion == 6) -return 0; +return infoPtr->szBarPadding.cy; #endif return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); }
[ros-diffs] 01/01: [EXPLORER] CNotifyToolbar: Set TBMETRICS::cxBarPad and TBMETRICS::cyBarPad MSDN says that these values are not used but apparently they are used as a padding around the buttons. Thi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22d1e1017f8ca89aae73c2bb9131155cb20f96a2 commit 22d1e1017f8ca89aae73c2bb9131155cb20f96a2 Author: Giannis AdamopoulosAuthorDate: Mon Jan 29 17:28:29 2018 +0200 Commit: Giannis Adamopoulos CommitDate: Mon Jan 29 17:30:44 2018 +0200 [EXPLORER] CNotifyToolbar: Set TBMETRICS::cxBarPad and TBMETRICS::cyBarPad MSDN says that these values are not used but apparently they are used as a padding around the buttons. This helps to center the buttons in the notification area. --- base/shell/explorer/syspager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 45f17023b9..4656d8f6fa 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1189,6 +1189,8 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue) tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING | TBMF_PAD; tbm.cxPad = 1; tbm.cyPad = 1; +tbm.cxBarPad = 1; +tbm.cyBarPad = 1; tbm.cxButtonSpacing = 1; tbm.cyButtonSpacing = 1; SetMetrics();
[ros-diffs] 01/01: [CONTRIBUTING] Update .gitmessage template
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19a67154c6bb612d324da5c1ca824c9a3ca1e6b7 commit 19a67154c6bb612d324da5c1ca824c9a3ca1e6b7 Author: Alexander ShaposhnikovAuthorDate: Mon Jan 29 16:09:04 2018 +0200 Commit: Alexander Shaposhnikov CommitDate: Mon Jan 29 16:09:04 2018 +0200 [CONTRIBUTING] Update .gitmessage template --- .gitmessage | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitmessage b/.gitmessage index ebf493f1c4..f0b7ea10e1 100644 --- a/.gitmessage +++ b/.gitmessage @@ -4,20 +4,17 @@ # CORE- CIDX -#^ -# 70^ # * [MODULE] should usually be the name of the CMake module, written # in all caps. # -# * Summary should be imperative (not past tense), 70 characters or -# less, and not end with a period. +# * Summary should be imperative (not past tense), and not end with +# a period. # -# * Description of commit should explain WHY a change was made and -# lines should be also wrapped to 70 characters. +# * Description of commit should explain WHY a change was made. # # * JIRA, Coverity ID references should be placed at the bottom and # preceded by the newline. # # * Pull request should always be referenced in the summary in parens -# unless it doesn't fit In this case it should be placed after bug +# unless it doesn't fit. In this case it should be placed after bug # IDs if any.
[ros-diffs] 01/01: [CONTRIBUTING] Add a commit template and a paragraph about it
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d70741fa20aff5ee9dc19b68dac6b7ef31475949 commit d70741fa20aff5ee9dc19b68dac6b7ef31475949 Author: Alexander ShaposhnikovAuthorDate: Sun Jan 28 00:51:48 2018 +0200 Commit: Alexander Shaposhnikov CommitDate: Mon Jan 29 15:08:04 2018 +0200 [CONTRIBUTING] Add a commit template and a paragraph about it This template defines a general commit style, and will be most helpful for newcomers. I will be using it personally :) --- .gitmessage | 23 +++ CONTRIBUTING.md | 5 + 2 files changed, 28 insertions(+) diff --git a/.gitmessage b/.gitmessage new file mode 100644 index 00..ebf493f1c4 --- /dev/null +++ b/.gitmessage @@ -0,0 +1,23 @@ +# [MODULE] A short but descriptive summary (#pr-num) + +# A comprehensible description of WHY you did this work. + +# CORE- CIDX + +#^ +# 70^ +# * [MODULE] should usually be the name of the CMake module, written +# in all caps. +# +# * Summary should be imperative (not past tense), 70 characters or +# less, and not end with a period. +# +# * Description of commit should explain WHY a change was made and +# lines should be also wrapped to 70 characters. +# +# * JIRA, Coverity ID references should be placed at the bottom and +# preceded by the newline. +# +# * Pull request should always be referenced in the summary in parens +# unless it doesn't fit In this case it should be placed after bug +# IDs if any. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 028fe8bead..2d4b903b40 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,6 +57,10 @@ A __[patch]__ is a set of changes to existing source code. The changes in a patc See [Submitting Patches] for details. +### Commit style + +Our commit style is defined in a __[commit template]__. Use it as a reference or turn it on using `git config commit.template .gitmessage`. This will set this template as an initial commit message for the new commits in your local repository. + ### Rules and Recommendations - *Use your __real name__ and __real email__.* We do not accept anonymous contributions! @@ -96,3 +100,4 @@ Finding a good project to start with can be a challenge, because when starting o [README.FSD]: /media/doc/README.FSD [Coverity]: https://scan.coverity.com/projects/reactos [request-coverity]: https://scan.coverity.com/memberships/new?project_id=reactos + [commit template]: .gitmessage