Merge branch 'master' of https://github.com/reactos/reactos into usbvideo_bringup

Author: janderwald

.github/labeler.yml

@@ -48,6 +48,7 @@ Win32SS:
 - changed-files:
   - any-glob-to-any-file:
     - base/ctf/**
+    - base/system/conime/**
     - win32ss/user/imm32/**
     - win32ss/user/ntuser/ime.c
     - win32ss/user/user32/misc/imm.c

base/applications/cmdutils/hostname/hostname.rc

@@ -39,6 +39,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_RU_RU
     #include "lang/ru-RU.rc"
 #endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
 #ifdef LANGUAGE_SQ_AL
     #include "lang/sq-AL.rc"
 #endif

base/applications/cmdutils/hostname/lang/sk-SK.rc

@@ -0,0 +1,15 @@
+/*
+ * PROJECT:     ReactOS Hostname Command
+ * LICENSE:     LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+)
+ * PURPOSE:     Slovak resource file
+ * TRANSLATOR:  Copyright 2026 Václav Zouzalík (Venca24) <vaclav.zouzalik@seznam.cz>
+ */
+
+LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Vypíše súčasný názov hostiteľa.\n\nhostname"
+    IDS_NOSET "hostname -s nie je podporovaný."
+    IDS_ERROR "Chyba Win32"
+END

base/applications/kbswitch/kbswitch.h

@@ -11,19 +11,14 @@
 #include <tchar.h>
 #include <strsafe.h>
 #include <ime/indicml.h> /* INDICATOR_CLASS, INDICM_... */
+#include <cjkcode.h> /* LANGID_... */
 
 #include "resource.h"
 #include "indicdll/resource.h"
 
 #define CCH_LAYOUT_ID       8   // Character Count of a layout ID like "00000409"
 #define CCH_ULONG_DEC       10  // Maximum Character Count of a ULONG in decimal
 
-// Far East Language IDs
-#define LANGID_CHINESE_SIMPLIFIED MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED)
-#define LANGID_CHINESE_TRADITIONAL MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL)
-#define LANGID_JAPANESE MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT)
-#define LANGID_KOREAN MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT)
-
 #define WM_LANG_CHANGED    (WM_USER + 10200)
 #define WM_WINDOW_ACTIVATE (WM_USER + 10300)
 

base/applications/mspaint/history.cpp

@@ -38,8 +38,6 @@ ImageModel::ImageModel()
     , m_undoSteps(0)
     , m_redoSteps(0)
 {
-    ZeroMemory(m_historyItems, sizeof(m_historyItems));
-
     m_hbmMaster = CreateColorDIB(1, 1, RGB(255, 255, 255));
     m_hbmOld = ::SelectObject(m_hDrawingDC, m_hbmMaster);
 

base/applications/mspaint/history.h

@@ -13,8 +13,8 @@
 struct IMAGE_PART
 {
     CRect m_rcPart;
-    HBITMAP m_hbmImage;
-    BOOL m_bPartial;
+    HBITMAP m_hbmImage = NULL;
+    BOOL m_bPartial = FALSE;
 
     void clear();
 };

base/applications/network/ftp/cmds.c

@@ -1677,12 +1677,12 @@ int globulize(const char **cpp)
 		return (0);
 	}
 	if (globbed) {
-		*cpp = *globbed++;
+		*cpp = *globbed;
 		/* don't waste too much memory */
-		if (*globbed) {
-			blkfree(globbed);
-			free((char *)globbed);
+		if (globbed[1]) {
+			blkfree(&globbed[1]);
 		}
+		free(globbed);
 	}
 	return (1);
 }

base/applications/network/ipconfig/ipconfig.c

@@ -1244,8 +1244,10 @@ SetClassId(
     ULONG ret = 0;
     WCHAR szFriendlyName[MAX_PATH];
     WCHAR szKeyName[256];
+    WCHAR szUnicodeAdapterName[MAX_ADAPTER_NAME_LENGTH + 4];
     MIB_IFROW mibEntry;
     HKEY hKey;
+    DHCP_PNP_EVENT PnpEvent;
 
     ConResPrintf(StdOut, IDS_HEADER);
 
@@ -1313,8 +1315,31 @@ SetClassId(
         if (pszClassId == NULL)
             pszClassId = L"";
 
-        RegSetValueExW(hKey, L"DhcpClassId", 0, REG_SZ, (LPBYTE)pszClassId, (wcslen(pszClassId) + 1) * sizeof(WCHAR));
+        ret = RegSetValueExW(hKey, L"DhcpClassId", 0, REG_SZ, (LPBYTE)pszClassId, (wcslen(pszClassId) + 1) * sizeof(WCHAR));
         RegCloseKey(hKey);
+        if (ret != ERROR_SUCCESS)
+        {
+            ConResPrintf(StdOut, IDS_DHCPSETIDERROR, szFriendlyName);
+            DoFormatMessage(ret);
+            goto done;
+        }
+
+        mbstowcs(szUnicodeAdapterName, pFoundAdapter->AdapterName, strlen(pFoundAdapter->AdapterName) + 1);
+
+        ZeroMemory(&PnpEvent, sizeof(PnpEvent));
+        PnpEvent.Unknown5 = 1;
+
+        ret = DhcpHandlePnPEvent(0,
+                                 1,
+                                 szUnicodeAdapterName,
+                                 &PnpEvent,
+                                 0);
+        if (ret != ERROR_SUCCESS)
+        {
+            ConResPrintf(StdOut, IDS_DHCPSETIDERROR, szFriendlyName);
+            DoFormatMessage(ret);
+            goto done;
+        }
 
         ConResPrintf(StdOut, IDS_DHCPSETIDSUCCESS, szFriendlyName);
     }

base/applications/network/nslookup/utility.c

@@ -7,6 +7,7 @@
  */
 
 #include "nslookup.h"
+#include <assert.h>
 
 BOOL SendRequest( PCHAR pInBuffer,
                   ULONG InBufferLength,
@@ -252,6 +253,8 @@ void ReverseIP( PCHAR pIP, PCHAR pReturn )
     int j;
     int k = 0;
 
+    assert(pReturn != pIP);
+
     j = strlen( pIP ) - 1;
     i = j;
 
@@ -261,7 +264,8 @@ void ReverseIP( PCHAR pIP, PCHAR pReturn )
     /* A */
     for( ; i > 0; i -= 1 ) if( '.' == pIP[i] ) break;
 
-    strncpy( &pReturn[k], &pIP[i + 1], (j - i) );
+    if (j != i)
+        strncpy( &pReturn[k], &pIP[i + 1], (j - i) );
     k += (j - i);
 
     pReturn[k] = '.';
@@ -273,7 +277,8 @@ void ReverseIP( PCHAR pIP, PCHAR pReturn )
     /* B */
     for( ; i > 0; i -= 1 ) if( '.' == pIP[i] ) break;
 
-    strncpy( &pReturn[k], &pIP[i + 1], (j - i) );
+    if (j != i)
+        strncpy( &pReturn[k], &pIP[i + 1], (j - i) );
     k += (j - i);
 
     pReturn[k] = '.';
@@ -285,7 +290,8 @@ void ReverseIP( PCHAR pIP, PCHAR pReturn )
     /* C */
     for( ; i > 0; i -= 1 ) if( '.' == pIP[i] ) break;
 
-    strncpy( &pReturn[k], &pIP[i + 1], (j - i) );
+    if (j != i)
+        strncpy( &pReturn[k], &pIP[i + 1], (j - i) );
     k += (j - i);
 
     pReturn[k] = '.';

base/applications/network/ping/lang/cs-CZ.rc

@@ -1,7 +1,9 @@
 /*
- * FILE:        base/applications/network/ping/lang/cs-CZ.rc
- * PURPOSE:     Czech translations for ReactOS Ping Command
- * TRANSLATORS: Radek Liska (Black_Fox) <radekliska at gmail dot com>
+ * PROJECT:     ReactOS Ping Command
+ * LICENSE:     MIT (https://spdx.org/licenses/MIT)
+ * PURPOSE:     Czech resource file
+ * TRANSLATORS: Copyright 2011 Radek Liška (Black_Fox) <radekliska@gmail.com>
+ *              Copyright 2026 Václav Zouzalík (Venca24) <vaclav.zouzalik@seznam.cz>
  */
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@@ -10,50 +12,49 @@ STRINGTABLE
 BEGIN
     IDS_USAGE "\n\
 Použití: ping [-t] [-a] [-n počet] [-l velikost] [-f] [-i TTL] [-v TOS]\n\
-              [-w timeout] [-4] [-6] target\n\
+              [-w timeout] [-4] [-6] cíl\n\
 \n\
-Options:\n\
-    -t           Ping the specified host until stopped.\n\
-                 To see statistics and continue - type Control-Break;\n\
-                 To stop - type Control-C.\n\
-    -a           Resolve addresses to hostnames.\n\
-    -n počet     Počet požadavků o ozvěnu, které budou zaslány.\n\
+Volby:\n\
+    -t           Posílá ping na určeného hostitele, dokud není zastaven.\n\
+                 Pro výpis statistiky a pokračování - stiskněte Ctrl-Break;\n\
+                 Pro zastavení - stiskněte Ctrl-C.\n\
+    -a           Převede adresy na názvy hostitelů.\n\
+    -n počet     Počet požadavků na ozvěnu, které budou zaslány.\n\
     -l velikost  Velikost vyrovnávací paměti.\n\
-    -f           Set Don't Fragment flag in packet (IPv4-only).\n\
+    -f           Nastaví v paketech příznak Don't Fragment (jen IPv4).\n\
     -i TTL       Time To Live.\n\
-    -v TOS       Type Of Service (IPv4-only. This setting has been deprecated\n\
-                 and has no effect on the type of service field in the IP\n\
-                 Header).\n\
+    -v TOS       Type Of Service (Jen IPv4. Toto nastavení je zastaralé\n\
+                 a nemá žádný vliv na pole typu služby v IP hlavičce).\n\
     -w timeout   Doba v milisekundách, po kterou se bude čekat na odpověď.\n\
-    -4           Force using IPv4.\n\
-    -6           Force using IPv6.\n\
+    -4           Vynutí použití IPv4.\n\
+    -6           Vynutí použití IPv6.\n\
 \n"
 
-    IDS_CTRL_BREAK "Control-Break\n"
-    IDS_CTRL_C "Control-C\n"
+    IDS_CTRL_BREAK "Ctrl-Break\n"
+    IDS_CTRL_C "Ctrl-C\n"
     IDS_NO_RESOURCES "Není k dispozici dostatek volných zdrojů.\n"
-    IDS_MISSING_ADDRESS "IP address must be specified.\n"
-    IDS_MISSING_VALUE "Value must be supplied for option %s.\n"
+    IDS_MISSING_ADDRESS "IP adresa musí být uvedena.\n"
+    IDS_MISSING_VALUE "Musí být zadána hodnota pro volbu %s.\n"
     IDS_BAD_OPTION "Nesprávná volba %s.\n"
     IDS_BAD_PARAMETER "Nesprávný parametr %s.\n"
     IDS_BAD_VALUE "Nesprávná hodnota volby %s, platný rozsah je od %u do %u.\n"
-    IDS_WRONG_FAMILY "The option %s is only supported for %s.\n"
-    IDS_UNKNOWN_HOST "Ping could not find host %s. Please check the name and try again.\n"
-    IDS_PINGING_ADDRESS "\nPinging %s "
-    IDS_PINGING_HOSTNAME "\nPinging %s [%s] "
-    IDS_SOURCE_ADDRESS "from %s %s"
-    IDS_PING_SIZE "with %lu bytes of data:\n\n"
+    IDS_WRONG_FAMILY "Volba %s je podporována jen pro %s.\n"
+    IDS_UNKNOWN_HOST "Ping nenašel hostitele %s. Zkontrolujte prosím jeho název a zkuste to znovu.\n"
+    IDS_PINGING_ADDRESS "\nPosílám ping na %s "
+    IDS_PINGING_HOSTNAME "\nPosílám ping na %s [%s] "
+    IDS_SOURCE_ADDRESS "z %s %s"
+    IDS_PING_SIZE "s %lu bajty dat:\n\n"
     IDS_REPLY_FROM "Odpověď od %s: "
     IDS_REPLY_BYTES "bajtů=%d "
     IDS_REPLY_TIME_MS "čas=%lums "
     IDS_REPLY_TIME_0MS "čas<1ms "
     IDS_REPLY_TTL "TTL=%d\n"
-    IDS_REPLY_STATUS "Echo reply returned %lu.\n"
-    IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n"
-    IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n"
+    IDS_REPLY_STATUS "Vrátila se odpověď na echo %lu.\n"
+    IDS_DEST_HOST_UNREACHABLE "Cílový hostitel není dostupný.\n"
+    IDS_DEST_NET_UNREACHABLE "Cílová síť není dostupná.\n"
     IDS_REQUEST_TIMED_OUT "Časový limit žádosti vypršel.\n"
-    IDS_TTL_EXPIRED "TTL expired in transit.\n"
-    IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n"
+    IDS_TTL_EXPIRED "Vypršelo TTL během přenosu.\n"
+    IDS_TRANSMIT_FAILED "PING: přenos selhal. (Chyba %u)\n"
 
     IDS_STATISTICS "\n\
 Statistika pro %s:\n\
@@ -62,5 +63,5 @@ Statistika pro %s:\n\
     IDS_APPROXIMATE_RTT "Přibližná doba do přijetí odezvy v milisekundách:\n\
     Minimum = %lums, Maximum = %lums, Průměr = %lums\n"
 
-    IDS_WINSOCK_FAIL "Failed to initialize WinSock: %i\n"
+    IDS_WINSOCK_FAIL "Inicializace WinSock selhala: %i\n"
 END