[ros-diffs] [reactos] 01/01: [SDK][INCLUDE] Update msgdump.h and winxx.h (TreeView and ListView support)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c7dc4e3e136bfb9bfd1d2598af7780661f0802d
commit 0c7dc4e3e136bfb9bfd1d2598af7780661f0802d
Author: Katayama Hirofumi MZ
AuthorDate: Mon Jun 17 20:29:03 2019 +0900
Commit: Katayama Hirofumi MZ
CommitDate: Mon Jun 17 20:29:03 2019 +0900
[SDK][INCLUDE] Update msgdump.h and winxx.h (TreeView and ListView support)
---
sdk/include/reactos/msgdump.h | 2027 -
sdk/include/reactos/winxx.h | 908 --
2 files changed, 2860 insertions(+), 75 deletions(-)
diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h
index c81763b02e6..79341481d4e 100644
--- a/sdk/include/reactos/msgdump.h
+++ b/sdk/include/reactos/msgdump.h
@@ -5,7 +5,7 @@
* COPYRIGHT: Copyright 2018-2019 Katayama Hirofumi MZ
(katayama.hirofumi...@gmail.com)
*/
#ifndef _INC_MSGDUMP
-#define _INC_MSGDUMP6 /* Version 6 */
+#define _INC_MSGDUMP10 /* Version 10 */
/*
* NOTE: MD_msgdump function in this file provides Win32API message dump
feature.
@@ -1809,7 +1809,7 @@ static __inline void MSGDUMP_API
MD_Edit_OnSetWordBreakProc(HWND hwnd, EDITWORDBREAKPROC ewbprc)
{
MSGDUMP_TPRINTF(TEXT("%sEM_SETWORDBREAKPROC(hwnd:%p, ewbprc:%p)\n"),
-MSGDUMP_PREFIX, (void *)hwnd, (void *)ewbprc);
+MSGDUMP_PREFIX, (void *)hwnd, *(void **)&ewbprc);
}
static __inline EDITWORDBREAKPROC MSGDUMP_API
@@ -2630,13 +2630,1565 @@ MD_ScrollBar_OnGetScrollBarInfo(HWND hwnd,
LPSCROLLBARINFO lpsbi)
return FALSE;
}
+static __inline COLORREF MSGDUMP_API
+MD_ListView_OnGetBkColor(HWND hwnd)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_GETBKCOLOR(hwnd:%p)\n"),
+MSGDUMP_PREFIX, (void *)hwnd);
+return 0;
+}
+
+static __inline BOOL MSGDUMP_API
+MD_ListView_OnSetBkColor(HWND hwnd, COLORREF clrBk)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_SETBKCOLOR(hwnd:%p, clrBk:0x%08lX)\n"),
+MSGDUMP_PREFIX, (void *)hwnd, clrBk);
+return FALSE;
+}
+
+static __inline HIMAGELIST MSGDUMP_API
+MD_ListView_OnGetImageList(HWND hwnd, INT iImageList)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_GETIMAGELIST(hwnd:%p, iImageList:%d)\n"),
+MSGDUMP_PREFIX, (void *)hwnd, iImageList);
+return NULL;
+}
+
+static __inline HIMAGELIST MSGDUMP_API
+MD_ListView_OnSetImageList(HWND hwnd, INT iImageList, HIMAGELIST himl)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_SETIMAGELIST(hwnd:%p, iImageList:%d,
himl:%p)\n"),
+MSGDUMP_PREFIX, (void *)hwnd, iImageList, (void *)himl);
+return NULL;
+}
+
+static __inline INT MSGDUMP_API
+MD_ListView_OnGetItemCount(HWND hwnd)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_GETITEMCOUNT(hwnd:%p)\n"),
+MSGDUMP_PREFIX, (void *)hwnd);
+return 0;
+}
+
+static __inline BOOL MSGDUMP_API
+MD_ListView_OnGetItemA(HWND hwnd, LV_ITEMA *pitem)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_GETITEMA(hwnd:%p, pitem:%p)\n"),
+MSGDUMP_PREFIX, (void *)hwnd, (void *)pitem);
+return FALSE;
+}
+
+static __inline BOOL MSGDUMP_API
+MD_ListView_OnSetItemA(HWND hwnd, const LV_ITEMA *pitem)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_SETITEMA(hwnd:%p, pitem:%p)\n"),
+MSGDUMP_PREFIX, (void *)hwnd, (void *)pitem);
+return FALSE;
+}
+
+static __inline INT MSGDUMP_API
+MD_ListView_OnInsertItemA(HWND hwnd, const LV_ITEMA *pitem)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_INSERTITEMA(hwnd:%p, pitem:%p)\n"),
+MSGDUMP_PREFIX, (void *)hwnd, (void *)pitem);
+return 0;
+}
+
+static __inline BOOL MSGDUMP_API
+MD_ListView_OnDeleteItem(HWND hwnd, INT i)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_DELETEITEM(hwnd:%p, i:%d)\n"),
+MSGDUMP_PREFIX, (void *)hwnd, i);
+return FALSE;
+}
+
+static __inline BOOL MSGDUMP_API
+MD_ListView_OnDeleteAllItems(HWND hwnd)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_DELETEALLITEMS(hwnd:%p)\n"),
+MSGDUMP_PREFIX, (void *)hwnd);
+return FALSE;
+}
+
+static __inline BOOL MSGDUMP_API
+MD_ListView_OnGetCallbackMask(HWND hwnd)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_GETCALLBACKMASK(hwnd:%p)\n"),
+MSGDUMP_PREFIX, (void *)hwnd);
+return FALSE;
+}
+
+static __inline BOOL MSGDUMP_API
+MD_ListView_OnSetCallbackMask(HWND hwnd, UINT mask)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_SETCALLBACKMASK(hwnd:%p, mask:%u)\n"),
+MSGDUMP_PREFIX, (void *)hwnd, mask);
+return FALSE;
+}
+
+static __inline INT MSGDUMP_API
+MD_ListView_OnGetNextItem(HWND hwnd, INT i, UINT flags)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_GETNEXTITEM(hwnd:%p, i:%d, flags:%u)\n"),
+MSGDUMP_PREFIX, (void *)hwnd, i, flags);
+return 0;
+}
+
+static __inline INT MSGDUMP_API
+MD_ListView_OnFindItemA(HWND hwnd, INT iStart, const LV_FINDINFOA *plvfi)
+{
+MSGDUMP_TPRINTF(TEXT("%sLVM_FINDITEMA(hwnd:%p, iStart:%d, plvfi:%p)\n"),
+MSGDUMP_PREFIX, (void *)hwnd, iStart, (void *)plvfi);
+return 0;
+}
+
+static
[ros-diffs] [reactos] 01/01: [KERNEL32_APITEST] Improve SetComputerNameExW testcase (#1661)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5246d68f54b6392ef067c46cc8a334cbc23a479
commit c5246d68f54b6392ef067c46cc8a334cbc23a479
Author: Katayama Hirofumi MZ
AuthorDate: Mon Jun 17 20:33:31 2019 +0900
Commit: GitHub
CommitDate: Mon Jun 17 20:33:31 2019 +0900
[KERNEL32_APITEST] Improve SetComputerNameExW testcase (#1661)
Improve SetComputerNameExW testcase to check invalid characters. CORE-16122
---
.../apitests/kernel32/SetComputerNameExW.c | 201 ++---
1 file changed, 173 insertions(+), 28 deletions(-)
diff --git a/modules/rostests/apitests/kernel32/SetComputerNameExW.c
b/modules/rostests/apitests/kernel32/SetComputerNameExW.c
index 89ba26460a5..1b631da8c2f 100644
--- a/modules/rostests/apitests/kernel32/SetComputerNameExW.c
+++ b/modules/rostests/apitests/kernel32/SetComputerNameExW.c
@@ -37,31 +37,16 @@ static HKEY OpenComputerNameKey(void)
return NULL;
}
-START_TEST(SetComputerNameExW)
+static void DoTestComputerName(HKEY hKeyHN, HKEY hKeyCN, LPCWSTR pszNewName,
BOOL bValid)
{
-static const WCHAR szNewName[] = L"SRVROSTEST";
LONG Error;
BOOL ret;
-HKEY hKeyHN, hKeyCN;
DWORD cbData;
WCHAR szNVHostNameOld[MAX_PATH], szNVHostNameNew[MAX_PATH];
WCHAR szHostNameOld[MAX_PATH], szHostNameNew[MAX_PATH];
WCHAR szComputerNameOld[MAX_PATH], szComputerNameNew[MAX_PATH];
-/* Open keys */
-hKeyHN = OpenHostNameKey();
-ok(hKeyHN != NULL, "hKeyHN is NULL\n");
-hKeyCN = OpenComputerNameKey();
-ok(hKeyCN != NULL, "hKeyCN is NULL\n");
-if (!hKeyHN || !hKeyCN)
-{
-if (hKeyHN)
-RegCloseKey(hKeyHN);
-if (hKeyCN)
-RegCloseKey(hKeyCN);
-skip("Unable to open keys. Missing Admin rights?\n");
-return;
-}
+trace("Testing '%S':\n", pszNewName);
/* Get Old NV Hostname */
szNVHostNameOld[0] = UNICODE_NULL;
@@ -85,35 +70,62 @@ START_TEST(SetComputerNameExW)
ok(szComputerNameOld[0], "szComputerNameOld is empty\n");
/* Change the value */
-ret = SetComputerNameExW(ComputerNamePhysicalDnsHostname, szNewName);
-ok_int(ret, TRUE);
+SetLastError(0xDEADFACE);
+ret = SetComputerNameExW(ComputerNamePhysicalDnsHostname, pszNewName);
+ok_int(ret, bValid);
+Error = GetLastError();
+if (bValid)
+ok_long(Error, ERROR_SUCCESS);
+else
+ok_long(Error, ERROR_INVALID_PARAMETER);
/* Get New NV Hostname */
szNVHostNameNew[0] = UNICODE_NULL;
cbData = sizeof(szNVHostNameNew);
Error = RegQueryValueExW(hKeyHN, L"NV Hostname", NULL, NULL,
(LPBYTE)szNVHostNameNew, &cbData);
ok_long(Error, ERROR_SUCCESS);
-ok(szNVHostNameNew[0], "szNVHostNameNew is empty\n");
-ok(lstrcmpW(szNVHostNameNew, szNewName) == 0,
- "szNVHostNameNew '%S' should be szNewName '%S'\n", szNVHostNameNew,
szNewName);
+if (bValid)
+{
+ok(szNVHostNameNew[0], "szNVHostNameNew is empty\n");
+ok(lstrcmpW(szNVHostNameNew, pszNewName) == 0,
+ "szNVHostNameNew '%S' should be pszNewName '%S'\n",
szNVHostNameNew, pszNewName);
+}
/* Get New Hostname */
szHostNameNew[0] = UNICODE_NULL;
cbData = sizeof(szHostNameNew);
Error = RegQueryValueExW(hKeyHN, L"Hostname", NULL, NULL,
(LPBYTE)szHostNameNew, &cbData);
ok_long(Error, ERROR_SUCCESS);
-ok(szHostNameNew[0], "szHostNameNew is empty\n");
-ok(lstrcmpW(szHostNameNew, szHostNameOld) == 0,
- "szHostNameNew '%S' should be szHostNameOld '%S'\n", szHostNameNew,
szHostNameOld);
+if (bValid)
+{
+ok(szHostNameNew[0], "szHostNameNew is empty\n");
+ok(lstrcmpW(szHostNameNew, szHostNameOld) == 0,
+ "szHostNameNew '%S' should be szHostNameOld '%S'\n", szHostNameNew,
szHostNameOld);
+}
/* Get New Computer Name */
szComputerNameNew[0] = UNICODE_NULL;
cbData = sizeof(szComputerNameNew);
Error = RegQueryValueExW(hKeyCN, L"ComputerName", NULL, NULL,
(LPBYTE)szComputerNameNew, &cbData);
ok_long(Error, ERROR_SUCCESS);
-ok(szComputerNameNew[0], "szComputerNameNew is empty\n");
-ok(lstrcmpW(szComputerNameNew, szNewName) == 0,
- "szComputerNameNew '%S' should be szNewName '%S'\n", szComputerNameNew,
szNewName);
+if (bValid)
+{
+ok(szComputerNameNew[0], "szComputerNameNew is empty\n");
+if (lstrlenW(pszNewName) > MAX_COMPUTERNAME_LENGTH)
+{
+WCHAR szTruncatedNewName[MAX_COMPUTERNAME_LENGTH + 1];
+lstrcpynW(szTruncatedNewName, pszNewName,
ARRAYSIZE(szTruncatedNewName));
+ok(lstrcmpiW(szComputerNameNew, szTruncatedNewName) == 0,
+ "szComputerNameNew '%S' should be szTruncatedNewName '%S'\n",
+ szComputerNameNew, szTruncatedNewName);
+}
+else
+{
+ok(lstrcmpiW(szComputerNameNew, pszNewName) == 0,
+ "szComputerNameNew '%S' should be pszNewName '%S'\n",
+
[ros-diffs] [reactos] 01/01: [UUID] Add some missing NetCfg IIDs.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6bc82b6e0131e122c36ea394379315a4514f152 commit c6bc82b6e0131e122c36ea394379315a4514f152 Author: Eric Kohl AuthorDate: Mon Jun 17 13:47:52 2019 +0200 Commit: Eric Kohl CommitDate: Mon Jun 17 13:48:34 2019 +0200 [UUID] Add some missing NetCfg IIDs. --- sdk/lib/uuid/otherguids.c | 40 +++- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/sdk/lib/uuid/otherguids.c b/sdk/lib/uuid/otherguids.c index f12cbb7e8e0..14db6bf0264 100644 --- a/sdk/lib/uuid/otherguids.c +++ b/sdk/lib/uuid/otherguids.c @@ -3,23 +3,29 @@ #include #include -DEFINE_GUID(IID_IDirectPlaySP,0xc9f6360, 0xcc61, 0x11cf, 0xac, 0xec, 0x0, 0xaa, 0x0, 0x68, 0x86, 0xe3); -DEFINE_GUID(IID_ISFHelper, 0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00); -DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c); -DEFINE_GUID(IID_IEnumNetConnection, 0xC08956A0,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetConnectionManager, 0xC08956A2,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetConnectionConnectUi, 0xC08956A3,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetConnectionPropertyUi, 0xC08956A4,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetLanConnectionUiInfo, 0xC08956A6,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_IEnumNetCfgComponent, 0xC0E8AE92,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetCfg, 0xC0E8AE93,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetCfgComponent, 0xC0E8AE99,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetCfgComponentBindings, 0xC0E8AE9E,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetCfgLock, 0xC0E8AE9F,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetConnectionPropertyUi2, 0xC08956B9,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetCfgPnpReconfigCallback,0x8D84BD35,0xE227,0x11D2,0xB7,0x00,0x00,0xA0,0xC9,0x8A,0x6A,0x85); -DEFINE_GUID(IID_INetCfgComponentPropertyUi,0x932238E0,0xBEA1,0x11D0,0x92,0x98,0x00,0xC0,0x4f,0xC9,0x9D,0xCF); -DEFINE_GUID(IID_INetCfgComponentControl, 0x932238DF,0xBEA1,0x11D0,0x92,0x98,0x00,0xC0,0x4f,0xC9,0x9D,0xCF); +DEFINE_GUID(IID_IDirectPlaySP, 0xc9f6360, 0xcc61, 0x11cf, 0xac, 0xec, 0x0, 0xaa, 0x0, 0x68, 0x86, 0xe3); +DEFINE_GUID(IID_ISFHelper, 0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00); +DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c); +DEFINE_GUID(IID_IEnumNetConnection, 0xC08956A0,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetConnectionManager, 0xC08956A2,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetConnectionConnectUi, 0xC08956A3,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetConnectionPropertyUi, 0xC08956A4,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetLanConnectionUiInfo, 0xC08956A6,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_IEnumNetCfgBindingInterface, 0xC0E8AE90,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_IEnumNetCfgBindingPath, 0xC0E8AE91,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_IEnumNetCfgComponent, 0xC0E8AE92,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfg, 0xC0E8AE93,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfgBindingInterface, 0xC0E8AE94,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfgBindingPath, 0xC0E8AE96,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfgClass, 0xC0E8AE97,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfgComponent, 0xC0E8AE99,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfgClassSetup, 0xC0E8AE9D,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfgComponentBindings, 0xC0E8AE9E,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfgLock, 0xC0E8AE9F,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetConnectionPropertyUi2, 0xC08956B9,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetCfgPnpReconfigCallback, 0x8D84BD35,0xE227,0x11D2,0xB7,0x00,0x00,0xA0,0xC9,0x8A,0x6A,0x85); +DEFINE_GUID(IID_INetCfgComponentPropertyUi,
[ros-diffs] [reactos] 01/01: [NETCFGX] Add the INetCfgComponentBindings interface to the NetCfgComponent class.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1270e0a4fc0d3e22795aa25aa6a57e7689e7a38b
commit 1270e0a4fc0d3e22795aa25aa6a57e7689e7a38b
Author: Eric Kohl
AuthorDate: Mon Jun 17 14:57:08 2019 +0200
Commit: Eric Kohl
CommitDate: Mon Jun 17 14:57:08 2019 +0200
[NETCFGX] Add the INetCfgComponentBindings interface to the NetCfgComponent
class.
---
dll/win32/netcfgx/inetcfgcomp_iface.c | 150 +-
1 file changed, 147 insertions(+), 3 deletions(-)
diff --git a/dll/win32/netcfgx/inetcfgcomp_iface.c
b/dll/win32/netcfgx/inetcfgcomp_iface.c
index 71b5e028da2..76c8f8dda15 100644
--- a/dll/win32/netcfgx/inetcfgcomp_iface.c
+++ b/dll/win32/netcfgx/inetcfgcomp_iface.c
@@ -2,12 +2,13 @@
typedef struct
{
-const INetCfgComponent * lpVtbl;
+const INetCfgComponent *lpVtbl;
+const INetCfgComponentBindings *lpVtblComponentBindings;
LONG ref;
NetCfgComponentItem * pItem;
INetCfgComponentPropertyUi * pProperty;
INetCfg * pNCfg;
-}INetCfgComponentImpl;
+} INetCfgComponentImpl;
typedef struct
{
@@ -16,7 +17,143 @@ typedef struct
NetCfgComponentItem * pCurrent;
NetCfgComponentItem * pHead;
INetCfg * pNCfg;
-}IEnumNetCfgComponentImpl;
+} IEnumNetCfgComponentImpl;
+
+static __inline INetCfgComponentImpl*
impl_from_INetCfgComponentBindings(INetCfgComponentBindings *iface)
+{
+return (INetCfgComponentImpl*)((char *)iface -
FIELD_OFFSET(INetCfgComponentImpl, lpVtblComponentBindings));
+}
+
+
+/***
+ * INetCfgComponentBindings
+ */
+
+HRESULT
+WINAPI
+INetCfgComponentBindings_fnQueryInterface(
+INetCfgComponentBindings *iface,
+REFIID iid,
+LPVOID *ppvObj)
+{
+INetCfgComponentImpl *This = impl_from_INetCfgComponentBindings(iface);
+return INetCfgComponent_QueryInterface((INetCfgComponent*)This, iid,
ppvObj);
+}
+
+ULONG
+WINAPI
+INetCfgComponentBindings_fnAddRef(
+INetCfgComponentBindings *iface)
+{
+INetCfgComponentImpl *This = impl_from_INetCfgComponentBindings(iface);
+return INetCfgComponent_AddRef((INetCfgComponent*)This);
+}
+
+ULONG
+WINAPI
+INetCfgComponentBindings_fnRelease(
+INetCfgComponentBindings *iface)
+{
+INetCfgComponentImpl *This = impl_from_INetCfgComponentBindings(iface);
+return INetCfgComponent_Release((INetCfgComponent*)This);
+}
+
+HRESULT
+WINAPI
+INetCfgComponentBindings_fnBindTo(
+INetCfgComponentBindings *iface,
+INetCfgComponent *pnccItem)
+{
+return E_NOTIMPL;
+}
+
+HRESULT
+WINAPI
+INetCfgComponentBindings_fnUnbindFrom(
+INetCfgComponentBindings *iface,
+INetCfgComponent *pnccItem)
+{
+return E_NOTIMPL;
+}
+
+HRESULT
+WINAPI
+INetCfgComponentBindings_fnSupportsBindingInterface(
+INetCfgComponentBindings *iface,
+DWORD dwFlags,
+LPCWSTR pszwInterfaceName)
+{
+return E_NOTIMPL;
+}
+
+HRESULT
+WINAPI
+INetCfgComponentBindings_fnIsBoundTo(
+INetCfgComponentBindings *iface,
+INetCfgComponent *pnccItem)
+{
+return E_NOTIMPL;
+}
+
+HRESULT
+WINAPI
+INetCfgComponentBindings_fnIsBindableTo(
+INetCfgComponentBindings *iface,
+INetCfgComponent *pnccItem)
+{
+return E_NOTIMPL;
+}
+
+HRESULT
+WINAPI
+INetCfgComponentBindings_fnEnumBindingPaths(
+INetCfgComponentBindings *iface,
+DWORD dwFlags,
+IEnumNetCfgBindingPath **ppIEnum)
+{
+return E_NOTIMPL;
+}
+
+HRESULT
+WINAPI
+INetCfgComponentBindings_fnMoveBefore(
+INetCfgComponentBindings *iface,
+DWORD dwFlags,
+INetCfgBindingPath *pncbItemSrc,
+INetCfgBindingPath *pncbItemDest)
+{
+return E_NOTIMPL;
+}
+
+HRESULT
+WINAPI
+INetCfgComponentBindings_fnMoveAfter(
+INetCfgComponentBindings *iface,
+DWORD dwFlags,
+INetCfgBindingPath *pncbItemSrc,
+INetCfgBindingPath *pncbItemDest)
+{
+return E_NOTIMPL;
+}
+
+static const INetCfgComponentBindingsVtbl vt_NetCfgComponentBindings =
+{
+INetCfgComponentBindings_fnQueryInterface,
+INetCfgComponentBindings_fnAddRef,
+INetCfgComponentBindings_fnRelease,
+INetCfgComponentBindings_fnBindTo,
+INetCfgComponentBindings_fnUnbindFrom,
+INetCfgComponentBindings_fnSupportsBindingInterface,
+INetCfgComponentBindings_fnIsBoundTo,
+INetCfgComponentBindings_fnIsBindableTo,
+INetCfgComponentBindings_fnEnumBindingPaths,
+INetCfgComponentBindings_fnMoveBefore,
+INetCfgComponentBindings_fnMoveAfter,
+};
+
+/***
+ * INetCfgComponent
+ */
HRESULT
WINAPI
@@ -35,6 +172,12 @@ INetCfgComponent_fnQueryInterface(
INetCfg_AddRef(iface);
return S_OK;
}
+else if (IsEqualIID (iid, &IID_INetCfgComponentBindings))
+{
+*ppvObj = (LPVOID)&This->lpVtblComponentBindings;
+INetCfgComponentBindings_AddRef(iface);
+return S_OK;
+}
return E_NOINTERFACE;
}
@@ -527,6 +670,7 @@ INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID
riid, LPVOID * ppv, N
T
[ros-diffs] [reactos] 01/08: [ACCESS.CPL] Add & update Portuguese translation. (#1656)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8aca2dafeb27edf91a7513c64bba741502ef241b
commit 8aca2dafeb27edf91a7513c64bba741502ef241b
Author: Jose Carlos Jesus
AuthorDate: Mon May 27 22:09:50 2019 +0100
Commit: Hermès Bélusca-Maïto
CommitDate: Mon Jun 17 15:12:08 2019 +0200
[ACCESS.CPL] Add & update Portuguese translation. (#1656)
---
dll/cpl/access/access.rc | 5 -
dll/cpl/access/lang/pt-BR.rc | 10 -
dll/cpl/access/lang/{pt-BR.rc => pt-PT.rc} | 34 +++---
3 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/dll/cpl/access/access.rc b/dll/cpl/access/access.rc
index 0e722be4534..58bc0aba31b 100644
--- a/dll/cpl/access/access.rc
+++ b/dll/cpl/access/access.rc
@@ -70,6 +70,9 @@ IDI_CPLACCESS ICON "resources/applet.ico"
#ifdef LANGUAGE_PT_BR
#include "lang/pt-BR.rc"
#endif
+#ifdef LANGUAGE_PT_PT
+#include "lang/pt-PT.rc"
+#endif
#ifdef LANGUAGE_RO_RO
#include "lang/ro-RO.rc"
#endif
@@ -93,4 +96,4 @@ IDI_CPLACCESS ICON "resources/applet.ico"
#endif
#ifdef LANGUAGE_ZH_TW
#include "lang/zh-TW.rc"
-#endif
\ No newline at end of file
+#endif
diff --git a/dll/cpl/access/lang/pt-BR.rc b/dll/cpl/access/lang/pt-BR.rc
index 2d4064582e7..012b07039e7 100644
--- a/dll/cpl/access/lang/pt-BR.rc
+++ b/dll/cpl/access/lang/pt-BR.rc
@@ -1,4 +1,4 @@
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, 246, 228
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -6,12 +6,12 @@ CAPTION "Teclado"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Teclas de aderência", -1, 6, 11, 234, 62
-LTEXT "Use as teclas de aderência se você desejar usar SHIFT, CTRL, ALT ou
a tecla de logotipo do Windows pressionando uma tecla de cada vez.",
+LTEXT "Use as teclas de aderência se você desejar usar SHIFT, CTRL, ALT ou
a tecla de logotipo do ReactOS pressionando uma tecla de cada vez.",
-1, 12, 20, 222, 29
AUTOCHECKBOX "&Usar as teclas de aderência", IDC_STICKY_BOX, 12, 49, 126,
14
PUSHBUTTON "&Configurações", IDC_STICKY_BUTTON, 144, 49, 90, 14
GROUPBOX "Teclas de filtragem", -1, 6, 79, 234, 67
-LTEXT "Use as teclas de filtragem para que o Windows ignore teclas
pressionadas rápida ou repetidamente ou para que ele diminua a taxa de
repetição.",
+LTEXT "Use as teclas de filtragem para que o ReactOS ignore teclas
pressionadas rápida ou repetidamente ou para que ele diminua a taxa de
repetição.",
-1, 12, 89, 222, 29
AUTOCHECKBOX "Usar as teclas de &filtragem", IDC_FILTER_BOX, 12, 121, 126,
14
PUSHBUTTON "C&onfigurações", IDC_FILTER_BUTTON, 144, 121, 90, 14
@@ -30,7 +30,7 @@ CAPTION "Som"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Sinalizador de som", -1, 6, 11, 234, 98
-LTEXT "Use o sinalizador de som se desejar que o Windows gere avisos
visuais quando o sistema emitir um som.",
+LTEXT "Use o sinalizador de som se desejar que o ReactOS gere avisos
visuais quando o sistema emitir um som.",
-1, 12, 20, 222, 29
AUTOCHECKBOX "U&sar o sinalizador de som", IDC_SENTRY_BOX, 12, 49, 90, 14
LTEXT "Escolha o aviso visual:", IDC_SENTRY_TEXT, 12, 72, 222, 11
@@ -48,7 +48,7 @@ CAPTION "Vídeo"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Alto contraste", -1, 6, 11, 234, 62
-LTEXT "Use esta opção para que o Windows utilize cores e fontes que
facilitam a leitura.",
+LTEXT "Use esta opção para que o ReactOS utilize cores e fontes que
facilitam a leitura.",
-1, 12, 20, 222, 29
AUTOCHECKBOX "&Usar alto contraste", IDC_CONTRAST_BOX, 12, 49, 126, 14
PUSHBUTTON "&Configurações", IDC_CONTRAST_BUTTON, 144, 49, 90, 14
diff --git a/dll/cpl/access/lang/pt-BR.rc b/dll/cpl/access/lang/pt-PT.rc
similarity index 90%
copy from dll/cpl/access/lang/pt-BR.rc
copy to dll/cpl/access/lang/pt-PT.rc
index 2d4064582e7..26e47e62b10 100644
--- a/dll/cpl/access/lang/pt-BR.rc
+++ b/dll/cpl/access/lang/pt-PT.rc
@@ -6,12 +6,12 @@ CAPTION "Teclado"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Teclas de aderência", -1, 6, 11, 234, 62
-LTEXT "Use as teclas de aderência se você desejar usar SHIFT, CTRL, ALT ou
a tecla de logotipo do Windows pressionando uma tecla de cada vez.",
+LTEXT "Use as teclas de aderência se deseja usar SHIFT, CTRL, ALT ou a
tecla de logotipo do ReactOS pressionando uma tecla de cada vez.",
-1, 12, 20, 222, 29
AUTOCHECKBOX "&Usar as teclas de aderência", IDC_STICKY_BOX, 12, 49, 126,
14
PUSHBUTTON "&Configurações", IDC_STICKY_BUTTON, 144, 49, 90, 14
GROUPBOX "Teclas de filtragem", -1, 6, 79, 234, 67
-LTEXT "Use as teclas de filtragem para que o Windows ignore teclas
pressionadas rápida ou repetidamente ou para que ele diminua a taxa de
repetição.",
+LTEXT "Use as teclas de filtragem para que o ReactOS ignore teclas
pressionadas rápida ou
[ros-diffs] [reactos] 03/08: [APPWIZ.CPL] Update Portuguese Brazilian, and add Portuguese (neutral) translations. (#1656)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65dc8aba929ae329b97c3930ee90e4398ce36c2d
commit 65dc8aba929ae329b97c3930ee90e4398ce36c2d
Author: Jose Carlos Jesus
AuthorDate: Mon May 27 22:35:21 2019 +0100
Commit: Hermès Bélusca-Maïto
CommitDate: Mon Jun 17 15:12:08 2019 +0200
[APPWIZ.CPL] Update Portuguese Brazilian, and add Portuguese (neutral)
translations. (#1656)
---
dll/cpl/appwiz/appwiz.rc | 3 +++
dll/cpl/appwiz/lang/pt-BR.rc | 30 +++
dll/cpl/appwiz/lang/{pt-BR.rc => pt-PT.rc} | 38 +++---
3 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/dll/cpl/appwiz/appwiz.rc b/dll/cpl/appwiz/appwiz.rc
index 6a99373901c..947dd8edd59 100644
--- a/dll/cpl/appwiz/appwiz.rc
+++ b/dll/cpl/appwiz/appwiz.rc
@@ -69,6 +69,9 @@ IDB_SHORTCUT BITMAP "resources/shortcut.bmp"
#ifdef LANGUAGE_PT_BR
#include "lang/pt-BR.rc"
#endif
+#ifdef LANGUAGE_PT_PT
+#include "lang/pt-PT.rc"
+#endif
#ifdef LANGUAGE_RO_RO
#include "lang/ro-RO.rc"
#endif
diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc
index 1d1a267cb38..a76c1bcd118 100644
--- a/dll/cpl/appwiz/lang/pt-BR.rc
+++ b/dll/cpl/appwiz/lang/pt-BR.rc
@@ -1,6 +1,6 @@
/* Translation and UTF-8 Conversion by mkbu95 (May, 2012) */
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -45,14 +45,14 @@ END
IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-CAPTION "Remove Shortcuts/Folders"
+CAPTION "Remove Atalho/Pastas"
FONT 8, "MS Shell Dlg"
BEGIN
-LTEXT "&To remove an item from the Start menu, select the item and click
Remove.", -1, 10, 10, 192, 16
+LTEXT "&Para remover um item do Menu Iniciar, selecione o item e clique em
Remover.", -1, 10, 10, 192, 16
CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT |
LVS_SHOWSELALWAYS |
LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138
-PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP |
WS_TABSTOP
-DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP
+PUSHBUTTON "&Remover", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP |
WS_TABSTOP
+DEFPUSHBUTTON "Fechar", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP
END
ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95
@@ -77,14 +77,14 @@ END
STRINGTABLE
BEGIN
-IDS_DOWNLOADING "Downloading..."
-IDS_INSTALLING "Installing..."
-IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting
installation of corrupted file."
-IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut"
-IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have
an internet connection in order to download it. The setup will proceed without
installing Gecko."
-IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut."
-IDS_CANTMAKESHORTCUT "Failed to create shortcut."
-IDS_NO_MEMORY "No memory could be allocated!"
-IDS_NO_DIRECTORY "No directory given!"
-IDS_INVALID_PATH "The given path is invalid!"
+IDS_DOWNLOADING "A carregar..."
+IDS_INSTALLING "A Instalar..."
+IDS_INVALID_SHA "Inesperado checksum do ficheiro carregado . Abortar
instalação. Ficheiro corrompido."
+IDS_NEW_INTERNET_SHORTCUT "Novo atalho de Internet"
+IDS_DWL_FAILED "Falha ao carregar o pacote Gecko. Verifique a ligação à
Internet. O setup irá continuar sem instalar o Gecko."
+IDS_CANTMAKEINETSHORTCUT "Falha ao criar o atalho de internete."
+IDS_CANTMAKESHORTCUT "Falha ao criar o atalho."
+IDS_NO_MEMORY "A memória não pode ser alocada!"
+IDS_NO_DIRECTORY "Sem diretoria!"
+IDS_INVALID_PATH "O caminho é invalido!"
END
diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-PT.rc
similarity index 64%
copy from dll/cpl/appwiz/lang/pt-BR.rc
copy to dll/cpl/appwiz/lang/pt-PT.rc
index 1d1a267cb38..0c6e6801ee3 100644
--- a/dll/cpl/appwiz/lang/pt-BR.rc
+++ b/dll/cpl/appwiz/lang/pt-PT.rc
@@ -35,7 +35,7 @@ END
IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Selecione um Título para o Programa"
+CAPTION "Seleccione um Título para o Programa"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Digite um nome para este atalho:", -1, 120, 15, 150, 10
@@ -45,26 +45,26 @@ END
IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-CAPTION "Remove Shortcuts/Folders"
+CAPTION "Remove Atalho/Pastas"
FONT 8, "MS Shell Dlg"
BEGIN
-LTEXT "&To remove an item from the Start menu, select the item and click
Remove.", -1, 10, 10, 192, 16
+LTEXT "&Para remover um item do Menu Iniciar, seleccione o item e clique
em Remover.", -1, 10, 10, 1
[ros-diffs] [reactos] 05/08: [WLANCONF] Add Portuguese (neutral) translation. (#1656)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=285afe885144252529a2abf633445f6944da7f0c commit 285afe885144252529a2abf633445f6944da7f0c Author: Jose Carlos Jesus AuthorDate: Sat Jun 15 11:27:04 2019 +0100 Commit: Hermès Bélusca-Maïto CommitDate: Mon Jun 17 15:12:12 2019 +0200 [WLANCONF] Add Portuguese (neutral) translation. (#1656) --- base/applications/network/wlanconf/lang/pt-PT.rc | 37 base/applications/network/wlanconf/wlanconf.rc | 5 +++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/base/applications/network/wlanconf/lang/pt-PT.rc b/base/applications/network/wlanconf/lang/pt-PT.rc new file mode 100644 index 000..366d07cc051 --- /dev/null +++ b/base/applications/network/wlanconf/lang/pt-PT.rc @@ -0,0 +1,37 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN +IDS_USAGE "\nConfiguração do adaptador WLAN.\n\n\ +WLANCONF [-c SSID [-w WEP] [-a]] [-d] [-s]\n\n\ +\t-c SSID\t\tliga ao SSID fornecido,\n\ +\t-w WEP\t\tEspecifica uma chave WEP para uso.\n\ +\t-a\t\tEspecifica se a rede de destino é ad-hoc\n\ +\t-d\t\tDesliga o actual Ponto de acesso.\n\ +\t-s\t\tPreenche e exibe a lista de pontos de acesso\n\ +\t\t\tna faixa.\n\n\ +Sem parâmetros, irá imprimir informações sobre a ligação WLAN actual\n" +IDS_NO_NETWORK "Nenhuma rede encontrada no intervalo\n" +IDS_NO_WLAN_ADAPTER "Não foi possível encontrar um adaptador WLAN no sistema\n" +IDS_SUCCESS "A operação terminada com sucesso.\n" +IDS_WLAN_DISCONNECT "\nWLAN desligada\n" +IDS_MSG_WEP_ENABLED "WEP habilitada: %s\n" +IDS_MSG_NETWORK_MODE "Modo de rede: %s\n" +IDS_MSG_CURRENT_WIRELESS "\nInformações actuais de configuração sem fios:\n\n" +IDS_MSG_ENCRYPTED "Encriptado: %s\n" +IDS_MSG_NETWORK_TYPE "Tipo de rede: %s\n" +IDS_MSG_RSSI "RSSI: %i dBm\n" +IDS_MSG_SUPPORT_RATE "Taxas suportadas (Mbps): " +IDS_MSG_TRANSMISSION_POWER "Potência de transmissão: %d mW\n" +IDS_MSG_ANTENNA_COUNT "Contagem de antenas: %d\n" +IDS_MSG_TRANSMIT_ANTENNA "Antena de transmissão: %d\n" +IDS_MSG_TRANSMIT_ANTENNA_ANY "Antena de transmissão: nenhuma\n" +IDS_MSG_RECEIVE_ANTENNA "Antena de recepção: %d\n" +IDS_MSG_RECEIVE_ANTENNA_ANY "Antena de recepção: nenhuma\n" +IDS_MSG_FRAGMENT_THRESHOLD "Limiar de fragmentação: %d bytes\n" +IDS_MSG_RTS_THRESHOLD "Limiar RTS: %d bytes\n" +IDS_YES "Sim" +IDS_NO "Não" +IDS_ADHOC "Ad-hoc" +IDS_INFRASTRUCTURE "Infra-estrutura" +END diff --git a/base/applications/network/wlanconf/wlanconf.rc b/base/applications/network/wlanconf/wlanconf.rc index 41aa5e97508..1790f926b91 100644 --- a/base/applications/network/wlanconf/wlanconf.rc +++ b/base/applications/network/wlanconf/wlanconf.rc @@ -31,6 +31,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_PT +#include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif @@ -48,4 +51,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif \ No newline at end of file +#endif
[ros-diffs] [reactos] 04/08: [RUNONCE][USERINIT] Add Portuguese (neutral) translation. (#1656)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12632613ac6ac49c4a4acb017d87d14e4a4b7ed8
commit 12632613ac6ac49c4a4acb017d87d14e4a4b7ed8
Author: Jose Carlos Jesus
AuthorDate: Mon May 27 23:48:01 2019 +0100
Commit: Hermès Bélusca-Maïto
CommitDate: Mon Jun 17 15:12:12 2019 +0200
[RUNONCE][USERINIT] Add Portuguese (neutral) translation. (#1656)
---
base/system/runonce/lang/pt-BR.rc| 2 +-
base/system/runonce/lang/{pt-BR.rc => pt-PT.rc} | 2 +-
base/system/runonce/runonce.rc | 3 +++
base/system/userinit/lang/pt-BR.rc | 2 +-
base/system/userinit/lang/{pt-BR.rc => pt-PT.rc} | 24
base/system/userinit/userinit.rc | 5 -
6 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/base/system/runonce/lang/pt-BR.rc
b/base/system/runonce/lang/pt-BR.rc
index 18af480d5ff..13f28a7c46f 100644
--- a/base/system/runonce/lang/pt-BR.rc
+++ b/base/system/runonce/lang/pt-BR.rc
@@ -1,6 +1,6 @@
/* Translation and UTF-8 Conversion by mkbu95 (August,
2011) */
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
IDD_RUNONCE_DLG DIALOGEX 0, 0, 239, 170
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
diff --git a/base/system/runonce/lang/pt-BR.rc
b/base/system/runonce/lang/pt-PT.rc
similarity index 88%
copy from base/system/runonce/lang/pt-BR.rc
copy to base/system/runonce/lang/pt-PT.rc
index 18af480d5ff..909f9be6a55 100644
--- a/base/system/runonce/lang/pt-BR.rc
+++ b/base/system/runonce/lang/pt-PT.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYS
CAPTION "Instalação do ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
-LTEXT "ReactOS está configurando os seguintes itens:", -1, 38, 8, 196, 18
+LTEXT "ReactOS está a configurar os seguintes itens:", -1, 38, 8, 196, 18
LISTBOX IDC_COMP_LIST, 36, 32, 197, 131, LBS_OWNERDRAWVARIABLE |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
ICON IDI_ICON, -1, 5, 6, 21, 20
END
diff --git a/base/system/runonce/runonce.rc b/base/system/runonce/runonce.rc
index b4eba87b798..12bb0274d03 100644
--- a/base/system/runonce/runonce.rc
+++ b/base/system/runonce/runonce.rc
@@ -51,6 +51,9 @@ IDI_ICON ICON "res/icon.ico"
#ifdef LANGUAGE_PT_BR
#include "lang/pt-BR.rc"
#endif
+#ifdef LANGUAGE_PT_PT
+#include "lang/pt-PT.rc"
+#endif
#ifdef LANGUAGE_RO_RO
#include "lang/ro-RO.rc"
#endif
diff --git a/base/system/userinit/lang/pt-BR.rc
b/base/system/userinit/lang/pt-BR.rc
index b921cf40f91..0b931a9013b 100644
--- a/base/system/userinit/lang/pt-BR.rc
+++ b/base/system/userinit/lang/pt-BR.rc
@@ -1,4 +1,4 @@
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYSMENU
diff --git a/base/system/userinit/lang/pt-BR.rc
b/base/system/userinit/lang/pt-PT.rc
similarity index 56%
copy from base/system/userinit/lang/pt-BR.rc
copy to base/system/userinit/lang/pt-PT.rc
index b921cf40f91..147d8587d3a 100644
--- a/base/system/userinit/lang/pt-BR.rc
+++ b/base/system/userinit/lang/pt-PT.rc
@@ -6,15 +6,15 @@ CAPTION "ReactOS LiveCD"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE |
SS_OWNERDRAW, 18, 4, 290, 99
-RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+RTEXT "&Linguagem:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT
| WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+RTEXT "&Estilo de teclado:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
+LTEXT "Seleccione a linguagem e o estilo de teclado. Click em Avançar para
continuar.", IDC_STATIC, 7, 152, 300, 8
CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1
-DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
-PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+DEFPUSHBUTTON "&Avançar", IDOK, 205, 172, 50, 14
+PUSHBUTTON "&Cancelar", IDCANCEL, 260, 172, 50, 14
END
IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
@@ -23,21 +23,21 @@ CAPTION "ReactOS LiveCD"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE |
SS_OWNERDRAW, 18, 4, 290, 99
-DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
-PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
+D
[ros-diffs] [reactos] 02/08: [WINLOGON] Add Portuguese (neutral) translation. (#1656)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51d408b3fc0bff9c94cc8e0aaeae02f4125b53b6 commit 51d408b3fc0bff9c94cc8e0aaeae02f4125b53b6 Author: Jose Carlos Jesus AuthorDate: Mon May 27 22:23:36 2019 +0100 Commit: Hermès Bélusca-Maïto CommitDate: Mon Jun 17 15:12:08 2019 +0200 [WINLOGON] Add Portuguese (neutral) translation. (#1656) --- base/system/winlogon/lang/pt-BR.rc | 2 +- base/system/winlogon/lang/pt-PT.rc | 61 ++ base/system/winlogon/winlogon.rc | 5 +++- 3 files changed, 66 insertions(+), 2 deletions(-) diff --git a/base/system/winlogon/lang/pt-BR.rc b/base/system/winlogon/lang/pt-BR.rc index 9aa416315c0..f37fb6c8bfe 100644 --- a/base/system/winlogon/lang/pt-BR.rc +++ b/base/system/winlogon/lang/pt-BR.rc @@ -1,6 +1,6 @@ /* Translation and UTF-8 Conversion by mkbu95 (May, 2012) */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 164, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU diff --git a/base/system/winlogon/lang/pt-PT.rc b/base/system/winlogon/lang/pt-PT.rc new file mode 100644 index 000..ee6c469920b --- /dev/null +++ b/base/system/winlogon/lang/pt-PT.rc @@ -0,0 +1,61 @@ +/* Translation and UTF-8 Conversion by mkbu95 (May, 2012) */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 164, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Desligar Computador" +FONT 8, "MS Shell Dlg" +BEGIN +LTEXT "O computador pode ser desligado em segurança.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 +ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 +DEFPUSHBUTTON "&Reiniciar", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Falha Interface do utilizador" +FONT 8, "MS Shell Dlg" +BEGIN +LTEXT "A DLL de Logon de Interface do utilizador %s falhou ao carregar.", IDC_GINALOADFAILED, 39, 16, 156, 24 +LTEXT "Contacte o administrador do seu sistema para substituir a DLL, ou recuperar a DLL original.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 +DEFPUSHBUTTON "&Reiniciar", 1, 80, 91, 68, 14 +END + +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "Desligar o sistema" +FONT 8, "MS Shell Dlg" +BEGIN +ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 +LTEXT "O sistema iniciou o encerramento. Por favor guarde o seu trabalho e termine a sessão. Todos os dados não guardados serão perdidos quando o sistema encerrar.", -1, 38, 7, 135, 40 +LTEXT "O sistema encerrará em:", -1, 38, 50, 90, 8 +LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 +LTEXT "Mensagem:", -1, 38, 65, 135, 8 +EDITTEXT IDC_SYSSHUTDOWNMESSAGE, 34, 75, 139, 58, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE +END + +STRINGTABLE +BEGIN +IDS_PREPARENETWORKCONNECTIONS "A preparar ligações de rede..." +IDS_APPLYINGCOMPUTERSETTINGS "A guardar as configurações do computador..." +IDS_RUNNINGSTARTUPSCRIPTS "A executar scripts de inicialização..." +IDS_RUNNINGSHUTDOWNSCRIPTS "A executar scripts de desligamento..." +IDS_APPLYINGYOURPERSONALSETTINGS "A aplicar as suas configurações pessoais..." +IDS_RUNNINGLOGOFFSCRIPTS "A executar scripts de logoff..." +IDS_RUNNINGLOGONSCRIPTS "A executar scripts de logon..." +IDS_LOADINGYOURPERSONALSETTINGS "A carregar configurações pessoais..." +IDS_CLOSINGNETWORKCONNECTIONS "A terminar as ligações de rede..." +IDS_REACTOSISSHUTTINGDOWN "A desligar o ReactOS " +IDS_PREPARETOSTANDBY "Preparando para entrar em Modo de Espera..." +IDS_PREPARETOHIBERNATE "Preparando para Hibernar..." +IDS_SAVEYOURSETTINGS "A guardar as suas configurações..." +IDS_REACTOSISSTARTINGUP "ReactOS está a iniciar..." +IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" +IDS_TIMEOUTLONGFORMAT "%d days" +END + +STRINGTABLE +BEGIN +IDS_FAILEDACTIVATEUSERSHELL "Winlogon falhou ao activar user shell!" +END diff --git a/base/system/winlogon/winlogon.rc b/base/system/winlogon/winlogon.rc index 92b8f2cd75f..88794845837 100644 --- a/base/system/winlogon/winlogon.rc +++ b/base/system/winlogon/winlogon.rc @@ -69,6 +69,9 @@ IDI_WINLOGON ICON "res/winlogon.ico" #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT +#include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif @@ -95,4 +98,4 @@ IDI_WINLOGON ICON "res/winlogon.ico" #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif \ No newline at end of file +#endif
[ros-diffs] [reactos] 06/08: [NOTEPAD] Update Portuguese (neutral) translation. (#1656)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec8779fa3009f390df209944fc2f3e88c85138d7 commit ec8779fa3009f390df209944fc2f3e88c85138d7 Author: Jose Carlos Jesus AuthorDate: Sat Jun 15 12:42:28 2019 +0100 Commit: Hermès Bélusca-Maïto CommitDate: Mon Jun 17 15:12:13 2019 +0200 [NOTEPAD] Update Portuguese (neutral) translation. (#1656) --- base/applications/notepad/lang/pt-PT.rc | 46 - 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index d5756d3d62c..5991da59191 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -43,15 +43,15 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Localizar...", CMD_SEARCH MENUITEM "Localizar &próxima\tF3", CMD_SEARCH_NEXT -MENUITEM "Replace...\tCtrl+H", CMD_REPLACE +MENUITEM "Substituir...\tCtrl+H", CMD_REPLACE MENUITEM "Ir Para...\tCtrl+G", CMD_GOTO MENUITEM SEPARATOR -MENUITEM "Selecionar &tudo", CMD_SELECT_ALL +MENUITEM "Seleccionar &tudo", CMD_SELECT_ALL MENUITEM "&Data/Hora\tF5", CMD_TIME_DATE END POPUP "F&ormatar" BEGIN -MENUITEM "&Quebrar automática de linha", CMD_WRAP +MENUITEM "&Quebra automática de linha", CMD_WRAP MENUITEM "&Fonte...", CMD_FONT END POPUP "&Visualizar" @@ -62,7 +62,7 @@ BEGIN BEGIN MENUITEM "&Conteúdo", CMD_HELP_CONTENTS MENUITEM SEPARATOR -MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD +MENUITEM "&Acerca do Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -70,36 +70,36 @@ END DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP FONT 8, "MS Shell Dlg" -CAPTION "Page Setup" +CAPTION "Configurar página" BEGIN -GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX +GROUPBOX "Pré-visualizar", 0, 240, 6, 120, 153, BS_GROUPBOX CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 -GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX -LTEXT "&Size:", stc2, 16, 22, 36, 8 +GROUPBOX "Papel", grp2, 8, 6, 224, 56, BS_GROUPBOX +LTEXT "&Tamanho:", stc2, 16, 22, 36, 8 COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL -LTEXT "&Tray:", stc3, 16, 42, 36, 8 +LTEXT "&Origem:", stc3, 16, 42, 36, 8 COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL -GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX -AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON -AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON -GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX -LTEXT "L&eft:", stc15, 88, 82, 30, 8 +GROUPBOX "Orientação", grp1, 8, 66, 64, 56, BS_GROUPBOX +AUTORADIOBUTTON "&Retrato", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON +AUTORADIOBUTTON "&Panorama", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON +GROUPBOX "Margens", grp4, 80, 66, 152, 56, BS_GROUPBOX +LTEXT "E&squerda:", stc15, 88, 82, 30, 8 EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER -LTEXT "&Right:", stc16, 159, 82, 30, 8 +LTEXT "&Direita:", stc16, 159, 82, 30, 8 EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER -LTEXT "T&op:", stc17, 88, 102, 30, 8 +LTEXT "S&uperior:", stc17, 88, 102, 30, 8 EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER -LTEXT "&Bottom:", stc18, 159, 102, 30, 8 +LTEXT "&Inferior:", stc18, 159, 102, 30, 8 EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER -LTEXT "&Header:", 0x140, 8, 132, 40, 15 +LTEXT "&Cabeçalho:", 0x140, 8, 132, 40, 15 EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL -LTEXT "&Footer:", 0x142, 8, 149, 40, 15 +LTEXT "&Rodapé:", 0x142, 8, 149, 40, 15 EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL -PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14 +PUSHBUTTON "Ajuda", IDHELP, 8, 170, 50, 14 DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON -PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14 +PUSHBUTTON "Cancelar", IDCANCEL, 254, 170, 50, 14 PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14 END @@ -162,8 +162,8 @@ tarefa. \nFeche uma ou mais aplicações para aumentar a quantidade de memória STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linha %d, coluna %d" -STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." +STRING_PRINTERROR "Impossível imprimir o ficheiro '%s'.\n\nCert
[ros-diffs] [reactos] 07/08: [RAPPS] Add Portuguese (neutral) translation. (#1656)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=210adcc213c84e7e905be3a29479edecbd196e05
commit 210adcc213c84e7e905be3a29479edecbd196e05
Author: Jose Carlos Jesus
AuthorDate: Sat Jun 15 13:46:17 2019 +0100
Commit: Hermès Bélusca-Maïto
CommitDate: Mon Jun 17 15:12:13 2019 +0200
[RAPPS] Add Portuguese (neutral) translation. (#1656)
---
base/applications/rapps/lang/pt-BR.rc | 2 +-
.../applications/rapps/lang/{pt-BR.rc => pt-PT.rc} | 98 +++---
base/applications/rapps/rapps.rc | 3 +
3 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/base/applications/rapps/lang/pt-BR.rc
b/base/applications/rapps/lang/pt-BR.rc
index e2a5f8f5cd6..48b63e5a210 100644
--- a/base/applications/rapps/lang/pt-BR.rc
+++ b/base/applications/rapps/lang/pt-BR.rc
@@ -1,6 +1,6 @@
/* Translation and UTF-8 Conversion by mkbu95 (August,
2011) */
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
IDR_MAINMENU MENU
BEGIN
diff --git a/base/applications/rapps/lang/pt-BR.rc
b/base/applications/rapps/lang/pt-PT.rc
similarity index 65%
copy from base/applications/rapps/lang/pt-BR.rc
copy to base/applications/rapps/lang/pt-PT.rc
index e2a5f8f5cd6..34700700292 100644
--- a/base/applications/rapps/lang/pt-BR.rc
+++ b/base/applications/rapps/lang/pt-PT.rc
@@ -18,9 +18,9 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Remover do Registro", ID_REGREMOVE
MENUITEM SEPARATOR
-MENUITEM "A&tualizar\tF5", ID_REFRESH
+MENUITEM "&Actualizar\tF5", ID_REFRESH
MENUITEM SEPARATOR
-MENUITEM "Update Da&tabase\tCtrl+F5", ID_RESETDB
+MENUITEM "actualizar Da&tabase\tCtrl+F5", ID_RESETDB
END
POPUP "Aj&uda"
BEGIN
@@ -48,9 +48,9 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Remover do Registro", ID_REGREMOVE
MENUITEM SEPARATOR
-MENUITEM "&Atualizar\tF5", ID_REFRESH
+MENUITEM "&Actualizar\tF5", ID_REFRESH
MENUITEM SEPARATOR
-MENUITEM "Update Da&tabase\tCtrl+F5", ID_RESETDB
+MENUITEM "Actualizar Da&tabase\tCtrl+F5", ID_RESETDB
END
END
@@ -61,16 +61,16 @@ FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Geral", -1, 4, 2, 240, 61
AUTOCHECKBOX "&Salvar posição da janela", IDC_SAVE_WINDOW_POS, 15, 12,
219, 12
-AUTOCHECKBOX "&Atualizar esta lista de programas ao iniciar",
IDC_UPDATE_AVLIST, 15, 29, 222, 12
-AUTOCHECKBOX "&Registro de instalação e remoção de programas",
IDC_LOG_ENABLED, 15, 46, 219, 12
-GROUPBOX "Baixando", -1, 4, 65, 240, 51
+AUTOCHECKBOX "&Actualizar esta lista de programas ao iniciar",
IDC_UPDATE_AVLIST, 15, 29, 222, 12
+AUTOCHECKBOX "&Registo de instalação e remoção de programas",
IDC_LOG_ENABLED, 15, 46, 219, 12
+GROUPBOX "A carregar", -1, 4, 65, 240, 51
LTEXT "Pasta de download:", -1, 16, 75, 100, 9
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE |
WS_GROUP | ES_AUTOHSCROLL
PUSHBUTTON "&Escolher", IDC_CHOOSE, 187, 85, 50, 14
-AUTOCHECKBOX "&Deletar instalador após a instalação do programa",
IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+AUTOCHECKBOX "&Apagar instalador após a instalação do programa",
IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
GROUPBOX "Proxy", -1, 4, 116, 240, 76
-CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10
-CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON |
WS_TABSTOP, 15, 145, 210, 10
+CONTROL "Configurações de proxy do sistema", IDC_PROXY_DEFAULT, "Button",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10
+CONTROL "Directo (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON |
WS_TABSTOP, 15, 145, 210, 10
CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP,
15, 160, 74, 10
EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED
LTEXT "No proxy for", -1, 27, 175, 64, 10
@@ -87,7 +87,7 @@ FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35
AUTORADIOBUTTON "&Instalar com uma mídia (CD ou DVD)", IDC_CD_INSTALL, 10,
46, 197, 11, WS_GROUP
-AUTORADIOBUTTON "&Baixar e instalar", IDC_DOWNLOAD_INSTALL, 10, 59, 197,
11, NOT WS_TABSTOP
+AUTORADIOBUTTON "&Carregar e instalar", IDC_DOWNLOAD_INSTALL, 10, 59, 197,
11, NOT WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14
PUSHBUTTON "Cancelar", IDCANCEL, 150, 78, 60, 14
END
@@ -118,8 +118,8 @@ BEGIN
IDS_TOOLTIP_UNINSTALL "Desinstalar"
IDS_TOOLTIP_MODIFY "Modificar"
IDS_TOOLTIP_SETTINGS "Configurações"
-IDS_TOOLTIP_REFRESH "Atualizar"
-IDS_TOOLTIP_UPDATE_DB "Update Database"
+IDS_TOOLTIP_REFRESH "Actualizar"
+IDS_TOOLTIP_UPDATE_DB "Actualizar Database"
IDS_TOOLTIP_EXIT "Sair"
END
@@ -136,12 +136,12 @@ BEGIN
IDS_INFO_DESCRIPTION "\nDescrição: "
IDS_INFO_PUBLISHE
[ros-diffs] [reactos] 08/08: [REGEDIT] Update Portuguese (neutral) translations. (#1656)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fbbfc8f2fda7dc712a830768637a34e7b2bd6e5 commit 3fbbfc8f2fda7dc712a830768637a34e7b2bd6e5 Author: Jose Carlos Jesus AuthorDate: Mon Jun 17 15:04:50 2019 +0200 Commit: Hermès Bélusca-Maïto CommitDate: Mon Jun 17 15:12:13 2019 +0200 [REGEDIT] Update Portuguese (neutral) translations. (#1656) --- base/applications/regedit/lang/pt-PT.rc | 262 1 file changed, 131 insertions(+), 131 deletions(-) diff --git a/base/applications/regedit/lang/pt-PT.rc b/base/applications/regedit/lang/pt-PT.rc index 6da9a4a9475..84b402183cd 100644 --- a/base/applications/regedit/lang/pt-PT.rc +++ b/base/applications/regedit/lang/pt-PT.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN @@ -26,16 +26,16 @@ END IDR_REGEDIT_MENU MENU BEGIN -POPUP "&Registro" +POPUP "&Registo" BEGIN -MENUITEM "&Importar arquivo do Registro...", ID_REGISTRY_IMPORTREGISTRYFILE -MENUITEM "&Exportar arquivo do Registro...", ID_REGISTRY_EXPORTREGISTRYFILE +MENUITEM "&Importar arquivo do Registo...", ID_REGISTRY_IMPORTREGISTRYFILE +MENUITEM "&Exportar arquivo do Registo...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR -MENUITEM "&Conectar Registro da rede...", ID_REGISTRY_CONNECTNETWORKREGISTRY -MENUITEM "&Desconectar Registro da rede...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED +MENUITEM "&Ligar Registo da rede...", ID_REGISTRY_CONNECTNETWORKREGISTRY +MENUITEM "&Desligar Registo da rede...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "Im&primir...\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR @@ -52,11 +52,11 @@ BEGIN MENUITEM "Valor &Texto", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valor &Binário", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE -MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE -MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE +MENUITEM "Valor &Multi-String", ID_EDIT_NEW_MULTISTRINGVALUE +MENUITEM "Valor &Expand. String", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR -MENUITEM "&Permissions...", ID_EDIT_PERMISSIONS +MENUITEM "&Permissões...", ID_EDIT_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Excluir\tDel", ID_EDIT_DELETE MENUITEM "&Renomear", ID_EDIT_RENAME @@ -72,7 +72,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Dividir", ID_VIEW_SPLIT MENUITEM SEPARATOR -MENUITEM "&Atualizar\tF5", ID_VIEW_REFRESH +MENUITEM "&Actualizar\tF5", ID_VIEW_REFRESH END POPUP "&Favoritos" BEGIN @@ -83,7 +83,7 @@ BEGIN BEGIN MENUITEM "&Topics da Ajuda", ID_HELP_HELPTOPICS MENUITEM SEPARATOR -MENUITEM "&Sobre o Editor do Registro", ID_HELP_ABOUT +MENUITEM "&Sobre o Editor do Registo", ID_HELP_ABOUT END END @@ -106,41 +106,41 @@ BEGIN MENUITEM "Valor &Texto", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valor &Binário", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE -MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE -MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE +MENUITEM "Valor &Multi-String", ID_EDIT_NEW_MULTISTRINGVALUE +MENUITEM "valor &Expand String", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END END POPUP "" BEGIN -MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH -POPUP "&New" +MENUITEM "Expandir/Recolher", ID_TREE_EXPANDBRANCH +POPUP "&Novo" BEGIN -MENUITEM "&Key", ID_EDIT_NEW_KEY +MENUITEM "&Chave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE -MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE -MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE +MENUITEM "Valor &Multi-String", ID_EDIT_NEW_MULTISTRINGVALUE +MENUITEM "Valor &Expand String", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM "&Localizar...", ID_EDIT_FIND MENUITEM SEPARATOR -MENUITEM "&Delete", ID_TREE_DELETE -MENUITEM "&Rename", ID_TREE_RENAME +MENUITEM "&Apagar", ID_TREE_DELETE +MENUITEM "&Renomear", ID_TREE_RENAME MENUITEM SEP
[ros-diffs] [reactos] 01/01: [URLMON] Directly call cabinet!Extract instead of calling it via advpack!ExtractFilesW CORE-15795
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8ef4912a7230bdeef25d90dc7120c70c79bad74
commit c8ef4912a7230bdeef25d90dc7120c70c79bad74
Author: Mark Jansen
AuthorDate: Sat Jun 15 22:32:22 2019 +0200
Commit: Mark Jansen
CommitDate: Mon Jun 17 19:51:58 2019 +0200
[URLMON] Directly call cabinet!Extract instead of calling it via
advpack!ExtractFilesW
CORE-15795
---
dll/win32/urlmon/axinstall.c | 129 +++
1 file changed, 129 insertions(+)
diff --git a/dll/win32/urlmon/axinstall.c b/dll/win32/urlmon/axinstall.c
index 5eac00d46c7..86beb09e568 100644
--- a/dll/win32/urlmon/axinstall.c
+++ b/dll/win32/urlmon/axinstall.c
@@ -72,13 +72,142 @@ static inline BOOL file_exists(const WCHAR *file_name)
return GetFileAttributesW(file_name) != INVALID_FILE_ATTRIBUTES;
}
+#ifdef __REACTOS__
+
+/* The following definitions were copied from dll/win32/advpack32/files.c */
+
+/* SESSION Operation */
+#define EXTRACT_FILLFILELIST 0x0001
+#define EXTRACT_EXTRACTFILES 0x0002
+
+struct FILELIST{
+LPSTR FileName;
+struct FILELIST *next;
+BOOL DoExtract;
+};
+
+typedef struct {
+INT FileSize;
+ERF Error;
+struct FILELIST *FileList;
+INT FileCount;
+INT Operation;
+CHAR Destination[MAX_PATH];
+CHAR CurrentFile[MAX_PATH];
+CHAR Reserved[MAX_PATH];
+struct FILELIST *FilterList;
+} SESSION;
+
+static HRESULT (WINAPI *pExtract)(SESSION*, LPCSTR);
+
+
+/* The following functions were copied from dll/win32/advpack32/files.c
+ All unused arguments are removed */
+
+static void free_file_node(struct FILELIST *pNode)
+{
+HeapFree(GetProcessHeap(), 0, pNode->FileName);
+HeapFree(GetProcessHeap(), 0, pNode);
+}
+
+static void free_file_list(SESSION* session)
+{
+struct FILELIST *next, *curr = session->FileList;
+
+while (curr)
+{
+next = curr->next;
+free_file_node(curr);
+curr = next;
+}
+}
+
+HRESULT WINAPI Modified_ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir)
+{
+SESSION session;
+HMODULE hCabinet;
+HRESULT res = S_OK;
+LPSTR szConvertedList = NULL;
+
+TRACE("(%s, %s)\n", debugstr_a(CabName), debugstr_a(ExpandDir));
+
+if (!CabName || !ExpandDir)
+return E_INVALIDARG;
+
+if (GetFileAttributesA(ExpandDir) == INVALID_FILE_ATTRIBUTES)
+return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND);
+
+hCabinet = LoadLibraryA("cabinet.dll");
+if (!hCabinet)
+return E_FAIL;
+
+ZeroMemory(&session, sizeof(SESSION));
+
+pExtract = (void *)GetProcAddress(hCabinet, "Extract");
+if (!pExtract)
+{
+res = E_FAIL;
+goto done;
+}
+
+lstrcpyA(session.Destination, ExpandDir);
+
+session.Operation |= (EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES);
+res = pExtract(&session, CabName);
+
+done:
+free_file_list(&session);
+FreeLibrary(hCabinet);
+HeapFree(GetProcessHeap(), 0, szConvertedList);
+
+return res;
+}
+
+
+
+HRESULT WINAPI Modified_ExtractFilesW(LPCWSTR CabName, LPCWSTR ExpandDir)
+{
+char *cab_name = NULL, *expand_dir = NULL;
+HRESULT hres = S_OK;
+
+TRACE("(%s, %s, %d)\n", debugstr_w(CabName), debugstr_w(ExpandDir));
+
+if(CabName) {
+cab_name = heap_strdupWtoA(CabName);
+if(!cab_name)
+return E_OUTOFMEMORY;
+}
+
+if(ExpandDir) {
+expand_dir = heap_strdupWtoA(ExpandDir);
+if(!expand_dir)
+hres = E_OUTOFMEMORY;
+}
+
+/* cabinet.dll, which does the real job of extracting files, doesn't have
UNICODE API,
+so we need W->A conversion at some point anyway. */
+if(SUCCEEDED(hres))
+hres = Modified_ExtractFilesA(cab_name, expand_dir);
+
+heap_free(cab_name);
+heap_free(expand_dir);
+return hres;
+}
+
+#endif
+
+
static HRESULT extract_cab_file(install_ctx_t *ctx)
{
size_t path_len, file_len;
WCHAR *ptr;
HRESULT hres;
+#ifdef __REACTOS__
+hres = Modified_ExtractFilesW(ctx->cache_file, ctx->tmp_dir);
+#else
hres = ExtractFilesW(ctx->cache_file, ctx->tmp_dir, 0, NULL, NULL, 0);
+#endif
if(FAILED(hres)) {
WARN("ExtractFilesW failed: %08x\n", hres);
return hres;
