Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[jimtabor] 38590: - Patch by Michael Martin: Fix for Get/Set CallProc. - Michael points out the fact that our system hard codes to unicode and does not mix ANSI and Unicode as it should. This creates problems when applications use ansi only. ReactOS lacks the mechanics of switching back to ANSI. The beginning of the project it seemed to become an unwritten rule. We learn from our misstakes and move on. When working on a drafting project, do not draw more than you can erase in a day.
by jimtabor＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: jimtabor Date: Mon Jan 5 17:35:10 2009 New Revision: 38590 URL: http://svn.reactos.org/svn/reactos?rev=38590&view=rev Log: - Patch by Michael Martin: Fix for Get/Set CallProc. - Michael points out the fact that our system hard codes to unicode and does not mix ANSI and Unicode as it should. This creates problems when applications use ansi only. ReactOS lacks the mechanics of switching back to ANSI. The beginning of the project it seemed to become an unwritten rule. We learn from our misstakes and move on. When working on a drafting project, do not draw more than you can erase in a day. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Jan 5 17:35:10 2009 @@ -570,6 +570,8 @@ { return GetCallProcHandle(Wnd->CallProc); } + /* BUGBOY Comments: Maybe theres something Im not undestanding here, but why would a CallProc be created + on a function that I thought is only suppose to return the current Windows Proc? */ else { PCALLPROC NewCallProc, CallProc; @@ -1693,6 +1695,14 @@ Wnd->UserData = 0; Wnd->IsSystem = Wnd->Class->System; + + /* BugBoy Comments: Comment below say that System classes are always created as UNICODE. + In windows, creating a window with the ANSI version of CreateWindow sets the window + to ansi as verified by testing with IsUnicodeWindow API. + + No where can I see in code or through testing does the window change back to ANSI + after being created as UNICODE in ROS. I didnt do more testing to see what problems this would cause.*/ + // See NtUserDefSetText! We convert to Unicode all the time and never use Mix. (jt) if (Wnd->Class->System) { /* NOTE: Always create a unicode window for system classes! */ @@ -2178,6 +2188,28 @@ co_IntSendMessage(ParentWindow->hSelf, WM_MDIREFRESHMENU, 0, 0); /* ShowWindow won't activate child windows */ co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); + } + } + + /* BugBoy Comments: if the window being created is a edit control, ATOM 0xC007, + then my testing shows that windows (2k and XP) creates a CallProc for it immediately + Dont understand why it does this. */ + if (ClassAtom == 0XC007) + { + PCALLPROC CallProc; + //CallProc = CreateCallProc(NULL, Wnd->WndProc, bUnicodeWindow, Wnd->ti->kpi); + CallProc = CreateCallProc(NULL, Wnd->WndProc, Wnd->Unicode , Wnd->ti->kpi); + + if (!CallProc) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + DPRINT1("Warning: Unable to create CallProc for edit control. Control may not operate correctly! hwnd %x\n",hWnd); + } + else + { + UserAddCallProcToClass(Wnd->Class, CallProc); + Wnd->CallProc = CallProc; + Wnd->IsSystem = FALSE; } } @@ -3414,7 +3446,7 @@ DPRINT("NtUserGetWindowLong(%x,%d,%d)\n", hWnd, (INT)Index, Ansi); - if (!(Window = UserGetWindowObject(hWnd))) + if (!(Window = UserGetWindowObject(hWnd)) || !Window->Wnd) { return 0; } @@ -3574,10 +3606,22 @@ UserAddCallProcToClass(Wnd->Class, CallProc); } + /* BugBoy Comments: Added this if else, see below comments */ + if (!Wnd->CallProc) + { + Ret = Wnd->WndProc; + } + else + { + Ret = GetCallProcHandle(Wnd->CallProc); + } Wnd->CallProc = CallProc; - Ret = GetCallProcHandle(Wnd->CallProc); + /* BugBoy Comments: Above sets the current CallProc for the + window and below we set the Ret value to it. + SetWindowLong for WNDPROC should return the previous proc + Ret = GetCallProcHandle(Wnd->CallProc); */ } } @@ -4632,6 +4676,7 @@ { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); Ret = FALSE; + goto Exit; } } }

1 0

[hpoussin] 38589: Add missing breaks Spotted by Maciej Bialas (bjauy at o2.pl)
by hpoussin＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: hpoussin Date: Mon Jan 5 14:36:39 2009 New Revision: 38589 URL: http://svn.reactos.org/svn/reactos?rev=38589&view=rev Log: Add missing breaks Spotted by Maciej Bialas (bjauy at o2.pl) Modified: trunk/reactos/drivers/input/sermouse/detect.c trunk/reactos/drivers/serial/serenum/detect.c Modified: trunk/reactos/drivers/input/sermouse/detect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/det… ============================================================================== --- trunk/reactos/drivers/input/sermouse/detect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/detect.c [iso-8859-1] Mon Jan 5 14:36:39 2009 @@ -222,12 +222,15 @@ case '3': INFO_(SERMOUSE, "Microsoft Mouse with 3-buttons detected\n"); MouseType = mtLogitech; + break; case 'Z': INFO_(SERMOUSE, "Microsoft Wheel Mouse detected\n"); MouseType = mtWheelZ; + break; default: INFO_(SERMOUSE, "Microsoft Mouse with 2-buttons detected\n"); MouseType = mtMicrosoft; + break; } goto ByeBye; } Modified: trunk/reactos/drivers/serial/serenum/detect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/det… ============================================================================== --- trunk/reactos/drivers/serial/serenum/detect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serenum/detect.c [iso-8859-1] Mon Jan 5 14:36:39 2009 @@ -572,6 +572,7 @@ RtlInitUnicodeString(&DeviceDescription, L"Microsoft Mouse with 3-buttons"); SerenumInitMultiSzString(&HardwareIds, "*PNP0F08", NULL); SerenumInitMultiSzString(&CompatibleIds, "SERIAL_MOUSE", NULL); + break; default: /* Hardware id: *PNP0F01 * Compatible id: SERIAL_MOUSE @@ -579,6 +580,7 @@ RtlInitUnicodeString(&DeviceDescription, L"Microsoft Mouse with 2-buttons or Microsoft Wheel Mouse"); SerenumInitMultiSzString(&HardwareIds, "*PNP0F01", NULL); SerenumInitMultiSzString(&CompatibleIds, "SERIAL_MOUSE", NULL); + break; } Status = ReportDetectedDevice(DeviceObject, &DeviceDescription, &DeviceId, &InstanceId, &HardwareIds, &CompatibleIds);

1 0

[cwittich] 38588: - Austin English <austinenglish <at> gmail.com> Tue, 9 Sep 2008 widl: remove unreached code (Smatch) - Rob Shearman <robertshearman <at> gmail.com> Wed Sep 10 2008 widl: Fix the writing typedefs to dispinterfaces and pointers to interfaces. - Rob Shearman <robertshearman <at> gmail.com> Wed Sep 10 2008 widl: Remove redundant code.
by cwittich＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: cwittich Date: Mon Jan 5 12:17:35 2009 New Revision: 38588 URL: http://svn.reactos.org/svn/reactos?rev=38588&view=rev Log: - Austin English <austinenglish <at> gmail.com> Tue, 9 Sep 2008 widl: remove unreached code (Smatch) - Rob Shearman <robertshearman <at> gmail.com> Wed Sep 10 2008 widl: Fix the writing typedefs to dispinterfaces and pointers to interfaces. - Rob Shearman <robertshearman <at> gmail.com> Wed Sep 10 2008 widl: Remove redundant code. Modified: trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… ============================================================================== --- trunk/reactos/tools/widl/write_msft.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/write_msft.c [iso-8859-1] Mon Jan 5 12:17:35 2009 @@ -883,7 +883,9 @@ next_vt = VT_VOID; encode_type(typelib, next_vt, type->ref, &target_type, NULL, NULL, &child_size); - if(type->ref && (type->ref->type == RPC_FC_IP)) { + /* these types already have an implicit pointer, so we don't need to + * add another */ + if(next_vt == VT_DISPATCH || next_vt == VT_UNKNOWN) { chat("encode_type: skipping ptr\n"); *encoded_type = target_type; *width = 4; @@ -1001,10 +1003,7 @@ add_coclass_typeinfo(typelib, type); break; case 0: - if (type->kind == TKIND_DISPATCH) - add_dispinterface_typeinfo(typelib, type); - else - error("encode_type: VT_USERDEFINED - can't yet add typedef's on the fly\n"); + error("encode_type: VT_USERDEFINED - can't yet add typedef's on the fly\n"); break; default: error("encode_type: VT_USERDEFINED - unhandled type %d\n", type->type); @@ -1028,24 +1027,6 @@ *encoded_type = typeoffset; *width = 0; *alignment = 1; - - if(type->type == RPC_FC_IP) { - for (typeoffset = 0; typeoffset < typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { - typedata = (void *)&typelib->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - if ((typedata[0] == ((0x7fff << 16) | VT_PTR)) && (typedata[1] == *encoded_type)) break; - } - if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { - typeoffset = ctl2_alloc_segment(typelib, MSFT_SEG_TYPEDESC, 8, 0); - typedata = (void *)&typelib->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - - typedata[0] = (0x7fff << 16) | VT_PTR; - typedata[1] = *encoded_type; - } - *encoded_type = typeoffset; - *width = 4; - *alignment = 4; - *decoded_size += 8; - } break; } @@ -1175,7 +1156,9 @@ dump_type(type); encode_type(typelib, vt, type, encoded_type, width, alignment, decoded_size); - if(type->type == RPC_FC_IP) return 2; + /* these types already have an implicit pointer, so we don't need to + * add another */ + if(vt == VT_DISPATCH || vt == VT_UNKNOWN) return 2; return 0; } @@ -1646,7 +1629,6 @@ varflags |= 0x01; /* VARFLAG_FREADONLY */ break; /* FIXME: VARFLAG_FREPLACEABLE */ - break; case ATTR_REQUESTEDIT: varflags |= 0x08; /* VARFLAG_FREQUESTEDIT */ break;

1 0

[sginsberg] 38587: - Properly implement NdisGetSystemUpTime, based on http://www.tech-archive.net/Archive/Development/microsoft.public.development.device.drivers/2004-11/0616.html
by sginsberg＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: sginsberg Date: Mon Jan 5 11:51:55 2009 New Revision: 38587 URL: http://svn.reactos.org/svn/reactos?rev=38587&view=rev Log: - Properly implement NdisGetSystemUpTime, based on http://www.tech-archive.net/Archive/Development/microsoft.public.developmen… Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] Mon Jan 5 11:51:55 2009 @@ -532,17 +532,19 @@ */ VOID EXPORT -NdisGetSystemUpTime( - OUT PULONG pSystemUpTime) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ +NdisGetSystemUpTime(OUT PULONG pSystemUpTime) { - /* Get the uptime of the system in msec */ - *pSystemUpTime = ( (SharedUserData->TickCountLowDeprecated * SharedUserData->TickCountMultiplier) / 0x1000000); + ULONG Increment; + LARGE_INTEGER TickCount; + + /* Get the increment and current tick count */ + Increment = KeQueryTimeIncrement(); + KeQueryTickCount(&TickCount); + + /* Convert to milliseconds and return */ + TickCount.QuadPart *= Increment; + TickCount.QuadPart /= (10 * 1000); + *pSystemUpTime = TickCount.LowPart; }

1 0

[greatlrd] 38586: fix a bug inside WinWatchClose it did endless loop when it try remove a gpWatchList entry
by greatlrd＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: greatlrd Date: Mon Jan 5 11:17:36 2009 New Revision: 38586 URL: http://svn.reactos.org/svn/reactos?rev=38586&view=rev Log: fix a bug inside WinWatchClose it did endless loop when it try remove a gpWatchList entry Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Mon Jan 5 11:17:36 2009 @@ -481,8 +481,8 @@ if ( tmp_gpWinWatchList->prev != NULL ) { tmp_gpWinWatchList->prev = ((LPWINWATCH_INT)tmp_gpWinWatchList->prev)->prev ; - } - + } + break; } else {

1 0

[greatlrd] 38585: rename ddcs to gcsWinWatchLock add global windows watch list call gpWinWatchList it will be use by DciBeginAccess and DciEndAccess. Change behavior in WinWatchOpen so it store the new hww into gpWinWatchList. Change behavior WinWatchClose so it remove the hww entry inside gpWinWatchList.
by greatlrd＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: greatlrd Date: Mon Jan 5 11:10:21 2009 New Revision: 38585 URL: http://svn.reactos.org/svn/reactos?rev=38585&view=rev Log: rename ddcs to gcsWinWatchLock add global windows watch list call gpWinWatchList it will be use by DciBeginAccess and DciEndAccess. Change behavior in WinWatchOpen so it store the new hww into gpWinWatchList. Change behavior WinWatchClose so it remove the hww entry inside gpWinWatchList. Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Mon Jan 5 11:10:21 2009 @@ -9,12 +9,13 @@ #include <ddrawgdi.h> #include <pseh/pseh.h> -CRITICAL_SECTION ddcs; + /* Winwatch internal struct */ typedef struct _WINWATCH_INT { + LPVOID prev; HWND hWnd; BOOL WinWatchStatus; LPRGNDATA lpRgnData; @@ -41,6 +42,11 @@ } DCISURFACE_INT, *LPDCISURFACE_INT; +/* Global value */ +LPWINWATCH_INT gpWinWatchList; +CRITICAL_SECTION gcsWinWatchLock; + +/* Function */ BOOL WINAPI DllMain( HINSTANCE hModule, DWORD ul_reason_for_call, LPVOID reserved ) @@ -48,11 +54,11 @@ switch(ul_reason_for_call) { case DLL_PROCESS_DETACH: - DeleteCriticalSection( &ddcs ); + DeleteCriticalSection( &gcsWinWatchLock ); break; case DLL_PROCESS_ATTACH: - InitializeCriticalSection( &ddcs ); + InitializeCriticalSection( &gcsWinWatchLock ); break; } return TRUE; @@ -404,41 +410,115 @@ return retvalue; } +/*++ +* @name DWORD WINAPI WinWatchOpen(HWND hwnd) +* @implemented +* + +* @return +* +* @remarks. +* None +*/ HWINWATCH WINAPI WinWatchOpen(HWND hwnd) { LPWINWATCH_INT pWinwatch_int; - EnterCriticalSection(&ddcs); + EnterCriticalSection(&gcsWinWatchLock); if ( (pWinwatch_int = (LPWINWATCH_INT) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINWATCH_INT) )) != NULL ) { pWinwatch_int->hWnd = hwnd; - } - LeaveCriticalSection(&ddcs); + pWinwatch_int->prev = (LPVOID) gpWinWatchList; + + gpWinWatchList = pWinwatch_int; + } + LeaveCriticalSection(&gcsWinWatchLock); return (HWINWATCH) pWinwatch_int; } +/*++ +* @name DWORD WINAPI WinWatchClose(HWND hwnd) +* @implemented +* + +* @return +* +* @remarks. +* None +*/ void WINAPI WinWatchClose(HWINWATCH hWW) { - LPWINWATCH_INT pWinwatch_int = (LPWINWATCH_INT)hWW; - - EnterCriticalSection(&ddcs); - - if (pWinwatch_int != NULL) - { - if (pWinwatch_int->lpRgnData != NULL) - { - HeapFree(GetProcessHeap(), 0, pWinwatch_int->lpRgnData); - } - - HeapFree(GetProcessHeap(), 0, hWW); - } - - LeaveCriticalSection(&ddcs); -} - + LPWINWATCH_INT pWinwatch_int = (LPWINWATCH_INT)hWW; + LPWINWATCH_INT tmp_gpWinWatchList ; + LPWINWATCH_INT delete_gpWinWatchList; + + EnterCriticalSection(&gcsWinWatchLock); + + /* Start search see if our hWW exists in the gpWinWatchList */ + tmp_gpWinWatchList = gpWinWatchList; + delete_gpWinWatchList = gpWinWatchList; + + while (delete_gpWinWatchList != pWinwatch_int ) + { + if ( delete_gpWinWatchList == NULL ) + { + /* Noting to delete */ + break; + } + + /* Have we found our entry ? */ + if ( tmp_gpWinWatchList->prev == pWinwatch_int ) + { + /* Yes we found our entry */ + + /* Now we save it to delete_gpWinWatchList */ + delete_gpWinWatchList = tmp_gpWinWatchList->prev; + + /* Remove it from the gpWinWatchList list */ + if ( tmp_gpWinWatchList->prev != NULL ) + { + tmp_gpWinWatchList->prev = ((LPWINWATCH_INT)tmp_gpWinWatchList->prev)->prev ; + } + + } + else + { + /* No so we keep looking */ + tmp_gpWinWatchList = tmp_gpWinWatchList->prev ; + } + } + + /* now we can delete our entry */ + + if ( (delete_gpWinWatchList != NULL) && + (pWinwatch_int == delete_gpWinWatchList) ) + { + /* Check see if we got any region data and free it */ + if (pWinwatch_int->lpRgnData != NULL) + { + HeapFree(GetProcessHeap(), 0, delete_gpWinWatchList->lpRgnData); + } + + /* Free the delete_gpWinWatchList */ + HeapFree(GetProcessHeap(), 0, delete_gpWinWatchList); + } + + LeaveCriticalSection(&gcsWinWatchLock); +} + +/*++ +* @name WinWatchDidStatusChange(HWINWATCH hWW) +* @implemented +* + +* @return +* +* @remarks. +* None +*/ BOOL WINAPI WinWatchDidStatusChange(HWINWATCH hWW) { @@ -446,6 +526,16 @@ return pWinwatch_int->WinWatchStatus; } +/*++ +* @name WinWatchGetClipList(HWINWATCH hWW) +* @implemented +* + +* @return +* +* @remarks. +* None +*/ UINT WINAPI WinWatchGetClipList(HWINWATCH hWW, LPRECT prc,

1 0

[tkreuzer] 38584: silence crt TRACE flood
by tkreuzer＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: tkreuzer Date: Mon Jan 5 08:07:04 2009 New Revision: 38584 URL: http://svn.reactos.org/svn/reactos?rev=38584&view=rev Log: silence crt TRACE flood Modified: trunk/reactos/lib/sdk/crt/precomp.h Modified: trunk/reactos/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/precomp.h?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] Mon Jan 5 08:07:04 2009 @@ -38,6 +38,7 @@ /* kernelmode libcnt should not include Wine-debugging crap */ #ifndef _LIBCNT_ +#define WINE_NO_TRACE_MSGS #include "wine/debug.h" #ifndef __WINE_DEBUG_CHANNEL__ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);

1 0

[cfinck] 38583: Revert a part of r38087. OutputDebugStringA doesn't add a newline automatically. Verified by MSVC's debug output and kinda proofed by http://www.unixwiz.net/techtips/outputdebugstring.html (nobody would write a function for adding newlines to the debug output if that would be done automatically) Thanks to Gregor for the hints.
by cfinck＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: cfinck Date: Mon Jan 5 07:22:27 2009 New Revision: 38583 URL: http://svn.reactos.org/svn/reactos?rev=38583&view=rev Log: Revert a part of r38087. OutputDebugStringA doesn't add a newline automatically. Verified by MSVC's debug output and kinda proofed by http://www.unixwiz.net/techtips/outputdebugstring.html (nobody would write a function for adding newlines to the debug output if that would be done automatically) Thanks to Gregor for the hints. Modified: trunk/reactos/dll/win32/kernel32/debug/output.c Modified: trunk/reactos/dll/win32/kernel32/debug/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/o… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] Mon Jan 5 07:22:27 2009 @@ -376,18 +376,6 @@ /* copy the current block */ memcpy(a_cBuffer, _OutputString, nRoundLen); - /* Have we reached the end of the string? */ - if (nRoundLen == nOutputStringLen) - { - /* Make sure we terminate with a line break */ - if (a_cBuffer[nRoundLen - 1] != '\n') - { - a_cBuffer[nRoundLen] = '\n'; - nRoundLen++; - nOutputStringLen++; - } - } - /* null-terminate the current block */ a_cBuffer[nRoundLen] = 0;

1 0

[tkreuzer] 38582: Silence warnings on linux hosts
by tkreuzer＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: tkreuzer Date: Mon Jan 5 06:55:13 2009 New Revision: 38582 URL: http://svn.reactos.org/svn/reactos?rev=38582&view=rev Log: Silence warnings on linux hosts Modified: trunk/reactos/tools/rsym.c Modified: trunk/reactos/tools/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.c?rev=38582&r1=… ============================================================================== --- trunk/reactos/tools/rsym.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym.c [iso-8859-1] Mon Jan 5 06:55:13 2009 @@ -489,7 +489,7 @@ *ProcessedRelocs = malloc(RelocSectionHeader->SizeOfRawData); if (NULL == *ProcessedRelocs) { - fprintf(stderr, "Failed to allocate %lu bytes for relocations\n", RelocSectionHeader->SizeOfRawData); + fprintf(stderr, "Failed to allocate %u bytes for relocations\n", (unsigned int)RelocSectionHeader->SizeOfRawData); return 1; } *ProcessedRelocsLength = 0; @@ -565,7 +565,7 @@ OutHeader = malloc(StartOfRawData); if (NULL == OutHeader) { - fprintf(stderr, "Failed to allocate %lu bytes for output file header\n", StartOfRawData); + fprintf(stderr, "Failed to allocate %u bytes for output file header\n", (unsigned int)StartOfRawData); return 1; } memset(OutHeader, '\0', StartOfRawData); @@ -678,7 +678,7 @@ PaddedRosSym = malloc(RosSymFileLength); if (NULL == PaddedRosSym) { - fprintf(stderr, "Failed to allocate %lu bytes for padded .rossym\n", RosSymFileLength); + fprintf(stderr, "Failed to allocate %u bytes for padded .rossym\n", (unsigned int)RosSymFileLength); return 1; } memcpy(PaddedRosSym, RosSymSection, RosSymLength);

1 0

[cfinck] 38581: Supersede the current way for running automatic regression tests for real now and switch to rosautotest. No more sights of hardcoded regression test stuff inside syssetup :-) Works well here, let's hope BuildBot is with me ; -) Still, there seems to be a bug in our OutputDebugString function, adding a newline at the end of the debug output automatically. Getting the OutputDebugString output through MSVC doesn't lead to this behaviour, that bug needs to be evaluated in detail late
by cfinck＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: cfinck Date: Mon Jan 5 06:48:59 2009 New Revision: 38581 URL: http://svn.reactos.org/svn/reactos?rev=38581&view=rev Log: Supersede the current way for running automatic regression tests for real now and switch to rosautotest. No more sights of hardcoded regression test stuff inside syssetup :-) Works well here, let's hope BuildBot is with me ;-) Still, there seems to be a bug in our OutputDebugString function, adding a newline at the end of the debug output automatically. Getting the OutputDebugString output through MSVC doesn't lead to this behaviour, that bug needs to be evaluated in detail later. Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] Mon Jan 5 06:48:59 2009 @@ -45,12 +45,10 @@ ; yes - disabled ; no - enabled DisableVmwInst = yes -LocaleID = 407 -BootCDRegTestActive = 1 +LocaleID = 409 ; enable this section to automatically launch programs ; after 3rd boot ; -; [GuiRunOnce] -; %SystemRoot%\system32\cmd.exe - +[GuiRunOnce] +%SystemRoot%\system32\rosautotest.exe /s Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Jan 5 06:48:59 2009 @@ -618,6 +618,8 @@ modules\rosapps\dflat32\edit.exe 1 optional modules\rosapps\drivers\green\green.sys 2 optional modules\rosapps\templates\dialog\dialog.exe 1 optional + +modules\rostests\rosautotest\rosautotest.exe 1 optional modules\rostests\tests\pseh2\pseh2_test.exe 7 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional @@ -668,6 +670,7 @@ modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional + modules\wallpaper\lake.bmp 4 optional ; Native libraries Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Mon Jan 5 06:48:59 2009 @@ -47,7 +47,6 @@ WCHAR AdminPassword[15]; /* max. 14 characters */ BOOL UnattendSetup; BOOL DisableVmwInst; - DWORD BootCDRegtestActive; SYSTEMTIME SystemTime; PTIMEZONE_ENTRY TimeZoneListHead; Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Mon Jan 5 06:48:59 2009 @@ -2132,10 +2132,6 @@ else SetupData.DisableVmwInst = 0; } - else if (!wcscmp(szName, L"BootCDRegTestActive")) - { - SetupData.BootCDRegtestActive = _wtoi(szValue); - } } while (SetupFindNextLine(&InfContext, &InfContext)); @@ -2187,55 +2183,6 @@ }while(SetupFindNextLine(&InfContext, &InfContext)); } - if (SetupData.BootCDRegtestActive) - { - char szPath[MAX_PATH]; - FILE * file; - WIN32_FIND_DATAA ffd; - HANDLE hFind = INVALID_HANDLE_VALUE; -#if 0 - if (!SHGetSpecialFolderPathA(0, szPath, CSIDL_DESKTOP, FALSE)) - { - /* failed to get desktop path */ - strcpy(szPath, "C:"); - } - strcat(szPath, "\\sysregtest.bat"); -#else - strcpy(szPath, "C:\\sysregtest.bat"); -#endif - file = fopen(szPath, "w+"); - if (!file) - { - DPRINT1("Error: failed create sysregtest.bat"); - RegCloseKey(hKey); - return TRUE; - } - - RegSetValueExA(hKey, - "BootCDRegtestActive", - 0, - REG_SZ, - (const BYTE*)szPath, - (strlen(szPath)+1) * sizeof(char)); - - - /* winetests */ - hFind = FindFirstFileA("c:\\reactos\\bin\\*.exe", &ffd); /* %windir% isn't working on ros */ - if (hFind != INVALID_HANDLE_VALUE) - { - do - { - if (ffd.dwFileAttributes & ~FILE_ATTRIBUTE_DIRECTORY) - fprintf(file, "%s%s\n", "dbgprint --winetest %windir%\\bin\\", ffd.cFileName); - } - while (FindNextFileA(hFind, &ffd) != 0); - FindClose(hFind); - } - - fprintf(file, "%s\n", "dbgprint SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE"); - fprintf(file, "%s\n", "shutdown -s"); - fclose(file); - } RegCloseKey(hKey); return TRUE; }

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009