Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 21:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Autosyncing with Wine HEAD

Browse source 
svn path=/trunk/; revision=32848
This commit is contained in:
The Wine Synchronizer 2008-04-04 13:28:59 +00:00
parent f59a940b00
commit 5ef42dd10a
3 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/win32/mpr/mpr.rbuild
View file

@ -1,5 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<group>
<module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" allowwarnings="true"> <module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" allowwarnings="true">
<importlibrary definition="mpr.spec.def" /> <importlibrary definition="mpr.spec.def" />
<include base="mpr">.</include> <include base="mpr">.</include>
@ -7,11 +8,6 @@
<define name="__WINESRC__" /> <define name="__WINESRC__" />
<define name="WINVER">0x600</define> <define name="WINVER">0x600</define>
<define name="_WIN32_WINNT">0x600</define> <define name="_WIN32_WINNT">0x600</define>
<library>wine</library>
<library>user32</library>
<library>advapi32</library>
<library>kernel32</library>
<library>ntdll</library>
<file>auth.c</file> <file>auth.c</file>
<file>mpr_main.c</file> <file>mpr_main.c</file>
<file>multinet.c</file> <file>multinet.c</file>
@ -20,4 +16,10 @@
<file>wnet.c</file> <file>wnet.c</file>
<file>mpr.rc</file> <file>mpr.rc</file>
<file>mpr.spec</file> <file>mpr.spec</file>
<library>wine</library>
<library>user32</library>
<library>advapi32</library>
<library>kernel32</library>
<library>ntdll</library>
</module> </module>
</group>

21
reactos/dll/win32/mpr/mpr_Nl.rc
View file

@ -2,6 +2,7 @@
* Dutch resources for MPR * Dutch resources for MPR
* *
* Copyright (C) 2004 Hans Leidekker * Copyright (C) 2004 Hans Leidekker
* Copyright (C) 2008 Frans Kool
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -24,3 +25,23 @@ STRINGTABLE DISCARDABLE
{ {
IDS_ENTIRENETWORK "Gehele netwerk" IDS_ENTIRENETWORK "Gehele netwerk"
} }
IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Voer het Netwerk Wachtwoord in"
FONT 8, "MS Shell Dlg"
{
LTEXT "Voer a.u.b uw gebruikersnaam en wachtwoord in:", IDC_EXPLAIN, 40, 6, 150, 15
LTEXT "Proxy", -1, 40, 26, 50, 10
/* LTEXT "Realm", -1, 40, 46, 50, 10 */
LTEXT "Gebruiker", -1, 40, 66, 50, 10
LTEXT "Wachtwoord", -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 "&Sla dit wachtwoord op (Onveilig)", 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 "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
}

12
reactos/dll/win32/mpr/wnet.c
View file

@ -279,16 +279,18 @@ void wnetInit(HINSTANCE hInstDll)
{ {
PWSTR ptrPrev; PWSTR ptrPrev;
int entireNetworkLen; int entireNetworkLen;
LPCWSTR stringresource;
entireNetworkLen = LoadStringW(hInstDll, entireNetworkLen = LoadStringW(hInstDll,
IDS_ENTIRENETWORK, NULL, 0); IDS_ENTIRENETWORK, (LPWSTR)&stringresource, 0);
providerTable->entireNetwork = HeapAlloc( providerTable->entireNetwork = HeapAlloc(
GetProcessHeap(), 0, (entireNetworkLen + 1) * GetProcessHeap(), 0, (entireNetworkLen + 1) *
sizeof(WCHAR)); sizeof(WCHAR));
if (providerTable->entireNetwork) if (providerTable->entireNetwork)
LoadStringW(hInstDll, IDS_ENTIRENETWORK, {
providerTable->entireNetwork, memcpy(providerTable->entireNetwork, stringresource, entireNetworkLen*sizeof(WCHAR));
entireNetworkLen + 1); providerTable->entireNetwork[entireNetworkLen] = 0;
}
providerTable->numAllocated = numToAllocate; providerTable->numAllocated = numToAllocate;
for (ptr = providers; ptr; ) for (ptr = providers; ptr; )
{ {
@ -355,7 +357,7 @@ static LPNETRESOURCEW _copyNetResourceForEnumW(LPNETRESOURCEW lpNet)
{ {
size_t len; size_t len;
memcpy(ret, lpNet, sizeof(ret)); *ret = *lpNet;
ret->lpLocalName = ret->lpComment = ret->lpProvider = NULL; ret->lpLocalName = ret->lpComment = ret->lpProvider = NULL;
if (lpNet->lpRemoteName) if (lpNet->lpRemoteName)
{ {