Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 29204: Implement RegisterDeviceNotificationAW and UnregisterDeviceNotification, based on Gdi32 OpenGL.
by jimtabor＠svn.reactos.org 25 Sep '07

25 Sep '07

Author: jimtabor Date: Wed Sep 26 02:28:35 2007 New Revision: 29204 URL: http://svn.reactos.org/svn/reactos?rev=29204&view=rev Log: Implement RegisterDeviceNotificationAW and UnregisterDeviceNotification, based on Gdi32 OpenGL. Modified: trunk/reactos/dll/win32/user32/misc/resources.c trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.def Modified: trunk/reactos/dll/win32/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/reso… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/resources.c (original) +++ trunk/reactos/dll/win32/user32/misc/resources.c Wed Sep 26 02:28:35 2007 @@ -1,6 +1,17 @@ #include <user32.h> #include <wine/debug.h> + +#ifndef _CFGMGR32_H_ +#define CR_SUCCESS 0x00000000 +#define CR_OUT_OF_MEMORY 0x00000002 +#define CR_INVALID_POINTER 0x00000003 +#define CR_FAILURE 0x00000013 +#define CR_INVALID_DATA 0x0000001F +#endif + +typedef DWORD (*CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG); +typedef DWORD (*CMP_UNREGNOTIFY) (ULONG ); /* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which does not seem to work properly for stack address space. */ @@ -228,4 +239,92 @@ return nStringLen; } + +/* + * @implemented + */ +HDEVNOTIFY +STDCALL +RegisterDeviceNotificationW( + HANDLE hRecipient, + LPVOID NotificationFilter, + DWORD Flags + ) +{ + DWORD ConfigRet = 0; + CMP_REGNOTIFY RegNotify = NULL; + HDEVNOTIFY hDevNotify = NULL; + HINSTANCE hSetupApi = LoadLibraryA("SETUPAPI.DLL"); + if (hSetupApi == NULL) return NULL; + RegNotify = (CMP_REGNOTIFY) GetProcAddress ( hSetupApi, "CMP_RegisterNotification"); + if (RegNotify == NULL) + { + FreeLibrary ( hSetupApi ); + return NULL; + } + ConfigRet = RegNotify ( hRecipient, NotificationFilter, Flags, (PULONG) &hDevNotify); + FreeLibrary ( hSetupApi ); + if (ConfigRet != CR_SUCCESS) + { + switch (ConfigRet) + { + case CR_OUT_OF_MEMORY: + SetLastError (ERROR_NOT_ENOUGH_MEMORY); + break; + case CR_INVALID_POINTER: + SetLastError (ERROR_INVALID_PARAMETER); + break; + case CR_INVALID_DATA: + SetLastError (ERROR_INVALID_DATA); + break; + case CR_FAILURE: + default: + SetLastError (ERROR_SERVICE_SPECIFIC_ERROR); + break; + } + } + return hDevNotify; +} + + +/* + * @implemented + */ +BOOL +STDCALL +UnregisterDeviceNotification( + HDEVNOTIFY Handle) +{ + DWORD ConfigRet = 0; + CMP_UNREGNOTIFY UnRegNotify = NULL; + HINSTANCE hSetupApi = LoadLibraryA("SETUPAPI.DLL"); + if (hSetupApi == NULL) return FALSE; + UnRegNotify = (CMP_UNREGNOTIFY) GetProcAddress ( hSetupApi, "CMP_UnregisterNotification"); + if (UnRegNotify == NULL) + { + FreeLibrary ( hSetupApi ); + return FALSE; + } + ConfigRet = UnRegNotify ( (ULONG) Handle ); + FreeLibrary ( hSetupApi ); + if (ConfigRet != CR_SUCCESS) + { + switch (ConfigRet) + { + case CR_INVALID_POINTER: + SetLastError (ERROR_INVALID_PARAMETER); + break; + case CR_INVALID_DATA: + SetLastError (ERROR_INVALID_DATA); + break; + case CR_FAILURE: + default: + SetLastError (ERROR_SERVICE_SPECIFIC_ERROR); + break; + } + return FALSE; + } + return TRUE; +} + /* EOF */ Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c Wed Sep 26 02:28:35 2007 @@ -108,19 +108,6 @@ /* * @unimplemented */ -BOOL -STDCALL -UnregisterDeviceNotification( - HDEVNOTIFY Handle) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ DWORD STDCALL WaitForInputIdle( @@ -333,21 +320,6 @@ /* * @unimplemented */ -HDEVNOTIFY -STDCALL -RegisterDeviceNotificationW( - HANDLE hRecipient, - LPVOID NotificationFilter, - DWORD Flags - ) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ UINT STDCALL GetRawInputDeviceInfoW( @@ -397,21 +369,6 @@ /* * @unimplemented */ -HDEVNOTIFY -STDCALL -RegisterDeviceNotificationA( - HANDLE hRecipient, - LPVOID NotificationFilter, - DWORD Flags - ) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ UINT STDCALL GetRawInputDeviceInfoA( Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def (original) +++ trunk/reactos/dll/win32/user32/user32.def Wed Sep 26 02:28:35 2007 @@ -549,7 +549,7 @@ RegisterClassW@4 RegisterClipboardFormatA@4 RegisterClipboardFormatW@4 -RegisterDeviceNotificationA@12 +RegisterDeviceNotificationA@12=RegisterDeviceNotificationW@12 RegisterDeviceNotificationW@12 RegisterHotKey@16 RegisterLogonProcess@8

1 0

[greatlrd] 29203: forget commit Implement of GdiGetLocalBrush, GdiGetLocalDC, GdiGetLocalFont fix a smaller bug in GdiSetBatchLimit fix GdiSetLastError to be simluare to windows xp
by greatlrd＠svn.reactos.org 25 Sep '07

25 Sep '07

Author: greatlrd Date: Wed Sep 26 00:44:53 2007 New Revision: 29203 URL: http://svn.reactos.org/svn/reactos?rev=29203&view=rev Log: forget commit Implement of GdiGetLocalBrush, GdiGetLocalDC, GdiGetLocalFont fix a smaller bug in GdiSetBatchLimit fix GdiSetLastError to be simluare to windows xp Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/gdientry.c trunk/reactos/dll/win32/gdi32/misc/historic.c trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Wed Sep 26 00:44:53 2007 @@ -146,9 +146,6 @@ DdEntry7@12=NtGdiDdAddAttachedSurface@12 DdEntry8@12=NtGdiDdAlphaBlt@12 DdEntry9@8=NtGdiDdAttachSurface@8 - - - DeleteColorSpace@4=NtGdiDeleteColorSpace@4 DeleteDC@4 DeleteEnhMetaFile@4 @@ -273,6 +270,7 @@ GdiDeleteSpoolFileHandle@4 GdiDescribePixelFormat@16=NtGdiDescribePixelFormat@16 GdiDllInitialize@12 +GdiDrawStream@12 GdiEndDocEMF@4 GdiEndPageEMF@8 GdiEntry10@8 @@ -338,6 +336,7 @@ GdiValidateHandle@4 GetArcDirection@4 GetAspectRatioFilterEx@8 +GetBitmapAttributes@4 GetBitmapBits@12=NtGdiGetBitmapBits@12 GetBitmapDimensionEx@8=NtGdiGetBitmapDimension@8 GetBkColor@4 @@ -609,8 +608,8 @@ XLATEOBJ_cGetPalette@16=NtGdiXLATEOBJ_cGetPalette@16 XLATEOBJ_hGetColorTransform@4=NtGdiXLATEOBJ_hGetColorTransform@4 -GdiDrawStream@12 -GetBitmapAttributes@4 + + GetBrushAttributes@4 GetGlyphIndicesA@20 GetTextExtentExPointWPri@28 Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Wed Sep 26 00:44:53 2007 @@ -485,7 +485,7 @@ if (!ghDirectDraw) { /* Create the DC */ - if ((hdc = CreateDC(L"Display", NULL, NULL, NULL))) + if ((hdc = CreateDCW(L"Display", NULL, NULL, NULL))) { /* Create the DDraw Object */ ghDirectDraw = NtGdiDdCreateDirectDrawObject(hdc); @@ -509,7 +509,7 @@ else { /* Using the per-process object, so create it */ - pDirectDrawGlobal->hDD = (ULONG_PTR)NtGdiDdCreateDirectDrawObject(hdc); + pDirectDrawGlobal->hDD = (ULONG_PTR)NtGdiDdCreateDirectDrawObject(hdc); /* Set the return value */ Return = pDirectDrawGlobal->hDD ? TRUE : FALSE; @@ -830,8 +830,7 @@ DdCreateSurfaceObject( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, BOOL bPrimarySurface) { - return bDDCreateSurface(pSurfaceLocal, TRUE); - //return bDdCreateSurfaceObject(pSurfaceLocal, TRUE); + return bDDCreateSurface(pSurfaceLocal, TRUE); } @@ -911,8 +910,8 @@ HANDLE hSectionApp, DWORD dwOffset) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -988,6 +987,7 @@ STDCALL DdQueryDisplaySettingsUniqueness() { + /* FIXME share memory */ return RemberDdQueryDisplaySettingsUniquenessID; } Modified: trunk/reactos/dll/win32/gdi32/misc/historic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/histo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/historic.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/historic.c Wed Sep 26 00:44:53 2007 @@ -265,3 +265,34 @@ { return newhfnt; } + +/* + * @implemented + */ +HBRUSH +STDCALL +GdiGetLocalBrush(HBRUSH hbr) +{ + return hbr; +} + +/* + * @implemented + */ +HDC +STDCALL +GdiGetLocalDC(HDC hdc) +{ + return hdc; +} + +/* + * @implemented + */ +HFONT +STDCALL +GdiGetLocalFont(HFONT hfont) +{ + return hfont; +} + Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Wed Sep 26 00:44:53 2007 @@ -75,10 +75,19 @@ STDCALL GdiFixUpHandle(HGDIOBJ hGdiObj) { - if (((ULONG_PTR)(hGdiObj)) & GDI_HANDLE_UPPER_MASK ) return hGdiObj; - PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); - return hGdiObj = (HGDIOBJ)(((LONG_PTR)(hGdiObj)) | - (Entry->Type << GDI_ENTRY_UPPER_SHIFT)); // Rebuild handle for Object + PGDI_TABLE_ENTRY Entry; + + if (((ULONG_PTR)(hGdiObj)) & GDI_HANDLE_UPPER_MASK ) + { + return hGdiObj; + } + + /* FIXME is this right ?? */ + + Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); + + /* Rebuild handle for Object */ + return hGdiObj = (HGDIOBJ)(((LONG_PTR)(hGdiObj)) | (Entry->Type << GDI_ENTRY_UPPER_SHIFT)); } /* @@ -138,8 +147,14 @@ STDCALL GdiSetBatchLimit(DWORD Limit) { - DWORD OldLimit = GDI_BatchLimit; - if ((!Limit) || (Limit > GDI_BATCH_LIMIT)) return Limit; + DWORD OldLimit = GDI_BatchLimit; + + if ( (!Limit) || + (Limit >= GDI_BATCH_LIMIT)) + { + return Limit; + } + GdiFlush(); GDI_BatchLimit = Limit; return OldLimit; @@ -166,17 +181,16 @@ return 0; } -INT STDCALL -ExtEscape( - HDC hDC, - int nEscape, - int cbInput, - LPCSTR lpszInData, - int cbOutput, - LPSTR lpszOutData -) -{ - return NtGdiExtEscape(hDC, NULL, 0, nEscape, cbInput, (LPSTR)lpszInData, cbOutput, lpszOutData); +INT +STDCALL +ExtEscape(HDC hDC, + int nEscape, + int cbInput, + LPCSTR lpszInData, + int cbOutput, + LPSTR lpszOutData) +{ + return NtGdiExtEscape(hDC, NULL, 0, nEscape, cbInput, (LPSTR)lpszInData, cbOutput, lpszOutData); } /* @@ -186,5 +200,5 @@ STDCALL GdiSetLastError(DWORD dwErrCode) { - SetLastError(dwErrCode); -} + NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrCode; +} 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 (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Sep 26 00:44:53 2007 @@ -1502,9 +1502,9 @@ STDCALL GdiConvertEnhMetaFile(HENHMETAFILE hmf) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1514,9 +1514,9 @@ STDCALL GdiDrawStream(HDC dc, ULONG l, VOID *v) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1526,45 +1526,9 @@ STDCALL GdiGetCodePage(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HBRUSH -STDCALL -GdiGetLocalBrush(HBRUSH hbr) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HDC -STDCALL -GdiGetLocalDC(HDC hdc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HFONT -STDCALL -GdiGetLocalFont(HFONT hfont) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1574,9 +1538,9 @@ STDCALL GdiIsMetaFileDC(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*

1 0

[greatlrd] 29202: Fix a stupied bug in DdAttachSurface when pSurfaceFrom->hDDSurface is NULL or pSurfaceTo->hDDSurface is null we need create them.
by greatlrd＠svn.reactos.org 25 Sep '07

25 Sep '07

Author: greatlrd Date: Tue Sep 25 20:49:13 2007 New Revision: 29202 URL: http://svn.reactos.org/svn/reactos?rev=29202&view=rev Log: Fix a stupied bug in DdAttachSurface when pSurfaceFrom->hDDSurface is NULL or pSurfaceTo->hDDSurface is null we need create them. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Tue Sep 25 20:49:13 2007 @@ -942,7 +942,7 @@ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo) { /* Create Surface if it does not exits one */ - if (pSurfaceFrom->hDDSurface) + if (!pSurfaceFrom->hDDSurface) { if (!bDDCreateSurface(pSurfaceFrom, FALSE)) { @@ -951,7 +951,7 @@ } /* Create Surface if it does not exits one */ - if (pSurfaceTo->hDDSurface) + if (!pSurfaceTo->hDDSurface) { if (!bDDCreateSurface(pSurfaceTo, FALSE)) {

1 0

[jimtabor] 29201: IsMetaFile is an easy check used when porting wine static and listbox.
by jimtabor＠svn.reactos.org 25 Sep '07

25 Sep '07

Author: jimtabor Date: Tue Sep 25 18:42:51 2007 New Revision: 29201 URL: http://svn.reactos.org/svn/reactos?rev=29201&view=rev Log: IsMetaFile is an easy check used when porting wine static and listbox. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/misc.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h (original) +++ trunk/reactos/dll/win32/user32/include/user32.h Tue Sep 25 18:42:51 2007 @@ -42,3 +42,5 @@ HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); BOOL STDCALL NtGdiPatBlt(HDC hdcDst, INT x, INT y, INT cx, INT cy, DWORD rop4); LONG STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); +BOOL FASTCALL IsMetaFile(HDC); + Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c Tue Sep 25 18:42:51 2007 @@ -293,6 +293,22 @@ return TRUE; } +BOOL +FASTCALL +IsMetaFile(HDC hDc) +{ + DWORD Type = GetObjectType((HGDIOBJ) hDc); + switch(Type) + { + case OBJ_METADC: + case OBJ_METAFILE: + case OBJ_ENHMETADC: + case OBJ_ENHMETAFILE: + return TRUE; + } + return FALSE; +} + PUSER_HANDLE_ENTRY FASTCALL GetUser32Handle(HANDLE handle)

1 0

[gedmurphy] 29200: - Add usermode checks to GetDIBits - passes 21 out of 27 tests - Add GdiSetLastError to the lib instead of forwarding it straight to kernel32
by gedmurphy＠svn.reactos.org 25 Sep '07

25 Sep '07

Author: gedmurphy Date: Tue Sep 25 17:27:09 2007 New Revision: 29200 URL: http://svn.reactos.org/svn/reactos?rev=29200&view=rev Log: - Add usermode checks to GetDIBits - passes 21 out of 27 tests - Add GdiSetLastError to the lib instead of forwarding it straight to kernel32 Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Tue Sep 25 17:27:09 2007 @@ -328,7 +328,7 @@ GdiResetDCEMF@8 GdiSetAttrs@4 GdiSetBatchLimit@4 -GdiSetLastError@4=SetLastError@4 +GdiSetLastError@4 GdiSetPixelFormat@8=NtGdiSetPixelFormat@8 GdiSetServerAttr@8 GdiStartDocEMF@8 Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Tue Sep 25 17:27:09 2007 @@ -192,5 +192,9 @@ STDCALL GdiAddFontResourceW(LPCWSTR lpszFilename,FLONG fl,DESIGNVECTOR *pdv); +VOID +STDCALL +GdiSetLastError( DWORD dwErrCode ); + /* EOF */ Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Tue Sep 25 17:27:09 2007 @@ -178,3 +178,13 @@ { return NtGdiExtEscape(hDC, NULL, 0, nEscape, cbInput, (LPSTR)lpszInData, cbOutput, lpszOutData); } + +/* + * @implemented + */ +VOID +STDCALL +GdiSetLastError(DWORD dwErrCode) +{ + SetLastError(dwErrCode); +} Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c Tue Sep 25 17:27:09 2007 @@ -1,4 +1,7 @@ #include "precomp.h" + +//#define NDEBUG +//#include <debug.h> /* * Return the full scan size for a bitmap. @@ -151,8 +154,6 @@ - - INT STDCALL GetDIBits( @@ -162,16 +163,34 @@ UINT cScanLines, LPVOID lpvBits, LPBITMAPINFO lpbmi, - UINT uUsage - ) + UINT uUsage) { - return NtGdiGetDIBitsInternal(hDC, - hbmp, - uStartScan, - cScanLines, - lpvBits, - lpbmi, - uUsage, - DIB_BitmapMaxBitsSize( lpbmi, cScanLines ), - 0); + INT ret = 0; + + if (hDC == NULL || !GdiIsHandleValid((HGDIOBJ)hDC)) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + } + else if (lpbmi == NULL) + { + // XP doesn't run this check and results in a + // crash in DIB_BitmapMaxBitsSize, we'll be more forgiving + GdiSetLastError(ERROR_INVALID_PARAMETER); + } + else + { + UINT cjBmpScanSize = DIB_BitmapMaxBitsSize(lpbmi, cScanLines); + + ret = NtGdiGetDIBitsInternal(hDC, + hbmp, + uStartScan, + cScanLines, + lpvBits, + lpbmi, + uUsage, + cjBmpScanSize, + 0); + } + + return ret; }

1 0

[gedmurphy] 29199: add more checks for GetDIBits
by gedmurphy＠svn.reactos.org 25 Sep '07

25 Sep '07

Author: gedmurphy Date: Tue Sep 25 17:20:46 2007 New Revision: 29199 URL: http://svn.reactos.org/svn/reactos?rev=29199&view=rev Log: add more checks for GetDIBits Modified: trunk/rostests/apitests/gdi32api/tests/GetDIBits.c Modified: trunk/rostests/apitests/gdi32api/tests/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetDIBits.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetDIBits.c Tue Sep 25 17:20:46 2007 @@ -15,6 +15,7 @@ hBitmap = CreateCompatibleBitmap(hDCScreen, 16, 16); RTEST(hBitmap != NULL); + /* misc */ SetLastError(ERROR_SUCCESS); RTEST(GetDIBits(0, 0, 0, 0, NULL, NULL, 0) == 0); RTEST(GetLastError() == ERROR_INVALID_PARAMETER); @@ -31,12 +32,51 @@ RTEST(GetDIBits((HDC)2345, hBitmap, 0, 15, NULL, &bi, 0) == 0); RTEST(GetLastError() == ERROR_INVALID_PARAMETER); + + + /* null hdc */ SetLastError(ERROR_SUCCESS); - ZeroMemory(&bi, sizeof(BITMAPINFO)); - bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + RTEST(GetDIBits(NULL, hBitmap, 0, 15, NULL, &bi, DIB_RGB_COLORS) == 0); + RTEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* null bitmap */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + RTEST(GetDIBits(hDCScreen, NULL, 0, 15, NULL, &bi, DIB_RGB_COLORS) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + /* 0 scan lines */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + RTEST(GetDIBits(hDCScreen, hBitmap, 0, 0, NULL, &bi, DIB_RGB_COLORS) > 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + /* null bitmap info - crashes XP*/ + //SetLastError(ERROR_SUCCESS); + //RTEST(GetDIBits(hDCScreen, NULL, 0, 15, NULL, NULL, DIB_RGB_COLORS) == 0); + //RTEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* bad bmi colours (uUsage) */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + RTEST(GetDIBits(hDCScreen, hBitmap, 0, 15, NULL, &bi, 100) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + RTEST(bi.bmiHeader.biWidth == 0); + RTEST(bi.bmiHeader.biHeight == 0); + RTEST(bi.bmiHeader.biBitCount == 0); + RTEST(bi.bmiHeader.biSizeImage == 0); + + /* basic call */ + SetLastError(ERROR_SUCCESS); + ZeroMemory(&bi, sizeof(BITMAPINFO)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); RTEST(GetDIBits(hDCScreen, hBitmap, 0, 15, NULL, &bi, DIB_RGB_COLORS) > 0); RTEST(GetLastError() == ERROR_SUCCESS); - ScreenBpp = GetDeviceCaps(hDCScreen, BITSPIXEL); RTEST(bi.bmiHeader.biWidth == 16); RTEST(bi.bmiHeader.biHeight == 16);

1 0

[cfinck] 29198: Traditional chinese translation for "cacls" by Chaoming Tseng See issue #2687 for more details.
by cfinck＠svn.reactos.org 25 Sep '07

25 Sep '07

Author: cfinck Date: Tue Sep 25 14:32:22 2007 New Revision: 29198 URL: http://svn.reactos.org/svn/reactos?rev=29198&view=rev Log: Traditional chinese translation for "cacls" by Chaoming Tseng See issue #2687 for more details. Added: trunk/reactos/base/applications/cacls/lang/zh-TW.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc Added: trunk/reactos/base/applications/cacls/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/zh-TW.rc (added) +++ trunk/reactos/base/applications/cacls/lang/zh-TW.rc Tue Sep 25 14:32:22 2007 @@ -1,0 +1,95 @@ +/* + * cacls (TRADITIONAL Chinese resources) + * (ÁcÅé¤¤¤å¸ê·½) + * Copyright 2007 jauming <jauming.tw(a)gmail.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + + +STRINGTABLE DISCARDABLE +{ + +IDS_HELP, "Åã¥Ü©ÎªÌ×§ï¤å¥óªº³X°Ý±±¨îªí \n\n\ +CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\ + [/P user:perm [...]] [/D user [...]]\n\ + filename Åã¥Ü ACLs¡C\n\ + /T §ó§ï·í«e¥Ø¿ý¤Î¨ä©Ò¦³¤l¥Ø¿ý¤¤\n\ + «ü©w¤å¥óªº ACL¡C\n\ + /E ½s¿è ACL ¦Ó¤£´À´«¡C\n\ + /C ¦b¥X²{©Úµ´³X°Ý¿ù»~®ÉÄ~Äò¡C\n\ + /G user:perm ½á¤©«ü©w¥Î¤á³X°ÝÅv¡C\n\ + Perm ¥i¥H¬O: R Åª¨ú \n\ + W ¼g¤J \n\ + C §ó§ï(¼g¤J) \n\ + F §¹¥þ±±¨î \n\ + /R user ºM¾P«ü©w¥Î¤áªº³X°ÝÅv(¶È¦bÉO /E ¤@°_¨Ï¥Î®É¦Xªk)¡C\n\ + /P user:perm ´À´««ü©w¥Î¤áªº³X°ÝÅv¡C\n\ + Perm ¥i¥H¬O: N µL \n\ + R Åª¨ú \n\ + W ¼g¤J \n\ + C §ó§ï(¼g¤J) \n\ + F §¹¥þ±±¨î \n\ + /D user ©Úµ´«ü©w¥Î¤áªº³X°Ý¡C\n\ +¦b©R¥O¤¤¥i¥H¨Ï¥Î³q°t²Å«ü©w¦hÓ¤å¥ó¡C\n\ +±z¤]¥i¥H¦b©R¥O¤¤«ü©w¦hÓ¥Î¤á¡C\n\n\ +ÁY¼g: \n\ + CI - ®e¾¹Ä~©Ó¡C\n\ + ACE·|¥Ñ¥Ø¿ýÄ~©Ó¡C\n\ + OI - ¹ï¶HÄ~©Ó¡C\n\ + ACE ·|¥Ñ¤å¥óÄ~©Ó¡C\n\ + IO - ¥uÄ~©Ó¡C\n\ + ACE ¤£¾A¥Î©ó·í«e¤å¥ó/¥Ø¿ý¡C\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(special access:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +} Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc Tue Sep 25 14:32:22 2007 @@ -1,13 +1,6 @@ - - #include <windows.h> #include "resource.h" -/* define language neutral resources */ - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -/* include localised resources */ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" #include "lang/de-DE.rc" @@ -22,3 +15,4 @@ #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" +#include "lang/zh-TW.rc"

1 0

[cfinck] 29197: - Bug 2685: Ukrainian translation for "format" by Rostislav Zabolotny (rstzab AT yandex DOT ru) - Bug 2686: Ukrainian translation for "regsvr32" by Rostislav Zabolotny (rstzab AT yandex DOT ru)
by cfinck＠svn.reactos.org 25 Sep '07

25 Sep '07

Author: cfinck Date: Tue Sep 25 14:08:39 2007 New Revision: 29197 URL: http://svn.reactos.org/svn/reactos?rev=29197&view=rev Log: - Bug 2685: Ukrainian translation for "format" by Rostislav Zabolotny (rstzab AT yandex DOT ru) - Bug 2686: Ukrainian translation for "regsvr32" by Rostislav Zabolotny (rstzab AT yandex DOT ru) Added: trunk/reactos/base/system/format/lang/uk-UA.rc trunk/reactos/base/system/regsvr32/lang/uk-UA.rc Modified: trunk/reactos/base/system/format/rsrc.rc trunk/reactos/base/system/regsvr32/rsrc.rc Added: trunk/reactos/base/system/format/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/uk… ============================================================================== --- trunk/reactos/base/system/format/lang/uk-UA.rc (added) +++ trunk/reactos/base/system/format/lang/uk-UA.rc Tue Sep 25 14:08:39 2007 @@ -1,0 +1,75 @@ +#include "resource.h" +/* + * PROJECT: ReactOS CMD Format. + * LICENSE: GPL - See COPYING in the top level directory + * FILE: reactos/base/system/format/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Format command + * PROGRAMMERS: Rostislav Zabolotny + */ + + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ +STRING_HELP, "Âèêîðèñòàííÿ: %S ïðèñòð³é: [-FS:ôàéë-ñèñòåìà] [-V:ì³òêà] [-Q] [-A:ðîçì³ð] [-C]\n\n\ + [ïðèñòð³é:] Âêàçóº äèñê, ÿêèé ñë³ä â³äôîðìàòóâàòè (äâîêðàïêà îáîâ'ÿçêîâà).\n\ + -FS:ôàéë-ñèñòåìà Âèçíà÷àº òèï ôàéëîâî¿ ñèñòåìè (%s).\n\ + -V:ì³òêà Âèçíà÷àº êîðîòêó íàçâó äèñêó.\n\ + -Q Øâèäêå ôîðìàòóâàííÿ.\n\ + -A:ðîçì³ð Ïåðåâèçíà÷àº ðîçì³ð êëàñòåðà çà çàìîâ÷óâàííÿì. Ðåêîìåíäóºòüñÿ \n\ + âèêîðèñòîâóâàòè çíà÷åííÿ çà çàìîâ÷óâàííÿì.\n\ + NTFS ï³äòðèìóº 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ + FAT ï³äòðèìóº 8192, 16K, 32K, 64K, 128K, 256K.\n\ + NTFS ñòèñêàííÿ íå ï³äòðèìóºòüñÿ äëÿ êëàñòåð³â á³ëüøèõ çà 4096.\n\ + -C Âñòàíîâëþº ðåæèì ñòèñêàííÿ äëÿ âñ³õ íîâèõ ôàéë³â,\n\ + ÿê³ ñòâîðþþòüñÿ íà äèñêó.\n\n" + +STRING_COMPLETE "%lu â³äñîòê³â âèêîíàíî.\r" + +STRING_FORMAT_FAIL "FormatEx íå çì³ã óñï³øíî âèêîíàòè çàâäàííÿ.\n\n" + +STRING_NO_SUPPORT "Ôóíêö³ÿ íå ï³äòðèìóºòüñÿ" + +STRING_FMIFS_FAIL "Íå çì³ã çíàöòè FMIFS òî÷êè âõîäó.\n\n" + +STRING_UNKNOW_ARG "Íåâ³äîìèé àðãóìåíò: %S\n" + +STRING_DRIVE_PARM "Íåîáõ³äíèé ïàðàìåòð îïåðàö³¿ â³äñóòí³é.\n\n" + +STRING_ERROR_DRIVE_TYPE "Íå âäàëîñÿ âòñàíâèòè òèï ïðèñòðîþ" + +STRING_INSERT_DISK "Âñòàâòå ÷èñòèé äèñê â ïðèñòð³é %C:\n³ íàòèñí³òü Enter ùîá ïðîäîâæèòè..." + +STRING_NO_VOLUME "Íå âäàëîñÿ âèêîíàòè çàïèò äî ïðèñòðîþ" + +STRING_NO_VOLUME_SIZE "Íå âäàëîñÿ âèçíà÷èòè ðîçì³ð äèñêó" + +STRING_FILESYSTEM "Âèçíà÷åíà ôàéëîâà ñèñòåìà %S.\n" + +STRING_LABEL_NAME_EDIT "Âèçíà÷òå ì³òêó äèñêó %C: " + +STRING_ERROR_LABEL "Áóëî âêàçàíî íåêîððåêòíó ì³òêó.\n" + +STRING_YN_FORMAT "\nÓÂÀÃÀ! ÂÑ² ÄÀÍ² ÍÀ Ô²ÊÑÎÂÀÍÎÌÓ ÄÈÑÊÓ %C:\n\ + ÁÓÄÅ ÂÒÐÀ×ÅÍÎ! \nÐîçïî÷àòè ôîðìàòóâàííÿ(Y/N)? " + +STRING_YES_NO_FAQ "YN" + +STRING_VERIFYING "Ïåðåâ³ðêà" + +STRING_FAST_FMT "Øâèäêå ôîðìàòóâàííÿ" + +STRING_CREATE_FSYS "Ñòâîðåííÿ ôàéëîâî¿ ñèñòåìè.\n" + +STRING_FMT_COMPLETE "Ôîðìàòóâàííÿ çàâåðøåíî.\n" + +STRING_VOL_COMPRESS "Äèñê íå ï³äòðèìóº ñòèñêàííÿ.\n" + +STRING_ENTER_LABEL "Ì³òêà äèñêó (11 ñèìâîë³â,íàòèñí³òü Enter ÿêùî íå òðåáà)? " + +STRING_NO_LABEL "Íå ìîæó âñòàíîâèòè ì³òêó äèñêó" + +STRING_FREE_SPACE "\n%I64d áàéò³â íà äèñêó.\n%I64d áàéò³â íàÿâíî íà äèñêó.\n" + +STRING_SERIAL_NUMBER "\nÑåð³éíèé íîìåð äèñêó - %04X-%04X\n" +} Modified: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/format/rsrc.rc (original) +++ trunk/reactos/base/system/format/rsrc.rc Tue Sep 25 14:08:39 2007 @@ -13,3 +13,4 @@ #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/base/system/regsvr32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/uk-UA.rc (added) +++ trunk/reactos/base/system/regsvr32/lang/uk-UA.rc Tue Sep 25 14:08:39 2007 @@ -1,0 +1,29 @@ +#include "resource.h" + + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +IDS_UsageMessage, "%s\n\nÂèêîðèñòàííÿ: regsvr32 [/u] [/s] [/c] [/n] [/i[:ïàðàìåòðè]] íàçâà_dll\n\ +/u - Â³äì³íèòè ðåºñòðàö³þ ñåðâåðà\n\ +/s - Òèõèé ðåæèì: Íå âèâîäèòè ïîâ³äîìëåíü\n\ +/c - Âèâ³ä â êîíñîëü\n\ +/i - Âèêëèêàòè DllInstall ç äîäàòêîâèìè ïàðàìåòðàìè [ïàðàìåòðè]; Êîëè âèêîðèñòîâóºòüñÿ êëþ÷ /u âèêëèêàºòüñÿ DllUninstall\n\ +/n - Íå âèêëèêàòè DllRegisterServer; öåé êëþ÷ ìàº âèêîðèñòîâóâàòèñÿ ç /i" + +IDS_NoDllSpecified, "Íå âêàçàíî ³ì'ÿ DLL." + +IDS_InvalidFlag, "Íåâ³äîìèé êëþ÷: %s" + +IDS_SwitchN_NoI, "Íåâ³äîìèé êëþ÷: /n âèêîðèñòîâóºòüñÿ ëèøå ç êëþ÷åì /i" + +IDS_DllNotLoaded, "LoadLibrary('%s') çàâåðøèâñÿ àâàð³éíî.\nGetLastError ïîâåðíóëî 0x%08x." + +IDS_MissingEntry, "%s áóëî çàïóùåíî, àëå òî÷êà âõîäó äëÿ %s íå çíàéäåíî.\n\n\ +%s ìîæå íå åêñïîðòóâàòèñü, ÷è â ïàì'ÿò³ ëåæèòü ïîøêîäæåíà âåðñ³ÿ %s. Äëÿ òîãî ùîá çíàéòè ³ âèäàëòè %s, âèêîðèñòîâóéòå PView." + +IDS_FailureMessage, "%s â %s çàâåðøèëîñÿ àâàð³éíî.\nÊîä çàâåðøåííÿ: 0x%08x" + +IDS_SuccessMessage "%s â %s óñï³øíî âèêîíàíî." +} Modified: trunk/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.… ============================================================================== --- trunk/reactos/base/system/regsvr32/rsrc.rc (original) +++ trunk/reactos/base/system/regsvr32/rsrc.rc Tue Sep 25 14:08:39 2007 @@ -15,3 +15,4 @@ #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc"

1 0

[dreimer] 29196: Next try. Hopefully with Vista Support.
by dreimer＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: dreimer Date: Tue Sep 25 00:37:35 2007 New Revision: 29196 URL: http://svn.reactos.org/svn/reactos?rev=29196&view=rev Log: Next try. Hopefully with Vista Support. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh trunk/tools/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Tue Sep 25 00:37:35 2007 @@ -116,6 +116,7 @@ set _MINGWVERSION=4.1.3 set HOST_CFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include" set HOST_CPPFLAGS=-I"%ROSBEBASEDIR%\4.1.3\include" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3" -I"%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3\mingw32" -I"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include" + set HOST_LFLAGS=-L"%ROSBEBASEDIR%\4.1.3\lib" -L"%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3" echo ******************************************************************************* echo * * Modified: trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-4.… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh (original) +++ trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh Tue Sep 25 00:37:35 2007 @@ -1,4 +1,4 @@ -Section "-MinGW, GCC v4.1.3 and NASM 0.99.02" SEC01 +Section "-MinGW, GCC v4.1.3 and NASM 0.99.03" SEC01 SetOutPath "$INSTDIR\4.1.3\" SetOverwrite try File /r Components\4.1.3\*.* Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Tue Sep 25 00:37:35 2007 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "0.3.8.0" +!define PRODUCT_VERSION "0.3.8.1" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -18,7 +18,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "0.3.8.0" +VIAddVersionKey /LANG=1033 "FileVersion" "0.3.8.1" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -26,7 +26,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "0.3.8.0" +VIProductVersion "0.3.8.1" CRCCheck force SetCompressor /FINAL /SOLID lzma

1 0

[greatlrd] 29195: clean up : move EngWideCharToMultiByte from stubs.c to eng.c and mark it as implement
by greatlrd＠svn.reactos.org 24 Sep '07

24 Sep '07

Author: greatlrd Date: Mon Sep 24 23:17:15 2007 New Revision: 29195 URL: http://svn.reactos.org/svn/reactos?rev=29195&view=rev Log: clean up : move EngWideCharToMultiByte from stubs.c to eng.c and mark it as implement Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/eng.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 (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Mon Sep 24 23:17:15 2007 @@ -2282,9 +2282,6 @@ return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits); } - - - /* * @unimplemented */ @@ -2295,30 +2292,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - - - -/* - * @unimplemented - */ -INT STDCALL -EngWideCharToMultiByte( UINT CodePage, - LPWSTR WideCharString, - INT BytesInWideCharString, - LPSTR MultiByteString, - INT BytesInMultiByteString) -{ - return WideCharToMultiByte( - CodePage, - 0, - WideCharString, - (BytesInWideCharString/sizeof(WCHAR)), /* Bytes to (in WCHARs) */ - MultiByteString, - BytesInMultiByteString, - NULL, - NULL); -} - /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c Mon Sep 24 23:17:15 2007 @@ -17,6 +17,52 @@ EngAcquireSemaphore ( IN HSEMAPHORE hsem ) { RtlEnterCriticalSection((PRTL_CRITICAL_SECTION)hsem); +} + + +/* + * @unimplemented + */ +BOOL +copy_my_glyphset( FD_GLYPHSET *dst_glyphset , FD_GLYPHSET * src_glyphset, ULONG Size) +{ + BOOL retValue = FALSE; + + memcpy(src_glyphset, dst_glyphset, Size); + if (src_glyphset->cRuns == 0) + { + retValue = TRUE; + } + + /* FIXME copy wrun */ + return retValue; +} + +FD_GLYPHSET* STDCALL +EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) +{ + FD_GLYPHSET * ntfd_glyphset; + FD_GLYPHSET * myfd_glyphset = NULL; + + ntfd_glyphset = NtGdiEngComputeGlyphSet(nCodePage,nFirstChar,cChars); + + if (!ntfd_glyphset) + { + if (ntfd_glyphset->cjThis) + { + myfd_glyphset = GlobalAlloc(0,ntfd_glyphset->cjThis); + + if (!myfd_glyphset) + { + if (copy_my_glyphset(myfd_glyphset,ntfd_glyphset,ntfd_glyphset->cjThis) == FALSE) + { + GlobalFree(myfd_glyphset); + myfd_glyphset = NULL; + } + } + } + } + return myfd_glyphset; } /* @@ -160,47 +206,20 @@ RtlLeaveCriticalSection( (PRTL_CRITICAL_SECTION) hsem); } -BOOL -copy_my_glyphset( FD_GLYPHSET *dst_glyphset , FD_GLYPHSET * src_glyphset, ULONG Size) -{ - BOOL retValue = FALSE; - - memcpy(src_glyphset, dst_glyphset, Size); - if (src_glyphset->cRuns == 0) - { - retValue = TRUE; - } - - /* FIXME copy wrun */ - return retValue; -} - -/* - * @unimplemented - */ -FD_GLYPHSET* STDCALL -EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) -{ - FD_GLYPHSET * ntfd_glyphset; - FD_GLYPHSET * myfd_glyphset = NULL; - - ntfd_glyphset = NtGdiEngComputeGlyphSet(nCodePage,nFirstChar,cChars); - - if (!ntfd_glyphset) - { - if (ntfd_glyphset->cjThis) - { - myfd_glyphset = GlobalAlloc(0,ntfd_glyphset->cjThis); - - if (!myfd_glyphset) - { - if (copy_my_glyphset(myfd_glyphset,ntfd_glyphset,ntfd_glyphset->cjThis) == FALSE) - { - GlobalFree(myfd_glyphset); - myfd_glyphset = NULL; - } - } - } - } - return myfd_glyphset; -} + + + +/* + * @implemented + */ +INT +STDCALL +EngWideCharToMultiByte( UINT CodePage, + LPWSTR WideCharString, + INT BytesInWideCharString, + LPSTR MultiByteString, + INT BytesInMultiByteString) +{ + return WideCharToMultiByte(CodePage, 0, WideCharString, (BytesInWideCharString/sizeof(WCHAR)), + MultiByteString, BytesInMultiByteString, NULL, NULL); +}

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