Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 17547: add stub for ControlServiceEx()
by weiden＠svn.reactos.com 25 Aug '05

25 Aug '05

add stub for ControlServiceEx() Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-08-25 20:58:01 UTC (rev 17546) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-08-25 22:06:31 UTC (rev 17547) @@ -73,6 +73,7 @@ ;CommandLineFromMsiDescriptor@12 ;ComputeAccessTokenFromCodeAuthzLevel@20 ControlService@12 +ControlServiceEx@16 ;ControlTraceA@12 ;ControlTraceW@12 ;ConvertAccessToSecurityDescriptorA@20 _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-08-25 20:58:01 UTC (rev 17546) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-08-25 22:06:31 UTC (rev 17547) @@ -195,6 +195,25 @@ /********************************************************************** + * ControlServiceEx + * + * @unimplemented + */ +BOOL STDCALL +ControlServiceEx(IN SC_HANDLE hService, + IN DWORD dwControl, + IN DWORD dwInfoLevel, + IN OUT PVOID pControlParams) +{ + DPRINT1("ControlServiceEx(0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", + hService, dwControl, dwInfoLevel, pControlParams); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + + +/********************************************************************** * CreateServiceA * * @unimplemented

1 0

[sedwards] 17546: Generate a GUID for each module processed. Later on this will be needed to support msvc2k3/5 vcproj files.
by sedwards＠svn.reactos.com 25 Aug '05

25 Aug '05

Generate a GUID for each module processed. Later on this will be needed to support msvc2k3/5 vcproj files. Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-25 20:05:07 UTC (rev 17545) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-25 20:58:01 UTC (rev 17546) @@ -96,8 +96,6 @@ #endif fclose ( m_dswFile ); - gen_guid(); - // The MSVC build still needs the mingw backend. //ProcessModules(); @@ -120,6 +118,7 @@ Module &module = *ProjectNode.modules[i]; this->_generate_dsp ( module ); + gen_guid(); /*for(size_t k = 0; k < module.non_if_data.files.size(); k++) {

1 0

[turner] 17545: Implement escape char in console. "^"
by turner＠svn.reactos.com 25 Aug '05

25 Aug '05

Implement escape char in console. "^" cmd.c - when the env isnt found, dont zero out the params redir.c - skip over all ^ when looking for redir/pipe echo.c - when printing out, treat ^ correctly. Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/redir.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-08-25 19:53:37 UTC (rev 17544) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-08-25 20:05:07 UTC (rev 17545) @@ -1027,7 +1027,7 @@ cp = commandline; while (*ip) { - if (*ip == _T('%')) + if (*ip == _T('%')) { switch (*++ip) { @@ -1077,7 +1077,6 @@ GetCurrentDirectory (MAX_PATH, szPath); cp = _stpcpy (cp, szPath); } - /* %TIME% */ else if (_tcsicmp(ip,_T("time")) ==0) { @@ -1146,8 +1145,18 @@ evar = malloc ( 512 * sizeof(TCHAR)); if (evar==NULL) return 1; - + SetLastError(0); size = GetEnvironmentVariable (ip, evar, 512); + if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) + { + /* if no env var is found you must + continue with what was input*/ + cp = _stpcpy (cp, _T("%")); + cp = _stpcpy (cp, ip); + cp = _stpcpy (cp, _T("%")); + } + else + { if (size > 512) { evar = realloc(evar,size * sizeof(TCHAR) ); @@ -1162,6 +1171,7 @@ { cp = _stpcpy (cp, evar); } + } free(evar); } _____ Modified: trunk/reactos/subsys/system/cmd/echo.c --- trunk/reactos/subsys/system/cmd/echo.c 2005-08-25 19:53:37 UTC (rev 17544) +++ trunk/reactos/subsys/system/cmd/echo.c 2005-08-25 20:05:07 UTC (rev 17545) @@ -33,6 +33,7 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param) { TCHAR szMsg[RC_STRING_MAX_SIZE]; + INT i = 0; #ifdef _DEBUG DebugPrintf (_T("CommandEcho '%s' : '%s'\n"), cmd, param); @@ -58,7 +59,20 @@ else if (_tcsicmp (param, D_ON) == 0) bEcho = TRUE; else if (*param) + { + while(i < _tcslen(param)) + { + if(param[i] == _T('^')) + { + memmove(&param[i],&param[i + 1], _tcslen(&param[i]) * sizeof(TCHAR)); + //skip past the char being escaped + i++; + } + else + i++; + } ConOutPuts (param); + } else { LoadString(CMD_ModuleHandle, STRING_ECHO_HELP5, szMsg, RC_STRING_MAX_SIZE); _____ Modified: trunk/reactos/subsys/system/cmd/redir.c --- trunk/reactos/subsys/system/cmd/redir.c 2005-08-25 19:53:37 UTC (rev 17544) +++ trunk/reactos/subsys/system/cmd/redir.c 2005-08-25 20:05:07 UTC (rev 17545) @@ -78,6 +78,12 @@ /* find and remove all the redirections first */ while (*sp) { + if (*sp == _T('^')) + { + *dp++ = *sp++; + *dp++ = *sp++; + continue; + } if ((*sp == _T('"')) || (*sp == _T('\''))) { /* No redirects inside quotes */ @@ -242,8 +248,14 @@ sp = s; while (*sp) { - if ((*sp == _T('"')) || (*sp == _T('\''))) + if (*sp == _T('^')) { + *sp++; + *sp++; + continue; + } + else if ((*sp == _T('"')) || (*sp == _T('\''))) + { TCHAR qc = *sp; do

1 0

[weiden] 17544: enable theming of the checklist control
by weiden＠svn.reactos.com 25 Aug '05

25 Aug '05

enable theming of the checklist control Modified: trunk/reactos/lib/aclui/aclui.xml _____ Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2005-08-25 19:47:44 UTC (rev 17543) +++ trunk/reactos/lib/aclui/aclui.xml 2005-08-25 19:53:37 UTC (rev 17544) @@ -7,6 +7,7 @@ <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> + <define name="SUPPORT_UXTHEME" /> <library>ntdll</library> <library>kernel32</library> <library>user32</library>

1 0

[weiden] 17543: - added stubs for Set/GetConsoleHistoryInfo(), GetConsoleOriginalTitleA/W(), Set/GetConsoleScreenBufferInfoEx() and GetCurrentConsoleFontEx()
by weiden＠svn.reactos.com 25 Aug '05

25 Aug '05

- added stubs for Set/GetConsoleHistoryInfo(), GetConsoleOriginalTitleA/W(), Set/GetConsoleScreenBufferInfoEx() and GetCurrentConsoleFontEx() - added missing structure definitions Modified: trunk/reactos/lib/aclui/aclui.xml Modified: trunk/reactos/lib/advapi32/advapi32.xml Modified: trunk/reactos/lib/kernel32/kernel32.def Modified: trunk/reactos/lib/kernel32/kernel32.xml Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/misc/lcformat.c Modified: trunk/reactos/lib/ntdll/ntdll.xml Modified: trunk/reactos/lib/ntmarta/ntmarta.xml Modified: trunk/reactos/w32api/include/wincon.h Modified: trunk/reactos/w32api/include/windows.h _____ Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/aclui/aclui.xml 2005-08-25 19:47:44 UTC (rev 17543) @@ -5,7 +5,7 @@ <define name="_UNICODE" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> - <define name="_WIN32_WINNT">0x501</define> + <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> <library>ntdll</library> <library>kernel32</library> _____ Modified: trunk/reactos/lib/advapi32/advapi32.xml --- trunk/reactos/lib/advapi32/advapi32.xml 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/advapi32/advapi32.xml 2005-08-25 19:47:44 UTC (rev 17543) @@ -5,7 +5,7 @@ <define name="__USE_W32API" /> <define name="WINVER">0x600</define> <define name="_WIN32_IE">0x0500</define> - <define name="_WIN32_WINNT">0x0501</define> + <define name="_WIN32_WINNT">0x0600</define> <library>scm_client</library> <library>ntdll</library> <library>kernel32</library> _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/kernel32/kernel32.def 2005-08-25 19:47:44 UTC (rev 17543) @@ -773,6 +773,7 @@ SetConsoleDisplayMode@12 SetConsoleFont@8 SetConsoleHardwareState@12 +SetConsoleHistoryInfo@4 SetConsoleIcon@4 SetConsoleInputExeNameA@4 SetConsoleInputExeNameW@4 @@ -787,6 +788,7 @@ ;SetConsoleOS2OemFormat SetConsoleOutputCP@4 SetConsolePalette@12 +SetConsoleScreenBufferInfoEx@8 SetConsoleScreenBufferSize@8 SetConsoleTextAttribute@8 SetConsoleTitleA@4 _____ Modified: trunk/reactos/lib/kernel32/kernel32.xml --- trunk/reactos/lib/kernel32/kernel32.xml 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/kernel32/kernel32.xml 2005-08-25 19:47:44 UTC (rev 17543) @@ -4,9 +4,9 @@ <define name="_DISABLE_TIDENTS" /> <define name="_SEH_NO_NATIVE_NLG" /> <define name="__USE_W32API" /> - <define name="_WIN32_WINNT">0x0502</define> + <define name="_WIN32_WINNT">0x0600</define> <define name="__NO_CTYPE_INLINES" /> - <define name="WINVER">0x0500</define> + <define name="WINVER">0x0600</define> <pch>k32.h</pch> <directory name="debug"> <file>break.c</file> _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-08-25 19:47:44 UTC (rev 17543) @@ -3622,4 +3622,108 @@ return Ret; } + +/*-------------------------------------------------------------- + * GetConsoleHistoryInfo + * + * @unimplemented + */ +BOOL STDCALL +GetConsoleHistoryInfo(PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) +{ + DPRINT1("GetConsoleHistoryInfo(0x%p) UNIMPLEMENTED!\n", lpConsoleHistoryInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*-------------------------------------------------------------- + * SetConsoleHistoryInfo + * + * @unimplemented + */ +BOOL STDCALL +SetConsoleHistoryInfo(IN PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) +{ + DPRINT1("SetConsoleHistoryInfo(0x%p) UNIMPLEMENTED!\n", lpConsoleHistoryInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*-------------------------------------------------------------- + * GetConsoleOriginalTitleW + * + * @unimplemented + */ +DWORD STDCALL +GetConsoleOriginalTitleW(OUT LPWSTR lpConsoleTitle, + IN DWORD nSize) +{ + DPRINT1("GetConsoleOriginalTitleW(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/*-------------------------------------------------------------- + * GetConsoleOriginalTitleA + * + * @unimplemented + */ +DWORD STDCALL +GetConsoleOriginalTitleA(OUT LPSTR lpConsoleTitle, + IN DWORD nSize) +{ + DPRINT1("GetConsoleOriginalTitleA(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/*-------------------------------------------------------------- + * GetConsoleScreenBufferInfoEx + * + * @unimplemented + */ +BOOL STDCALL +GetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, + OUT PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) +{ + DPRINT1("GetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*-------------------------------------------------------------- + * SetConsoleScreenBufferInfoEx + * + * @unimplemented + */ +BOOL STDCALL +SetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, + IN PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) +{ + DPRINT1("SetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*-------------------------------------------------------------- + * GetCurrentConsoleFontEx + * + * @unimplemented + */ +BOOL STDCALL +GetCurrentConsoleFontEx(IN HANDLE hConsoleOutput, + IN BOOL bMaximumWindow, + OUT PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx) +{ + DPRINT1("GetCurrentConsoleFontEx(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, lpConsoleCurrentFontEx); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/misc/lcformat.c --- trunk/reactos/lib/kernel32/misc/lcformat.c 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/kernel32/misc/lcformat.c 2005-08-25 19:47:44 UTC (rev 17543) @@ -28,8 +28,6 @@ * -Gunnar */ -#define WINVER 0x0500 - #include <k32.h> #include "wine/config.h" _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-08-25 19:47:44 UTC (rev 17543) @@ -5,7 +5,7 @@ <define name="__NTDLL__" /> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> - <define name="_WIN32_WINNT">0x0502</define> + <define name="_WIN32_WINNT">0x0600</define> <define name="_NTOSKRNL_" /> <define name="__NO_CTYPE_INLINES" /> <library>rtl</library> _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.xml --- trunk/reactos/lib/ntmarta/ntmarta.xml 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/lib/ntmarta/ntmarta.xml 2005-08-25 19:47:44 UTC (rev 17543) @@ -5,7 +5,7 @@ <define name="_UNICODE" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> - <define name="_WIN32_WINNT">0x501</define> + <define name="_WIN32_WINNT">0x600</define> <define name="WINVER">0x0600</define> <library>ntdll</library> <library>kernel32</library> _____ Modified: trunk/reactos/w32api/include/wincon.h --- trunk/reactos/w32api/include/wincon.h 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/w32api/include/wincon.h 2005-08-25 19:47:44 UTC (rev 17543) @@ -107,7 +107,6 @@ PACKED #endif KEY_EVENT_RECORD; - typedef struct _MOUSE_EVENT_RECORD { COORD dwMousePosition; DWORD dwButtonState; @@ -128,8 +127,39 @@ } Event; } INPUT_RECORD,*PINPUT_RECORD; +#if (_WIN32_WINNT >= 0x0600) +#define HISTORY_NO_DUP_FLAG 0x1 +#define CONSOLE_OVERSTRIKE 0x1 +typedef struct _CONSOLE_HISTORY_INFO { + UINT cbSize; + UINT HistoryBufferSize; + UINT NumberOfHistoryBuffers; + DWORD dwFlags; +} CONSOLE_HISTORY_INFO, *PCONSOLE_HISTORY_INFO; + +typedef struct _CONSOLE_SCREEN_BUFFER_INFOEX { + ULONG cbSize; + COORD dwSize; + COORD dwCursorPosition; + WORD wAttributes; + SMALL_RECT srWindow; + COORD dwMaximumWindowSize; + WORD wPopupAttributes; + COLORREF ColorTable[16]; +} CONSOLE_SCREEN_BUFFER_INFOEX, *PCONSOLE_SCREEN_BUFFER_INFOEX; + +typedef struct _CONSOLE_FONT_INFOEX { + ULONG cbSize; + DWORD nFont; + COORD dwFontSize; + UINT FontFamily; + UINT FontWeight; + WCHAR FaceName[LF_FACESIZE]; +} CONSOLE_FONT_INFOEX, *PCONSOLE_FONT_INFOEX; +#endif + BOOL WINAPI AllocConsole(void); -#if (_WIN32_WINNT >= 0x05001) +#if (_WIN32_WINNT >= 0x0501) BOOL WINAPI AttachConsole(DWORD); #endif HANDLE WINAPI CreateConsoleScreenBuffer(DWORD,DWORD,CONST SECURITY_ATTRIBUTES*,DWORD,LPVOID); _____ Modified: trunk/reactos/w32api/include/windows.h --- trunk/reactos/w32api/include/windows.h 2005-08-25 18:21:50 UTC (rev 17542) +++ trunk/reactos/w32api/include/windows.h 2005-08-25 19:47:44 UTC (rev 17543) @@ -47,11 +47,11 @@ #include <excpt.h> #include <stdarg.h> #include <windef.h> -#include <wincon.h> #include <winbase.h> #if !(defined NOGDI || defined _WINGDI_H) #include <wingdi.h> #endif +#include <wincon.h> #ifndef _WINUSER_H #include <winuser.h> #endif

1 0

[weiden] 17542: add stubs for CreateSymbolicLinkA/W
by weiden＠svn.reactos.com 25 Aug '05

25 Aug '05

add stubs for CreateSymbolicLinkA/W Modified: trunk/reactos/lib/kernel32/file/create.c Modified: trunk/reactos/lib/kernel32/kernel32.def _____ Modified: trunk/reactos/lib/kernel32/file/create.c --- trunk/reactos/lib/kernel32/file/create.c 2005-08-25 17:38:15 UTC (rev 17541) +++ trunk/reactos/lib/kernel32/file/create.c 2005-08-25 18:21:50 UTC (rev 17542) @@ -357,4 +357,51 @@ return FileHandle; } + +/* + * @unimplemented + */ +BOOL STDCALL +CreateSymbolicLinkW(IN LPCWSTR lpSymlinkFileName, + IN LPCWSTR lpTargetFileName, + IN DWORD dwFlags) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @implemented + */ +BOOL STDCALL +CreateSymbolicLinkA(IN LPCSTR lpSymlinkFileName, + IN LPCSTR lpTargetFileName, + IN DWORD dwFlags) +{ + PWCHAR SymlinkW, TargetW; + BOOL Ret; + + if(!lpSymlinkFileName || !lpTargetFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!(SymlinkW = FilenameA2W(lpSymlinkFileName, FALSE))) + return FALSE; + + if (!(TargetW = FilenameA2W(lpTargetFileName, TRUE))) + return FALSE; + + Ret = CreateSymbolicLinkW(SymlinkW, + TargetW, + dwFlags); + + RtlFreeHeap(RtlGetProcessHeap(), 0, TargetW); + + return Ret; +} + + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2005-08-25 17:38:15 UTC (rev 17541) +++ trunk/reactos/lib/kernel32/kernel32.def 2005-08-25 18:21:50 UTC (rev 17542) @@ -135,6 +135,8 @@ CreateSemaphoreA@16 CreateSemaphoreW@16 CreateSocketHandle@0 +CreateSymbolicLinkA@12 +CreateSymbolicLinkW@12 CreateTapePartition@16 CreateThread@24 CreateTimerQueue@0

1 0

[turner] 17541: Use GetShortPathName and GetLongPathName to correct the case of the new path in SetRootPath. GetFullPathName by itself would not work when there was a space in the name.
by turner＠svn.reactos.com 25 Aug '05

25 Aug '05

Use GetShortPathName and GetLongPathName to correct the case of the new path in SetRootPath. GetFullPathName by itself would not work when there was a space in the name. Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-08-25 17:24:11 UTC (rev 17540) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-08-25 17:38:15 UTC (rev 17541) @@ -215,7 +215,8 @@ { TCHAR oldpath[MAX_PATH]; TCHAR OutPath[MAX_PATH]; - TCHAR OutPathUpper[MAX_PATH]; + TCHAR OutPathTemp[MAX_PATH]; + TCHAR OutPathTemp2[MAX_PATH]; BOOL fail; @@ -228,16 +229,20 @@ if (_tcsncicmp(&InPath[1],_T(":\\"),2)!=0) { - if (!GetRootPath(InPath,OutPathUpper,MAX_PATH)) - _tcscpy(OutPathUpper,InPath); + if (!GetRootPath(InPath,OutPathTemp,MAX_PATH)) + _tcscpy(OutPathTemp,InPath); } else { - _tcscpy(OutPathUpper,InPath); + _tcscpy(OutPathTemp,InPath); } - _tcsupr(OutPathUpper); - GetLongPathName(OutPathUpper, OutPath, MAX_PATH); + _tcsupr(OutPathTemp); + /* The use of both of these together will correct the case of a path + where as one alone or GetFullPath will not. Exameple: + c:\windows\SYSTEM32 => C:\WINDOWS\system32 */ + GetShortPathName(OutPathTemp, OutPathTemp2, MAX_PATH); + GetLongPathName(OutPathTemp2, OutPath, MAX_PATH); fail = SetCurrentDirectory(OutPath); if (!fail)

1 0

[royce] 17540: file paths should be relative to the location of the dsp file, not the dsw file
by royce＠svn.reactos.com 25 Aug '05

25 Aug '05

file paths should be relative to the location of the dsp file, not the dsw file Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-25 15:31:28 UTC (rev 17539) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-25 17:24:11 UTC (rev 17540) @@ -20,7 +20,7 @@ const bool wine = false; string dsp_file = DspFileName(module); - printf ( "Creating MSVC project: '%s'\r\n", dsp_file.c_str() ); + printf ( "Creating MSVC project: '%s'\n", dsp_file.c_str() ); FILE* OUT = fopen ( dsp_file.c_str(), "wb" ); vector<string> imports; @@ -55,6 +55,7 @@ //$output->progress("$dsp_file (file $progress_current of $progress_max)"); // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'? + string dsp_path = module.GetBasePath(); vector<string> c_srcs, source_files, resource_files; vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.non_if_data ); @@ -69,7 +70,8 @@ for ( i = 0; i < files.size(); i++ ) { // TODO FIXME - do we want the full path of the file here? - const string& file = files[i]->name; + string file = string(".") + &files[i]->name[dsp_path.size()]; + source_files.push_back ( file ); if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) c_srcs.push_back ( file );

1 0

[mbosma] 17539: Fill some more structs, that ms ddraw fill as well.
by mbosma＠svn.reactos.com 25 Aug '05

25 Aug '05

Fill some more structs, that ms ddraw fill as well. Modified: trunk/reactos/lib/ddraw/hal/ddraw.c Modified: trunk/reactos/lib/ddraw/main/ddraw.c Modified: trunk/reactos/lib/ddraw/main/surface.c Modified: trunk/reactos/lib/ddraw/main.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw.c --- trunk/reactos/lib/ddraw/hal/ddraw.c 2005-08-25 12:33:37 UTC (rev 17538) +++ trunk/reactos/lib/ddraw/hal/ddraw.c 2005-08-25 15:31:28 UTC (rev 17539) @@ -15,60 +15,88 @@ { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + /* get the object */ if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc)) return DDERR_INVALIDPARAMS; - + + /* alloc some space */ + This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), 0, sizeof(DDHAL_CALLBACKS)); + memset(This->DirectDrawGlobal.lpDDCBtmp, 0, sizeof(DDHAL_CALLBACKS)); + This->HalInfo.lpDDCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDCallbacks; + This->HalInfo.lpDDSurfaceCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDSurfaceCallbacks; + This->HalInfo.lpDDExeBufCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDExeBufCallbacks; + This->HalInfo.lpDDPaletteCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDPaletteCallbacks; + This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_CALLBACKS)); + This->DirectDrawGlobal.lpD3DGlobalDriverData = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_GLOBALDRIVERDATA)); + + /* fill the sizeofs */ This->HalInfo.dwSize = sizeof(DDHALINFO); - This->D3dDriverData.dwSize = sizeof(D3DHAL_GLOBALDRIVERDATA); - This->DriverCallbacks.DdMain.dwSize = sizeof(DDHAL_DDCALLBACKS); - This->DriverCallbacks.DdSurface.dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); - This->DriverCallbacks.DdPalette.dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); - This->DriverCallbacks.D3dMain.dwSize = sizeof(D3DHAL_CALLBACKS); - This->DriverCallbacks.D3dBufferCallbacks.dwSize = sizeof(DDHAL_DDEXEBUFCALLBACKS); - + This->HalInfo.lpDDCallbacks->dwSize = sizeof(DDHAL_DDCALLBACKS); + This->HalInfo.lpDDSurfaceCallbacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); + This->HalInfo.lpDDPaletteCallbacks->dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); + This->HalInfo.lpDDExeBufCallbacks->dwSize = sizeof(DDHAL_DDEXEBUFCALLBACKS); + ((LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks)->dwSize = sizeof(D3DHAL_CALLBACKS); + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwSize = sizeof(D3DHAL_GLOBALDRIVERDATA); + + /* query all kinds of infos from the driver */ if(!DdQueryDirectDrawObject ( &This->DirectDrawGlobal, &This->HalInfo, - &This->DriverCallbacks.DdMain, - &This->DriverCallbacks.DdSurface, - &This->DriverCallbacks.DdPalette, - &This->DriverCallbacks.D3dMain, - &This->D3dDriverData, - &This->DriverCallbacks.D3dBufferCallbacks, + This->HalInfo.lpDDCallbacks, + This->HalInfo.lpDDSurfaceCallbacks, + This->HalInfo.lpDDPaletteCallbacks, + (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, + (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, + This->HalInfo.lpDDExeBufCallbacks, NULL, NULL, NULL )) - return DDERR_INVALIDPARAMS; + { + OutputDebugString(L"First DdQueryDirectDrawObject failed"); + return 1; + } - This->pD3dTextureFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDSURFACEDESC) * This->D3dDriverData.dwNumTextureFormats); + /* ms wants us to call that function twice */ This->HalInfo.vmiData.pvmList = HeapAlloc(GetProcessHeap(), 0, sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); This->DirectDrawGlobal.lpdwFourCC = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); This->DirectDrawGlobal.lpZPixelFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDSURFACEDESC) * ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwNumTextureFormats); if(!DdQueryDirectDrawObject ( &This->DirectDrawGlobal, &This->HalInfo, - &This->DriverCallbacks.DdMain, - &This->DriverCallbacks.DdSurface, - &This->DriverCallbacks.DdPalette, - &This->DriverCallbacks.D3dMain, - &This->D3dDriverData, - &This->DriverCallbacks.D3dBufferCallbacks, - This->pD3dTextureFormats, + This->HalInfo.lpDDCallbacks, + This->HalInfo.lpDDSurfaceCallbacks, + This->HalInfo.lpDDPaletteCallbacks, + (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, + (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, + This->HalInfo.lpDDExeBufCallbacks, + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats, This->DirectDrawGlobal.lpdwFourCC, - This->HalInfo.vmiData.pvmList )) - return DDERR_INVALIDPARAMS; + This->HalInfo.vmiData.pvmList + )) + { + OutputDebugString(L"Second DdQueryDirectDrawObject failed"); + return 1; + } + /* fill some extra data */ This->DirectDrawGlobal.vmiData.dwDisplayWidth = This->Width; This->DirectDrawGlobal.vmiData.dwDisplayHeight = This->Height; This->DirectDrawGlobal.vmiData.lDisplayPitch = This->Width * This->Bpp/8; - //This->DirectDrawGlobal.vmiData.ddpfDisplay; // This has to be filled This->DirectDrawGlobal.vmiData.dwOffscreenAlign = 64; This->DirectDrawGlobal.vmiData.dwOverlayAlign = 64; This->DirectDrawGlobal.vmiData.dwTextureAlign = 64; This->DirectDrawGlobal.vmiData.dwZBufferAlign = 64; This->DirectDrawGlobal.vmiData.dwAlphaAlign = 64; + //This->DirectDrawGlobal.vmiData.ddpfDisplay; // This has to be filled + This->DirectDrawGlobal.ddCaps = This->HalInfo.ddCaps; + This->DirectDrawGlobal.lpDDCBtmp->HALDD = This->DirectDrawGlobal.lpDDCBtmp->cbDDCallbacks; + This->DirectDrawGlobal.lpDDCBtmp->HALDDSurface = This->DirectDrawGlobal.lpDDCBtmp->cbDDSurfaceCallbacks; + This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf = This->DirectDrawGlobal.lpDDCBtmp->cbDDExeBufCallbacks; + This->DirectDrawGlobal.lpDDCBtmp->HALDDPalette = This->DirectDrawGlobal.lpDDCBtmp->cbDDPaletteCallbacks; + return DD_OK; } @@ -82,11 +110,20 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DdDeleteDirectDrawObject (&This->DirectDrawGlobal); - - if(This->pD3dTextureFormats) - HeapFree(GetProcessHeap(), 0, This->pD3dTextureFormats); + + if(This->HalInfo.vmiData.pvmList) + HeapFree(GetProcessHeap(), 0, This->HalInfo.vmiData.pvmList); if(This->DirectDrawGlobal.lpdwFourCC) HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpdwFourCC); - if(This->HalInfo.vmiData.pvmList) - HeapFree(GetProcessHeap(), 0, This->HalInfo.vmiData.pvmList); + if(This->DirectDrawGlobal.lpZPixelFormats) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpZPixelFormats); + if(((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverD ata)->lpTextureFormats) + HeapFree(GetProcessHeap(), 0, ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats); + + if(This->DirectDrawGlobal.lpDDCBtmp) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDCBtmp); + if(This->DirectDrawGlobal.lpD3DHALCallbacks) + HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks); + if(This->DirectDrawGlobal.lpD3DGlobalDriverData) + HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DGlobalDriverData); } _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-08-25 12:33:37 UTC (rev 17538) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-08-25 15:31:28 UTC (rev 17539) @@ -25,8 +25,8 @@ // get the HDC This->hdc = GetWindowDC(GetDesktopWindow()); - This->Height = GetDeviceCaps(This->hdc, HORZRES); - This->Width = GetDeviceCaps(This->hdc, VERTRES); + This->Height = GetDeviceCaps(This->hdc, VERTRES); + This->Width = GetDeviceCaps(This->hdc, HORZRES); This->Bpp = GetDeviceCaps(This->hdc, BITSPIXEL); // call software first @@ -151,7 +151,7 @@ ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->DirectDrawGlobal.dwRefCnt); return ref; } @@ -159,7 +159,7 @@ ULONG WINAPI Main_DirectDraw_Release (LPDIRECTDRAW7 iface) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->DirectDrawGlobal.dwRefCnt); if (ref == 0) { _____ Modified: trunk/reactos/lib/ddraw/main/surface.c --- trunk/reactos/lib/ddraw/main/surface.c 2005-08-25 12:33:37 UTC (rev 17538) +++ trunk/reactos/lib/ddraw/main/surface.c 2005-08-25 15:31:28 UTC (rev 17539) @@ -25,74 +25,71 @@ return DDERR_INVALIDPARAMS; This->owner = (IDirectDrawImpl*)pDD; + + /* can the driver create the surface */ + DDHAL_CANCREATESURFACEDATA CanCreateData; + memset(&CanCreateData, 0, sizeof(DD_CANCREATESURFACEDATA)); + CanCreateData.lpDD = &This->owner->DirectDrawGlobal; + CanCreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD; + CanCreateData.CanCreateSurface = This->owner->HalInfo.lpDDCallbacks->CanCreateSurface; + + if (CanCreateData.CanCreateSurface(&CanCreateData) == DDHAL_DRIVER_NOTHANDLED) + return DDERR_INVALIDPARAMS; + + if(CanCreateData.ddRVal != DD_OK) + return CanCreateData.ddRVal; - // Surface Global Struct + /* surface global struct */ DDRAWI_DDRAWSURFACE_GBL Global; memset(&Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - - if(pDDSD->ddsCaps.dwCaps == DDSCAPS_PRIMARYSURFACE) - Global.dwGlobalFlags |= DDRAWISURFGBL_ISGDISURFACE; - Global.lpDD = &This->owner->DirectDrawGlobal; Global.wHeight = This->owner->Height; Global.wWidth = This->owner->Width; Global.dwLinearSize = Global.wWidth * This->owner->Bpp/8; - // Surface More Struct + /* surface more struct */ DDRAWI_DDRAWSURFACE_MORE More; memset(&More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - // Surface Local Struct + /* surface local struct */ DDRAWI_DDRAWSURFACE_LCL Local; memset(&Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); Local.lpGbl = &Global; Local.lpSurfMore = &More; Local.ddsCaps = *(DDSCAPS*)&pDDSD->ddsCaps; - - // BitDepth = DDSurf_BitDepth(psurf); ? - + /* we need to set some flags if we create the primary surface */ if(pDDSD->ddsCaps.dwCaps == DDSCAPS_PRIMARYSURFACE) + { Local.dwFlags |= DDRAWISURF_FRONTBUFFER; + Global.dwGlobalFlags |= DDRAWISURFGBL_ISGDISURFACE; + } - DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; // for stupid double pointer below + /* for the double pointer below */ + DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; + pLocal[0] = &Local; + pLocal[1] = NULL; // we need this one for bad written drivers - pLocal[0] = &Local; - pLocal[1] = NULL; - - // The Parameter Struct + /* the parameter struct */ DDHAL_CREATESURFACEDATA CreateData; memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); CreateData.lpDD = &This->owner->DirectDrawGlobal; CreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD; CreateData.dwSCnt = 1; CreateData.lplpSList = pLocal; - + CreateData.CreateSurface = This->owner->HalInfo.lpDDCallbacks->CreateSurface; - - DDHAL_CANCREATESURFACEDATA CanCreateData; - memset(&CanCreateData, 0, sizeof(DD_CANCREATESURFACEDATA)); - CanCreateData.lpDD = &This->owner->DirectDrawGlobal; - CanCreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD; - - - if (This->owner->DriverCallbacks.DdMain.CanCreateSurface (&CanCreateData) == DDHAL_DRIVER_NOTHANDLED) - return DDERR_INVALIDPARAMS; - - if(CanCreateData.ddRVal != DD_OK) - return CanCreateData.ddRVal; - - - if(This->owner->DriverCallbacks.DdMain.CreateSurface (&CreateData) == DDHAL_DRIVER_NOTHANDLED) + /* this is the call we were waiting for */ + if(CreateData.CreateSurface(&CreateData) == DDHAL_DRIVER_NOTHANDLED) return DDERR_INVALIDPARAMS; if(CreateData.ddRVal != DD_OK) return CreateData.ddRVal; + OutputDebugString(L"This does not get hit :( "); + OutputDebugString(L"Yet ;)"); - OutputDebugString(L"This does not get hit."); - return DD_OK; } @@ -122,7 +119,7 @@ ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) _____ Modified: trunk/reactos/lib/ddraw/main.c --- trunk/reactos/lib/ddraw/main.c 2005-08-25 12:33:37 UTC (rev 17538) +++ trunk/reactos/lib/ddraw/main.c 2005-08-25 15:31:28 UTC (rev 17539) @@ -24,7 +24,7 @@ ZeroMemory(This,sizeof(IDirectDrawImpl)); This->lpVtbl = &DirectDraw_VTable; - This->ref = 1; + This->DirectDrawGlobal.dwRefCnt = 1; *pIface = (LPDIRECTDRAW)This; return This->lpVtbl->Initialize ((LPDIRECTDRAW7)This, pGUID); @@ -39,7 +39,6 @@ return DDERR_INVALIDPARAMS; } - return Create_DirectDraw (lpGUID, lplpDD, pUnkOuter, FALSE); } _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-08-25 12:33:37 UTC (rev 17538) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-08-25 15:31:28 UTC (rev 17539) @@ -18,23 +18,9 @@ typedef struct { - DDHAL_DDCALLBACKS DdMain; - DDHAL_DDSURFACECALLBACKS DdSurface; - DDHAL_DDPALETTECALLBACKS DdPalette; - D3DHAL_CALLBACKS D3dMain; - DDHAL_DDEXEBUFCALLBACKS D3dBufferCallbacks; - -} DRIVERCALLBACKS; - -typedef struct -{ IDirectDraw7Vtbl* lpVtbl; - DRIVERCALLBACKS DriverCallbacks; - DWORD ref; - + DDRAWI_DIRECTDRAW_GBL DirectDrawGlobal; DDHALINFO HalInfo; - D3DHAL_GLOBALDRIVERDATA D3dDriverData; - LPDDSURFACEDESC pD3dTextureFormats; HWND window; DWORD cooperative_level; @@ -42,7 +28,6 @@ int Height, Width, Bpp; GUID* lpGUID; - DDRAWI_DIRECTDRAW_GBL DirectDrawGlobal; } IDirectDrawImpl;

1 0

[hbirr] 17538: Fixed a bug in RtlLeaveCriticalSection. We have only to signal the event if someone waits on it.
by hbirr＠svn.reactos.com 25 Aug '05

25 Aug '05

Fixed a bug in RtlLeaveCriticalSection. We have only to signal the event if someone waits on it. Modified: trunk/reactos/lib/ntdll/rtl/critical.c _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-08-25 12:30:10 UTC (rev 17537) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-08-25 12:33:37 UTC (rev 17538) @@ -329,10 +329,11 @@ CriticalSection->OwningThread = 0; /* Was someone wanting us? This needs to be done atomically. */ - InterlockedDecrement(&CriticalSection->LockCount); + if (-1 != InterlockedDecrement(&CriticalSection->LockCount)) { - /* Let him have us */ - RtlpUnWaitCriticalSection(CriticalSection); + /* Let him have us */ + RtlpUnWaitCriticalSection(CriticalSection); + } } /* Sucessful! */

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