Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 40063: - Support loading drivers which have no subdirectory in their image path.
by fireball＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: fireball Date: Mon Mar 16 21:26:02 2009 New Revision: 40063 URL: http://svn.reactos.org/svn/reactos?rev=40063&view=rev Log: - Support loading drivers which have no subdirectory in their image path. Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Mon Mar 16 21:26:02 2009 @@ -277,6 +277,12 @@ // Cut out the name from the path *(DriverNamePos+1) = 0; } + else + { + // There is no directory in the path + strcpy(DllName, DriverPath); + DriverPath[0] = 0; + } DPRINTM(DPRINT_WINDOWS, "DriverPath: %s, DllName: %s, LPB %p\n", DriverPath, DllName, LoaderBlock);

1 0

[jmorlan] 40062: Implement ASSOC command (Bug 4275). Patch by Lee C. Baker <lee at leecbaker.com>.
by jmorlan＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: jmorlan Date: Mon Mar 16 21:18:26 2009 New Revision: 40062 URL: http://svn.reactos.org/svn/reactos?rev=40062&view=rev Log: Implement ASSOC command (Bug 4275). Patch by Lee C. Baker <lee at leecbaker.com>. Added: trunk/reactos/base/shell/cmd/assoc.c (with props) Modified: trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/base/shell/cmd/cmdtable.c trunk/reactos/base/shell/cmd/config.h trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/resource.h Added: trunk/reactos/base/shell/cmd/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/assoc.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/assoc.c (added) +++ trunk/reactos/base/shell/cmd/assoc.c [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -1,0 +1,262 @@ +/* + * Assoc.C - assoc internal command. + * + * + * History: + * + * 14-Mar-2009 Lee C. Baker + * - initial implementation + * + * 15-Mar-2009 Lee C. Baker + * - Don't write to (or use) HKEY_CLASSES_ROOT directly + * - Externalize strings + * + * TODO: + * - PrintAllAssociations might could be optimized to not fetch all registry subkeys under 'Classes', just the ones that start with '.' + * - Make sure that non-administrator users can list associations, and get appropriate error messages when they don't have sufficient + * priveleges to perform an operation + */ + +#include <precomp.h> +#include <tchar.h> + +#ifdef INCLUDE_CMD_ASSOC + +static INT +PrintAssociation(LPTSTR extension) +{ + DWORD return_val; + HKEY hKey = NULL, hInsideKey = NULL; + + DWORD fileTypeLength = 0; + LPTSTR fileType = NULL; + + return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); + + if(return_val != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return -1; + } + + return_val = RegOpenKeyEx(hKey, extension, 0, KEY_READ, &hInsideKey); + + if(return_val != ERROR_SUCCESS) + { + RegCloseKey(hKey); + RegCloseKey(hInsideKey); + return 0; + } + + /* obtain string length */ + return_val = RegQueryValueEx(hInsideKey, NULL, NULL, NULL, NULL, &fileTypeLength); + + if(return_val == ERROR_FILE_NOT_FOUND) /* no default value, don't display */ + { + RegCloseKey(hInsideKey); + RegCloseKey(hKey); + return 0; + } + + if(return_val != ERROR_SUCCESS) + { + RegCloseKey(hInsideKey); + RegCloseKey(hKey); + return -2; + } + + fileType = cmd_alloc(fileTypeLength * sizeof(TCHAR)); + + /* obtain actual file type */ + return_val = RegQueryValueEx(hInsideKey, NULL, NULL, NULL, (LPBYTE) fileType, &fileTypeLength); + + RegCloseKey(hInsideKey); + RegCloseKey(hKey); + + if(return_val != ERROR_SUCCESS) + { + cmd_free(fileType); + return -2; + } + + if(fileTypeLength != 0) /* if there is a default key, display relevant information */ + { + ConOutPrintf(_T("%s=%s\r\n"), extension, fileType); + } + + if(fileTypeLength) + cmd_free(fileType); + + return 1; +} + +static INT +PrintAllAssociations() +{ + DWORD return_val = 0; + HKEY hKey = NULL; + DWORD numKeys = 0; + + DWORD extLength = 0; + LPTSTR extName = NULL; + DWORD keyCtr = 0; + + return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); + + if(return_val != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return -1; + } + + return_val = RegQueryInfoKey(hKey, NULL, NULL, NULL, &numKeys, &extLength, NULL, NULL, NULL, NULL, NULL, NULL); + + if(return_val != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return -2; + } + + extName = cmd_alloc(extLength * sizeof(TCHAR)); + + for(keyCtr = 0; keyCtr < numKeys; keyCtr++) + { + DWORD buffer_size = extLength; + return_val = RegEnumKeyEx(hKey, keyCtr, extName, &buffer_size, NULL, NULL, NULL, NULL); + + if(return_val == ERROR_SUCCESS || return_val == ERROR_MORE_DATA) + { + if(*extName == _T('.')) + PrintAssociation(extName); + } + else + { + cmd_free(extName); + RegCloseKey(hKey); + return -1; + } + } + + RegCloseKey(hKey); + + if(extName) + cmd_free(extName); + + return numKeys; +} + +static INT +AddAssociation(LPTSTR extension, LPTSTR type) +{ + DWORD return_val; + HKEY hKey = NULL, insideKey = NULL; + + return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); + + if(return_val != ERROR_SUCCESS) + return -1; + + return_val = RegCreateKeyEx(hKey, extension, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &insideKey, NULL); + + if(return_val != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return -1; + } + + return_val = RegSetValueEx(insideKey, NULL, 0, REG_SZ, (LPBYTE)type, (_tcslen(type) + 1) * sizeof(TCHAR)); + + if(return_val != ERROR_SUCCESS) + { + RegCloseKey(insideKey); + RegCloseKey(hKey); + return -2; + } + + RegCloseKey(insideKey); + RegCloseKey(hKey); + return 0; +} + + +static int +RemoveAssociation(LPTSTR extension) +{ + DWORD return_val; + HKEY hKey; + + return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); + + if(return_val != ERROR_SUCCESS) + return -1; + + return_val = RegDeleteKey(hKey, extension); + + if(return_val != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return -2; + } + + RegCloseKey(hKey); + return 0; +} + + + +INT CommandAssoc (LPTSTR param) +{ + + LPTSTR lpEqualSign = NULL; + + /* print help */ + if (!_tcsncmp (param, _T("/?"), 2)) + { + ConOutResPaging(TRUE,STRING_ASSOC_HELP); + return 0; + } + + nErrorLevel = 0; + + if(_tcslen(param) == 0) + PrintAllAssociations(); + else + { + lpEqualSign = _tcschr(param, _T('=')); + if(lpEqualSign != NULL) + { + LPTSTR fileType = lpEqualSign + 1; + LPTSTR extension = cmd_alloc((lpEqualSign - param + 1) * sizeof(TCHAR)); + + _tcsncpy(extension, param, lpEqualSign - param); + extension[lpEqualSign - param] = (TCHAR)0; + + if(_tcslen(fileType) == 0) + /* if the equal sign is the last character + in the string, then delete the key */ + { + RemoveAssociation(extension); + } + else + /* otherwise, add the key and print out the association*/ + { + AddAssociation( extension, fileType); + PrintAssociation(extension); + } + + cmd_free(extension); + } + else + { + /* no equal sign, print all associations */ + INT retval = PrintAssociation(param); + + if(retval == 0) /* if nothing printed out */ + ConOutResPrintf(STRING_ASSOC_ERROR, param); + } + } + + return 0; +} + +#endif /* INCLUDE_CMD_ASSOC */ Propchange: trunk/reactos/base/shell/cmd/assoc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -70,6 +70,9 @@ /* Prototypes for ALIAS.C */ VOID ExpandAlias (LPTSTR, INT); INT CommandAlias (LPTSTR); + +/* Prototypes for ASSOC.C */ +INT CommandAssoc (LPTSTR); /* Prototypes for ATTRIB.C */ INT CommandAttrib (LPTSTR); Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -16,6 +16,7 @@ <pch>precomp.h</pch> <compilationunit name="unit.c"> <file>alias.c</file> + <file>assoc.c</file> <file>attrib.c</file> <file>batch.c</file> <file>beep.c</file> Modified: trunk/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdtable.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdtable.c [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -35,6 +35,10 @@ #ifdef FEATURE_ALIASES {_T("alias"), 0, CommandAlias}, +#endif + +#ifdef INCLUDE_CMD_ASSOC + {_T("assoc"), 0, CommandAssoc}, #endif #ifdef INCLUDE_CMD_ATTRIB Modified: trunk/reactos/base/shell/cmd/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/config.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/config.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/config.h [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -50,6 +50,7 @@ #ifdef NT4_INTERNAL_COMMANDS #define INCLUDE_CMD_ACTIVATE #endif +#define INCLUDE_CMD_ASSOC #define INCLUDE_CMD_ATTRIB #define INCLUDE_CMD_CHCP #define INCLUDE_CMD_CHDIR Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -8,6 +8,14 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "Zeigt Dateiattribute an oder ändert sie.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] Dateiname ...\n\ @@ -600,6 +608,7 @@ STRING_COPY_OPTION, "JNA" STRING_ALIAS_ERROR, "Die Befehlszeile ist zu lange nach der Alias-Erweiterung!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "Es trat ein Fehler auf, während die Batch-Datei geöffnet wurde.\n" STRING_CHCP_ERROR1, "Aktive Code-Page: %u\n" STRING_CHCP_ERROR4, "Ungültige Code-Page\n" Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -8,6 +8,14 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "ÐñïâïëÞ Þ áëëáãÞ ôùí ÷áñáêôçñéóôéêþí ôùí áñ÷åßùí.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ @@ -605,6 +613,7 @@ STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "Error opening batch file\n" STRING_CHCP_ERROR1, "Active code page: %u\n" STRING_CHCP_ERROR4, "Invalid code page\n" Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -8,6 +8,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "Displays or changes file attributes.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ @@ -608,7 +616,7 @@ STRING_CHOICE_OPTION, "YN" STRING_COPY_OPTION, "YNA" - +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" STRING_BATCH_ERROR, "Error opening batch file\n" STRING_CHCP_ERROR1, "Active code page: %u\n" Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -8,6 +8,14 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "Muestra o cambia los atributos de los archivos.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ @@ -567,6 +575,7 @@ STRING_ALIAS_ERROR, "¡Linea de comandos demasiado larga tras la expansión del alias!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "Error abriendo el archivo por lotes\n" STRING_CHCP_ERROR1, "Página de códigos activa: %u\n" STRING_CHCP_ERROR4, "Código de página inválido\n" Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -9,6 +9,14 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "Affiche ou change des attributs de fichiers.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ @@ -623,6 +631,7 @@ STRING_ALIAS_ERROR, "Ligne de commande trop longue après remplacement de l'alias!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "Erreur à l'ouverture du fichier batch\n" STRING_CHCP_ERROR1, "Page de codes actuelle : %u\n" STRING_CHCP_ERROR4, "Page de codes invalide \n" Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -10,6 +10,14 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "Állományok attribútumok megjelenítése vagy beállításai.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] állomány ...\n\ @@ -547,6 +555,7 @@ STRING_ALIAS_ERROR, "A parancssor túl hosszú az alias kibontásakor!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "Hiba a batch állomány megnyitásakor\n" STRING_CHCP_ERROR1, "Aktív kódlap: %u\n" STRING_CHCP_ERROR4, "Érvénytelen kódlap\n" Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -9,6 +9,14 @@ STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "Menampilkan atau mengubah atribut file.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ @@ -567,6 +575,7 @@ STRING_ALIAS_ERROR, "Baris perintah terlalu panjang setelah ekspansi alias!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "Kesalaham membuka file batch\n" STRING_CHCP_ERROR1, "Halaman kode aktif: %u\n" STRING_CHCP_ERROR4, "Halaman kode tidak benar\n" Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -4,6 +4,14 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "Visualizza o modifica gli attributi dei file.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ @@ -613,6 +621,7 @@ STRING_ALIAS_ERROR, "Linea di comando troppo lunga dopo l'espansione degli alias!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "Errore durante l'apertura di un batch\n" STRING_CHCP_ERROR1, "Tabella dei codici attiva: %u\n" STRING_CHCP_ERROR4, "Tabella dei codici non valida\n" Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -8,6 +8,14 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "t@C®«ð\\¦Ü½ÍÏXµÜ·B\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [t@C] ...\n\ @@ -574,6 +582,7 @@ STRING_ALIAS_ERROR, "GCAXWJãÌR}h Cª··¬Ü·!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "ob` t@CðJÆ«ÉG[ª¶µÜµ½B\n" STRING_CHCP_ERROR1, "»ÝÌR[h y[W: %u\n" STRING_CHCP_ERROR4, "³øÈR[h y[WÅ·\n" Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -4,6 +4,14 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "Viser eller endrer filattributtene.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\ @@ -559,6 +567,7 @@ STRING_ALIAS_ERROR, "Kommando linje for lang etter alias utvidelse!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "Feil ved åpning av satsvis fil\n" STRING_CHCP_ERROR1, "Aktiv tegntabell: %u\n" STRING_CHCP_ERROR4, "Ugyldig tegntabell\n" Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -9,6 +9,14 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "Wywietla lub zmienia atrybuty plików.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] nazwa_pliku ...\n\ @@ -565,6 +573,7 @@ STRING_ALIAS_ERROR, "Linia poleceñ zbyt d³uga po rozszerzeniu aliasa!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "B³¹d podczas otwierania pliku wsadowego\n" STRING_CHCP_ERROR1, "Aktywna strona kodowa nr: %u\n" STRING_CHCP_ERROR4, "Niew³aciwy numer strony kodowej\n" Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -12,6 +12,14 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "Âûâîä è èçìåíåíèå àòðèáóòîâ ôàéëîâ.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] ôàéë ...\n\ @@ -572,6 +580,7 @@ STRING_ALIAS_ERROR, "Êîìàíäíàÿ ñòðîêà ñëèøêîì äëèííàÿ ïîñëå ðàçâåðòûâàíèÿ ïñåâäîíèìîâ!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "Îøèáêà îòêðûòèÿ êîìàíäíîãî ôàéëà\n" STRING_CHCP_ERROR1, "Òåêóùàÿ êîäîâàÿ ñòðàíèöà: %u\n" STRING_CHCP_ERROR4, "Îøèáî÷íàÿ êîäîâàÿ ñòðàíèöà\n" Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -12,6 +12,14 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" STRING_ATTRIB_HELP, "Â³äîáðàæåííÿ àáî çì³íà àòðèáóò³â ôàéëó.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] ôàéë ...\n\ @@ -613,6 +621,7 @@ STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" +STRING_ASSOC_ERROR, "File association not found for extension %s\n" STRING_BATCH_ERROR, "Error opening batch file\n" STRING_CHCP_ERROR1, "Active code page: %u\n" STRING_CHCP_ERROR4, "Invalid code page\n" Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Mon Mar 16 21:18:26 2009 @@ -70,6 +70,7 @@ #define STRING_REPLACE_ERROR5 355 #define STRING_REPLACE_ERROR6 356 #define STRING_REPLACE_ERROR7 357 +#define STRING_ASSOC_ERROR 358 #define STRING_ATTRIB_HELP 600 #define STRING_ALIAS_HELP 601 @@ -87,6 +88,7 @@ #define STRING_CMD_HELP6 613 #define STRING_CMD_HELP7 614 #define STRING_CMD_HELP8 615 +#define STRING_ASSOC_HELP 616 #define STRING_CMD_SHELLINFO 624

1 0

[dgorbachev] 40061: Update Slovak translation, fix formatting. Mario Kacmar. Bug #4281.
by dgorbachev＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: dgorbachev Date: Mon Mar 16 17:10:15 2009 New Revision: 40061 URL: http://svn.reactos.org/svn/reactos?rev=40061&view=rev Log: Update Slovak translation, fix formatting. Mario Kacmar. Bug #4281. Modified: trunk/reactos/base/applications/mplay32/rsrc.rc trunk/reactos/dll/cpl/intl/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc Modified: trunk/reactos/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] Mon Mar 16 17:10:15 2009 @@ -9,6 +9,6 @@ #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" #include "lang/sk-SK.rc" -#include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/intl/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] Mon Mar 16 17:10:15 2009 @@ -61,7 +61,7 @@ IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Numbers" +CAPTION "Èísla" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Appearance sample", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE @@ -92,7 +92,7 @@ IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Currency" +CAPTION "Mena" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Appearance sample", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Mon Mar 16 17:10:15 2009 @@ -206,8 +206,8 @@ IDS_CMT_NOTEPAD "Launch Text Editor" IDS_CMT_RDESKTOP "Launch Remote Desktop" IDS_CMT_REGEDIT "Launch Registry Editor" + IDS_CMT_SCREENSHOT "Take screenshot" IDS_CMT_SERVMAN "Launch Service Manager" - IDS_CMT_SCREENSHOT "Take screenshot" IDS_CMT_WORDPAD "Launch Document Editor" END @@ -222,8 +222,8 @@ BEGIN IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "Character Map" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" - IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END STRINGTABLE @@ -259,6 +259,7 @@ IDS_SHORT_CMD "Command Prompt.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" @@ -270,11 +271,10 @@ IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" - IDS_SHORT_SNDVOL32 "Volume Control.lnk" - IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Mon Mar 16 17:10:15 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 09-02-2008 - * LAST CHANGE: 14-03-2009 + * LAST CHANGE: 16-03-2009 * THANKS TO : Filip Navara and Kamil Hornicek and all good people ;-) */ @@ -198,43 +198,43 @@ STRINGTABLE BEGIN - IDS_GAMES "Hry" - IDS_CMT_SOLITAIRE "Solitér" - IDS_CMT_WINEMINE "Míny" -END - -STRINGTABLE -BEGIN - IDS_SYS_TOOLS "Systémové nástroje" - IDS_CMT_CHARMAP "Mapa znakov" - IDS_CMT_KBSWITCH "Prepínaè rozloenia klávesnice" - IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" -END - - -STRINGTABLE -BEGIN - IDS_SYS_ACCESSIBILITY "Zjednoduenie ovládania" //Accessibility - IDS_CMT_MAGNIFY "Lupa" -END - -STRINGTABLE -BEGIN - IDS_SYS_ENTERTAINMENT "Entertainment" - IDS_CMT_MPLAY32 "Launch Multimedia Player" - IDS_CMT_SNDVOL32 "Launch Volume Control" -END - -STRINGTABLE -BEGIN - IDS_REACTOS_SETUP "Intalátor systému ReactOS" + IDS_GAMES "Hry" + IDS_CMT_SOLITAIRE "Solitér" + IDS_CMT_WINEMINE "Míny" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "Systémové nástroje" + IDS_CMT_CHARMAP "Mapa znakov" + IDS_CMT_KBSWITCH "Prepínaè rozloenia klávesnice" + IDS_CMT_DXDIAG "Spusti ReactX - diagnostický program" +END + + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Zjednoduenie ovládania" //Accessibility + IDS_CMT_MAGNIFY "Lupa" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Zábava" //Entertainment + IDS_CMT_MPLAY32 "Spusti Multimediálny prehrávaè" + IDS_CMT_SNDVOL32 "Stusti Ovládanie hlasitosti" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "Intalátor systému ReactOS" IDS_UNKNOWN_ERROR "Neznáma chyba" IDS_REGISTERING_COMPONENTS "Registrujem súèasti..." IDS_LOADLIBRARY_FAILED "LoadLibrary zlyhal: " IDS_GETPROCADDR_FAILED "GetProcAddr zlyhal: " IDS_REGSVR_FAILED "DllRegisterServer zlyhal: " IDS_DLLINSTALL_FAILED "DllInstall zlyhal: " - IDS_TIMEOUT "Vypral èasový limit registrácie" + IDS_TIMEOUT "Vypral èasový limit registrácie" IDS_REASON_UNKNOWN "" END @@ -259,24 +259,24 @@ IDS_SHORT_KBSWITCH "Prepínaè rozloenia klávesnice.lnk" IDS_SHORT_EVENTVIEW "Zobrazovaè udalostí.lnk" IDS_SHORT_MSCONFIG "Program na konfiguráciu systému.lnk" - IDS_SHORT_SNDVOL32 "Volume Control.lnk" - IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" -END - -STRINGTABLE -BEGIN - IDS_WZD_NAME "Intalácia nemôe pokraèova, kým nezadáte svoje meno." - IDS_WZD_SETCOMPUTERNAME "Intalátor nedokázal nastavi názov poèítaèa." - IDS_WZD_COMPUTERNAME "Intalácia nemôe pokraèova, kým nezadáte názov poèítaèa." - IDS_WZD_PASSWORDEMPTY "Musíte zada heslo!" - IDS_WZD_PASSWORDMATCH "Zadané heslá nesúhlasia. Zadajte poadované heslo znovu." - IDS_WZD_PASSWORDCHAR "Zadané heslo obsahuje nepovolené znaky. Zadajte upravené heslo." - IDS_WZD_LOCALTIME "Intalátor nedokázal nastavi èas." -END - -STRINGTABLE -BEGIN - IDS_STATUS_INSTALL_DEV "Intalujem zariadenia..." + IDS_SHORT_SNDVOL32 "Ovládanie hlasitosti.lnk" //Volume Control + IDS_SHORT_DXDIAG "Diagnostika ReactX.lnk" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "Intalácia nemôe pokraèova, kým nezadáte svoje meno." + IDS_WZD_SETCOMPUTERNAME "Intalátor nedokázal nastavi názov poèítaèa." + IDS_WZD_COMPUTERNAME "Intalácia nemôe pokraèova, kým nezadáte názov poèítaèa." + IDS_WZD_PASSWORDEMPTY "Musíte zada heslo!" + IDS_WZD_PASSWORDMATCH "Zadané heslá nesúhlasia. Zadajte poadované heslo znovu." + IDS_WZD_PASSWORDCHAR "Zadané heslo obsahuje nepovolené znaky. Zadajte upravené heslo." + IDS_WZD_LOCALTIME "Intalátor nedokázal nastavi èas." +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Intalujem zariadenia..." END /* EOF */

1 0

[cwittich] 40060: -add wlan service to registry -add wlansvc and wlapapi_winetest to bootcd -add some parameter checks to WlanCloseHandle -halfplement WlanOpenHandle
by cwittich＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: cwittich Date: Mon Mar 16 16:40:25 2009 New Revision: 40060 URL: http://svn.reactos.org/svn/reactos?rev=40060&view=rev Log: -add wlan service to registry -add wlansvc and wlapapi_winetest to bootcd -add some parameter checks to WlanCloseHandle -halfplement WlanOpenHandle Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/wlanapi/main.c trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild trunk/reactos/dll/win32/wlanapi/wlanapi.spec trunk/reactos/include/reactos/idl/wlansvc.idl Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Mar 16 16:40:25 2009 @@ -1041,6 +1041,17 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Type",0x00010001,0x00000110 +; WLAN service +HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","DependOnService",0x00010000,"RPCSS" +HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","DisplayName",0x00000000,"WLAN Service" +HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Description",0x00000000,"WLAN Service" +HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Group",0x00000000,"TDI" +HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","ImagePath",0x00020000,"%SystemRoot%\system32\wlansvc.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Type",0x00010001,0x00000110 + ; Simple TCP services HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Description",0x00000000,"Supports the following TCP/IP services: Chargen, Daytime, Discard, Echo, QOTD" HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","DisplayName",0x00000000,"Simple TCP/IP Services" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Mar 16 16:40:25 2009 @@ -86,6 +86,7 @@ base\services\tcpsvcs\tcpsvcs.exe 1 base\services\tcpsvcs\quotes 5 base\services\umpnpmgr\umpnpmgr.exe 1 +base\services\wlansvc\wlansvc.exe 1 base\setup\setup\setup.exe 1 base\setup\vmwinst\vmwinst.exe 1 @@ -746,6 +747,7 @@ modules\rostests\winetests\winhttp\winhttp_winetest.exe 7 optional modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional +modules\rostests\winetests\wlanapi\wlanapi_winetest.exe 7 optional modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Mon Mar 16 16:40:25 2009 @@ -23,8 +23,62 @@ #include <windows.h> #include "wlansvc_c.h" -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); + +handle_t __RPC_USER +WLANSVC_HANDLE_bind(WLANSVC_HANDLE szMachineName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS Status; + + TRACE("RPC_SERVICE_STATUS_HANDLE_bind() called\n"); + + Status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + szMachineName, + L"\\pipe\\trkwks", + NULL, + &pszStringBinding); + if (Status != RPC_S_OK) + { + ERR("RpcStringBindingCompose returned 0x%x\n", Status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + Status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (Status != RPC_S_OK) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", Status); + } + + Status = RpcStringFreeW(&pszStringBinding); + if (Status != RPC_S_OK) + { + ERR("RpcStringFree returned 0x%x\n", Status); + } + + return hBinding; +} + +void __RPC_USER +WLANSVC_HANDLE_unbind(WLANSVC_HANDLE szMachineName, + handle_t hBinding) +{ + RPC_STATUS Status; + + TRACE("WLANSVC_HANDLE_unbind() called\n"); + + Status = RpcBindingFree(&hBinding); + if (Status != RPC_S_OK) + { + ERR("RpcBindingFree returned 0x%x\n", Status); + } +} PVOID WINAPI @@ -38,6 +92,34 @@ WlanFreeMemory(IN PVOID pMem) { HeapFree(GetProcessHeap(), 0, pMem); +} + +DWORD +WINAPI +WlanOpenHandle(IN DWORD dwClientVersion, + PVOID pReserved, + OUT DWORD *pdwNegotiatedVersion, + OUT HANDLE *phClientHandle) +{ + DWORD dwError = ERROR_SUCCESS; + + if ((pReserved != NULL) || (pdwNegotiatedVersion == NULL) || (phClientHandle == NULL)) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + dwError = _RpcOpenHandle(NULL, + dwClientVersion, + pdwNegotiatedVersion, + (WLANSVC_RPC_HANDLE) phClientHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RpcExceptionCode(); + } + RpcEndExcept; + + return dwError; } DWORD @@ -46,6 +128,9 @@ PVOID pReserved) { DWORD dwError = ERROR_SUCCESS; + + if ((pReserved != NULL) || (hClientHandle == NULL)) + return ERROR_INVALID_PARAMETER; RpcTryExcept { Modified: trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/wlanapi.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] Mon Mar 16 16:40:25 2009 @@ -3,6 +3,7 @@ <include base="wlanapi">.</include> <include base="wlansvc_client">.</include> <library>wlansvc_client</library> + <library>wine</library> <library>kernel32</library> <library>rpcrt4</library> <library>pseh</library> Modified: trunk/reactos/dll/win32/wlanapi/wlanapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/wlanapi.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] Mon Mar 16 16:40:25 2009 @@ -15,7 +15,7 @@ @ stub WlanGetProfileList @ stub WlanGetSecuritySettings @ stub WlanIhvControl -@ stub WlanOpenHandle +@ stdcall WlanOpenHandle (long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter @ stub WlanQueryInterface @ stub WlanReasonCodeToString Modified: trunk/reactos/include/reactos/idl/wlansvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wlansv… ============================================================================== --- trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] Mon Mar 16 16:40:25 2009 @@ -7,6 +7,7 @@ typedef [context_handle] PVOID WLANSVC_RPC_HANDLE; typedef WLANSVC_RPC_HANDLE* LPWLANSVC_RPC_HANDLE; +typedef [handle] LPWSTR WLANSVC_HANDLE; /* FIXME */ typedef struct struct_C { @@ -46,7 +47,7 @@ { /* Function: 0x00 */ DWORD _RpcOpenHandle( - [in] wchar_t * arg_1, + [in] WLANSVC_HANDLE szMachineName, [in] DWORD dwClientVersion, [in, out] DWORD* pdwNegotiatedVersion, [in, out] LPWLANSVC_RPC_HANDLE phClientHandle);

1 0

[cwittich] 40059: more precise error descriptions
by cwittich＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: cwittich Date: Mon Mar 16 16:39:03 2009 New Revision: 40059 URL: http://svn.reactos.org/svn/reactos?rev=40059&view=rev Log: more precise error descriptions Modified: trunk/rostests/winetests/wlanapi/wlanapi.c Modified: trunk/rostests/winetests/wlanapi/wlanapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wlanapi/wlanapi… ============================================================================== --- trunk/rostests/winetests/wlanapi/wlanapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wlanapi/wlanapi.c [iso-8859-1] Mon Mar 16 16:39:03 2009 @@ -46,15 +46,15 @@ /* invalid pdwNegotiatedVersion */ ret = WlanOpenHandle(1, NULL, NULL, &hClientHandle); - ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* invalid hClientHandle */ ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* invalid pReserved */ ret = WlanOpenHandle(1, (PVOID) 1, &dwNegotiatedVersion, &hClientHandle); - ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } static void WlanCloseHandle_test(void)

1 0

[janderwald] 40058: - Fix memory leak - Fix memory corruptions - Does not fix es1370mp / es1371mp driver (qemu / vmware)
by janderwald＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: janderwald Date: Mon Mar 16 16:12:14 2009 New Revision: 40058 URL: http://svn.reactos.org/svn/reactos?rev=40058&view=rev Log: - Fix memory leak - Fix memory corruptions - Does not fix es1370mp / es1371mp driver (qemu / vmware) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Mon Mar 16 16:12:14 2009 @@ -468,10 +468,11 @@ DPRINT("Pin %p\n", Pin); } - DPRINT1("CreatePinWorkerRoutine completing irp\n"); + DPRINT1("CreatePinWorkerRoutine completing irp %p\n", WorkerContext->Irp); WorkerContext->Irp->IoStatus.Status = Status; WorkerContext->Irp->IoStatus.Information = 0; IoCompleteRequest(WorkerContext->Irp, IO_SOUND_INCREMENT); + ExFreePool(WorkerContext); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] Mon Mar 16 16:12:14 2009 @@ -215,10 +215,24 @@ return STATUS_INSUFFICIENT_RESOURCES; } - RtlCopyMemory(NewTranslatedResources, This->TranslatedResourceList, sizeof(CM_RESOURCE_LIST) + (This->TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + RtlCopyMemory(NewTranslatedResources, This->TranslatedResourceList, sizeof(CM_RESOURCE_LIST)); + if (This->TranslatedResourceList[0].List->PartialResourceList.Count > 1) + { + RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[0], + &This->TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[0], + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * This->TranslatedResourceList->List[0].PartialResourceList.Count); + } + RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->TranslatedResourceList[0].List->PartialResourceList.Count], Translated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - RtlCopyMemory(NewUntranslatedResources, This->UntranslatedResourceList, sizeof(CM_RESOURCE_LIST) + (This->UntranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + RtlCopyMemory(NewUntranslatedResources, This->UntranslatedResourceList, sizeof(CM_RESOURCE_LIST)); + if (This->UntranslatedResourceList[0].List->PartialResourceList.Count > 1) + { + RtlCopyMemory(&NewUntranslatedResources->List[0].PartialResourceList.PartialDescriptors[0], + &This->UntranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[0], + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * This->UntranslatedResourceList->List[0].PartialResourceList.Count); + } + RtlCopyMemory(&NewUntranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->UntranslatedResourceList[0].List->PartialResourceList.Count], Untranslated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); FreeItem(This->TranslatedResourceList, TAG_PORTCLASS); @@ -255,7 +269,14 @@ if (!NewTranslatedResources) return STATUS_INSUFFICIENT_RESOURCES; - RtlCopyMemory(NewTranslatedResources, This->TranslatedResourceList, sizeof(CM_RESOURCE_LIST) + (This->TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + RtlCopyMemory(NewTranslatedResources, This->TranslatedResourceList, sizeof(CM_RESOURCE_LIST)); + if (This->TranslatedResourceList[0].List->PartialResourceList.Count > 1) + { + RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[0], + &This->TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[0], + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * This->TranslatedResourceList->List[0].PartialResourceList.Count); + } + RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->TranslatedResourceList[0].List->PartialResourceList.Count], Translated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); FreeItem(This->TranslatedResourceList, TAG_PORTCLASS); @@ -336,7 +357,10 @@ /* Initialize */ - NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + (TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + NewTranslatedSize = sizeof(CM_RESOURCE_LIST); + if (TranslatedResourceList[0].List->PartialResourceList.Count > 1) + NewTranslatedSize += (TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + NewTranslatedResources = AllocateItem(PoolType, NewTranslatedSize, TAG_PORTCLASS); if (!NewTranslatedResources) { @@ -344,7 +368,10 @@ return STATUS_INSUFFICIENT_RESOURCES; } - NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) + (UntranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + NewUntranslatedSize = sizeof(CM_RESOURCE_LIST); + if (UntranslatedResourceList[0].List->PartialResourceList.Count > 1) + NewUntranslatedSize += (UntranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + NewUntranslatedResources = AllocateItem(PoolType, NewUntranslatedSize, TAG_PORTCLASS); if (!NewUntranslatedResources) { @@ -353,8 +380,8 @@ return STATUS_INSUFFICIENT_RESOURCES; } - RtlCopyMemory(NewTranslatedResources, TranslatedResourceList, sizeof(CM_RESOURCE_LIST) + (TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - RtlCopyMemory(NewUntranslatedResources, UntranslatedResourceList, sizeof(CM_RESOURCE_LIST) + (UntranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + RtlCopyMemory(NewTranslatedResources, TranslatedResourceList, NewTranslatedSize); + RtlCopyMemory(NewUntranslatedResources, UntranslatedResourceList, NewUntranslatedSize); NewList->lpVtbl = (IResourceListVtbl*)&vt_ResourceListVtbl; NewList->ref = 1;

1 0

[cwittich] 40057: add some wlanapi tests
by cwittich＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: cwittich Date: Mon Mar 16 15:15:02 2009 New Revision: 40057 URL: http://svn.reactos.org/svn/reactos?rev=40057&view=rev Log: add some wlanapi tests Added: trunk/rostests/winetests/wlanapi/ (with props) trunk/rostests/winetests/wlanapi/testlist.c (with props) trunk/rostests/winetests/wlanapi/wlanapi.c (with props) trunk/rostests/winetests/wlanapi/wlanapi.rbuild (with props) Modified: trunk/rostests/winetests/directory.rbuild Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… ============================================================================== --- trunk/rostests/winetests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/directory.rbuild [iso-8859-1] Mon Mar 16 15:15:02 2009 @@ -232,6 +232,9 @@ <directory name="wintrust"> <xi:include href="wintrust/wintrust.rbuild" /> </directory> + <directory name="wlanapi"> + <xi:include href="wlanapi/wlanapi.rbuild" /> + </directory> <directory name="wldap32"> <xi:include href="wldap32/wldap32.rbuild" /> </directory> Propchange: trunk/rostests/winetests/wlanapi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Mar 16 15:15:02 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/winetests/wlanapi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/winetests/wlanapi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/winetests/wlanapi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/winetests/wlanapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wlanapi/testlis… ============================================================================== --- trunk/rostests/winetests/wlanapi/testlist.c (added) +++ trunk/rostests/winetests/wlanapi/testlist.c [iso-8859-1] Mon Mar 16 15:15:02 2009 @@ -1,0 +1,15 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_wlanapi(void); + +const struct test winetest_testlist[] = +{ + { "wlanapi", func_wlanapi }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/wlanapi/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wlanapi/wlanapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wlanapi/wlanapi… ============================================================================== --- trunk/rostests/winetests/wlanapi/wlanapi.c (added) +++ trunk/rostests/winetests/wlanapi/wlanapi.c [iso-8859-1] Mon Mar 16 15:15:02 2009 @@ -1,0 +1,82 @@ +/* + * Wlanapi - tests + * + * Copyright 2009 Christoph von Wittich + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wlanapi.h" + +#include "wine/test.h" + +static void WlanOpenHandle_test(void) +{ + DWORD ret; + DWORD dwNegotiatedVersion; + HANDLE hClientHandle; + + /* correct call to determine if WlanSvc is running */ + ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, &hClientHandle); + if (ret == ERROR_SERVICE_EXISTS) + { + skip("Skipping wlanapi tests, WlanSvc is not running\n"); + return; + } + ok(ret == ERROR_SUCCESS, "WlanOpenHandle failed, error %d\n", ret); + WlanCloseHandle(hClientHandle, NULL); + + /* invalid pdwNegotiatedVersion */ + ret = WlanOpenHandle(1, NULL, NULL, &hClientHandle); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid hClientHandle */ + ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid pReserved */ + ret = WlanOpenHandle(1, (PVOID) 1, &dwNegotiatedVersion, &hClientHandle); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); +} + +static void WlanCloseHandle_test(void) +{ + DWORD ret; + HANDLE hClientHandle = (HANDLE) 0xdeadbeef; + + /* invalid pReserved */ + ret = WlanCloseHandle(hClientHandle, (PVOID) 1); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid hClientHandle */ + ret = WlanCloseHandle(NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected failure\n"); + + /* invalid hClientHandle */ + ret = WlanCloseHandle(hClientHandle, NULL); + ok(ret == ERROR_INVALID_HANDLE, "expected failure\n"); +} + +START_TEST(wlanapi) +{ + WlanOpenHandle_test(); + WlanCloseHandle_test(); +} Propchange: trunk/rostests/winetests/wlanapi/wlanapi.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wlanapi/wlanapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wlanapi/wlanapi… ============================================================================== --- trunk/rostests/winetests/wlanapi/wlanapi.rbuild (added) +++ trunk/rostests/winetests/wlanapi/wlanapi.rbuild [iso-8859-1] Mon Mar 16 15:15:02 2009 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="wlanapi_winetest" type="win32cui" installbase="bin" installname="wlanapi_winetest.exe" allowwarnings="true"> + <compilerflag compiler="cc">-Wno-format</compilerflag> + <include base="wininet_winetest">.</include> + <define name="__ROS_LONG64__" /> + <library>wine</library> + <library>wlanapi</library> + <library>kernel32</library> + <library>ntdll</library> + <file>wlanapi.c</file> + <file>testlist.c</file> +</module> +</group> Propchange: trunk/rostests/winetests/wlanapi/wlanapi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 40056: add missing types
by cwittich＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: cwittich Date: Mon Mar 16 12:50:56 2009 New Revision: 40056 URL: http://svn.reactos.org/svn/reactos?rev=40056&view=rev Log: add missing types Modified: trunk/reactos/include/psdk/ntddndis.h Modified: trunk/reactos/include/psdk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddndis.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] Mon Mar 16 12:50:56 2009 @@ -2,15 +2,80 @@ #define _NTDDNDIS_ #endif +/* Defines */ +#define NDIS_802_11_LENGTH_SSID 32 +#define NDIS_802_11_LENGTH_RATES 8 + #define OID_802_11_BSSID_LIST 0x0D010217 #define OID_802_11_BSSID_LIST_SCAN 0x0D01011A +/* Enumerations */ +typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE +{ + Ndis802_11IBSS, + Ndis802_11Infrastructure, + Ndis802_11AutoUnknown, + Ndis802_11InfrastructureMax +} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE; + +typedef enum _NDIS_802_11_NETWORK_TYPE +{ + Ndis802_11FH, + Ndis802_11DS, + Ndis802_11OFDM5, + Ndis802_11OFDM24, + Ndis802_11Automode, + Ndis802_11NetworkTypeMax +} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE; + +/* Typedefs */ typedef struct _NDIS_OBJECT_HEADER { - UCHAR Type; - UCHAR Revision; + UCHAR Type; + UCHAR Revision; USHORT Size; } NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER; + +typedef UCHAR NDIS_802_11_MAC_ADDRESS[6]; +typedef LONG NDIS_802_11_RSSI; +typedef UCHAR NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; + +typedef struct _NDIS_802_11_SSID +{ + ULONG SsidLength; + UCHAR Ssid[NDIS_802_11_LENGTH_SSID]; +} NDIS_802_11_SSID, *PNDIS_802_11_SSID; + +typedef struct _NDIS_802_11_CONFIGURATION_FH +{ + ULONG Length; + ULONG HopPattern; + ULONG HopSet; + ULONG DwellTime; +} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH; + +typedef struct _NDIS_802_11_CONFIGURATION +{ + ULONG Length; + ULONG BeaconPeriod; + ULONG ATIMWindow; + ULONG DSConfig; + NDIS_802_11_CONFIGURATION_FH FHConfig; +} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION; + +typedef struct _NDIS_WLAN_BSSID +{ + ULONG Length; + NDIS_802_11_MAC_ADDRESS MacAddress; + UCHAR Reserved[2]; + NDIS_802_11_SSID Ssid; + ULONG Privacy; + NDIS_802_11_RSSI Rssi; + NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; + NDIS_802_11_CONFIGURATION Configuration; + NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; + NDIS_802_11_RATES SupportedRates; +} NDIS_WLAN_BSSID, *PNDIS_WLAN_BSSID; typedef struct _NDIS_802_11_BSSID_LIST {

1 0

[cwittich] 40055: -implement WlanScan and WlanEnumInterfaces -add some more NDIS definitions
by cwittich＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: cwittich Date: Mon Mar 16 12:22:25 2009 New Revision: 40055 URL: http://svn.reactos.org/svn/reactos?rev=40055&view=rev Log: -implement WlanScan and WlanEnumInterfaces -add some more NDIS definitions Modified: trunk/reactos/base/services/wlansvc/rpcserver.c trunk/reactos/dll/win32/wlanapi/main.c trunk/reactos/dll/win32/wlanapi/wlanapi.spec trunk/reactos/include/psdk/ntddndis.h trunk/reactos/include/psdk/wlanapi.h Modified: trunk/reactos/base/services/wlansvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/rpcs… ============================================================================== --- trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] Mon Mar 16 12:22:25 2009 @@ -112,6 +112,21 @@ PDOT11_SSID pDot11Ssid, PWLAN_RAW_DATA pIeData) { + /* + DWORD dwBytesReturned; + HANDLE hDevice; + ULONG OidCode = OID_802_11_BSSID_LIST_SCAN; + PNDIS_802_11_BSSID_LIST pBssIDList; + + DeviceIoControl(hDevice, + IOCTL_NDIS_QUERY_GLOBAL_STATS, + &OidCode, + sizeof(ULONG), + NULL, + 0, + &dwBytesReturned, + NULL); +*/ UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -173,7 +188,6 @@ return ERROR_CALL_NOT_IMPLEMENTED; } - DWORD _RpcSetProfileEapUserData( WLANSVC_RPC_HANDLE hClientHandle, GUID *pInterfaceGuid, Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Mon Mar 16 12:22:25 2009 @@ -60,12 +60,61 @@ return dwError; } +DWORD +WINAPI +WlanEnumInterfaces(IN HANDLE hClientHandle, + PVOID pReserved, + OUT PWLAN_INTERFACE_INFO_LIST *ppInterfaceList) +{ + DWORD dwError = ERROR_SUCCESS; + + if ((pReserved != NULL) || (ppInterfaceList == NULL) || (hClientHandle == NULL)) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + _RpcEnumInterfaces(hClientHandle, ppInterfaceList); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RpcExceptionCode(); + } + RpcEndExcept; + + return dwError; +} + +DWORD +WINAPI +WlanScan(IN HANDLE hClientHandle, + IN GUID *pInterfaceGuid, + IN PDOT11_SSID pDot11Ssid, + IN PWLAN_RAW_DATA pIeData, + PVOID pReserved) +{ + DWORD dwError = ERROR_SUCCESS; + + if ((pReserved != NULL) || (pInterfaceGuid == NULL) || (hClientHandle == NULL)) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + _RpcScan(hClientHandle, pInterfaceGuid, pDot11Ssid, pIeData); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RpcExceptionCode(); + } + RpcEndExcept; + + return dwError; +} + void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } - void __RPC_USER midl_user_free(void __RPC_FAR * ptr) Modified: trunk/reactos/dll/win32/wlanapi/wlanapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/wlanapi.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] Mon Mar 16 12:22:25 2009 @@ -1,9 +1,9 @@ @ stdcall WlanAllocateMemory (long) -@ stub WlanCloseHandle +@ stdcall WlanCloseHandle (ptr ptr) @ stub WlanConnect @ stub WlanDeleteProfile @ stub WlanDisconnect -@ stub WlanEnumInterfaces +@ stdcall WlanEnumInterfaces (ptr ptr ptr) @ stub WlanExtractPsdIEDataList @ stdcall WlanFreeMemory (ptr) @ stub WlanGetAvailableNetworkList @@ -22,7 +22,7 @@ @ stub WlanRegisterNotification @ stub WlanRenameProfile @ stub WlanSaveTemporaryProfile -@ stub WlanScan +@ stdcall WlanScan (ptr ptr ptr ptr ptr) @ stub WlanSetAutoConfigParameter @ stub WlanSetFilterList @ stub WlanSetInterface Modified: trunk/reactos/include/psdk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddndis.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] Mon Mar 16 12:22:25 2009 @@ -1,6 +1,9 @@ #ifndef _NTDDNDIS_ #define _NTDDNDIS_ #endif + +#define OID_802_11_BSSID_LIST 0x0D010217 +#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A typedef struct _NDIS_OBJECT_HEADER { @@ -9,4 +12,9 @@ USHORT Size; } NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER; +typedef struct _NDIS_802_11_BSSID_LIST +{ + ULONG NumberOfItems; + NDIS_WLAN_BSSID Bssid[1]; +} NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST; Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Mon Mar 16 12:22:25 2009 @@ -190,6 +190,8 @@ VOID WINAPI WlanFreeMemory(PVOID pMemory); DWORD WINAPI WlanOpenHandle(IN DWORD dwClientVersion, PVOID pReserved, OUT DWORD *pdwNegotiatedVersion, OUT HANDLE *phClientHandle); DWORD WINAPI WlanCloseHandle(IN HANDLE hClientHandle, PVOID pReserved); +DWORD WINAPI WlanEnumInterfaces(IN HANDLE hClientHandle, PVOID pReserved, OUT PWLAN_INTERFACE_INFO_LIST *ppInterfaceList); +DWORD WINAPI WlanScan(IN HANDLE hClientHandle, IN GUID *pInterfaceGuid, IN PDOT11_SSID pDot11Ssid, IN PWLAN_RAW_DATA pIeData, PVOID pReserved); #endif #ifdef __cplusplus

1 0

[cwittich] 40054: implement WlanCloseHandle
by cwittich＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: cwittich Date: Mon Mar 16 11:23:58 2009 New Revision: 40054 URL: http://svn.reactos.org/svn/reactos?rev=40054&view=rev Log: implement WlanCloseHandle Modified: trunk/reactos/dll/win32/wlanapi/main.c trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild trunk/reactos/include/psdk/wlanapi.h Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Mon Mar 16 11:23:58 2009 @@ -18,9 +18,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +/* INCLUDES ****************************************************************/ #include <windows.h> -#include <wlanapi.h> +#include "wlansvc_c.h" +#define NDEBUG +#include <debug.h> PVOID WINAPI @@ -36,3 +40,36 @@ HeapFree(GetProcessHeap(), 0, pMem); } +DWORD +WINAPI +WlanCloseHandle(IN HANDLE hClientHandle, + PVOID pReserved) +{ + DWORD dwError = ERROR_SUCCESS; + + RpcTryExcept + { + _RpcCloseHandle(hClientHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RpcExceptionCode(); + } + RpcEndExcept; + + return dwError; +} + +void __RPC_FAR * __RPC_USER +midl_user_allocate(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER +midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + Modified: trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/wlanapi.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] Mon Mar 16 11:23:58 2009 @@ -1,7 +1,11 @@ <module name="wlanapi" type="win32dll" baseaddress="${BASEADDRESS_WLANAPI}" installbase="system32" installname="wlanapi.dll" entrypoint="0"> <importlibrary definition="wlanapi.spec" /> <include base="wlanapi">.</include> + <include base="wlansvc_client">.</include> + <library>wlansvc_client</library> <library>kernel32</library> + <library>rpcrt4</library> + <library>pseh</library> <library>ntdll</library> <file>main.c</file>  Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Mon Mar 16 11:23:58 2009 @@ -188,6 +188,8 @@ #if !defined(__midl) && !defined(__WIDL__) PVOID WINAPI WlanAllocateMemory(DWORD dwSize); VOID WINAPI WlanFreeMemory(PVOID pMemory); +DWORD WINAPI WlanOpenHandle(IN DWORD dwClientVersion, PVOID pReserved, OUT DWORD *pdwNegotiatedVersion, OUT HANDLE *phClientHandle); +DWORD WINAPI WlanCloseHandle(IN HANDLE hClientHandle, PVOID pReserved); #endif #ifdef __cplusplus

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs