Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 18958: - Split files
by gedmurphy＠svn.reactos.com 02 Nov '05

02 Nov '05

- Split files - start to implement 'start' - split and rewrite much of the 'query' functionality - a lot of code "altering" Comments are a bit vauge, but it's still very incomplete and untested and most changes aren't worth mentioning. Added: trunk/reactos/subsys/system/sc/control.c Added: trunk/reactos/subsys/system/sc/create.c Added: trunk/reactos/subsys/system/sc/delete.c Deleted: trunk/reactos/subsys/system/sc/manage.c Modified: trunk/reactos/subsys/system/sc/query.c Modified: trunk/reactos/subsys/system/sc/sc.c Modified: trunk/reactos/subsys/system/sc/sc.h Added: trunk/reactos/subsys/system/sc/start.c Modified: trunk/reactos/subsys/system/sc/usage.c _____ Added: trunk/reactos/subsys/system/sc/control.c --- trunk/reactos/subsys/system/sc/control.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/control.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -0,0 +1,45 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/control.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + +#include "sc.h" + +/* + * handles the following commands: + * control, continue, interrogate, pause, stop + */ + +BOOL Control(DWORD Control, TCHAR **Args) +{ + SC_HANDLE hSc; + SERVICE_STATUS Status; + LPCTSTR ServiceName = *Args; + + + hSc = OpenService(hSCManager, ServiceName, DELETE); + + if (hSc == NULL) + { + _tprintf(_T("openService failed\n")); + ReportLastError(); + return FALSE; + } + + if (! ControlService(hSc, Control, &Status)) + { + _tprintf(_T("controlService failed\n")); + ReportLastError(); + return FALSE; + } + + CloseServiceHandle(hSc); + return TRUE; + +} Property changes on: trunk/reactos/subsys/system/sc/control.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/sc/create.c --- trunk/reactos/subsys/system/sc/create.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/create.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -0,0 +1,57 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/create.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + +#include "sc.h" + +BOOL Create(TCHAR **Args) +{ + SC_HANDLE hSc; + LPCTSTR ServiceName = *Args; + LPCTSTR BinaryPathName = *++Args; + LPCTSTR *Options = (LPCTSTR *)++Args; + + /* testing */ + printf("service to create - %s\n", ServiceName); + printf("Binary path - %s\n", BinaryPathName); + printf("Arguments :\n"); + while (*Options) + { + printf("%s\n", *Options); + Options++; + } + + + hSc = CreateService(hSCManager, + ServiceName, + ServiceName, + SERVICE_ALL_ACCESS, + SERVICE_WIN32_OWN_PROCESS, + SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, + BinaryPathName, + NULL, + NULL, + NULL, + NULL, + NULL); + + if (hSc == NULL) + { + _tprintf(_T("CreateService failed\n")); + ReportLastError(); + return FALSE; + } + else + { + CloseServiceHandle(hSc); + return TRUE; + } +} Property changes on: trunk/reactos/subsys/system/sc/create.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/sc/delete.c --- trunk/reactos/subsys/system/sc/delete.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/delete.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -0,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/delete.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + +#include "sc.h" + +BOOL Delete(TCHAR **Args) +{ + SC_HANDLE hSc; + LPCTSTR ServiceName = *Args; + + /* testing */ + printf("service to delete - %s\n\n", ServiceName); + + hSc = OpenService(hSCManager, ServiceName, DELETE); + + if (hSc == NULL) + { + _tprintf(_T("openService failed\n")); + ReportLastError(); + return FALSE; + } + + if (! DeleteService(hSc)) + { + _tprintf(_T("DeleteService failed\n")); + ReportLastError(); + return FALSE; + } + + CloseServiceHandle(hSc); + return TRUE; +} Property changes on: trunk/reactos/subsys/system/sc/delete.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Deleted: trunk/reactos/subsys/system/sc/manage.c --- trunk/reactos/subsys/system/sc/manage.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/manage.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -1,121 +0,0 @@ -#include "sc.h" - -extern SC_HANDLE hSCManager; // declared in sc.c - -BOOL Start(INT ArgCount, TCHAR **Args) -{ - SC_HANDLE hSc; - LPCTSTR ServiceName = *Args++; - LPCTSTR *ServiceArgs = &*Args; - - hSc = OpenService(hSCManager, ServiceName, SERVICE_ALL_ACCESS); - - if (hSc == NULL) - { - dprintf("openService failed\n"); - ReportLastError(); - return FALSE; - } - - if (! StartService(hSc, ArgCount, ServiceArgs)) - { - dprintf("DeleteService failed\n"); - ReportLastError(); - return FALSE; - } - - CloseServiceHandle(hSc); - return TRUE; - -} - - -BOOL Create(TCHAR **Args) -{ - SC_HANDLE hSc; - LPCTSTR Name = *Args; - LPCTSTR BinaryPathName = *++Args; - - - hSc = CreateService(hSCManager, - Name, - Name, - SERVICE_ALL_ACCESS, - SERVICE_WIN32_OWN_PROCESS, - SERVICE_DEMAND_START, - SERVICE_ERROR_NORMAL, - BinaryPathName, - NULL, - NULL, - NULL, - NULL, - NULL); - - if (hSc == NULL) - { - dprintf("CreateService failed (%d)\n"); - ReportLastError(); - return FALSE; - } - else - { - CloseServiceHandle(hSc); - return TRUE; - } -} - -BOOL Delete(TCHAR **Args) -{ - SC_HANDLE hSc; - LPCTSTR ServiceName = *Args; - - hSc = OpenService(hSCManager, ServiceName, DELETE); - - if (hSc == NULL) - { - dprintf("openService failed\n"); - ReportLastError(); - return FALSE; - } - - if (! DeleteService(hSc)) - { - dprintf("DeleteService failed\n"); - ReportLastError(); - return FALSE; - } - - CloseServiceHandle(hSc); - return TRUE; -} - - -BOOL Control(DWORD Control, TCHAR **Args) -{ - SC_HANDLE hSc; - SERVICE_STATUS Status; - LPCTSTR ServiceName = *Args; - - - hSc = OpenService(hSCManager, ServiceName, DELETE); - - if (hSc == NULL) - { - dprintf("openService failed\n"); - ReportLastError(); - return FALSE; - } - - if (! ControlService(hSc, Control, &Status)) - { - dprintf("controlService failed\n"); - ReportLastError(); - return FALSE; - } - - CloseServiceHandle(hSc); - return TRUE; - -} - - _____ Modified: trunk/reactos/subsys/system/sc/query.c --- trunk/reactos/subsys/system/sc/query.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/query.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -1,107 +1,175 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/query.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + #include "sc.h" -extern SC_HANDLE hSCManager; /* declared in sc.c */ +/* local function decs */ +VOID PrintService(ENUM_SERVICE_STATUS_PROCESS *pSStatus, BOOL bExtended); +INT EnumServices(DWORD ServiceType, DWORD ServiceState); +/* global variables */ +static ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; + BOOL Query(TCHAR **Args, BOOL bExtended) { - SC_HANDLE hSc; - ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; - DWORD BufSize = 0; - DWORD BytesNeeded; - DWORD NumServices; - DWORD ResumeHandle; - INT i; + + LPCTSTR ServiceName = *Args; - /* determine required buffer size */ - EnumServicesStatusEx(hSCManager, - SC_ENUM_PROCESS_INFO, - SERVICE_DRIVER | SERVICE_WIN32, - SERVICE_STATE_ALL, - (LPBYTE)pServiceStatus, - BufSize, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0); + if (! *Args) + { + printf("Service name %s\n", ServiceName); // test - /* exit on failure */ - if (GetLastError() != ERROR_MORE_DATA) - { - ReportLastError(); - return FALSE; + /* get default values */ + EnumServices(SERVICE_WIN32, SERVICE_ACTIVE); + + /* print default values */ + PrintService(pServiceStatus, bExtended); } - /* reserve memory for service info array */ - pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) malloc(BytesNeeded); - - /* fill array with service info */ - if (! EnumServicesStatusEx(hSCManager, - SC_ENUM_PROCESS_INFO, - SERVICE_DRIVER | SERVICE_WIN32, - SERVICE_STATE_ALL, - (LPBYTE)pServiceStatus, - BufSize, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0)) + if (_tcsicmp(Args[0], _T("type=")) == 0) { - dprintf("Call to EnumServicesStatusEx failed : "); - ReportLastError(); - return FALSE; + TCHAR *Type = *++Args; + _tprintf(_T("got type\narg = %s\n"), Type); // test + if (_tcsicmp(Type, _T("driver")) == 0) + EnumServices(SERVICE_DRIVER, SERVICE_STATE_ALL); + else if (_tcsicmp(Type, _T("service")) == 0) + EnumServices(SERVICE_WIN32, SERVICE_STATE_ALL); + else if (_tcsicmp(Type, _T("all")) == 0) + EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_STATE_ALL); + else + { + _tprintf(_T("\nERROR following \"type=\"!\n")); + _tprintf(_T("Must be \"driver\" or \"service\" or \"all\"\n")); + } + + PrintService(pServiceStatus, bExtended); } -/* - for (i=0; i<NumServices; i++) + else if(_tcsicmp(Args[0], _T("state=")) == 0) { - if (Args == NULL) + TCHAR *State = *++Args; + + if (_tcsicmp(State, _T("active")) == 0) + EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_ACTIVE); + else if (_tcsicmp(State, _T("inactive")) == 0) + EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_INACTIVE); + else if (_tcsicmp(State, _T("all")) == 0) + EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_STATE_ALL); + else { - if (pServiceStatus[i]->dwServiceType == SERVICE_WIN32 && - pServiceStatus[i]->dwServiceState == SERVICE_ACTIVE) - PrintService(pServiceStatus[i], bExtended); - continue; + _tprintf(_T("\nERROR following \"state=\"!\n")); + _tprintf(_T("Must be \"active\" or \"inactive\" or \"all\"\n")); } - - if(_tcsicmp(Args[0], _T("type=")) + + PrintService(pServiceStatus, bExtended); + } + else + { + printf("no args\n"); // test + /* get default values */ + EnumServices(SERVICE_WIN32, SERVICE_ACTIVE); - else if(_tcsicmp(Args[0], _T("state=")) + /* print default values */ + PrintService(pServiceStatus, bExtended); + } - else if(_tcsicmp(Args[0], _T("bufsize=")) +/* + else if(_tcsicmp(Args[0], _T("bufsize="))) - else if(_tcsicmp(Args[0], _T("ri=")) - - else if(_tcsicmp(Args[0], _T("group=")) + else if(_tcsicmp(Args[0], _T("ri="))) + else if(_tcsicmp(Args[0], _T("group="))) */ } +INT EnumServices(DWORD ServiceType, DWORD ServiceState) +{ + SC_HANDLE hSc; + DWORD BufSize = 0; + DWORD BytesNeeded = 0; + DWORD NumServices = 0; + DWORD ResumeHandle = 0; + + /* determine required buffer size */ + if (! EnumServicesStatusEx(hSCManager, + SC_ENUM_PROCESS_INFO, + ServiceType, + ServiceState, + (LPBYTE)pServiceStatus, + BufSize, + &BytesNeeded, + &NumServices, + &ResumeHandle, + 0)) + { + /* Call function again if required size was returned */ + if (GetLastError() == ERROR_MORE_DATA) + { + /* reserve memory for service info array */ + pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) malloc(BytesNeeded); + + /* fill array with service info */ + if (! EnumServicesStatusEx(hSCManager, + SC_ENUM_PROCESS_INFO, + SERVICE_DRIVER | SERVICE_WIN32, + SERVICE_STATE_ALL, + (LPBYTE)pServiceStatus, + BufSize, + &BytesNeeded, + &NumServices, + &ResumeHandle, + 0)) + { + _tprintf(_T("Second call to EnumServicesStatusEx failed : ")); + ReportLastError(); + return FALSE; + } + } + else /* exit on failure */ + { + _tprintf(_T("First call to EnumServicesStatusEx failed : ")); + ReportLastError(); + return FALSE; + } + } +} + + VOID PrintService(ENUM_SERVICE_STATUS_PROCESS *pServiceStatus, BOOL bExtended) { - dprintf("SERVICE_NAME: %s\n", pServiceStatus->lpServiceName); - dprintf("DISPLAY_NAME: %s\n", pServiceStatus->lpDisplayName); - dprintf("TYPE : %lu\n", + _tprintf(_T("SERVICE_NAME: %s\n"), pServiceStatus->lpServiceName); + _tprintf(_T("DISPLAY_NAME: %s\n"), pServiceStatus->lpDisplayName); + _tprintf(_T("TYPE : %lu\n"), pServiceStatus->ServiceStatusProcess.dwServiceType); - dprintf("STATE : %lu\n", + _tprintf(_T("STATE : %lu\n"), pServiceStatus->ServiceStatusProcess.dwCurrentState); // (STOPPABLE,NOT_PAUSABLE,ACCEPTS_SHUTDOWN) - dprintf("WIN32_EXIT_CODE : %lu \n", + _tprintf(_T("WIN32_EXIT_CODE : %lu \n"), pServiceStatus->ServiceStatusProcess.dwWin32ExitCode); - dprintf("SERVICE_EXIT_CODE : %lu \n", + _tprintf(_T("SERVICE_EXIT_CODE : %lu \n"), pServiceStatus->ServiceStatusProcess.dwServiceSpecificExitCode); - dprintf("CHECKPOINT : %lu\n", + _tprintf(_T("CHECKPOINT : %lu\n"), pServiceStatus->ServiceStatusProcess.dwCheckPoint); - dprintf("WAIT_HINT : %lu\n", + _tprintf(_T("WAIT_HINT : %lu\n"), pServiceStatus->ServiceStatusProcess.dwWaitHint); if (bExtended) { - dprintf("PID : %lu\n", + _tprintf(_T("PID : %lu\n"), pServiceStatus->ServiceStatusProcess.dwProcessId); - dprintf("FLAGS : %lu\n", + _tprintf(_T("FLAGS : %lu\n"), pServiceStatus->ServiceStatusProcess.dwServiceFlags); } } _____ Modified: trunk/reactos/subsys/system/sc/sc.c --- trunk/reactos/subsys/system/sc/sc.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/sc.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -1,21 +1,18 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/sc.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + #include "sc.h" -HANDLE OutputHandle; -HANDLE InputHandle; - SC_HANDLE hSCManager; -VOID dprintf(TCHAR* fmt, ...) -{ - va_list args; - char buffer[255]; - - va_start(args, fmt); - wvsprintfA(buffer, fmt, args); - WriteConsole(OutputHandle, buffer, lstrlenA(buffer), NULL, NULL); - va_end(args); -} - DWORD ReportLastError(VOID) { LPVOID lpMsgBuf; @@ -52,19 +49,19 @@ if (MachineName) { - dprintf("Remote service control is not yet implemented\n"); + _tprintf(_T("Remote service control is not yet implemented\n")); return 2; } - +/* hSCManager = OpenSCManager(MachineName, NULL, SC_MANAGER_ALL_ACCESS); if (hSCManager == NULL) { - dprintf("[SC] OpenSCManager FAILED \n"); + _tprintf(_T("[SC] OpenSCManager FAILED %d:\n\n"), GetLastError()); ReportLastError(); return -1; } +*/ - if (_tcsicmp(Command, _T("query")) == 0) Query(Args, FALSE); @@ -73,46 +70,70 @@ else if (_tcsicmp(Command, _T("start")) == 0) { - /*if (! **Args) + if (*Args) + Start(3, Args); + else StartUsage(); + } + else if (_tcsicmp(Command, _T("pause")) == 0) + { + if (*Args) + Control(SERVICE_CONTROL_PAUSE, Args); else - Start(Args);*/ + PauseUsage(); } - else if (_tcsicmp(Command, _T("pause")) == 0) - Control(SERVICE_CONTROL_PAUSE, ++Args); - else if (_tcsicmp(Command, _T("interrogate")) == 0) - Control(SERVICE_CONTROL_INTERROGATE, ++Args); - - else if (_tcsicmp(Command, _T("interrogate")) == 0) - Control(SERVICE_CONTROL_INTERROGATE, ++Args); - + { + if (*Args) + Control(SERVICE_CONTROL_INTERROGATE, Args); + else + InterrogateUsage(); + } + else if (_tcsicmp(Command, _T("stop")) == 0) + { + if (*Args) + Control(SERVICE_CONTROL_STOP, Args); + else + StopUsage(); + } else if (_tcsicmp(Command, _T("continue")) == 0) - Control(SERVICE_CONTROL_CONTINUE, ++Args); - + { + if (*Args) + Control(SERVICE_CONTROL_CONTINUE, Args); + else + ContinueUsage(); + } else if (_tcsicmp(Command, _T("delete")) == 0) - Delete(Args); - + { + if (*Args) + Delete(Args); + else + DeleteUsage(); + } else if (_tcsicmp(Command, _T("create")) == 0) - Create(Args); - + { + if (*Args) + Create(Args); + else + CreateUsage(); + } else if (_tcsicmp(Command, _T("control")) == 0) - Control((DWORD)NULL, Args); - + { + if (*Args) + Control((DWORD)NULL, ++Args); + else + ContinueUsage(); + } return 0; } -int main(int argc, char* argv[]) +int _tmain(DWORD argc, LPCTSTR argv[]) { LPTSTR MachineName = NULL; // remote machine LPCTSTR Command = argv[1]; // sc command TCHAR **Args = NULL; // rest of args - /* initialize standard input / output and get handles */ - AllocConsole(); - InputHandle = GetStdHandle(STD_INPUT_HANDLE); - OutputHandle = GetStdHandle(STD_OUTPUT_HANDLE); if (argc < 2) return MainUsage(); @@ -125,12 +146,12 @@ _tcscpy(MachineName, argv[1]); Command = argv[2]; - Args = &argv[3]; + Args = (TCHAR **)&argv[3]; return ScControl(MachineName, Command, Args); } else { - Args = &argv[2]; + Args = (TCHAR **)&argv[2]; return ScControl(MachineName, Command, Args); } _____ Modified: trunk/reactos/subsys/system/sc/sc.h --- trunk/reactos/subsys/system/sc/sc.h 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/sc.h 2005-11-02 21:10:50 UTC (rev 18958) @@ -2,9 +2,21 @@ #include <stdio.h> #include <tchar.h> +extern SC_HANDLE hSCManager; // declared in sc.c + +//#define DBG + +/* control functions */ +BOOL Query(TCHAR **Args, BOOL bExtended); +BOOL Start(INT ArgCount, TCHAR **Args); +BOOL Create(TCHAR **Args); +BOOL Delete(TCHAR **Args); +BOOL Control(DWORD Control, TCHAR **Args); + +/* print and error functions */ DWORD ReportLastError(VOID); -VOID dprintf(TCHAR* fmt, ...); +/* usage functions */ INT MainUsage(VOID); INT StartUsage(VOID); INT PauseUsage(VOID); @@ -13,9 +25,3 @@ INT StopUsage(VOID); INT ConfigUsage(VOID); INT DescriptionUsage(VOID); - -BOOL Query(TCHAR **Args, BOOL bExtended); -BOOL Start(INT ArgCount, TCHAR **Args); -BOOL Create(TCHAR **Args); -BOOL Delete(TCHAR **Args); -BOOL Control(DWORD Control, TCHAR **Args); _____ Added: trunk/reactos/subsys/system/sc/start.c --- trunk/reactos/subsys/system/sc/start.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/start.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -0,0 +1,101 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/start.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + +#include "sc.h" + +BOOL Start(INT ArgCount, TCHAR **Args) +{ + SC_HANDLE hSc; + SERVICE_STATUS_PROCESS ServiceStatus; + LPCTSTR ServiceName = *Args++; + LPCTSTR *ServiceArgs = (LPCTSTR *)Args; + DWORD BytesNeeded; + + + /* testing */ + printf("service to start - %s\n\n", ServiceName); + printf("Arguments :\n"); + while (*ServiceArgs) + { + printf("%s\n", *ServiceArgs); + ServiceArgs++; + } + + /* get a handle to the service requested for starting */ + hSc = OpenService(hSCManager, ServiceName, SERVICE_ALL_ACCESS); + + if (hSc == NULL) + { + _tprintf(_T("openService failed\n")); + ReportLastError(); + return FALSE; + } + + /* start the service opened */ + if (! StartService(hSc, ArgCount, ServiceArgs)) + { + _tprintf(_T("StartService failed\n")); + ReportLastError(); + return FALSE; + } + + if (! QueryServiceStatusEx( + hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + _tprintf(_T("QueryServiceStatusEx 1 failed\n")); + ReportLastError(); + return FALSE; + } + + + while (ServiceStatus.dwCurrentState == SERVICE_START_PENDING) + { + /* wait before checking status */ + Sleep(ServiceStatus.dwWaitHint); + + /* check status again */ + if (! QueryServiceStatusEx( + hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + _tprintf(_T("QueryServiceStatusEx 2 failed\n")); + ReportLastError(); + return FALSE; + } + } + + CloseServiceHandle(hSc); + + if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) + { + _tprintf(_T("%s is running\n"), ServiceName); + return TRUE; + } + else + { + _tprintf(_T("Failed to start %s\n"), ServiceName); + _tprintf(_T("Curent state: %lu\n"), ServiceStatus.dwCurrentState); + _tprintf(_T("Exit code: %lu\n"), ServiceStatus.dwWin32ExitCode); + _tprintf(_T("Service Specific exit code: %lu\n"), + ServiceStatus.dwServiceSpecificExitCode); + _tprintf(_T("Check point: %lu\n"), ServiceStatus.dwCheckPoint); + _tprintf(_T("Wait hint: %lu\n"), ServiceStatus.dwWaitHint); + + return FALSE; + } +} Property changes on: trunk/reactos/subsys/system/sc/start.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/sc/usage.c --- trunk/reactos/subsys/system/sc/usage.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/usage.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -1,3 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/usage.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + #include "sc.h" INT MainUsage(VOID) @@ -2,40 +13,40 @@ { - dprintf("DESCRIPTION:\n"); - dprintf("\tSC is a command line program used for communicating with\n"); - dprintf("\tthe Service Control Manager and its services.\n"); - dprintf("USAGE:\n"); - dprintf("\tsc <server> [command] [service name] <option1> <option2>...\n"); + _tprintf(_T("DESCRIPTION:\n") + _T("\tSC is a command line program used for communicating with\n") + _T("\tthe Service Control Manager and its services.\n") + _T("USAGE:\n") + _T("\tsc <server> [command] [service name] <option1> <option2>...\n") - dprintf("\tThe optional parameter <server> has the form \"\\ServerName\"\n"); - dprintf("\tFurther help on commands can be obtained by typing: \"sc [command]\"\n"); - dprintf("\tService Commands:\n"); - dprintf("\t query : Queries the status for a service, or\n"); - dprintf("\t enumerates the status for types of services.\n"); - dprintf("\t queryex : Queries the extended status for a service, or\n"); -// dprintf("\t enumerates the status for types of services.\n"); - dprintf("\t start : Starts a service.\n"); - dprintf("\t pause : Sends a PAUSE control request to a service.\n"); - dprintf("\t interrogate : Sends a INTERROGATE control request to a service.\n"); -// dprintf("\t continue : Sends a CONTINUE control request to a service.\n"); - dprintf("\t stop : Sends a STOP request to a service.\n"); -// dprintf("\t config : Changes the configuration of a service (persistant).\n"); -// dprintf("\t description : Changes the description of a service.\n"); -// dprintf("\t failure : Changes the actions taken by a service upon failure.\n"); -// dprintf("\t qc : Queries the configuration information for a service.\n"); -// dprintf("\t qdescription : Queries the description for a service.\n"); -// dprintf("\t qfailure : Queries the actions taken by a service upon failure.\n"); - dprintf("\t delete : Deletes a service (from the registry).\n"); - dprintf("\t create : Creates a service. (adds it to the registry).\n"); - dprintf("\t control : Sends a control to a service.\n"); -// dprintf("\t sdshow : Displays a service's security descriptor.\n"); -// dprintf("\t sdset : Sets a service's security descriptor.\n"); -// dprintf("\t GetDisplayName : Gets the DisplayName for a service.\n"); -// dprintf("\t GetKeyName : Gets the ServiceKeyName for a service.\n"); -// dprintf("\t EnumDepend : Enumerates Service Dependencies.\n"); -// dprintf("\n"); -// dprintf("\tService Name Independant Commands:\n"); -// dprintf("\t boot : (ok | bad) Indicates whether the last boot should\n"); -// dprintf("\t be saved as the last-known-good boot configuration\n"); -// dprintf("\t Lock : Locks the SCM Database\n"); -// dprintf("\t QueryLock : Queries the LockStatus for the SCM Database\n"); + _T("\tThe optional parameter <server> has the form \"\\ServerName\"\n") + _T("\tFurther help on commands can be obtained by typing: \"sc [command]\"\n") + _T("\tService Commands:\n") + _T("\t query : Queries the status for a service, or\n") + _T("\t enumerates the status for types of services.\n") + _T("\t queryex : Queries the extended status for a service, or\n") +// _T("\t enumerates the status for types of services.\n" + _T("\t start : Starts a service.\n") + _T("\t pause : Sends a PAUSE control request to a service.\n") + _T("\t interrogate : Sends a INTERROGATE control request to a service.\n") + _T("\t continue : Sends a CONTINUE control request to a service.\n") + _T("\t stop : Sends a STOP request to a service.\n") +// "\t config : Changes the configuration of a service (persistant).\n" +// "\t description : Changes the description of a service.\n" +// "\t failure : Changes the actions taken by a service upon failure.\n" +// "\t qc : Queries the configuration information for a service.\n" +// "\t qdescription : Queries the description for a service.\n" +// "\t qfailure : Queries the actions taken by a service upon failure.\n" + _T("\t delete : Deletes a service (from the registry).\n") + _T("\t create : Creates a service. (adds it to the registry).\n") + _T("\t control : Sends a control to a service.\n")); +// "\t sdshow : Displays a service's security descriptor.\n") +// "\t sdset : Sets a service's security descriptor.\n") +// "\t GetDisplayName : Gets the DisplayName for a service.\n") +// "\t GetKeyName : Gets the ServiceKeyName for a service.\n") +// "\t EnumDepend : Enumerates Service Dependencies.\n") +// "\n") +// "\tService Name Independant Commands:\n") +// "\t boot : (ok | bad) Indicates whether the last boot should\n") +// "\t be saved as the last-known-good boot configuration\n") +// "\t Lock : Locks the SCM Database\n") +// "\t QueryLock : Queries the LockStatus for the SCM Database\n") @@ -47,10 +58,10 @@ INT StartUsage(VOID) { - dprintf("DESCRIPTION:\n"); - dprintf(" Starts a service running.\n"); - dprintf("USAGE:\n"); - dprintf(" sc <server> start [service name] <arg1> <arg2> ...\n"); + _tprintf(_T("DESCRIPTION:\n") + _T(" Starts a service running.\n") + _T("USAGE:\n") + _T(" sc <server> start [service name] <arg1> <arg2> ...\n")); return 0; } @@ -58,48 +69,49 @@ INT PauseUsage(VOID) { - dprintf("DESCRIPTION:\n"); - dprintf(" Sends a PAUSE control request to a service.\n"); - dprintf("USAGE:\n"); - dprintf(" sc <server> pause [service name]\n"); + _tprintf(_T("DESCRIPTION:\n") + _T(" Sends a PAUSE control request to a service.\n") + _T("USAGE:\n") + _T(" sc <server> pause [service name]\n")); return 0; } INT InterrogateUsage(VOID) { - dprintf("DESCRIPTION:\n"); - dprintf(" Sends an INTERROGATE control request to a service.\n"); - dprintf("USAGE:\n"); - dprintf(" sc <server> interrogate [service name]\n"); + _tprintf(_T("DESCRIPTION:\n") [truncated at 1000 lines; 87 more skipped]

1 0

[gvg] 18957: Sync to Wine-0_9:
by gvg＠svn.reactos.com 02 Nov '05

02 Nov '05

Sync to Wine-0_9: Vincent Béron <vberon(a)mecano.gme.usherb.ca> - Allow file:/// protocol to be used to download the Mozilla ActiveX control. - Remove tempfile used to download Mozilla ActiveX control once it's not used anymore. Alexandre Julliard <julliard(a)winehq.org> - Fixed a handle leak. Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c _____ Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c --- trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-11-02 20:50:50 UTC (rev 18956) +++ trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-11-02 21:05:35 UTC (rev 18957) @@ -307,6 +307,7 @@ { IBindStatusCallback *dl; static const WCHAR szUrlVal[] = {'M','o','z','i','l','l','a','U','r','l',0}; + static const WCHAR szFileProtocol[] = {'f','i','l','e',':','/','/','/',0}; WCHAR path[MAX_PATH], szUrl[MAX_PATH]; LPWSTR p; STARTUPINFOW si; @@ -315,6 +316,7 @@ DWORD r, sz, type; HKEY hkey; BOOL bCancelled = FALSE; + BOOL bTempfile = FALSE; /* find the name of the thing to download */ szUrl[0] = 0; @@ -329,21 +331,27 @@ if( r != ERROR_SUCCESS ) goto end; - /* built the path for the download */ - p = strrchrW( szUrl, '/' ); - if (!p) - goto end; - if (!GetTempPathW( MAX_PATH, path )) - goto end; - strcatW( path, p+1 ); + if( !strncmpW(szUrl, szFileProtocol, strlenW(szFileProtocol)) ) + lstrcpynW( path, szUrl+strlenW(szFileProtocol), MAX_PATH ); + else + { + /* built the path for the download */ + p = strrchrW( szUrl, '/' ); + if (!p) + goto end; + if (!GetTempPathW( MAX_PATH, path )) + goto end; + strcatW( path, p+1 ); - /* download it */ - dl = create_dl(info, &bCancelled); - r = URLDownloadToFileW( NULL, szUrl, path, 0, dl ); - if( dl ) - IBindStatusCallback_Release( dl ); - if( (r != S_OK) || bCancelled ) - goto end; + /* download it */ + bTempfile = TRUE; + dl = create_dl(info, &bCancelled); + r = URLDownloadToFileW( NULL, szUrl, path, 0, dl ); + if( dl ) + IBindStatusCallback_Release( dl ); + if( (r != S_OK) || bCancelled ) + goto end; + } /* run it */ memset( &si, 0, sizeof si ); @@ -352,8 +360,12 @@ if( !r ) goto end; WaitForSingleObject( pi.hProcess, INFINITE ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); end: + if( bTempfile ) + DeleteFileW( path ); EndDialog( hDlg, 0 ); return 0; }

1 0

[gvg] 18956: Sync to Wine-0_9:
by gvg＠svn.reactos.com 02 Nov '05

02 Nov '05

Sync to Wine-0_9: Lionel Ulmer <lionel.ulmer(a)free.fr> - fix first two arguments to 'FindExecutableA' (input strings instead of pointers) - fix last argument to 'FindExecutableW' (it's an output string) Francois Gouget <fgouget(a)free.fr> - Use "static const" rather than "const static" as gcc -W complains about the former. Jonathan Ernst <Jonathan(a)ErnstFamily.ch> - First creation of registry entries missed AppData. Aric Stewart <aric(a)codeweavers.com> - MSDN states that the pszDisplayName member of BROWSEINFO is assumed to be MAX_PATH in length. So when doing the A->W conversion in BrowseForFolderA do not set that member to be the size of the incoming string, instead make it MAX_PATH. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Use appropriate DDE APIs (ANSI or unicode) for ShellExecuteA/W, Excel 2000 depends on that. Martin Fuchs <martin-fuchs(a)gmx.net> - Simplify 'sei' structure initialization in ShellExecuteA/W. Mike McCormack <mike(a)codeweavers.com> - Use ShellLink_QueryInterface to return the right interface in IShellLink_Constructor. Richard Cohen <richard(a)daijobu.co.uk> - Don't hardcode "windows" directory. Modified: trunk/reactos/lib/shell32/brsfolder.c Modified: trunk/reactos/lib/shell32/enumidlist.c Modified: trunk/reactos/lib/shell32/shell.c Modified: trunk/reactos/lib/shell32/shell32.spec Modified: trunk/reactos/lib/shell32/shell32_main.h Modified: trunk/reactos/lib/shell32/shelllink.c Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shfldr_desktop.c Modified: trunk/reactos/lib/shell32/shlexec.c _____ Modified: trunk/reactos/lib/shell32/brsfolder.c --- trunk/reactos/lib/shell32/brsfolder.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/brsfolder.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -627,9 +627,8 @@ bi.pidlRoot = lpbi->pidlRoot; if (lpbi->pszDisplayName) { - len = MultiByteToWideChar( CP_ACP, 0, lpbi->pszDisplayName, -1, NULL, 0 ); - bi.pszDisplayName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpbi->pszDisplayName, -1, bi.pszDisplayName, len ); + bi.pszDisplayName = HeapAlloc( GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, lpbi->pszDisplayName, -1, bi.pszDisplayName, MAX_PATH ); } else bi.pszDisplayName = NULL; _____ Modified: trunk/reactos/lib/shell32/enumidlist.c --- trunk/reactos/lib/shell32/enumidlist.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/enumidlist.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -112,9 +112,9 @@ HANDLE hFile; WCHAR szPath[MAX_PATH]; BOOL succeeded = TRUE; - const static WCHAR stars[] = { '*','.','*',0 }; - const static WCHAR dot[] = { '.',0 }; - const static WCHAR dotdot[] = { '.','.',0 }; + static const WCHAR stars[] = { '*','.','*',0 }; + static const WCHAR dot[] = { '.',0 }; + static const WCHAR dotdot[] = { '.','.',0 }; TRACE("(%p)->(path=%s flags=0x%08lx) \n",list,debugstr_w(lpszPath),dwFlags); _____ Modified: trunk/reactos/lib/shell32/shell.c --- trunk/reactos/lib/shell32/shell.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shell.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -625,7 +625,7 @@ seiW.dwHotKey = 0; seiW.hProcess = hProcess; - ShellExecuteExW32 (&seiW, SHELL_Execute16); + SHELL_execute( &seiW, SHELL_Execute16, FALSE ); if (wVerb) SHFree(wVerb); if (wFile) SHFree(wFile); _____ Modified: trunk/reactos/lib/shell32/shell32.spec --- trunk/reactos/lib/shell32/shell32.spec 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shell32.spec 2005-11-02 20:50:50 UTC (rev 18956) @@ -290,8 +290,8 @@ @ stdcall ExtractIconW(long wstr long) @ stub ExtractVersionResource16W @ stub FindExeDlgProc -@ stdcall FindExecutableA(ptr ptr ptr) -@ stdcall FindExecutableW(wstr wstr wstr) +@ stdcall FindExecutableA(str str ptr) +@ stdcall FindExecutableW(wstr wstr ptr) @ stub FixupOptionalComponents @ stdcall FreeIconList(long) @ stub InternalExtractIconListA _____ Modified: trunk/reactos/lib/shell32/shell32_main.h --- trunk/reactos/lib/shell32/shell32_main.h 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shell32_main.h 2005-11-02 20:50:50 UTC (rev 18956) @@ -213,7 +213,7 @@ typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, LPSHELLEXECUTEINFOW sei, LPSHELLEXECUTEINFOW sei_out); -BOOL WINAPI ShellExecuteExW32(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc); +BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc, BOOL unicode); UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, LPWSTR lpResult, int resultLen, LPWSTR key, WCHAR **env, LPITEMIDLIST pidl, LPCWSTR args); _____ Modified: trunk/reactos/lib/shell32/shelllink.c --- trunk/reactos/lib/shell32/shelllink.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shelllink.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -1152,6 +1152,7 @@ REFIID riid, LPVOID *ppv ) { IShellLinkImpl * sl; + HRESULT r; TRACE("unkOut=%p riid=%s\n",pUnkOuter, debugstr_guid(riid)); @@ -1176,18 +1177,9 @@ TRACE("(%p)->()\n",sl); - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IShellLinkA)) - *ppv = sl; - else if (IsEqualIID(riid, &IID_IShellLinkW)) - *ppv = &(sl->lpvtblw); - else { - LocalFree((HLOCAL)sl); - ERR("E_NOINTERFACE\n"); - return E_NOINTERFACE; - } - - return S_OK; + r = ShellLink_QueryInterface( sl, riid, ppv ); + ShellLink_Release( sl ); + return r; } _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shellpath.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -805,7 +805,7 @@ /* This defaults to L"Documents and Settings" on Windows 2000/XP, but we're * acting more Windows 9x-like for now. */ -static const WCHAR szDefaultProfileDirW[] = {'w','i','n','d','o','w','s','\\','p','r','o','f','i','l','e','s','\0'}; +static const WCHAR szDefaultProfileDirW[] = {'p','r','o','f','i','l','e','s','\0'}; static const WCHAR AllUsersW[] = {'A','l','l',' ','U','s','e','r','s','\0'}; typedef enum _CSIDL_Type { @@ -1259,6 +1259,9 @@ switch (folder) { case CSIDL_PERSONAL: + case CSIDL_MYMUSIC: + case CSIDL_MYPICTURES: + case CSIDL_MYVIDEO: { const char *home = getenv("HOME"); @@ -1792,6 +1795,7 @@ CSIDL_PROGRAMS, CSIDL_PERSONAL, CSIDL_FAVORITES, + CSIDL_APPDATA, CSIDL_STARTUP, CSIDL_RECENT, CSIDL_SENDTO, _____ Modified: trunk/reactos/lib/shell32/shfldr_desktop.c --- trunk/reactos/lib/shell32/shfldr_desktop.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shfldr_desktop.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -427,7 +427,7 @@ { IGenericSFImpl *This = (IGenericSFImpl *)iface; HRESULT hr = S_OK; - const static DWORD dwDesktopAttributes = + static const DWORD dwDesktopAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; _____ Modified: trunk/reactos/lib/shell32/shlexec.c --- trunk/reactos/lib/shell32/shlexec.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shlexec.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -772,7 +772,8 @@ static unsigned dde_connect(WCHAR* key, WCHAR* start, WCHAR* ddeexec, const WCHAR* lpFile, WCHAR *env, LPCWSTR szCommandline, LPITEMIDLIST pidl, SHELL_ExecuteW32 execfunc, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) + LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, + BOOL unicode) { static const WCHAR wApplication[] = {'\\','a','p','p','l','i','c','a','t','i','o','n',0}; static const WCHAR wTopic[] = {'\\','t','o','p','i','c',0}; @@ -803,10 +804,16 @@ strcpyW(topic, wSystem); } - if (DdeInitializeW(&ddeInst, dde_cb, APPCMD_CLIENTONLY, 0L) != DMLERR_NO_ERROR) + if (unicode) { - return 2; + if (DdeInitializeW(&ddeInst, dde_cb, APPCMD_CLIENTONLY, 0L) != DMLERR_NO_ERROR) + return 2; } + else + { + if (DdeInitializeA(&ddeInst, dde_cb, APPCMD_CLIENTONLY, 0L) != DMLERR_NO_ERROR) + return 2; + } hszApp = DdeCreateStringHandleW(ddeInst, app, CP_WINUNICODE); hszTopic = DdeCreateStringHandleW(ddeInst, topic, CP_WINUNICODE); @@ -845,8 +852,18 @@ /* It's documented in the KB 330337 that IE has a bug and returns * error DMLERR_NOTPROCESSED on XTYP_EXECUTE request. */ - hDdeData = DdeClientTransaction((LPBYTE)res, (strlenW(res) + 1) * sizeof(WCHAR), hConv, 0L, 0, - XTYP_EXECUTE, 10000, &tid); + if (unicode) + hDdeData = DdeClientTransaction((LPBYTE)res, (strlenW(res) + 1) * sizeof(WCHAR), hConv, 0L, 0, + XTYP_EXECUTE, 10000, &tid); + else + { + DWORD lenA = WideCharToMultiByte(CP_ACP, 0, res, -1, NULL, 0, NULL, NULL); + char *resA = HeapAlloc(GetProcessHeap(), 0, lenA); + WideCharToMultiByte(CP_ACP, 0, res, -1, resA, lenA, NULL, NULL); + hDdeData = DdeClientTransaction( (LPBYTE)resA, lenA, hConv, 0L, 0, + XTYP_EXECUTE, 10000, &tid ); + HeapFree(GetProcessHeap(), 0, resA); + } if (hDdeData) DdeFreeDataHandle(hDdeData); else @@ -866,7 +883,8 @@ */ static UINT_PTR execute_from_key(LPWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWSTR szCommandline, SHELL_ExecuteW32 execfunc, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) + LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, + BOOL unicode) { WCHAR cmd[1024]; LONG cmdlen = sizeof(cmd); @@ -894,7 +912,7 @@ if (RegQueryValueW(HKEY_CLASSES_ROOT, key, param, &paramlen) == ERROR_SUCCESS) { TRACE("Got ddeexec %s => %s\n", debugstr_w(key), debugstr_w(param)); - retval = dde_connect(key, cmd, param, lpFile, env, szCommandline, psei->lpIDList, execfunc, psei, psei_out); + retval = dde_connect(key, cmd, param, lpFile, env, szCommandline, psei->lpIDList, execfunc, psei, psei_out, unicode); } else { @@ -966,9 +984,9 @@ } /*********************************************************************** ** - * ShellExecuteExW32 [Internal] + * SHELL_execute [Internal] */ -BOOL WINAPI ShellExecuteExW32 (LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) +BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc, BOOL unicode ) { static const WCHAR wQuote[] = {'"',0}; static const WCHAR wSpace[] = {' ',0}; @@ -1296,7 +1314,7 @@ } TRACE("%s/%s => %s/%s\n", debugstr_w(wszApplicationName), debugstr_w(sei_tmp.lpVerb), debugstr_w(wszQuotedCmd), debugstr_w(lpstrProtocol)); if (*lpstrProtocol) - retval = execute_from_key(lpstrProtocol, wszApplicationName, env, sei_tmp.lpParameters, execfunc, &sei_tmp, sei); + retval = execute_from_key(lpstrProtocol, wszApplicationName, env, sei_tmp.lpParameters, execfunc, &sei_tmp, sei, unicode); else retval = execfunc(wszQuotedCmd, env, FALSE, &sei_tmp, sei); HeapFree( GetProcessHeap(), 0, env ); @@ -1329,7 +1347,7 @@ lpFile += iSize; while (*lpFile == ':') lpFile++; } - retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters, execfunc, &sei_tmp, sei); + retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters, execfunc, &sei_tmp, sei, unicode); } /* Check if file specified is in the form www.??????.*** */ else if (!strncmpiW(lpFile, wWww, 3)) @@ -1414,7 +1432,7 @@ else seiW.lpClass = NULL; - ret = ShellExecuteExW32 (&seiW, SHELL_ExecuteW); + ret = SHELL_execute( &seiW, SHELL_ExecuteW, FALSE ); sei->hInstApp = seiW.hInstApp; @@ -1436,7 +1454,7 @@ */ BOOL WINAPI ShellExecuteExW (LPSHELLEXECUTEINFOW sei) { - return ShellExecuteExW32 (sei, SHELL_ExecuteW); + return SHELL_execute( sei, SHELL_ExecuteW, TRUE ); } /*********************************************************************** ** @@ -1465,6 +1483,6 @@ sei.dwHotKey = 0; sei.hProcess = 0; - ShellExecuteExW32 (&sei, SHELL_ExecuteW); + SHELL_execute( &sei, SHELL_ExecuteW, TRUE ); return sei.hInstApp; }

1 0

[gvg] 18955: Sync to Wine-0_9:
by gvg＠svn.reactos.com 02 Nov '05

02 Nov '05

Sync to Wine-0_9: Phil Krylov <phil(a)newstar.rinet.ru> - Fixed encoding of non-ASCII chars. Krzysztof Foltman <wdev(a)foltman.com> - Bugfix in EM_GETTEXTEX - Additional traces helpful in diagnosing similar (text retrieval-related) bugs. - Fix unnecessary (and harmful) repeated statement. - Removed buffer overrun error (incrementing output pointer one time too much in non-CRLF mode) making KeyNote fail to install. - Style trace information is written to different debug channel (it's not very useful anymore, reference counting looks correct for now). - The document dump contains the character position of the end-of-text mark. - The previous implementation was a workaround for off-by-one bug in ME_RunOfsFromCharOfs, this one relies on correct behavior of that function introduced by the previous patch. - Send verbose info to different debug channels (richedit_check for output from offset checker, richedit_lists for the document list dumps). - Fix a bug in 1.0 emulation mode in EM_LINELENGTH (which broke PTE installer). - Fixed EOL detection in ME_RunOfsFromCharOfs in 1.0 emulation mode (necessary for a non-workaround version of EM_POSFROMCHAR). - Fix 1.0 emulation mode in ME_GetTextW. - Remove another potential sources of infinite loops caused by EOF in the middle of the font and color tables. - Closing brace on text level is treated as EOF (effectively protecting the control from trash after the end of RTF). - Removed misleading comment about incomplete buffers (I was definitely wrong). - Implemented EM_GETFIRSTVISIBLELINE and EM_POSFROMCHAR (basic suboptimal implementation, can be optimized to skip whole paragraphs later if it's useful at all). - Fixed another case of misunderstanding MSDN wrt StreamInProc, causing license text to be truncated in Picasa installer (as well as some other programs, especially those that display long texts with NSIS). Modified: trunk/reactos/lib/riched20/editor.c Modified: trunk/reactos/lib/riched20/list.c Modified: trunk/reactos/lib/riched20/reader.c Modified: trunk/reactos/lib/riched20/run.c Modified: trunk/reactos/lib/riched20/style.c Modified: trunk/reactos/lib/riched20/writer.c _____ Modified: trunk/reactos/lib/riched20/editor.c --- trunk/reactos/lib/riched20/editor.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/editor.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -43,7 +43,7 @@ - EM_GETCHARFORMAT (partly done) - EM_GETEDITSTYLE + EM_GETEVENTMASK - - EM_GETFIRSTVISIBLELINE + + EM_GETFIRSTVISIBLELINE (can be optimized if needed) - EM_GETIMECOLOR 1.0asian - EM_GETIMECOMPMODE 2.0 - EM_GETIMEOPTIONS 1.0asian @@ -81,7 +81,7 @@ + EM_LINELENGTH + EM_LINESCROLL - EM_PASTESPECIAL - - EM_POSFROMCHARS + + EM_POSFROMCHAR + EM_REDO 2.0 - EM_REQUESTRESIZE + EM_REPLACESEL (proper style?) ANSI&Unicode @@ -290,7 +290,7 @@ } ME_InsertTextFromCursor(editor, 0, pText, nWideChars, style); - if (stream->dwSize < STREAMIN_BUFFER_SIZE) + if (stream->dwSize == 0) break; stream->dwSize = 0; } while(1); @@ -483,7 +483,12 @@ { ME_Style *s; RTFFlushOutputBuffer(info); + if (info->stackTop<=1) { + info->rtfClass = rtfEOF; + return; + } info->stackTop--; + assert(info->stackTop >= 0); if (info->styleChanged) { /* FIXME too slow ? how come ? */ @@ -1111,7 +1116,6 @@ UNSUPPORTED_MSG(EM_GETAUTOURLDETECT) UNSUPPORTED_MSG(EM_GETBIDIOPTIONS) UNSUPPORTED_MSG(EM_GETEDITSTYLE) - UNSUPPORTED_MSG(EM_GETFIRSTVISIBLELINE) UNSUPPORTED_MSG(EM_GETIMECOMPMODE) /* UNSUPPORTED_MSG(EM_GETIMESTATUS) missing in Wine headers */ UNSUPPORTED_MSG(EM_GETLANGOPTIONS) @@ -1130,7 +1134,6 @@ UNSUPPORTED_MSG(EM_HIDESELECTION) UNSUPPORTED_MSG(EM_LIMITTEXT) /* also known as EM_SETLIMITTEXT */ UNSUPPORTED_MSG(EM_PASTESPECIAL) -/* UNSUPPORTED_MSG(EM_POSFROMCHARS) missing in Wine headers */ UNSUPPORTED_MSG(EM_REQUESTRESIZE) UNSUPPORTED_MSG(EM_SCROLL) UNSUPPORTED_MSG(EM_SCROLLCARET) @@ -1350,6 +1353,30 @@ case EM_GETPARAFORMAT: ME_GetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); return 0; + case EM_GETFIRSTVISIBLELINE: + { + ME_DisplayItem *p = editor->pBuffer->pFirst; + int y = editor->nScrollPosY; + int ypara = 0; + int count = 0; + int ystart, yend; + while(p) { + p = ME_FindItemFwd(p, diStartRowOrParagraphOrEnd); + if (p->type == diTextEnd) + break; + if (p->type == diParagraph) { + ypara = p->member.para.nYPos; + continue; + } + ystart = ypara + p->member.row.nYPos; + yend = ystart + p->member.row.nHeight; + if (y < yend) { + break; + } + count++; + } + return count; + } case EM_LINESCROLL: { int nPos = editor->nScrollPosY, nEnd= editor->nTotalLength - editor->sizeWindow.cy; @@ -1538,16 +1565,19 @@ } else { - LPWSTR buffer = HeapAlloc(GetProcessHeap(), 0, (nCount + 1) * sizeof(WCHAR)); - DWORD buflen = ex->cb; - LRESULT rc; - DWORD flags = 0; + /* potentially each char may be a CR, why calculate the exact value with O(N) when + we can just take a bigger buffer? :) */ + int crlfmul = (ex->flags & GT_USECRLF) ? 2 : 1; + LPWSTR buffer = HeapAlloc(GetProcessHeap(), 0, (crlfmul*nCount + 1) * sizeof(WCHAR)); + DWORD buflen = ex->cb; + LRESULT rc; + DWORD flags = 0; - buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); - rc = WideCharToMultiByte(ex->codepage, flags, buffer, buflen, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); + buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); + rc = WideCharToMultiByte(ex->codepage, flags, buffer, buflen, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); - HeapFree(GetProcessHeap(),0,buffer); - return rc; + HeapFree(GetProcessHeap(),0,buffer); + return rc; } } case EM_GETSELTEXT: @@ -1563,6 +1593,9 @@ case EM_GETTEXTRANGE: { TEXTRANGEW *rng = (TEXTRANGEW *)lParam; + TRACE("EM_GETTEXTRANGE min=%ld max=%ld unicode=%d emul1.0=%d length=%d\n", + rng->chrg.cpMin, rng->chrg.cpMax, IsWindowUnicode(hWnd), + editor->bEmulateVersion10, ME_GetTextLength(editor)); if (IsWindowUnicode(hWnd)) return ME_GetTextW(editor, rng->lpstrText, rng->chrg.cpMin, rng->chrg.cpMax-rng->chrg.cpMin, editor->bEmulateVersion10); else @@ -1639,7 +1672,8 @@ if (item_end) nNextLineOfs = ME_CharOfsFromRunOfs(editor, ME_FindItemFwd(item_end, diRun), 0); else - nNextLineOfs = ME_FindItemFwd(item, diParagraphOrEnd)->member.para.nCharOfs-1; + nNextLineOfs = ME_FindItemFwd(item, diParagraphOrEnd)->member.para.nCharOfs + - (editor->bEmulateVersion10?2:1); nChars = nNextLineOfs - nThisLineOfs; TRACE("EM_LINELENGTH(%d)==%d\n",wParam, nChars); return nChars; @@ -1684,6 +1718,33 @@ return ME_SetZoom(editor, wParam, lParam); case EM_CHARFROMPOS: return ME_CharFromPos(editor, ((POINTL *)lParam)->x, ((POINTL *)lParam)->y); + case EM_POSFROMCHAR: + { + ME_DisplayItem *pRun; + int nCharOfs, nOffset, nLength; + POINTL pt = {0,0}; + + nCharOfs = wParam; + /* detect which API version we're dealing with */ + if (wParam >= 0x40000) + nCharOfs = lParam; + nLength = ME_GetTextLength(editor); + + if (nCharOfs < nLength) { + ME_RunOfsFromCharOfs(editor, nCharOfs, &pRun, &nOffset); + assert(pRun->type == diRun); + pt.y = pRun->member.run.pt.y; + pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset); + pt.y += ME_GetParagraph(pRun)->member.para.nYPos; + } else { + pt.x = 0; + pt.y = editor->pBuffer->pLast->member.para.nYPos; + } + if (wParam >= 0x40000) { + *(POINTL *)wParam = pt; + } + return MAKELONG( pt.x, pt.y ); + } case WM_CREATE: ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); @@ -1982,12 +2043,12 @@ { ME_DisplayItem *item = ME_FindItemAtOffset(editor, diRun, nStart, &nStart); int nWritten = 0; + WCHAR *pStart = buffer; if (!item) { *buffer = L'\0'; return 0; } - assert(item); if (nStart) { @@ -2012,13 +2073,16 @@ if (item->member.run.nFlags & MERF_ENDPARA) { - *buffer++ = '\r'; + *buffer = '\r'; if (bCRLF) { - *buffer = '\n'; + *(++buffer) = '\n'; nWritten++; } assert(nLen == 1); + /* our end paragraph consists of 2 characters now */ + if (editor->bEmulateVersion10) + nChars--; } else CopyMemory(buffer, item->member.run.strText->szData, sizeof(WCHAR)*nLen); @@ -2028,12 +2092,14 @@ if (!nChars) { + TRACE("nWritten=%d, actual=%d\n", nWritten, buffer-pStart); *buffer = L'\0'; return nWritten; } item = ME_FindItemFwd(item, diRun); } *buffer = L'\0'; + TRACE("nWritten=%d, actual=%d\n", nWritten, buffer-pStart); return nWritten; } _____ Modified: trunk/reactos/lib/riched20/list.c --- trunk/reactos/lib/riched20/list.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/list.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -21,7 +21,7 @@ #include "editor.h" -WINE_DEFAULT_DEBUG_CHANNEL(riched20); +WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists); void ME_InsertBefore(ME_DisplayItem *diWhere, ME_DisplayItem *diWhat) { @@ -181,7 +181,7 @@ pItem->member.run.nCharOfs); break; case diTextEnd: - TRACE("\nEnd\n"); + TRACE("\nEnd(ofs=%d)\n", pItem->member.para.nCharOfs); break; default: break; _____ Modified: trunk/reactos/lib/riched20/reader.c --- trunk/reactos/lib/riched20/reader.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/reader.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -127,13 +127,6 @@ TRACE("\n"); - /* Doc says, that if the last buffer wasn't full, it's EOF. - Actually, that's not true. */ -/* - if (stream->dwSize > 0 && stream->dwSize == stream->dwUsed - && stream->dwSize < sizeof(stream->buffer)) - return EOF; -*/ if (stream->dwSize <= stream->dwUsed) { ME_StreamInFill(stream); @@ -455,6 +448,10 @@ RTFFuncPtr p; TRACE("\n"); + /* don't try to return anything once EOF is reached */ + if (info->rtfClass == rtfEOF) { + return rtfEOF; + } for (;;) { @@ -885,6 +882,8 @@ for (;;) { RTFGetToken (info); + if (info->rtfClass == rtfEOF) + break; if (RTFCheckCM (info, rtfGroup, rtfEndGroup)) break; if (old < 0) /* first entry - determine tbl type */ @@ -901,6 +900,8 @@ if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup)) RTFPanic (info, "%s: missing \"{\"", fn); RTFGetToken (info); /* yes, skip to next token */ + if (info->rtfClass == rtfEOF) + break; } fp = New (RTFFont); if (fp == NULL) @@ -1002,12 +1003,18 @@ fn,info->rtfTextBuf); } RTFGetToken (info); + if (info->rtfClass == rtfEOF) + break; } + if (info->rtfClass == rtfEOF) + break; if (old == 0) /* need to see "}" here */ { RTFGetToken (info); if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) RTFPanic (info, "%s: missing \"}\"", fn); + if (info->rtfClass == rtfEOF) + break; } /* Apply the real properties of the default font */ @@ -1055,6 +1062,8 @@ for (;;) { RTFGetToken (info); + if (info->rtfClass == rtfEOF) + break; if (RTFCheckCM (info, rtfGroup, rtfEndGroup)) break; cp = New (RTFColor); @@ -1074,6 +1083,8 @@ } RTFGetToken (info); } + if (info->rtfClass == rtfEOF) + break; if (!RTFCheckCM (info, rtfText, ';')) RTFPanic (info,"%s: malformed entry", fn); } _____ Modified: trunk/reactos/lib/riched20/run.c --- trunk/reactos/lib/riched20/run.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/run.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -23,6 +23,8 @@ #include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); +WINE_DECLARE_DEBUG_CHANNEL(richedit_check); +WINE_DECLARE_DEBUG_CHANNEL(richedit_lists); int ME_CanJoinRuns(ME_Run *run1, ME_Run *run2) { @@ -72,26 +74,26 @@ { ME_DisplayItem *p = editor->pBuffer->pFirst; int ofs = 0, ofsp = 0; - if(TRACE_ON(richedit)) + if(TRACE_ON(richedit_lists)) { - TRACE("---\n"); + TRACE_(richedit_lists)("---\n"); ME_DumpDocument(editor->pBuffer); } do { p = ME_FindItemFwd(p, diRunOrParagraphOrEnd); switch(p->type) { case diTextEnd: - TRACE("tend, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); + TRACE_(richedit_check)("tend, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); assert(ofsp+ofs == p->member.para.nCharOfs); return; case diParagraph: - TRACE("para, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); + TRACE_(richedit_check)("para, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); assert(ofsp+ofs == p->member.para.nCharOfs); ofsp = p->member.para.nCharOfs; ofs = 0; break; case diRun: - TRACE("run, real ofs = %d (+ofsp = %d), counted = %d, len = %d, txt = \"%s\", flags=%08x, fx&mask = %08lx\n", + TRACE_(richedit_check)("run, real ofs = %d (+ofsp = %d), counted = %d, len = %d, txt = \"%s\", flags=%08x, fx&mask = %08lx\n", p->member.run.nCharOfs, p->member.run.nCharOfs+ofsp, ofsp+ofs, p->member.run.strText->nLen, debugstr_w(p->member.run.strText->szData), p->member.run.nFlags, @@ -143,6 +145,7 @@ if (nCharOfs < pPara->member.para.next_para->member.para.nCharOfs) { + int eollen = 1; *ppRun = ME_FindItemFwd(pPara, diRun); assert(*ppRun); while (!((*ppRun)->member.run.nFlags & MERF_ENDPARA)) @@ -157,7 +160,10 @@ } *ppRun = pNext; } - if (nCharOfs == nParaOfs + (*ppRun)->member.run.nCharOfs) { + /* the handling of bEmulateVersion10 may be a source of many bugs, I'm afraid */ + eollen = (editor->bEmulateVersion10 ? 2 : 1); + if (nCharOfs >= nParaOfs + (*ppRun)->member.run.nCharOfs && + nCharOfs < nParaOfs + (*ppRun)->member.run.nCharOfs + eollen) { *pOfs = 0; return; } _____ Modified: trunk/reactos/lib/riched20/style.c --- trunk/reactos/lib/riched20/style.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/style.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -21,6 +21,7 @@ #include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); +WINE_DECLARE_DEBUG_CHANNEL(richedit_style); static int all_refs = 0; @@ -197,7 +198,7 @@ { char buf[2048]; ME_DumpStyleToBuf(&s->fmt, buf); - TRACE("%s\n", buf); + TRACE_(richedit_style)("%s\n", buf); } void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]) @@ -321,7 +322,7 @@ if (i < HFONT_CACHE_SIZE) /* found */ { item = &editor->pFontCache[i]; - TRACE("font reused %d\n", i); + TRACE_(richedit_style)("font reused %d\n", i); s->hFont = item->hFont; item->nRefs++; @@ -332,13 +333,13 @@ assert(nEmpty != -1); /* otherwise we leak cache entries or get too many fonts at once*/ if (item->hFont) { - TRACE("font deleted %d\n", nEmpty); + TRACE_(richedit_style)("font deleted %d\n", nEmpty); DeleteObject(item->hFont); item->hFont = NULL; } s->hFont = CreateFontIndirectW(&lf); assert(s->hFont); - TRACE("font created %d\n", nEmpty); + TRACE_(richedit_style)("font created %d\n", nEmpty); item->hFont = s->hFont; item->nRefs = 1; memcpy(&item->lfSpecs, &lf, sizeof(LOGFONTW)); @@ -391,9 +392,9 @@ s->nRefs--; all_refs--; if (s->nRefs==0) - TRACE("destroy style %p, total refs=%d\n", s, all_refs); + TRACE_(richedit_style)("destroy style %p, total refs=%d\n", s, all_refs); else - TRACE("release style %p, new refs=%d, total refs=%d\n", s, s->nRefs, all_refs); + TRACE_(richedit_style)("release style %p, new refs=%d, total refs=%d\n", s, s->nRefs, all_refs); if (!all_refs) TRACE("all style references freed (good!)\n"); assert(s->nRefs>=0); if (!s->nRefs) _____ Modified: trunk/reactos/lib/riched20/writer.c --- trunk/reactos/lib/riched20/writer.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/writer.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -616,7 +616,7 @@ buffer[pos++] = *letter; } else { for (i = 0; i < nBytes; i++) - pos += sprintf(buffer + pos, "\\'%02x", letter[i]); + pos += sprintf(buffer + pos, "\\'%02x", (BYTE)letter[i]); } text++; nChars--;

1 0

[gvg] 18954: Sync to Wine-0_9:
by gvg＠svn.reactos.com 02 Nov '05

02 Nov '05

Sync to Wine-0_9: Pierre d'Herbemont <pidherbemont(a)opendarwin.org> - Allow compilation on non-i386. Huw Davies <huw(a)codeweavers.com> - When a dispinterface isn't dual, we should return TYPE_E_ELEMENTNOTFOUND when trying to get index -1. - Proxies and stubs for GetTypeInfoCont, GetLibAttr and ReleaseLibAttr. - Implement GetContainingTypelib_{Proxy,Stub}. Modified: trunk/reactos/lib/oleaut32/tmarshal.c Deleted: trunk/reactos/lib/oleaut32/tmarshal.h Modified: trunk/reactos/lib/oleaut32/typelib.c Modified: trunk/reactos/lib/oleaut32/usrmarshal.c Modified: trunk/reactos/w32api/include/oaidl.h _____ Modified: trunk/reactos/lib/oleaut32/tmarshal.c --- trunk/reactos/lib/oleaut32/tmarshal.c 2005-11-02 18:36:04 UTC (rev 18953) +++ trunk/reactos/lib/oleaut32/tmarshal.c 2005-11-02 19:28:16 UTC (rev 18954) @@ -344,7 +344,9 @@ #include "poppack.h" #else /* __i386__ */ -# error You need to implement stubless proxies for your architecture +# warning You need to implement stubless proxies for your architecture +typedef struct _TMAsmProxy { +} TMAsmProxy; #endif typedef struct _TMProxyImpl { @@ -1939,6 +1941,7 @@ for (j=0;j<fdesc->cParams;j++) nrofargs += _argsize(fdesc->lprgelemdescParam[j].tdesc.vt); +#ifdef __i386__ if (fdesc->callconv != CC_STDCALL) { ERR("calling convention is not stdcall????\n"); return E_FAIL; @@ -1963,6 +1966,10 @@ xasm->bytestopop= (nrofargs+2)*4; /* pop args, This, iMethod */ proxy->lpvtbl[i] = xasm; break; +#else + FIXME("not implemented on non i386\n"); + return E_FAIL; +#endif } } } _____ Deleted: trunk/reactos/lib/oleaut32/tmarshal.h --- trunk/reactos/lib/oleaut32/tmarshal.h 2005-11-02 18:36:04 UTC (rev 18953) +++ trunk/reactos/lib/oleaut32/tmarshal.h 2005-11-02 19:28:16 UTC (rev 18954) @@ -1,24 +0,0 @@ -/* - * Copyright 2002 Marcus Meissner - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef TMARSHAL_H -#define TMARSHAL_H -HRESULT WINAPI -TypeLibFac_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv); - -#endif _____ Modified: trunk/reactos/lib/oleaut32/typelib.c --- trunk/reactos/lib/oleaut32/typelib.c 2005-11-02 18:36:04 UTC (rev 18953) +++ trunk/reactos/lib/oleaut32/typelib.c 2005-11-02 19:28:16 UTC (rev 18954) @@ -4338,7 +4338,8 @@ HREFTYPE *pRefType) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - int(i); + int i; + HRESULT hr = S_OK; TLBImplType *pImpl = This->impltypelist; TRACE("(%p) index %d\n", This, index); @@ -4358,8 +4359,7 @@ } else { - if (!pImpl) return TYPE_E_ELEMENTNOTFOUND; - *pRefType = pImpl->hRef; + hr = TYPE_E_ELEMENTNOTFOUND; } } else @@ -4370,15 +4370,21 @@ pImpl = pImpl->next; } - if (!pImpl) return TYPE_E_ELEMENTNOTFOUND; + if (pImpl) + *pRefType = pImpl->hRef; + else + hr = TYPE_E_ELEMENTNOTFOUND; + } - *pRefType = pImpl->hRef; - - TRACE("-- 0x%08lx\n", pImpl->hRef ); + if(TRACE_ON(ole)) + { + if(SUCCEEDED(hr)) + TRACE("SUCCESS -- hRef = 0x%08lx\n", *pRefType ); + else + TRACE("FAILURE -- hresult = 0x%08lx\n", hr); } - return S_OK; - + return hr; } /* ITypeInfo::GetImplTypeFlags _____ Modified: trunk/reactos/lib/oleaut32/usrmarshal.c --- trunk/reactos/lib/oleaut32/usrmarshal.c 2005-11-02 18:36:04 UTC (rev 18953) +++ trunk/reactos/lib/oleaut32/usrmarshal.c 2005-11-02 19:28:16 UTC (rev 18954) @@ -967,8 +967,24 @@ ITypeLib** ppTLib, UINT* pIndex) { - FIXME("not implemented\n"); - return E_FAIL; + ITypeLib *pTL; + UINT index; + HRESULT hr; + + TRACE("(%p, %p, %p)\n", This, ppTLib, pIndex ); + + hr = ITypeInfo_RemoteGetContainingTypeLib_Proxy(This, &pTL, &index); + if(SUCCEEDED(hr)) + { + if(pIndex) + *pIndex = index; + + if(ppTLib) + *ppTLib = pTL; + else + ITypeLib_Release(pTL); + } + return hr; } HRESULT __RPC_STUB ITypeInfo_GetContainingTypeLib_Stub( @@ -976,8 +992,8 @@ ITypeLib** ppTLib, UINT* pIndex) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %p, %p)\n", This, ppTLib, pIndex ); + return ITypeInfo_GetContainingTypeLib(This, ppTLib, pIndex); } void CALLBACK ITypeInfo_ReleaseTypeAttr_Proxy( @@ -1055,24 +1071,30 @@ UINT CALLBACK ITypeLib_GetTypeInfoCount_Proxy( ITypeLib* This) { - FIXME("not implemented\n"); - return E_FAIL; + UINT count = 0; + TRACE("(%p)\n", This); + + ITypeLib_RemoteGetTypeInfoCount_Proxy(This, &count); + + return count; } HRESULT __RPC_STUB ITypeLib_GetTypeInfoCount_Stub( ITypeLib* This, UINT* pcTInfo) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %p)\n", This, pcTInfo); + *pcTInfo = ITypeLib_GetTypeInfoCount(This); + return S_OK; } HRESULT CALLBACK ITypeLib_GetLibAttr_Proxy( ITypeLib* This, TLIBATTR** ppTLibAttr) { - FIXME("not implemented\n"); - return E_FAIL; + CLEANLOCALSTORAGE stg; + TRACE("(%p, %p)\n", This, ppTLibAttr); + return ITypeLib_RemoteGetLibAttr_Proxy(This, ppTLibAttr, &stg); } HRESULT __RPC_STUB ITypeLib_GetLibAttr_Stub( @@ -1080,8 +1102,8 @@ LPTLIBATTR* ppTLibAttr, CLEANLOCALSTORAGE* pDummy) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %p)\n", This, ppTLibAttr); + return ITypeLib_GetLibAttr(This, ppTLibAttr); } HRESULT CALLBACK ITypeLib_GetDocumentation_Proxy( @@ -1159,14 +1181,15 @@ ITypeLib* This, TLIBATTR* pTLibAttr) { - FIXME("not implemented\n"); + TRACE("(%p, %p)\n", This, pTLibAttr); + CoTaskMemFree(pTLibAttr); } HRESULT __RPC_STUB ITypeLib_ReleaseTLibAttr_Stub( ITypeLib* This) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("nothing to do\n"); + return S_OK; } _____ Modified: trunk/reactos/w32api/include/oaidl.h --- trunk/reactos/w32api/include/oaidl.h 2005-11-02 18:36:04 UTC (rev 18953) +++ trunk/reactos/w32api/include/oaidl.h 2005-11-02 19:28:16 UTC (rev 18954) @@ -91,6 +91,11 @@ extern const IID IID_IRecordInfo; extern const IID IID_ITypeMarshal; +#ifndef __ITypeLib_FWD_DEFINED__ +#define __ITypeLib_FWD_DEFINED__ +typedef struct ITypeLib ITypeLib; +#endif + typedef enum tagSYSKIND { SYS_WIN16,SYS_WIN32,SYS_MAC } SYSKIND; @@ -586,6 +591,301 @@ #define ITypeInfo_ReleaseVarDesc(p,a) (p)->lpVtbl->ReleaseVarDesc(p,a) #endif +HRESULT CALLBACK ITypeInfo_RemoteGetTypeAttr_Proxy( + ITypeInfo* This, + LPTYPEATTR* ppTypeAttr, + CLEANLOCALSTORAGE* pDummy); +void __RPC_STUB ITypeInfo_RemoteGetTypeAttr_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetTypeAttr_Proxy( + ITypeInfo* This, + TYPEATTR** ppTypeAttr); +HRESULT __RPC_STUB ITypeInfo_GetTypeAttr_Stub( + ITypeInfo* This, + LPTYPEATTR* ppTypeAttr, + CLEANLOCALSTORAGE* pDummy); +HRESULT CALLBACK ITypeInfo_GetTypeComp_Proxy( + ITypeInfo* This, + ITypeComp** ppTComp); +void __RPC_STUB ITypeInfo_GetTypeComp_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_RemoteGetFuncDesc_Proxy( + ITypeInfo* This, + UINT index, + LPFUNCDESC* ppFuncDesc, + CLEANLOCALSTORAGE* pDummy); +void __RPC_STUB ITypeInfo_RemoteGetFuncDesc_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetFuncDesc_Proxy( + ITypeInfo* This, + UINT index, + FUNCDESC** ppFuncDesc); +HRESULT __RPC_STUB ITypeInfo_GetFuncDesc_Stub( + ITypeInfo* This, + UINT index, + LPFUNCDESC* ppFuncDesc, + CLEANLOCALSTORAGE* pDummy); +HRESULT CALLBACK ITypeInfo_RemoteGetVarDesc_Proxy( + ITypeInfo* This, + UINT index, + LPVARDESC* ppVarDesc, + CLEANLOCALSTORAGE* pDummy); +void __RPC_STUB ITypeInfo_RemoteGetVarDesc_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetVarDesc_Proxy( + ITypeInfo* This, + UINT index, + VARDESC** ppVarDesc); +HRESULT __RPC_STUB ITypeInfo_GetVarDesc_Stub( + ITypeInfo* This, + UINT index, + LPVARDESC* ppVarDesc, + CLEANLOCALSTORAGE* pDummy); +HRESULT CALLBACK ITypeInfo_RemoteGetNames_Proxy( + ITypeInfo* This, + MEMBERID memid, + BSTR* rgBstrNames, + UINT cMaxNames, + UINT* pcNames); +void __RPC_STUB ITypeInfo_RemoteGetNames_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetNames_Proxy( + ITypeInfo* This, + MEMBERID memid, + BSTR* rgBstrNames, + UINT cMaxNames, + UINT* pcNames); +HRESULT __RPC_STUB ITypeInfo_GetNames_Stub( + ITypeInfo* This, + MEMBERID memid, + BSTR* rgBstrNames, + UINT cMaxNames, + UINT* pcNames); +HRESULT CALLBACK ITypeInfo_GetRefTypeOfImplType_Proxy( + ITypeInfo* This, + UINT index, + HREFTYPE* pRefType); +void __RPC_STUB ITypeInfo_GetRefTypeOfImplType_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetImplTypeFlags_Proxy( + ITypeInfo* This, + UINT index, + INT* pImplTypeFlags); +void __RPC_STUB ITypeInfo_GetImplTypeFlags_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_LocalGetIDsOfNames_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalGetIDsOfNames_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetIDsOfNames_Proxy( + ITypeInfo* This, + LPOLESTR* rgszNames, + UINT cNames, + MEMBERID* pMemId); +HRESULT __RPC_STUB ITypeInfo_GetIDsOfNames_Stub( + ITypeInfo* This); +HRESULT CALLBACK ITypeInfo_LocalInvoke_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalInvoke_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_Invoke_Proxy( + ITypeInfo* This, + PVOID pvInstance, + MEMBERID memid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr); +HRESULT __RPC_STUB ITypeInfo_Invoke_Stub( + ITypeInfo* This); +HRESULT CALLBACK ITypeInfo_RemoteGetDocumentation_Proxy( + ITypeInfo* This, + MEMBERID memid, + DWORD refPtrFlags, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +void __RPC_STUB ITypeInfo_RemoteGetDocumentation_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetDocumentation_Proxy( + ITypeInfo* This, + MEMBERID memid, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +HRESULT __RPC_STUB ITypeInfo_GetDocumentation_Stub( + ITypeInfo* This, + MEMBERID memid, + DWORD refPtrFlags, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +HRESULT CALLBACK ITypeInfo_RemoteGetDllEntry_Proxy( + ITypeInfo* This, + MEMBERID memid, + INVOKEKIND invKind, + DWORD refPtrFlags, + BSTR* pBstrDllName, + BSTR* pBstrName, + WORD* pwOrdinal); +void __RPC_STUB ITypeInfo_RemoteGetDllEntry_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetDllEntry_Proxy( + ITypeInfo* This, + MEMBERID memid, + INVOKEKIND invKind, + BSTR* pBstrDllName, + BSTR* pBstrName, + WORD* pwOrdinal); +HRESULT __RPC_STUB ITypeInfo_GetDllEntry_Stub( + ITypeInfo* This, + MEMBERID memid, + INVOKEKIND invKind, + DWORD refPtrFlags, + BSTR* pBstrDllName, + BSTR* pBstrName, + WORD* pwOrdinal); +HRESULT CALLBACK ITypeInfo_GetRefTypeInfo_Proxy( + ITypeInfo* This, + HREFTYPE hRefType, + ITypeInfo** ppTInfo); +void __RPC_STUB ITypeInfo_GetRefTypeInfo_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_LocalAddressOfMember_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalAddressOfMember_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_AddressOfMember_Proxy( + ITypeInfo* This, + MEMBERID memid, + INVOKEKIND invKind, + PVOID* ppv); +HRESULT __RPC_STUB ITypeInfo_AddressOfMember_Stub( + ITypeInfo* This); +HRESULT CALLBACK ITypeInfo_RemoteCreateInstance_Proxy( + ITypeInfo* This, + REFIID riid, + IUnknown** ppvObj); +void __RPC_STUB ITypeInfo_RemoteCreateInstance_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_CreateInstance_Proxy( + ITypeInfo* This, + IUnknown* pUnkOuter, + REFIID riid, + PVOID* ppvObj); +HRESULT __RPC_STUB ITypeInfo_CreateInstance_Stub( + ITypeInfo* This, + REFIID riid, + IUnknown** ppvObj); +HRESULT CALLBACK ITypeInfo_GetMops_Proxy( + ITypeInfo* This, + MEMBERID memid, + BSTR* pBstrMops); +void __RPC_STUB ITypeInfo_GetMops_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_RemoteGetContainingTypeLib_Proxy( + ITypeInfo* This, + ITypeLib** ppTLib, + UINT* pIndex); +void __RPC_STUB ITypeInfo_RemoteGetContainingTypeLib_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetContainingTypeLib_Proxy( + ITypeInfo* This, + ITypeLib** ppTLib, + UINT* pIndex); +HRESULT __RPC_STUB ITypeInfo_GetContainingTypeLib_Stub( + ITypeInfo* This, + ITypeLib** ppTLib, + UINT* pIndex); +HRESULT CALLBACK ITypeInfo_LocalReleaseTypeAttr_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalReleaseTypeAttr_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +void CALLBACK ITypeInfo_ReleaseTypeAttr_Proxy( + ITypeInfo* This, + TYPEATTR* pTypeAttr); +HRESULT __RPC_STUB ITypeInfo_ReleaseTypeAttr_Stub( + ITypeInfo* This); +HRESULT CALLBACK ITypeInfo_LocalReleaseFuncDesc_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalReleaseFuncDesc_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +void CALLBACK ITypeInfo_ReleaseFuncDesc_Proxy( + ITypeInfo* This, + FUNCDESC* pFuncDesc); +HRESULT __RPC_STUB ITypeInfo_ReleaseFuncDesc_Stub( + ITypeInfo* This); +HRESULT CALLBACK ITypeInfo_LocalReleaseVarDesc_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalReleaseVarDesc_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +void CALLBACK ITypeInfo_ReleaseVarDesc_Proxy( + ITypeInfo* This, + VARDESC* pVarDesc); +HRESULT __RPC_STUB ITypeInfo_ReleaseVarDesc_Stub( + ITypeInfo* This); + #define INTERFACE ITypeInfo2 DECLARE_INTERFACE_(ITypeInfo2,ITypeInfo) { @@ -704,6 +1004,161 @@ #define ITypeLib_ReleaseTLibAttr(p,a) (p)->lpVtbl->ReleaseTLibAttr(p,a) #endif +HRESULT CALLBACK ITypeLib_RemoteGetTypeInfoCount_Proxy( + ITypeLib* This, + UINT* pcTInfo); +void __RPC_STUB ITypeLib_RemoteGetTypeInfoCount_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +UINT CALLBACK ITypeLib_GetTypeInfoCount_Proxy( + ITypeLib* This); +HRESULT __RPC_STUB ITypeLib_GetTypeInfoCount_Stub( + ITypeLib* This, + UINT* pcTInfo); +HRESULT CALLBACK ITypeLib_GetTypeInfo_Proxy( + ITypeLib* This, + UINT index, + ITypeInfo** ppTInfo); +void __RPC_STUB ITypeLib_GetTypeInfo_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_GetTypeInfoType_Proxy( + ITypeLib* This, + UINT index, + TYPEKIND* pTKind); +void __RPC_STUB ITypeLib_GetTypeInfoType_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_GetTypeInfoOfGuid_Proxy( + ITypeLib* This, + REFGUID guid, + ITypeInfo** ppTinfo); +void __RPC_STUB ITypeLib_GetTypeInfoOfGuid_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_RemoteGetLibAttr_Proxy( + ITypeLib* This, + LPTLIBATTR* ppTLibAttr, + CLEANLOCALSTORAGE* pDummy); +void __RPC_STUB ITypeLib_RemoteGetLibAttr_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_GetLibAttr_Proxy( + ITypeLib* This, + TLIBATTR** ppTLibAttr); +HRESULT __RPC_STUB ITypeLib_GetLibAttr_Stub( + ITypeLib* This, + LPTLIBATTR* ppTLibAttr, + CLEANLOCALSTORAGE* pDummy); +HRESULT CALLBACK ITypeLib_GetTypeComp_Proxy( + ITypeLib* This, + ITypeComp** ppTComp); +void __RPC_STUB ITypeLib_GetTypeComp_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_RemoteGetDocumentation_Proxy( + ITypeLib* This, + INT index, + DWORD refPtrFlags, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +void __RPC_STUB ITypeLib_RemoteGetDocumentation_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_GetDocumentation_Proxy( + ITypeLib* This, + INT index, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +HRESULT __RPC_STUB ITypeLib_GetDocumentation_Stub( + ITypeLib* This, + INT index, + DWORD refPtrFlags, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +HRESULT CALLBACK ITypeLib_RemoteIsName_Proxy( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + BOOL* pfName, + BSTR* pBstrLibName); +void __RPC_STUB ITypeLib_RemoteIsName_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_IsName_Proxy( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + BOOL* pfName); +HRESULT __RPC_STUB ITypeLib_IsName_Stub( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + BOOL* pfName, + BSTR* pBstrLibName); +HRESULT CALLBACK ITypeLib_RemoteFindName_Proxy( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + ITypeInfo** ppTInfo, + MEMBERID* rgMemId, + USHORT* pcFound, + BSTR* pBstrLibName); +void __RPC_STUB ITypeLib_RemoteFindName_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_FindName_Proxy( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + ITypeInfo** ppTInfo, + MEMBERID* rgMemId, + USHORT* pcFound); +HRESULT __RPC_STUB ITypeLib_FindName_Stub( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + ITypeInfo** ppTInfo, + MEMBERID* rgMemId, + USHORT* pcFound, + BSTR* pBstrLibName); +HRESULT CALLBACK ITypeLib_LocalReleaseTLibAttr_Proxy( + ITypeLib* This); +void __RPC_STUB ITypeLib_LocalReleaseTLibAttr_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +void CALLBACK ITypeLib_ReleaseTLibAttr_Proxy( + ITypeLib* This, + TLIBATTR* pTLibAttr); +HRESULT __RPC_STUB ITypeLib_ReleaseTLibAttr_Stub( + ITypeLib* This); + #define INTERFACE ITypeLib2 DECLARE_INTERFACE_(ITypeLib2,ITypeLib) {

1 0

[mf] 18953: regedit: polish resource file from Sebastian Gasiorek (sebastian dot gasiorek at gmail dot com
by mf＠svn.reactos.com 02 Nov '05

02 Nov '05

regedit: polish resource file from Sebastian Gasiorek (sebastian dot gasiorek at gmail dot com Added: trunk/reactos/subsys/system/regedit/Pl.rc Modified: trunk/reactos/subsys/system/regedit/rsrc.rc _____ Added: trunk/reactos/subsys/system/regedit/Pl.rc --- trunk/reactos/subsys/system/regedit/Pl.rc 2005-11-02 16:13:00 UTC (rev 18952) +++ trunk/reactos/subsys/system/regedit/Pl.rc 2005-11-02 18:36:04 UTC (rev 18953) @@ -0,0 +1,395 @@ +/* + * Regedit resources + * + * Copyright 2005 Sebastian Gasiorek + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +/* + * Menu + */ + +IDC_REGEDIT MENU DISCARDABLE +BEGIN + POPUP "&Plik" + BEGIN + MENUITEM "Za&ko±cz", ID_REGISTRY_EXIT + END + POPUP "Pomo&c" + BEGIN + MENUITEM "&Informacje ...", ID_HELP_ABOUT + END +END + +IDR_REGEDIT_MENU MENU DISCARDABLE +BEGIN + POPUP "&Rejestr" + BEGIN + MENUITEM "&Importuj plik rejestru...", ID_REGISTRY_IMPORTREGISTRYFILE + + MENUITEM "&Eksportuj plik rejestru...", ID_REGISTRY_EXPORTREGISTRYFILE + + MENUITEM SEPARATOR + MENUITEM "&Pod??cz rejestr sieciowy...", + ID_REGISTRY_CONNECTNETWORKREGISTRY + + MENUITEM "&Od??cz rejestr sieciowy...", + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + , GRAYED + MENUITEM SEPARATOR + MENUITEM "&Drukuj\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Za&ko±cz", ID_REGISTRY_EXIT + END + POPUP "&Edycja" + BEGIN + MENUITEM "&Modyfikuj", ID_EDIT_MODIFY + MENUITEM SEPARATOR + POPUP "&Nowy" + BEGIN + MENUITEM "&Klucz", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "Warto£µ &ci?gu", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Warto£µ &binarna", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Warto£µ &DWORD", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM SEPARATOR + MENUITEM "&Uprawnienia...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "U&su±\tDel", ID_EDIT_DELETE + MENUITEM "Z&mie± nazwÛ", ID_EDIT_RENAME + MENUITEM SEPARATOR + MENUITEM "&Kopiuj nazwÛ klucza", ID_EDIT_COPYKEYNAME + MENUITEM SEPARATOR + MENUITEM "&Znajdf\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "Zn&ajdf nastÛpny\tF3", ID_EDIT_FINDNEXT, GRAYED + END + POPUP "&Widok" + BEGIN + MENUITEM "&Pasek stanu", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "Po&dziel", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Od£wie?\tF5", ID_VIEW_REFRESH + END + POPUP "Ulu&bione" + BEGIN + MENUITEM "&Dodaj do ulubionych", ID_FAVOURITES_ADDTOFAVOURITES + , GRAYED + MENUITEM "&Usu± ulubiony", ID_FAVOURITES_REMOVEFAVOURITE + , GRAYED + END + POPUP "Pomo&c" + BEGIN + MENUITEM "&Tematy pomocy\tF1", ID_HELP_HELPTOPICS + MENUITEM SEPARATOR + MENUITEM "Edytor rejestru - i&nformacje", ID_HELP_ABOUT + END +END + +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Modyfikuj", ID_EDIT_MODIFY + MENUITEM "Modyfikuj dane &binarne", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "&Usu±\tDel", ID_EDIT_DELETE + MENUITEM "&Zmie± nazwÛ", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "&Nowy" + BEGIN + MENUITEM "&Kklucz", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Warto£µ ci?gu", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Warto£µ &binarna", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Warto£µ &DWORD", ID_EDIT_NEW_DWORDVALUE + END + END + POPUP "" + BEGIN + MENUITEM "Rozwi±/Zwi±", ID_TREE_EXPANDBRANCH + POPUP "&Nowy" + BEGIN + MENUITEM "&Klucz", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Warto£µ ci?gu", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Warto£µ &binarna", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Warto£µ &DWORD", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM "&Znajdf", ID_EDIT_FIND, GRAYED + MENUITEM "U&su±", ID_TREE_DELETE + MENUITEM "Z&mie± nazwÛ", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Kopiuj nazwÛ klucza", ID_EDIT_COPYKEYNAME + END +END + + +/* + * Dialog + */ + +IDD_EDIT_STRING DIALOG 32, 24, 252, 84 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edytowanie ci?gu" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa warto£ci:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Dane warto£ci:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,142,64,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,196,64,50,14 +END + +IDD_EDIT_MULTI_STRING DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edytowanie wieloci?gu" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa warto£ci:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Dane &warto£ci:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,196,154,50,14 +END + +IDD_EDIT_BIN_DATA DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edytowanie warto£ci binarnej" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa warto£ci:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Dane warto£ci:",IDC_STATIC,6,35,161,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,196,154,50,14 +END + + +IDD_EDIT_DWORD DIALOG 32, 24, 252, 104 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edytowanie warto£ci DWORD" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa warto£ci:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Dane &warto£ci:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL + GROUPBOX "System",IDC_STATIC,130,35,116,39 + AUTORADIOBUTTON "&Szesnastkowy",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP + AUTORADIOBUTTON "&DziesiÛtny",IDC_FORMAT_DEC,141,59,60,10 + DEFPUSHBUTTON "OK",IDOK,142,82,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,196,82,50,14 +END + +/* + * String Table + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LIST_COLUMN_NAME "Nazwa" + IDS_LIST_COLUMN_TYPE "Typ" + IDS_LIST_COLUMN_DATA "Dane" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Edytor rejestru" + IDC_REGEDIT "REGEDIT" + IDC_REGEDIT_FRAME "REGEDIT_FRAME" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_MENU "Zawiera polecenia do pracy z ca?ym rejestrem" + ID_EDIT_MENU "Zawiera polecenia do edycji warto£ci lub klucz" + ID_VIEW_MENU "Zawiera polecenia do dostosowywania okien rejestru" + ID_FAVOURITES_MENU "Zawiera polecenia dla dostÛpu do czÛsto u?ywanych klawiszy" + ID_HELP_MENU "Zawiera polecenia do wy£wietlania Pomocy oraz informacji o Edytorze rejestru" + ID_EDIT_NEW_MENU "Zawiera polecenia do tworzenia nowych kluczy lub warto£ci" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_EDIT_MODIFY "Zmienia dane warto£ci" + ID_EDIT_NEW_KEY "Dodaje nowy klucz" + ID_EDIT_NEW_STRINGVALUE "Dodaje now? warto£µ ci?gu" + ID_EDIT_NEW_BINARYVALUE "Dodaje now? warto£µ binarn?" + ID_EDIT_NEW_DWORDVALUE "Dodaje now? warto£µ DWORD" + ID_REGISTRY_IMPORTREGISTRYFILE "Importuje plik do rejestru" + ID_REGISTRY_EXPORTREGISTRYFILE + "Eksportuje ca?o£µ lub czÛ£µ rejestru do pliku" + ID_REGISTRY_CONNECTNETWORKREGISTRY + "Po??czenie z rejestrem zdalnego komputera" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + "Od??cza od rejestru zdalnego komputera" + ID_REGISTRY_PRINT "Drukuje ca?o£µ lub czÛ£µ rejestru" +/* ID_HELP_HELPTOPICS "Otwiera Pomoc Edytora rejestru" */ + ID_HELP_ABOUT "Wy£wietla informacje o programie, numerze wersji i prawach autorskich" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_EXIT "Konczy dzia?anie Edytora rejestru" + ID_FAVOURITES_ADDTOFAVOURITES "Dodaje klawisze do listy element¾w ulubionych" + ID_FAVOURITES_REMOVEFAVOURITE "Usuwa klawisze z listy element¾w ulubionych" + ID_VIEW_STATUSBAR "Pokazuje lub ukrywa pasek stanu" + ID_VIEW_SPLIT "Zmienia pozycjÛ podzia?u pomiÛdzy dwoma okienkami" + ID_VIEW_REFRESH "Od£wie?a okno" + ID_EDIT_DELETE "Usuwa zaznaczenie" + ID_EDIT_RENAME "Zmienia nazwÛ zaznaczenia" + ID_EDIT_COPYKEYNAME "Kopiuje nazwÛ wybranego klucza do Schowka" + ID_EDIT_FIND "Znajduje ci?g tekstowy w kluczu, warto£ci lub danych" + ID_EDIT_FINDNEXT "Znajduje nastÛpne wyst?pienie tekstu okre£lonego przy poprzednim szukaniu" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "B??d" + IDS_WARNING "Ostrze?enie" + IDS_BAD_VALUE "Nie mo?na odczytaµ warto£ci '%s'" + IDS_UNSUPPORTED_TYPE "Nie mo?na edytowaµ kluczy tego typu (%ld)" + IDS_TOO_BIG_VALUE "Warto£µ jest za du?a (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "Dane typu REG_MULTI_SZ nie mog? zawieraµ pustych ci?g¾w.\nPusty ci?g zosta? usuniÛty z listy." + IDS_QUERY_DELETE_KEY_ONE "Czy na pewno chcesz usun?µ ten klucz?" + IDS_QUERY_DELETE_KEY_MORE "Czy na pewno chcesz usun?µ te klucze?" + IDS_QUERY_DELETE_KEY_CONFIRM "Potwierdzenie usuniÛcia klucza" + IDS_QUERY_DELETE_ONE "Czy na pewno chcesz usun?µ tÛ warto£µ?" + IDS_QUERY_DELETE_MORE "Czy na pewno chcesz usun?µ te warto£ci?" + IDS_QUERY_DELETE_CONFIRM "Potwierdzanie usuniÛcia warto£ci" + IDS_ERR_DELVAL_CAPTION "B??d przy usuwaniu warto£ci" + IDS_ERR_DELETEVALUE "Nie mo?na usun?µ wszystkich podanych warto£ci!" + IDS_ERR_RENVAL_CAPTION "B??d przy zmianie warto£ci" + IDS_ERR_RENVAL_TOEMPTY "Nie mo?na zmieniµ nazwy %s. Okre£lona nazwa klucza jest pusta. Wpisz inn? nazwÛ i spr¾buj ponownie." + IDS_NEW_KEY "Nowy klucz #%d" + IDS_NEW_VALUE "Nowa warto£µ #%d" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(warto£µ binarna o d?ugo£ci zero)" + IDS_DEFAULT_VALUE_NAME "(Domy£lna)" + IDS_VALUE_NOT_SET "(warto£µ nie ustalona)" + IDS_UNKNOWN_TYPE "Nieznany typ: (0x%lx)" + IDS_MY_COMPUTER "M¾j komputer" + IDS_IMPORT_REG_FILE "Importuj plik rejestru" + IDS_EXPORT_REG_FILE "Eksportuj plik rejestru" + IDS_INVALID_DWORD "(niew?a£ciwa warto£µ DWORD)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILES "Pliki rejestru" + IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_REGEDIT4 "Pliki rejestru Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4_FLT "*.reg" + IDS_FLT_ALLFILES "Wszystkie pliki (*.*)" + IDS_FLT_ALLFILES_FLT "*.*" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACCESS_FULLCONTROL "Pe?na kontrola" + IDS_ACCESS_READ "Odczyt" + IDS_ACCESS_QUERYVALUE "Badanie warto£ci" + IDS_ACCESS_SETVALUE "Ustawianie warto£ci" + IDS_ACCESS_CREATESUBKEY "Tworzenie podklucza" + IDS_ACCESS_ENUMERATESUBKEYS "Wyliczanie podkluczy" + IDS_ACCESS_NOTIFY "Powiadamianie" + IDS_ACCESS_CREATELINK "Tworzenie ??cza" + IDS_ACCESS_DELETE "Usu±" + IDS_ACCESS_WRITEDAC "Zapisywanie DAC" + IDS_ACCESS_WRITEOWNER "Zapisywanie w?a£ciciela" + IDS_ACCESS_READCONTROL "Kontrola odczytu" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "Tylko ten klucz" + IDS_INHERIT_THISKEYANDSUBKEYS "Ten klucz i podklucze" + IDS_INHERIT_SUBKEYSONLY "Tylko podklucze" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Rozwi±" + IDS_COLLAPSE "&Zwi±" + IDS_GOTO_SUGGESTED_KEY "&Idf do '%s'" +END + +/*****************************************************************/ + + +/* + * Dialog + */ + +IDD_EXPORTRANGE DIALOG DISCARDABLE 50, 50, 370, 50 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 8, "MS Sans Serif" +BEGIN + GROUPBOX "Zakres eksportu",IDC_STATIC,2,0,366,48 + CONTROL "&Wszystko",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "Wy&brana ga?? f",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 +END + +IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,130,7,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,130,24,50,14 +END + + +/* + * TEXTINCLUDE + */ + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + + + +/* + * String Table + */ + +/* + *STRINGTABLE DISCARDABLE + *BEGIN + * ID_HELP_HELPTOPICS "Opens Registry Editor Help." + * ID_HELP_ABOUT "Displays program information, version number, and copyright." + *END + */ _____ Modified: trunk/reactos/subsys/system/regedit/rsrc.rc --- trunk/reactos/subsys/system/regedit/rsrc.rc 2005-11-02 16:13:00 UTC (rev 18952) +++ trunk/reactos/subsys/system/regedit/rsrc.rc 2005-11-02 18:36:04 UTC (rev 18953) @@ -35,6 +35,7 @@ #include "It.rc" #include "Ja.rc" #include "Nl.rc" +#include "Pl.rc" #include "Pt.rc" #include "Ru.rc" #include "Si.rc"

1 0

[gvg] 18952: ScoTTie <scott@wizzer-it.com>/erie-- <seditaniedi@gmail.com>
by gvg＠svn.reactos.com 02 Nov '05

02 Nov '05

ScoTTie <scott(a)wizzer-it.com>/erie-- <seditaniedi(a)gmail.com> Build fixes for FreeBSD Modified: trunk/reactos/tools/buildno/XML.cpp Modified: trunk/reactos/tools/buildno/ssprintf.cpp Modified: trunk/reactos/tools/cabman/cabinet.cxx Modified: trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/tools/nci/ncitool.c Modified: trunk/reactos/tools/pefixup.c Modified: trunk/reactos/tools/rbuild/XML.cpp Modified: trunk/reactos/tools/rbuild/ssprintf.cpp Modified: trunk/reactos/tools/rsym.h Modified: trunk/reactos/w32api/include/poppack.h Modified: trunk/reactos/w32api/include/pshpack1.h Modified: trunk/reactos/w32api/include/pshpack2.h Modified: trunk/reactos/w32api/include/pshpack4.h Modified: trunk/reactos/w32api/include/pshpack8.h Modified: trunk/reactos/w32api/include/wingdi.h _____ Modified: trunk/reactos/tools/buildno/XML.cpp --- trunk/reactos/tools/buildno/XML.cpp 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/buildno/XML.cpp 2005-11-02 16:13:00 UTC (rev 18952) @@ -71,13 +71,19 @@ filelen ( FILE* f ) { #ifdef WIN32 - return _filelengthi64 ( _fileno(f) ); + return _filelengthi64 ( _fileno(f) ); #else - struct stat64 file_stat; - if ( fstat64(fileno(f), &file_stat) != 0 ) - return 0; - return file_stat.st_size; -#endif +# ifdef __FreeBSD__ + struct stat file_stat; + if ( fstat(fileno(f), &file_stat) != 0 ) +# else + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) +# endif // __FreeBSD__ + return 0; + return file_stat.st_size; + +#endif // WIN32 } Path::Path() _____ Modified: trunk/reactos/tools/buildno/ssprintf.cpp --- trunk/reactos/tools/buildno/ssprintf.cpp 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/buildno/ssprintf.cpp 2005-11-02 16:13:00 UTC (rev 18952) @@ -2,12 +2,23 @@ #include "pch.h" -#include <malloc.h> +#ifdef __FreeBSD__ +# include <stdlib.h> +#else +# include <malloc.h> +#endif // __FreeBSD__ #include <math.h> #include <float.h> #include <assert.h> #include "ssprintf.h" +#ifdef __FreeBSD__ +# define __isnan isnan +# define __finite finite +# define powl __builtin_powl +# define modfl __builtin_modfl +#endif // _FreeBSD__ + #ifdef _MSC_VER #define alloca _alloca #endif//_MSC_VER _____ Modified: trunk/reactos/tools/cabman/cabinet.cxx --- trunk/reactos/tools/cabman/cabinet.cxx 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/cabman/cabinet.cxx 2005-11-02 16:13:00 UTC (rev 18952) @@ -16,6 +16,9 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#ifdef __FreeBSD__ +# include <sys/stat.h> +#endif // __FreeBSD__ #include "cabinet.h" #include "raw.h" #include "mszip.h" _____ Modified: trunk/reactos/tools/cdmake/cdmake.c --- trunk/reactos/tools/cdmake/cdmake.c 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/cdmake/cdmake.c 2005-11-02 16:13:00 UTC (rev 18952) @@ -35,15 +35,19 @@ #include <stdlib.h> #include <string.h> #ifdef WIN32 -#include <io.h> -#include <dos.h> +# include <io.h> +# include <dos.h> #else -#include <sys/io.h> -#include <errno.h> -#include <sys/types.h> -#include <dirent.h> -#include <unistd.h> -#endif +# ifdef __FreeBSD__ +# include <sys/uio.h> +# else +# include <sys/io.h> +# endif // __FreeBSD__ +# include <errno.h> +# include <sys/types.h> +# include <dirent.h> +# include <unistd.h> +#endif // WIN32 #include <ctype.h> #include <setjmp.h> #include <time.h> _____ Modified: trunk/reactos/tools/nci/ncitool.c --- trunk/reactos/tools/nci/ncitool.c 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/nci/ncitool.c 2005-11-02 16:13:00 UTC (rev 18952) @@ -14,7 +14,9 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> +#ifndef __FreeBSD__ +# include <malloc.h> +#endif // __FreeBSD__ /* DEFINES ****************************************************************/ _____ Modified: trunk/reactos/tools/pefixup.c --- trunk/reactos/tools/pefixup.c 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/pefixup.c 2005-11-02 16:13:00 UTC (rev 18952) @@ -47,7 +47,7 @@ #define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((unsigned long)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS )(h))->FileHeader.SizeOfOptionalHeader)) #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 -#pragma pack(push,2) +#pragma pack(2) typedef struct _IMAGE_DOS_HEADER { WORD e_magic; WORD e_cblp; @@ -69,8 +69,8 @@ WORD e_res2[10]; LONG e_lfanew; } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; -#pragma pack(pop) -#pragma pack(push,4) +#pragma pack(4) +#pragma pack(4) typedef struct _IMAGE_EXPORT_DIRECTORY { DWORD Characteristics; DWORD TimeDateStamp; @@ -150,7 +150,7 @@ WORD NumberOfLinenumbers; DWORD Characteristics; } IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; -#pragma pack(pop) +#pragma pack(4) /* End of ripped definitions */ _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-11-02 16:13:00 UTC (rev 18952) @@ -70,13 +70,19 @@ filelen ( FILE* f ) { #ifdef WIN32 - return _filelengthi64 ( _fileno(f) ); + return _filelengthi64 ( _fileno(f) ); #else - struct stat64 file_stat; - if ( fstat64(fileno(f), &file_stat) != 0 ) - return 0; - return file_stat.st_size; -#endif +# ifdef __FreeBSD__ + struct stat file_stat; + if ( fstat(fileno(f), &file_stat) != 0 ) +# else + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) +# endif // __FreeBSD__ + return 0; + return file_stat.st_size; + +#endif // WIN32 } Path::Path() _____ Modified: trunk/reactos/tools/rbuild/ssprintf.cpp --- trunk/reactos/tools/rbuild/ssprintf.cpp 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/rbuild/ssprintf.cpp 2005-11-02 16:13:00 UTC (rev 18952) @@ -15,12 +15,23 @@ */ #include "pch.h" -#include <malloc.h> +#ifdef __FreeBSD__ +# include <stdlib.h> +#else +# include <malloc.h> +#endif // __FreeBSD__ #include <math.h> #include <float.h> #include <assert.h> #include "ssprintf.h" +#ifdef __FreeBSD__ +# define __isnan isnan +# define __finite finite +# define powl __builtin_powl +# define modfl __builtin_modfl +#endif // _FreeBSD__ + #ifdef _MSC_VER #define alloca _alloca #endif//_MSC_VER _____ Modified: trunk/reactos/tools/rsym.h --- trunk/reactos/tools/rsym.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/rsym.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -33,7 +33,7 @@ #endif #endif -#pragma pack(push,2) +#pragma pack(2) typedef struct _IMAGE_DOS_HEADER { WORD e_magic; WORD e_cblp; @@ -55,13 +55,13 @@ WORD e_res2[10]; LONG e_lfanew; } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; -#pragma pack(pop) +#pragma pack(4) #define IMAGE_FILE_LINE_NUMS_STRIPPED 4 #define IMAGE_FILE_LOCAL_SYMS_STRIPPED 8 #define IMAGE_FILE_DEBUG_STRIPPED 512 -#pragma pack(push,4) +#pragma pack(4) typedef struct _IMAGE_FILE_HEADER { WORD Machine; WORD NumberOfSections; @@ -162,7 +162,7 @@ USHORT s_nlnno; /* number of line number entries */ ULONG s_flags; /* flags */ } SCNHDR; -#pragma pack(pop) +#pragma pack(4) typedef struct _SYMBOLFILE_HEADER { ULONG SymbolsOffset; @@ -238,7 +238,7 @@ #define C_ALIAS 105 /* duplicate tag */ #define C_HIDDEN 106 /* ext symbol in dmert public lib */ -#pragma pack(push,1) +#pragma pack(1) typedef struct _COFF_SYMENT { union @@ -258,7 +258,7 @@ UCHAR e_sclass; UCHAR e_numaux; } COFF_SYMENT, *PCOFF_SYMENT; -#pragma pack(pop) +#pragma pack(4) typedef struct _ROSSYM_ENTRY { ULONG_PTR Address; _____ Modified: trunk/reactos/w32api/include/poppack.h --- trunk/reactos/w32api/include/poppack.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/poppack.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1,3 +1,7 @@ #ifndef RC_INVOKED -#pragma pack(pop) -#endif +# if ( __FreeBSD__ == 5 ) +# pragma pack(4) +# else +# pragma pack(pop) +# endif // __FreeBSD__ +#endif // RC_INVOKED _____ Modified: trunk/reactos/w32api/include/pshpack1.h --- trunk/reactos/w32api/include/pshpack1.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/pshpack1.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1,3 +1,7 @@ #ifndef RC_INVOKED -#pragma pack(push,1) -#endif +# if ( __FreeBSD__ == 5 ) +# pragma pack(1) +# else +# pragma pack(push,1) +# endif // __FreeBSD__ +#endif // RC_INVOKED _____ Modified: trunk/reactos/w32api/include/pshpack2.h --- trunk/reactos/w32api/include/pshpack2.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/pshpack2.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1,3 +1,7 @@ #ifndef RC_INVOKED -#pragma pack(push,2) -#endif +# if ( __FreeBSD__ == 5 ) +# pragma pack(2) +# else +# pragma pack(push,2) +# endif // __FreeBSD__ +#endif // RC_INVOKED _____ Modified: trunk/reactos/w32api/include/pshpack4.h --- trunk/reactos/w32api/include/pshpack4.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/pshpack4.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1,3 +1,7 @@ #ifndef RC_INVOKED -#pragma pack(push,4) -#endif +# if ( __FreeBSD__ == 5 ) +# pragma pack(4) +# else +# pragma pack(push,4) +# endif // __FreeBSD__ +#endif // RC_INVOKED _____ Modified: trunk/reactos/w32api/include/pshpack8.h --- trunk/reactos/w32api/include/pshpack8.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/pshpack8.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1,3 +1,7 @@ #ifndef RC_INVOKED -#pragma pack(push,8) -#endif +# if ( __FreeBSD__ == 5 ) +# pragma pack(8) +# else +# pragma pack(push,8) +# endif // __FreeBSD__ +#endif // RC_INVOKED _____ Modified: trunk/reactos/w32api/include/wingdi.h --- trunk/reactos/w32api/include/wingdi.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/wingdi.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1225,14 +1225,14 @@ WORD bcPlanes; WORD bcBitCount; } BITMAPCOREHEADER,*LPBITMAPCOREHEADER,*PBITMAPCOREHEADER; -#pragma pack(push,1) +#include "pshpack1.h" typedef struct tagRGBTRIPLE { BYTE rgbtBlue; BYTE rgbtGreen; BYTE rgbtRed; } RGBTRIPLE,*LPRGBTRIPLE; -#pragma pack(pop) -#pragma pack(push,2) +#include "poppack.h" +#include "pshpack2.h" typedef struct tagBITMAPFILEHEADER { WORD bfType; DWORD bfSize; @@ -1240,7 +1240,7 @@ WORD bfReserved2; DWORD bfOffBits; } BITMAPFILEHEADER,*LPBITMAPFILEHEADER,*PBITMAPFILEHEADER; -#pragma pack(pop) +#include "poppack.h" typedef struct _BITMAPCOREINFO { BITMAPCOREHEADER bmciHeader; RGBTRIPLE bmciColors[1]; @@ -2024,7 +2024,7 @@ EMR emr; DWORD iMode; } EMRSELECTCLIPPATH,*PEMRSELECTCLIPPATH,EMRSETBKMODE,*PEMRSETBKMODE,EMRSET MAPMODE,*PEMRSETMAPMODE,EMRSETPOLYFILLMODE,*PEMRSETPOLYFILLMODE,EMRSETRO P2,*PEMRSETROP2,EMRSETSTRETCHBLTMODE,*PEMRSETSTRETCHBLTMODE,EMRSETTEXTAL IGN,*PEMRSETTEXTALIGN,EMRENABLEICM,*PEMRENABLEICM; -#pragma pack(push,2) +#include "pshpack2.h" typedef struct tagMETAHEADER { WORD mtType; WORD mtHeaderSize; @@ -2034,7 +2034,7 @@ DWORD mtMaxRecord; WORD mtNoParameters; } METAHEADER,*PMETAHEADER,*LPMETAHEADER; -#pragma pack(pop) +#include "poppack.h" typedef struct tagENHMETAHEADER { DWORD iType; DWORD nSize; @@ -2320,7 +2320,7 @@ DWORD lsCsbSupported[2]; } LOCALESIGNATURE,*PLOCALESIGNATURE,*LPLOCALESIGNATURE; typedef LONG LCSTYPE; -#pragma pack(push,4) +#include "pshpack4.h" typedef struct tagNEWTEXTMETRICA { LONG tmHeight; LONG tmAscent; @@ -2373,7 +2373,7 @@ UINT ntmCellHeight; UINT ntmAvgWidth; } NEWTEXTMETRICW,*PNEWTEXTMETRICW,*LPNEWTEXTMETRICW; -#pragma pack(pop) +#include "poppack.h" typedef struct tagNEWTEXTMETRICEXA { NEWTEXTMETRICA ntmTm; FONTSIGNATURE ntmFontSig;

1 0

[cwittich] 18951: * compile .S files with MSVC2002/2003 too
by cwittich＠svn.reactos.com 02 Nov '05

02 Nov '05

* compile .S files with MSVC2002/2003 too Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-02 14:18:40 UTC (rev 18950) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-02 15:32:05 UTC (rev 18951) @@ -367,6 +367,24 @@ const string& source_file = DosSeparator(source_files[isrcfile]); fprintf ( OUT, "\t\t\t<File\r\n" ); fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); + + if (configuration.VSProjectVersion < "8.00") { + if (source_file.at(source_file.size() - 1) == 'S') { + for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) + { + std::string& config = cfgs[iconfig]; + fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); + fprintf ( OUT, "\t\t\t\t\tName=\"" ); + fprintf ( OUT, config.c_str()); + fprintf ( OUT, "|Win32\">\r\n" ); + fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" | as -o "$(OutDir)\\$(InputName).obj"\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); + fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); + } + } + } fprintf ( OUT, "\t\t\t</File>\r\n" ); } fprintf ( OUT, "\t\t</Filter>\r\n" );

1 0

[royce] 18950: newer msvc's are aware of __FUNCTION__
by royce＠svn.reactos.com 02 Nov '05

02 Nov '05

newer msvc's are aware of __FUNCTION__ Modified: trunk/reactos/include/wine/debug.h _____ Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-11-02 14:15:42 UTC (rev 18949) +++ trunk/reactos/include/wine/debug.h 2005-11-02 14:18:40 UTC (rev 18950) @@ -17,7 +17,9 @@ #endif #ifndef __GNUC__ +#if !defined(_MSC_VER) || _MSC_VER < 8 #define __FUNCTION__ "" +#endif//_MSC_VER #define inline __inline #endif

1 0

[turner] 18949: Some changes for better formatting / following standards.
by turner＠svn.reactos.com 02 Nov '05

02 Nov '05

Some changes for better formatting / following standards. Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-11-02 14:08:16 UTC (rev 18948) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-11-02 14:15:42 UTC (rev 18949) @@ -216,7 +216,8 @@ * displays help screen for dir * Rob Lake */ -static VOID DirHelp(VOID) +static VOID +DirHelp(VOID) { ConOutResPaging(TRUE, STRING_DIR_HELP1); } @@ -228,10 +229,11 @@ * * Parse the parameters and switches of the command line and exports them */ -static BOOL DirReadParam(LPTSTR Line, /* [IN] The line with the parameters & switches */ - LPTSTR** params, /* [OUT] The parameters after parsing */ - LPINT entries, /* [OUT] The number of parameters after parsing */ - LPDIRSWITCHFLAGS lpFlags) /* [IN/OUT] The flags after calculating switches */ +static BOOL +DirReadParam(LPTSTR Line, /* [IN] The line with the parameters & switches */ + LPTSTR** params, /* [OUT] The parameters after parsing */ + LPINT entries, /* [OUT] The number of parameters after parsing */ + LPDIRSWITCHFLAGS lpFlags) /* [IN/OUT] The flags after calculating switches */ { TCHAR cCurSwitch; /* The current switch */ TCHAR cCurChar; /* Current examing character */ @@ -1220,7 +1222,8 @@ * * Get the name of the file without extension */ -static LPTSTR getName(const TCHAR* file, TCHAR * dest) +static LPTSTR +getName(const TCHAR* file, TCHAR * dest) { int iLen; LPTSTR end; @@ -1320,9 +1323,9 @@ */ static VOID DirPrintWideList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ - DWORD dwCount, /* [IN] The quantity of files */ - TCHAR *szCurPath, /* [IN] Full path of current directory */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ + DWORD dwCount, /* [IN] The quantity of files */ + TCHAR *szCurPath, /* [IN] Full path of current directory */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { SHORT iScreenWidth; USHORT iColumns; @@ -1512,9 +1515,9 @@ */ static VOID DirPrintBareList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ - DWORD dwCount, /* [IN] The number of files */ - LPTSTR lpCurPath, /* [IN] Full path of current directory */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ + DWORD dwCount, /* [IN] The number of files */ + LPTSTR lpCurPath, /* [IN] Full path of current directory */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { TCHAR szFullName[MAX_PATH]; DWORD i; @@ -1556,9 +1559,9 @@ */ static VOID DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ - DWORD dwCount, /* [IN] The quantity of files */ - TCHAR *szCurPath, /* [IN] Full path of current directory */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ + DWORD dwCount, /* [IN] The quantity of files */ + TCHAR *szCurPath, /* [IN] Full path of current directory */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */ @@ -1617,8 +1620,8 @@ */ static BOOL CompareFiles(LPWIN32_FIND_DATA lpFile1, /* [IN] A pointer to WIN32_FIND_DATA of file 1 */ - LPWIN32_FIND_DATA lpFile2, /* [IN] A pointer to WIN32_FIND_DATA of file 2 */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we use to list */ + LPWIN32_FIND_DATA lpFile2, /* [IN] A pointer to WIN32_FIND_DATA of file 2 */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we use to list */ { ULARGE_INTEGER u64File1; ULARGE_INTEGER u64File2; @@ -1768,9 +1771,9 @@ */ static INT DirList(LPTSTR szPath, /* [IN] The path that dir starts */ - LPTSTR szFilespec, /* [IN] The type of file that we are looking for */ - LPINT pLine, /* FIXME: Maybe used for paginating */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ + LPTSTR szFilespec, /* [IN] The type of file that we are looking for */ + LPINT pLine, /* FIXME: Maybe used for paginating */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ { HANDLE hSearch; /* The handle of the search */ HANDLE hRecSearch; /* The handle for searching recursivly */ @@ -1974,7 +1977,8 @@ * * internal dir command */ -INT CommandDir(LPTSTR first, LPTSTR rest) +INT +CommandDir(LPTSTR first, LPTSTR rest) { TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ TCHAR cDrive;

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