Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[peterw] 28167: - Who swears in a manual? ;)

by peterw＠svn.reactos.org

Author: peterw Date: Sun Aug 5 05:42:13 2007 New Revision: 28167 URL: http://svn.reactos.org/svn/reactos?rev=28167&view=rev Log: - Who swears in a manual? ;) Modified: trunk/tools/RosBE-Windows/Documentation/files/howto.html Modified: trunk/tools/RosBE-Windows/Documentation/files/howto.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/howto.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/howto.html Sun Aug 5 05:42:13 2007 @@ -52,7 +52,7 @@ <li> </li> <li title="Question"> - Q: My Source Tree is fucked up / Updating was aborted etc. etc. and now + Q: My Source Tree seems corrupted / Updating was aborted etc. etc. and now I cannot update it anymore... What to do? </li> <li title="Answer">

17 years, 4 months

[jimtabor] 28166: Removed non Enh Metafile stubs from win32k: - Updated ntgdibad.h. - List of known functions: NtGidConvertMetafileRect NtGdiCreateMetafileDC NtGdiCreateServerMetaFile NtGdiGetServerMetaFileBits NtGdiSetMetaRgn - No updates for Enh Metafile.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Aug 5 02:02:39 2007 New Revision: 28166 URL: http://svn.reactos.org/svn/reactos?rev=28166&view=rev Log: Removed non Enh Metafile stubs from win32k: - Updated ntgdibad.h. - List of known functions: NtGidConvertMetafileRect NtGdiCreateMetafileDC NtGdiCreateServerMetaFile NtGdiGetServerMetaFileBits NtGdiSetMetaRgn - No updates for Enh Metafile. Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/metafile.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sun Aug 5 02:02:39 2007 @@ -125,13 +125,6 @@ HDC hDC ); -/* Metafiles are user mode */ -HMETAFILE -STDCALL -NtGdiCloseMetaFile ( - HDC hDC - ); - /* Does not exist */ BOOL STDCALL @@ -144,14 +137,6 @@ STDCALL NtGdiCopyEnhMetaFile ( HENHMETAFILE Src, - LPCWSTR File - ); - -/* Metafiles are user mode */ -HMETAFILE -STDCALL -NtGdiCopyMetaFile ( - HMETAFILE Src, LPCWSTR File ); @@ -177,13 +162,6 @@ LPCWSTR Description ); -/* Metafiles are user mode */ -HDC -STDCALL -NtGdiCreateMetaFile ( - LPCWSTR File - ); - /* Use NtGdiCreatePaletteInternal with palNumEntries at the end. */ HPALETTE STDCALL @@ -220,13 +198,6 @@ STDCALL NtGdiDeleteEnhMetaFile ( HENHMETAFILE emf - ); - -/* Meta are user-mode. */ -BOOL -STDCALL -NtGdiDeleteMetaFile ( - HMETAFILE mf ); /* Should be done in user-mode. */ @@ -257,16 +228,6 @@ NtGdiEnumICMProfiles(HDC hDC, LPWSTR lpstrBuffer, UINT cch ); - -/* Meta are user-mode. */ -BOOL -STDCALL -NtGdiEnumMetaFile ( - HDC hDC, - HMETAFILE mf, - MFENUMPROC MetaFunc, - LPARAM lParam - ); /* Should be done in user-mode. */ INT @@ -483,30 +444,6 @@ /* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetMapMode(HDC hDC); -/* Meta files are user-mode. */ -HMETAFILE -STDCALL -NtGdiGetMetaFile ( - LPCWSTR MetaFile - ); - -/* Meta files are user-mode. */ -UINT -STDCALL -NtGdiGetMetaFileBitsEx ( - HMETAFILE hmf, - UINT Size, - LPVOID Data - ); - -/* Meta files are user-mode. */ -int -STDCALL -NtGdiGetMetaRgn ( - HDC hDC, - HRGN hrgn - ); - /* Use NtGdiDoPalette with GdiPalGetEntries. */ UINT STDCALL @@ -565,17 +502,6 @@ /* Needs to be done in user-mode. */ BOOL STDCALL NtGdiGetViewportOrgEx(HDC hDC, LPPOINT viewportOrg); - -/* Metafiles are user-mode. */ -UINT -STDCALL -NtGdiGetWinMetaFileBits ( - HENHMETAFILE hemf, - UINT BufSize, - LPBYTE Buffer, - INT MapMode, - HDC Ref - ); /* Needs to be done in user-mode. */ BOOL STDCALL NtGdiGetWindowExtEx(HDC hDC, LPSIZE windowExt); @@ -664,24 +590,6 @@ LPHANDLETABLE Handletable, CONST ENHMETARECORD * EnhMetaRecord, UINT Handles - ); - -/* Metafiles are user-mode. */ -BOOL -STDCALL -NtGdiPlayMetaFile ( - HDC hDC, - HMETAFILE hmf - ); - -/* Metafiles are user-mode. */ -BOOL -STDCALL -NtGdiPlayMetaFileRecord ( - HDC hDC, - LPHANDLETABLE Handletable, - LPMETARECORD MetaRecord, - UINT Handles ); /* Use NtGdiPolyPolyDraw with GdiPolyBezier. */ @@ -893,13 +801,6 @@ NtGdiSetMapperFlags(HDC hDC, DWORD Flag); -/* Metafiles are user-mode. */ -HMETAFILE -STDCALL -NtGdiSetMetaFileBitsEx ( - UINT Size, - CONST PBYTE Data - ); /* Use NtGdiDoPalette with GdiPalSetEntries, TRUE. */ UINT Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/metafile.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c Sun Aug 5 02:02:39 2007 @@ -255,14 +255,6 @@ return hmf; } -HMETAFILE -STDCALL -NtGdiCloseMetaFile(HDC hDC) -{ - UNIMPLEMENTED; - return 0; -} - HENHMETAFILE STDCALL NtGdiCopyEnhMetaFile(HENHMETAFILE Src, @@ -272,14 +264,6 @@ return 0; } -HMETAFILE -STDCALL -NtGdiCopyMetaFile(HMETAFILE Src, - LPCWSTR File) -{ - UNIMPLEMENTED; - return 0; -} // // // Rewrite is in progress, this function is subject to change at any time. @@ -487,28 +471,9 @@ return ret; } - - - -HDC -STDCALL -NtGdiCreateMetaFile(LPCWSTR File) -{ - UNIMPLEMENTED; - return 0; -} - BOOL STDCALL NtGdiDeleteEnhMetaFile(HENHMETAFILE emf) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -NtGdiDeleteMetaFile(HMETAFILE mf) { UNIMPLEMENTED; return FALSE; @@ -528,17 +493,6 @@ BOOL STDCALL -NtGdiEnumMetaFile(HDC hDC, - HMETAFILE mf, - MFENUMPROC MetaFunc, - LPARAM lParam) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL NtGdiGdiComment(HDC hDC, UINT Size, CONST LPBYTE Data) @@ -590,36 +544,6 @@ NtGdiGetEnhMetaFilePaletteEntries(HENHMETAFILE hemf, UINT Entries, LPPALETTEENTRY pe) -{ - UNIMPLEMENTED; - return 0; -} - -HMETAFILE -STDCALL -NtGdiGetMetaFile(LPCWSTR MetaFile) -{ - UNIMPLEMENTED; - return 0; -} - -UINT -STDCALL -NtGdiGetMetaFileBitsEx(HMETAFILE hmf, - UINT Size, - LPVOID Data) -{ - UNIMPLEMENTED; - return 0; -} - -UINT -STDCALL -NtGdiGetWinMetaFileBits(HENHMETAFILE hemf, - UINT BufSize, - LPBYTE Buffer, - INT MapMode, - HDC Ref) { UNIMPLEMENTED; return 0; @@ -646,26 +570,6 @@ return FALSE; } -BOOL -STDCALL -NtGdiPlayMetaFile(HDC hDC, - HMETAFILE hmf) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -NtGdiPlayMetaFileRecord(HDC hDC, - LPHANDLETABLE Handletable, - LPMETARECORD MetaRecord, - UINT Handles) -{ - UNIMPLEMENTED; - return FALSE; -} - HENHMETAFILE STDCALL NtGdiSetEnhMetaFileBits(UINT BufSize, @@ -675,25 +579,4 @@ return 0; } -HMETAFILE -STDCALL -NtGdiSetMetaFileBitsEx(UINT Size, - CONST PBYTE Data) -{ - UNIMPLEMENTED; - return 0; -} - -HENHMETAFILE -STDCALL -NtGdiSetWinMetaFileBits(UINT BufSize, - CONST PBYTE Buffer, - HDC Ref, -// CONST METAFILEPICT *mfp) - PVOID mfp) -{ - UNIMPLEMENTED; - return 0; -} - /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sun Aug 5 02:02:39 2007 @@ -11,12 +11,10 @@ NtGdiCancelDC 1 NtGdiCloseEnhMetaFile 1 NtGdiCloseFigure 1 -NtGdiCloseMetaFile 1 NtGdiColorMatchToTarget 3 NtGdiCombineRgn 4 NtGdiCombineTransform 3 NtGdiCopyEnhMetaFile 2 -NtGdiCopyMetaFile 2 NtGdiCreateBitmap 5 NtGdiCreateClientObj 1 NtGdiCreateColorSpace 1 @@ -29,7 +27,6 @@ NtGdiCreateEnhMetaFile 4 NtGdiCreateHalftonePalette 1 NtGdiCreateHatchBrushInternal 3 -NtGdiCreateMetaFile 1 NtGdiCreatePalette 1 NtGdiCreatePatternBrushInternal 3 NtGdiCreatePen 4 @@ -44,7 +41,6 @@ NtGdiDeleteColorSpace 1 NtGdiDeleteObjectApp 1 NtGdiDeleteEnhMetaFile 1 -NtGdiDeleteMetaFile 1 NtGdiDeleteObject 1 NtGdiDescribePixelFormat 4 #NtGdiDeviceCapabilitiesEx ? @@ -56,7 +52,6 @@ NtGdiEnumEnhMetaFile 5 NtGdiEnumFonts 4 NtGdiEnumICMProfiles 3 -NtGdiEnumMetaFile 4 NtGdiEnumObjects 4 NtGdiEqualRgn 2 NtGdiEscape 5 @@ -120,9 +115,6 @@ NtGdiGetKerningPairs 3 NtGdiGetLogColorSpace 3 NtGdiGetMapMode 1 -NtGdiGetMetaFile 1 -NtGdiGetMetaFileBitsEx 3 -NtGdiGetMetaRgn 2 NtGdiGetMiterLimit 2 NtGdiGetNearestColor 2 NtGdiGetNearestPaletteIndex 2 @@ -153,7 +145,6 @@ NtGdiGetTextMetricsW 3 NtGdiGetViewportExtEx 2 NtGdiGetViewportOrgEx 2 -NtGdiGetWinMetaFileBits 5 NtGdiGetWindowExtEx 2 NtGdiGetWindowOrgEx 2 NtGdiGetWorldTransform 2 @@ -177,8 +168,6 @@ NtGdiPie 9 NtGdiPlayEnhMetaFile 3 NtGdiPlayEnhMetaFileRecord 4 -NtGdiPlayMetaFile 2 -NtGdiPlayMetaFileRecord 4 NtGdiPlgBlt 11 NtGdiPolyBezier 3 NtGdiPolyBezierTo 3 @@ -232,7 +221,6 @@ NtGdiSetICMProfile 2 NtGdiSetMapMode 2 NtGdiSetMapperFlags 2 -NtGdiSetMetaFileBitsEx 2 NtGdiSetMetaRgn 1 NtGdiSetMiterLimit 3 NtGdiSetPaletteEntries 4 @@ -250,7 +238,6 @@ NtGdiSetTextJustification 3 NtGdiSetViewportExtEx 4 NtGdiSetViewportOrgEx 4 -#NtGdiSetWinMetaFileBits 1 NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 NtGdiSetWorldTransform 2

17 years, 4 months

[jimtabor] 28165: Copy Metafile.c to EnhMFile.c. Separating the code.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Aug 5 01:02:55 2007 New Revision: 28165 URL: http://svn.reactos.org/svn/reactos?rev=28165&view=rev Log: Copy Metafile.c to EnhMFile.c. Separating the code. Added: trunk/reactos/dll/win32/gdi32/objects/enhmfile.c - copied, changed from r28161, trunk/reactos/dll/win32/gdi32/objects/metafile.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/objects/metafile.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 (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Sun Aug 5 01:02:55 2007 @@ -31,6 +31,7 @@ <file>bitmap.c</file> <file>brush.c</file> <file>dc.c</file> + <file>enhmfile.c</file> <file>font.c</file> <file>linedda.c</file> <file>metafile.c</file> Copied: trunk/reactos/dll/win32/gdi32/objects/enhmfile.c (from r28161, trunk/reactos/dll/win32/gdi32/objects/metafile.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/metafile.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/enhmfile.c Sun Aug 5 01:02:55 2007 @@ -11,127 +11,8 @@ return NtGdiCloseEnhMetaFile(hdc); } -/* - * @implemented - */ -HMETAFILE -STDCALL -CopyMetaFileW( - HMETAFILE hmfSrc, - LPCWSTR lpszFile - ) -{ - return NtGdiCopyMetaFile (hmfSrc, lpszFile); -} - - -/* - * @implemented - */ -HMETAFILE -STDCALL -CopyMetaFileA( - HMETAFILE hmfSrc, - LPCSTR lpszFile - ) -{ - NTSTATUS Status; - PWSTR lpszFileW; - HMETAFILE rc = 0; - - Status = HEAP_strdupA2W ( &lpszFileW, lpszFile ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); - else - { - rc = NtGdiCopyMetaFile ( hmfSrc, lpszFileW ); - - HEAP_free ( lpszFileW ); - } - - return rc; -} - - -/* - * @implemented - */ -HDC -STDCALL -CreateMetaFileW( - LPCWSTR lpszFile - ) -{ - return NtGdiCreateMetaFile ( lpszFile ); -} - - -/* - * @implemented - */ -HDC -STDCALL -CreateMetaFileA( - LPCSTR lpszFile - ) -{ - NTSTATUS Status; - PWSTR lpszFileW; - HDC rc = 0; - - Status = HEAP_strdupA2W ( &lpszFileW, lpszFile ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); - else - { - rc = NtGdiCreateMetaFile ( lpszFileW ); - - HEAP_free ( lpszFileW ); - } - return rc; -} - - -/* - * @implemented - */ -HMETAFILE -STDCALL -GetMetaFileW( - LPCWSTR lpszMetaFile - ) -{ - return NtGdiGetMetaFile ( lpszMetaFile ); -} - - -/* - * @implemented - */ -HMETAFILE -STDCALL -GetMetaFileA( - LPCSTR lpszMetaFile - ) -{ - NTSTATUS Status; - LPWSTR lpszMetaFileW; - HMETAFILE rc = 0; - - Status = HEAP_strdupA2W ( &lpszMetaFileW, lpszMetaFile ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); - else - { - rc = NtGdiGetMetaFile ( lpszMetaFileW ); - - HEAP_free ( lpszMetaFileW ); - } - - return rc; -} - -#if 0 + +#if 0 // Remove once new EnhMetaFile support is implemented. HDC WINAPI CreateEnhMetaFileW( HDC hDC, /* [in] optional reference DC */ Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/me… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/metafile.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/metafile.c Sun Aug 5 01:02:55 2007 @@ -1,15 +1,5 @@ #include "precomp.h" -/* - * @unimplemented - */ -HENHMETAFILE -STDCALL -CloseEnhMetaFile( - HDC hdc) -{ - return NtGdiCloseEnhMetaFile(hdc); -} /* * @implemented @@ -21,7 +11,7 @@ LPCWSTR lpszFile ) { - return NtGdiCopyMetaFile (hmfSrc, lpszFile); + return NULL; } @@ -44,8 +34,8 @@ SetLastError (RtlNtStatusToDosError(Status)); else { - rc = NtGdiCopyMetaFile ( hmfSrc, lpszFileW ); + rc = NULL; HEAP_free ( lpszFileW ); } @@ -62,7 +52,7 @@ LPCWSTR lpszFile ) { - return NtGdiCreateMetaFile ( lpszFile ); + return NULL; } @@ -84,7 +74,7 @@ SetLastError (RtlNtStatusToDosError(Status)); else { - rc = NtGdiCreateMetaFile ( lpszFileW ); + rc = NULL; HEAP_free ( lpszFileW ); } @@ -101,7 +91,7 @@ LPCWSTR lpszMetaFile ) { - return NtGdiGetMetaFile ( lpszMetaFile ); + return NULL; } @@ -123,7 +113,7 @@ SetLastError (RtlNtStatusToDosError(Status)); else { - rc = NtGdiGetMetaFile ( lpszMetaFileW ); + rc = NULL; HEAP_free ( lpszMetaFileW ); } @@ -131,341 +121,4 @@ return rc; } -#if 0 -HDC WINAPI CreateEnhMetaFileW( - HDC hDC, /* [in] optional reference DC */ - LPCWSTR filename, /* [in] optional filename for disk metafiles */ - const RECT* rect, /* [in] optional bounding rectangle */ - LPCWSTR description /* [in] optional description */ - ) -{ - HDC mDC; - PDC_ATTR Dc_Attr; - PLDC pLDC; - HANDLE hFile; - PENHMETAFILE EmfDC; - DWORD size = 0, length = 0; - - mDC = NtGdiCreateMetafileDC( hDC ); // Basically changes the handle from 1xxxx to 46xxxx. - // If hDC == NULL, works just like createdc in win32k. - - if ( !GdiGetHandleUserData((HGDIOBJ) mDC, (PVOID) &Dc_Attr)) - { - SetLastError (ERROR_INVALID_PARAMETER); - return NULL; // need to delete the handle? - } - - pLDC = LocalAlloc(LMEM_ZEROINIT, sizeof(LDC)); - - Dc_Attr->pvLDC = pLDC; - pLDC->hDC = mDC; - pLDC->iType = LDC_EMFDC - - - if (description) - { /* App name\0Title\0\0 */ - length = lstrlenW(description); - length += lstrlenW(description + length + 1); - length += 3; - length *= 2; - } - - size = sizeof(ENHMETAFILE) + (length + 3) / 4 * 4; - - //Allocate ENHMETAFILE structure - EmfDC = LocalAlloc(LMEM_ZEROINIT, sizeof(ENHMETAFILE)); - pLDC->pvEmfDC = EmfDC; - - EmfDC->handles_size = HANDLE_LIST_INC; - EmfDC->cur_handles = 1; - - EmfDC->horzres = GetDeviceCaps(mDC, HORZRES); - EmfDC->vertres = GetDeviceCaps(mDC, VERTRES); - EmfDC->logpixelsx = GetDeviceCaps(mDC, LOGPIXELSX); - EmfDC->logpixelsy = GetDeviceCaps(mDC, LOGPIXELSY); - EmfDC->horzsize = GetDeviceCaps(mDC, HORZSIZE); - EmfDC->vertsize = GetDeviceCaps(mDC, VERTSIZE); - EmfDC->bitspixel = GetDeviceCaps(mDC, BITSPIXEL); - EmfDC->textcaps = GetDeviceCaps(mDC, TEXTCAPS); - EmfDC->rastercaps = GetDeviceCaps(mDC, RASTERCAPS); - EmfDC->technology = GetDeviceCaps(mDC, TECHNOLOGY); - EmfDC->planes = GetDeviceCaps(mDC, PLANES); - - EmfDC->emf = LocalAlloc(LMEM_ZEROINIT, size); - - EmfDC->emf->iType = EMR_HEADER; - EmfDC->emf->nSize = size; - - EmfDC->emf->rclBounds.left = EmfDC->emf->rclBounds.top = 0; - EmfDC->emf->rclBounds.right = EmfDC->emf->rclBounds.bottom = -1; - - if(rect) - { - EmfDC->emf->rclFrame.left = rect->left; - EmfDC->emf->rclFrame.top = rect->top; - EmfDC->emf->rclFrame.right = rect->right; - EmfDC->emf->rclFrame.bottom = rect->bottom; - } - else - { /* Set this to {0,0 - -1,-1} and update it at the end */ - EmfDC->emf->rclFrame.left = EmfDC->emf->rclFrame.top = 0; - EmfDC->emf->rclFrame.right = EmfDC->emf->rclFrame.bottom = -1; - } - - EmfDC->emf->dSignature = ENHMETA_SIGNATURE; - EmfDC->emf->nVersion = 0x10000; - EmfDC->emf->nBytes = pLDC->pvEmfDC->nSize; - EmfDC->emf->nRecords = 1; - EmfDC->emf->nHandles = 1; - - EmfDC->emf->sReserved = 0; /* According to docs, this is reserved and must be 0 */ - EmfDC->emf->nDescription = length / 2; - - EmfDC->emf->offDescription = length ? sizeof(ENHMETAHEADER) : 0; - - EmfDC->emf->nPalEntries = 0; /* I guess this should start at 0 */ - - /* Size in pixels */ - EmfDC->emf->szlDevice.cx = EmfDC->horzres; - EmfDC->emf->szlDevice.cy = EmfDC->vertres; - - /* Size in millimeters */ - EmfDC->emf->szlMillimeters.cx = EmfDC->horzsize; - EmfDC->emf->szlMillimeters.cy = EmfDC->vertsize; - - /* Size in micrometers */ - EmfDC->emf->szlMicrometers.cx = EmfDC->horzsize * 1000; - EmfDC->emf->szlMicrometers.cy = EmfDC->vertsize * 1000; - - RtlCopyMemory((char *)EmfDC->emf + sizeof(ENHMETAHEADER), description, length); - - if (filename) /* disk based metafile */ - { - if ((hFile = CreateFileW(filename, GENERIC_WRITE | GENERIC_READ, 0, - NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) - { - EMFDRV_DeleteDC( EmfDC ); - return NULL; - } - if (!WriteFile( hFile, (LPSTR)EmfDC->emf, size, NULL, NULL )) - { - EMFDRV_DeleteDC( EmfDC ); - return NULL; - } - EmfDC.hFile = hFile; - EmfDC.iType = METAFILE_DISK; - } - else - EmfDC.iType = METAFILE_MEMORY; - - return mDC; -} -#endif - -/* - * @implemented - */ -HENHMETAFILE -STDCALL -CopyEnhMetaFileW( - HENHMETAFILE hemfSrc, - LPCWSTR lpszFile - ) -{ - return NtGdiCopyEnhMetaFile ( hemfSrc, lpszFile ); -} - - -/* - * @implemented - */ -HENHMETAFILE -STDCALL -CopyEnhMetaFileA( - HENHMETAFILE hemfSrc, - LPCSTR lpszFile - ) -{ - NTSTATUS Status; - LPWSTR lpszFileW; - HENHMETAFILE rc = 0; - - Status = HEAP_strdupA2W ( &lpszFileW, lpszFile ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); - else - { - rc = NtGdiCopyEnhMetaFile ( hemfSrc, lpszFileW ); - - HEAP_free ( lpszFileW ); - } - return rc; -} - - -/* - * @implemented - */ -HDC -STDCALL -CreateEnhMetaFileW( - HDC hdcRef, - LPCWSTR lpFileName, - CONST RECT *lpRect, - LPCWSTR lpDescription - ) -{ - return NtGdiCreateEnhMetaFile ( hdcRef, lpFileName, (CONST LPRECT)lpRect, lpDescription ); -} - - -/* - * @implemented - */ -HDC -STDCALL -CreateEnhMetaFileA( - HDC hdcRef, - LPCSTR lpFileName, - CONST RECT *lpRect, - LPCSTR lpDescription - ) -{ - NTSTATUS Status; - LPWSTR lpFileNameW, lpDescriptionW; - HDC rc = 0; - - lpFileNameW = NULL; - if (lpFileName != NULL) - { - Status = HEAP_strdupA2W ( &lpFileNameW, lpFileName ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); - - return rc; - } - - lpDescriptionW = NULL; - if (lpDescription != NULL) - { - Status = HEAP_strdupA2W ( &lpDescriptionW, lpDescription ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); - - return rc; - } - - rc = NtGdiCreateEnhMetaFile (hdcRef, lpFileNameW, (CONST LPRECT)lpRect, lpDescriptionW ); - - if (lpDescriptionW != NULL) - HEAP_free ( lpDescriptionW ); - - if (lpFileNameW != NULL) - HEAP_free ( lpFileNameW ); - - return rc; -} - -/* - * @implemented - */ -HENHMETAFILE -STDCALL -GetEnhMetaFileW( - LPCWSTR lpszMetaFile - ) -{ - return NtGdiGetEnhMetaFile ( lpszMetaFile ); -} - - -/* - * @implemented - */ -HENHMETAFILE -STDCALL -GetEnhMetaFileA( - LPCSTR lpszMetaFile - ) -{ - NTSTATUS Status; - LPWSTR lpszMetaFileW; - HENHMETAFILE rc = 0; - - Status = HEAP_strdupA2W ( &lpszMetaFileW, lpszMetaFile ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); - else - { - rc = NtGdiGetEnhMetaFile ( lpszMetaFileW ); - - HEAP_free ( lpszMetaFileW ); - } - - return rc; -} - - -/* - * @implemented - */ -UINT -STDCALL -GetEnhMetaFileDescriptionW( - HENHMETAFILE hemf, - UINT cchBuffer, - LPWSTR lpszDescription - ) -{ - return NtGdiGetEnhMetaFileDescription ( hemf, cchBuffer, lpszDescription ); -} - - -/* - * @implemented - */ -UINT -STDCALL -GetEnhMetaFileDescriptionA( - HENHMETAFILE hemf, - UINT cchBuffer, - LPSTR lpszDescription - ) -{ - NTSTATUS Status; - LPWSTR lpszDescriptionW; - UINT rc; - - if ( lpszDescription && cchBuffer ) - { - lpszDescriptionW = (LPWSTR)HEAP_alloc ( cchBuffer*sizeof(WCHAR) ); - if ( !lpszDescriptionW ) - { - SetLastError (RtlNtStatusToDosError(STATUS_NO_MEMORY)); - return 0; - } - } - else - lpszDescriptionW = NULL; - - rc = NtGdiGetEnhMetaFileDescription ( hemf, cchBuffer, lpszDescriptionW ); - - if ( lpszDescription && cchBuffer ) - { - Status = RtlUnicodeToMultiByteN ( lpszDescription, - cchBuffer, - NULL, - lpszDescriptionW, - cchBuffer ); - HEAP_free ( lpszDescriptionW ); - if ( !NT_SUCCESS(Status) ) - { - SetLastError (RtlNtStatusToDosError(Status)); - return 0; - } - } - - return rc; -} -

17 years, 4 months

[dreimer] 28164: revert some accidently commited changes in my tree.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Aug 5 00:51:54 2007 New Revision: 28164 URL: http://svn.reactos.org/svn/reactos?rev=28164&view=rev Log: revert some accidently commited changes in my tree. Modified: trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Sun Aug 5 00:51:54 2007 @@ -28,9 +28,6 @@ <directory name="cards"> <xi:include href="cards/cards.rbuild" /> </directory> -<directory name="cardsbav"> - <xi:include href="cardsbav/cardsbav.rbuild" /> -</directory> <directory name="cfgmgr32"> <xi:include href="cfgmgr32/cfgmgr32.rbuild" /> </directory>

17 years, 4 months

[mbosma] 28163: Reverted changes from r25949 and r25951 on request from author.

by mbosma＠svn.reactos.org

Author: mbosma Date: Sun Aug 5 00:23:18 2007 New Revision: 28163 URL: http://svn.reactos.org/svn/reactos?rev=28163&view=rev Log: Reverted changes from r25949 and r25951 on request from author. Modified: branches/cache_manager_rewrite/Instructions.txt branches/cache_manager_rewrite/mm/freelist.c branches/cache_manager_rewrite/mm/mminit.c branches/cache_manager_rewrite/mm/pageop.c branches/cache_manager_rewrite/mm/rmap.c branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/Instructions.txt URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/Instructi… ============================================================================== --- branches/cache_manager_rewrite/Instructions.txt (original) +++ branches/cache_manager_rewrite/Instructions.txt Sun Aug 5 00:23:18 2007 @@ -1,2 +1,2 @@ To build this branch apply the patch to trunk. And replace ntoskrnl/mm, ntoskrnl/cc with the folders from here. -This branch currently applies against: 0.3.1 branch - r25940 +This branch currently applies against: r25313 Modified: branches/cache_manager_rewrite/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/freeli… ============================================================================== --- branches/cache_manager_rewrite/mm/freelist.c (original) +++ branches/cache_manager_rewrite/mm/freelist.c Sun Aug 5 00:23:18 2007 @@ -479,9 +479,7 @@ MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[j].Flags.Zero = 0; MmPageArray[j].Flags.Consumer = MC_NPPOOL; - /* Reference count 2, because we're having ReferenceCount track - MapCount as well. */ - MmPageArray[j].ReferenceCount = 2; + MmPageArray[j].ReferenceCount = 1; MmPageArray[j].MapCount = 1; InsertTailList(&UsedPageListHeads[MC_NPPOOL], &MmPageArray[j].ListEntry); @@ -521,7 +519,7 @@ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Zero = 0; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 2; + MmPageArray[i].ReferenceCount = 1; MmPageArray[i].MapCount = 1; InsertTailList(&UsedPageListHeads[MC_NPPOOL], &MmPageArray[i].ListEntry); @@ -590,7 +588,6 @@ KEBUGCHECK(0); } MmPageArray[Pfn].MapCount++; - MmPageArray[Pfn].ReferenceCount++; KeReleaseSpinLock(&PageListLock, oldIrql); } } @@ -615,7 +612,6 @@ KEBUGCHECK(0); } MmPageArray[Pfn].MapCount--; - MmPageArray[Pfn].ReferenceCount--; KeReleaseSpinLock(&PageListLock, oldIrql); } } Modified: branches/cache_manager_rewrite/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mminit… ============================================================================== --- branches/cache_manager_rewrite/mm/mminit.c (original) +++ branches/cache_manager_rewrite/mm/mminit.c Sun Aug 5 00:23:18 2007 @@ -485,7 +485,7 @@ /* * Initialise the modified page writer. */ - if (!strstr(KeLoaderBlock->LoadOptions, "MININT")) MmInitMpwThread(); + MmInitMpwThread(); /* FIXME: Read parameters from memory */ MmInitSectionImplementation2(); Modified: branches/cache_manager_rewrite/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pageop… ============================================================================== --- branches/cache_manager_rewrite/mm/pageop.c (original) +++ branches/cache_manager_rewrite/mm/pageop.c Sun Aug 5 00:23:18 2007 @@ -48,7 +48,7 @@ } if (PageOp->MArea) { - (void)InterlockedDecrementUL(&PageOp->MArea->PageOpCount); + InterlockedDecrementUL(&PageOp->MArea->PageOpCount); } PrevPageOp = MmPageOpHashTable[PageOp->Hash]; if (PrevPageOp == PageOp) Modified: branches/cache_manager_rewrite/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/rmap.c… ============================================================================== --- branches/cache_manager_rewrite/mm/rmap.c (original) +++ branches/cache_manager_rewrite/mm/rmap.c Sun Aug 5 00:23:18 2007 @@ -415,7 +415,7 @@ if (MmGetPfnForProcess(Process, Address) != Page) { DPRINT1("Insert rmap (%d, 0x%.8X) 0x%.8X which doesn't match physical " - "address 0x%.8X\n", Process->UniqueProcessId, Address, + "address 0x%.8X\n", Process ? Process->UniqueProcessId : 0, Address, MmGetPfnForProcess(Process, Address) << PAGE_SHIFT, Page << PAGE_SHIFT); KEBUGCHECK(0); @@ -492,7 +492,7 @@ } if (Process) { - (void)InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); + InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); } } } @@ -528,7 +528,7 @@ } if (Process) { - (void)InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); + InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); } return; } Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Sun Aug 5 00:23:18 2007 @@ -3281,7 +3281,6 @@ ObjectTypeInitializer.GenericMapping = MmpSectionMapping; ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection; ObjectTypeInitializer.CloseProcedure = MmpCloseSection; - ObjectTypeInitializer.ValidAccessMask = SECTION_ALL_ACCESS; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType); InitializeListHead(&ImageSectionObjectListHead);

17 years, 4 months

[dreimer] 28162: Add 8 new Backgrounds to cards.dll. thx to Mario Kacmar (kario@szm.sk) (Bug 2416)

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Aug 5 00:13:19 2007 New Revision: 28162 URL: http://svn.reactos.org/svn/reactos?rev=28162&view=rev Log: Add 8 new Backgrounds to cards.dll. thx to Mario Kacmar (kario(a)szm.sk) (Bug 2416) Added: trunk/reactos/dll/win32/cards/res/Background_10.bmp (with props) trunk/reactos/dll/win32/cards/res/Background_11.bmp (with props) trunk/reactos/dll/win32/cards/res/Background_12.bmp (with props) trunk/reactos/dll/win32/cards/res/Background_5.bmp (with props) trunk/reactos/dll/win32/cards/res/Background_6.bmp (with props) trunk/reactos/dll/win32/cards/res/Background_7.bmp (with props) trunk/reactos/dll/win32/cards/res/Background_8.bmp (with props) trunk/reactos/dll/win32/cards/res/Background_9.bmp (with props) Modified: trunk/reactos/dll/win32/cards/cards.rc trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/dll/win32/cards/cards.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rc?r… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rc (original) +++ trunk/reactos/dll/win32/cards/cards.rc Sun Aug 5 00:13:19 2007 @@ -85,14 +85,14 @@ 55 BITMAP "res/Background_2.bmp" 56 BITMAP "res/Background_3.bmp" 57 BITMAP "res/Background_4.bmp" -58 BITMAP "res/Background_1.bmp" -59 BITMAP "res/Background_1.bmp" -60 BITMAP "res/Background_1.bmp" -61 BITMAP "res/Background_1.bmp" -62 BITMAP "res/Background_1.bmp" -63 BITMAP "res/Background_1.bmp" -64 BITMAP "res/Background_1.bmp" -65 BITMAP "res/Background_1.bmp" +58 BITMAP "res/Background_5.bmp" +59 BITMAP "res/Background_6.bmp" +60 BITMAP "res/Background_7.bmp" +61 BITMAP "res/Background_8.bmp" +62 BITMAP "res/Background_9.bmp" +63 BITMAP "res/Background_10.bmp" +64 BITMAP "res/Background_11.bmp" +65 BITMAP "res/Background_12.bmp" 66 BITMAP "res/Joker.bmp" 67 BITMAP "res/XSign.bmp" 68 BITMAP "res/OSign.bmp" Added: trunk/reactos/dll/win32/cards/res/Background_10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/Background_10.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/Background_11.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/Background_11.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/Background_12.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/Background_12.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/Background_5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/Background_5.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/Background_6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/Background_6.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/Background_7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/Background_7.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/Background_8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/Background_8.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/Background_9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/Background_9.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Sun Aug 5 00:13:19 2007 @@ -28,6 +28,9 @@ <directory name="cards"> <xi:include href="cards/cards.rbuild" /> </directory> +<directory name="cardsbav"> + <xi:include href="cardsbav/cardsbav.rbuild" /> +</directory> <directory name="cfgmgr32"> <xi:include href="cfgmgr32/cfgmgr32.rbuild" /> </directory>

17 years, 4 months

[tkreuzer] 28161: small bugfix

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Aug 4 20:51:10 2007 New Revision: 28161 URL: http://svn.reactos.org/svn/reactos?rev=28161&view=rev Log: small bugfix Modified: trunk/rostests/apitests/apitest.c trunk/rostests/apitests/w32knapi/w32knapi.c Modified: trunk/rostests/apitests/apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.c?rev=28… ============================================================================== --- trunk/rostests/apitests/apitest.c (original) +++ trunk/rostests/apitests/apitest.c Sat Aug 4 20:51:10 2007 @@ -156,14 +156,14 @@ printf(" regressions: %d\n", orfailed); } - if (ti.bRegress) - return ti.rfailed; - if (bStatus) { write(hFile, szFileFooter, strlen(szFileFooter)); close(hFile); } + if (ti.bRegress) + return ti.rfailed; + return ti.failed; } Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c Sat Aug 4 20:51:10 2007 @@ -142,6 +142,7 @@ int nCmdShow) { g_hInstance = hInstance; + printf("Win32k native API test\n"); @@ -155,7 +156,5 @@ printf("\n"); - TestMain(L"w32knapi", L"win32k.sys Nt-Api"); - - return 0; + return TestMain(L"w32knapi", L"win32k.sys Nt-Api"); }

17 years, 4 months

[tkreuzer] 28160: - implement quick 'n dirty HTML api status output - change test function return type to INT - add ASSERT macro - include some more headers

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Aug 4 20:45:12 2007 New Revision: 28160 URL: http://svn.reactos.org/svn/reactos?rev=28160&view=rev Log: - implement quick 'n dirty HTML api status output - change test function return type to INT - add ASSERT macro - include some more headers Modified: trunk/rostests/apitests/apitest.c trunk/rostests/apitests/apitest.h trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.c trunk/rostests/apitests/w32knapi/w32knapi.h Modified: trunk/rostests/apitests/apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.c?rev=28… ============================================================================== --- trunk/rostests/apitests/apitest.c (original) +++ trunk/rostests/apitests/apitest.c Sat Aug 4 20:45:12 2007 @@ -1,24 +1,74 @@ #include "apitest.h" +const char szFileHeader[] = "<html><head><style>\ntd.red {color:red}\ntd.green{color:green}\n</style>\n</head>\n<body>\n<head>\n"; +const char szTableHeader[] = "<table width = '800'><tr><th align='left'>Function</th><th align='left'>Status</th><th align='left'>Tests (all/passed/failed)</th><th align='left'>Regressions</th></tr>"; +const char szFileFooter[] = "</table></body></html>"; + void -OutputUsage(LPWSTR pszExe) +OutputUsage(LPWSTR pszName) { printf("\nUsage:\n\n"); - printf("%ls <TestName> - perform individual test\n", pszExe); - printf("%ls all - perform all tests\n", pszExe); - printf("%ls status - create api status file\n", pszExe); - printf("%ls -r ... - perform regression testing\n", pszExe); + printf("%ls.exe <TestName> - perform individual test\n", pszName); + printf("%ls.exe all - perform all tests\n", pszName); + printf("%ls.exe status - create api status file\n", pszName); + printf("%ls.exe -r ... - perform regression testing\n", pszName); printf("\n"); } +BOOL +WriteFileHeader(UINT hFile, LPWSTR pszModule) +{ + char szHeader[100]; + + write(hFile, szFileHeader, strlen(szFileHeader)); + sprintf(szHeader, "<H1>Test results for %ls</H1>", pszModule); + write(hFile, szHeader, strlen(szHeader)); + write(hFile, szTableHeader, strlen(szTableHeader)); + return TRUE; +} + +BOOL +WriteRow(UINT hFile, LPWSTR pszFunction, PTESTINFO pti) +{ + char szLine[500]; + + sprintf(szLine, "<tr><td>%ls</td>", pszFunction); + + switch(pti->nApiStatus) + { + case APISTATUS_NOT_FOUND: + strcat(szLine, "<td class='red'>not found</td>"); + break; + case APISTATUS_UNIMPLEMENTED: + strcat(szLine, "<td class='red'>unimplemented</td>"); + break; + case APISTATUS_ASSERTION_FAILED: + strcat(szLine, "<td class='red'>assertion failed</td>"); + break; + case APISTATUS_REGRESSION: + strcat(szLine, "<td class='red'>Regression!</td>"); + break; + case APISTATUS_NORMAL: + strcat(szLine, "<td class='green'>Implemented</td>"); + break; + } + + sprintf(szLine + strlen(szLine), "<td>%d / %d / %d</td><td>%d</td></tr>\n", + pti->passed+pti->failed, pti->passed, pti->failed, pti->rfailed); + + write(hFile, szLine, strlen(szLine)); + return TRUE; +} + int -TestMain(LPWSTR pszExe) +TestMain(LPWSTR pszName, LPWSTR pszModule) { INT argc, i, j; LPWSTR *argv; TESTINFO ti; INT opassed, ofailed, orfailed; BOOL bAll, bStatus; + UINT hFile = 0; ti.bRegress = FALSE; bAll = FALSE; @@ -29,7 +79,7 @@ if (argc < 2) { - OutputUsage(pszExe); + OutputUsage(pszName); return 0; } @@ -53,8 +103,16 @@ if (bStatus) { - printf("Output of API status is unimplemented.\n"); - return 0; + ti.bRegress = TRUE; + char szOutputFile[MAX_PATH]; + wsprintf(szOutputFile, "%ls.html", pszName); + hFile = open(szOutputFile, O_CREAT | O_TRUNC | O_RDWR, 00700); + if (hFile == -1) + { + printf("Could not create output file.\n"); + return 0; + } + WriteFileHeader(hFile, pszModule); } for (i = 0; i < NumTests(); i++) @@ -69,15 +127,22 @@ if (!IsFunctionPresent(TestList[i].Test)) { printf("Function %ls was not found!\n", TestList[i].Test); + ti.nApiStatus = APISTATUS_NOT_FOUND; } else { printf("Executing test: %ls\n", TestList[i].Test); - TestList[i].Proc(&ti); + ti.nApiStatus = TestList[i].Proc(&ti); opassed += ti.passed; ofailed += ti.failed; orfailed += ti.rfailed; printf(" tests: %d, passed: %d, failed: %d\n\n", ti.passed+ti.failed, ti.passed, ti.failed); + } + if (bStatus) + { + if (ti.rfailed > 0) + ti.nApiStatus = APISTATUS_REGRESSION; + WriteRow(hFile, TestList[i].Test, &ti); } break; } @@ -94,5 +159,11 @@ if (ti.bRegress) return ti.rfailed; + if (bStatus) + { + write(hFile, szFileFooter, strlen(szFileFooter)); + close(hFile); + } + return ti.failed; } Modified: trunk/rostests/apitests/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.h?rev=28… ============================================================================== --- trunk/rostests/apitests/apitest.h (original) +++ trunk/rostests/apitests/apitest.h Sat Aug 4 20:45:12 2007 @@ -4,11 +4,16 @@ #define WINVER 0x501 #include <stdlib.h> - #include <stdarg.h> #include <stdio.h> +#include <fcntl.h> #include <windows.h> +#define APISTATUS_NORMAL 0 +#define APISTATUS_NOT_FOUND 1 +#define APISTATUS_UNIMPLEMENTED 2 +#define APISTATUS_ASSERTION_FAILED 3 +#define APISTATUS_REGRESSION 4 /* type definitions */ @@ -18,9 +23,10 @@ INT failed; INT rfailed; BOOL bRegress; + INT nApiStatus; } TESTINFO, *PTESTINFO; -typedef BOOL (*TESTPROC)(PTESTINFO); +typedef INT (*TESTPROC)(PTESTINFO); typedef struct tagTEST { @@ -77,7 +83,14 @@ } -int TestMain(LPWSTR pszExe); +#define ASSERT(x) \ + if (!(x)) \ + { \ + printf("Assertion failed in %s:%d (%s)\n", __FILE__, __LINE__, #x);\ + return APISTATUS_ASSERTION_FAILED; \ + } + +int TestMain(LPWSTR pszExe, LPWSTR pszModule); extern TESTENTRY TestList[]; INT NumTests(void); BOOL IsFunctionPresent(LPWSTR lpszFunction); Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c Sat Aug 4 20:45:12 2007 @@ -10,7 +10,7 @@ return (HANDLE)Syscall(L"NtGdiDdCreateDirectDrawObject", 1, &hdc); } -BOOL +INT Test_NtGdiDdCreateDirectDrawObject(PTESTINFO pti) { HDC hdc=CreateDCW(L"Display",NULL,NULL,NULL); @@ -21,5 +21,5 @@ DeleteDC(hdc); - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c Sat Aug 4 20:45:12 2007 @@ -10,10 +10,10 @@ return (BOOL)Syscall(L"NtGdiDdDeleteDirectDrawObject", 1, &hDirectDrawLocal); } -BOOL +INT Test_NtGdiDdDeleteDirectDrawObject(PTESTINFO pti) { TEST(NtGdiDdDeleteDirectDrawObject(NULL) == 0); - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Sat Aug 4 20:45:12 2007 @@ -19,9 +19,9 @@ return (HANDLE)Syscall("NtGdiDdQueryDirectDrawObject", 11, &hDirectDrawLocal); } #endif -BOOL +INT Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti) { - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c Sat Aug 4 20:45:12 2007 @@ -1,6 +1,4 @@ #include "../w32knapi.h" - -typedef int ARCTYPE; BOOL STDCALL @@ -19,7 +17,7 @@ return (BOOL)Syscall(L"NtGdiArcInternal", 10, &arctype); } -BOOL +INT Test_NtGdiArcInternal(PTESTINFO pti) { HDC hDC = CreateDCW(L"Display",NULL,NULL,NULL); @@ -53,5 +51,5 @@ DeleteDC(hDC); - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c Sat Aug 4 20:45:12 2007 @@ -10,7 +10,7 @@ } -BOOL +INT Test_NtGdiGetBitmapBits(PTESTINFO pti) { BYTE Bits[50] = {0,1,2,3,4,5,6,7,8,9}; @@ -70,5 +70,5 @@ DeleteObject(hBitmap); - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c Sat Aug 4 20:45:12 2007 @@ -10,7 +10,7 @@ } -BOOL +INT Test_NtGdiSetBitmapBits(PTESTINFO pti) { BYTE Bits[50] = {0,1,2,3,4,5,6,7,8,9}; @@ -70,5 +70,5 @@ DeleteObject(hBitmap); - return TRUE; + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c Sat Aug 4 20:45:12 2007 @@ -8,11 +8,10 @@ return Syscall(L"NtUserCountClipboardFormats", 0, &p); } -BOOL +INT Test_NtUserCountClipboardFormats(PTESTINFO pti) { - TEST(NtUserCountClipboardFormats() < 1000); - TEST(TRUE); - return TRUE; + RTEST(NtUserCountClipboardFormats() < 1000); + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Sat Aug 4 20:45:12 2007 @@ -7,25 +7,29 @@ #include "ntdd/NtGdiDdQueryDirectDrawObject.c" #include "ntgdi/NtGdiArcInternal.c" +//#include "ntgdi/NtGdiDoPalette.c" +#include "ntgdi/NtGdiGetBitmapBits.c" #include "ntgdi/NtGdiSetBitmapBits.c" -#include "ntgdi/NtGdiGetBitmapBits.c" +//#include "ntgdi/NtGdiSTROBJ_vEnumStart.c" #include "ntuser/NtUserCountClipboardFormats.c" /* The List of tests */ TESTENTRY TestList[] = { - /* DirectDraw */ + /* DirectDraw */ { L"NtGdiDdCreateDirectDrawObject", Test_NtGdiDdCreateDirectDrawObject }, { L"NtGdiDdDeleteDirectDrawObject", Test_NtGdiDdDeleteDirectDrawObject }, { L"NtGdiDdQueryDirectDrawObject", Test_NtGdiDdQueryDirectDrawObject }, - /* ntgdi */ + /* ntgdi */ { L"NtGdiArcInternal", Test_NtGdiArcInternal }, +// { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits }, +// { L"NtGdiSTROBJ_vEnumStart", Test_NtGdiSTROBJ_vEnumStart }, - /* ntuser */ + /* ntuser */ { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats } }; Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c Sat Aug 4 20:45:12 2007 @@ -155,7 +155,7 @@ printf("\n"); - TestMain(L"w32knapi.exe"); + TestMain(L"w32knapi", L"win32k.sys Nt-Api"); return 0; } Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Sat Aug 4 20:45:12 2007 @@ -2,7 +2,14 @@ #define _W32KNAPI_H #include "../apitest.h" + #include <ddk/winddi.h> +#include <ddk/ntddk.h> + +/* Public Win32K Headers */ +#include <win32k/callback.h> +#include <win32k/ntusrtyp.h> +#include <win32k/ntgdityp.h> #define OS_UNSUPPORTED 0 #define OS_REACTOS 1

17 years, 4 months

[ekohl] 28159: Add remaining sticky keys options.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Aug 4 20:41:30 2007 New Revision: 28159 URL: http://svn.reactos.org/svn/reactos?rev=28159&view=rev Log: Add remaining sticky keys options. Modified: trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/resource.h Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Sat Aug 4 20:41:30 2007 @@ -21,6 +21,7 @@ STICKYKEYS oldStickyKeys; FILTERKEYS filterKeys; TOGGLEKEYS toggleKeys; + BOOL bKeyboardPref; } GLOBAL_DATA, *PGLOBAL_DATA; @@ -57,6 +58,13 @@ IDC_STICKY_UNLOCK_CHECK, pGlobalData->stickyKeys.dwFlags & SKF_TWOKEYSOFF ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, + IDC_STICKY_SOUND_CHECK, + pGlobalData->stickyKeys.dwFlags & SKF_AUDIBLEFEEDBACK ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_STICKY_STATUS_CHECK, + pGlobalData->stickyKeys.dwFlags & SKF_INDICATOR ? BST_CHECKED : BST_UNCHECKED); break; case WM_COMMAND: @@ -72,6 +80,14 @@ case IDC_STICKY_UNLOCK_CHECK: pGlobalData->stickyKeys.dwFlags ^= SKF_TWOKEYSOFF; + break; + + case IDC_STICKY_SOUND_CHECK: + pGlobalData->stickyKeys.dwFlags ^= SKF_AUDIBLEFEEDBACK; + break; + + case IDC_STICKY_STATUS_CHECK: + pGlobalData->stickyKeys.dwFlags ^= SKF_INDICATOR; break; case IDOK: @@ -206,6 +222,15 @@ return; } + /* Get keyboard preference information */ + if (!SystemParametersInfo(SPI_GETKEYBOARDPREF, + 0, + &pGlobalData->bKeyboardPref, + 0)) + { + return; + } + CheckDlgButton(hwndDlg, IDC_STICKY_BOX, pGlobalData->stickyKeys.dwFlags & SKF_STICKYKEYSON ? BST_CHECKED : BST_UNCHECKED); @@ -217,6 +242,10 @@ CheckDlgButton(hwndDlg, IDC_TOGGLE_BOX, pGlobalData->toggleKeys.dwFlags & TKF_TOGGLEKEYSON ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_KEYBOARD_EXTRA, + pGlobalData->bKeyboardPref ? BST_CHECKED : BST_UNCHECKED); } @@ -288,6 +317,11 @@ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; + case IDC_KEYBOARD_EXTRA: + pGlobalData->bKeyboardPref = !pGlobalData->bKeyboardPref; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + default: break; } @@ -312,6 +346,11 @@ &pGlobalData->toggleKeys, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE /*0*/); + SystemParametersInfo(SPI_SETKEYBOARDPREF, + pGlobalData->bKeyboardPref, + NULL, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE /*0*/); + return TRUE; } break; Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Sat Aug 4 20:41:30 2007 @@ -18,7 +18,7 @@ LTEXT "Pouijte funkci Ozvuèení kláves, chcete-li být upozornìni na stisk kláves Caps Lock, Num Lock a Scroll Lock zvukovým signálem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)+6 AUTOCHECKBOX "Pouívat funkci O&zvuèení kláves",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+4,PROPSHEETPADDING(20),14 PUSHBUTTON "Na&stavení",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+4,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "&V programech zobrazovat dodateènou nápovìdu ke klávesám.",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "&V programech zobrazovat dodateènou nápovìdu ke klávesám.",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -104,6 +104,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Sat Aug 4 20:41:30 2007 @@ -20,7 +20,7 @@ LTEXT "Benutzen Sie die Signalfunktion, wenn Sie einen Signalton hören wollen, wenn Sie Caps-, Num-, oder Scroll-Lock drücken.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "&Signalfunktion benutzen",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETPADDING(15),14 PUSHBUTTON "Ei&nstellungen",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Extra Tastaturhilfe in den P&rogrammen anzeigen ",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Extra Tastaturhilfe in &Programmen anzeigen ",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -106,6 +106,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Sat Aug 4 20:41:30 2007 @@ -18,7 +18,7 @@ LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "Use &ToggleKeys",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Setti&ngs",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -103,6 +103,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Sat Aug 4 20:41:30 2007 @@ -21,7 +21,7 @@ LTEXT "Use &Teclas Activas si desea escuchar tonos al presionar Caps Lock, Num Lock, y Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "Usar Teclas Activas",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Opcio&nes",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -107,6 +107,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Sat Aug 4 20:41:30 2007 @@ -19,7 +19,7 @@ LTEXT "Utilisez les touches &bascules si vous voulez entendre un son émis à chaques fois que vous appuyez sur Verr. maj, Verr. num, et Arrêt défil.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "Utiliser les touches bascules",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Para&mètres",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "&Afficher l'aide supplémentaire sur le clavier dans les programmes",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "&Afficher l'aide supplémentaire sur le clavier dans les programmes",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -105,6 +105,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Sat Aug 4 20:41:30 2007 @@ -19,7 +19,7 @@ LTEXT "Ha a Caps Lock, Num Lock, és Scroll Lock billentyûk lenyomásakor hangot szeretne hallani, használja az Állásjelzõ hangok lehetõséget.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "Állásjelzõ hangok használata",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Beállítá&sok",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(8),14 -// AUTOCHECKBOX "Kibõvített billentyûzet segítség megjelenítése a programokban",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Kibõvített billentyûzet segítség megjelenítése a programokban",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -105,6 +105,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Sat Aug 4 20:41:30 2007 @@ -20,7 +20,7 @@ LTEXT "Gunakan ToggleKeys jika anda ingin mendengan nada ketika menekan Caps Lock, Num Lock, dan Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "Gunakan &ToggleKeys",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Setelan&n",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -106,6 +106,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Sat Aug 4 20:41:30 2007 @@ -18,7 +18,7 @@ LTEXT "Se vuoi un segnale acustico quando viene premuto Blocco Maiuscole, Num o Scr.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "Use &Bistabili",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Im&postazioni",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -104,6 +104,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Sat Aug 4 20:41:30 2007 @@ -18,7 +18,7 @@ LTEXT "ØèÖ¦L[@\\ðg¤ÆACapsLockANumLockAScrollLock L[ðµ½Æ«É¹ðÂçµÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "ØèÖ¦L[@\\ðg¤(&T)",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Ýè(&N)",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "vOÅÇÁÌL[{[h wvð\\¦·é(&W)",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "vOÅÇÁÌL[{[h wvð\\¦·é(&W)",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -104,6 +104,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Sat Aug 4 20:41:30 2007 @@ -20,7 +20,7 @@ LTEXT "U kunt schakeltoetsen gebruiken als u wilt dat er een geluid wordt weergegeven als u CapsLock, NumLock of ScrollLock indrukt.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "Schakeltoetsen gebruiken",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Inst&ellingen...",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Extra hulp voor toetsenborden weergeven in programma's",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Extra hulp voor toetsenborden weergeven in programma's",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -106,6 +106,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Sat Aug 4 20:41:30 2007 @@ -21,7 +21,7 @@ LTEXT "U¿yj funkcji &Klawisze Prze³¹czaj¹ce, jeli chcesz s³yszeæ dwiêk przy naciskaniu klawiszy Caps Lock, Num Lock albo Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "U¿yj Klawiszy Prze³¹czaj¹cych",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Ustawie&nia",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 -// AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -107,6 +107,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Sat Aug 4 20:41:30 2007 @@ -18,7 +18,7 @@ LTEXT "Îçâó÷èâàíèå íàæàòèÿ êëàâèø ïåðåêëþ÷åíèÿ ðåæèìîâ Caps Lock, Num Lock è Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "&Îçâó÷èâàíèå",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 PUSHBUTTON "Íà&ñòðîéêà",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(20)+6,PROPSHEETPADDING(15)-5,14 -// AUTOCHECKBOX "&Äîïîëíèòåëüíûå ñâåäåíèÿ î ðàáîòå ñ êëàâèàòóðîé",IDC_KEYBOARD_EXTRA + AUTOCHECKBOX "&Äîïîëíèòåëüíûå ñâåäåíèÿ î ðàáîòå ñ êëàâèàòóðîé",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -104,6 +104,10 @@ AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Sat Aug 4 20:41:30 2007 @@ -40,11 +40,12 @@ #define IDC_FILTER_BUTTON 203 #define IDC_TOGGLE_BOX 204 #define IDC_TOGGLE_BUTTON 205 +#define IDC_KEYBOARD_EXTRA 206 -#define IDC_SENTRY_BOX 206 -#define IDC_SENTRY_TEXT 207 -#define IDC_SENTRY_COMBO 208 -#define IDC_SSHOW_BOX 209 +#define IDC_SENTRY_BOX 207 +#define IDC_SENTRY_TEXT 208 +#define IDC_SENTRY_COMBO 209 +#define IDC_SSHOW_BOX 210 #define IDC_CONTRAST_BOX 211 #define IDC_CONTRAST_BUTTON 212 @@ -62,7 +63,7 @@ #define IDC_STICKY_ACTIVATE_CHECK 221 #define IDC_STICKY_LOCK_CHECK 222 #define IDC_STICKY_UNLOCK_CHECK 223 -#define IDC_STICKY_SIGNAL_CHECK 224 +#define IDC_STICKY_SOUND_CHECK 224 #define IDC_STICKY_STATUS_CHECK 225 #endif /* __CPL_RESOURCE_H */

17 years, 4 months

[cwittich] 28158: Fix scanning affinity in IoConnectInterrupt (patch by w3seek)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Aug 4 19:52:17 2007 New Revision: 28158 URL: http://svn.reactos.org/svn/reactos?rev=28158&view=rev Log: Fix scanning affinity in IoConnectInterrupt (patch by w3seek) Modified: trunk/reactos/ntoskrnl/io/iomgr/irq.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irq.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irq.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irq.c Sat Aug 4 19:52:17 2007 @@ -74,6 +74,7 @@ RtlZeroMemory(IoInterrupt, sizeof(IO_INTERRUPT)); /* Now create all the interrupts */ + Affinity = ProcessorEnableMask & KeActiveProcessors; for (Count = 0; Affinity; Count++, Affinity >>= 1) { /* Check if it's enabled for this CPU */

17 years, 4 months

← Newer
1
...
54
55
56
57
58
59
60
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007