Sync to Wine-20050310: Marcelo Duarte wine-devel@bol.com.br - Use "MS Shell Dlg" everywhere except for Japanese. Alex Villacis Lasso a_villacis@palosanto.com - Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL for LANG_SPANISH in all resources, so that Spanish locales other than Spain also use Spanish resources. Modified: trunk/reactos/lib/mpr/mpr_De.rc Modified: trunk/reactos/lib/mpr/mpr_En.rc Modified: trunk/reactos/lib/mpr/mpr_Es.rc Deleted: trunk/reactos/lib/mpr/mpr_Fr.rc Added: trunk/reactos/lib/mpr/mpr_Fr.rc Modified: trunk/reactos/lib/mpr/mpr_Pt.rc Deleted: trunk/reactos/lib/mpr/netspi.h Added: trunk/reactos/lib/mpr/netspi.h _____
Modified: trunk/reactos/lib/mpr/mpr_De.rc --- trunk/reactos/lib/mpr/mpr_De.rc 2005-03-14 22:24:35 UTC (rev 14078) +++ trunk/reactos/lib/mpr/mpr_De.rc 2005-03-14 22:28:58 UTC (rev 14079) @@ -28,7 +28,7 @@
IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Netzwerkkennung eingeben" -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" { LTEXT "Bitte geben Sie Benutzernamen und Kennwort ein:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 _____
Modified: trunk/reactos/lib/mpr/mpr_En.rc --- trunk/reactos/lib/mpr/mpr_En.rc 2005-03-14 22:24:35 UTC (rev 14078) +++ trunk/reactos/lib/mpr/mpr_En.rc 2005-03-14 22:28:58 UTC (rev 14079) @@ -28,7 +28,7 @@
IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Enter Network Password" -FONT 8, "Helv" +FONT 8, "MS Shell Dlg" { LTEXT "Please enter your username and password:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 _____
Modified: trunk/reactos/lib/mpr/mpr_Es.rc --- trunk/reactos/lib/mpr/mpr_Es.rc 2005-03-14 22:24:35 UTC (rev 14078) +++ trunk/reactos/lib/mpr/mpr_Es.rc 2005-03-14 22:28:58 UTC (rev 14079) @@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE { _____
Deleted: trunk/reactos/lib/mpr/mpr_Fr.rc --- trunk/reactos/lib/mpr/mpr_Fr.rc 2005-03-14 22:24:35 UTC (rev 14078) +++ trunk/reactos/lib/mpr/mpr_Fr.rc 2005-03-14 22:28:58 UTC (rev 14079) @@ -1,47 +0,0 @@
-/* - * MPR dll resources - * French language support - * - * Copyright (C) 2005 Jonathan Ernst - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Le rÚseau entier" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Entrez le mot de passe rÚseau" -FONT 8, "Helv" -{ - LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Utilisateur", -1, 40, 66, 50, 10 - LTEXT "Mot de passe", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Enregistrer ce mot de passe (risquÚ)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuler", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} _____
Copied: trunk/reactos/lib/mpr/mpr_Fr.rc (from rev 14078, vendor/wine/dlls/mpr/current/mpr_Fr.rc) _____
Modified: trunk/reactos/lib/mpr/mpr_Pt.rc --- trunk/reactos/lib/mpr/mpr_Pt.rc 2005-03-14 22:24:35 UTC (rev 14078) +++ trunk/reactos/lib/mpr/mpr_Pt.rc 2005-03-14 22:28:58 UTC (rev 14079) @@ -24,3 +24,23 @@
{ IDS_ENTIRENETWORK "Toda a rede" } + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Entre a senha da rede" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Por favor, entre como o nome de usu?írio e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Usu?írio", -1, 40, 66, 50, 10 + LTEXT "Senha", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Salvar esta senha (Inseguro)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} _____
Deleted: trunk/reactos/lib/mpr/netspi.h --- trunk/reactos/lib/mpr/netspi.h 2005-03-14 22:24:35 UTC (rev 14078) +++ trunk/reactos/lib/mpr/netspi.h 2005-03-14 22:28:58 UTC (rev 14079) @@ -1,153 +0,0 @@
-/* - * MPR - Network provider services - * Warning: this file apparently existed as part of the Win98 DDK. Some of - * the declarations in it conflict with those in the Platform SDK's npapi.h, - * therefore this header was made private. Don't try to include both headers. - * - * Copyright (C) 1999 Ulrich Weigand - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _NETSPI_H_ -#define _NETSPI_H_ - -#include "windef.h" -#include "winnetwk.h" - -/* - * Note: The Unicode variants of all these routines/structures - * apparently don't exist, at least not in Win95 ... - */ - -#define HPROVIDER LPVOID -typedef HPROVIDER *PHPROVIDER; - -typedef struct -{ - DWORD cbStructure; - HWND hwndOwner; - LPCSTR lpResource; - LPSTR lpUsername; - DWORD cbUsername; - LPSTR lpPassword; - DWORD cbPassword; - LPSTR lpOrgUnit; - DWORD cbOrgUnit; - LPCSTR lpOUTitle; - LPCSTR lpExplainText; - LPCSTR lpDefaultUserName; - DWORD dwFlags; - -} AUTHDLGSTRUCTA, *LPAUTHDLGSTRUCTA; - -DECL_WINELIB_TYPE_AW(AUTHDLGSTRUCT) -DECL_WINELIB_TYPE_AW(LPAUTHDLGSTRUCT) - -#define AUTHDLG_ENABLECACHE 0x00000001 -#define AUTHDLG_CHECKCACHE 0x00000002 -#define AUTHDLG_CACHEINVALID 0x00000004 -#define AUTHDLG_USE_DEFAULT_NAME 0x00000008 -#define AUTHDLG_CHECKDEFAULT_NAME 0x00000010 -#define AUTHDLG_LOGON 0x00000020 - -#define AUTHDLG_ENABLECACHE 0x00000001 -#define AUTHDLG_CHECKCACHE 0x00000002 -#define AUTHDLG_CACHEINVALID 0x00000004 -#define AUTHDLG_USE_DEFAULT_NAME 0x00000008 -#define AUTHDLG_CHECKDEFAULT_NAME 0x00000010 -#define AUTHDLG_LOGON 0x00000020 - -DWORD WINAPI NPSAuthenticationDialogA(LPAUTHDLGSTRUCTA); -#define NPSAuthenticationDialog WINELIB_NAME_AW(NPSAuthenticationDialog) -DWORD WINAPI NPSGetProviderHandleA(PHPROVIDER); -#define NPSGetProviderHandle WINELIB_NAME_AW(NPSGetProviderHandle) -DWORD WINAPI NPSGetProviderNameA(HPROVIDER,LPCSTR *); -#define NPSGetProviderName WINELIB_NAME_AW(NPSGetProviderName) -DWORD WINAPI NPSGetSectionNameA(HPROVIDER,LPCSTR *lpszSectionName); -#define NPSGetSectionName WINELIB_NAME_AW(NPSGetSectionName) -DWORD WINAPI NPSSetExtendedErrorA(DWORD,LPSTR); -#define NPSSetExtendedError WINELIB_NAME_AW(NPSSetExtendedError) -VOID WINAPI NPSSetCustomTextA(LPSTR); -#define NPSSetCustomText WINELIB_NAME_AW(NPSSetCustomText) -DWORD WINAPI NPSCopyStringA(LPCSTR,LPVOID,LPDWORD); -#define NPSCopyString WINELIB_NAME_AW(NPSCopyString) -DWORD WINAPI NPSDeviceGetNumberA(LPSTR,LPDWORD,LPDWORD); -#define NPSDeviceGetNumber WINELIB_NAME_AW(NPSDeviceGetNumber) -DWORD WINAPI NPSDeviceGetStringA(DWORD,DWORD,LPSTR,LPDWORD); -#define NPSDeviceGetString WINELIB_NAME_AW(NPSDeviceGetString) - - -enum NOTIFYTYPE { NotifyAddConnection, - NotifyCancelConnection, - NotifyGetConnectionPerformance }; - -#define NOTIFY_PRE 0x00 -#define NOTIFY_POST 0x01 - -typedef struct -{ - DWORD cbStructure; - DWORD dwNotifyStatus; - DWORD dwOperationStatus; - LPVOID lpNPContext; - -} NOTIFYINFO, *LPNOTIFYINFO; - -typedef struct -{ - DWORD cbStructure; - HWND hwndOwner; - NETRESOURCEA NetResource; - DWORD dwAddFlags; - LPSTR lpAccessName; - LPDWORD lpBufferSize; - DWORD dwResult; - DWORD dwAddContext; - -} NOTIFYADDA, *LPNOTIFYADDA; - -#define CONNECT_CTXT_RESTORE 0x00000001 -#define CONNECT_CTXT_GLOBAL 0x00000002 -#define CONNECT_CTXT_PROVIDER 0x00000004 -#define CONNECT_CTXT_SINGLE 0x00000008 - -typedef struct -{ - DWORD cbStructure; - LPSTR lpName; - LPSTR lpProvider; - DWORD dwFlags; - BOOL fForce; - -} NOTIFYCANCELA, *LPNOTIFYCANCELA; - -typedef struct -{ - DWORD cbStructure; - LPSTR lpRemoteName; - LPSTR lpProviderName; - LPNETCONNECTINFOSTRUCT lpNetConnectInfo; - -} NOTIFYPERFORMANCEA, *LPNOTIFYPERFORMANCEA; - -typedef DWORD (CALLBACK *NOTIFYCALLBACK)(LPNOTIFYINFO,LPVOID); - -DWORD WINAPI NPSNotifyRegisterA(enum NOTIFYTYPE,NOTIFYCALLBACK); -#define NPSNotifyRegister WINELIB_NAME_AW(NPSNotifyRegister) -LPVOID WINAPI NPSNotifyGetContextA(NOTIFYCALLBACK); -#define NPSNotifyGetContext WINELIB_NAME_AW(NPSNotifyGetContext) - -#endif /* _NETSPI_H_ */ _____
Copied: trunk/reactos/lib/mpr/netspi.h (from rev 14078, vendor/wine/dlls/mpr/current/netspi.h) Property changes on: trunk/reactos/lib/mpr/netspi.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native
-
gvg＠svn.reactos.com