[0.4.14][SDK] Remove 'RC' from version.cmake

CORE-16742 'Start button background in themes is scaled incorrectly' (especially MS Luna)

The problem once was unhidden by
0.4.7-dev-705-g 85ae842105

Fix picked from 0.4.15-dev-3441-g 67ad4e7f60

CMakeLists.txt

@@ -16,6 +16,8 @@ if(POLICY CMP0065)
     cmake_policy(SET CMP0065 NEW)
 endif()
 
+include(CMakeDependentOption)
+
 project(REACTOS)
 
 # Versioning
@@ -139,7 +141,7 @@ else()
         add_definitions(-D_WINKD_)
     endif()
 
-    if(CMAKE_VERSION MATCHES "ReactOS")
+    if(CMAKE_VERSION MATCHES "ReactOS" AND CMAKE_VERSION VERSION_LESS 3.3.0)
         set(PCH 1 CACHE BOOL "Whether to use precompiled headers")
     else()
         set(PCH 0 CACHE BOOL "Whether to use precompiled headers")

base/applications/fontview/fontview.c

@@ -35,7 +35,7 @@ HINSTANCE g_hInstance;
 INT g_FontIndex = 0;
 INT g_NumFonts = 0;
 LOGFONTW g_LogFonts[64];
-LPCWSTR g_fileName;
+LPCWSTR g_fileName = L"";
 WCHAR g_FontTitle[1024] = L"";
 BOOL g_FontPrint = FALSE;
 BOOL g_DisableInstall = FALSE;
@@ -102,7 +102,6 @@ wWinMain(HINSTANCE hThisInstance,
 	int argc;
 	INT i;
 	WCHAR** argv;
-	WCHAR szFileName[MAX_PATH] = L"";
 	DWORD dwSize;
 	HWND hMainWnd;
 	MSG msg;
@@ -125,6 +124,8 @@ wWinMain(HINSTANCE hThisInstance,
 	argv = CommandLineToArgvW(GetCommandLineW(), &argc);
 	if (argc < 2)
 	{
+#if 0
+		WCHAR szFileName[MAX_PATH] = L"";
 		OPENFILENAMEW fontOpen;
         WCHAR filter[MAX_PATH*2], dialogTitle[MAX_PATH];
 
@@ -154,6 +155,7 @@ wWinMain(HINSTANCE hThisInstance,
 			exiting the program altogether */
 			return 0;
 		}
+#endif
 	}
 	else
 	{
@@ -190,9 +192,9 @@ wWinMain(HINSTANCE hThisInstance,
 		g_fileName = fileName;
 	}
 
-	if (!AddFontResourceW(fileName))
+	if (!AddFontResourceW(g_fileName))
 	{
-		ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName);
+		ErrorMsgBox(0, IDS_ERROR_NOFONT, g_fileName);
 		return -1;
 	}
 

base/applications/network/netstat/netstat.c

@@ -434,7 +434,6 @@ BOOL ShowTcpTable(VOID)
     {
         ConResPrintf(StdErr, IDS_ERROR_TCP_SNAPSHOT);
         DoFormatMessage(error);
-        HeapFree(GetProcessHeap(), 0, tcpTable);
         return FALSE;
     }
 

base/applications/notepad/lang/es-ES.rc

@@ -8,7 +8,7 @@ BEGIN
     "^C", CMD_COPY
     "^B", CMD_SEARCH
     "^T", CMD_GOTO
-    "^R", CMD_REPLACE, VIRTKEY, CONTROL
+    "R", CMD_REPLACE, VIRTKEY, CONTROL
     "^N", CMD_NEW
     "^A", CMD_OPEN
     "^P", CMD_PRINT

base/applications/rapps/loaddlg.cpp

@@ -49,7 +49,8 @@
 #include "misc.h"
 
 #ifdef USE_CERT_PINNING
-#define CERT_ISSUER_INFO "US\r\nLet's Encrypt\r\nLet's Encrypt Authority X3"
+#define CERT_ISSUER_INFO_OLD "US\r\nLet's Encrypt\r\nLet's Encrypt Authority X3"
+#define CERT_ISSUER_INFO_NEW "US\r\nLet's Encrypt\r\nR3"
 #define CERT_SUBJECT_INFO "rapps.reactos.org"
 #endif
 
@@ -138,6 +139,7 @@ public:
             UINT uiPercentage = ((ULONGLONG) ulProgress * 100) / ulProgressMax;
 
             /* send the current progress to the progress bar */
+            if (!IsWindow()) return;
             SendMessage(PBM_SETPOS, uiPercentage, 0);
 
             /* format total download size */
@@ -152,6 +154,7 @@ public:
         else
         {
             /* send the current progress to the progress bar */
+            if (!IsWindow()) return;
             SendMessage(PBM_SETPOS, 0, 0);
 
             /* total size is not known, display only current size */
@@ -159,6 +162,7 @@ public:
         }
 
         /* and finally display it */
+        if (!IsWindow()) return;
         SendMessage(WM_SETTEXT, 0, (LPARAM) ProgressText.GetString());
     }
 
@@ -481,8 +485,10 @@ VOID CDownloadManager::UpdateProgress(
 {
     HWND Item;
 
+    if (!IsWindow(hDlg)) return;
     ProgressBar.SetProgress(ulProgress, ulProgressMax);
 
+    if (!IsWindow(hDlg)) return;
     Item = GetDlgItem(hDlg, IDC_DOWNLOAD_STATUS);
     if (Item && szStatusText && wcslen(szStatusText) > 0 && UrlHasBeenCopied == FALSE)
     {
@@ -548,6 +554,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param)
     for (iAppId = 0; iAppId < InfoArray.GetSize(); ++iAppId)
     {
         // Reset progress bar
+        if (!IsWindow(hDlg)) break;
         Item = GetDlgItem(hDlg, IDC_DOWNLOAD_PROGRESS);
         if (Item)
         {
@@ -579,6 +586,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param)
             szNewCaption.LoadStringW(IDS_DL_DIALOG_DB_DOWNLOAD_DISP);
         }
 
+        if (!IsWindow(hDlg)) goto end;
         SetWindowTextW(hDlg, szNewCaption.GetString());
 
         // build the path for the download
@@ -616,6 +624,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param)
         }
 
         // Add the download URL
+        if (!IsWindow(hDlg)) goto end;
         SetDlgItemTextW(hDlg, IDC_DOWNLOAD_STATUS, InfoArray[iAppId].szUrl.GetString());
 
         DownloadsListView.SetDownloadStatus(iAppId, DLSTATUS_DOWNLOADING);
@@ -720,7 +729,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param)
             (wcscmp(InfoArray[iAppId].szUrl, APPLICATION_DATABASE_URL) == 0))
         {
             CLocalPtr subjectName, issuerName;
-            CStringW szMsgText;
+            CStringA szMsgText;
             bool bAskQuestion = false;
             if (!CertGetSubjectAndIssuer(hFile, subjectName, issuerName))
             {
@@ -730,7 +739,8 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param)
             else
             {
                 if (strcmp(subjectName, CERT_SUBJECT_INFO) ||
-                    strcmp(issuerName, CERT_ISSUER_INFO))
+                    (strcmp(issuerName, CERT_ISSUER_INFO_OLD) &&
+                    strcmp(issuerName, CERT_ISSUER_INFO_NEW)))
                 {
                     szMsgText.Format(IDS_MISMATCH_CERT_INFO, (char*)subjectName, (const char*)issuerName);
                     bAskQuestion = true;
@@ -739,7 +749,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param)
 
             if (bAskQuestion)
             {
-                if (MessageBoxW(hMainWnd, szMsgText.GetString(), NULL, MB_YESNO | MB_ICONERROR) != IDYES)
+                if (MessageBoxA(hMainWnd, szMsgText.GetString(), NULL, MB_YESNO | MB_ICONERROR) != IDYES)
                 {
                     goto end;
                 }
@@ -768,6 +778,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param)
             }
 
             dwCurrentBytesRead += dwBytesRead;
+            if (!IsWindow(hDlg)) goto end;
             UpdateProgress(hDlg, dwCurrentBytesRead, dwContentLen, 0, InfoArray[iAppId].szUrl.GetString());
         } while (dwBytesRead && !bCancelled);
 
@@ -783,6 +794,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param)
             ProgressBar.SetMarquee(FALSE);
 
             dwContentLen = dwCurrentBytesRead;
+            if (!IsWindow(hDlg)) goto end;
             UpdateProgress(hDlg, dwCurrentBytesRead, dwContentLen, 0, InfoArray[iAppId].szUrl.GetString());
         }
 
@@ -796,6 +808,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param)
             if (!szMsgText.LoadStringW(IDS_INTEG_CHECK_TITLE))
                 goto end;
 
+            if (!IsWindow(hDlg)) goto end;
             SetWindowTextW(hDlg, szMsgText.GetString());
             SendMessageW(GetDlgItem(hDlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM) Path.GetString());
 
@@ -805,6 +818,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param)
                 if (!szMsgText.LoadStringW(IDS_INTEG_CHECK_FAIL))
                     goto end;
 
+                if (!IsWindow(hDlg)) goto end;
                 MessageBoxW(hDlg, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR);
                 goto end;
             }
@@ -829,6 +843,7 @@ run:
                 //reflect installation progress in the titlebar
                 //TODO: make a separate string with a placeholder to include app name?
                 ATL::CStringW szMsgText = LoadStatusString(DLSTATUS_INSTALLING);
+                if (!IsWindow(hDlg)) goto end;
                 SetWindowTextW(hDlg, szMsgText.GetString());
 
                 DownloadsListView.SetDownloadStatus(iAppId, DLSTATUS_INSTALLING);
@@ -856,10 +871,12 @@ end:
                 DeleteFileW(Path.GetString());
         }
 
+        if (!IsWindow(hDlg)) return 0;
         DownloadsListView.SetDownloadStatus(iAppId, DLSTATUS_FINISHED);
     }
 
     delete static_cast<DownloadParam*>(param);
+    if (!IsWindow(hDlg)) return 0;
     SendMessageW(hDlg, WM_CLOSE, 0, 0);
     return 0;
 }

base/applications/sndrec32/audio_membuffer.cpp

@@ -12,7 +12,7 @@ _AUDIO_NAMESPACE_START_
 
 /* Protected Functions */
 
-void 
+void
 audio_membuffer::alloc_mem_(unsigned int bytes)
 {
     /* Some checking */
@@ -79,7 +79,7 @@ audio_membuffer::resize_mem_(unsigned int new_size)
         buffer_resized(new_size);
 }
 
-void 
+void
 audio_membuffer::truncate_(void)
 {
     /* If `buf_size' is already = to the `bytes_received' of audio data,
@@ -113,7 +113,7 @@ audio_membuffer::clear(void)
     bytes_received = 0;
 }
 
-void 
+void
 audio_membuffer::reset(void)
 {
     /* Frees memory and reset to initial state */
@@ -122,37 +122,37 @@ audio_membuffer::reset(void)
     alloc_mem_(init_size);
 }
 
-void 
+void
 audio_membuffer::alloc_bytes(unsigned int bytes)
 {
     alloc_mem_(bytes);
 }
 
-void 
+void
 audio_membuffer::alloc_seconds(unsigned int secs)
 {
     alloc_mem_(aud_info.byte_rate() * secs);
 }
 
-void 
+void
 audio_membuffer::alloc_seconds(float secs)
 {
     alloc_mem_((unsigned int)((float)aud_info.byte_rate() * secs));
 }
 
-void 
+void
 audio_membuffer::resize_bytes(unsigned int bytes)
 {
     resize_mem_(bytes);
 }
 
-void 
+void
 audio_membuffer::resize_seconds(unsigned int secs)
 {
     resize_mem_(aud_info.byte_rate() * secs);
 }
 
-void 
+void
 audio_membuffer::resize_seconds(float secs)
 {
     resize_mem_((unsigned int)((float)aud_info.byte_rate() * secs));
@@ -160,7 +160,7 @@ audio_membuffer::resize_seconds(float secs)
 
 /* Inherited Functions */
 
-void 
+void
 audio_membuffer::audio_receive(unsigned char *data, unsigned int size)
 {
     /* If there isn't a buffer, allocs memory for it of size*2, and copies audio data arrival */
@@ -196,7 +196,7 @@ audio_membuffer::audio_receive(unsigned char *data, unsigned int size)
         audio_arrival(aud_info.samples_in_bytes(size));
 }
 
-unsigned int 
+unsigned int
 audio_membuffer::read(BYTE *out_buf, unsigned int bytes)
 {
     /* Some checking */

base/applications/sndrec32/audio_resampler_acm.cpp

@@ -25,7 +25,7 @@ audio_resampler_acm::init_(void)
     wformat_src.cbSize = sizeof(WAVEFORMATEX);
     wformat_dst.cbSize = sizeof(WAVEFORMATEX);
 
-    /* Setting WAVEFORMATEX structure parameters 
+    /* Setting WAVEFORMATEX structure parameters
        according to `audio_format' in/out classes */
 
     wformat_src.wFormatTag = WAVE_FORMAT_PCM;
@@ -189,7 +189,7 @@ audio_resampler_acm::close(void)
     /* ACM sream successfully closed */
 }
 
-void 
+void
 audio_resampler_acm::audio_receive(unsigned char *data, unsigned int size)
 {
     MMRESULT err;

base/applications/sndrec32/audio_wavein.cpp

@@ -50,7 +50,7 @@ audio_wavein::alloc_buffers_mem_(unsigned int buffs, float secs)
     mb_size = tot_size;
 }
 
-void 
+void
 audio_wavein::free_buffers_mem_(void)
 {
     /* Frees memory */
@@ -65,7 +65,7 @@ audio_wavein::free_buffers_mem_(void)
     wave_headers = 0;
 }
 
-void 
+void
 audio_wavein::init_headers_(void)
 {
     /* If there is no memory for memory or headers, simply return */
@@ -85,7 +85,7 @@ audio_wavein::init_headers_(void)
     }
 }
 
-void 
+void
 audio_wavein::prep_headers_(void)
 {
     MMRESULT err;
@@ -108,7 +108,7 @@ audio_wavein::prep_headers_(void)
         MessageBox(0, TEXT("waveInPrepareHeader Error."), 0, 0);
 }
 
-void 
+void
 audio_wavein::unprep_headers_(void)
 {
     MMRESULT err;
@@ -131,7 +131,7 @@ audio_wavein::unprep_headers_(void)
         MessageBox(0, TEXT("waveInUnPrepareHeader Error."), 0, 0);
 }
 
-void 
+void
 audio_wavein::add_buffers_to_driver_(void)
 {
     MMRESULT err;
@@ -155,7 +155,7 @@ audio_wavein::add_buffers_to_driver_(void)
 }
 
 void
-audio_wavein::close(void) 
+audio_wavein::close(void)
 {
     /* If wavein object is already in the status NOTREADY, nothing to do */
     if (status == WAVEIN_NOTREADY)
@@ -340,7 +340,7 @@ audio_wavein::stop_recording(void)
     status = WAVEIN_STOP;
 }
 
-DWORD WINAPI 
+DWORD WINAPI
 audio_wavein::recording_procedure(LPVOID arg)
 {
     MSG msg;

base/applications/sndrec32/audio_wavein.hpp

@@ -123,7 +123,7 @@ class audio_wavein
                 return;
 
             /* Set seconds length for each buffer */
-            buf_secs = bsecs; 
+            buf_secs = bsecs;
         }
 
         unsigned int total_buffers(void) const
@@ -181,7 +181,7 @@ class audio_wavein
                 svalue = (unsigned int)abs(*((short *)(main_buffer + aud_info.bytes_in_samples(nsamp))));
             else if (aud_info.bits() == 8)
                svalue = (unsigned int)((ptrdiff_t) *(main_buffer + aud_info.bytes_in_samples(nsamp)));
-            else 
+            else
                 svalue = 0;
 
             return svalue;

base/applications/sndrec32/audio_waveout.cpp

@@ -22,7 +22,7 @@ audio_waveout::init_(void)
     status = WAVEOUT_NOTREADY;
 }
 
-void 
+void
 audio_waveout::alloc_buffers_mem_(unsigned int buffs, float secs)
 {
     unsigned int onebuf_size = 0, tot_size = 0;
@@ -35,7 +35,7 @@ audio_waveout::alloc_buffers_mem_(unsigned int buffs, float secs)
         delete[] wave_headers;
 
     /* Calcs size of the buffers */
-    onebuf_size = (unsigned int)((float)aud_info.byte_rate() * secs); 
+    onebuf_size = (unsigned int)((float)aud_info.byte_rate() * secs);
     tot_size = onebuf_size * buffs;
     /* Allocs memory for the audio buffers */
     main_buffer = new BYTE[tot_size];
@@ -48,7 +48,7 @@ audio_waveout::alloc_buffers_mem_(unsigned int buffs, float secs)
     mb_size = tot_size;
 }
 
-void 
+void
 audio_waveout::init_headers_(void)
 {
     /* If there is no memory for memory or headers, simply return */
@@ -80,7 +80,7 @@ audio_waveout::init_headers_(void)
     }
 }
 
-void 
+void
 audio_waveout::prep_headers_(void)
 {
     MMRESULT err;
@@ -105,7 +105,7 @@ audio_waveout::prep_headers_(void)
     }
 }
 
-void 
+void
 audio_waveout::unprep_headers_(void)
 {
     MMRESULT err;
@@ -130,7 +130,7 @@ audio_waveout::unprep_headers_(void)
     }
 }
 
-void 
+void
 audio_waveout::free_buffers_mem_(void)
 {
     /* Frees memory */
@@ -144,7 +144,7 @@ audio_waveout::free_buffers_mem_(void)
     wave_headers = 0;
 }
 
-void 
+void
 audio_waveout::open(void)
 {
     MMRESULT err;
@@ -214,7 +214,7 @@ audio_waveout::open(void)
     status = WAVEOUT_READY;
 }
 
-void 
+void
 audio_waveout::play(void)
 {
     MMRESULT err;
@@ -268,7 +268,7 @@ audio_waveout::play(void)
     }
 }
 
-void 
+void
 audio_waveout::pause(void)
 {
     MMRESULT err;
@@ -288,7 +288,7 @@ audio_waveout::pause(void)
     }
 }
 
-void 
+void
 audio_waveout::stop(void)
 {
     MMRESULT err;
@@ -344,7 +344,7 @@ audio_waveout::close(void)
     free_buffers_mem_();
 }
 
-DWORD WINAPI 
+DWORD WINAPI
 audio_waveout::playing_procedure(LPVOID arg)
 {
     MSG msg;

base/applications/sndrec32/audio_waveout.hpp

@@ -117,7 +117,7 @@ class audio_waveout
                 return (unsigned int)65535;
             else if (aud_info.bits() == 8)
                 return (unsigned int)255;
-            else 
+            else
                 return 0;
         }
 
@@ -134,7 +134,7 @@ class audio_waveout
                 svalue = (unsigned int)abs(*((short *)(main_buffer + aud_info.bytes_in_samples(nsamp))));
             else if (aud_info.bits() == 8)
                svalue = (unsigned int)((ptrdiff_t) *(main_buffer + aud_info.bytes_in_samples(nsamp)));
-            else 
+            else
                 svalue = 0;
 
             return svalue;

base/applications/sndrec32/lang/cs-CZ.rc

@@ -11,17 +11,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Záznam zvuku"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "ReactOS Záznam zvuku, verze 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "Soubor"

base/applications/sndrec32/lang/de-DE.rc

@@ -6,17 +6,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Information zum Audiorecorder"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "ReactOS Audiorecorder, Version 1.0", IDC_STATIC, 56, 16, 134, 8, SS_NOPREFIX
-    LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 134, 8
-    DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "&Datei"

base/applications/sndrec32/lang/en-US.rc

@@ -6,17 +6,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Information about ReactOS Sound Recorder"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "ReactOS Sound Recorder, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "&File"

base/applications/sndrec32/lang/es-ES.rc

@@ -9,17 +9,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Acerca de la Grabadora de sonidos de ReactOS"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "Grabadora de sonidos de ReactOS, versión 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "Aceptar", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "&Archivo"

base/applications/sndrec32/lang/fr-FR.rc

@@ -6,58 +6,47 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Information à propos de l'Enregistreur de Son ReactOS"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "Enregistreur de Son ReactOS, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "Accepter", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
-    POPUP "Fichier"
+    POPUP "&Fichier"
     BEGIN
-        MENUITEM "Nouveau", ID_FILE_NEW
-        MENUITEM "Ouvrir...", ID_FILE_OPEN
-        MENUITEM "Enregistrer", ID_FILE_SAVE, GRAYED
-        MENUITEM "Enregistrer sous...", ID_FILE_SAVEAS, GRAYED
-        MENUITEM "Restorer...", ID_FILE_RESTORE, GRAYED
-        MENUITEM "Propriétés", ID_FILE_PROPERTIES
+        MENUITEM "&Nouveau", ID_FILE_NEW
+        MENUITEM "&Ouvrir...", ID_FILE_OPEN
+        MENUITEM "&Enregistrer", ID_FILE_SAVE, GRAYED
+        MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS, GRAYED
+        MENUITEM "&Restaurer...", ID_FILE_RESTORE, GRAYED
+        MENUITEM "&Propriétés", ID_FILE_PROPERTIES
         MENUITEM SEPARATOR
-        MENUITEM "Sortir", ID_FILE_EXIT
+        MENUITEM "&Quitter", ID_FILE_EXIT
     END
     POPUP "&Edition"
     BEGIN
-        MENUITEM "&Copie", ID_EDIT_COPY
-        MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED
-        MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED
+        MENUITEM "&Copier", ID_EDIT_COPY
+        MENUITEM "Coller &Insérer", ID_EDIT_PASTE, GRAYED
+        MENUITEM "Coller &Mélanger", ID_EDIT_PASTEMIX, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Insérer un fichier...", ID_EDIT_INSERTFILE
-        MENUITEM "&Mix with File...", ID_EDIT_MIXFILE
+        MENUITEM "Insérer un &fichier...", ID_EDIT_INSERTFILE
+        MENUITEM "Mé&langer avec un fichier...", ID_EDIT_MIXFILE
         MENUITEM SEPARATOR
-        MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED
-        MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED
+        MENUITEM "Supprimer &avant la position actuelle",ID_EDIT_DELETEBEFORE, GRAYED
+        MENUITEM "Supprimer a&près la position actuelle",ID_EDIT_DELETEAFTER, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Propriétés A&udio", ID_EDIT_AUDIOPROPS
     END
     POPUP "Effet&s"
     BEGIN
-        MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL
-        MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL
+        MENUITEM "&Augmenter le volume (de 25%)", ID_EFFECTS_INCVOL
+        MENUITEM "&Réduire le volume", ID_EFFECTS_DECVOL
         MENUITEM SEPARATOR
-        MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD
-        MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD
+        MENUITEM "Aug&menter la vitesse (de 100%)", ID_EFFECTS_INCSPD
+        MENUITEM "Réd&uire la vitesse", ID_EFFECTS_DECSPD
         MENUITEM SEPARATOR
-        MENUITEM "&Add Echo", ID_EFFECTS_ECHO
-        MENUITEM "&Reverse", ID_EFFECTS_REVERSE
+        MENUITEM "Aj&outer de l'écho", ID_EFFECTS_ECHO
+        MENUITEM "&Inverser", ID_EFFECTS_REVERSE
     END
-    POPUP "?"
+    POPUP "&?"
     BEGIN
-        MENUITEM "À propos", ID_ABOUT
+        MENUITEM "À &propos", ID_ABOUT
     END
 END
 
@@ -71,7 +60,7 @@ STRINGTABLE
 BEGIN
     IDS_STRPOS "Position: %.2f s"
     IDS_STRDUR "Durée : %.2f s"
-    IDS_STRBUF "Buffer: %.2f kb"
+    IDS_STRBUF "Buffer: %.2f Ko"
     IDS_STRFMT "%.1f kHz %u bits"
     IDS_STRMONO "mono"
     IDS_STRSTEREO "stéréo"

base/applications/sndrec32/lang/he-IL.rc

@@ -6,18 +6,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_LAYOUTRTL
-CAPTION "אודות הרשמקול של ReactOS"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "רשמקול של ReactOS גרסה 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "זכויות יוצרים (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "אישור", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "קובץ"

base/applications/sndrec32/lang/it-IT.rc

@@ -6,17 +6,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Informazioni su ReactOS Registratore Audio"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "ReactOS Registratore Audio, versione 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "File"

base/applications/sndrec32/lang/ja-JP.rc

@@ -6,17 +6,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "サウンド レコーダ に関する情報"
-FONT 9, "MS UI Gothic", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "サウンド レコーダ, バージョン 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "ファイル"

base/applications/sndrec32/lang/pl-PL.rc

@@ -15,17 +15,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Informacje o Rejestratorze Dźwięku ReactOS"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "Rejestrator Dźwięku ReactOS, wersja 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Prawa autorskie (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "Plik"

base/applications/sndrec32/lang/ro-RO.rc

@@ -1,5 +1,5 @@
 /* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */
- 
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 IDC_REACTOS_SNDREC32 ACCELERATORS
@@ -8,17 +8,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Despre Înregistratorul audio"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "Înregistrator audio, versiunea 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Drept de autor (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "Î&nchide", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "&Fișier"

base/applications/sndrec32/lang/ru-RU.rc

@@ -6,17 +6,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Информация о программе ""Звукозапись для ReactOS"""
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "Звукозапись для ReactOS, версия 1.0", IDC_STATIC, 56, 16, 134, 8, SS_NOPREFIX
-    LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "&Файл"

base/applications/sndrec32/lang/sk-SK.rc

@@ -11,17 +11,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Čo je reactOS_sndrec32"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "reactOS_sndrec32, verzia 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Autorské práva (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "&Súbor"

base/applications/sndrec32/lang/sq-AL.rc

@@ -1,4 +1,4 @@
-/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) 
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
  * DATE OF TR:  29-11-2013
 */
 
@@ -10,17 +10,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Informacione rreth ReactOS rregjistruesi i zerit"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "ReactOS Rregjistruesi i Zerit, versioni 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "T'drejtat (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "File"

base/applications/sndrec32/lang/sv-SE.rc

@@ -8,17 +8,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Information om ReactOS_sndrec32"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "ReactOS_sndrec32, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "Arkiv"

base/applications/sndrec32/lang/tr-TR.rc

@@ -8,17 +8,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Ses Kaydedicisi Hakkında Bilgi"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "ReactOS Ses Kaydedicisi, sürüm 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Tekif Hakkı - 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "Tamam", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "&Dosya"

base/applications/sndrec32/lang/uk-UA.rc

@@ -8,17 +8,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Інформація про reactOS_sndrec32"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "reactOS_sndrec32, версії 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "Файл"

base/applications/sndrec32/lang/zh-CN.rc

@@ -8,17 +8,6 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "关于 ReactOS 录音机"
-FONT 9, "宋体", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "ReactOS 录音机，版本 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "版权所有 (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "确定", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "文件"

base/applications/sndrec32/lang/zh-TW.rc

@@ -4,6 +4,7 @@
  * FILE:       base/applications/sndrec32/lang/zh-TW.rc
  * PURPOSE:    Chinese (Traditional) resource file
  * TRANSLATOR: Elton Chung aka MfldElton <elton328@gmail.com>
+ *             Chan Chilung <eason066@gmail.com>
  */
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
@@ -14,43 +15,32 @@ BEGIN
     "/", IDM_ABOUT, ASCII, ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "關於 ReactOS 錄音機"
-FONT 9, "新細明體", 0, 0, 0x1
-BEGIN
-    ICON IDI_SNDREC32, -1, 19, 14, 21, 20
-    LTEXT "ReactOS 錄音機，版本 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX
-    LTEXT "版權所有 (C) 2009", IDC_STATIC, 56, 25, 114, 8
-    DEFPUSHBUTTON "確定", IDOK, 139, 54, 50, 14, WS_GROUP
-END
-
 IDR_MENU1 MENU
 BEGIN
     POPUP "檔案"
     BEGIN
-        MENUITEM "新增", ID_FILE_NEW
-        MENUITEM "開啟...", ID_FILE_OPEN
-        MENUITEM "儲存", ID_FILE_SAVE, GRAYED
-        MENUITEM "另存為...", ID_FILE_SAVEAS, GRAYED
-        MENUITEM "還原...", ID_FILE_RESTORE, GRAYED
-        MENUITEM "屬性", ID_FILE_PROPERTIES
+        MENUITEM "新增(&N)", ID_FILE_NEW
+        MENUITEM "開啟(&O)...", ID_FILE_OPEN
+        MENUITEM "儲存(&S)", ID_FILE_SAVE, GRAYED
+        MENUITEM "另存新檔(&A)...", ID_FILE_SAVEAS, GRAYED
+        MENUITEM "還原(&R)...", ID_FILE_RESTORE, GRAYED
+        MENUITEM "內容(&P)", ID_FILE_PROPERTIES
         MENUITEM SEPARATOR
-        MENUITEM "結束", ID_FILE_EXIT
+        MENUITEM "結束(&X)", ID_FILE_EXIT
     END
     POPUP "編輯(&E)"
     BEGIN
         MENUITEM "複製(&C)", ID_EDIT_COPY
-        MENUITEM "粘貼插入(&P)", ID_EDIT_PASTE, GRAYED
-        MENUITEM "粘貼混合(&X)", ID_EDIT_PASTEMIX, GRAYED
+        MENUITEM "貼上插入(&P)", ID_EDIT_PASTE, GRAYED
+        MENUITEM "貼上混合(&X)", ID_EDIT_PASTEMIX, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "插入檔...(&I)", ID_EDIT_INSERTFILE
-        MENUITEM "與檔混合...(&M)", ID_EDIT_MIXFILE
+        MENUITEM "插入檔案(&I)...", ID_EDIT_INSERTFILE
+        MENUITEM "與檔案混合(&M)...", ID_EDIT_MIXFILE
         MENUITEM SEPARATOR
-        MENUITEM "刪除當前位置之前(&B)",ID_EDIT_DELETEBEFORE, GRAYED
-        MENUITEM "刪除當前位置之後(&A)",ID_EDIT_DELETEAFTER, GRAYED
+        MENUITEM "刪除目前位置之前的內容(&B)",ID_EDIT_DELETEBEFORE, GRAYED
+        MENUITEM "刪除目前位置之後的內容(&A)",ID_EDIT_DELETEAFTER, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "音訊屬性(&U)", ID_EDIT_AUDIOPROPS
+        MENUITEM "音訊內容(&U)", ID_EDIT_AUDIOPROPS
     END
     POPUP "效果(&S)"
     BEGIN
@@ -60,12 +50,12 @@ BEGIN
         MENUITEM "增加速度 (100%)(&I)", ID_EFFECTS_INCSPD
         MENUITEM "降低速度(&D)", ID_EFFECTS_DECSPD
         MENUITEM SEPARATOR
-        MENUITEM "添加回音(&A)", ID_EFFECTS_ECHO
-        MENUITEM "反向(&R)", ID_EFFECTS_REVERSE
+        MENUITEM "新增回音(&A)", ID_EFFECTS_ECHO
+        MENUITEM "反轉(&R)", ID_EFFECTS_REVERSE
     END
-    POPUP "說明"
+    POPUP "說明(&?)"
     BEGIN
-        MENUITEM "關於", ID_ABOUT
+        MENUITEM "關於(&A)", ID_ABOUT
     END
 END
 

base/applications/sndrec32/resource.h

@@ -5,7 +5,6 @@
 
 #define IDD_REACTOS_SNDREC32_DIALOG 102
 #define IDS_APP_TITLE               103
-#define IDD_ABOUTBOX                103
 #define IDM_ABOUT                   104
 #define IDI_REACTOS_SNDREC32        107
 #define IDI_REACTOS_SNDREC32LL      107

base/applications/sndrec32/sndrec32.cpp

@@ -78,30 +78,6 @@ RECT text_rect;
 RECT text2_rect;
 RECT cli;
 
-INT_PTR
-CALLBACK
-AboutDlgProc(HWND hWnd,
-             UINT msg,
-             WPARAM wp,
-             LPARAM lp)
-{
-    switch (msg)
-    {
-        case WM_COMMAND:
-            switch (LOWORD(wp))
-            {
-                case IDOK:
-                    EndDialog(hWnd, 0);
-                    return TRUE;
-            }
-            break;
-        case WM_CLOSE:
-            EndDialog(hWnd, 0);
-            return TRUE;
-    }
-    return FALSE;
-}
-
 int
 APIENTRY
 _tWinMain(HINSTANCE hInstance,
@@ -118,8 +94,8 @@ _tWinMain(HINSTANCE hInstance,
     s_info.cbSize = sizeof( NONCLIENTMETRICS );
 
     InitCommonControls();
-	
-	switch (GetUserDefaultUILanguage())
+
+    switch (GetUserDefaultUILanguage())
     {
         case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT):
             SetProcessDefaultLayout(LAYOUT_RTL);
@@ -455,6 +431,8 @@ WndProc(HWND hWnd,
     HFONT font;
     HFONT oldfont;
     long long slid_samp = 0;
+    WCHAR szAppName[100];
+    HICON hIcon;
 
     /* Checking for global pointers to buffer and io audio devices */
     if ((!AUD_IN) || (!AUD_OUT) || (!AUD_BUF))
@@ -469,7 +447,7 @@ WndProc(HWND hWnd,
             /* Creating the wave bar */
             if (!InitInstance_wave(hWnd, hInst, SW_SHOWNORMAL))
             {
-                MessageBox(0, TEXT("CreateWindow() Error!"), TEXT("ERROR"), MB_ICONERROR);
+                MessageBox(0, TEXT("InitInstance_wave() Error!"), TEXT("ERROR"), MB_ICONERROR);
                 return FALSE;
             }
 
@@ -619,8 +597,10 @@ WndProc(HWND hWnd,
                     break;
 
                 case ID_ABOUT:
-                    DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutDlgProc);
-                    return TRUE;
+                    LoadStringW(hInst, IDS_APP_TITLE, szAppName, _countof(szAppName));
+                    hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_REACTOS_SNDREC32));
+                    ShellAboutW(hWnd, szAppName, NULL, hIcon);
+                    DestroyIcon(hIcon);
                     break;
 
                 case ID_FILE_SAVEAS:
@@ -820,7 +800,7 @@ WndProc(HWND hWnd,
             ExtTextOut(hdc,
                        STRPOS_X,
                        STRPOS_Y,
-                       ETO_OPAQUE,
+                       0,
                        0,
                        str_tmp,
                        _tcslen(str_tmp),
@@ -844,7 +824,7 @@ WndProc(HWND hWnd,
             ExtTextOut(hdc,
                        STRDUR_X,
                        STRDUR_Y,
-                       ETO_OPAQUE,
+                       0,
                        0,
                        str_tmp,
                        _tcslen(str_tmp),
@@ -858,7 +838,7 @@ WndProc(HWND hWnd,
             ExtTextOut(hdc,
                        STRBUF_X,
                        STRBUF_Y,
-                       ETO_OPAQUE,
+                       0,
                        0,
                        str_tmp,
                        _tcslen(str_tmp),
@@ -874,7 +854,7 @@ WndProc(HWND hWnd,
             ExtTextOut(hdc,
                        STRFMT_X,
                        STRFMT_Y,
-                       ETO_OPAQUE,
+                       0,
                        0,
                        str_tmp,
                        _tcslen(str_tmp),
@@ -888,7 +868,7 @@ WndProc(HWND hWnd,
             ExtTextOut(hdc,
                        STRCHAN_X,
                        STRCHAN_Y,
-                       ETO_OPAQUE,
+                       0,
                        0,
                        str_tmp,
                        _tcslen(str_tmp),

base/applications/winhlp32/CMakeLists.txt

@@ -14,9 +14,6 @@ list(APPEND SOURCE
     winhelp.c
     precomp.h)
 
-# macro.lex.yy.c has been generated with relative file paths...
-set_source_files_properties(macro.lex.yy.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"")
-
 add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winhelp.ico)
 add_executable(winhlp32 ${SOURCE} macro.lex.yy.c string.c rsrc.rc)
 set_module_type(winhlp32 win32gui)

base/applications/wordpad/res/wordpad_ros.diff

@@ -0,0 +1,5 @@
+ReactOS uses the following files that are not wine synced, but unique to ReactOS:
+
+1) wordpad/res/formatbar.bmp
+2) wordpad/res/toolbar.bmp
+

base/services/dnsrslvr/cache.c

@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
 static RESOLVER_CACHE DnsCache;

base/services/umpnpmgr/install.c

@@ -22,7 +22,7 @@
  * FILE:             base/services/umpnpmgr/install.c
  * PURPOSE:          Device installer
  * PROGRAMMER:       Eric Kohl (eric.kohl@reactos.org)
- *                   Herv<EFBFBD> Poussineau (hpoussin@reactos.org)
+ *                   Hervé Poussineau (hpoussin@reactos.org)
  *                   Colin Finck (colin@reactos.org)
  */
 
@@ -40,7 +40,9 @@ HANDLE hUserToken = NULL;
 HANDLE hInstallEvent = NULL;
 HANDLE hNoPendingInstalls = NULL;
 
-SLIST_HEADER DeviceInstallListHead;
+/* Device-install event list */
+HANDLE hDeviceInstallListMutex;
+LIST_ENTRY DeviceInstallListHead;
 HANDLE hDeviceInstallListNotEmpty;
 
 
@@ -354,7 +356,7 @@ DWORD
 WINAPI
 DeviceInstallThread(LPVOID lpParameter)
 {
-    PSLIST_ENTRY ListEntry;
+    PLIST_ENTRY ListEntry;
     DeviceInstallParams* Params;
     BOOL showWizard;
 
@@ -366,7 +368,11 @@ DeviceInstallThread(LPVOID lpParameter)
 
     while (TRUE)
     {
-        ListEntry = InterlockedPopEntrySList(&DeviceInstallListHead);
+        /* Dequeue the next oldest device-install event */
+        WaitForSingleObject(hDeviceInstallListMutex, INFINITE);
+        ListEntry = (IsListEmpty(&DeviceInstallListHead)
+                        ? NULL : RemoveHeadList(&DeviceInstallListHead));
+        ReleaseMutex(hDeviceInstallListMutex);
 
         if (ListEntry == NULL)
         {

base/services/umpnpmgr/precomp.h

@@ -35,8 +35,8 @@
 
 typedef struct
 {
-    SLIST_ENTRY ListEntry;
-    WCHAR DeviceIds[1];
+    LIST_ENTRY ListEntry;
+    WCHAR DeviceIds[ANYSIZE_ARRAY];
 } DeviceInstallParams;
 
 /* install.c */
@@ -45,7 +45,9 @@ extern HANDLE hUserToken;
 extern HANDLE hInstallEvent;
 extern HANDLE hNoPendingInstalls;
 
-extern SLIST_HEADER DeviceInstallListHead;
+/* Device-install event list */
+extern HANDLE hDeviceInstallListMutex;
+extern LIST_ENTRY DeviceInstallListHead;
 extern HANDLE hDeviceInstallListNotEmpty;
 
 BOOL

base/services/umpnpmgr/umpnpmgr.c

@@ -104,13 +104,18 @@ PnpEventThread(LPVOID lpParameter)
             DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds);
             if (DeviceIdLength)
             {
-                /* Queue device install (will be dequeued by DeviceInstallThread) */
+                /* Allocate a new device-install event */
                 len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1) * sizeof(WCHAR);
                 Params = HeapAlloc(GetProcessHeap(), 0, len);
                 if (Params)
                 {
                     wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds);
-                    InterlockedPushEntrySList(&DeviceInstallListHead, &Params->ListEntry);
+
+                    /* Queue the event (will be dequeued by DeviceInstallThread) */
+                    WaitForSingleObject(hDeviceInstallListMutex, INFINITE);
+                    InsertTailList(&DeviceInstallListHead, &Params->ListEntry);
+                    ReleaseMutex(hDeviceInstallListMutex);
+
                     SetEvent(hDeviceInstallListNotEmpty);
                 }
             }
@@ -413,14 +418,6 @@ InitializePnPManager(VOID)
         return dwError;
     }
 
-    hDeviceInstallListNotEmpty = CreateEventW(NULL, FALSE, FALSE, NULL);
-    if (hDeviceInstallListNotEmpty == NULL)
-    {
-        dwError = GetLastError();
-        DPRINT1("Could not create the Event! (Error %lu)\n", dwError);
-        return dwError;
-    }
-
     hNoPendingInstalls = CreateEventW(NULL,
                                       TRUE,
                                       FALSE,
@@ -428,11 +425,30 @@ InitializePnPManager(VOID)
     if (hNoPendingInstalls == NULL)
     {
         dwError = GetLastError();
-        DPRINT1("Could not create the Event! (Error %lu)\n", dwError);
+        DPRINT1("Could not create the Pending-Install Event! (Error %lu)\n", dwError);
         return dwError;
     }
 
-    InitializeSListHead(&DeviceInstallListHead);
+    /*
+     * Initialize the device-install event list
+     */
+
+    hDeviceInstallListNotEmpty = CreateEventW(NULL, FALSE, FALSE, NULL);
+    if (hDeviceInstallListNotEmpty == NULL)
+    {
+        dwError = GetLastError();
+        DPRINT1("Could not create the List Event! (Error %lu)\n", dwError);
+        return dwError;
+    }
+
+    hDeviceInstallListMutex = CreateMutexW(NULL, FALSE, NULL);
+    if (hDeviceInstallListMutex == NULL)
+    {
+        dwError = GetLastError();
+        DPRINT1("Could not create the List Mutex! (Error %lu)\n", dwError);
+        return dwError;
+    }
+    InitializeListHead(&DeviceInstallListHead);
 
     /* Query the SuppressUI registry value and cache it for our whole lifetime */
     GetBooleanRegValue(HKEY_LOCAL_MACHINE,

base/setup/usetup/consup.c

@@ -240,19 +240,32 @@ CONSOLE_ClearScreen(VOID)
     coPos.X = 0;
     coPos.Y = 0;
 
-    FillConsoleOutputAttribute(
-        StdOutput,
-        FOREGROUND_WHITE | BACKGROUND_BLUE,
-        xScreen * yScreen,
-        coPos,
-        &Written);
+    /*
+     * Hide everything under the same foreground & background colors, so that
+     * the actual color and text blanking reset does not create a visual "blinking".
+     * We do this because we cannot do the screen scrolling trick that would
+     * allow to change both the text and the colors at the same time (the
+     * function is currently not available in our console "emulation" layer).
+     */
+    FillConsoleOutputAttribute(StdOutput,
+                               FOREGROUND_BLUE | BACKGROUND_BLUE,
+                               xScreen * yScreen,
+                               coPos,
+                               &Written);
 
-    FillConsoleOutputCharacterA(
-        StdOutput,
-        ' ',
-        xScreen * yScreen,
-        coPos,
-        &Written);
+    /* Blank the text */
+    FillConsoleOutputCharacterA(StdOutput,
+                                ' ',
+                                xScreen * yScreen,
+                                coPos,
+                                &Written);
+
+    /* Reset the actual foreground & background colors */
+    FillConsoleOutputAttribute(StdOutput,
+                               FOREGROUND_WHITE | BACKGROUND_BLUE,
+                               xScreen * yScreen,
+                               coPos,
+                               &Written);
 }
 
 VOID

base/setup/usetup/devinst.c

@@ -25,12 +25,14 @@ static HANDLE hNoPendingInstalls = NULL;
 static HANDLE hPnpThread = NULL;
 static HANDLE hDeviceInstallThread = NULL;
 
-static SLIST_HEADER DeviceInstallListHead;
+/* Device-install event list */
+static HANDLE hDeviceInstallListMutex = NULL;
+static LIST_ENTRY DeviceInstallListHead;
 static HANDLE hDeviceInstallListNotEmpty = NULL;
 
 typedef struct
 {
-    SLIST_ENTRY ListEntry;
+    LIST_ENTRY ListEntry;
     WCHAR DeviceIds[ANYSIZE_ARRAY];
 } DeviceInstallParams;
 
@@ -363,13 +365,17 @@ static ULONG NTAPI
 DeviceInstallThread(IN PVOID Parameter)
 {
     HINF hSetupInf = *(HINF*)Parameter;
-    PSLIST_ENTRY ListEntry;
+    PLIST_ENTRY ListEntry;
     DeviceInstallParams* Params;
     LARGE_INTEGER Timeout;
 
     for (;;)
     {
-        ListEntry = RtlInterlockedPopEntrySList(&DeviceInstallListHead);
+        /* Dequeue the next oldest device-install event */
+        NtWaitForSingleObject(hDeviceInstallListMutex, FALSE, NULL);
+        ListEntry = (IsListEmpty(&DeviceInstallListHead)
+                        ? NULL : RemoveHeadList(&DeviceInstallListHead));
+        NtReleaseMutant(hDeviceInstallListMutex, NULL);
 
         if (ListEntry == NULL)
         {
@@ -454,18 +460,23 @@ PnpEventThread(IN PVOID Parameter)
             ULONG len;
             ULONG DeviceIdLength;
 
-            DPRINT("Device enumerated event: %S\n", PnpEvent->TargetDevice.DeviceIds);
+            DPRINT("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds);
 
             DeviceIdLength = wcslen(PnpEvent->TargetDevice.DeviceIds);
             if (DeviceIdLength)
             {
-                /* Queue device install (will be dequeued by DeviceInstallThread) */
+                /* Allocate a new device-install event */
                 len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1) * sizeof(WCHAR);
                 Params = RtlAllocateHeap(ProcessHeap, 0, len);
                 if (Params)
                 {
                     wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds);
-                    RtlInterlockedPushEntrySList(&DeviceInstallListHead, &Params->ListEntry);
+
+                    /* Queue the event (will be dequeued by DeviceInstallThread) */
+                    NtWaitForSingleObject(hDeviceInstallListMutex, FALSE, NULL);
+                    InsertTailList(&DeviceInstallListHead, &Params->ListEntry);
+                    NtReleaseMutant(hDeviceInstallListMutex, NULL);
+
                     NtSetEvent(hDeviceInstallListNotEmpty, NULL);
                 }
                 else
@@ -559,17 +570,6 @@ InitializeUserModePnpManager(
     UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum");
     UNICODE_STRING ServicesU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services");
 
-    Status = NtCreateEvent(&hDeviceInstallListNotEmpty,
-                           EVENT_ALL_ACCESS,
-                           NULL,
-                           SynchronizationEvent,
-                           FALSE);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT1("Could not create the event! (Status 0x%08lx)\n", Status);
-        goto Failure;
-    }
-
     Status = NtCreateEvent(&hNoPendingInstalls,
                            EVENT_ALL_ACCESS,
                            NULL,
@@ -577,11 +577,34 @@ InitializeUserModePnpManager(
                            FALSE);
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("Could not create the event! (Status 0x%08lx)\n", Status);
+        DPRINT1("Could not create the Pending-Install Event! (Status 0x%08lx)\n", Status);
         goto Failure;
     }
 
-    RtlInitializeSListHead(&DeviceInstallListHead);
+    /*
+     * Initialize the device-install event list
+     */
+
+    Status = NtCreateEvent(&hDeviceInstallListNotEmpty,
+                           EVENT_ALL_ACCESS,
+                           NULL,
+                           SynchronizationEvent,
+                           FALSE);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Could not create the List Event! (Status 0x%08lx)\n", Status);
+        goto Failure;
+    }
+
+    Status = NtCreateMutant(&hDeviceInstallListMutex,
+                            MUTANT_ALL_ACCESS,
+                            NULL, FALSE);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Could not create the List Mutex! (Status 0x%08lx)\n", Status);
+        goto Failure;
+    }
+    InitializeListHead(&DeviceInstallListHead);
 
     InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_CASE_INSENSITIVE, NULL, NULL);
     Status = NtOpenKey(&hEnumKey, KEY_QUERY_VALUE, &ObjectAttributes);
@@ -653,14 +676,18 @@ Failure:
         NtClose(hEnumKey);
     hEnumKey = NULL;
 
-    if (hNoPendingInstalls)
-        NtClose(hNoPendingInstalls);
-    hNoPendingInstalls = NULL;
+    if (hDeviceInstallListMutex)
+        NtClose(hDeviceInstallListMutex);
+    hDeviceInstallListMutex = NULL;
 
     if (hDeviceInstallListNotEmpty)
         NtClose(hDeviceInstallListNotEmpty);
     hDeviceInstallListNotEmpty = NULL;
 
+    if (hNoPendingInstalls)
+        NtClose(hNoPendingInstalls);
+    hNoPendingInstalls = NULL;
+
     return Status;
 }
 

base/setup/usetup/lang/de-DE.h

@@ -1096,7 +1096,7 @@ static MUI_ENTRY deDEChangeSystemPartition[] =
     {
         6,
         19,
-        "die Partition <EFBFBD>ndern, die derzeit als aktiv markiert ist.",
+        "die Partition \204ndern, die derzeit als aktiv markiert ist.",
         TEXT_STYLE_NORMAL,
         TEXT_ID_STATIC
     },

base/shell/cmd/parser.c

@@ -575,9 +575,10 @@ error:
 /* Parse a REM command */
 static PARSED_COMMAND *ParseRem(void)
 {
-    /* Just ignore the rest of the line */
-    while (CurChar && CurChar != _T('\n'))
-        ParseChar();
+    /* "Ignore" the rest of the line.
+     * (Line continuations will still be parsed, though.) */
+    while (ParseToken(0, NULL) != TOK_END)
+        ;
     return NULL;
 }
 

base/shell/explorer/taskswnd.cpp

@@ -1625,6 +1625,11 @@ public:
         return FALSE;
     }
 
+    static VOID CALLBACK
+    SendAsyncProc(HWND hwnd, UINT uMsg, DWORD_PTR dwData, LRESULT lResult)
+    {
+        ::PostMessageW(hwnd, WM_NULL, 0, 0);
+    }
 
     VOID HandleTaskItemRightClick(IN OUT PTASK_ITEM TaskItem)
     {
@@ -1635,14 +1640,11 @@ public:
 
         ActivateTask(TaskItem->hWnd);
 
-       /* Wait up to 2 seconds for the window to process the foreground notification. */
-        DWORD_PTR resultDummy;
-        if (!SendMessageTimeout(TaskItem->hWnd, WM_NULL, 0, 0, 0, 2000, &resultDummy))
-            ERR("HandleTaskItemRightClick detected the window was unresponsive for 2 seconds, or was destroyed\n");
         if (GetForegroundWindow() != TaskItem->hWnd)
             ERR("HandleTaskItemRightClick detected the window did not become foreground\n");
 
-        ::SendMessageW(TaskItem->hWnd, WM_POPUPSYSTEMMENU, 0, MAKELPARAM(pt.x, pt.y));
+        ::SendMessageCallbackW(TaskItem->hWnd, WM_POPUPSYSTEMMENU, 0, MAKELPARAM(pt.x, pt.y),
+                               SendAsyncProc, (ULONG_PTR)TaskItem);
     }
 
     VOID HandleTaskGroupRightClick(IN OUT PTASK_GROUP TaskGroup)

base/shell/explorer/traywnd.cpp

@@ -1550,7 +1550,7 @@ ChangePos:
         else
         {
             WndSize.cx = StartBtnSize.cx;
-            WndSize.cy = StartBtnSize.cy - EdgeSize.cx;
+            WndSize.cy = StartBtnSize.cy - EdgeSize.cy;
         }
 
         if (WndSize.cx < g_TaskbarSettings.sr.Size.cx)
@@ -1616,14 +1616,13 @@ ChangePos:
         if (StartSize.cx > rcClient.right)
             StartSize.cx = rcClient.right;
 
-        if (!m_Theme)
+        HWND hwndTaskToolbar = ::GetWindow(m_TaskSwitch, GW_CHILD);
+        if (hwndTaskToolbar)
         {
-            HWND hwndTaskToolbar = ::GetWindow(m_TaskSwitch, GW_CHILD);
-            if (hwndTaskToolbar)
-            {
-                DWORD size = SendMessageW(hwndTaskToolbar, TB_GETBUTTONSIZE, 0, 0);
-                StartSize.cy = HIWORD(size);
-            }
+            DWORD size = SendMessageW(hwndTaskToolbar, TB_GETBUTTONSIZE, 0, 0);
+
+            /* Themed button covers Edge area as well */
+            StartSize.cy = HIWORD(size) + (m_Theme ? GetSystemMetrics(SM_CYEDGE) : 0);
         }
 
         if (m_StartButton.m_hWnd != NULL)

base/shell/progman/dialog.c

@@ -586,7 +586,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
             SetDlgItemTextW(hDlg, PM_ICON_FILE, pIconContext->szName);
             SendMessageA(pIconContext->hDlgCtrl, LB_SETITEMHEIGHT, 0, 32);
 
-            pIconContext->hLibrary = LoadLibraryExW(pIconContext->szName, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE);
+            pIconContext->hLibrary = LoadLibraryExW(pIconContext->szName, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE);
             if (pIconContext->hLibrary)
             {
                 EnumResourceNamesW(pIconContext->hLibrary,
@@ -635,7 +635,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
                     SetDlgItemTextW(hDlg, PM_ICON_FILE, filename);
                     DestroyIconList(pIconContext->hDlgCtrl);
-                    pIconContext->hLibrary = LoadLibraryExW(filename, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE);
+                    pIconContext->hLibrary = LoadLibraryExW(filename, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE);
                     if (pIconContext->hLibrary)
                     {
                         EnumResourceNamesW(pIconContext->hLibrary,

base/system/winlogon/shutdown.c

@@ -4,6 +4,7 @@
  * FILE:            base/system/winlogon/shutdown.c
  * PURPOSE:         System shutdown dialog
  * PROGRAMMERS:     alpha5056 <alpha5056@users.noreply.github.com>
+ *                  Hermes Belusca-Maito
  */
 
 /* INCLUDES ******************************************************************/
@@ -26,11 +27,15 @@ typedef struct _SYS_SHUTDOWN_PARAMS
 {
     PWSTR pszMessage;
     ULONG dwTimeout;
+
+    HDESK hShutdownDesk;
+    WCHAR DesktopName[512];
+    WINDOWPLACEMENT wpPos;
+
+    BOOLEAN bShuttingDown;
     BOOLEAN bRebootAfterShutdown;
     BOOLEAN bForceAppsClosed;
     DWORD dwReason;
-
-    BOOLEAN bShuttingDown;
 } SYS_SHUTDOWN_PARAMS, *PSYS_SHUTDOWN_PARAMS;
 
 
@@ -48,12 +53,6 @@ DoSystemShutdown(
 {
     BOOL Success;
 
-    if (pShutdownParams->pszMessage)
-    {
-        HeapFree(GetProcessHeap(), 0, pShutdownParams->pszMessage);
-        pShutdownParams->pszMessage = NULL;
-    }
-
     /* If shutdown has been cancelled, bail out now */
     if (!pShutdownParams->bShuttingDown)
         return TRUE;
@@ -77,17 +76,67 @@ OnTimer(
     HWND hwndDlg,
     PSYS_SHUTDOWN_PARAMS pShutdownParams)
 {
+    HDESK hInputDesktop;
+    BOOL bSuccess;
+    DWORD dwSize;
+    INT iSeconds, iMinutes, iHours, iDays;
     WCHAR szFormatBuffer[32];
     WCHAR szBuffer[32];
-    INT iSeconds, iMinutes, iHours, iDays;
+    WCHAR DesktopName[512];
 
     if (!pShutdownParams->bShuttingDown)
     {
         /* Shutdown has been cancelled, close the dialog and bail out */
-        EndDialog(hwndDlg, 0);
+        EndDialog(hwndDlg, IDABORT);
         return;
     }
 
+    /*
+     * Check whether the input desktop has changed. If so, close the dialog,
+     * and let the shutdown thread recreate it on the new desktop.
+     */
+
+    // TODO: Investigate: It would be great if we could also compare with
+    // our internally maintained desktop handles, before calling that heavy
+    // comparison.
+    // (Note that we cannot compare handles with arbitrary input desktop,
+    // since OpenInputDesktop() creates new handle instances everytime.)
+
+    hInputDesktop = OpenInputDesktop(0, FALSE, GENERIC_ALL);
+    if (!hInputDesktop)
+    {
+        /* No input desktop but we have a dialog: kill it */
+        ERR("OpenInputDesktop() failed, error 0x%lx\n", GetLastError());
+        EndDialog(hwndDlg, 0);
+        return;
+    }
+    bSuccess = GetUserObjectInformationW(hInputDesktop,
+                                         UOI_NAME,
+                                         DesktopName,
+                                         sizeof(DesktopName),
+                                         &dwSize);
+    if (!bSuccess)
+    {
+        ERR("GetUserObjectInformationW(0x%p) failed, error 0x%lx\n",
+            hInputDesktop, GetLastError());
+    }
+    CloseDesktop(hInputDesktop);
+
+    if (bSuccess && (wcscmp(DesktopName, pShutdownParams->DesktopName) != 0))
+    {
+        TRACE("Input desktop has changed: '%S' --> '%S'\n",
+              pShutdownParams->DesktopName, DesktopName);
+
+        /* Save the original dialog position to be restored later */
+        pShutdownParams->wpPos.length = sizeof(pShutdownParams->wpPos);
+        GetWindowPlacement(hwndDlg, &pShutdownParams->wpPos);
+
+        /* Close the dialog */
+        EndDialog(hwndDlg, IDCANCEL);
+        return;
+    }
+
+    /* Update the shutdown timeout */
     if (pShutdownParams->dwTimeout < SECONDS_PER_DAY)
     {
         iSeconds = (INT)pShutdownParams->dwTimeout;
@@ -111,9 +160,8 @@ OnTimer(
 
     if (pShutdownParams->dwTimeout == 0)
     {
-        /* Close the dialog and perform the system shutdown */
+        /* Close the dialog and let the shutdown thread perform the system shutdown */
         EndDialog(hwndDlg, 0);
-        DoSystemShutdown(pShutdownParams);
         return;
     }
 
@@ -132,15 +180,16 @@ ShutdownDialogProc(
 {
     PSYS_SHUTDOWN_PARAMS pShutdownParams;
 
-    pShutdownParams = (PSYS_SHUTDOWN_PARAMS)GetWindowLongPtr(hwndDlg, DWLP_USER);
+    pShutdownParams = (PSYS_SHUTDOWN_PARAMS)GetWindowLongPtrW(hwndDlg, DWLP_USER);
 
     switch (uMsg)
     {
         case WM_INITDIALOG:
         {
             pShutdownParams = (PSYS_SHUTDOWN_PARAMS)lParam;
-            SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pShutdownParams);
+            SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)pShutdownParams);
 
+            /* Display the shutdown message */
             if (pShutdownParams->pszMessage)
             {
                 SetDlgItemTextW(hwndDlg,
@@ -148,10 +197,18 @@ ShutdownDialogProc(
                                 pShutdownParams->pszMessage);
             }
 
+            /* Remove the Close menu item */
             DeleteMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND);
-            SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
 
-            PostMessage(hwndDlg, WM_TIMER, 0, 0);
+            /* Position the window (initial position, or restore from old) */
+            if (pShutdownParams->wpPos.length == sizeof(pShutdownParams->wpPos))
+                SetWindowPlacement(hwndDlg, &pShutdownParams->wpPos);
+
+            SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0,
+                         SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE);
+
+            /* Initialize the timer */
+            PostMessageW(hwndDlg, WM_TIMER, 0, 0);
             SetTimer(hwndDlg, SHUTDOWN_TIMER_ID, 1000, NULL);
             break;
         }
@@ -180,15 +237,77 @@ InitiateSystemShutdownThread(
     LPVOID lpParameter)
 {
     PSYS_SHUTDOWN_PARAMS pShutdownParams;
-    INT_PTR status;
+    HDESK hInputDesktop;
+    DWORD dwSize;
+    INT_PTR res;
 
     pShutdownParams = (PSYS_SHUTDOWN_PARAMS)lpParameter;
 
-    status = DialogBoxParamW(hAppInstance,
-                             MAKEINTRESOURCEW(IDD_SYSSHUTDOWN),
-                             NULL,
-                             ShutdownDialogProc,
-                             (LPARAM)pShutdownParams);
+    /* Default to initial dialog position */
+    pShutdownParams->wpPos.length = 0;
+
+    /* Continuously display the shutdown dialog on the current input desktop */
+    while (TRUE)
+    {
+        /* Retrieve the current input desktop */
+        hInputDesktop = OpenInputDesktop(0, FALSE, GENERIC_ALL);
+        if (!hInputDesktop)
+        {
+            /* No input desktop on the current WinSta0, just shut down */
+            ERR("OpenInputDesktop() failed, error 0x%lx\n", GetLastError());
+            break;
+        }
+
+        /* Remember it for checking desktop changes later */
+        pShutdownParams->hShutdownDesk = hInputDesktop;
+        if (!GetUserObjectInformationW(pShutdownParams->hShutdownDesk,
+                                       UOI_NAME,
+                                       pShutdownParams->DesktopName,
+                                       sizeof(pShutdownParams->DesktopName),
+                                       &dwSize))
+        {
+            ERR("GetUserObjectInformationW(0x%p) failed, error 0x%lx\n",
+                pShutdownParams->hShutdownDesk, GetLastError());
+        }
+
+        /* Assign the desktop to the current thread */
+        SetThreadDesktop(hInputDesktop);
+
+        /* Display the shutdown dialog on the current input desktop */
+        res = DialogBoxParamW(hAppInstance,
+                              MAKEINTRESOURCEW(IDD_SYSSHUTDOWN),
+                              NULL,
+                              ShutdownDialogProc,
+                              (LPARAM)pShutdownParams);
+
+        /* Close the desktop */
+        CloseDesktop(hInputDesktop);
+
+        /*
+         * Check why the dialog has been closed.
+         *
+         * - If it failed to be created (returned -1), don't care about
+         *   re-creating it, and proceed directly to shutdown.
+         *
+         * - If it closed unexpectedly (returned != 1), check whether a
+         *   shutdown is in progress. If the shutdown has been cancelled,
+         *   just bail out; if a shutdown is in progress and the timeout
+         *   is 0, bail out and proceed to shutdown.
+         *
+         * - If the dialog has closed because the input desktop changed,
+         *   loop again and recreate it on the new desktop.
+         */
+        if ((res == -1) || (res != IDCANCEL) ||
+            !(pShutdownParams->bShuttingDown && (pShutdownParams->dwTimeout > 0)))
+        {
+            break;
+        }
+    }
+
+    /* Reset dialog information */
+    pShutdownParams->hShutdownDesk = NULL;
+    ZeroMemory(&pShutdownParams->DesktopName, sizeof(pShutdownParams->DesktopName));
+    ZeroMemory(&pShutdownParams->wpPos, sizeof(pShutdownParams->wpPos));
 
     if (pShutdownParams->pszMessage)
     {
@@ -196,11 +315,17 @@ InitiateSystemShutdownThread(
         pShutdownParams->pszMessage = NULL;
     }
 
-    if (status >= 0)
-        return ERROR_SUCCESS;
+    if (pShutdownParams->bShuttingDown)
+    {
+        /* Perform the system shutdown */
+        if (DoSystemShutdown(pShutdownParams))
+            return ERROR_SUCCESS;
+        else
+            return GetLastError();
+    }
 
     pShutdownParams->bShuttingDown = FALSE;
-    return GetLastError();
+    return ERROR_SUCCESS;
 }
 
 
@@ -231,7 +356,7 @@ StartSystemShutdown(
     if (_InterlockedCompareExchange8((volatile char*)&g_ShutdownParams.bShuttingDown, TRUE, FALSE) == TRUE)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    if (lpMessage && lpMessage->Length && lpMessage->Buffer)
+    if ((dwTimeout != 0) && lpMessage && lpMessage->Length && lpMessage->Buffer)
     {
         g_ShutdownParams.pszMessage = HeapAlloc(GetProcessHeap(),
                                                 HEAP_ZERO_MEMORY,

boot/bootdata/CMakeLists.txt

@@ -9,7 +9,7 @@ add_custom_target(converted_caroots_inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/caro
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf
                    COMMAND native-utf16le "${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf" "${CMAKE_CURRENT_BINARY_DIR}/caroots.inf"
                    DEPENDS native-utf16le ${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf)
-add_cd_file(TARGET converted_caroots_inf FILE ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf DESTINATION reactos NO_CAB FOR all)
+add_cd_file(TARGET converted_caroots_inf FILE ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf DESTINATION reactos NO_CAB FOR bootcd regtest)
 
 add_registry_inf(
     hivecls.inf

boot/bootdata/bootcd/unattend.inf

@@ -53,6 +53,11 @@ DisableGeckoInst = no
 ; see hivesys.inf for available languages
 LocaleID = 409
 
+; set product option
+; 0: ReactOS Server
+; 1: ReactOS Workstation
+ProductOption = 0
+
 ; enable this section to automatically launch programs
 ; after 3rd boot
 ;

boot/bootdata/hivesft.inf

@@ -1807,6 +1807,11 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","USERProcessHandleQu
 ; App Compat -- Enable on ReactOS
 ;HKLM,"SOFTWARE\Policies\Microsoft\Windows\AppCompat","DisableEngine",0x00010003, 0x00000001
 
+; App Compat -- for official Releases we do still disable the new heuristic introduced in master 0.4.13-dev-986-g029b8f2.
+; This will not automatically expose apisets based on apps manifests as we have too many gaps still in the apisets.
+; Adventurous users can set this to 0 to expose more Vista+ stuff, in return can OPT-OUT per app via shim "IgnoreManifestCompatVersion".
+HKLM,"SOFTWARE\Policies\Microsoft\Windows\AppCompat","DisableCompatGuidDetection",0x00010003, 0x00000001
+
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]

boot/bootdata/hivesys.inf

@@ -573,7 +573,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040e","Layout Text",
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5033"
 
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040f","Layout File",0x00000000,"kbdic.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040f","Layout Text",0x00000000,%ICELANDIC%"Icelandic"
+HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040f","Layout Text",0x00000000,%ICELANDIC%
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5013"
 
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout File",0x00000000,"kbdit.dll"
@@ -787,7 +787,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout File",
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout Text",0x00000000,%BURMESE%
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5140"
 
-
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout File",0x00000000,"kbdeo.dll"
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout Text",0x00000000,"Esperanto"
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5142"
@@ -2343,7 +2342,7 @@ NORWEGIAN = "Norwegian"
 POLISH_214 = "Polish (214)"
 POLISH_PROGRAMMERS = "Polish (Programmers)"
 PORTUGESE = "Portuguese (Portugal)"
-PORTUGESE_BRAZILIAN% = "Portuguese (Brazilian ABNT2)"
+PORTUGESE_BRAZILIAN = "Portuguese (Brazilian ABNT2)"
 ROMANIAN_LEGACY = "Romanian (Legacy)"
 ROMANIAN_STANDARD = "Romanian (Standard)"
 RUSSIAN = "Russian"
@@ -2494,7 +2493,7 @@ NORWEGIAN = "Norweski"
 POLISH_214 = "Polski (214)"
 POLISH_PROGRAMMERS = "Polski (Programisty)"
 PORTUGESE = "Portugalski"
-PORTUGESE_BRAZILIAN% = "Portugalski (Brazylijski ABNT2)"
+PORTUGESE_BRAZILIAN = "Portugalski (Brazylijski ABNT2)"
 ROMANIAN_LEGACY = "Rumuński (Legacy)"
 ROMANIAN_STANDARD = "Rumuński (Standard)"
 RUSSIAN = "Rosyjski"
@@ -2642,7 +2641,7 @@ NORWEGIAN = "Norvegiană"
 POLISH_214 = "Poloneză (214)"
 POLISH_PROGRAMMERS = "Poloneză (programatori)"
 PORTUGESE = "Portugheză (Portugalia)"
-PORTUGESE_BRAZILIAN% = "Portugheză (Braziliană ABNT2)"
+PORTUGESE_BRAZILIAN = "Portugheză (Braziliană ABNT2)"
 ROMANIAN_LEGACY = "Română (moștenire)"
 ROMANIAN_STANDARD = "Română (standard)"
 RUSSIAN = "Rusă"

boot/freeldr/freeldr/arch/i386/pc/pcdisk.c

@@ -790,7 +790,7 @@ PcDiskReadLogicalSectors(
 #if defined(__i386__) || defined(_M_AMD64)
 VOID __cdecl DiskStopFloppyMotor(VOID)
 {
-    WRITE_PORT_UCHAR((PUCHAR)0x3F2, 0x0C); // DOR_FDC_ENABLE | DOR_DMA_IO_INTERFACE_ENABLE
+    WRITE_PORT_UCHAR((PUCHAR)0x3F2, 0); // DOR_FDC_ENABLE | DOR_DMA_IO_INTERFACE_ENABLE 0x0C // we changed 0x0C->0 to workaround CORE-16469
 }
 #endif // defined __i386__ || defined(_M_AMD64)
 

dll/apisets/CMakeLists.txt

@@ -27,7 +27,7 @@ function (add_apiset apiset_name baseaddress)
     if(NOT MSVC)
         target_compile_options(${apiset_name} PRIVATE -fno-builtin)
     else()
-        target_compile_options(${apiset_name} PRIVATE /wd4026 /wd4273)
+        target_compile_options(${apiset_name} PRIVATE /wd4026 /wd4273 /Oi-)
     endif()
 
     add_importlibs(${apiset_name} ${ARGN} ntdll)

dll/apisets/CMakeLists.txt.in

@@ -27,7 +27,7 @@ function (add_apiset apiset_name baseaddress)
     if(NOT MSVC)
         target_compile_options(${apiset_name} PRIVATE -fno-builtin)
     else()
-        target_compile_options(${apiset_name} PRIVATE /wd4026 /wd4273)
+        target_compile_options(${apiset_name} PRIVATE /wd4026 /wd4273 /Oi-)
     endif()
 
     add_importlibs(${apiset_name} ${ARGN} ntdll)

dll/apisets/api-ms-win-core-winrt-l1-1-0.spec

@@ -1,12 +1,12 @@
 
 # This file is autogenerated by update.py
 
-@ stub RoActivateInstance
-@ stub RoGetActivationFactory
-@ stub RoGetApartmentIdentifier
-@ stub RoInitialize
-@ stub RoRegisterActivationFactories
-@ stub RoRegisterForApartmentShutdown
-@ stub RoRevokeActivationFactories
-@ stub RoUninitialize
-@ stub RoUnregisterForApartmentShutdown
+@ stub -version=0x602+ RoActivateInstance
+@ stub -version=0x602+ RoGetActivationFactory
+@ stub -version=0x602+ RoGetApartmentIdentifier
+@ stub -version=0x602+ RoInitialize
+@ stub -version=0x602+ RoRegisterActivationFactories
+@ stub -version=0x602+ RoRegisterForApartmentShutdown
+@ stub -version=0x602+ RoRevokeActivationFactories
+@ stub -version=0x602+ RoUninitialize
+@ stub -version=0x602+ RoUnregisterForApartmentShutdown

dll/apisets/api-ms-win-crt-private-l1-1-0.spec

@@ -27,7 +27,7 @@
 @ stdcall -arch=i386 __CxxQueryExceptionSize() msvcrt.__CxxQueryExceptionSize
 @ stub __CxxRegisterExceptionObject
 @ stub __CxxUnregisterExceptionObject
-@ stub __DestructExceptionObject
+@ cdecl __DestructExceptionObject() msvcrt.__DestructExceptionObject
 @ stub __FrameUnwindFilter
 @ stub __GetPlatformExceptionInfo
 @ stub __NLG_Dispatch2

dll/cpl/appwiz/addons.c

@@ -59,7 +59,7 @@ static const addon_info_t addons_info[] = {
 static const addon_info_t *addon;
 
 static HWND install_dialog = NULL;
-static IBinding *download_binding;
+static IBinding *download_binding = NULL;
 
 static WCHAR GeckoUrl[] = L"https://svn.reactos.org/amine/wine_gecko-2.40-x86.msi";
 
@@ -382,7 +382,7 @@ static DWORD WINAPI download_proc(PVOID arg)
     }
 
     DeleteFileW(tmp_file);
-    EndDialog(install_dialog, 0);
+    PostMessageW(install_dialog, WM_COMMAND, IDCANCEL, 0);
     return 0;
 }
 

dll/cpl/desk/settings.c

@@ -472,8 +472,12 @@ OnBPPChanged(IN HWND hwndDlg, IN PSETTINGS_DATA pData)
     /* Show a new spectrum bitmap */
     hSpectrumControl = GetDlgItem(hwndDlg, IDC_SETTINGS_SPECTRUM);
     hSpectrumDC = GetDC(hSpectrumControl);
+    if (hSpectrumDC == NULL)
+        return;
+
     GetClientRect(hSpectrumControl, &client);
     ShowColorSpectrum(hSpectrumDC, &client, dmNewBitsPerPel, pData);
+    ReleaseDC(hSpectrumControl, hSpectrumDC);
 
     /* Find if new parameters are valid */
     Current = pData->CurrentDisplayDevice->CurrentSettings;

dll/cpl/mmsys/lang/bg-BG.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "&Събития:", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Звуци", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Обзор...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/cs-CZ.rc

@@ -41,7 +41,7 @@ BEGIN
     LTEXT "&Události programů:", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Zvuky:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Procházet...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/de-DE.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "&Programmereignisse:", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Klänge:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 135, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 135, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 148, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Durchsuchen...", IDC_BROWSE_SOUND, 168, 205, 70, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/el-GR.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "&Program events:", -1, 8, 118, 150, 9
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Sounds:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Browse...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/en-US.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "&Program events:", -1, 8, 118, 150, 9
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Sounds:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Browse...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/es-ES.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "&Sucesos de programa:", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "S&onidos:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "E&xaminar...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/fr-FR.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "Évènements des programmes :", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Sons :", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "Parcourir...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/he-IL.rc

@@ -38,7 +38,7 @@ BEGIN
     LTEXT "אירועי תכניות:", -1, 8, 118, 150, 9
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "צלילים:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "בחר...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/id-ID.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "Event &program:", -1, 8, 118, 150, 9
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "S&uara:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Cari...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/it-IT.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "&Eventi:", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Suoni:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Sfoglia...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/ja-JP.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "プログラム イベント(&P):", -1, 8, 118, 150, 9
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "音声(&S):", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "参照(&B)...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/nl-NL.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "&Programmagebeurtenissen:", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Geluiden:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "Bl&aderen...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/no-NO.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "&Programhendelser:", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Lyder:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Bla gjennom...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/pl-PL.rc

@@ -49,7 +49,7 @@ BEGIN
     LTEXT "&Zdarzenia:", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Dźwięki:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Przeglądaj...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/pt-BR.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "&Program events:", -1, 8, 118, 150, 9
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Sounds:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Browse...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/pt-PT.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "Eventos de &programas:", -1, 8, 118, 150, 9
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Sons:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Procurar...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/ro-RO.rc

@@ -41,7 +41,7 @@ BEGIN
     LTEXT "E&venimente:", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "S&unete:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "Spe&cificare…", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/ru-RU.rc

@@ -36,7 +36,7 @@ BEGIN
     LTEXT "Программные &события:", -1, 8, 118, 150, 9
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Звуки:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Обзор...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/sk-SK.rc

@@ -41,7 +41,7 @@ BEGIN
     LTEXT "&Udalosti programov:", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Zvuky:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Prehľadávať...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/sq-AL.rc

@@ -40,7 +40,7 @@ BEGIN
     LTEXT "Evente &Programi:", -1, 8, 118, 150, 9
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Zëri:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Shfleto...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/tr-TR.rc

@@ -38,7 +38,7 @@ BEGIN
     LTEXT "İ&zlence Olayları:", -1, 8, 118, 150, 9
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "S&esler:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "&Göz At...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/uk-UA.rc

@@ -44,7 +44,7 @@ BEGIN
     LTEXT "&Програмні події:", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "&Звуки:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "О&гляд...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/zh-CN.rc

@@ -44,7 +44,7 @@ BEGIN
     LTEXT "程序事件(&P):", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "声音(&S):", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "浏览(&B)...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/lang/zh-TW.rc

@@ -42,7 +42,7 @@ BEGIN
     LTEXT "程式事件(&P):", -1, 8, 118, 150, 17
     CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60
     LTEXT "聲音(&S):", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED
-    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
+    COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON
     PUSHBUTTON "瀏覽(&B)...", IDC_BROWSE_SOUND, 188, 205, 50, 15, WS_DISABLED
 END

dll/cpl/mmsys/speakervolume.c

@@ -155,7 +155,7 @@ OnHScroll(
     INT id, idx, i, j;
 
     id = (INT)GetWindowLongPtr((HWND)lParam, GWLP_ID);
-    if (id < 9475 && id > 9503)
+    if (id < 9475 || id > 9503)
         return;
 
     if ((id - 9475) % 4 != 0)

dll/cpl/sysdm/general.c

@@ -69,22 +69,22 @@ static VOID InitLogo(HWND hwndDlg)
     COLORREF *pBits;
     INT line, column;
 
+    if (hDC == NULL || hDCLogo == NULL || hDCMask == NULL)
+        goto Cleanup;
+
     ZeroMemory(pImgInfo, sizeof(*pImgInfo));
     ZeroMemory(&bmpi, sizeof(bmpi));
 
-    hLogo = (HBITMAP)LoadImage(hApplet, MAKEINTRESOURCE(IDB_ROSBMP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
-    hMask = (HBITMAP)LoadImage(hApplet, MAKEINTRESOURCE(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+    hLogo = (HBITMAP)LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_ROSBMP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+    hMask = (HBITMAP)LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_ROSMASK), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
 
     if (hLogo != NULL && hMask != NULL)
     {
-        GetObject(hLogo, sizeof(BITMAP), &logoBitmap);
-        GetObject(hMask, sizeof(BITMAP), &maskBitmap);
+        GetObject(hLogo, sizeof(logoBitmap), &logoBitmap);
+        GetObject(hMask, sizeof(maskBitmap), &maskBitmap);
 
-        if(logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth)
-            return;
-
-        pImgInfo->cxSource = logoBitmap.bmWidth;
-        pImgInfo->cySource = logoBitmap.bmHeight;
+        if (logoBitmap.bmHeight != maskBitmap.bmHeight || logoBitmap.bmWidth != maskBitmap.bmWidth)
+            goto Cleanup;
 
         bmpi.bmiHeader.biSize = sizeof(BITMAPINFO);
         bmpi.bmiHeader.biWidth = logoBitmap.bmWidth;
@@ -94,17 +94,17 @@ static VOID InitLogo(HWND hwndDlg)
         bmpi.bmiHeader.biCompression = BI_RGB;
         bmpi.bmiHeader.biSizeImage = 4 * logoBitmap.bmWidth * logoBitmap.bmHeight;
 
+        /* Create a premultiplied bitmap */
         hAlphaLogo = CreateDIBSection(hDC, &bmpi, DIB_RGB_COLORS, (PVOID*)&pBits, 0, 0);
-
-        if(!hAlphaLogo)
-            return;
+        if (!hAlphaLogo)
+            goto Cleanup;
 
         SelectObject(hDCLogo, hLogo);
         SelectObject(hDCMask, hMask);
 
-        for(line = logoBitmap.bmHeight - 1; line >= 0; line--)
+        for (line = logoBitmap.bmHeight - 1; line >= 0; line--)
         {
-            for(column = 0; column < logoBitmap.bmWidth; column++)
+            for (column = 0; column < logoBitmap.bmWidth; column++)
             {
                 COLORREF alpha = GetPixel(hDCMask, column, line) & 0xFF;
                 COLORREF Color = GetPixel(hDCLogo, column, line);
@@ -114,22 +114,23 @@ static VOID InitLogo(HWND hwndDlg)
                 g = GetGValue(Color) * alpha / 255;
                 b = GetBValue(Color) * alpha / 255;
 
-                *pBits++ =  b | g << 8 | r << 16 | alpha << 24;
+                *pBits++ = b | (g << 8) | (r << 16) | (alpha << 24);
             }
-          }
+        }
+
+        pImgInfo->hBitmap = hAlphaLogo;
+        pImgInfo->cxSource = logoBitmap.bmWidth;
+        pImgInfo->cySource = logoBitmap.bmHeight;
+        pImgInfo->iBits = logoBitmap.bmBitsPixel;
+        pImgInfo->iPlanes = logoBitmap.bmPlanes;
     }
 
-    pImgInfo->hBitmap = hAlphaLogo;
-    pImgInfo->cxSource = logoBitmap.bmWidth;
-    pImgInfo->cySource = logoBitmap.bmHeight;
-    pImgInfo->iBits = logoBitmap.bmBitsPixel;
-    pImgInfo->iPlanes = logoBitmap.bmPlanes;
-
-    DeleteObject(hLogo);
-    DeleteObject(hMask);
-    DeleteDC(hDCLogo);
-    DeleteDC(hDCMask);
-
+Cleanup:
+    if (hMask != NULL) DeleteObject(hMask);
+    if (hLogo != NULL) DeleteObject(hLogo);
+    if (hDCMask != NULL) DeleteDC(hDCMask);
+    if (hDCLogo != NULL) DeleteDC(hDCLogo);    
+    if (hDC != NULL) ReleaseDC(hwndDlg, hDC);
 }
 
 LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -145,19 +146,23 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
                 if (timerid == 0)
                 {
                     HDC hCreditsDC, hLogoDC;
-                    HFONT hFont;
+                    HDC hDC = GetDC(NULL);
+                    HFONT hFont = NULL;
                     NONCLIENTMETRICS ncm;
                     RECT rcCredits;
                     TCHAR szCredits[2048];
                     INT iDevsHeight;
 
+                    if (hDC == NULL)
+                        goto Cleanup;
+
                     top = 0;
                     offset = 0;
-                    hCreditsDC = CreateCompatibleDC(GetDC(NULL));
+                    hCreditsDC = CreateCompatibleDC(hDC);
                     hLogoDC = CreateCompatibleDC(hCreditsDC);
 
                     if (hCreditsDC == NULL || hLogoDC == NULL)
-                        break;
+                        goto Cleanup;
 
                     SetRect(&rcCredits, 0, 0, 0, 0);
 
@@ -165,6 +170,8 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
                     SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0);
 
                     hFont = CreateFontIndirect(&ncm.lfMessageFont);
+                    if (!hFont)
+                        goto Cleanup;
                     SelectObject(hCreditsDC, hFont);
 
                     LoadString(hApplet, IDS_DEVS, szCredits, sizeof(szCredits) / sizeof(TCHAR));
@@ -174,8 +181,8 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 
                     hCreditsBitmap = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1, pImgInfo->iPlanes, pImgInfo->iBits, NULL);
 
-                    if(!hCreditsBitmap)
-                        break;
+                    if (!hCreditsBitmap)
+                        goto Cleanup;
 
                     SelectObject(hLogoDC, pImgInfo->hBitmap);
                     SelectObject(hCreditsDC, hCreditsBitmap);
@@ -201,10 +208,13 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
                     AlphaBlend(hCreditsDC, 0, 0, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0,  0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc);
                     AlphaBlend(hCreditsDC, 0, offset, pImgInfo->cxSource, pImgInfo->cySource, hLogoDC, 0,  0, pImgInfo->cxSource, pImgInfo->cySource, BlendFunc);
 
-                    DeleteDC(hLogoDC);
-                    DeleteDC(hCreditsDC);
-
                     timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL);
+
+Cleanup:
+                    if (hFont != NULL) DeleteObject(hFont);
+                    if (hLogoDC != NULL) DeleteDC(hLogoDC);
+                    if (hCreditsDC != NULL) DeleteDC(hCreditsDC);
+                    if (hDC != NULL) ReleaseDC(NULL, hDC);
                 }
             }
             break;
@@ -213,15 +223,18 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
             {
                 RECT rcCredits;
                 HDC hDC = GetDC(hwnd);
-
-                GetClientRect(hwnd, &rcCredits);
-                SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource);
-                FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
-
+                if (hDC != NULL)
+                {
+                    GetClientRect(hwnd, &rcCredits);
+                    SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource);
+                    FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
+                    ReleaseDC(hwnd, hDC);
+                }
                 KillTimer(hwnd, timerid);
-                DeleteObject(hCreditsBitmap);
-                InvalidateRect(hwnd, NULL, FALSE);
+                if (hCreditsBitmap != NULL)
+                    DeleteObject(hCreditsBitmap);
 
+                InvalidateRect(hwnd, NULL, FALSE);
                 top = 0;
                 timerid = 0;
             }
@@ -233,13 +246,16 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
             {
                 RECT rcCredits;
                 HDC hDC = GetDC(hwnd);
-
-                GetClientRect(hwnd, &rcCredits);
-                SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource);
-                FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
-
+                if (hDC != NULL)
+                {
+                    GetClientRect(hwnd, &rcCredits);
+                    SetRect(&rcCredits, 0, 0, rcCredits.right, pImgInfo->cySource);
+                    FillRect(hDC, &rcCredits, GetSysColorBrush(COLOR_3DFACE));
+                    ReleaseDC(hwnd, hDC);
+                }
                 KillTimer(hwnd, timerid);
-                DeleteObject(hCreditsBitmap);
+                if (hCreditsBitmap != NULL)
+                    DeleteObject(hCreditsBitmap);
 
                 top = 0;
                 timerid = 0;

dll/cpl/sysdm/lang/bg-BG.rc

@@ -6,13 +6,13 @@ CAPTION "Общи"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "Уредба:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "Уредба:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Версия:", IDC_ROSVERSION, 10, 137, 131, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Машина:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Машина:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -338,7 +338,6 @@ BEGIN
     IDS_PAGEFILE_NONE "Няма"
     IDS_PAGEFILE_SYSTEM "System Managed"
     IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
-    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete"
     IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?"
     IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use."

dll/cpl/sysdm/lang/cs-CZ.rc

@@ -11,13 +11,13 @@ CAPTION "Obecné"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "Systém:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "Systém:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Verze", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Počítač:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Počítač:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -343,7 +343,6 @@ BEGIN
     IDS_PAGEFILE_NONE "Není"
     IDS_PAGEFILE_SYSTEM "Spravováno systémem"
     IDS_INFOREBOOT "Změny se projeví po restartování počítače."
-    IDS_DEVS "\nTým ReactOS\n\nPKoordinátor\n\nAleksey Bragin\n\nVývojáři\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Potvrďte smazání profilu"
     IDS_HWPROFILE_CONFIRM_DELETE "Opravdu chcete odstranit hardwarový profil ""%s""?"
     IDS_HWPROFILE_ALREADY_IN_USE "Zadané jméno profilu se již používá."

dll/cpl/sysdm/lang/da-DK.rc

@@ -6,13 +6,13 @@ CAPTION "Generelt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "Operativsystem:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "Operativsystem:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Machine:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -338,7 +338,6 @@ BEGIN
     IDS_PAGEFILE_NONE "None"
     IDS_PAGEFILE_SYSTEM "System Managed"
     IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
-    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete"
     IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?"
     IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use."

dll/cpl/sysdm/lang/de-DE.rc

@@ -15,13 +15,13 @@ CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "System:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "System:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Computer:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Computer:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -319,7 +319,7 @@ BEGIN
     IDS_PETABYTE "PB RAM"
     IDS_MEGAHERTZ "MHz"
     IDS_GIGAHERTZ "GHz"
-    IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u"
+    IDS_UPTIME_FORMAT "%u Tage, %02u:%02u:%02u"
     IDS_VARIABLE "Variable"
     IDS_VALUE "Wert"
     IDS_NO_DUMP "(Keine)"
@@ -347,7 +347,6 @@ BEGIN
     IDS_PAGEFILE_NONE "Keine"
     IDS_PAGEFILE_SYSTEM "Systemverwaltet"
     IDS_INFOREBOOT "Sie müssen den Computer neu starten, damit die Änderung wirksam wird."
-    IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey Bragin\n\nEntwicklerteam\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Hornícek\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Verantwortliche\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebseitenteam\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedienteam\n\nMindflyer\nWierd_W\n\nweiterer Dank geht an\n\nalle Mitwirkenden\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Löschen bestätigen"
     IDS_HWPROFILE_CONFIRM_DELETE "Sind Sie sicher, dass das Hardwareprofil ""%s"" gelöscht werden soll?"
     IDS_HWPROFILE_ALREADY_IN_USE "Der Profilname wird bereits verwendet."

dll/cpl/sysdm/lang/el-GR.rc

@@ -6,13 +6,13 @@ CAPTION "Γενικά"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "Σύστημα:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "Σύστημα:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Έκδοση", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Υπολογιστής:", IDC_STATIC, 124, 116, 44, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Υπολογιστής:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -338,7 +338,6 @@ BEGIN
     IDS_PAGEFILE_NONE "Κανένα"
     IDS_PAGEFILE_SYSTEM "System Managed"
     IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
-    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete"
     IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?"
     IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use."

dll/cpl/sysdm/lang/en-US.rc

@@ -6,13 +6,13 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "System:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "System:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Machine:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -338,7 +338,6 @@ BEGIN
     IDS_PAGEFILE_NONE "None"
     IDS_PAGEFILE_SYSTEM "System Managed"
     IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
-    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete"
     IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?"
     IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use."

dll/cpl/sysdm/lang/es-ES.rc

@@ -8,13 +8,13 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "Sistema operativo:", IDC_STATIC, 4, 116, 80, 9
+    LTEXT "Sistema operativo:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Versión", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "Tiempo de operación:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Equipo:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Tiempo de operación:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Equipo:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -340,7 +340,6 @@ BEGIN
     IDS_PAGEFILE_NONE "Ninguno"
     IDS_PAGEFILE_SYSTEM "Administrado por el sistema"
     IDS_INFOREBOOT "Es necesario reiniciar el equipo para que se apliquen los cambios."
-    IDS_DEVS "\nEquipo de ReactOS\n\nCoordinador del proyecto\n\nAleksey Bragin\n\nEquipo de desarrollo\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nIngenieros de publicación de versión\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nEquipo Web\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEquipo multimedia\n\nMindflyer\nWierd_W\n\nqueremos agradecer especialmente el trabajo realizado por\n\ntodos los colaboradores\nEl equipo de Wine\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmar el borrado del perfil"
     IDS_HWPROFILE_CONFIRM_DELETE "¿Seguro que quiere borrar el perfil de hardware «%s»?"
     IDS_HWPROFILE_ALREADY_IN_USE "El nombre de perfil ya está en uso."

dll/cpl/sysdm/lang/fr-FR.rc

@@ -6,13 +6,13 @@ CAPTION "Général"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "Système d'exploitation :", IDC_STATIC, 4, 116, 75, 9
+    LTEXT "Système d'exploitation :", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "Temps d'activité :", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Machine :", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Temps d'activité :", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Machine :", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -338,7 +338,6 @@ BEGIN
     IDS_PAGEFILE_NONE "Aucun"
     IDS_PAGEFILE_SYSTEM "Géré par le système"
     IDS_INFOREBOOT "Vous devez redémarrer le système pour appliquer les changements."
-    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirmation de suppression"
     IDS_HWPROFILE_CONFIRM_DELETE "Êtes-vous sûre de vouloir supprimer le profil matériel ""%s"" ?"
     IDS_HWPROFILE_ALREADY_IN_USE "Le nom de profil est déjà utilisé."

dll/cpl/sysdm/lang/he-IL.rc

@@ -8,13 +8,13 @@ CAPTION "כללי"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "מערכת:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "מערכת:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "גרסה", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "מכונה:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "מכונה:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -340,7 +340,6 @@ BEGIN
     IDS_PAGEFILE_NONE "ללא"
     IDS_PAGEFILE_SYSTEM "System Managed"
     IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
-    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete"
     IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?"
     IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use."

dll/cpl/sysdm/lang/hu-HU.rc

@@ -8,21 +8,21 @@ CAPTION "Általános"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "Operációs rendszer:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "Operációs rendszer:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Verzió", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Számítógép:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Rendszer üzemidő:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Számítógép:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
     LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9
     LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9
     LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9
-    CONTROL "Visit the <A HREF=""https://reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
-    PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15
+    CONTROL "A <A HREF=""https://reactos.org/"">ReactOS honlapjának</A> meglátogatása", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10
+    PUSHBUTTON "&Licenc megtekintése...", IDC_LICENCE, 166, 198, 82, 15
 END
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218
@@ -340,7 +340,6 @@ BEGIN
     IDS_PAGEFILE_NONE "None"
     IDS_PAGEFILE_SYSTEM "System Managed"
     IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
-    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete"
     IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?"
     IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use."

dll/cpl/sysdm/lang/id-ID.rc

@@ -6,13 +6,13 @@ CAPTION "Umum"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "Sistem:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "Sistem:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Versi", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "Waktu hidup sistem:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Mesin:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Waktu hidup sistem:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Mesin:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -338,7 +338,6 @@ BEGIN
     IDS_PAGEFILE_NONE "Tidak ada"
     IDS_PAGEFILE_SYSTEM "Diatur Sistem"
     IDS_INFOREBOOT "Anda harus memulai ulang komputer untuk menerapkan perubahan."
-    IDS_DEVS "\nReactOS Team\n\nKoordinator Proyek\n\nAleksey Bragin\n\nTim Pengembangan\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nTim Media\n\nMindflyer\nWierd_W\n\nselanjutnya terima kasih untuk\n\nsemua Kontributor\nTim Wine\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Konfirmasi Penghapusan Profil"
     IDS_HWPROFILE_CONFIRM_DELETE "Anda yakin ingin menghapus profil perangkat keras ""%s""?"
     IDS_HWPROFILE_ALREADY_IN_USE "Nama profil telah digunakan."

dll/cpl/sysdm/lang/it-IT.rc

@@ -6,13 +6,13 @@ CAPTION "Generale"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "Sistema:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "Sistema:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Versione", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "Tempo di Avvio Sistema:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Macchina:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "Tempo di Avvio Sistema:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Macchina:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -338,7 +338,6 @@ BEGIN
     IDS_PAGEFILE_NONE "None"
     IDS_PAGEFILE_SYSTEM "System Managed"
     IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
-    IDS_DEVS "\nReactOS Team\n\nCoordinatore\n\nAleksey Bragin\n\nGruppo di sviluppo\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nUlteriori ringraziamenti\n\na tutti i contributori\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete"
     IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?"
     IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use."

dll/cpl/sysdm/lang/ja-JP.rc

@@ -6,13 +6,13 @@ CAPTION "全般"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "システム:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "システム:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "バージョン", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "起動してからの時間:", IDC_STATIC, 4, 148, 95, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "マシン:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "起動してからの時間:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "マシン:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -338,7 +338,6 @@ BEGIN
     IDS_PAGEFILE_NONE "なし"
     IDS_PAGEFILE_SYSTEM "システム管理"
     IDS_INFOREBOOT "変更を適用するには、コンピュータを再起動する必要があります。"
-    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "プロファイル削除の確認"
     IDS_HWPROFILE_CONFIRM_DELETE "ハードウェア プロファイル ""%s"" を削除してもよいですか?"
     IDS_HWPROFILE_ALREADY_IN_USE "プロファイル名は使用中です。"

dll/cpl/sysdm/lang/nl-NL.rc

@@ -6,13 +6,13 @@ CAPTION "Algemeen"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "Besturingssysteem:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "Besturingssysteem:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Versie", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Machine:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -338,7 +338,6 @@ BEGIN
     IDS_PAGEFILE_NONE "None"
     IDS_PAGEFILE_SYSTEM "System Managed"
     IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
-    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete"
     IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?"
     IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use."

dll/cpl/sysdm/lang/no-NO.rc

@@ -6,13 +6,13 @@ CAPTION "Generielt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT "System:", IDC_STATIC, 4, 116, 32, 9
+    LTEXT "System:", IDC_STATIC, 4, 116, 100, 9
     LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9
     LTEXT "Versjon", IDC_ROSVERSION, 10, 137, 116, 9
-    LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9
-    LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9
-    LTEXT "", IDC_UPTIME, 10, 170, 116, 9
-    LTEXT "Maskin:", IDC_STATIC, 124, 116, 34, 9
+    LTEXT KERNEL_VERSION_REVISION_RC, IDC_STATIC, 10, 146, 110, 9
+    LTEXT "System Uptime:", IDC_STATIC, 4, 161, 100, 9
+    LTEXT "", IDC_UPTIME, 10, 173, 116, 9
+    LTEXT "Maskin:", IDC_STATIC, 124, 116, 100, 9
     LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9
     LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9
     LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9
@@ -338,7 +338,6 @@ BEGIN
     IDS_PAGEFILE_NONE "Ingen"
     IDS_PAGEFILE_SYSTEM "System Managed"
     IDS_INFOREBOOT "You have to reboot the computer in order to apply the changes."
-    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes Anderwald\nKamil Horníček\nKatayama Hirofumi MZ\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMark Jansen\nMatthias Kupfer\nMike Nordell\nPeter Hater\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStanislav Motylkov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nThomas Faber\nTimo Kreuzer\nVadim Galyant\n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini\n\nRelease Engineers\n\nAmine Khaldi\nColin Finck\nJoachim Henze\nThomas Faber\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributors\nWine Team\n\n"
     IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete"
     IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?"
     IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use."