Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 20737: Make the toolbar a bit more attractive.
by gedmurphy＠svn.reactos.org 08 Jan '06

08 Jan '06

Make the toolbar a bit more attractive. Modified: trunk/reactos/subsys/system/servman/En.rc Deleted: trunk/reactos/subsys/system/servman/res/buttons.bmp Added: trunk/reactos/subsys/system/servman/res/toolbar.bmp Modified: trunk/reactos/subsys/system/servman/resource.h Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-08 22:14:26 UTC (rev 20736) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-08 22:48:21 UTC (rev 20737) @@ -67,7 +67,7 @@ CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 END -IDB_BUTTONS BITMAP "res/buttons.bmp" +IDB_BUTTONS BITMAP "res/toolbar.bmp" STRINGTABLE DISCARDABLE BEGIN @@ -118,4 +118,7 @@ IDS_TOOLTIP_STOP "Stop service" IDS_TOOLTIP_PAUSE "Pause service" IDS_TOOLTIP_RESTART "Restart service" + IDS_TOOLTIP_NEW "Create a service" + IDS_TOOLTIP_HELP "Help" + IDS_TOOLTIP_EXIT "Exit" END _____ Deleted: trunk/reactos/subsys/system/servman/res/buttons.bmp (Binary files differ) _____ Added: trunk/reactos/subsys/system/servman/res/toolbar.bmp (Binary files differ) Property changes on: trunk/reactos/subsys/system/servman/res/toolbar.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: trunk/reactos/subsys/system/servman/resource.h --- trunk/reactos/subsys/system/servman/resource.h 2006-01-08 22:14:26 UTC (rev 20736) +++ trunk/reactos/subsys/system/servman/resource.h 2006-01-08 22:48:21 UTC (rev 20737) @@ -9,16 +9,18 @@ #define IDC_TOOLBAR 1001 #define IDC_STATUSBAR 1002 -#define ID_PROP 4010 -#define ID_REFRESH 4011 -#define ID_EXPORT 4012 +#define ID_PROP 2000 +#define ID_REFRESH 2001 +#define ID_EXPORT 2002 +#define ID_START 2003 +#define ID_STOP 2004 +#define ID_PAUSE 2005 +#define ID_RESUME 2006 +#define ID_RESTART 2007 +#define ID_NEW 2008 +#define ID_HELP 2009 +#define ID_EXIT 2010 -#define ID_START 2000 -#define ID_STOP 2001 -#define ID_PAUSE 2002 -#define ID_RESUME 2003 -#define ID_RESTART 2004 - #define IDR_MAINMENU 102 #define ID_FILE_EXIT 4001 #define ID_VIEW_CUSTOMIZE 4021 @@ -37,34 +39,42 @@ #define IDS_TOOLTIP_STOP 6004 #define IDS_TOOLTIP_PAUSE 6005 #define IDS_TOOLTIP_RESTART 6006 +#define IDS_TOOLTIP_NEW 6007 +#define IDS_TOOLTIP_HELP 6008 +#define IDS_TOOLTIP_EXIT 6009 - #define IDS_SERVICES_STATUS_RUNNING 5000 #define IDS_SERVICES_STATUS_STOPPED 5001 -#define IDS_SERVICES_YES 5002 +#define IDS_SERVICES_YES 5002 #define IDS_SERVICES_UNKNOWN 5003 -#define IDS_SERVICES_AUTO 5004 -#define IDS_SERVICES_MAN 5005 -#define IDS_SERVICES_DIS 5006 +#define IDS_SERVICES_AUTO 5004 +#define IDS_SERVICES_MAN 5005 +#define IDS_SERVICES_DIS 5006 #define IDS_SERVICES_NUM_SERVICES 5010 #define IDI_SM_ICON 50 #define IDB_BUTTONS 51 -#define TBICON_START 2 -#define TBICON_STOP 3 -#define TBICON_PAUSE 0 -#define TBICON_RESTART 1 +#define TBICON_PROP 0 +#define TBICON_REFRESH 1 +#define TBICON_EXPORT 2 +#define TBICON_START 3 +#define TBICON_STOP 4 +#define TBICON_PAUSE 5 +#define TBICON_RESTART 6 +#define TBICON_NEW 7 +#define TBICON_HELP 8 +#define TBICON_EXIT 9 -#define IDS_PROP_SHEET 10000 -#define IDD_DLG_GENERAL 10001 -#define IDC_SERV_NAME 10041 -#define IDC_DISP_NAME 10051 -#define IDC_DESCRIPTION 10061 -#define IDC_START_TYPE 10101 -#define IDC_SERV_STATUS 10121 -#define IDC_START 10131 -#define IDC_STOP 10141 -#define IDC_PAUSE 10151 -#define IDC_RESUME 10161 -#define IDC_START_PARAM 10191 +#define IDS_PROP_SHEET 10000 +#define IDD_DLG_GENERAL 10001 +#define IDC_SERV_NAME 10041 +#define IDC_DISP_NAME 10051 +#define IDC_DESCRIPTION 10061 +#define IDC_START_TYPE 10101 +#define IDC_SERV_STATUS 10121 +#define IDC_START 10131 +#define IDC_STOP 10141 +#define IDC_PAUSE 10151 +#define IDC_RESUME 10161 +#define IDC_START_PARAM 10191 _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-08 22:14:26 UTC (rev 20736) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-08 22:48:21 UTC (rev 20737) @@ -37,9 +37,9 @@ /* Toolbar buttons */ TBBUTTON tbb [NUM_BUTTONS] = { // iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString - {STD_PROPERTIES, ID_PROP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* properties */ - {STD_FILENEW, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* */ - {STD_FILENEW, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* */ + {TBICON_PROP, ID_PROP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* properties */ + {TBICON_REFRESH, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* refresh */ + {TBICON_EXPORT, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* export */ /* Note: First item for a seperator is its width in pixels */ {5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ @@ -48,6 +48,13 @@ {TBICON_STOP, ID_STOP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ {TBICON_PAUSE, ID_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ {TBICON_RESTART, ID_RESTART, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* restart */ + + {5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */ + {TBICON_HELP, ID_HELP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ + {TBICON_EXIT, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ + }; /* ======================== Create Toolbar ============================== */ @@ -76,11 +83,17 @@ /* Add custom images */ tbab.hInst = hInstance; tbab.nID = IDB_BUTTONS; - iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 4, (LPARAM)&tbab); + iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 11, (LPARAM)&tbab); + tbb[0].iBitmap += iImageOffset; /* properties */ + tbb[1].iBitmap += iImageOffset; /* refresh */ + tbb[2].iBitmap += iImageOffset; /* export */ tbb[4].iBitmap += iImageOffset; /* start */ tbb[5].iBitmap += iImageOffset; /* stop */ - tbb[6].iBitmap += iImageOffset; /* pause */ + tbb[6].iBitmap += iImageOffset; /* pause */ tbb[7].iBitmap += iImageOffset; /* restart */ + tbb[9].iBitmap += iImageOffset; /* new */ + tbb[10].iBitmap += iImageOffset; /* help */ + tbb[11].iBitmap += iImageOffset; /* exit */ /* Add buttons to toolbar */ SendMessage(hTool, TB_ADDBUTTONS, NUM_BUTTONS, (LPARAM) &tbb); @@ -260,7 +273,19 @@ case ID_RESTART: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_RESTART); break; + + case ID_NEW: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_NEW); + break; + case ID_HELP: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_HELP); + break; + + case ID_EXIT: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); + break; + } } break; _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-08 22:14:26 UTC (rev 20736) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-08 22:48:21 UTC (rev 20737) @@ -9,7 +9,7 @@ #include "resource.h" #define MAX_KEY_LENGTH 256 -#define NUM_BUTTONS 8 +#define NUM_BUTTONS 12 BOOL RefreshServiceList(VOID);

1 0

[gvg] 20736: Obtain DHCP info from DHCP client service
by gvg＠svn.reactos.org 08 Jan '06

08 Jan '06

Obtain DHCP info from DHCP client service Modified: trunk/reactos/include/libs/dhcp/rosdhcp_public.h Modified: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.spec Modified: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml Added: trunk/reactos/lib/iphlpapi/dhcp.h Added: trunk/reactos/lib/iphlpapi/dhcp_reactos.c Modified: trunk/reactos/lib/iphlpapi/iphlpapi.xml Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/services/dhcp/api.c Modified: trunk/reactos/services/dhcp/dhclient.c Modified: trunk/reactos/services/dhcp/include/dhcpd.h Modified: trunk/reactos/services/dhcp/include/rosdhcp.h Modified: trunk/reactos/services/dhcp/pipe.c _____ Modified: trunk/reactos/include/libs/dhcp/rosdhcp_public.h --- trunk/reactos/include/libs/dhcp/rosdhcp_public.h 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/include/libs/dhcp/rosdhcp_public.h 2006-01-08 22:14:26 UTC (rev 20736) @@ -7,6 +7,7 @@ DhcpReqReleaseIpAddress, DhcpReqRenewIpAddress, DhcpReqStaticRefreshParams, + DhcpReqGetAdapterInfo, }; typedef struct _COMM_DHCP_REQ { @@ -39,6 +40,12 @@ DWORD Mtu; DWORD Speed; } QueryHWInfo; + struct { + BOOL DhcpEnabled; + DWORD DhcpServer; + time_t LeaseObtained; + time_t LeaseExpires; + } GetAdapterInfo; } COMM_DHCP_REPLY; #define DHCP_PIPE_NAME "\\\\.\\pipe\\dhcpclient" _____ Modified: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c --- trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -12,6 +12,7 @@ #include <roscfg.h> #include <winsock2.h> #include <dhcpcsdk.h> +#include <time.h> #include <dhcp/rosdhcp_public.h> #define DHCP_TIMEOUT 1000 @@ -117,6 +118,70 @@ return Reply.Reply; } +/*++ + * @name DhcpRosGetAdapterInfo + * @implemented ReactOS only + * + * Get DHCP info for an adapter + * + * @param AdapterIndex + * Index of the adapter (iphlpapi-style) for which info is + * requested + * + * @param DhcpEnabled + * Returns whether DHCP is enabled for the adapter + * + * @param DhcpServer + * Returns DHCP server IP address (255.255.255.255 if no + * server reached yet), in network byte order + * + * @param LeaseObtained + * Returns time at which the lease was obtained + * + * @param LeaseExpires + * Returns time at which the lease will expire + * + * @return non-zero on success + * + * @remarks This is a ReactOS-only routine + * + *--*/ +DWORD APIENTRY DhcpRosGetAdapterInfo( DWORD AdapterIndex, + PBOOL DhcpEnabled, + PDWORD DhcpServer, + time_t *LeaseObtained, + time_t *LeaseExpires ) +{ + COMM_DHCP_REQ Req; + COMM_DHCP_REPLY Reply; + DWORD BytesRead; + BOOL Result; + + Req.Type = DhcpReqGetAdapterInfo; + Req.AdapterIndex = AdapterIndex; + + Result = CallNamedPipe + ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), + &BytesRead, DHCP_TIMEOUT ); + + if ( 0 != Result && 0 != Reply.Reply ) { + *DhcpEnabled = Reply.GetAdapterInfo.DhcpEnabled; + } else { + *DhcpEnabled = FALSE; + } + if ( *DhcpEnabled ) { + *DhcpServer = Reply.GetAdapterInfo.DhcpServer; + *LeaseObtained = Reply.GetAdapterInfo.LeaseObtained; + *LeaseExpires = Reply.GetAdapterInfo.LeaseExpires; + } else { + *DhcpServer = INADDR_NONE; + *LeaseObtained = 0; + *LeaseExpires = 0; + } + + return Reply.Reply; +} + INT STDCALL DllMain(PVOID hinstDll, ULONG dwReason, _____ Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def --- trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def 2006-01-08 22:14:26 UTC (rev 20736) @@ -1,16 +0,0 @@ -; $Id: dhcpcapi.def 14337 2005-03-26 22:10:04Z $ -; -; dhcpcsvc.def -; -; ReactOS Operating System -; -LIBRARY dhcpcsvc.dll -EXPORTS -DhcpCApiInitialize@4 -DhcpCApiCleanup@0 -DhcpQueryHWInfo@16 -DhcpLeaseIpAddress@4 -DhcpReleaseIpAddressLease@4 -DhcpRenewIpAddressLease@4 -DhcpStaticRefreshParams@12 -; EOF _____ Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.spec --- trunk/reactos/lib/dhcpcsvc/dhcpcsvc.spec 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.spec 2006-01-08 22:14:26 UTC (rev 20736) @@ -0,0 +1,47 @@ +# +# PROJECT: ReactOS Networking +# LICENSE: GPL - See COPYING in the top level directory +# FILE: lib/dhcpcsvc/dhcpcsvc.spec +# PURPOSE: dhcpcsvc exports +# COPYRIGHT: Copyright 2006 Ge van Geldorp <gvg(a)reactos.org> +# +@ stub DhcpAcquireParameters +@ stub DhcpAcquireParametersByBroadcast +@ stdcall DhcpCApiCleanup() +@ stdcall DhcpCApiInitialize(ptr) +@ stub DhcpDelPersistentRequestParams +@ stub DhcpDeRegisterOptions +@ stub DhcpDeRegisterParamChange +@ stub DhcpEnumClasses +@ stub DhcpFallbackRefreshParams +@ stub DhcpHandlePnPEvent +@ stdcall DhcpLeaseIpAddress(long) +@ stub DhcpLeaseIpAddressEx +@ stub DhcpNotifyConfigChange +@ stub DhcpNotifyConfigChangeEx +@ stub DhcpNotifyMediaReconnected +@ stub DhcpOpenGlobalEvent +@ stub DhcpPersistentRequestParams +@ stdcall DhcpQueryHWInfo(long ptr ptr ptr) +@ stub DhcpRegisterOptions +@ stub DhcpRegisterParamChange +@ stdcall DhcpReleaseIpAddressLease(long) +@ stub DhcpReleaseIpAddressLeaseEx +@ stub DhcpReleaseParameters +@ stub DhcpRemoveDNSRegistrations +@ stdcall DhcpRenewIpAddressLease(long) +@ stub DhcpRenewIpAddressLeaseEx +@ stub DhcpRequestOptions +@ stub DhcpRequestParams +@ stdcall DhcpStaticRefreshParams(long long long) +@ stub DhcpUndoRequestParams +@ stub McastApiCleanup +@ stub McastApiStartup +@ stub McastEnumerateScopes +@ stub McastGenUID +@ stub McastReleaseAddress +@ stub McastRenewAddress +@ stub McastRequestAddress +@ stdcall DhcpRosGetAdapterInfo(long ptr ptr ptr ptr) +# The Windows DHCP client service is implemented in the DLL too +#@ stub ServiceMain _____ Modified: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml --- trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml 2006-01-08 22:14:26 UTC (rev 20736) @@ -1,5 +1,5 @@ <module name="dhcpcsvc" type="win32dll" installbase="system32" installname="dhcpcsvc.dll"> - <importlibrary definition="dhcpcsvc.def" /> + <importlibrary definition="dhcpcsvc.spec.def" /> <include base="dhcpcsvc">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> @@ -11,4 +11,5 @@ <library>iphlpapi</library> <file>dhcpcsvc.c</file> <file>dhcpcsvc.rc</file> + <file>dhcpcsvc.spec</file> </module> _____ Added: trunk/reactos/lib/iphlpapi/dhcp.h --- trunk/reactos/lib/iphlpapi/dhcp.h 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/iphlpapi/dhcp.h 2006-01-08 22:14:26 UTC (rev 20736) @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS Networking + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/iphlpapi/dhcp_reactos.c + * PURPOSE: DHCP helper functions for ReactOS + * COPYRIGHT: Copyright 2006 Ge van Geldorp <gvg(a)reactos.org> + */ + +#ifndef WINE_DHCP_H_ +#define WINE_DHCP_H_ + +DWORD getDhcpInfoForAdapter(DWORD AdapterIndex, + PBOOL DhcpEnabled, + PDWORD DhcpServer, + time_t *LeaseObtained, + time_t *LeaseExpires); + +#endif /* ndef WINE_DHCP_H_ */ Property changes on: trunk/reactos/lib/iphlpapi/dhcp.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/iphlpapi/dhcp_reactos.c --- trunk/reactos/lib/iphlpapi/dhcp_reactos.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/iphlpapi/dhcp_reactos.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -0,0 +1,30 @@ +/* + * PROJECT: ReactOS Networking + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/iphlpapi/dhcp_reactos.c + * PURPOSE: DHCP helper functions for ReactOS + * COPYRIGHT: Copyright 2006 Ge van Geldorp <gvg(a)reactos.org> + */ + +#include "iphlpapi_private.h" +#include "dhcp.h" +#include <assert.h> + +#define NDEBUG +#include "debug.h" + +DWORD APIENTRY DhcpRosGetAdapterInfo(DWORD AdapterIndex, + PBOOL DhcpEnabled, + PDWORD DhcpServer, + time_t *LeaseObtained, + time_t *LeaseExpires); + +DWORD getDhcpInfoForAdapter(DWORD AdapterIndex, + PBOOL DhcpEnabled, + PDWORD DhcpServer, + time_t *LeaseObtained, + time_t *LeaseExpires) +{ + return DhcpRosGetAdapterInfo(AdapterIndex, DhcpEnabled, DhcpServer, + LeaseObtained, LeaseExpires); +} Property changes on: trunk/reactos/lib/iphlpapi/dhcp_reactos.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi.xml --- trunk/reactos/lib/iphlpapi/iphlpapi.xml 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/iphlpapi/iphlpapi.xml 2006-01-08 22:14:26 UTC (rev 20736) @@ -11,6 +11,8 @@ <library>kernel32</library> <library>advapi32</library> <library>ws2_32</library> + <library>dhcpcsvc</library> + <file>dhcp_reactos.c</file> <file>ifenum_reactos.c</file> <file>ipstats_reactos.c</file> <file>iphlpapi_main.c</file> _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c --- trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -42,6 +42,7 @@ #include "winbase.h" #include "winreg.h" #include "iphlpapi.h" +#include "dhcp.h" #include "ifenum.h" #include "ipstats.h" #include "resinfo.h" @@ -559,6 +560,8 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) { DWORD ret; + BOOL dhcpEnabled; + DWORD dhcpServer; TRACE("pAdapterInfo %p, pOutBufLen %p\n", pAdapterInfo, pOutBufLen); if (!pOutBufLen) @@ -637,6 +640,12 @@ ptr->IpAddressList.IpAddress.String); toIPAddressString(getInterfaceMaskByIndex(table->indexes[ndx]), ptr->IpAddressList.IpMask.String); + getDhcpInfoForAdapter(table->indexes[ndx], &dhcpEnabled, + &dhcpServer, &ptr->LeaseObtained, + &ptr->LeaseExpires); + ptr->DhcpEnabled = (DWORD) dhcpEnabled; + toIPAddressString(dhcpServer, + ptr->DhcpServer.IpAddress.String); if (winsEnabled) { ptr->HaveWins = TRUE; memcpy(ptr->PrimaryWinsServer.IpAddress.String, _____ Modified: trunk/reactos/services/dhcp/api.c --- trunk/reactos/services/dhcp/api.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/services/dhcp/api.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -11,6 +11,9 @@ #include <winsock2.h> #include <iphlpapi.h> +#define NDEBUG +#include <reactos/debug.h> + static CRITICAL_SECTION ApiCriticalSection; VOID ApiInit() { @@ -140,3 +143,40 @@ return Send( &Reply ); } + +DWORD DSGetAdapterInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { + COMM_DHCP_REPLY Reply; + PDHCP_ADAPTER Adapter; + + ApiLock(); + + Adapter = AdapterFindIndex( Req->AdapterIndex ); + + Reply.Reply = Adapter ? 1 : 0; + + if( Adapter ) { + Reply.GetAdapterInfo.DhcpEnabled = (S_STATIC != Adapter->DhclientState.state); + if (S_BOUND == Adapter->DhclientState.state) { + if (sizeof(Reply.GetAdapterInfo.DhcpServer) == + Adapter->DhclientState.active->serveraddress.len) { + memcpy(&Reply.GetAdapterInfo.DhcpServer, + Adapter->DhclientState.active->serveraddress.iabuf, + Adapter->DhclientState.active->serveraddress.len); + } else { + DPRINT1("Unexpected server address len %d\n", + Adapter->DhclientState.active->serveraddress.len); + Reply.GetAdapterInfo.DhcpServer = htonl(INADDR_NONE); + } + Reply.GetAdapterInfo.LeaseObtained = Adapter->DhclientState.active->obtained; + Reply.GetAdapterInfo.LeaseExpires = Adapter->DhclientState.active->expiry; + } else { + Reply.GetAdapterInfo.DhcpServer = htonl(INADDR_NONE); + Reply.GetAdapterInfo.LeaseObtained = 0; + Reply.GetAdapterInfo.LeaseExpires = 0; + } + } + + ApiUnlock(); + + return Send( &Reply ); +} _____ Modified: trunk/reactos/services/dhcp/dhclient.c --- trunk/reactos/services/dhcp/dhclient.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/services/dhcp/dhclient.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -420,6 +420,9 @@ ip->client->new->rebind = ip->client->new->renewal + ip->client->new->renewal / 2 + ip->client->new->renewal / 4; +#ifdef _REACTOS_ + ip->client->new->obtained = cur_time; +#endif ip->client->new->expiry += cur_time; /* Lease lengths can never be negative. */ if (ip->client->new->expiry < cur_time) @@ -809,6 +812,10 @@ lease->address.len = sizeof(packet->raw->yiaddr); memcpy(lease->address.iabuf, &packet->raw->yiaddr, lease->address.len); +#ifdef _REACTOS_ + lease->serveraddress.len = sizeof(packet->raw->siaddr); + memcpy(lease->serveraddress.iabuf, &packet->raw->siaddr, lease->address.len); +#endif /* If the server name was filled out, copy it. */ if ((!packet->options[DHO_DHCP_OPTION_OVERLOAD].len || _____ Modified: trunk/reactos/services/dhcp/include/dhcpd.h --- trunk/reactos/services/dhcp/include/dhcpd.h 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/services/dhcp/include/dhcpd.h 2006-01-08 22:14:26 UTC (rev 20736) @@ -158,6 +158,10 @@ time_t expiry, renewal, rebind; struct iaddr address; char *server_name; +#ifdef _REACTOS_ + time_t obtained; + struct iaddr serveraddress; +#endif char *filename; struct string_list *medium; unsigned int is_static : 1; _____ Modified: trunk/reactos/services/dhcp/include/rosdhcp.h --- trunk/reactos/services/dhcp/include/rosdhcp.h 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/services/dhcp/include/rosdhcp.h 2006-01-08 22:14:26 UTC (rev 20736) @@ -67,6 +67,8 @@ extern DWORD DSLeaseIpAddress( PipeSendFunc Send, COMM_DHCP_REQ *Req ); extern DWORD DSRenewIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ); extern DWORD DSReleaseIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ); +extern DWORD DSStaticRefreshParams( PipeSendFunc Send, COMM_DHCP_REQ *Req ); +extern DWORD DSGetAdapterInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ); extern int inet_aton(const char *s, struct in_addr *addr); int warn( char *format, ... ); #endif/*ROSDHCP_H*/ _____ Modified: trunk/reactos/services/dhcp/pipe.c --- trunk/reactos/services/dhcp/pipe.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/services/dhcp/pipe.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -9,6 +9,9 @@ #include <rosdhcp.h> +#define NDEBUG +#include <reactos/debug.h> + static HANDLE CommPipe = INVALID_HANDLE_VALUE, CommThread; DWORD CommThrId; @@ -30,8 +33,8 @@ DWORD WINAPI PipeThreadProc( LPVOID Parameter ) { DWORD BytesRead, BytesWritten; COMM_DHCP_REQ Req; - BOOL Result; - BOOLEAN Connection; + COMM_DHCP_REPLY Reply; + BOOL Result, Connection; while( (Connection = ConnectNamedPipe( CommPipe, NULL )) ) { Result = ReadFile( CommPipe, &Req, sizeof(Req), &BytesRead, NULL ); @@ -52,6 +55,21 @@ case DhcpReqRenewIpAddress: BytesWritten = DSRenewIpAddressLease( PipeSend, &Req ); break; + + case DhcpReqStaticRefreshParams: + BytesWritten = DSStaticRefreshParams( PipeSend, &Req ); + break; + + case DhcpReqGetAdapterInfo: + BytesWritten = DSGetAdapterInfo( PipeSend, &Req ); + break; + + default: + DPRINT1("Unrecognized request type %d\n", Req.Type); + ZeroMemory( &Reply, sizeof( COMM_DHCP_REPLY ) ); + Reply.Reply = 0; + BytesWritten = PipeSend( &Reply ); + break; } } DisconnectNamedPipe( CommPipe );

1 0

[frik85] 20735: add support for swedish and italian languages
by frik85＠svn.reactos.org 08 Jan '06

08 Jan '06

add support for swedish and italian languages Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/structure.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php --- trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php 2006-01-08 21:32:30 UTC (rev 20734) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php 2006-01-08 21:38:13 UTC (rev 20735) @@ -62,7 +62,7 @@ // myReactOS Content -$roscms_langres['myReactOS_description'] = 'Un'interfaccia potente e facile da usare per gestire il tuo ReactOS homepage account.'; +$roscms_langres['myReactOS_description'] = 'Un interfaccia potente e facile da usare per gestire il tuo ReactOS homepage account.'; $roscms_langres['Account_Information'] = 'Informazioni Account'; $roscms_langres['Account_Information_description'] = 'Un riassunto delle informazioni sul tuo account ... &ltda supportare>'; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/structure.php --- trunk/web/reactos.org/htdocs/roscms/inc/structure.php 2006-01-08 21:32:30 UTC (rev 20734) +++ trunk/web/reactos.org/htdocs/roscms/inc/structure.php 2006-01-08 21:38:13 UTC (rev 20735) @@ -127,6 +127,9 @@ <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=de">Deutsch (German)</option> <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=fr">Franþais (French)</option> <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=ru">Russian (Russian)</option> + <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=es">Spanish</option> + <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=sv">Swedish</option> + <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=it">Italian</option> </optgroup> </select> </div>

1 0

[frik85] 20734: add support for swedish and italian languages
by frik85＠svn.reactos.org 08 Jan '06

08 Jan '06

add support for swedish and italian languages Modified: trunk/web/reactos.org/htdocs/roscms/index.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/index.php --- trunk/web/reactos.org/htdocs/roscms/index.php 2006-01-08 21:26:34 UTC (rev 20733) +++ trunk/web/reactos.org/htdocs/roscms/index.php 2006-01-08 21:32:30 UTC (rev 20734) @@ -126,6 +126,8 @@ case 'fr': case 'ru': case 'es': + case 'sv': + case 'it': break; default: $checked_lang = ''; @@ -228,6 +230,24 @@ $rpm_lang_session="ru/"; $rpm_lang="ru"; } + $var = ""; + $var = strchr($roscms_referrer, "/es/"); + if ($var != "" AND $rpm_lang == "") { + $rpm_lang_session="es/"; + $rpm_lang="ru"; + } + $var = ""; + $var = strchr($roscms_referrer, "/sv/"); + if ($var != "" AND $rpm_lang == "") { + $rpm_lang_session="sv/"; + $rpm_lang="ru"; + } + $var = ""; + $var = strchr($roscms_referrer, "/it/"); + if ($var != "" AND $rpm_lang == "") { + $rpm_lang_session="it/"; + $rpm_lang="ru"; + } if ($rpm_lang == "") { $rpm_lang_session="en/"; $rpm_lang="en";

1 0

[turner] 20733: Check for NULL char and not '\' ;)
by turner＠svn.reactos.org 08 Jan '06

08 Jan '06

Check for NULL char and not '\' ;) Modified: trunk/reactos/subsys/system/cmd/misc.c _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2006-01-08 21:26:17 UTC (rev 20732) +++ trunk/reactos/subsys/system/cmd/misc.c 2006-01-08 21:26:34 UTC (rev 20733) @@ -372,7 +372,7 @@ { /* Check to make sure if there is no ending " * we dont run over the null char */ - if(*s != _T('/')) + if(*s == _T('\0')) { break; }

1 0

[ion] 20732: - Forgot this file for msvc build
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

- Forgot this file for msvc build Modified: trunk/reactos/include/subsys/lsass/lsass.h _____ Modified: trunk/reactos/include/subsys/lsass/lsass.h --- trunk/reactos/include/subsys/lsass/lsass.h 2006-01-08 21:17:40 UTC (rev 20731) +++ trunk/reactos/include/subsys/lsass/lsass.h 2006-01-08 21:26:17 UTC (rev 20732) @@ -35,11 +35,13 @@ typedef struct _LSASS_DEREGISTER_LOGON_PROCESS_REQUEST { + ULONG Dummy; } LSASS_DEREGISTER_LOGON_PROCESS_REQUEST, *PLSASS_DEREGISTER_LOGON_PROCES_REQUEST; typedef struct _LSASS_DEREGISTER_LOGON_PROCESS_REPLY -{ +{ + ULONG Dummy; } LSASS_DEREGISTER_LOGON_PROCESS_REPLY, *PLSASS_DEREGISTER_LOGON_PROCESS_REPLY;

1 0

[turner] 20731: Check to see if we are at the end of the string even if there isnt a " there.
by turner＠svn.reactos.org 08 Jan '06

08 Jan '06

Check to see if we are at the end of the string even if there isnt a " there. Modified: trunk/reactos/subsys/system/cmd/misc.c _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2006-01-08 21:09:00 UTC (rev 20730) +++ trunk/reactos/subsys/system/cmd/misc.c 2006-01-08 21:17:40 UTC (rev 20731) @@ -370,6 +370,12 @@ /* adjust string pointer if quoted (") */ if (bQuoted) { + /* Check to make sure if there is no ending " + * we dont run over the null char */ + if(*s != _T('/')) + { + break; + } ++s; bQuoted = FALSE; }

1 0

[frik85] 20730: altered several year numbers from "2005" to "2006"
by frik85＠svn.reactos.org 08 Jan '06

08 Jan '06

altered several year numbers from "2005" to "2006" Modified: trunk/reactos/include/reactos/resource.h Modified: trunk/reactos/include/reactos/version.rc Modified: trunk/reactos/lib/freetype/freetype.rc Modified: trunk/reactos/lib/shell32/authors.c Modified: trunk/reactos/subsys/system/cmd/cmd.rc _____ Modified: trunk/reactos/include/reactos/resource.h --- trunk/reactos/include/reactos/resource.h 2006-01-08 20:50:08 UTC (rev 20729) +++ trunk/reactos/include/reactos/resource.h 2006-01-08 21:09:00 UTC (rev 20730) @@ -22,7 +22,7 @@ /* Common version strings for rc scripts */ #define RES_STR_COMPANY_NAME "ReactOS Development Team\0" -#define RES_STR_LEGAL_COPYRIGHT "Copyright (c) 1998-2005 ReactOS Team\0" +#define RES_STR_LEGAL_COPYRIGHT "Copyright (c) 1998-2006 ReactOS Team\0" #define RES_STR_PRODUCT_NAME "ReactOS Operating System\0" #define RES_STR_PRODUCT_VERSION KERNEL_VERSION_RC #define RES_STR_BUILD_DATE KERNEL_VERSION_BUILD_RC _____ Modified: trunk/reactos/include/reactos/version.rc --- trunk/reactos/include/reactos/version.rc 2006-01-08 20:50:08 UTC (rev 20729) +++ trunk/reactos/include/reactos/version.rc 2006-01-08 21:09:00 UTC (rev 20730) @@ -78,7 +78,7 @@ #endif /* REACTOS_STR_INTERNAL_NAME */ #ifndef REACTOS_STR_LEGAL_COPYRIGHT -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2005 ReactOS Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2006 ReactOS Team\0" #endif /* REACTOS_STR_LEGAL_COPYRIGHT */ #ifndef REACTOS_STR_ORIGINAL_FILENAME _____ Modified: trunk/reactos/lib/freetype/freetype.rc --- trunk/reactos/lib/freetype/freetype.rc 2006-01-08 20:50:08 UTC (rev 20729) +++ trunk/reactos/lib/freetype/freetype.rc 2006-01-08 21:09:00 UTC (rev 20730) @@ -3,6 +3,6 @@ #define REACTOS_STR_INTERNAL_NAME "freetype\0" #define REACTOS_STR_ORIGINAL_FILENAME "freetype.dll\0" #define REACTOS_STR_COMPANY_NAME "ReactOS Development Team/FreeType Team\0" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2005 ReactOS Team\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright 1996-2005 FreeType Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2006 ReactOS Team\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright 1996-2006 FreeType Team\0" #include <reactos/version.rc> _____ Modified: trunk/reactos/lib/shell32/authors.c --- trunk/reactos/lib/shell32/authors.c 2006-01-08 20:50:08 UTC (rev 20729) +++ trunk/reactos/lib/shell32/authors.c 2006-01-08 21:09:00 UTC (rev 20730) @@ -1 +1 @@ -const char * const SHELL_Authors[] = { "Copyright 1993-2005 WINE team", "Copyright 1998-2005 ReactOS Team", 0 }; +const char * const SHELL_Authors[] = { "Copyright 1993-2006 WINE team", "Copyright 1998-2006 ReactOS Team", 0 }; _____ Modified: trunk/reactos/subsys/system/cmd/cmd.rc --- trunk/reactos/subsys/system/cmd/cmd.rc 2006-01-08 20:50:08 UTC (rev 20729) +++ trunk/reactos/subsys/system/cmd/cmd.rc 2006-01-08 21:09:00 UTC (rev 20730) @@ -5,7 +5,7 @@ #define REACTOS_STR_INTERNAL_NAME "cmd\0" #define REACTOS_STR_ORIGINAL_FILENAME "cmd.exe\0" #define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (C) 1994-1998 Tim Norman and others\0" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright (C) 1998-2005 Eric Kohl and others\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright (C) 1998-2006 Eric Kohl and others\0" #include <reactos/version.rc> #include "En.rc"

1 0

[gvg] 20729: - Scream a little louder about unimplemented IOCTL codes
by gvg＠svn.reactos.org 08 Jan '06

08 Jan '06

- Scream a little louder about unimplemented IOCTL codes - Work around missing FSCTL_PIPE_TRANSCEIVE implementation Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2006-01-08 20:33:14 UTC (rev 20728) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2006-01-08 20:50:08 UTC (rev 20729) @@ -394,7 +394,7 @@ switch (IoStack->Parameters.FileSystemControl.FsControlCode) { case FSCTL_PIPE_ASSIGN_EVENT: - DPRINT("Assign event\n"); + DPRINT1("Assign event not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; @@ -414,12 +414,14 @@ break; case FSCTL_PIPE_QUERY_EVENT: - DPRINT("Query event\n"); + DPRINT1("Query event not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_TRANSCEIVE: - DPRINT("Transceive\n"); + /* If you implement this, please remove the workaround in + lib/kernel32/file/npipe.c function TransactNamedPipe() */ + DPRINT1("Transceive not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; @@ -429,42 +431,43 @@ break; case FSCTL_PIPE_IMPERSONATE: - DPRINT("Impersonate\n"); + DPRINT1("Impersonate not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_SET_CLIENT_PROCESS: - DPRINT("Set client process\n"); + DPRINT1("Set client process not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_QUERY_CLIENT_PROCESS: - DPRINT("Query client process\n"); + DPRINT1("Query client process not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_INTERNAL_READ: - DPRINT("Internal read\n"); + DPRINT1("Internal read not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_INTERNAL_WRITE: - DPRINT("Internal write\n"); + DPRINT1("Internal write not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_INTERNAL_TRANSCEIVE: - DPRINT("Internal transceive\n"); + DPRINT1("Internal transceive not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; case FSCTL_PIPE_INTERNAL_READ_OVFLOW: - DPRINT("Internal read overflow\n"); + DPRINT1("Internal read overflow not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; default: - DPRINT("IoControlCode: %x\n", IoStack->Parameters.FileSystemControl.FsControlCode); + DPRINT1("Unrecognized IoControlCode: %x\n", + IoStack->Parameters.FileSystemControl.FsControlCode); Status = STATUS_UNSUCCESSFUL; } _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2006-01-08 20:33:14 UTC (rev 20728) +++ trunk/reactos/lib/kernel32/file/npipe.c 2006-01-08 20:50:08 UTC (rev 20729) @@ -1150,6 +1150,7 @@ } else { +#if 0 /* We don't implement FSCTL_PIPE_TRANSCEIVE yet */ IO_STATUS_BLOCK Iosb; Status = NtFsControlFile(hNamedPipe, @@ -1187,6 +1188,31 @@ SetLastErrorByStatus(Status); return FALSE; } +#else /* Workaround while FSCTL_PIPE_TRANSCEIVE not available */ + DWORD nActualBytes; + + while (0 != nInBufferSize && + WriteFile(hNamedPipe, lpInBuffer, nInBufferSize, &nActualBytes, + NULL)) + { + lpInBuffer = (LPVOID)((char *) lpInBuffer + nActualBytes); + nInBufferSize -= nActualBytes; + } + if (0 != nInBufferSize) + { + /* Must have dropped out of the while 'cause WriteFile failed */ + return FALSE; + } + if (! ReadFile(hNamedPipe, lpOutBuffer, nOutBufferSize, &nActualBytes, + NULL)) + { + return FALSE; + } + if (NULL != lpBytesRead) + { + *lpBytesRead = nActualBytes; + } +#endif } return TRUE;

1 0

[cwittich] 20728: fixed two bugs (spotted by w3seek)
by cwittich＠svn.reactos.org 08 Jan '06

08 Jan '06

fixed two bugs (spotted by w3seek) Modified: trunk/reactos/subsys/system/msconfig/startuppage.c Modified: trunk/reactos/subsys/system/notepad/main.c _____ Modified: trunk/reactos/subsys/system/msconfig/startuppage.c --- trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 20:12:11 UTC (rev 20727) +++ trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 20:33:14 UTC (rev 20728) @@ -75,7 +75,7 @@ { dwValueLength = MAX_KEY_LENGTH; dwDataLength = MAX_VALUE_NAME; - Data = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME); + Data = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME * sizeof(TCHAR)); if (Data == NULL) break; retVal = RegEnumValue(hKey, Index, lpValueName, &dwValueLength, NULL, &dwType, (LPBYTE)Data, &dwDataLength); _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2006-01-08 20:12:11 UTC (rev 20727) +++ trunk/reactos/subsys/system/notepad/main.c 2006-01-08 20:33:14 UTC (rev 20728) @@ -37,7 +37,7 @@ { lstrcpy(Globals.szFileName, szFileName); Globals.szFileTitle[0] = 0; - GetFileTitle(szFileName, Globals.szFileTitle, wcslen(Globals.szFileTitle)); + GetFileTitle(szFileName, Globals.szFileTitle, sizeof(Globals.szFileTitle) / sizeof(Globals.szFileTitle[0])); } /***********************************************************************

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