diff -ruN reactos.old/base/applications/cmdutils/reg/Pl.rc reactos/base/applications/cmdutils/reg/Pl.rc
--- reactos.old/base/applications/cmdutils/reg/Pl.rc	2012-09-12 07:25:49.000000000 +0200
+++ reactos/base/applications/cmdutils/reg/Pl.rc	2012-09-12 22:22:06.243247909 +0200
@@ -4,7 +4,8 @@
  *
  * Copyright 2008 Andrew Riedi
  * Copyright 2008 Mikolaj Zalewski
- * Copyright 2010 �ukasz Wojni�owicz
+ * Copyright 2010 Łukasz Wojniłowicz
+ * Copyright 2012 Mieczyslaw Nalewaj
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,17 +24,20 @@
 
 #include "reg.h"
 
+/* UTF-8 */
+#pragma code_page(65001)
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_USAGE, "Sk�adnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n"
-    STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_warto�ci | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_warto�ci | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_warto�ci | /ve] [/s]\n"
-    STRING_SUCCESS, "Operacja zako�czona pomy�lnie\n"
-    STRING_INVALID_KEY, "B��d: Niew�a�ciwa nazwa klucza\n"
-    STRING_INVALID_CMDLINE, "B��d: Niew�a�ciwe parametry wiersza polece�\n"
-    STRING_NO_REMOTE, "B��d: Nie mo�na doda� kluczy do zdalnej maszyny\n"
-    STRING_CANNOT_FIND, "B��d: System nie m�g� znale�� podanej warto�ci lub klucza rejestru\n"
+    STRING_USAGE, "Składnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n"
+    STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve] [/s]\n"
+    STRING_SUCCESS, "Operacja zakończona pomyślnie\n"
+    STRING_INVALID_KEY, "Błąd: Niewłaściwa nazwa klucza\n"
+    STRING_INVALID_CMDLINE, "Błąd: Niewłaściwe parametry wiersza poleceń\n"
+    STRING_NO_REMOTE, "Błąd: Nie można dodać kluczy do zdalnej maszyny\n"
+    STRING_CANNOT_FIND, "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n"
 }
diff -ruN reactos.old/base/applications/cmdutils/reg/reg.c reactos/base/applications/cmdutils/reg/reg.c
--- reactos.old/base/applications/cmdutils/reg/reg.c	2012-09-12 07:25:49.000000000 +0200
+++ reactos/base/applications/cmdutils/reg/reg.c	2012-09-12 22:10:03.694248532 +0200
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008 Andrew Riedi
+ * Copyright 2012 Mieczyslaw Nalewaj
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -65,21 +66,44 @@
 
 static HKEY get_rootkey(LPWSTR key)
 {
+    BOOL CompareRegW(LPCTSTR lpString1, LPCTSTR lpString2)
+    {
+	int cchCount;
+	if ((!lpString1)||(!lpString2)||(!*lpString1)||(!*lpString2))
+	    return FALSE;
+	cchCount = strlenW(lpString2);
+	if (strlenW(lpString1)<cchCount)
+	    return FALSE;
+
+	if ( (CompareStringW(CP_ACP,NORM_IGNORECASE,lpString1,cchCount,lpString2,cchCount)==2)
+    	    && ((lpString1[cchCount] == 0) || (lpString1[cchCount] == (WCHAR){'\\'}))) 
+	    return TRUE;
+	else
+	    return FALSE;
+    }
+
     static const WCHAR szHKLM[] = {'H','K','L','M',0};
     static const WCHAR szHKCU[] = {'H','K','C','U',0};
     static const WCHAR szHKCR[] = {'H','K','C','R',0};
     static const WCHAR szHKU[] = {'H','K','U',0};
     static const WCHAR szHKCC[] = {'H','K','C','C',0};
 
-    if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==2)
+    static const WCHAR szHKLMf[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0};
+    static const WCHAR szHKCUf[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0};
+    static const WCHAR szHKCRf[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0};
+    static const WCHAR szHKUf[] = {'H','K','E','Y','_','U','S','E','R','S',0};
+    static const WCHAR szHKCCf[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0};
+
+
+    if ( CompareRegW(key,szHKLM) || CompareRegW(key,szHKLMf) )
         return HKEY_LOCAL_MACHINE;
-    else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==2)
+    else if ( CompareRegW(key,szHKCU) || CompareRegW(key,szHKCUf) )
         return HKEY_CURRENT_USER;
-    else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==2)
+    else if ( CompareRegW(key,szHKCR) || CompareRegW(key,szHKCRf) )
         return HKEY_CLASSES_ROOT;
-    else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==2)
+    else if ( CompareRegW(key,szHKU) || CompareRegW(key,szHKUf) )
         return HKEY_USERS;
-    else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==2)
+    else if ( CompareRegW(key,szHKCC) || CompareRegW(key,szHKCCf) )
         return HKEY_CURRENT_CONFIG;
     else return NULL;
 }
@@ -345,11 +369,157 @@
 static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
     BOOL subkey)
 {
-    static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ',
-        '-',' ','%','s',' ','%','s',' ','%','d',' ','%','d','\n',0};
-    reg_printfW(stubW, key_name, value_name, value_empty, subkey);
+    LPWSTR p;
+    HKEY root, querykey;
+    DWORD count, dount, sount;
+    
+    static const WCHAR stubRW[] = {'\n', '!', ' ', 'R', 'E', 'G', '.', 'E', 'X', 'E',' ', 'V' ,'E', 'R', 'S', 'I', 'O', 'N', ' ', '1', '.', '0', '\n', '\n',0};
+
+    static const WCHAR stubW[] = {'%','s','\n',0};
+    static const WCHAR stubSW[] = {'%','s','\\','%','s','\n','\n',0};
+
+    static const WCHAR stubVALUEW[] = { '\t', '%', 's', '\t',0};
+    static const WCHAR stubVALUE0W[] = { '\t', '<', 'N', 'O', ' ', 'N', 'A', 'M', 'E', '>', '\t',0};
+    static const WCHAR stubREG_SZW[] = { 'R', 'E', 'G', '_', 'S', 'Z', '\t', '%', 's', '\n',0};
+    static const WCHAR stubREG_EXPAND_SZW[] = { 'R', 'E', 'G', '_', 'E', 'X', 'P', 'A', 'N', 'D', '_', 'S', 'Z', '\t', '%', 's', '\n',0};
+    static const WCHAR stubREG_DWORDW[] = { 'R', 'E', 'G', '_', 'D', 'W', 'O', 'R', 'D', '\t', '0', 'x', '%', 'X', '\n',0};
+    static const WCHAR stubREG_BINARY1W[] = { 'R', 'E', 'G', '_', 'D', 'W', 'O', 'R', 'D', '\t',0};
+    static const WCHAR stubREG_BINARY2W[] = { '%', '.','2', 'X' ,0};
+    static const WCHAR stubREG_MULTI_SZ1W[] = { 'R', 'E', 'G', '_', 'M', 'U', 'L', 'T', 'I', '_', 'S', 'Z', '\t',0};
+    static const WCHAR stubREG_MULTI_SZ2W[] = { '%', 'c' ,0};
+    static const WCHAR stubREG_MULTI_SZ0W[] = { '\\', '0' ,0};
+    static const WCHAR stubREG_3W[] = { '\n',0};
+
+
+    if (key_name[0]=='\\' && key_name[1]=='\\')
+    {
+        reg_message(STRING_NO_REMOTE);
+        return 1;
+    }
+
+    p = strchrW(key_name,'\\');
+    if (!p)
+    {
+        reg_message(STRING_INVALID_KEY);
+        return 1;
+    }
+    p++;
 
-    return 1;
+    root = get_rootkey(key_name);
+    if (!root)
+    {
+        reg_message(STRING_INVALID_KEY);
+        return 1;
+    }
+
+    if(RegOpenKeyW(root,p,&querykey)!=ERROR_SUCCESS)
+    {
+        reg_message(STRING_CANNOT_FIND);
+        return 1;
+    }    
+
+    LPWSTR szValue;
+    LPBYTE bnData;
+    LPWSTR szSubk;
+
+    DWORD maxValue;
+    DWORD maxData;
+    DWORD maxSubk;
+    DWORD values;
+    DWORD type;
+    DWORD subkeys;
+    
+    LONG rc;
+
+    reg_printfW(stubRW);
+
+    rc = RegQueryInfoKeyW(querykey, NULL, NULL, NULL, &subkeys, &maxSubk, NULL, &values,
+        &maxValue, &maxData, NULL, NULL);
+    if (rc != ERROR_SUCCESS)
+    {
+        RegCloseKey(querykey);
+        return 1;
+    }
+    maxValue++;
+    szValue = HeapAlloc(GetProcessHeap(),0,maxValue*sizeof(WCHAR));
+    maxData+=2;
+    bnData = HeapAlloc(GetProcessHeap(),0,maxData);
+    maxSubk++;
+    szSubk = HeapAlloc(GetProcessHeap(),0,maxSubk*sizeof(WCHAR));
+
+    int licz;
+    int n;
+    WCHAR zaw;
+    BOOL exist = FALSE;
+
+    reg_printfW(stubW, key_name);
+
+    rc = ERROR_SUCCESS;
+    for (licz=0; licz<values; licz++)
+    {
+        count = maxValue;
+        dount = maxData;
+        rc = RegEnumValueW(querykey, licz, szValue, &count, NULL, &type, bnData, &dount);
+	bnData[dount]=0;
+	bnData[dount+1]=0;
+	szValue[count]=0;
+        if (rc == ERROR_SUCCESS)
+        {
+    	    if ( ((!value_empty) && (!value_name)) ||
+		 ((value_empty)&&(count==0)) ||
+		 (!lstrcmpiW(szValue, value_name)) ) { 
+		exist = TRUE;
+        	if (count==0) reg_printfW(stubVALUE0W);
+		else reg_printfW(stubVALUEW, szValue);
+		
+		if (type==REG_SZ) reg_printfW(stubREG_SZW, bnData);
+		else if (type==REG_EXPAND_SZ) reg_printfW(stubREG_EXPAND_SZW, bnData);
+		else if (type==REG_DWORD) reg_printfW(stubREG_DWORDW, *bnData);
+		else if (type==REG_BINARY) {
+		    reg_printfW(stubREG_BINARY1W);
+		    for (n=0; n<dount; n++) 
+		        reg_printfW(stubREG_BINARY2W, bnData[n]);
+		    reg_printfW(stubREG_3W);
+		} else if (type==REG_MULTI_SZ) {
+		    reg_printfW(stubREG_MULTI_SZ1W);
+		    if (dount<=4) 
+		        reg_printfW(stubREG_MULTI_SZ0W);
+		    else for (n=0; n<dount; n+=2) { 
+		    	zaw = *((WCHAR*)(bnData+n));
+		    	if (zaw == 0)
+			    reg_printfW(stubREG_MULTI_SZ0W);
+			else
+			    reg_printfW(stubREG_MULTI_SZ2W, zaw);
+		    }
+		    reg_printfW(stubREG_3W);
+		}
+    	    }
+        }
+        else break;
+    }
+    reg_printfW(stubREG_3W);
+
+    if ((rc == ERROR_SUCCESS) && (!value_empty) && (!value_name)) for (licz=0; licz<subkeys; licz++)
+    {
+        sount = maxSubk;
+        rc = RegEnumKeyW(querykey, licz, szSubk, sount);
+        if (rc == ERROR_SUCCESS)
+        {
+    	    exist = TRUE;
+            reg_printfW(stubSW, key_name, szSubk);
+        }
+        else break;
+    }
+
+    RegCloseKey(querykey);
+
+    if (!exist)
+    {
+        reg_message(STRING_CANNOT_FIND);
+        return 1;
+    }
+
+    return 0;
 }
 
 int wmain(int argc, WCHAR *argvW[])