Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 41115: - Stubimplement SPI_GETFONTSMOOTHINGTYPE/SPI_SETFONTSMOOTHINGTYPE
by dchapyshev＠svn.reactos.org 25 May '09

25 May '09

Author: dchapyshev Date: Mon May 25 17:08:57 2009 New Revision: 41115 URL: http://svn.reactos.org/svn/reactos?rev=41115&view=rev Log: - Stubimplement SPI_GETFONTSMOOTHINGTYPE/SPI_SETFONTSMOOTHINGTYPE Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon May 25 17:08:57 2009 @@ -699,6 +699,22 @@ { ASSERT(pvParam); *((BOOL*)pvParam) = IntIsFontRenderingEnabled(); + break; + } + case SPI_SETFONTSMOOTHINGTYPE: + { + if (*((UINT*)pvParam) == FE_FONTSMOOTHINGCLEARTYPE) + { + DPRINT1("ReactOS does not support ClearType smoothing but it is returned TRUE\n"); + } + bChanged = TRUE; + break; + } + case SPI_GETFONTSMOOTHINGTYPE: + { + /* We do not support ClearType. Only standard smoothing */ + DPRINT1("ReactOS does not support ClearType smoothing. Returned FE_FONTSMOOTHINGSTANDARD\n"); + *((UINT*)pvParam) = FE_FONTSMOOTHINGSTANDARD; break; } case SPI_GETICONTITLELOGFONT:

1 0

[dchapyshev] 41114: - Add support for SPI_GETCARETWIDTH/SPI_SETCARETWIDTH
by dchapyshev＠svn.reactos.org 25 May '09

25 May '09

Author: dchapyshev Date: Mon May 25 16:46:44 2009 New Revision: 41114 URL: http://svn.reactos.org/svn/reactos?rev=41114&view=rev Log: - Add support for SPI_GETCARETWIDTH/SPI_SETCARETWIDTH Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon May 25 16:46:44 2009 @@ -192,6 +192,7 @@ static BOOL KeyboardPref = FALSE; static BOOL ShowSounds = FALSE; static ACCESSTIMEOUT AccessTimeout = {sizeof(ACCESSTIMEOUT), 0, 0}; + static DWORD CaretWidth = 1; static SERIALKEYS SerialKeys = {sizeof(SERIALKEYS), 0, 0, 0, 0, 0, 0}; if (!bInitialized) @@ -853,6 +854,19 @@ case SPI_SETACCESSTIMEOUT: { AccessTimeout = *((ACCESSTIMEOUT*)pvParam); + bChanged = TRUE; + break; + } + + case SPI_GETCARETWIDTH: + { + *((DWORD*)pvParam) = CaretWidth; + break; + } + + case SPI_SETCARETWIDTH: + { + CaretWidth = *((DWORD*)pvParam); bChanged = TRUE; break; }

1 0

[dchapyshev] 41113: - Disable Wow64* functions for x86 build
by dchapyshev＠svn.reactos.org 25 May '09

25 May '09

Author: dchapyshev Date: Mon May 25 15:01:16 2009 New Revision: 41113 URL: http://svn.reactos.org/svn/reactos?rev=41113&view=rev Log: - Disable Wow64* functions for x86 build Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Mon May 25 15:01:16 2009 @@ -950,9 +950,11 @@ @ stdcall WaitNamedPipeW (wstr long) @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) +#ifdef _M_AMD64 @ stdcall Wow64EnableWow64FsRedirection(long) @ stdcall Wow64DisableWow64FsRedirection(long) @ stdcall Wow64RevertWow64FsRedirection(long) +#endif @ stdcall WriteConsoleA(long ptr long ptr ptr) @ stdcall WriteConsoleInputA(long ptr long ptr) @ stdcall WriteConsoleInputVDMA(long long long long)

1 0

[khornicek] 41112: - don't discard valid pixel formats and use flags only for ranking - patch by Robert Millan (rmh dot reactos at aybabtu dot com) See issue #4384 for more details.
by khornicek＠svn.reactos.org 25 May '09

25 May '09

Author: khornicek Date: Mon May 25 14:50:03 2009 New Revision: 41112 URL: http://svn.reactos.org/svn/reactos?rev=41112&view=rev Log: - don't discard valid pixel formats and use flags only for ranking - patch by Robert Millan (rmh dot reactos at aybabtu dot com) See issue #4384 for more details. Modified: trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] Mon May 25 14:50:03 2009 @@ -502,6 +502,16 @@ */ #define BUFFERDEPTH_SCORE(want, have) \ ((want == 0) ? (0) : ((want < have) ? (1) : ((want > have) ? (3) : (0)))) + +/* Score if we want and not have it */ +#define FLAG_SCORE(want, have, flag) \ + (((want & ~have) & flag) ? (1) : (0)) + +/* Score if what we want is different than what we have, except when + _DONTCARE was set */ +#define FLAG_SCORE_DONTCARE(want, have, flag) \ + ((!(have & flag ## _DONTCARE)) && ((want & flag) != (have & flag)) ? (1) : (0)) + int APIENTRY rosglChoosePixelFormat( HDC hdc, CONST PIXELFORMATDESCRIPTOR *pfd ) @@ -512,8 +522,6 @@ int best = 0; int score, bestScore = 0x7fff; /* used to choose a pfd if no exact match */ int icdNumFormats; - const DWORD compareFlags = PFD_DRAW_TO_WINDOW | PFD_DRAW_TO_BITMAP | - PFD_SUPPORT_GDI | PFD_SUPPORT_OPENGL; DBGTRACE( "Called!" ); @@ -555,18 +563,17 @@ continue; } + score = 0; /* higher is worse */ + /* compare flags */ - if ((pfd->dwFlags & compareFlags) != (icdPfd.dwFlags & compareFlags)) - continue; - if (!(pfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE) && - ((pfd->dwFlags & PFD_DOUBLEBUFFER) != (icdPfd.dwFlags & PFD_DOUBLEBUFFER))) - continue; - if (!(pfd->dwFlags & PFD_STEREO_DONTCARE) && - ((pfd->dwFlags & PFD_STEREO) != (icdPfd.dwFlags & PFD_STEREO))) - continue; + score += FLAG_SCORE(pfd->dwFlags, icdPfd.dwFlags, PFD_DRAW_TO_WINDOW); + score += FLAG_SCORE(pfd->dwFlags, icdPfd.dwFlags, PFD_DRAW_TO_BITMAP); + score += FLAG_SCORE(pfd->dwFlags, icdPfd.dwFlags, PFD_SUPPORT_GDI); + score += FLAG_SCORE(pfd->dwFlags, icdPfd.dwFlags, PFD_SUPPORT_OPENGL); + score += FLAG_SCORE_DONTCARE(pfd->dwFlags, icdPfd.dwFlags, PFD_DOUBLEBUFFER); + score += FLAG_SCORE_DONTCARE(pfd->dwFlags, icdPfd.dwFlags, PFD_STEREO); /* check other attribs */ - score = 0; /* higher is worse */ if (pfd->iPixelType != icdPfd.iPixelType) score += 5; /* this is really bad i think */ if (pfd->iLayerType != icdPfd.iLayerType)

1 0

[dchapyshev] 41111: .spec -> .pspec
by dchapyshev＠svn.reactos.org 25 May '09

25 May '09

Author: dchapyshev Date: Mon May 25 14:41:13 2009 New Revision: 41111 URL: http://svn.reactos.org/svn/reactos?rev=41111&view=rev Log: .spec -> .pspec Added: trunk/reactos/dll/win32/kernel32/kernel32.pspec - copied, changed from r41109, trunk/reactos/dll/win32/kernel32/kernel32.spec Removed: trunk/reactos/dll/win32/kernel32/kernel32.spec Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild Copied: trunk/reactos/dll/win32/kernel32/kernel32.pspec (from r41109, trunk/reactos/dll/win32/kernel32/kernel32.spec) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Mon May 25 14:41:13 2009 @@ -1,16 +1,16 @@ @ stdcall AcquireSRWLockExclusive(ptr) ntdll.RtlAcquireSRWLockExclusive @ stdcall AcquireSRWLockShare(ptr) ntdll.RtlAcquireSRWLockShared -#@ stdcall ActivateActCtx(ptr ptr) +;@ stdcall ActivateActCtx(ptr ptr) @ stdcall AddAtomA(str) @ stdcall AddAtomW(wstr) -@ stdcall AddConsoleAliasA(str str str) #check -@ stdcall AddConsoleAliasW(wstr wstr wstr) #check +@ stdcall AddConsoleAliasA(str str str) ;check +@ stdcall AddConsoleAliasW(wstr wstr wstr) ;check @ stdcall AddLocalAlternateComputerNameA(str ptr) @ stdcall AddLocalAlternateComputerNameW(wstr ptr) -#@ stdcall AddRefActCtx(ptr) +;@ stdcall AddRefActCtx(ptr) @ stdcall AddVectoredExceptionHandler(long ptr) ntdll.RtlAddVectoredExceptionHandler @ stdcall AllocConsole() -@ stub AllocLSCallback # missing in XP SP3 +@ stub AllocLSCallback ; missing in XP SP3 @ stdcall AllocateUserPhysicalPages(long ptr ptr) @ stdcall AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) @@ -18,7 +18,7 @@ @ stdcall BackupRead(ptr ptr long ptr long long ptr) @ stdcall BackupSeek(ptr long long ptr ptr ptr) @ stdcall BackupWrite(ptr ptr long ptr long long ptr) -@ stdcall BaseCheckAppcompatCache(long long long ptr) #check +@ stdcall BaseCheckAppcompatCache(long long long ptr) ;check @ stdcall BaseCleanupAppcompatCache() @ stdcall BaseCleanupAppcompatCacheSupport(ptr) @ stdcall BaseDumpAppcompatCache() @@ -26,10 +26,10 @@ @ stdcall BaseInitAppcompatCache() @ stdcall BaseInitAppcompatCacheSupport() @ stdcall BaseProcessInitPostImport() -@ stdcall BaseQueryModuleData(str str ptr ptr ptr) #check +@ stdcall BaseQueryModuleData(str str ptr ptr ptr) ;check @ stdcall BaseUpdateAppcompatCache(long long long) @ stub BasepCheckWinSaferRestrictions -@ stub BasepDebugDump # missing in XP SP3 +@ stub BasepDebugDump ; missing in XP SP3 @ stdcall Beep(long long) @ stdcall BeginUpdateResourceA(str long) @ stdcall BeginUpdateResourceW(wstr long) @@ -55,7 +55,7 @@ @ stdcall CloseConsoleHandle(long) @ stdcall CloseHandle(long) @ stdcall CloseProfileUserMapping() -@ stub CloseSystemHandle # missing in XP SP3 +@ stub CloseSystemHandle ; missing in XP SP3 @ stdcall CmdBatNotification(long) @ stdcall CommConfigDialogA(str long ptr) @ stdcall CommConfigDialogW(wstr long ptr) @@ -64,7 +64,7 @@ @ stdcall CompareStringW(long long wstr long wstr long) @ stdcall ConnectNamedPipe(long ptr) @ stdcall ConsoleMenuControl(long long long) -@ stub ConsoleSubst # missing in XP SP3 +@ stub ConsoleSubst ; missing in XP SP3 @ stdcall ContinueDebugEvent(long long long) @ stdcall ConvertDefaultLocale (long) @ stdcall ConvertFiberToThread() @@ -75,8 +75,8 @@ @ stdcall CopyFileExW (wstr wstr ptr ptr ptr long) @ stdcall CopyFileW(wstr wstr long) @ stdcall CopyLZFile(long long) LZCopy -#@ stdcall CreateActCtxA(ptr) -#@ stdcall CreateActCtxW(ptr) +;@ stdcall CreateActCtxA(ptr) +;@ stdcall CreateActCtxW(ptr) @ stdcall CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall CreateDirectoryA(str ptr) @ stdcall CreateDirectoryExA(str str ptr) @@ -96,7 +96,7 @@ @ stdcall CreateJobObjectA(ptr str) @ stdcall CreateJobObjectW(ptr wstr) @ stdcall CreateJobSet(long ptr long) -@ stub CreateKernelThread # missing in XP SP3 +@ stub CreateKernelThread ; missing in XP SP3 @ stdcall CreateMailslotA(ptr long long ptr) @ stdcall CreateMailslotW(ptr long long ptr) @ stdcall CreateMemoryResourceNotification(ptr) @@ -129,7 +129,7 @@ @ stdcall CreateWaitableTimerW(ptr long wstr) @ stdcall CreateWaitableTimerExA (ptr str long long) @ stdcall CreateWaitableTimerExW (ptr wstr long long) -#@ stdcall DeactivateActCtx(long ptr) +;@ stdcall DeactivateActCtx(long ptr) @ stdcall DebugActiveProcess(long) @ stdcall DebugActiveProcessStop(long) @ stdcall DebugBreak() ntdll.DbgBreakPoint @@ -148,8 +148,8 @@ @ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) -@ stdcall DeleteVolumeMountPointA(str) #check -@ stdcall DeleteVolumeMountPointW(wstr) #check +@ stdcall DeleteVolumeMountPointA(str) ;check +@ stdcall DeleteVolumeMountPointW(wstr) ;check @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) @ stdcall DisableThreadLibraryCalls(long) @ stdcall DisconnectNamedPipe(long) @@ -213,9 +213,9 @@ @ stdcall FillConsoleOutputAttribute(long long long long ptr) @ stdcall FillConsoleOutputCharacterA(long long long long ptr) @ stdcall FillConsoleOutputCharacterW(long long long long ptr) -#@ stdcall FindActCtxSectionGuid(long ptr long ptr ptr) -#@ stdcall FindActCtxSectionStringA(long ptr long str ptr) -#@ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) +;@ stdcall FindActCtxSectionGuid(long ptr long ptr ptr) +;@ stdcall FindActCtxSectionStringA(long ptr long str ptr) +;@ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) @ stdcall FindAtomA(str) @ stdcall FindAtomW(wstr) @ stdcall FindClose(long) @@ -244,10 +244,10 @@ @ stdcall FindResourceW(long wstr wstr) @ stdcall FindVolumeClose(ptr) @ stdcall FindVolumeMountPointClose(ptr) -#@ stdcall FlsAlloc(ptr) # missing in XP SP3 -#@ stdcall FlsFree(long) # missing in XP SP3 -#@ stdcall FlsGetValue(long) # missing in XP SP3 -#@ stdcall FlsSetValue(long ptr) # missing in XP SP3 +;@ stdcall FlsAlloc(ptr) ; missing in XP SP3 +;@ stdcall FlsFree(long) ; missing in XP SP3 +;@ stdcall FlsGetValue(long) ; missing in XP SP3 +;@ stdcall FlsSetValue(long ptr) ; missing in XP SP3 @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) @@ -271,7 +271,7 @@ @ stdcall GetBinaryType(str ptr) GetBinaryTypeA @ stdcall GetBinaryTypeA(str ptr) @ stdcall GetBinaryTypeW(wstr ptr) -@ stdcall GetCPFileNameFromRegistry(long wstr long) #check +@ stdcall GetCPFileNameFromRegistry(long wstr long) ;check @ stdcall GetCPInfo(long ptr) @ stdcall GetCPInfoExA(long long ptr) @ stdcall GetCPInfoExW(long long ptr) @@ -322,7 +322,7 @@ @ stdcall GetConsoleMode(long ptr) @ stdcall GetConsoleNlsMode(long ptr) @ stdcall GetConsoleOutputCP() -@ stub GetConsoleProcessList # missing in XP SP3 +@ stub GetConsoleProcessList ; missing in XP SP3 @ stdcall GetConsoleScreenBufferInfo(long ptr) @ stdcall GetConsoleSelectionInfo(ptr) @ stdcall GetConsoleTitleA(ptr long) @@ -330,7 +330,7 @@ @ stdcall GetConsoleWindow() @ stdcall GetCurrencyFormatA(long long str ptr str long) @ stdcall GetCurrencyFormatW(long long str ptr str long) -#@ stdcall GetCurrentActCtx(ptr) +;@ stdcall GetCurrentActCtx(ptr) @ stdcall GetCurrentConsoleFont(long long ptr) @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) @@ -340,7 +340,7 @@ @ stdcall GetCurrentThreadId() @ stdcall GetDateFormatA(long long ptr str ptr long) @ stdcall GetDateFormatW(long long ptr wstr ptr long) -@ stub GetDaylightFlag # missing in XP SP3 +@ stub GetDaylightFlag ; missing in XP SP3 @ stdcall GetDefaultCommConfigA(str ptr long) @ stdcall GetDefaultCommConfigW(wstr ptr long) @ stdcall GetDefaultSortkeySize(ptr) @@ -384,8 +384,8 @@ @ stdcall GetGeoInfoW(long long ptr long long) @ stdcall GetHandleContext(long) @ stdcall GetHandleInformation(long ptr) -@ stub GetSCallbackTarget # missing in XP SP3 -@ stub GetSCallbackTemplate # missing in XP SP3 +@ stub GetSCallbackTarget ; missing in XP SP3 +@ stub GetSCallbackTemplate ; missing in XP SP3 @ stdcall GetLargePageMinimum() @ stdcall GetLargestConsoleWindowSize(long) @ stdcall GetLastError() @@ -448,7 +448,7 @@ @ stdcall GetProcessTimes(long ptr ptr ptr ptr) @ stdcall GetProcessVersion(long) @ stdcall GetProcessWorkingSetSize(long ptr ptr) -@ stub GetProductName # missing in XP SP3 +@ stub GetProductName ; missing in XP SP3 @ stdcall GetProfileIntA(str str long) @ stdcall GetProfileIntW(wstr wstr long) @ stdcall GetProfileSectionA(str ptr long) @@ -456,8 +456,8 @@ @ stdcall GetProfileStringA(str str str ptr long) @ stdcall GetProfileStringW(wstr wstr wstr ptr long) @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) -@ stub GetLSCallbackTarget # missing in XP SP3 -@ stub GetLSCallbackTemplate # missing in XP SP3 +@ stub GetLSCallbackTarget ; missing in XP SP3 +@ stub GetLSCallbackTemplate ; missing in XP SP3 @ stdcall GetShortPathNameA(str ptr long) @ stdcall GetShortPathNameW(wstr ptr long) @ stdcall GetStartupInfoA(ptr) @@ -559,7 +559,7 @@ @ stdcall HeapQueryInformation(long long ptr long ptr) @ stdcall HeapQueryTagW(long long long long ptr) @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap -@ stub HeapSetFlags # missing in XP SP3 +@ stub HeapSetFlags ; missing in XP SP3 @ stdcall HeapSetInformation(ptr long ptr long) @ stdcall HeapSize(long long ptr) ntdll.RtlSizeHeap @ stdcall HeapSummary(long long ptr) @@ -570,7 +570,7 @@ @ stdcall InitAtomTable(long) @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -#@ stdcall InitializeCriticalSectionEx(ptr long long) # missing in XP SP3 +;@ stdcall InitializeCriticalSectionEx(ptr long long) ; missing in XP SP3 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock @ stdcall InterlockedCompareExchange (ptr long long) @@ -582,7 +582,7 @@ @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList @ stdcall InvalidateConsoleDIBits(long long) -@ stub InvalidateNSCache # missing in XP SP3 +@ stub InvalidateNSCache ; missing in XP SP3 @ stdcall IsBadCodePtr(ptr) @ stdcall IsBadHugeReadPtr(ptr long) @ stdcall IsBadHugeWritePtr(ptr long) @@ -601,7 +601,7 @@ @ stdcall IsValidLocale(long long) @ stdcall IsValidUILanguage(long) @ stdcall IsWow64Process(ptr ptr) -@ stdcall LCIDToLocaleName(long wstr long long) # needed for wine gecko; missing in XP SP3 +@ stdcall LCIDToLocaleName(long wstr long long) ; needed for wine gecko; missing in XP SP3 @ stdcall LCMapStringA(long long str long ptr long) @ stdcall LCMapStringW(long long wstr long ptr long) @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection @@ -622,7 +622,7 @@ @ stdcall LocalShrink(long long) @ stdcall LocalSize(long) @ stdcall LocalUnlock(long) -@ stub LocaleNameToLCID # missing in XP SP3 +@ stub LocaleNameToLCID ; missing in XP SP3 @ stdcall LockFile(long long long long long) @ stdcall LockFileEx(long long long long long ptr) @ stdcall LockResource(long) @@ -632,8 +632,8 @@ @ stdcall LZInit(long) @ stdcall LZOpenFileA(str ptr long) @ stdcall LZOpenFileW(wstr ptr long) -@ stdcall LZRead(long str long) #check -@ stdcall LZSeek(long long long) #check +@ stdcall LZRead(long str long) ;check +@ stdcall LZSeek(long long long) ;check @ stdcall LZStart() @ stdcall MapUserPhysicalPages(ptr long ptr) @ stdcall MapUserPhysicalPagesScatter(ptr long ptr) @@ -655,8 +655,8 @@ @ stdcall NeedCurrentDirectoryForExePathW(wstr) @ stdcall NlsConvertIntegerToString(double double double wstr double) @ stdcall NlsGetCacheUpdateCount() -@ stub NlsResetProcessLocale # missing in XP SP3 -@ stub NotifyNLSUserCache # missing in XP SP3 +@ stub NlsResetProcessLocale ; missing in XP SP3 +@ stub NotifyNLSUserCache ; missing in XP SP3 @ stdcall NumaVirtualQueryNode(long long long long) @ stdcall OpenConsoleW(wstr long long long) @ stdcall OpenDataFile(long long) @@ -692,14 +692,14 @@ @ stdcall ProcessIdToSessionId(long ptr) @ stdcall PulseEvent(long) @ stdcall PurgeComm(long long) -#@ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) +;@ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) @ stdcall QueryInformationJobObject(long long ptr long ptr) @ stdcall QueryMemoryResourceNotification(long ptr) -@ stub QueryNumberOfEventLogRecords # missing in XP SP3 -@ stub QueryOldestEventLogRecord # missing in XP SP3 +@ stub QueryNumberOfEventLogRecords ; missing in XP SP3 +@ stub QueryOldestEventLogRecord ; missing in XP SP3 @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) @ stdcall QueryWin31IniFilesMappedToRegistry(long long long long) @@ -726,14 +726,14 @@ @ stdcall RegisterConsoleIME(ptr ptr) @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long) -@ stub RegisterServiceProcess # missing in XP SP3 -@ stub RegisterSysMsgHandler # missing in XP SP3 +@ stub RegisterServiceProcess ; missing in XP SP3 +@ stub RegisterSysMsgHandler ; missing in XP SP3 @ stdcall RegisterWaitForInputIdle(ptr) @ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) @ stdcall RegisterWaitForSingleObjectEx(long ptr ptr long long) @ stdcall RegisterWowBaseHandlers(long) @ stdcall RegisterWowExec(long) -#@ stdcall ReleaseActCtx(ptr) +;@ stdcall ReleaseActCtx(ptr) @ stdcall ReleaseMutex(long) @ stdcall ReleaseSemaphore(long long ptr) @ stdcall ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive @@ -811,7 +811,7 @@ @ stdcall SetCriticalSectionSpinCount(ptr long) ntdll.RtlSetCriticalSectionSpinCount @ stdcall SetCurrentDirectoryA(str) @ stdcall SetCurrentDirectoryW(wstr) -@ stub SetDaylightFlag # missing in XP SP3 +@ stub SetDaylightFlag ; missing in XP SP3 @ stdcall SetDefaultCommConfigA(str ptr long) @ stdcall SetDefaultCommConfigW(wstr ptr long) @ stdcall SetDllDirectoryA(str) @@ -837,10 +837,10 @@ @ stdcall SetHandleCount(long) @ stdcall SetHandleInformation(long long long) @ stdcall SetInformationJobObject(long long ptr long) -@ stub SetLastConsoleEventActive # missing in XP SP3 +@ stub SetLastConsoleEventActive ; missing in XP SP3 @ stdcall SetLastError(long) -@ stub SetLocalPrimaryComputerNameA # missing in XP SP3 -@ stub SetLocalPrimaryComputerNameW # missing in XP SP3 +@ stub SetLocalPrimaryComputerNameA ; missing in XP SP3 +@ stub SetLocalPrimaryComputerNameW ; missing in XP SP3 @ stdcall SetLocalTime(ptr) @ stdcall SetLocaleInfoA(long long str) @ stdcall SetLocaleInfoW(long long wstr) @@ -895,9 +895,9 @@ @ stdcall Thread32First(long ptr) @ stdcall Thread32Next(long ptr) @ stdcall TlsAlloc() -@ stub TlsAllocInternal # missing in XP SP3 +@ stub TlsAllocInternal ; missing in XP SP3 @ stdcall TlsFree(long) -@ stub TlsFreeInternal # missing in XP SP3 +@ stub TlsFreeInternal ; missing in XP SP3 @ stdcall TlsGetValue(long) @ stdcall TlsSetValue(long ptr) @ stdcall Toolhelp32ReadProcessMemory(long ptr ptr long ptr) @@ -919,8 +919,8 @@ @ stdcall UpdateResourceW(long wstr wstr long ptr long) @ stdcall VDMConsoleOperation(long long) @ stdcall VDMOperationStarted(long) -@ stub ValidateCType # missing in XP SP3 -@ stub ValidateLocale # missing in XP SP3 +@ stub ValidateCType ; missing in XP SP3 +@ stub ValidateLocale ; missing in XP SP3 @ stdcall VerLanguageNameA(long str long) @ stdcall VerLanguageNameW(long wstr long) @ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask @@ -980,9 +980,9 @@ @ stdcall WriteProfileStringW(wstr wstr wstr) @ stdcall WriteTapemark(ptr long long long) @ stdcall WTSGetActiveConsoleSessionId() -#@ stdcall ZombifyActCtx(ptr) -@ stub _DebugOut # missing in XP SP3 -@ stub _DebugPrintf # missing in XP SP3 +;@ stdcall ZombifyActCtx(ptr) +@ stub _DebugOut ; missing in XP SP3 +@ stub _DebugPrintf ; missing in XP SP3 @ stdcall _hread(long ptr long) @ stdcall _hwrite(long ptr long) @ stdcall _lclose(long) @@ -991,7 +991,7 @@ @ stdcall _lopen(str long) @ stdcall _lread(long ptr long) _hread @ stdcall _lwrite(long ptr long) _hwrite -@ stub dprintf # missing in XP SP3 +@ stub dprintf ; missing in XP SP3 @ stdcall lstrcat(str str) lstrcatA @ stdcall lstrcatA(str str) @ stdcall lstrcatW(wstr wstr) Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Mon May 25 14:41:13 2009 @@ -138,7 +138,7 @@ <library>normalize</library> </module> <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" crt="dll"> - <importlibrary definition="kernel32.spec" /> + <importlibrary definition="kernel32.pspec" /> <include base="kernel32">.</include> <include base="kernel32" root="intermediate">.</include> <include base="kernel32">include</include> Removed: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec (removed) @@ -1,1012 +1,0 @@ -@ stdcall AcquireSRWLockExclusive(ptr) ntdll.RtlAcquireSRWLockExclusive -@ stdcall AcquireSRWLockShare(ptr) ntdll.RtlAcquireSRWLockShared -#@ stdcall ActivateActCtx(ptr ptr) -@ stdcall AddAtomA(str) -@ stdcall AddAtomW(wstr) -@ stdcall AddConsoleAliasA(str str str) #check -@ stdcall AddConsoleAliasW(wstr wstr wstr) #check -@ stdcall AddLocalAlternateComputerNameA(str ptr) -@ stdcall AddLocalAlternateComputerNameW(wstr ptr) -#@ stdcall AddRefActCtx(ptr) -@ stdcall AddVectoredExceptionHandler(long ptr) ntdll.RtlAddVectoredExceptionHandler -@ stdcall AllocConsole() -@ stub AllocLSCallback # missing in XP SP3 -@ stdcall AllocateUserPhysicalPages(long ptr ptr) -@ stdcall AreFileApisANSI() -@ stdcall AssignProcessToJobObject(ptr ptr) -@ stdcall AttachConsole(long) -@ stdcall BackupRead(ptr ptr long ptr long long ptr) -@ stdcall BackupSeek(ptr long long ptr ptr ptr) -@ stdcall BackupWrite(ptr ptr long ptr long long ptr) -@ stdcall BaseCheckAppcompatCache(long long long ptr) #check -@ stdcall BaseCleanupAppcompatCache() -@ stdcall BaseCleanupAppcompatCacheSupport(ptr) -@ stdcall BaseDumpAppcompatCache() -@ stdcall BaseFlushAppcompatCache() -@ stdcall BaseInitAppcompatCache() -@ stdcall BaseInitAppcompatCacheSupport() -@ stdcall BaseProcessInitPostImport() -@ stdcall BaseQueryModuleData(str str ptr ptr ptr) #check -@ stdcall BaseUpdateAppcompatCache(long long long) -@ stub BasepCheckWinSaferRestrictions -@ stub BasepDebugDump # missing in XP SP3 -@ stdcall Beep(long long) -@ stdcall BeginUpdateResourceA(str long) -@ stdcall BeginUpdateResourceW(wstr long) -@ stdcall BindIoCompletionCallback(long ptr long) -@ stdcall BuildCommDCBA(str ptr) -@ stdcall BuildCommDCBAndTimeoutsA(str ptr ptr) -@ stdcall BuildCommDCBAndTimeoutsW(wstr ptr ptr) -@ stdcall BuildCommDCBW(wstr ptr) -@ stdcall CallNamedPipeA(str ptr long ptr long ptr long) -@ stdcall CallNamedPipeW(wstr ptr long ptr long ptr long) -@ stdcall CancelDeviceWakeupRequest(long) -@ stdcall CancelIo(long) -@ stdcall CancelIoEx(long ptr) -@ stdcall CancelSynchronousIo(long) -@ stdcall CancelTimerQueueTimer(long long) -@ stdcall CancelWaitableTimer(long) -@ stdcall ChangeTimerQueueTimer(long long long long) -@ stdcall CheckNameLegalDOS8Dot3A(str str long long long) -@ stdcall CheckNameLegalDOS8Dot3W(wstr str long long long) -@ stdcall CheckRemoteDebuggerPresent(long ptr) -@ stdcall ClearCommBreak(long) -@ stdcall ClearCommError(long ptr ptr) -@ stdcall CloseConsoleHandle(long) -@ stdcall CloseHandle(long) -@ stdcall CloseProfileUserMapping() -@ stub CloseSystemHandle # missing in XP SP3 -@ stdcall CmdBatNotification(long) -@ stdcall CommConfigDialogA(str long ptr) -@ stdcall CommConfigDialogW(wstr long ptr) -@ stdcall CompareFileTime(ptr ptr) -@ stdcall CompareStringA(long long str long str long) -@ stdcall CompareStringW(long long wstr long wstr long) -@ stdcall ConnectNamedPipe(long ptr) -@ stdcall ConsoleMenuControl(long long long) -@ stub ConsoleSubst # missing in XP SP3 -@ stdcall ContinueDebugEvent(long long long) -@ stdcall ConvertDefaultLocale (long) -@ stdcall ConvertFiberToThread() -@ stdcall ConvertThreadToFiber(ptr) -@ stdcall ConvertThreadToFiberEx(ptr long) -@ stdcall CopyFileA(str str long) -@ stdcall CopyFileExA (str str ptr ptr ptr long) -@ stdcall CopyFileExW (wstr wstr ptr ptr ptr long) -@ stdcall CopyFileW(wstr wstr long) -@ stdcall CopyLZFile(long long) LZCopy -#@ stdcall CreateActCtxA(ptr) -#@ stdcall CreateActCtxW(ptr) -@ stdcall CreateConsoleScreenBuffer(long long ptr long ptr) -@ stdcall CreateDirectoryA(str ptr) -@ stdcall CreateDirectoryExA(str str ptr) -@ stdcall CreateDirectoryExW(wstr wstr ptr) -@ stdcall CreateDirectoryW(wstr ptr) -@ stdcall CreateEventA(ptr long long str) -@ stdcall CreateEventW(ptr long long wstr) -@ stdcall CreateFiber(long ptr ptr) -@ stdcall CreateFiberEx(long long long ptr ptr) -@ stdcall CreateFileA(str long long ptr long long long) -@ stdcall CreateFileMappingA(long ptr long long long str) -@ stdcall CreateFileMappingW(long ptr long long long wstr) -@ stdcall CreateFileW(wstr long long ptr long long long) -@ stdcall CreateHardLinkA(str str ptr) -@ stdcall CreateHardLinkW(wstr wstr ptr) -@ stdcall CreateIoCompletionPort(long long long long) -@ stdcall CreateJobObjectA(ptr str) -@ stdcall CreateJobObjectW(ptr wstr) -@ stdcall CreateJobSet(long ptr long) -@ stub CreateKernelThread # missing in XP SP3 -@ stdcall CreateMailslotA(ptr long long ptr) -@ stdcall CreateMailslotW(ptr long long ptr) -@ stdcall CreateMemoryResourceNotification(ptr) -@ stdcall CreateMutexA(ptr long str) -@ stdcall CreateMutexW(ptr long wstr) -@ stdcall CreateNamedPipeA(str long long long long long long ptr) -@ stdcall CreateNamedPipeW(wstr long long long long long long ptr) -@ stdcall CreateNlsSecurityDescriptor(ptr long long) -@ stdcall CreatePipe(ptr ptr ptr long) -@ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) -@ stdcall CreateProcessInternalA(ptr str str ptr ptr long long ptr str ptr ptr long) -@ stdcall CreateProcessInternalW(ptr wstr wstr ptr ptr long long ptr wstr ptr ptr long) -@ stdcall CreateProcessInternalWSecure() -@ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) -@ stdcall CreateRemoteThread(long ptr long ptr long long ptr) -@ stdcall CreateSemaphoreA(ptr long long str) -@ stdcall CreateSemaphoreW(ptr long long wstr) -@ stdcall CreateSemaphoreExA(ptr long long str long long) -@ stdcall CreateSemaphoreExW(ptr long long wstr long long) -@ stdcall CreateSocketHandle() -@ stdcall CreateSymbolicLinkA(str str long) -@ stdcall CreateSymbolicLinkW(wstr wstr long) -@ stdcall CreateTapePartition(long long long long) -@ stdcall CreateThread(ptr long ptr long long ptr) -@ stdcall CreateTimerQueue () -@ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) -@ stdcall CreateToolhelp32Snapshot(long long) -@ stdcall CreateVirtualBuffer(long long long) -@ stdcall CreateWaitableTimerA(ptr long str) -@ stdcall CreateWaitableTimerW(ptr long wstr) -@ stdcall CreateWaitableTimerExA (ptr str long long) -@ stdcall CreateWaitableTimerExW (ptr wstr long long) -#@ stdcall DeactivateActCtx(long ptr) -@ stdcall DebugActiveProcess(long) -@ stdcall DebugActiveProcessStop(long) -@ stdcall DebugBreak() ntdll.DbgBreakPoint -@ stdcall DebugBreakProcess(long) -@ stdcall DebugSetProcessKillOnExit(long) -@ stdcall DecodePointer(ptr) ntdll.RtlDecodePointer -@ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer -@ stdcall DefineDosDeviceA(long str str) -@ stdcall DefineDosDeviceW(long wstr wstr) -@ stdcall DelayLoadFailureHook(str str) -@ stdcall DeleteAtom(long) -@ stdcall DeleteCriticalSection(ptr) ntdll.RtlDeleteCriticalSection -@ stdcall DeleteFiber(ptr) -@ stdcall DeleteFileA(str) -@ stdcall DeleteFileW(wstr) -@ stdcall DeleteTimerQueue(long) -@ stdcall DeleteTimerQueueEx (long long) -@ stdcall DeleteTimerQueueTimer(long long long) -@ stdcall DeleteVolumeMountPointA(str) #check -@ stdcall DeleteVolumeMountPointW(wstr) #check -@ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) -@ stdcall DisableThreadLibraryCalls(long) -@ stdcall DisconnectNamedPipe(long) -@ stdcall DnsHostnameToComputerNameA (str ptr ptr) -@ stdcall DnsHostnameToComputerNameW (wstr ptr ptr) -@ stdcall DosDateTimeToFileTime(long long ptr) -@ stdcall DosPathToSessionPathA(long str str) -@ stdcall DosPathToSessionPathW(long wstr wstr) -@ stdcall DuplicateConsoleHandle(long long long long) -@ stdcall DuplicateHandle(long long long ptr long long long) -@ stdcall EncodePointer(ptr) ntdll.RtlEncodePointer -@ stdcall EncodeSystemPointer(ptr) ntdll.RtlEncodeSystemPointer -@ stdcall EndUpdateResourceA(long long) -@ stdcall EndUpdateResourceW(long long) -@ stdcall EnterCriticalSection(ptr) ntdll.RtlEnterCriticalSection -@ stdcall EnumCalendarInfoA(ptr long long long) -@ stdcall EnumCalendarInfoExA(ptr long long long) -@ stdcall EnumCalendarInfoExW(ptr long long long) -@ stdcall EnumCalendarInfoW(ptr long long long) -@ stdcall EnumDateFormatsA(ptr long long) -@ stdcall EnumDateFormatsExA(ptr long long) -@ stdcall EnumDateFormatsExW(ptr long long) -@ stdcall EnumDateFormatsW(ptr long long) -@ stdcall EnumLanguageGroupLocalesA(ptr long long ptr) -@ stdcall EnumLanguageGroupLocalesW(ptr long long ptr) -@ stdcall EnumResourceLanguagesA(long str str ptr long) -@ stdcall EnumResourceLanguagesW(long wstr wstr ptr long) -@ stdcall EnumResourceNamesA(long str ptr long) -@ stdcall EnumResourceNamesW(long wstr ptr long) -@ stdcall EnumResourceTypesA(long ptr long) -@ stdcall EnumResourceTypesW(long ptr long) -@ stdcall EnumSystemCodePagesA(ptr long) -@ stdcall EnumSystemCodePagesW(ptr long) -@ stdcall EnumSystemGeoID(long long ptr) -@ stdcall EnumSystemLanguageGroupsA(ptr long ptr) -@ stdcall EnumSystemLanguageGroupsW(ptr long ptr) -@ stdcall EnumSystemLocalesA(ptr long) -@ stdcall EnumSystemLocalesW(ptr long) -@ stdcall EnumTimeFormatsA(ptr long long) -@ stdcall EnumTimeFormatsW(ptr long long) -@ stdcall EnumUILanguagesA(ptr long long) -@ stdcall EnumUILanguagesW(ptr long long) -@ stdcall EnumerateLocalComputerNamesA(ptr long str ptr) -@ stdcall EnumerateLocalComputerNamesW(ptr long wstr ptr) -@ stdcall EraseTape(ptr long long) -@ stdcall EscapeCommFunction(long long) -@ stdcall ExitProcess(long) -@ stdcall ExitThread(long) -@ stdcall ExitVDM(long long) -@ stdcall ExpandEnvironmentStringsA(str ptr long) -@ stdcall ExpandEnvironmentStringsW(wstr ptr long) -@ stdcall ExpungeConsoleCommandHistoryA(long) -@ stdcall ExpungeConsoleCommandHistoryW(long) -@ stdcall ExtendVirtualBuffer(long long) -@ stdcall FatalAppExitA(long str) -@ stdcall FatalAppExitW(long wstr) -@ stdcall FatalExit(long) -@ stdcall FileTimeToDosDateTime(ptr ptr ptr) -@ stdcall FileTimeToLocalFileTime(ptr ptr) -@ stdcall FileTimeToSystemTime(ptr ptr) -@ stdcall FillConsoleOutputAttribute(long long long long ptr) -@ stdcall FillConsoleOutputCharacterA(long long long long ptr) -@ stdcall FillConsoleOutputCharacterW(long long long long ptr) -#@ stdcall FindActCtxSectionGuid(long ptr long ptr ptr) -#@ stdcall FindActCtxSectionStringA(long ptr long str ptr) -#@ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) -@ stdcall FindAtomA(str) -@ stdcall FindAtomW(wstr) -@ stdcall FindClose(long) -@ stdcall FindCloseChangeNotification(long) -@ stdcall FindFirstChangeNotificationA(str long long) -@ stdcall FindFirstChangeNotificationW(wstr long long) -@ stdcall FindFirstFileA(str ptr) -@ stdcall FindFirstFileExA(str long ptr long ptr long) -@ stdcall FindFirstFileExW(wstr long ptr long ptr long) -@ stdcall FindFirstFileW(wstr ptr) -@ stdcall FindFirstStreamW(wstr ptr ptr long) -@ stdcall FindFirstVolumeA(ptr long) -@ stdcall FindFirstVolumeMountPointA(str ptr long) -@ stdcall FindFirstVolumeMountPointW(wstr ptr long) -@ stdcall FindFirstVolumeW(ptr long) -@ stdcall FindNextChangeNotification(long) -@ stdcall FindNextFileA(long ptr) -@ stdcall FindNextFileW(long ptr) -@ stdcall FindNextVolumeA(long ptr long) -@ stdcall FindNextVolumeMountPointA(long str long) -@ stdcall FindNextVolumeMountPointW(long wstr long) -@ stdcall FindNextVolumeW(long ptr long) -@ stdcall FindResourceA(long str str) -@ stdcall FindResourceExA(long str str long) -@ stdcall FindResourceExW(long wstr wstr long) -@ stdcall FindResourceW(long wstr wstr) -@ stdcall FindVolumeClose(ptr) -@ stdcall FindVolumeMountPointClose(ptr) -#@ stdcall FlsAlloc(ptr) # missing in XP SP3 -#@ stdcall FlsFree(long) # missing in XP SP3 -#@ stdcall FlsGetValue(long) # missing in XP SP3 -#@ stdcall FlsSetValue(long ptr) # missing in XP SP3 -@ stdcall FlushConsoleInputBuffer(long) -@ stdcall FlushFileBuffers(long) -@ stdcall FlushInstructionCache(long long long) -@ stdcall FlushViewOfFile(ptr long) -@ stdcall FoldStringA(long str long ptr long) -@ stdcall FoldStringW(long wstr long ptr long) -@ stdcall FormatMessageA(long ptr long long ptr long ptr) -@ stdcall FormatMessageW(long ptr long long ptr long ptr) -@ stdcall FreeConsole() -@ stdcall FreeEnvironmentStringsA(ptr) -@ stdcall FreeEnvironmentStringsW(ptr) -@ stdcall FreeLibrary(long) -@ stdcall FreeLibraryAndExitThread(long long) -@ stdcall FreeResource(long) -@ stdcall FreeUserPhysicalPages(long long long) -@ stdcall FreeVirtualBuffer(ptr) -@ stdcall GenerateConsoleCtrlEvent(long long) -@ stdcall GetACP() -@ stdcall GetAtomNameA(long ptr long) -@ stdcall GetAtomNameW(long ptr long) -@ stdcall GetBinaryType(str ptr) GetBinaryTypeA -@ stdcall GetBinaryTypeA(str ptr) -@ stdcall GetBinaryTypeW(wstr ptr) -@ stdcall GetCPFileNameFromRegistry(long wstr long) #check -@ stdcall GetCPInfo(long ptr) -@ stdcall GetCPInfoExA(long long ptr) -@ stdcall GetCPInfoExW(long long ptr) -@ stdcall GetCalendarInfoA(long long long ptr long ptr) -@ stdcall GetCalendarInfoW(long long long ptr long ptr) -@ stdcall GetComPlusPackageInstallStatus() -@ stdcall GetCommConfig(long ptr long) -@ stdcall GetCommMask(long ptr) -@ stdcall GetCommModemStatus(long ptr) -@ stdcall GetCommProperties(long ptr) -@ stdcall GetCommState(long ptr) -@ stdcall GetCommTimeouts(long ptr) -@ stdcall GetCommandLineA() -@ stdcall GetCommandLineW() -@ stdcall GetCompressedFileSizeA(long ptr) -@ stdcall GetCompressedFileSizeW(long ptr) -@ stdcall GetComputerNameA(ptr ptr) -@ stdcall GetComputerNameExA(long ptr ptr) -@ stdcall GetComputerNameExW(long ptr ptr) -@ stdcall GetComputerNameW(ptr ptr) -@ stdcall GetConsoleAliasA(str str long str) -@ stdcall GetConsoleAliasExesA(str long) -@ stdcall GetConsoleAliasExesLengthA() -@ stdcall GetConsoleAliasExesLengthW() -@ stdcall GetConsoleAliasExesW(wstr long) -@ stdcall GetConsoleAliasW(wstr wstr long wstr) -@ stdcall GetConsoleAliasesA(str long str) -@ stdcall GetConsoleAliasesLengthA(str) -@ stdcall GetConsoleAliasesLengthW(wstr) -@ stdcall GetConsoleAliasesW(wstr long wstr) -@ stdcall GetConsoleCP() -@ stdcall GetConsoleCharType(long long ptr) -@ stdcall GetConsoleCommandHistoryA(long long long) -@ stdcall GetConsoleCommandHistoryLengthA(long) -@ stdcall GetConsoleCommandHistoryLengthW(long) -@ stdcall GetConsoleCommandHistoryW(long long long) -@ stdcall GetConsoleCursorInfo(long ptr) -@ stdcall GetConsoleCursorMode(long ptr ptr) -@ stdcall GetConsoleDisplayMode(ptr) -@ stdcall GetConsoleFontInfo(long long long ptr) -@ stdcall GetConsoleFontSize(long long) -@ stdcall GetConsoleHardwareState(long long ptr) -@ stdcall GetConsoleInputExeNameA(long ptr) -@ stdcall GetConsoleInputExeNameW(long ptr) -@ stdcall GetConsoleInputWaitHandle() -@ stdcall GetConsoleKeyboardLayoutNameA(ptr) -@ stdcall GetConsoleKeyboardLayoutNameW(ptr) -@ stdcall GetConsoleMode(long ptr) -@ stdcall GetConsoleNlsMode(long ptr) -@ stdcall GetConsoleOutputCP() -@ stub GetConsoleProcessList # missing in XP SP3 -@ stdcall GetConsoleScreenBufferInfo(long ptr) -@ stdcall GetConsoleSelectionInfo(ptr) -@ stdcall GetConsoleTitleA(ptr long) -@ stdcall GetConsoleTitleW(ptr long) -@ stdcall GetConsoleWindow() -@ stdcall GetCurrencyFormatA(long long str ptr str long) -@ stdcall GetCurrencyFormatW(long long str ptr str long) -#@ stdcall GetCurrentActCtx(ptr) -@ stdcall GetCurrentConsoleFont(long long ptr) -@ stdcall GetCurrentDirectoryA(long ptr) -@ stdcall GetCurrentDirectoryW(long ptr) -@ stdcall GetCurrentProcess() -@ stdcall GetCurrentProcessId() -@ stdcall GetCurrentThread() -@ stdcall GetCurrentThreadId() -@ stdcall GetDateFormatA(long long ptr str ptr long) -@ stdcall GetDateFormatW(long long ptr wstr ptr long) -@ stub GetDaylightFlag # missing in XP SP3 -@ stdcall GetDefaultCommConfigA(str ptr long) -@ stdcall GetDefaultCommConfigW(wstr ptr long) -@ stdcall GetDefaultSortkeySize(ptr) -@ stdcall GetDevicePowerState(long ptr) -@ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) -@ stdcall GetDiskFreeSpaceExA (str ptr ptr ptr) -@ stdcall GetDiskFreeSpaceExW (wstr ptr ptr ptr) -@ stdcall GetDiskFreeSpaceW(wstr ptr ptr ptr ptr) -@ stdcall GetDllDirectoryA(long ptr) -@ stdcall GetDllDirectoryW(long ptr) -@ stdcall GetDriveTypeA(str) -@ stdcall GetDriveTypeW(wstr) -@ stdcall GetEnvironmentStrings() -@ stdcall GetEnvironmentStringsA() GetEnvironmentStrings -@ stdcall GetEnvironmentStringsW() -@ stdcall GetEnvironmentVariableA(str ptr long) -@ stdcall GetEnvironmentVariableW(wstr ptr long) -@ stdcall GetErrorMode() -@ stdcall GetExitCodeProcess(long ptr) -@ stdcall GetExitCodeThread(long ptr) -@ stdcall GetExpandedNameA(str ptr) -@ stdcall GetExpandedNameW(wstr ptr) -@ stdcall GetFileAttributesA(str) -@ stdcall GetFileAttributesByHandle(long ptr long) -@ stdcall GetFileAttributesExA(str long ptr) -@ stdcall GetFileAttributesExW(wstr long ptr) -@ stdcall GetFileAttributesW(wstr) -@ stdcall GetFileBandwidthReservation(long ptr ptr ptr ptr ptr) -@ stdcall GetFileInformationByHandle(long ptr) -@ stdcall GetFileSize(long ptr) -@ stdcall GetFileSizeEx(long ptr) -@ stdcall GetFileTime(long ptr ptr ptr) -@ stdcall GetFileType(long) -@ stdcall GetFinalPathNameByHandleA(long str long long) -@ stdcall GetFinalPathNameByHandleW(long wstr long long) -@ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) -@ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) -@ stdcall GetFullPathNameA(str long ptr ptr) -@ stdcall GetFullPathNameW(wstr long ptr ptr) -@ stdcall GetGeoInfoA(long long ptr long long) -@ stdcall GetGeoInfoW(long long ptr long long) -@ stdcall GetHandleContext(long) -@ stdcall GetHandleInformation(long ptr) -@ stub GetSCallbackTarget # missing in XP SP3 -@ stub GetSCallbackTemplate # missing in XP SP3 -@ stdcall GetLargePageMinimum() -@ stdcall GetLargestConsoleWindowSize(long) -@ stdcall GetLastError() -@ stdcall GetLinguistLangSize(ptr) -@ stdcall GetLocalTime(ptr) -@ stdcall GetLocaleInfoA(long long ptr long) -@ stdcall GetLocaleInfoW(long long ptr long) -@ stdcall GetLocaleInfoEx(wstr long wstr long) -@ stdcall GetLogicalDriveStringsA(long ptr) -@ stdcall GetLogicalDriveStringsW(long ptr) -@ stdcall GetLogicalDrives() -@ stdcall GetLongPathNameA (str long long) -@ stdcall GetLongPathNameW (wstr long long) -@ stdcall GetMailslotInfo(long ptr ptr ptr ptr) -@ stdcall GetModuleFileNameA(long ptr long) -@ stdcall GetModuleFileNameW(long ptr long) -@ stdcall GetModuleHandleA(str) -@ stdcall GetModuleHandleExA(long ptr ptr) -@ stdcall GetModuleHandleExW(long ptr ptr) -@ stdcall GetModuleHandleW(wstr) -@ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) -@ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) -@ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) -@ stdcall GetNativeSystemInfo(ptr) -@ stdcall GetNextVDMCommand(long) -@ stdcall GetNlsSectionName(long long double str str double) -@ stdcall GetNumaAvailableMemory(ptr double ptr) -@ stdcall GetNumaAvailableMemoryNode(double ptr) -@ stdcall GetNumaHighestNodeNumber(ptr) -@ stdcall GetNumaNodeProcessorMask(double ptr) -@ stdcall GetNumaProcessorMap(ptr double ptr) -@ stdcall GetNumaProcessorNode(double ptr) -@ stdcall GetNumberFormatA(long long str ptr ptr long) -@ stdcall GetNumberFormatW(long long wstr ptr ptr long) -@ stdcall GetNumberOfConsoleFonts() -@ stdcall GetNumberOfConsoleInputEvents(long ptr) -@ stdcall GetNumberOfConsoleMouseButtons(ptr) -@ stdcall GetOEMCP() -@ stdcall GetOverlappedResult(long ptr ptr long) -@ stdcall GetPriorityClass(long) -@ stdcall GetPrivateProfileIntA(str str long str) -@ stdcall GetPrivateProfileIntW(wstr wstr long wstr) -@ stdcall GetPrivateProfileSectionA(str ptr long str) -@ stdcall GetPrivateProfileSectionNamesA(ptr long str) -@ stdcall GetPrivateProfileSectionNamesW(ptr long wstr) -@ stdcall GetPrivateProfileSectionW(wstr ptr long wstr) -@ stdcall GetPrivateProfileStringA(str str str ptr long str) -@ stdcall GetPrivateProfileStringW(wstr wstr wstr ptr long wstr) -@ stdcall GetPrivateProfileStructA (str str ptr long str) -@ stdcall GetPrivateProfileStructW(wstr wstr ptr long wstr) -@ stdcall GetProcAddress(long str) -@ stdcall GetProcessAffinityMask(long ptr ptr) -@ stdcall GetProcessHandleCount(long ptr) -@ stdcall GetProcessHeap() -@ stdcall GetProcessHeaps(long ptr) -@ stdcall GetProcessId(long) -@ stdcall GetProcessIoCounters(long ptr) -@ stdcall GetProcessPriorityBoost(long ptr) -@ stdcall GetProcessShutdownParameters(ptr ptr) -@ stdcall GetProcessTimes(long ptr ptr ptr ptr) -@ stdcall GetProcessVersion(long) -@ stdcall GetProcessWorkingSetSize(long ptr ptr) -@ stub GetProductName # missing in XP SP3 -@ stdcall GetProfileIntA(str str long) -@ stdcall GetProfileIntW(wstr wstr long) -@ stdcall GetProfileSectionA(str ptr long) -@ stdcall GetProfileSectionW(wstr ptr long) -@ stdcall GetProfileStringA(str str str ptr long) -@ stdcall GetProfileStringW(wstr wstr wstr ptr long) -@ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) -@ stub GetLSCallbackTarget # missing in XP SP3 -@ stub GetLSCallbackTemplate # missing in XP SP3 -@ stdcall GetShortPathNameA(str ptr long) -@ stdcall GetShortPathNameW(wstr ptr long) -@ stdcall GetStartupInfoA(ptr) -@ stdcall GetStartupInfoW(ptr) -@ stdcall GetStdHandle(long) -@ stdcall GetStringTypeA(long long str long ptr) -@ stdcall GetStringTypeExA(long long str long ptr) -@ stdcall GetStringTypeExW(long long wstr long ptr) -@ stdcall GetStringTypeW(long wstr long ptr) -@ stdcall GetSystemDefaultLCID() -@ stdcall GetSystemDefaultLangID() -@ stdcall GetSystemDefaultUILanguage() -@ stdcall GetSystemDirectoryA(ptr long) -@ stdcall GetSystemDirectoryW(ptr long) -@ stdcall GetSystemInfo(ptr) -@ stdcall GetSystemPowerStatus(ptr) -@ stdcall GetSystemRegistryQuota(ptr ptr) -@ stdcall GetSystemTime(ptr) -@ stdcall GetSystemTimeAdjustment(ptr ptr ptr) -@ stdcall GetSystemTimeAsFileTime(ptr) -@ stdcall GetSystemTimes(ptr ptr ptr) -@ stdcall GetSystemWindowsDirectoryA(ptr long) -@ stdcall GetSystemWindowsDirectoryW(ptr long) -@ stdcall GetSystemWow64DirectoryA(ptr long) -@ stdcall GetSystemWow64DirectoryW(ptr long) -@ stdcall GetTapeParameters(ptr long ptr ptr) -@ stdcall GetTapePosition(ptr long ptr ptr ptr) -@ stdcall GetTapeStatus(ptr) -@ stdcall GetTempFileNameA(str str long ptr) -@ stdcall GetTempFileNameW(wstr wstr long ptr) -@ stdcall GetTempPathA(long ptr) -@ stdcall GetTempPathW(long ptr) -@ stdcall GetThreadContext(long ptr) -@ stdcall GetThreadId(ptr) -@ stdcall GetThreadIOPendingFlag(long ptr) -@ stdcall GetThreadLocale() -@ stdcall GetThreadPriority(long) -@ stdcall GetThreadPriorityBoost(long ptr) -@ stdcall GetThreadSelectorEntry(long long ptr) -@ stdcall GetThreadTimes(long ptr ptr ptr ptr) -@ stdcall GetTickCount() -@ stdcall -ret64 GetTickCount64() -@ stdcall GetTimeFormatA(long long ptr str ptr long) -@ stdcall GetTimeFormatW(long long ptr wstr ptr long) -@ stdcall GetTimeZoneInformation(ptr) -@ stdcall GetUserDefaultLCID() -@ stdcall GetUserDefaultLangID() -@ stdcall GetUserDefaultUILanguage() -@ stdcall GetUserGeoID(long) -@ stdcall GetVDMCurrentDirectories(long long) -@ stdcall GetVersion() -@ stdcall GetVersionExA(ptr) -@ stdcall GetVersionExW(ptr) -@ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) -@ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) -@ stdcall GetVolumeNameForVolumeMountPointA(str ptr long) -@ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) -@ stdcall GetVolumePathNameA(str ptr long) -@ stdcall GetVolumePathNameW(wstr ptr long) -@ stdcall GetVolumePathNamesForVolumeNameA(str str long ptr) -@ stdcall GetVolumePathNamesForVolumeNameW(wstr wstr long ptr) -@ stdcall GetWindowsDirectoryA(ptr long) -@ stdcall GetWindowsDirectoryW(ptr long) -@ stdcall GetWriteWatch(long ptr long ptr ptr ptr) -@ stdcall GlobalAddAtomA(str) -@ stdcall GlobalAddAtomW(wstr) -@ stdcall GlobalAlloc(long long) -@ stdcall GlobalCompact(long) -@ stdcall GlobalDeleteAtom(long) -@ stdcall GlobalFindAtomA(str) -@ stdcall GlobalFindAtomW(wstr) -@ stdcall GlobalFix(long) -@ stdcall GlobalFlags(long) -@ stdcall GlobalFree(long) -@ stdcall GlobalGetAtomNameA(long ptr long) -@ stdcall GlobalGetAtomNameW(long ptr long) -@ stdcall GlobalHandle(ptr) -@ stdcall GlobalLock(long) -@ stdcall GlobalMemoryStatus(ptr) -@ stdcall GlobalMemoryStatusEx(ptr) -@ stdcall GlobalReAlloc(long long long) -@ stdcall GlobalSize(long) -@ stdcall GlobalUnWire(long) -@ stdcall GlobalUnfix(long) -@ stdcall GlobalUnlock(long) -@ stdcall GlobalWire(long) -@ stdcall Heap32First(ptr long long) -@ stdcall Heap32ListFirst(long ptr) -@ stdcall Heap32ListNext(long ptr) -@ stdcall Heap32Next(ptr) -@ stdcall HeapAlloc(long long long) ntdll.RtlAllocateHeap -@ stdcall HeapCompact(long long) -@ stdcall HeapCreate(long long long) -@ stdcall HeapCreateTagsW(long long wstr wstr) -@ stdcall HeapDestroy(long) -@ stdcall HeapExtend(long long ptr long) -@ stdcall HeapFree(long long long) ntdll.RtlFreeHeap -@ stdcall HeapLock(long) -@ stdcall HeapQueryInformation(long long ptr long ptr) -@ stdcall HeapQueryTagW(long long long long ptr) -@ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap -@ stub HeapSetFlags # missing in XP SP3 -@ stdcall HeapSetInformation(ptr long ptr long) -@ stdcall HeapSize(long long ptr) ntdll.RtlSizeHeap -@ stdcall HeapSummary(long long ptr) -@ stdcall HeapUnlock(long) -@ stdcall HeapUsage(long long long long ptr) -@ stdcall HeapValidate(long long ptr) -@ stdcall HeapWalk(long ptr) -@ stdcall InitAtomTable(long) -@ stdcall InitializeCriticalSection(ptr) -@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -#@ stdcall InitializeCriticalSectionEx(ptr long long) # missing in XP SP3 -@ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead -@ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock -@ stdcall InterlockedCompareExchange (ptr long long) -@ stdcall InterlockedDecrement(ptr) -@ stdcall InterlockedExchange(ptr long) -@ stdcall InterlockedExchangeAdd (ptr long ) -@ stdcall InterlockedFlushSList(ptr) ntdll.RtlInterlockedFlushSList -@ stdcall InterlockedIncrement(ptr) -@ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList -@ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList -@ stdcall InvalidateConsoleDIBits(long long) -@ stub InvalidateNSCache # missing in XP SP3 -@ stdcall IsBadCodePtr(ptr) -@ stdcall IsBadHugeReadPtr(ptr long) -@ stdcall IsBadHugeWritePtr(ptr long) -@ stdcall IsBadReadPtr(ptr long) -@ stdcall IsBadStringPtrA(ptr long) -@ stdcall IsBadStringPtrW(ptr long) -@ stdcall IsBadWritePtr(ptr long) -@ stdcall IsDBCSLeadByte(long) -@ stdcall IsDBCSLeadByteEx(long long) -@ stdcall IsDebuggerPresent() -@ stdcall IsProcessInJob(long long ptr) -@ stdcall IsProcessorFeaturePresent(long) -@ stdcall IsSystemResumeAutomatic() -@ stdcall IsValidCodePage(long) -@ stdcall IsValidLanguageGroup(long long) -@ stdcall IsValidLocale(long long) -@ stdcall IsValidUILanguage(long) -@ stdcall IsWow64Process(ptr ptr) -@ stdcall LCIDToLocaleName(long wstr long long) # needed for wine gecko; missing in XP SP3 -@ stdcall LCMapStringA(long long str long ptr long) -@ stdcall LCMapStringW(long long wstr long ptr long) -@ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection -@ stdcall LoadLibraryA(str) -@ stdcall LoadLibraryExA( str long long) -@ stdcall LoadLibraryExW(wstr long long) -@ stdcall LoadLibraryW(wstr) -@ stdcall LoadModule(str ptr) -@ stdcall LoadResource(long long) -@ stdcall LocalAlloc(long long) -@ stdcall LocalCompact(long) -@ stdcall LocalFileTimeToFileTime(ptr ptr) -@ stdcall LocalFlags(long) -@ stdcall LocalFree(long) -@ stdcall LocalHandle(ptr) -@ stdcall LocalLock(long) -@ stdcall LocalReAlloc(long long long) -@ stdcall LocalShrink(long long) -@ stdcall LocalSize(long) -@ stdcall LocalUnlock(long) -@ stub LocaleNameToLCID # missing in XP SP3 -@ stdcall LockFile(long long long long long) -@ stdcall LockFileEx(long long long long long ptr) -@ stdcall LockResource(long) -@ stdcall LZClose(long) -@ stdcall LZCopy(long long) -@ stdcall LZDone() -@ stdcall LZInit(long) -@ stdcall LZOpenFileA(str ptr long) -@ stdcall LZOpenFileW(wstr ptr long) -@ stdcall LZRead(long str long) #check -@ stdcall LZSeek(long long long) #check -@ stdcall LZStart() -@ stdcall MapUserPhysicalPages(ptr long ptr) -@ stdcall MapUserPhysicalPagesScatter(ptr long ptr) -@ stdcall MapViewOfFile(long long long long long) -@ stdcall MapViewOfFileEx(long long long long long ptr) -@ stdcall Module32First(long ptr) -@ stdcall Module32FirstW(long ptr) -@ stdcall Module32Next(long ptr) -@ stdcall Module32NextW(long ptr) -@ stdcall MoveFileA(str str) -@ stdcall MoveFileExA(str str long) -@ stdcall MoveFileExW(wstr wstr long) -@ stdcall MoveFileW(wstr wstr) -@ stdcall MoveFileWithProgressA(str str ptr ptr long) -@ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) -@ stdcall MulDiv(long long long) -@ stdcall MultiByteToWideChar(long long str long ptr long) -@ stdcall NeedCurrentDirectoryForExePathA(str) -@ stdcall NeedCurrentDirectoryForExePathW(wstr) -@ stdcall NlsConvertIntegerToString(double double double wstr double) -@ stdcall NlsGetCacheUpdateCount() -@ stub NlsResetProcessLocale # missing in XP SP3 -@ stub NotifyNLSUserCache # missing in XP SP3 -@ stdcall NumaVirtualQueryNode(long long long long) -@ stdcall OpenConsoleW(wstr long long long) -@ stdcall OpenDataFile(long long) -@ stdcall OpenEventA(long long str) -@ stdcall OpenEventW(long long wstr) -@ stdcall OpenFile(str ptr long) -@ stdcall OpenFileMappingA(long long str) -@ stdcall OpenFileMappingW(long long wstr) -@ stdcall OpenJobObjectA(long long str) -@ stdcall OpenJobObjectW(long long wstr) -@ stdcall OpenMutexA(long long str) -@ stdcall OpenMutexW(long long wstr) -@ stdcall OpenProcess(long long long) -@ stdcall OpenProfileUserMapping() -@ stdcall OpenSemaphoreA(long long str) -@ stdcall OpenSemaphoreW(long long wstr) -@ stdcall OpenThread(long long long) -@ stdcall OpenWaitableTimerA(long long str) -@ stdcall OpenWaitableTimerW(long long wstr) -@ stdcall OutputDebugStringA(str) -@ stdcall OutputDebugStringW(wstr) -@ stdcall PeekConsoleInputA(ptr ptr long ptr) -@ stdcall PeekConsoleInputW(ptr ptr long ptr) -@ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) -@ stdcall PostQueuedCompletionStatus(long long ptr ptr) -@ stdcall PrepareTape(ptr long long) -@ stdcall PrivCopyFileExW(wstr wstr ptr ptr long long) -@ stdcall PrivMoveFileIdentityW(long long long) -@ stdcall Process32First (ptr ptr) -@ stdcall Process32FirstW (ptr ptr) -@ stdcall Process32Next (ptr ptr) -@ stdcall Process32NextW (ptr ptr) -@ stdcall ProcessIdToSessionId(long ptr) -@ stdcall PulseEvent(long) -@ stdcall PurgeComm(long long) -#@ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) -@ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList -@ stdcall QueryDosDeviceA(str ptr long) -@ stdcall QueryDosDeviceW(wstr ptr long) -@ stdcall QueryInformationJobObject(long long ptr long ptr) -@ stdcall QueryMemoryResourceNotification(long ptr) -@ stub QueryNumberOfEventLogRecords # missing in XP SP3 -@ stub QueryOldestEventLogRecord # missing in XP SP3 -@ stdcall QueryPerformanceCounter(ptr) -@ stdcall QueryPerformanceFrequency(ptr) -@ stdcall QueryWin31IniFilesMappedToRegistry(long long long long) -@ stdcall QueueUserAPC(ptr long long) -@ stdcall QueueUserWorkItem(ptr ptr long) -@ stdcall RaiseException(long long long ptr) -@ stdcall ReadConsoleA(long ptr long ptr ptr) -@ stdcall ReadConsoleInputA(long ptr long ptr) -@ stdcall ReadConsoleInputExA(long ptr long ptr long) -@ stdcall ReadConsoleInputExW(long ptr long ptr long) -@ stdcall ReadConsoleInputW(long ptr long ptr) -@ stdcall ReadConsoleOutputA(long ptr long long ptr) -@ stdcall ReadConsoleOutputAttribute(long ptr long long ptr) -@ stdcall ReadConsoleOutputCharacterA(long ptr long long ptr) -@ stdcall ReadConsoleOutputCharacterW(long ptr long long ptr) -@ stdcall ReadConsoleOutputW(long ptr long long ptr) -@ stdcall ReadConsoleW(long ptr long ptr ptr) -@ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) -@ stdcall ReadFile(long ptr long ptr ptr) -@ stdcall ReadFileEx(long ptr long ptr ptr) -@ stdcall ReadFileScatter(long ptr long ptr ptr) -@ stdcall ReadProcessMemory(long ptr ptr long ptr) -@ stdcall RegisterApplicationRestart(wstr long) -@ stdcall RegisterConsoleIME(ptr ptr) -@ stdcall RegisterConsoleOS2(long) -@ stdcall RegisterConsoleVDM(long long long long long long long long long long long) -@ stub RegisterServiceProcess # missing in XP SP3 -@ stub RegisterSysMsgHandler # missing in XP SP3 -@ stdcall RegisterWaitForInputIdle(ptr) -@ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) -@ stdcall RegisterWaitForSingleObjectEx(long ptr ptr long long) -@ stdcall RegisterWowBaseHandlers(long) -@ stdcall RegisterWowExec(long) -#@ stdcall ReleaseActCtx(ptr) -@ stdcall ReleaseMutex(long) -@ stdcall ReleaseSemaphore(long long ptr) -@ stdcall ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive -@ stdcall ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared -@ stdcall RemoveDirectoryA(str) -@ stdcall RemoveDirectoryW(wstr) -@ stdcall RemoveLocalAlternateComputerNameA(str long) -@ stdcall RemoveLocalAlternateComputerNameW(wstr long) -@ stdcall RemoveVectoredExceptionHandler(ptr) ntdll.RtlRemoveVectoredExceptionHandler -@ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW -@ stdcall ReplaceFileA(str str str long ptr ptr) -@ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) -@ stdcall RequestDeviceWakeup(long) -@ stdcall RequestWakeupLatency(long) -@ stdcall ResetEvent(long) -@ stdcall ResetWriteWatch(ptr long) -@ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error -@ stdcall ResumeThread(long) -@ stdcall RtlCaptureContext(ptr) ntdll.RtlCaptureContext -@ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace -@ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory -@ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory -@ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind -@ stdcall RtlVirtualUnwind(ptr ptr ptr long) ntdll.RtlVirtualUnwind -@ stdcall RtlLookupFunctionEntry(ptr ptr ptr) ntdll.RtlLookupFunctionEntry -@ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory -@ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) -@ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr) -@ stdcall SearchPathA(str str str long ptr ptr) -@ stdcall SearchPathW(wstr wstr wstr long ptr ptr) -@ stdcall SetCPGlobal(long) -@ stdcall SetCalendarInfoA(long long long str) -@ stdcall SetCalendarInfoW(long long long wstr) -@ stdcall SetClientTimeZoneInformation(ptr) -@ stdcall SetComPlusPackageInstallStatus(ptr) -@ stdcall SetCommBreak(long) -@ stdcall SetCommConfig(long ptr long) -@ stdcall SetCommMask(long ptr) -@ stdcall SetCommState(long ptr) -@ stdcall SetCommTimeouts(long ptr) -@ stdcall SetComputerNameA(str) -@ stdcall SetComputerNameExA(long str) -@ stdcall SetComputerNameExW(long wstr) -@ stdcall SetComputerNameW(wstr) -@ stdcall SetConsoleActiveScreenBuffer(long) -@ stdcall SetConsoleCP(long) -@ stdcall SetConsoleCommandHistoryMode(long) -@ stdcall SetConsoleCtrlHandler(ptr long) -@ stdcall SetConsoleCursor(long long) -@ stdcall SetConsoleCursorInfo(long ptr) -@ stdcall SetConsoleCursorMode(long long long) -@ stdcall SetConsoleCursorPosition(long long) -@ stdcall SetConsoleDisplayMode(long long ptr) -@ stdcall SetConsoleFont(long long) -@ stdcall SetConsoleHardwareState(long long long) -@ stdcall SetConsoleIcon(ptr) -@ stdcall SetConsoleInputExeNameA(ptr) -@ stdcall SetConsoleInputExeNameW(ptr) -@ stdcall SetConsoleKeyShortcuts(long long long long) -@ stdcall SetConsoleLocalEUDC(long long long long) -@ stdcall SetConsoleMaximumWindowSize(long long) -@ stdcall SetConsoleMenuClose(long) -@ stdcall SetConsoleMode(long long) -@ stdcall SetConsoleNlsMode(long long) -@ stdcall SetConsoleNumberOfCommandsA(long long) -@ stdcall SetConsoleNumberOfCommandsW(long long) -@ stdcall SetConsoleOS2OemFormat(long) -@ stdcall SetConsoleOutputCP(long) -@ stdcall SetConsolePalette(long long long) -@ stdcall SetConsoleScreenBufferSize(long long) -@ stdcall SetConsoleTextAttribute(long long) -@ stdcall SetConsoleTitleA(str) -@ stdcall SetConsoleTitleW(wstr) -@ stdcall SetConsoleWindowInfo(long long ptr) -@ stdcall SetCriticalSectionSpinCount(ptr long) ntdll.RtlSetCriticalSectionSpinCount -@ stdcall SetCurrentDirectoryA(str) -@ stdcall SetCurrentDirectoryW(wstr) -@ stub SetDaylightFlag # missing in XP SP3 -@ stdcall SetDefaultCommConfigA(str ptr long) -@ stdcall SetDefaultCommConfigW(wstr ptr long) -@ stdcall SetDllDirectoryA(str) -@ stdcall SetDllDirectoryW(wstr) -@ stdcall SetEndOfFile(long) -@ stdcall SetEnvironmentVariableA(str str) -@ stdcall SetEnvironmentVariableW(wstr wstr) -@ stdcall SetErrorMode(long) -@ stdcall SetEvent(long) -@ stdcall SetFileApisToANSI() -@ stdcall SetFileApisToOEM() -@ stdcall SetFileAttributesA(str long) -@ stdcall SetFileAttributesW(wstr long) -@ stdcall SetFilePointer(long long ptr long) -@ stdcall SetFilePointerEx(long double ptr long) -@ stdcall SetFileShortNameA(long str) -@ stdcall SetFileShortNameW(long wstr) -@ stdcall SetFileTime(long ptr ptr ptr) -@ stdcall SetFileValidData(long double) -@ stdcall SetFirmwareEnvironmentVariableA(str str ptr long) -@ stdcall SetFirmwareEnvironmentVariableW(wstr wstr ptr long) -@ stdcall SetHandleContext(long long) -@ stdcall SetHandleCount(long) -@ stdcall SetHandleInformation(long long long) -@ stdcall SetInformationJobObject(long long ptr long) -@ stub SetLastConsoleEventActive # missing in XP SP3 -@ stdcall SetLastError(long) -@ stub SetLocalPrimaryComputerNameA # missing in XP SP3 -@ stub SetLocalPrimaryComputerNameW # missing in XP SP3 -@ stdcall SetLocalTime(ptr) -@ stdcall SetLocaleInfoA(long long str) -@ stdcall SetLocaleInfoW(long long wstr) -@ stdcall SetMailslotInfo(long long) -@ stdcall SetMessageWaitingIndicator(long double) -@ stdcall SetNamedPipeHandleState(long ptr ptr ptr) -@ stdcall SetPriorityClass(long long) -@ stdcall SetProcessAffinityMask(long long) -@ stdcall SetProcessPriorityBoost(long long) -@ stdcall SetProcessShutdownParameters(long long) -@ stdcall SetProcessWorkingSetSize(long long long) -@ stdcall SetStdHandle(long long) -@ stdcall SetSystemPowerState(long long) -@ stdcall SetSystemTime(ptr) -@ stdcall SetSystemTimeAdjustment(long long) -@ stdcall SetTapeParameters(ptr long ptr) -@ stdcall SetTapePosition(ptr long long long long long) -@ stdcall SetTermsrvAppInstallMode(long) -@ stdcall SetThreadAffinityMask(long long) -@ stdcall SetThreadContext(long ptr) -@ stdcall SetThreadExecutionState(long) -@ stdcall SetThreadIdealProcessor(long long) -@ stdcall SetThreadLocale(long) -@ stdcall SetThreadPriority(long long) -@ stdcall SetThreadPriorityBoost(long long) -@ stdcall SetThreadUILanguage(long) -@ stdcall SetTimeZoneInformation(ptr) -@ stdcall SetTimerQueueTimer(long ptr ptr long long long) -@ stdcall SetUnhandledExceptionFilter(ptr) -@ stdcall SetUserGeoID(long) -@ stdcall SetVDMCurrentDirectories(long long) -@ stdcall SetVolumeLabelA(str str) -@ stdcall SetVolumeLabelW(wstr wstr) -@ stdcall SetVolumeMountPointA(str str) -@ stdcall SetVolumeMountPointW(wstr wstr) -@ stdcall SetWaitableTimer(long ptr long ptr ptr long) -@ stdcall SetupComm(long long long) -@ stdcall ShowConsoleCursor(long long) -@ stdcall SignalObjectAndWait(long long long long) -@ stdcall SizeofResource(long long) -@ stdcall Sleep(long) -@ stdcall SleepEx(long long) -@ stdcall SuspendThread(long) -@ stdcall SwitchToFiber(ptr) -@ stdcall SwitchToThread() -@ stdcall SystemTimeToFileTime(ptr ptr) -@ stdcall SystemTimeToTzSpecificLocalTime (ptr ptr ptr) -@ stdcall TerminateJobObject(long long) -@ stdcall TerminateProcess(long long) -@ stdcall TerminateThread(long long) -@ stdcall TermsrvAppInstallMode() -@ stdcall Thread32First(long ptr) -@ stdcall Thread32Next(long ptr) -@ stdcall TlsAlloc() -@ stub TlsAllocInternal # missing in XP SP3 -@ stdcall TlsFree(long) -@ stub TlsFreeInternal # missing in XP SP3 -@ stdcall TlsGetValue(long) -@ stdcall TlsSetValue(long ptr) -@ stdcall Toolhelp32ReadProcessMemory(long ptr ptr long ptr) -@ stdcall TransactNamedPipe(long ptr long ptr long ptr ptr) -@ stdcall TransmitCommChar(long long) -@ stdcall TrimVirtualBuffer(ptr) -@ stdcall TryEnterCriticalSection(ptr) ntdll.RtlTryEnterCriticalSection -@ stdcall TzSpecificLocalTimeToSystemTime(ptr ptr ptr) -@ stdcall UTRegister(long str str str ptr ptr ptr) -@ stdcall UTUnRegister(long) -@ stdcall UnhandledExceptionFilter(ptr) -@ stdcall UnlockFile(long long long long long) -@ stdcall UnlockFileEx(long long long long ptr) -@ stdcall UnmapViewOfFile(ptr) -@ stdcall UnregisterConsoleIME() -@ stdcall UnregisterWait(long) -@ stdcall UnregisterWaitEx(long long) -@ stdcall UpdateResourceA(long str str long ptr long) -@ stdcall UpdateResourceW(long wstr wstr long ptr long) -@ stdcall VDMConsoleOperation(long long) -@ stdcall VDMOperationStarted(long) -@ stub ValidateCType # missing in XP SP3 -@ stub ValidateLocale # missing in XP SP3 -@ stdcall VerLanguageNameA(long str long) -@ stdcall VerLanguageNameW(long wstr long) -@ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask -@ stdcall VerifyConsoleIoHandle(long) -@ stdcall VerifyVersionInfoA(long long double) -@ stdcall VerifyVersionInfoW(long long double) -@ stdcall VirtualAlloc(ptr long long long) -@ stdcall VirtualAllocEx(long ptr long long long) -@ stdcall VirtualBufferExceptionHandler(long long long) -@ stdcall VirtualFree(ptr long long) -@ stdcall VirtualFreeEx(long ptr long long) -@ stdcall VirtualLock(ptr long) -@ stdcall VirtualProtect(ptr long long ptr) -@ stdcall VirtualProtectEx(long ptr long long ptr) -@ stdcall VirtualQuery(ptr ptr long) -@ stdcall VirtualQueryEx(long ptr ptr long) -@ stdcall VirtualUnlock(ptr long) -@ stdcall WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable -@ stdcall WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable -@ stdcall WaitCommEvent(long ptr ptr) -@ stdcall WaitForDebugEvent(ptr long) -@ stdcall WaitForMultipleObjects(long ptr long long) -@ stdcall WaitForMultipleObjectsEx(long ptr long long long) -@ stdcall WaitForSingleObject(long long) -@ stdcall WaitForSingleObjectEx(long long long) -@ stdcall WaitNamedPipeA (str long) -@ stdcall WaitNamedPipeW (wstr long) -@ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) -@ stdcall WinExec(str long) -@ stdcall Wow64EnableWow64FsRedirection(long) -@ stdcall Wow64DisableWow64FsRedirection(long) -@ stdcall Wow64RevertWow64FsRedirection(long) -@ stdcall WriteConsoleA(long ptr long ptr ptr) -@ stdcall WriteConsoleInputA(long ptr long ptr) -@ stdcall WriteConsoleInputVDMA(long long long long) -@ stdcall WriteConsoleInputVDMW(long long long long) -@ stdcall WriteConsoleInputW(long ptr long ptr) -@ stdcall WriteConsoleOutputA(long ptr long long ptr) -@ stdcall WriteConsoleOutputAttribute(long ptr long long ptr) -@ stdcall WriteConsoleOutputCharacterA(long ptr long long ptr) -@ stdcall WriteConsoleOutputCharacterW(long ptr long long ptr) -@ stdcall WriteConsoleOutputW(long ptr long long ptr) -@ stdcall WriteConsoleW(long ptr long ptr ptr) -@ stdcall WriteFile(long ptr long ptr ptr) -@ stdcall WriteFileEx(long ptr long ptr ptr) -@ stdcall WriteFileGather(long ptr long ptr ptr) -@ stdcall WritePrivateProfileSectionA(str str str) -@ stdcall WritePrivateProfileSectionW(wstr wstr wstr) -@ stdcall WritePrivateProfileStringA(str str str str) -@ stdcall WritePrivateProfileStringW(wstr wstr wstr wstr) -@ stdcall WritePrivateProfileStructA (str str ptr long str) -@ stdcall WritePrivateProfileStructW(wstr wstr ptr long wstr) -@ stdcall WriteProcessMemory(long ptr ptr long ptr) -@ stdcall WriteProfileSectionA(str str) -@ stdcall WriteProfileSectionW(str str) -@ stdcall WriteProfileStringA(str str str) -@ stdcall WriteProfileStringW(wstr wstr wstr) -@ stdcall WriteTapemark(ptr long long long) -@ stdcall WTSGetActiveConsoleSessionId() -#@ stdcall ZombifyActCtx(ptr) -@ stub _DebugOut # missing in XP SP3 -@ stub _DebugPrintf # missing in XP SP3 -@ stdcall _hread(long ptr long) -@ stdcall _hwrite(long ptr long) -@ stdcall _lclose(long) -@ stdcall _lcreat(str long) -@ stdcall _llseek(long long long) -@ stdcall _lopen(str long) -@ stdcall _lread(long ptr long) _hread -@ stdcall _lwrite(long ptr long) _hwrite -@ stub dprintf # missing in XP SP3 -@ stdcall lstrcat(str str) lstrcatA -@ stdcall lstrcatA(str str) -@ stdcall lstrcatW(wstr wstr) -@ stdcall lstrcmp(str str) lstrcmpA -@ stdcall lstrcmpA(str str) -@ stdcall lstrcmpW(wstr wstr) -@ stdcall lstrcmpi(str str) lstrcmpiA -@ stdcall lstrcmpiA(str str) -@ stdcall lstrcmpiW(wstr wstr) -@ stdcall lstrcpy(ptr str) lstrcpyA -@ stdcall lstrcpyA(ptr str) -@ stdcall lstrcpyW(ptr wstr) -@ stdcall lstrcpyn(ptr str long) lstrcpynA -@ stdcall lstrcpynA(ptr str long) -@ stdcall lstrcpynW(ptr wstr long) -@ stdcall lstrlen(str) lstrlenA -@ stdcall lstrlenA(str) -@ stdcall lstrlenW(wstr)

1 0

[cwittich] 41110: sync msvcrt winetest to wine 1.1.22
by cwittich＠svn.reactos.org 25 May '09

25 May '09

Author: cwittich Date: Mon May 25 13:16:39 2009 New Revision: 41110 URL: http://svn.reactos.org/svn/reactos?rev=41110&view=rev Log: sync msvcrt winetest to wine 1.1.22 Modified: trunk/rostests/winetests/msvcrt/data.c trunk/rostests/winetests/msvcrt/heap.c Modified: trunk/rostests/winetests/msvcrt/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/data.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/data.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/data.c [iso-8859-1] Mon May 25 13:16:39 2009 @@ -70,19 +70,19 @@ static void test_initvar( HMODULE hmsvcrt ) { OSVERSIONINFO osvi = { sizeof(OSVERSIONINFO) }; - int* (*pp_winver)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winver"); - int* (*pp_winmajor)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winmajor"); - int* (*pp_winminor)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winminor"); - int* (*pp_osver)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__osver"); - int winver, winmajor, winminor, osver; + int *pp_winver = (int*)GetProcAddress(hmsvcrt, "_winver"); + int *pp_winmajor = (int*)GetProcAddress(hmsvcrt, "_winmajor"); + int *pp_winminor = (int*)GetProcAddress(hmsvcrt, "_winminor"); + int *pp_osver = (int*)GetProcAddress(hmsvcrt, "_osver"); + unsigned int winver, winmajor, winminor, osver; if( !( pp_winmajor && pp_winminor && pp_winver)) { win_skip("_winver variables are not available\n"); return; } - winver = *pp_winver(); - winminor = *pp_winminor(); - winmajor = *pp_winmajor(); + winver = *pp_winver; + winminor = *pp_winminor; + winmajor = *pp_winmajor; GetVersionEx( &osvi); ok( winminor == osvi.dwMinorVersion, "Wrong value for _winminor %02x expected %02x\n", winminor, osvi.dwMinorVersion); @@ -95,7 +95,7 @@ win_skip("_osver variables are not available\n"); return; } - osver = *pp_osver(); + osver = *pp_osver; ok( osver == (osvi.dwBuildNumber & 0xffff) || ((osvi.dwBuildNumber >> 24) == osvi.dwMajorVersion && ((osvi.dwBuildNumber >> 16) & 0xff) == osvi.dwMinorVersion), /* 95/98/ME */ Modified: trunk/rostests/winetests/msvcrt/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/heap.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/heap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/heap.c [iso-8859-1] Mon May 25 13:16:39 2009 @@ -103,7 +103,7 @@ mem1 = malloc(size1); if (mem1) { - int i; + unsigned int i; for (i = 0; i < size1; i++) ((char *)mem)[i] = i + 1; memcpy(mem1, mem, size1); @@ -138,7 +138,7 @@ ok(memcmp(mem2, mem1, min(size1, size2))==0, "_aligned_realloc(%p, %d, %d) has different data\n", mem, size2, alignment); if (memcmp(mem2, mem1, min(size1, size2)) && winetest_debug > 1) { - int i; + unsigned int i; for (i = 0; i < min(size1, size2); i++) { if (((char *)mem2)[i] != ((char *)mem1)[i]) @@ -175,7 +175,7 @@ mem1 = malloc(size1); if (mem1) { - int i; + unsigned int i; for (i = 0; i < size1; i++) ((char *)mem)[i] = i + 1; memcpy(mem1, mem, size1); @@ -211,7 +211,7 @@ ok(memcmp(mem2, mem1, min(size1, size2))==0, "_aligned_offset_realloc(%p, %d, %d, %d) has different data\n", mem, size2, alignment, offset); if (memcmp(mem2, mem1, min(size1, size2)) && winetest_debug > 1) { - int i; + unsigned int i; for (i = 0; i < min(size1, size2); i++) { if (((char *)mem2)[i] != ((char *)mem1)[i])

1 0

[dgoette] 422: * fix renaming of an entry * fix changing type of an entry * put a visible comment to entry details, that these changes are applied as you click the button
by dgoette＠svn.reactos.org 25 May '09

25 May '09

Author: dgoette Date: Mon May 25 11:27:35 2009 New Revision: 422 URL: http://svn.reactos.org/svn/reactos?rev=422&view=rev Log: * fix renaming of an entry * fix changing type of an entry * put a visible comment to entry details, that these changes are applied as you click the button Modified: branches/danny-web/www/www.reactos.org/roscms/css/cms_website.css branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito… branches/danny-web/www/www.reactos.org/roscms/lib/om/Entry.class.php Modified: branches/danny-web/www/www.reactos.org/roscms/css/cms_website.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/css/cms_website.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/css/cms_website.css [iso-8859-1] Mon May 25 11:27:35 2009 @@ -91,3 +91,6 @@ .deletebutton { cursor:pointer; color:#006090; font-weight: bold; } #previewzone {background-color: white;min-height: 300px;padding-top: 10px;} + +/* comments */ +.comment { color: gray;font-size:smaller; } Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] Mon May 25 11:27:35 2009 @@ -971,14 +971,13 @@ var d_name_str = beautifystr2(document.getElementById('secdataname').value); var d_type_str = document.getElementById('cbmdatatype').value; var d_acl_str = document.getElementById('cbmdataacl').value; - var d_name_update = document.getElementById('chdname').checked; // remove leading space character if (d_name_str.substr(0, 1) === ' ') { d_name_str = d_name_str.substr(1, d_name_str.length-1); } - makeRequest('?page=backend&type=text&subtype=mef&d_fl=altersecurity&d_id='+did+'&d_r_id='+drid+'&d_val='+d_name_str+'&d_val2='+d_type_str+'&d_val3='+d_acl_str+'&d_val4='+d_name_update, 'mef', 'editaltersecurity', 'html', 'GET', ''); + makeRequest('?page=backend&type=text&subtype=mef&d_fl=altersecurity&d_id='+did+'&d_r_id='+drid+'&d_val='+d_name_str+'&d_val2='+d_type_str+'&d_val3='+d_acl_str, 'mef', 'editaltersecurity', 'html', 'GET', ''); } } // end of function saveSecurityData Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito… [iso-8859-1] Mon May 25 11:27:35 2009 @@ -163,7 +163,7 @@ // update Security details case 'altersecurity': - Entry::update($_GET['d_id'], $_GET['d_val'], $_GET['d_val2'], $_GET['d_val3'], $_GET['d_val4']=='true'); + Entry::update($_GET['d_id'], $_GET['d_val'], $_GET['d_val2'], $_GET['d_val3']); $this->show(); break; @@ -472,10 +472,10 @@ // Fields if ($mode == self::FIELDS) { - echo '<strong>Fields</strong>'; + echo '<strong>Text Fields</strong>'; } else { - echo '<span class="detailmenu" onclick="'."showEditorTabFields(".$this->rev_id.")".'">Fields</span>'; + echo '<span class="detailmenu" onclick="'."showEditorTabFields(".$this->rev_id.")".'">Text Fields</span>'; } } @@ -498,14 +498,17 @@ // Security if ($mode == self::SECURITY) { - echo '<strong>Security</strong>'; + echo '<strong>Entry</strong>'; } else { - echo '<span class="detailmenu" onclick="'."showEditorTabSecurity(".$this->rev_id.")".'">Security</span>'; - } - } - - echo_strip(' + echo '<span class="detailmenu" onclick="'."showEditorTabSecurity(".$this->rev_id.")".'">Entry</span>'; + } + } + + echo_strip(' + </div> + <div class="comment"> + Changes in details are applied as you click the button, there is no need to save another draft. </div> </div>'); Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/Entry.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/om/Entry.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/om/Entry.class.php [iso-8859-1] Mon May 25 11:27:35 2009 @@ -76,6 +76,11 @@ { $type_update = false; $name_update = false; + + // call old data types as array index to get the short version + $convert = array( + 'content'=>'cont', + 'script'=>'inc'); // get entry $stmt=&DBConnection::getInstance()->prepare("SELECT name, type, access_id FROM ".ROSCMST_ENTRIES." WHERE id = :data_id LIMIT 1"); @@ -89,47 +94,48 @@ } // update data type - if ($data_type != '' && $data_type != $data['type']) { + if (isset($convert[$type]) && $type != $data['type']) { $type_update = true; $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ENTRIES." SET type = :type_new WHERE id = :data_id LIMIT 1"); - $stmt->bindParam('type_new',$data_type,PDO::PARAM_STR); + $stmt->bindParam('type_new',$type,PDO::PARAM_STR); $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); $stmt->execute(); - Log::writeMedium('data-type changed: '.$data['type'].' => '.$data_type); - $new_data_type = $data_type; + Log::writeMedium('data-type changed: '.$data['type'].' => '.$type); + $new_type = $type; } // update data name - if ($data_name != '' && $data_name != $data['name']) { + if ($name != '' && $name != $data['name']) { $name_update = true; $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ENTRIES." SET name = :name_new WHERE id = :id LIMIT 1"); - $stmt->bindParam('name_new',$data_name,PDO::PARAM_STR); + $stmt->bindParam('name_new',$name,PDO::PARAM_STR); $stmt->bindParam('id',$data_id,PDO::PARAM_INT); $stmt->execute(); - - Log::writeMedium('data-name changed: '.$data['name'].' => '.$data_name); + Log::writeMedium('data-name changed: '.$data['name'].' => '.$name); + $new_name = $name; } // update dependent entries if ($type_update || $name_update) { - // call old data types as array index to get the short version - $convert = array( - 'content'=>'cont', - 'script'=>'inc'); // if the datatype has not changed, use the old one - if ($new_data_type == '') { - $new_data_type = $data['type']; + if (!isset($new_type)) { + $new_type = $data['type']; + } + + // if the dataname has not changed, use the old one + if (!isset($new_name)) { + $new_name = $data['name']; } // update text content with new name and or types $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_TEXT." SET content = REPLACE(content, :old_type_name, :new_type_name) WHERE content LIKE :search"); - $stmt->bindParam('search','%[#'.$convert[$data['type']].'_'.$data['name'].']%',PDO::PARAM_STR); - $stmt->bindParam('old_type_name','[#'.$convert[$data['type']].'_'.$data['name'].']',PDO::PARAM_STR); - $stmt->bindParam('new_type_name','[#'.$convert[$new_type_short].'_'.$data_name.']',PDO::PARAM_STR); + $stmt->bindValue('search','%[#'.$convert[$data['type']].'_'.$data['name'].']%',PDO::PARAM_STR); + $stmt->bindValue('old_type_name','[#'.$convert[$data['type']].'_'.$data['name'].']',PDO::PARAM_STR); + $stmt->bindValue('new_type_name','[#'.$convert[$new_type].'_'.$new_name.']',PDO::PARAM_STR); $stmt->execute(); Log::writeMedium('data-interlinks updated due data-name change'); @@ -138,19 +144,19 @@ // update page links if ($name_update && ($data['type'] == 'page' || $data['type'] == 'dynamic')) { $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_TEXT." SET content = REPLACE(content, :old_link, :new_link) WHERE content LIKE :search"); - $stmt->bindParam('search','%[#link_'.$data['name'].']%',PDO::PARAM_STR); - $stmt->bindParam('old_link','[#link_'.$data['name'].']',PDO::PARAM_STR); - $stmt->bindParam('new_link','[#link_'.$data_name.']',PDO::PARAM_STR); + $stmt->bindValue('search','%[#link_'.$data['name'].']%',PDO::PARAM_STR); + $stmt->bindValue('old_link','[#link_'.$data['name'].']',PDO::PARAM_STR); + $stmt->bindValue('new_link','[#link_'.$name.']',PDO::PARAM_STR); $stmt->execute(); } // change ACL - if ($data_acl != '' && $data_acl != $data['access_id']) { + if ($acl != '' && $acl != $data['access_id']) { $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ENTRIES." SET access_id = :acl_new WHERE id = :data_id LIMIT 1"); - $stmt->bindParam('acl_new',$data_acl); + $stmt->bindParam('acl_new',$acl); $stmt->bindParam('data_id',$data_id); $stmt->execute(); - Log::writeMedium('data-acl changed: '.$data['access_id'].' => '.$data_acl); + Log::writeMedium('data-acl changed: '.$data['access_id'].' => '.$acl); } } // end of member function update

1 0

[tkreuzer] 41106: MmGrowKernelStack: go back to the ASSERT and add a fixed check
by tkreuzer＠svn.reactos.org 25 May '09

25 May '09

Author: tkreuzer Date: Mon May 25 03:17:48 2009 New Revision: 41106 URL: http://svn.reactos.org/svn/reactos?rev=41106&view=rev Log: MmGrowKernelStack: go back to the ASSERT and add a fixed check Modified: trunk/reactos/ntoskrnl/mm/procsup.c Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Mon May 25 03:17:48 2009 @@ -258,11 +258,15 @@ { PETHREAD Thread = PsGetCurrentThread(); - /* Make sure we have reserved space for our grow */ - if (((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) > - (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)) - { - return STATUS_NO_MEMORY; + /* Make sure the stack did not overflow */ + ASSERT(((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) <= + (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)); + + /* Check if we have reserved space for our grow */ + if ((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit + + KERNEL_STACK_SIZE > KERNEL_LARGE_STACK_SIZE) + { + return STATUS_STACK_OVERFLOW; } /*

2 1

[jimtabor] 41109: - Move more printer functions.
by jimtabor＠svn.reactos.org 25 May '09

25 May '09

Author: jimtabor Date: Mon May 25 08:28:54 2009 New Revision: 41109 URL: http://svn.reactos.org/svn/reactos?rev=41109&view=rev Log: - Move more printer functions. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/printdrv.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon May 25 08:28:54 2009 @@ -1643,45 +1643,6 @@ return 0; } - -/* - * @unimplemented - */ -HANDLE -WINAPI -GdiGetSpoolFileHandle(LPWSTR pwszPrinterName, - LPDEVMODEW pDevmode, - LPWSTR pwszDocName) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GdiDeleteSpoolFileHandle(HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -DWORD -WINAPI -GdiGetPageCount(HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - /* * @unimplemented */ Modified: trunk/reactos/dll/win32/gdi32/objects/printdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pr… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/printdrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/printdrv.c [iso-8859-1] Mon May 25 08:28:54 2009 @@ -2,89 +2,6 @@ #define NDEBUG #include <debug.h> - -/* - * @unimplemented - */ -int -WINAPI -EndDoc( - HDC hdc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -int -WINAPI -StartDocW( - HDC hdc, - CONST DOCINFOW *a1 - ) -{ - return NtGdiStartDoc ( hdc, (DOCINFOW *)a1, NULL, 0); -} - -/* - * @unimplemented - */ -int -WINAPI -StartDocA( - HDC hdc, - CONST DOCINFOA *lpdi - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -int -WINAPI -StartPage( - HDC hdc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -int -WINAPI -EndFormPage(HDC hdc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -int -WINAPI -EndPage( - HDC hdc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - /* * @unimplemented @@ -136,6 +53,84 @@ return Ret; } +/* + * @unimplemented + */ +int +WINAPI +EndDoc( + HDC hdc + ) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +HANDLE +WINAPI +GdiGetSpoolFileHandle(LPWSTR pwszPrinterName, + LPDEVMODEW pDevmode, + LPWSTR pwszDocName) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GdiDeleteSpoolFileHandle(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +GdiGetPageCount(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/* + * @unimplemented + */ +int +WINAPI +EndFormPage(HDC hdc) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +int +WINAPI +EndPage( + HDC hdc + ) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} /* * @implemented @@ -177,4 +172,45 @@ return SP_ERROR; } - +/* + * @unimplemented + */ +int +WINAPI +StartDocW( + HDC hdc, + CONST DOCINFOW *a1 + ) +{ + return NtGdiStartDoc ( hdc, (DOCINFOW *)a1, NULL, 0); +} + +/* + * @unimplemented + */ +int +WINAPI +StartDocA( + HDC hdc, + CONST DOCINFOA *lpdi + ) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +int +WINAPI +StartPage( + HDC hdc + ) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} +

1 0

[jimtabor] 41108: - Move and add to print driver file for printing functions.
by jimtabor＠svn.reactos.org 25 May '09

25 May '09

Author: jimtabor Date: Mon May 25 08:22:03 2009 New Revision: 41108 URL: http://svn.reactos.org/svn/reactos?rev=41108&view=rev Log: - Move and add to print driver file for printing functions. Added: trunk/reactos/dll/win32/gdi32/objects/printdrv.c (with props) Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Mon May 25 08:22:03 2009 @@ -41,6 +41,7 @@ <file>linedda.c</file> <file>metafile.c</file> <file>painting.c</file> + <file>printdrv.c</file> <file>palette.c</file> <file>pen.c</file> <file>region.c</file> Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon May 25 08:22:03 2009 @@ -505,142 +505,6 @@ } /* - * @unimplemented - */ -int -WINAPI -EndDoc( - HDC hdc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -int -WINAPI -StartPage( - HDC hdc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -int -WINAPI -EndPage( - HDC hdc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -int -WINAPI -AbortDoc( - HDC hdc - ) -{ - PLDC pldc; - int Ret = SP_ERROR; - ULONG hType = GDI_HANDLE_GET_TYPE(hdc); - - if (hType == GDILoObjType_LO_DC_TYPE || hType == GDILoObjType_LO_METADC16_TYPE) - { - SetLastError(ERROR_INVALID_HANDLE); - return SP_ERROR; - } - pldc = GdiGetLDC(hdc); - if ( !pldc ) - { - SetLastError(ERROR_INVALID_HANDLE); - return SP_ERROR; - } - if ( !(pldc->Flags & LDC_INIT_DOCUMENT) ) return 1; - - /* winspool:DocumentEvent printer driver */ - - ((PW32CLIENTINFO)NtCurrentTeb()->Win32ClientInfo)->cSpins = 0; - - if ( pldc->Flags & LDC_META_PRINT) - { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return Ret; - } - - if (NtGdiAbortDoc(hdc)) - { - /* winspool:AbortPrinter driver */ - Ret = 1; - } - else - Ret = SP_ERROR; - - pldc->Flags &= ~(LDC_META_PRINT|LDC_STARTPAGE|LDC_INIT_PAGE|LDC_INIT_DOCUMENT|LDC_SAPCALLBACK); - - return Ret; -} - - -/* - * @implemented - */ -int -WINAPI -SetAbortProc( - HDC hdc, - ABORTPROC lpAbortProc) -{ - PLDC pldc; - ULONG hType = GDI_HANDLE_GET_TYPE(hdc); - - if (hType == GDILoObjType_LO_DC_TYPE || hType == GDILoObjType_LO_METADC16_TYPE) - return SP_ERROR; - - pldc = GdiGetLDC(hdc); - if ( pldc ) - { - if ( lpAbortProc ) - { - if ( pldc->Flags & LDC_INIT_DOCUMENT ) - { - pldc->Flags |= LDC_SAPCALLBACK; - pldc->CallBackTick = GetTickCount(); - } - } - else - { - pldc->Flags &= ~LDC_SAPCALLBACK; - } - pldc->pAbortProc = lpAbortProc; - return 1; - } - else - { - SetLastError(ERROR_INVALID_HANDLE); - } - return SP_ERROR; -} - -/* * @implemented */ BOOL @@ -1161,18 +1025,6 @@ BOOL WINAPI ColorCorrectPalette(HDC hDC,HPALETTE hPalette,DWORD dwFirstEntry,DWORD dwNumOfEntries) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -int -WINAPI -EndFormPage(HDC hdc) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c [iso-8859-1] Mon May 25 08:22:03 2009 @@ -34,23 +34,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - - -/* - * @unimplemented - */ -int -WINAPI -StartDocA( - HDC hdc, - CONST DOCINFOA *lpdi - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Mon May 25 08:22:03 2009 @@ -1266,20 +1266,6 @@ /* * @implemented */ -int -WINAPI -StartDocW( - HDC hdc, - CONST DOCINFOW *a1 - ) -{ - return NtGdiStartDoc ( hdc, (DOCINFOW *)a1, NULL, 0); -} - - -/* - * @implemented - */ DWORD WINAPI GetObjectType( Added: trunk/reactos/dll/win32/gdi32/objects/printdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pr… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/printdrv.c (added) +++ trunk/reactos/dll/win32/gdi32/objects/printdrv.c [iso-8859-1] Mon May 25 08:22:03 2009 @@ -1,0 +1,180 @@ +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +/* + * @unimplemented + */ +int +WINAPI +EndDoc( + HDC hdc + ) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +int +WINAPI +StartDocW( + HDC hdc, + CONST DOCINFOW *a1 + ) +{ + return NtGdiStartDoc ( hdc, (DOCINFOW *)a1, NULL, 0); +} + +/* + * @unimplemented + */ +int +WINAPI +StartDocA( + HDC hdc, + CONST DOCINFOA *lpdi + ) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +int +WINAPI +StartPage( + HDC hdc + ) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +int +WINAPI +EndFormPage(HDC hdc) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +int +WINAPI +EndPage( + HDC hdc + ) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/* + * @unimplemented + */ +int +WINAPI +AbortDoc( + HDC hdc + ) +{ + PLDC pldc; + int Ret = SP_ERROR; + ULONG hType = GDI_HANDLE_GET_TYPE(hdc); + + if (hType == GDILoObjType_LO_DC_TYPE || hType == GDILoObjType_LO_METADC16_TYPE) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + pldc = GdiGetLDC(hdc); + if ( !pldc ) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + if ( !(pldc->Flags & LDC_INIT_DOCUMENT) ) return 1; + + /* winspool:DocumentEvent printer driver */ + + ((PW32CLIENTINFO)NtCurrentTeb()->Win32ClientInfo)->cSpins = 0; + + if ( pldc->Flags & LDC_META_PRINT) + { + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return Ret; + } + + if (NtGdiAbortDoc(hdc)) + { + /* winspool:AbortPrinter driver */ + Ret = 1; + } + else + Ret = SP_ERROR; + + pldc->Flags &= ~(LDC_META_PRINT|LDC_STARTPAGE|LDC_INIT_PAGE|LDC_INIT_DOCUMENT|LDC_SAPCALLBACK); + + return Ret; +} + + +/* + * @implemented + */ +int +WINAPI +SetAbortProc( + HDC hdc, + ABORTPROC lpAbortProc) +{ + PLDC pldc; + ULONG hType = GDI_HANDLE_GET_TYPE(hdc); + + if (hType == GDILoObjType_LO_DC_TYPE || hType == GDILoObjType_LO_METADC16_TYPE) + return SP_ERROR; + + pldc = GdiGetLDC(hdc); + if ( pldc ) + { + if ( lpAbortProc ) + { + if ( pldc->Flags & LDC_INIT_DOCUMENT ) + { + pldc->Flags |= LDC_SAPCALLBACK; + pldc->CallBackTick = GetTickCount(); + } + } + else + { + pldc->Flags &= ~LDC_SAPCALLBACK; + } + pldc->pAbortProc = lpAbortProc; + return 1; + } + else + { + SetLastError(ERROR_INVALID_HANDLE); + } + return SP_ERROR; +} + + Propchange: trunk/reactos/dll/win32/gdi32/objects/printdrv.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/gdi32/objects/printdrv.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

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