Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 30850: Fix typos and add check for DC type object.
by jimtabor＠svn.reactos.org 29 Nov '07

29 Nov '07

Author: jimtabor Date: Thu Nov 29 06:32:23 2007 New Revision: 30850 URL: http://svn.reactos.org/svn/reactos?rev=30850&view=rev Log: Fix typos and add check for DC type object. Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Thu Nov 29 06:32:23 2007 @@ -98,7 +98,8 @@ INT i; PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; if (Dc_Attr->flXform & ( DEVICE_TO_WORLD_INVALID | // Force a full recalibration! PAGE_XLATE_CHANGED | // Changes or Updates have been made, @@ -125,7 +126,8 @@ INT i; PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; if (Dc_Attr->flXform & ( PAGE_XLATE_CHANGED | // Check for Changes and Updates PAGE_EXTENTS_CHANGED | @@ -153,7 +155,8 @@ { PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; if ( lpPoint ) { @@ -234,7 +237,8 @@ #endif PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_DC)) return FALSE; /* Check that graphics mode is GM_ADVANCED */ if ( Dc_Attr->iGraphicsMode != GM_ADVANCED ) return FALSE; @@ -251,7 +255,8 @@ { PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; if ((Dc_Attr->flXform & PAGE_EXTENTS_CHANGED) && (Dc_Attr->iMapMode == MM_ISOTROPIC)) // Something was updated, go to kernel. @@ -274,7 +279,8 @@ { PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; lpPoint->x = Dc_Attr->ptlViewportOrg.x; lpPoint->y = Dc_Attr->ptlViewportOrg.y; if (Dc_Attr->dwLayout & LAYOUT_RTL) lpPoint->x = -lpPoint->x; @@ -292,7 +298,8 @@ { PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; lpSize->cx = Dc_Attr->szlWindowExt.cx; lpSize->cy = Dc_Attr->szlWindowExt.cy; if (Dc_Attr->dwLayout & LAYOUT_RTL) lpSize->cx = -lpSize->cx; @@ -310,7 +317,8 @@ { PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; lpPoint->x = Dc_Attr->ptlWindowOrg.x; lpPoint->y = Dc_Attr->ptlWindowOrg.y; return TRUE; @@ -349,13 +357,17 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; if (lpSize) { lpSize->cx = Dc_Attr->szlWindowExt.cx; lpSize->cy = Dc_Attr->szlWindowExt.cy; } + + if ((Dc_Attr->ptlWindowExt.cx == nXExtent) && (Dc_Attr->ptlWindowExt.cy == nYExtent)) + return TRUE; if ((Dc_Attr->iMapMode == MM_ISOTROPIC) && (Dc_Attr->iMapMode == MM_ANISOTROPIC)) { @@ -409,7 +421,8 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; if (lpPoint) { @@ -471,13 +484,14 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; if (lpSize) { lpSize->cx = Dc_Attr->szlWindowExt.cx; lpSize->cy = Dc_Attr->szlWindowExt.cy; - if (Dc_Attr->dwLayout & LAYOUT_RTL) -lpSize->cx; + if (Dc_Attr->dwLayout & LAYOUT_RTL) lpSize->cx = -lpSize->cx; } if (Dc_Attr->dwLayout & LAYOUT_RTL) @@ -542,15 +556,17 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; if (lpPoint) { lpPoint->x = Dc_Attr->ptlViewportOrg.x; lpPoint->y = Dc_Attr->ptlViewportOrg.y; - if (Dc_Attr->dwLayout & LAYOUT_RTL) -lpPoint->x; + if (Dc_Attr->dwLayout & LAYOUT_RTL) lpPoint->x = -lpPoint->x; } Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + if (Dc_Attr->dwLayout & LAYOUT_RTL) X = -X; Dc_Attr->ptlViewportOrg.x = X; Dc_Attr->ptlViewportOrg.y = Y; return TRUE; @@ -567,7 +583,8 @@ ) { PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return GDI_ERROR; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return GDI_ERROR; return Dc_Attr->dwLayout; } @@ -600,7 +617,8 @@ } } #endif - if (!GdiIsHandleValid((HGDIOBJ) hdc)) return GDI_ERROR; + if (!GdiIsHandleValid((HGDIOBJ) hdc) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return GDI_ERROR; return NtGdiSetLayout( hdc, -1, dwLayout); } @@ -611,7 +629,8 @@ STDCALL SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout) { - if (!GdiIsHandleValid((HGDIOBJ) hdc)) return GDI_ERROR; + if (!GdiIsHandleValid((HGDIOBJ) hdc) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return GDI_ERROR; return NtGdiSetLayout( hdc, wox, dwLayout); } Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Thu Nov 29 06:32:23 2007 @@ -55,7 +55,8 @@ GdiGetCodePage(HDC hdc) { PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return 0; if (Dc_Attr->ulDirty_ & DIRTY_CHARSET) return LOWORD(NtGdiGetCharSet(hdc)); return LOWORD(Dc_Attr->iCS_CP); } @@ -72,7 +73,8 @@ { PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hDc, (PVOID) &Dc_Attr)) return 0; + if (!GdiGetHandleUserData((HGDIOBJ) hDc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hDc) == GDI_OBJECT_TYPE_DC)) return 0; return Dc_Attr->lTextExtra; // return GetDCDWord( hDc, GdiGetTextCharExtra, 0); } @@ -442,7 +444,8 @@ return MFDRV_SetTextCharacterExtra( hDC, CharExtra ); // Wine port. } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return cExtra; + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_DC)) return cExtra; if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hDC) { @@ -467,7 +470,8 @@ GetTextAlign(HDC hdc) { PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return 0; return Dc_Attr->lTextAlign; } @@ -481,7 +485,8 @@ GetTextColor(HDC hdc) { PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return 0; return Dc_Attr->ulForegroundClr; } @@ -498,7 +503,8 @@ PDC_ATTR Dc_Attr; INT OldMode = 0; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return OldMode; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return OldMode; #if 0 if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -521,7 +527,11 @@ #endif OldMode = Dc_Attr->lTextAlign; Dc_Attr->lTextAlign = fMode; // Raw - Dc_Attr->flTextAlign = fMode & 0x1f; + if (Dc_Attr->dwLayout & LAYOUT_RTL) + { + if(!(fMode & TA_CENTER)) fMode |= TA_RIGHT; + } + Dc_Attr->flTextAlign = fMode & (TA_BASELINE|TA_UPDATECP|TA_CENTER); return OldMode; } @@ -539,8 +549,6 @@ { PDC_ATTR Dc_Attr; COLORREF OldColor = CLR_INVALID; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return OldColor; #if 0 if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -561,6 +569,9 @@ } } #endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return OldColor; + OldColor = (COLORREF) Dc_Attr->ulForegroundClr; Dc_Attr->ulForegroundClr = (ULONG) crColor; @@ -584,7 +595,6 @@ ) { PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; #if 0 if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -596,6 +606,9 @@ return FALSE; } #endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) && + (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_DC)) return FALSE; + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) { if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY)

1 0

[tkreuzer] 30849: Another test for AddFontResourceEx
by tkreuzer＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: tkreuzer Date: Thu Nov 29 02:45:23 2007 New Revision: 30849 URL: http://svn.reactos.org/svn/reactos?rev=30849&view=rev Log: Another test for AddFontResourceEx Modified: trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c Modified: trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/A… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c (original) +++ trunk/rostests/apitests/gdi32api/tests/AddFontResourceEx.c Thu Nov 29 02:45:23 2007 @@ -4,6 +4,17 @@ Test_AddFontResourceEx(PTESTINFO pti) { WCHAR szFileName[MAX_PATH]; + + /* Test NULL filename */ + SetLastError(ERROR_SUCCESS); + /* Windows crashes, would need SEH here */ +// TEST(AddFontResourceExW(NULL, 0, 0) != 0); +// TEST(GetLastError() == ERROR_SUCCESS); + + /* Test "" filename */ + SetLastError(ERROR_SUCCESS); + TEST(AddFontResourceExW(L"", 0, 0) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); GetEnvironmentVariableW(L"systemroot", szFileName, MAX_PATH); wcscat(szFileName, L"\\Fonts\\cour.ttf");

1 0

[tkreuzer] 30848: Query the gdi handle table for later use in tests
by tkreuzer＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: tkreuzer Date: Thu Nov 29 02:41:11 2007 New Revision: 30848 URL: http://svn.reactos.org/svn/reactos?rev=30848&view=rev Log: Query the gdi handle table for later use in tests Modified: trunk/rostests/apitests/gdi32api/gdi32api.c trunk/rostests/apitests/gdi32api/gdi32api.h Modified: trunk/rostests/apitests/gdi32api/gdi32api.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi32ap… ============================================================================== --- trunk/rostests/apitests/gdi32api/gdi32api.c (original) +++ trunk/rostests/apitests/gdi32api/gdi32api.c Thu Nov 29 02:41:11 2007 @@ -1,6 +1,7 @@ #include "gdi32api.h" HINSTANCE g_hInstance; +PGDI_TABLE_ENTRY GdiHandleTable; BOOL IsFunctionPresent(LPWSTR lpszFunction) @@ -14,6 +15,20 @@ LPSTR lpCmdLine, int nCmdShow) { + GDIQUERYPROC GdiQueryTable; + g_hInstance = hInstance; + + GdiQueryTable = (GDIQUERYPROC)GetProcAddress(GetModuleHandleW(L"GDI32.DLL"), "GdiQueryTable"); + if(!GdiQueryTable) + { + return -1; + } + GdiHandleTable = GdiQueryTable(); + if(!GdiHandleTable) + { + return -1; + } + return TestMain(L"gdi32api", L"gdi32.dll"); } Modified: trunk/rostests/apitests/gdi32api/gdi32api.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi32ap… ============================================================================== --- trunk/rostests/apitests/gdi32api/gdi32api.h (original) +++ trunk/rostests/apitests/gdi32api/gdi32api.h Thu Nov 29 02:41:11 2007 @@ -5,6 +5,7 @@ #include "gdi.h" extern HINSTANCE g_hInstance; +extern PGDI_TABLE_ENTRY GdiHandleTable; #endif /* _GDITEST_H */

1 0

[tkreuzer] 30847: - some more tests for GetObject
by tkreuzer＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: tkreuzer Date: Thu Nov 29 02:39:45 2007 New Revision: 30847 URL: http://svn.reactos.org/svn/reactos?rev=30847&view=rev Log: - some more tests for GetObject Modified: trunk/rostests/apitests/gdi32api/tests/GetStockObject.c Modified: trunk/rostests/apitests/gdi32api/tests/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetStockObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetStockObject.c Thu Nov 29 02:39:45 2007 @@ -4,6 +4,7 @@ /* Test limits and error */ SetLastError(ERROR_SUCCESS); RTEST(GetStockObject(0) != NULL); + TEST(GetStockObject(20) != NULL); TEST(GetStockObject(21) != NULL); RTEST(GetStockObject(-1) == NULL); RTEST(GetStockObject(9) == NULL); @@ -14,12 +15,27 @@ RTEST((UINT)GetStockObject(WHITE_BRUSH) && GDI_HANDLE_STOCK_MASK); /* Test for correct types */ - RTEST(GDI_HANDLE_GET_TYPE(GetStockObject(WHITE_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); - TEST(GDI_HANDLE_GET_TYPE(GetStockObject(DC_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); - RTEST(GDI_HANDLE_GET_TYPE(GetStockObject(WHITE_PEN)) == GDI_OBJECT_TYPE_PEN); - TEST(GDI_HANDLE_GET_TYPE(GetStockObject(DC_PEN)) == GDI_OBJECT_TYPE_PEN); - TEST(GDI_HANDLE_GET_TYPE(GetStockObject(ANSI_VAR_FONT)) == GDI_OBJECT_TYPE_FONT); - RTEST(GDI_HANDLE_GET_TYPE(GetStockObject(DEFAULT_PALETTE)) == GDI_OBJECT_TYPE_PALETTE); + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(WHITE_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); /* 0 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(LTGRAY_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); /* 1 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(GRAY_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); /* 1 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(DKGRAY_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); /* 1 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(BLACK_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); /* 1 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(NULL_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); /* 1 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(WHITE_PEN)) == GDI_OBJECT_TYPE_PEN); /* 6 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(BLACK_PEN)) == GDI_OBJECT_TYPE_PEN); /* 7 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(NULL_PEN)) == GDI_OBJECT_TYPE_PEN); /* 8 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(OEM_FIXED_FONT)) == GDI_OBJECT_TYPE_FONT); /* 10 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(ANSI_FIXED_FONT)) == GDI_OBJECT_TYPE_FONT); /* 11 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(ANSI_VAR_FONT)) == GDI_OBJECT_TYPE_FONT); /* 12 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(SYSTEM_FONT)) == GDI_OBJECT_TYPE_FONT); /* 13 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(DEVICE_DEFAULT_FONT)) == GDI_OBJECT_TYPE_FONT); /* 14 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(DEFAULT_PALETTE)) == GDI_OBJECT_TYPE_PALETTE); /* 15 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(SYSTEM_FIXED_FONT)) == GDI_OBJECT_TYPE_FONT); /* 16 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(DEFAULT_GUI_FONT)) == GDI_OBJECT_TYPE_FONT); /* 17 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(DC_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); /* 18 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(DC_PEN)) == GDI_OBJECT_TYPE_PEN); /* 19 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(20)) == GDI_OBJECT_TYPE_COLORSPACE); /* 20 */ + TEST(GDI_HANDLE_GET_TYPE(GetStockObject(21)) == GDI_OBJECT_TYPE_BITMAP); /* 21 */ return APISTATUS_NORMAL; }

1 0

[cfinck] 30846: Looks like my previous changes were already enough, so we can finally remove this hack :-) See issue #2779 for more details.
by cfinck＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: cfinck Date: Thu Nov 29 02:02:12 2007 New Revision: 30846 URL: http://svn.reactos.org/svn/reactos?rev=30846&view=rev Log: Looks like my previous changes were already enough, so we can finally remove this hack :-) See issue #2779 for more details. Modified: trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=30846&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Thu Nov 29 02:02:12 2007 @@ -8,10 +8,6 @@ TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing -D__REACTOS__ $(HOST_CFLAGS) TOOLS_CPPFLAGS = -Wall -Wpointer-arith -D__REACTOS__ $(HOST_CPPFLAGS) TOOLS_LFLAGS = $(HOST_LFLAGS) - -# HACK: Remove those lines once host tools don't use target headers anymore -TOOLS_CFLAGS += -D__i386__ -TOOLS_CPPFLAGS += -D__i386__ $(TOOLS_INT): | $(INTERMEDIATE) $(ECHO_MKDIR)

1 0

[fireball] 30845: - Cleanup kdb_cli's code: be consistent in used types, don't use unsigned vars and then check if it's below 0, don't use inline assembly if there are reactos intrinsics for this.
by fireball＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: fireball Date: Thu Nov 29 01:50:55 2007 New Revision: 30845 URL: http://svn.reactos.org/svn/reactos?rev=30845&view=rev Log: - Cleanup kdb_cli's code: be consistent in used types, don't use unsigned vars and then check if it's below 0, don't use inline assembly if there are reactos intrinsics for this. Modified: trunk/reactos/ntoskrnl/include/internal/ctype.h trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/include/internal/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ctype.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ctype.h Thu Nov 29 01:50:55 2007 @@ -40,5 +40,6 @@ extern inline int isdigit(int c); extern inline int isxdigit(int c); extern inline int isprint(int c); +extern inline int isalpha(int c); #endif Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Thu Nov 29 01:50:55 2007 @@ -483,8 +483,8 @@ else if (Argv[0][0] == 'c') /* cregs */ { ULONG Cr0, Cr2, Cr3, Cr4; - KDESCRIPTOR Gdtr, Ldtr, Idtr; - ULONG Tr; + KDESCRIPTOR Gdtr = {0}, Ldtr = {0}, Idtr = {0}; + ULONG Tr = 0; STATIC CONST PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, " WP", NULL, " AM", NULL, NULL, NULL, NULL, NULL, @@ -500,12 +500,12 @@ Cr4 = KdbCurrentTrapFrame->Cr4; /* Get descriptor table regs */ - asm volatile("sgdt %0" : : "m"(Gdtr.Limit)); - asm volatile("sldt %0" : : "m"(Ldtr.Limit)); - asm volatile("sidt %0" : : "m"(Idtr.Limit)); + Ke386GetGlobalDescriptorTable(*(PKDESCRIPTOR)&Gdtr.Limit); + Ke386GetLocalDescriptorTable(Ldtr.Limit); + Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&Idtr.Limit); /* Get the task register */ - asm volatile("str %0" : "=g"(Tr)); + Ke386GetTr(Tr); /* Display the control registers */ KdbpPrint("CR0 0x%08x ", Cr0); @@ -842,7 +842,8 @@ KDB_BREAKPOINT_TYPE Type; UCHAR Size = 0; KDB_ACCESS_TYPE AccessType = 0; - UINT AddressArgIndex, ConditionArgIndex, i; + ULONG AddressArgIndex, i; + LONG ConditionArgIndex; BOOLEAN Global = TRUE; if (Argv[0][2] == 'x') /* software breakpoint */ @@ -1188,8 +1189,8 @@ { return TRUE; } - KdbpPrint("Attached to process 0x%08x, thread 0x%08x.\n", (UINT)ul, - (UINT)KdbCurrentThread->Cid.UniqueThread); + KdbpPrint("Attached to process 0x%08x, thread 0x%08x.\n", (ULONG)ul, + (ULONG)KdbCurrentThread->Cid.UniqueThread); } else { @@ -1289,10 +1290,7 @@ STATIC BOOLEAN KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[]) { - struct __attribute__((packed)) { - USHORT Limit; - ULONG Base; - } Reg; + KDESCRIPTOR Reg = {0}; ULONG SegDesc[2]; ULONG SegBase; ULONG SegLimit; @@ -1305,7 +1303,7 @@ if (Argv[0][0] == 'i') { /* Read IDTR */ - asm volatile("sidt %0" : : "m"(Reg)); + Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&Reg.Limit); if (Reg.Limit < 7) { @@ -1362,14 +1360,14 @@ if (Argv[0][0] == 'g') { /* Read GDTR */ - asm volatile("sgdt %0" : : "m"(Reg)); + Ke386GetGlobalDescriptorTable(*(PKDESCRIPTOR)&Reg.Limit); i = 8; } else { ASSERT(Argv[0][0] == 'l'); /* Read LDTR */ - asm volatile("sldt %0" : : "m"(Reg)); + Ke386GetLocalDescriptorTable(Reg.Limit); i = 0; ul = 1 << 2; } @@ -1567,7 +1565,7 @@ STATIC BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]) { - ULONG l; + LONG l; BOOLEAN First; PCHAR pend = 0; KDB_ENTER_CONDITION ConditionFirst = KdbDoNotEnter; @@ -1765,9 +1763,9 @@ STATIC BOOLEAN TerminalReportsSize = TRUE; CHAR c = '\0'; PCHAR p, p2; - UINT Length; - UINT i, j; - INT RowsPrintedByTerminal; + ULONG Length; + ULONG i, j; + LONG RowsPrintedByTerminal; ULONG ScanCode; va_list ap; @@ -2210,7 +2208,7 @@ * \retval TRUE Don't continue execution. * \retval FALSE Continue execution (leave KDB) */ -STATIC BOOL +STATIC BOOLEAN KdbpDoCommand( IN PCHAR Command) { @@ -2390,7 +2388,7 @@ HANDLE hFile = NULL; INT FileSize; PCHAR FileBuffer; - ULONG OldEflags; + ULONG OldEflags = 0; /* Initialize the object attributes */ RtlInitUnicodeString(&FileName, L"\\SystemRoot\\system32\\drivers\\etc\\KDBinit");

1 0

[weiden] 30844: Fix typo in RegpApplyRestrictions (patch submitted to WINE by Andrew Talbot)
by weiden＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: weiden Date: Thu Nov 29 01:37:23 2007 New Revision: 30844 URL: http://svn.reactos.org/svn/reactos?rev=30844&view=rev Log: Fix typo in RegpApplyRestrictions (patch submitted to WINE by Andrew Talbot) Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Thu Nov 29 01:37:23 2007 @@ -1721,7 +1721,7 @@ if ((dwFlags & RRF_RT_DWORD) == RRF_RT_DWORD) cbExpect = 4; - else if ((dwFlags & RRF_RT_DWORD) == RRF_RT_QWORD) + else if ((dwFlags & RRF_RT_QWORD) == RRF_RT_QWORD) cbExpect = 8; if (cbExpect && cbData != cbExpect)

1 0

[cfinck] 30843: Don't define the "min" and "max" macros in the general "typedefs.h", they conflict with the similar functions in the "std" namespace in C++ apps then. Instead just define them in widl, this is currently the only place where we need them.
by cfinck＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: cfinck Date: Thu Nov 29 01:01:17 2007 New Revision: 30843 URL: http://svn.reactos.org/svn/reactos?rev=30843&view=rev Log: Don't define the "min" and "max" macros in the general "typedefs.h", they conflict with the similar functions in the "std" namespace in C++ apps then. Instead just define them in widl, this is currently the only place where we need them. Modified: trunk/reactos/include/host/typedefs.h trunk/reactos/tools/widl/widltypes.h Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h (original) +++ trunk/reactos/include/host/typedefs.h Thu Nov 29 01:01:17 2007 @@ -227,9 +227,6 @@ typedef const UNICODE_STRING *PCUNICODE_STRING; /* Widely used macros */ -#define min(a, b) ((a) < (b) ? (a) : (b)) -#define max(a,b) ((a) < (b) ? (b) : (a)) - #define LOBYTE(w) ((BYTE)(w)) #define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF)) #define LOWORD(l) ((WORD)((DWORD_PTR)(l))) Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h (original) +++ trunk/reactos/tools/widl/widltypes.h Thu Nov 29 01:01:17 2007 @@ -26,6 +26,9 @@ #define S_FALSE ((HRESULT)0x00000001L) #define E_OUTOFMEMORY ((HRESULT)0x8007000EL) #define TYPE_E_IOERROR ((HRESULT)0x80028CA2L) + +#define min(a, b) ((a) < (b) ? (a) : (b)) +#define max(a,b) ((a) < (b) ? (b) : (a)) #include <stdarg.h> #include "guiddef.h"

1 0

[cfinck] 30842: Change widl to use only host headers. Part of my ongoing attempt to separate host and target headers properly (see also bug 2779) - Add a new header "nls.h" in the host directory, which contains a bunch of definitions needed for both widl and wrc. - Add some more important defines to "typedefs.h".
by cfinck＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: cfinck Date: Thu Nov 29 00:40:39 2007 New Revision: 30842 URL: http://svn.reactos.org/svn/reactos?rev=30842&view=rev Log: Change widl to use only host headers. Part of my ongoing attempt to separate host and target headers properly (see also bug 2779) - Add a new header "nls.h" in the host directory, which contains a bunch of definitions needed for both widl and wrc. - Add some more important defines to "typedefs.h". Added: trunk/reactos/include/host/nls.h (with props) Modified: trunk/reactos/include/host/typedefs.h trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/widl.mak trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c trunk/reactos/tools/wrc/wrcrostypes.h Added: trunk/reactos/include/host/nls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/nls.h?rev=308… ============================================================================== --- trunk/reactos/include/host/nls.h (added) +++ trunk/reactos/include/host/nls.h Thu Nov 29 00:40:39 2007 @@ -1,0 +1,134 @@ +/* + PROJECT: ReactOS + LICENSE: GPL v2 or any later version + FILE: include/host/nls.h + PURPOSE: NLS definitions for host tools + COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> +*/ + +#ifndef _HOST_NLS_H +#define _HOST_NLS_H + +#include <host/typedefs.h> + +typedef DWORD LCID; + +#define MAKELANGID(p,s) ((((WORD)(s))<<10)|(WORD)(p)) +#define PRIMARYLANGID(l) ((WORD)(l)&0x3ff) +#define SUBLANGID(l) ((WORD)(l)>>10) +#define LANGIDFROMLCID(l) ((WORD)(l)) + +#define LANG_AFRIKAANS 0x36 +#define LANG_ALBANIAN 0x1c +#define LANG_ARABIC 0x01 +#define LANG_ARMENIAN 0x2b +#define LANG_ASSAMESE 0x4d +#define LANG_AZERI 0x2c +#define LANG_BASQUE 0x2d +#define LANG_BELARUSIAN 0x23 +#define LANG_BENGALI 0x45 +#define LANG_BULGARIAN 0x02 +#define LANG_CATALAN 0x03 +#define LANG_CHINESE 0x04 +#define LANG_CROATIAN 0x1a +#define LANG_CZECH 0x05 +#define LANG_DANISH 0x06 +#define LANG_DIVEHI 0x65 +#define LANG_DUTCH 0x13 +#define LANG_ENGLISH 0x09 +#define LANG_ESTONIAN 0x25 +#define LANG_FAEROESE 0x38 +#define LANG_FARSI 0x29 +#define LANG_FINNISH 0x0b +#define LANG_FRENCH 0x0c +#define LANG_GALICIAN 0x56 +#define LANG_GEORGIAN 0x37 +#define LANG_GERMAN 0x07 +#define LANG_GREEK 0x08 +#define LANG_GUJARATI 0x47 +#define LANG_HEBREW 0x0d +#define LANG_HINDI 0x39 +#define LANG_HUNGARIAN 0x0e +#define LANG_ICELANDIC 0x0f +#define LANG_INDONESIAN 0x21 +#define LANG_IRISH 0x3c +#define LANG_ITALIAN 0x10 +#define LANG_JAPANESE 0x11 +#define LANG_KANNADA 0x4b +#define LANG_KASHMIRI 0x60 +#define LANG_KAZAK 0x3f +#define LANG_KONKANI 0x57 +#define LANG_KOREAN 0x12 +#define LANG_KYRGYZ 0x40 +#define LANG_LATVIAN 0x26 +#define LANG_LITHUANIAN 0x27 +#define LANG_MACEDONIAN 0x2f +#define LANG_MANIPURI 0x58 +#define LANG_MALAY 0x3e +#define LANG_MALAYALAM 0x4c +#define LANG_MARATHI 0x4e +#define LANG_MONGOLIAN 0x50 +#define LANG_NEPALI 0x61 +#define LANG_NEUTRAL 0x00 +#define LANG_NORWEGIAN 0x14 +#define LANG_ORIYA 0x48 +#define LANG_POLISH 0x15 +#define LANG_PORTUGUESE 0x16 +#define LANG_PUNJABI 0x46 +#define LANG_ROMANIAN 0x18 +#define LANG_ROMANSH 0x17 +#define LANG_RUSSIAN 0x19 +#define LANG_SAMI 0x3b +#define LANG_SANSKRIT 0x4f +#define LANG_SERBIAN 0x1a +#define LANG_SINDHI 0x59 +#define LANG_SLOVAK 0x1b +#define LANG_SLOVENIAN 0x24 +#define LANG_SPANISH 0x0a +#define LANG_SWAHILI 0x41 +#define LANG_SWEDISH 0x1d +#define LANG_SYRIAC 0x5a +#define LANG_TAJIK 0x28 +#define LANG_TAMIL 0x49 +#define LANG_TATAR 0x44 +#define LANG_TELUGU 0x4a +#define LANG_THAI 0x1e +#define LANG_TURKISH 0x1f +#define LANG_UKRAINIAN 0x22 +#define LANG_URDU 0x20 +#define LANG_UZBEK 0x43 +#define LANG_VIETNAMESE 0x2a + +/* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ESPERANTO 0x8f +#define LANG_WALON 0x90 +#define LANG_CORNISH 0x91 +#define LANG_WELSH 0x92 +#define LANG_BRETON 0x93 + +/* FIXME: these are not in the Windows header */ +#define LANG_GAELIC 0x94 +#define LANG_MALTESE 0x3a +#define LANG_RHAETO_ROMANCE 0x17 +#define LANG_SAAMI 0x3b +#define LANG_SORBIAN 0x2e +#define LANG_LOWER_SORBIAN 0x2e +#define LANG_UPPER_SORBIAN 0x2e +#define LANG_SUTU 0x30 +#define LANG_TSONGA 0x31 +#define LANG_TSWANA 0x32 +#define LANG_VENDA 0x33 +#define LANG_XHOSA 0x34 +#define LANG_ZULU 0x35 + +/* Sublanguages */ +#define SUBLANG_AZERI_CYRILLIC 0x02 +#define SUBLANG_CHINESE_SINGAPORE 0x04 +#define SUBLANG_CHINESE_SIMPLIFIED 0x02 +#define SUBLANG_DEFAULT 0x01 +#define SUBLANG_NEUTRAL 0x00 +#define SUBLANG_NORWEGIAN_NYNORSK 0x02 +#define SUBLANG_SERBIAN_CYRILLIC 0x03 +#define SUBLANG_UZBEK_CYRILLIC 0x02 + +#endif Propchange: trunk/reactos/include/host/nls.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h (original) +++ trunk/reactos/include/host/typedefs.h Thu Nov 29 00:40:39 2007 @@ -4,6 +4,7 @@ FILE: include/host/typedefs.h PURPOSE: Type definitions and useful macros for host tools COPYRIGHT: Copyright 2007 Hervé Poussineau + Copyright 2007 Colin Finck <mail(a)colinfinck.de> */ #ifndef _TYPEDEFS_HOST_H @@ -21,6 +22,7 @@ #error Unknown compiler #endif +/* Function attributes for GCC */ #if !defined(_MSC_VER) && !defined(__fastcall) #define __fastcall __attribute__((fastcall)) #endif @@ -31,6 +33,7 @@ #define __stdcall __attribute__((stdcall)) #endif +/* Basic definitions */ #define UNIMPLEMENTED { printf("%s unimplemented\n", __FUNCTION__); exit(1); } #define ASSERT(x) assert(x) #define ASSERTMSG(x, m) assert(x) @@ -53,6 +56,7 @@ #define ANYSIZE_ARRAY 1 +/* Type definitions */ typedef void VOID, *PVOID, *HANDLE; typedef HANDLE HKEY, *PHKEY; typedef unsigned char UCHAR, *PUCHAR, BYTE, *LPBYTE; @@ -66,6 +70,8 @@ typedef unsigned int ULONG, *PULONG, DWORD, *LPDWORD; typedef long long LONGLONG; typedef unsigned long long ULONGLONG; +typedef int INT; +typedef unsigned int UINT, *PUINT, *LPUINT; typedef UCHAR BOOLEAN, *PBOOLEAN; typedef int BOOL; typedef long int W64 LONG_PTR, *PLONG_PTR; @@ -75,9 +81,11 @@ typedef const unsigned short *PCWSTR, *LPCWSTR; typedef int NTSTATUS; typedef int POOL_TYPE; +typedef LONG HRESULT; #define MAXUSHORT USHRT_MAX +/* Widely used structures */ #include <host/pshpack4.h> typedef struct _RTL_BITMAP { @@ -122,9 +130,7 @@ } UNICODE_STRING, *PUNICODE_STRING; #include <host/poppack.h> -// -// List Functions -// +/* List Functions */ static __inline VOID InitializeListHead( @@ -220,13 +226,25 @@ typedef const UNICODE_STRING *PCUNICODE_STRING; -#define NT_SUCCESS(x) ((x)>=0) -#define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) -#define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } -#define CONTAINING_RECORD(address, type, field) ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field)))) -#define RtlZeroMemory(Destination, Length) memset(Destination, 0, Length) -#define RtlCopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length) -#define RtlMoveMemory(Destination, Source, Length) memmove(Destination, Source, Length) +/* Widely used macros */ +#define min(a, b) ((a) < (b) ? (a) : (b)) +#define max(a,b) ((a) < (b) ? (b) : (a)) + +#define LOBYTE(w) ((BYTE)(w)) +#define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF)) +#define LOWORD(l) ((WORD)((DWORD_PTR)(l))) +#define HIWORD(l) ((WORD)(((DWORD_PTR)(l)>>16)&0xFFFF)) +#define MAKEWORD(a,b) ((WORD)(((BYTE)(a))|(((WORD)((BYTE)(b)))<<8))) +#define MAKELONG(a,b) ((LONG)(((WORD)(a))|(((DWORD)((WORD)(b)))<<16))) + +#define NT_SUCCESS(x) ((x)>=0) +#define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) +#define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } +#define CONTAINING_RECORD(address, type, field) ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field)))) + +#define RtlZeroMemory(Destination, Length) memset(Destination, 0, Length) +#define RtlCopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length) +#define RtlMoveMemory(Destination, Source, Length) memmove(Destination, Source, Length) /* Prevent inclusion of some other headers */ #define __INTERNAL_DEBUG Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=30… ============================================================================== --- trunk/reactos/tools/widl/client.c (original) +++ trunk/reactos/tools/widl/client.c Thu Nov 29 00:40:39 2007 @@ -29,12 +29,12 @@ #include <ctype.h> #include <signal.h> -#include "windef.h" - #include "widl.h" #include "utils.h" #include "parser.h" #include "header.h" + +#include <host/typedefs.h> #include "widltypes.h" #include "typelib.h" Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=3084… ============================================================================== --- trunk/reactos/tools/widl/hash.c (original) +++ trunk/reactos/tools/widl/hash.c Thu Nov 29 00:40:39 2007 @@ -21,10 +21,7 @@ #include <stdio.h> #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winnls.h" - +#include <host/nls.h> #include "hash.h" static const unsigned char Lookup_16[128 * 3] = { Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=30… ============================================================================== --- trunk/reactos/tools/widl/header.c (original) +++ trunk/reactos/tools/widl/header.c Thu Nov 29 00:40:39 2007 @@ -30,7 +30,6 @@ #include <ctype.h> #include <signal.h> -#include "windef.h" #include "widl.h" #include "utils.h" #include "parser.h" Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c (original) +++ trunk/reactos/tools/widl/parser.tab.c Thu Nov 29 00:40:39 2007 @@ -356,8 +356,6 @@ #include <alloca.h> #endif -#include "windef.h" - #include "widl.h" #include "utils.h" #include "parser.h" Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=30… ============================================================================== --- trunk/reactos/tools/widl/parser.y (original) +++ trunk/reactos/tools/widl/parser.y Thu Nov 29 00:40:39 2007 @@ -30,8 +30,6 @@ #ifdef HAVE_ALLOCA_H #include <alloca.h> #endif - -#include "windef.h" #include "widl.h" #include "utils.h" Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=30… ============================================================================== --- trunk/reactos/tools/widl/server.c (original) +++ trunk/reactos/tools/widl/server.c Thu Nov 29 00:40:39 2007 @@ -35,7 +35,6 @@ #include "utils.h" #include "parser.h" #include "header.h" -#include "windef.h" #include "widl.h" #include "typelib.h" Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c (original) +++ trunk/reactos/tools/widl/typegen.c Thu Nov 29 00:40:39 2007 @@ -37,7 +37,6 @@ #include "utils.h" #include "parser.h" #include "header.h" -#include "windef.h" #include "wine/list.h" #include "widl.h" Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typelib.c (original) +++ trunk/reactos/tools/widl/typelib.c Thu Nov 29 00:40:39 2007 @@ -34,9 +34,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" #include "widl.h" #include "utils.h" Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.… ============================================================================== --- trunk/reactos/tools/widl/typelib_struct.h (original) +++ trunk/reactos/tools/widl/typelib_struct.h Thu Nov 29 00:40:39 2007 @@ -302,7 +302,7 @@ * */ -#include "pshpack1.h" +#include <host/pshpack1.h> typedef struct { /*00*/ DWORD SLTG_magic; /* 0x47544c53 == "SLTG" */ @@ -599,7 +599,7 @@ WORD typeofarray */ -#include "poppack.h" +#include <host/poppack.h> /*---------------------------END--------------------------------------------*/ #endif Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=30… ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Thu Nov 29 00:40:39 2007 @@ -59,7 +59,7 @@ WIDL_HOST_CFLAGS = \ -DINT16=SHORT -DYYDEBUG=1 \ -I$(WIDL_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude/psdk \ + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude \ -I$(INTERMEDIATE_)include $(TOOLS_CFLAGS) WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h (original) +++ trunk/reactos/tools/widl/widltypes.h Thu Nov 29 00:40:39 2007 @@ -21,6 +21,12 @@ #ifndef __WIDL_WIDLTYPES_H #define __WIDL_WIDLTYPES_H +#include <host/typedefs.h> +#define S_OK ((HRESULT)0x00000000L) +#define S_FALSE ((HRESULT)0x00000001L) +#define E_OUTOFMEMORY ((HRESULT)0x8007000EL) +#define TYPE_E_IOERROR ((HRESULT)0x80028CA2L) + #include <stdarg.h> #include "guiddef.h" #include "wine/rpcfc.h" @@ -29,9 +35,6 @@ #define UUID_DEFINED typedef GUID UUID; #endif - -#define TRUE 1 -#define FALSE 0 typedef struct _attr_t attr_t; typedef struct _expr_t expr_t; Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… ============================================================================== --- trunk/reactos/tools/widl/write_msft.c (original) +++ trunk/reactos/tools/widl/write_msft.c Thu Nov 29 00:40:39 2007 @@ -40,10 +40,7 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +#include <host/nls.h> #include "widltypes.h" #include "typelib.h" Modified: trunk/reactos/tools/wrc/wrcrostypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrcrostypes.h?re… ============================================================================== --- trunk/reactos/tools/wrc/wrcrostypes.h (original) +++ trunk/reactos/tools/wrc/wrcrostypes.h Thu Nov 29 00:40:39 2007 @@ -10,19 +10,13 @@ #define _WRC_ROSTYPES_H #include <host/typedefs.h> +#include <host/nls.h> #include <string.h> // Definitions copied from various <win....h> files // We only want to include host headers, so we define them manually -#define LOBYTE(w) ((BYTE)(w)) -#define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF)) -#define LOWORD(l) ((WORD)((DWORD_PTR)(l))) -#define HIWORD(l) ((WORD)(((DWORD_PTR)(l)>>16)&0xFFFF)) -#define MAKELANGID(p,s) ((((WORD)(s))<<10)|(WORD)(p)) #define VS_FFI_SIGNATURE 0xFEEF04BD #define VS_FFI_STRUCVERSION 0x10000 -#define PRIMARYLANGID(l) ((WORD)(l)&0x3ff) -#define SUBLANGID(l) ((WORD)(l)>>10) #define BS_3STATE 5 #define BS_AUTO3STATE 6 @@ -60,104 +54,6 @@ #define WS_POPUPWINDOW 0x80880000 #define WS_TABSTOP 0x10000 #define WS_VISIBLE 0x10000000 - -#define LANG_AFRIKAANS 0x36 -#define LANG_ALBANIAN 0x1c -#define LANG_ARABIC 0x01 -#define LANG_ARMENIAN 0x2b -#define LANG_AZERI 0x2c -#define LANG_BASQUE 0x2d -#define LANG_BELARUSIAN 0x23 -#define LANG_BULGARIAN 0x02 -#define LANG_CATALAN 0x03 -#define LANG_CHINESE 0x04 -#define LANG_CROATIAN 0x1a -#define LANG_CZECH 0x05 -#define LANG_DANISH 0x06 -#define LANG_DIVEHI 0x65 -#define LANG_DUTCH 0x13 -#define LANG_ENGLISH 0x09 -#define LANG_ESTONIAN 0x25 -#define LANG_FAEROESE 0x38 -#define LANG_FARSI 0x29 -#define LANG_FINNISH 0x0b -#define LANG_FRENCH 0x0c -#define LANG_GALICIAN 0x56 -#define LANG_GEORGIAN 0x37 -#define LANG_GERMAN 0x07 -#define LANG_GREEK 0x08 -#define LANG_GUJARATI 0x47 -#define LANG_HEBREW 0x0d -#define LANG_HINDI 0x39 -#define LANG_HUNGARIAN 0x0e -#define LANG_ICELANDIC 0x0f -#define LANG_INDONESIAN 0x21 -#define LANG_ITALIAN 0x10 -#define LANG_JAPANESE 0x11 -#define LANG_KANNADA 0x4b -#define LANG_KAZAK 0x3f -#define LANG_KONKANI 0x57 -#define LANG_KOREAN 0x12 -#define LANG_KYRGYZ 0x40 -#define LANG_LATVIAN 0x26 -#define LANG_LITHUANIAN 0x27 -#define LANG_MACEDONIAN 0x2f -#define LANG_MALAY 0x3e -#define LANG_MARATHI 0x4e -#define LANG_MONGOLIAN 0x50 -#define LANG_NEUTRAL 0x00 -#define LANG_NORWEGIAN 0x14 -#define LANG_POLISH 0x15 -#define LANG_PORTUGUESE 0x16 -#define LANG_PUNJABI 0x46 -#define LANG_ROMANIAN 0x18 -#define LANG_RUSSIAN 0x19 -#define LANG_SANSKRIT 0x4f -#define LANG_SERBIAN 0x1a -#define LANG_SLOVAK 0x1b -#define LANG_SLOVENIAN 0x24 -#define LANG_SPANISH 0x0a -#define LANG_SWAHILI 0x41 -#define LANG_SWEDISH 0x1d -#define LANG_SYRIAC 0x5a -#define LANG_TAMIL 0x49 -#define LANG_TATAR 0x44 -#define LANG_TELUGU 0x4a -#define LANG_THAI 0x1e -#define LANG_TURKISH 0x1f -#define LANG_UKRAINIAN 0x22 -#define LANG_URDU 0x20 -#define LANG_UZBEK 0x43 -#define LANG_VIETNAMESE 0x2a - -/* non standard; keep the number high enough (but < 0xff) */ -#define LANG_ESPERANTO 0x8f -#define LANG_WALON 0x90 -#define LANG_CORNISH 0x91 -#define LANG_WELSH 0x92 -#define LANG_BRETON 0x93 - -/* FIXME: these are not in the Windows header */ -#define LANG_GAELIC 0x94 -#define LANG_MALTESE 0x3a -#define LANG_RHAETO_ROMANCE 0x17 -#define LANG_SAAMI 0x3b -#define LANG_SORBIAN 0x2e -#define LANG_LOWER_SORBIAN 0x2e -#define LANG_UPPER_SORBIAN 0x2e -#define LANG_SUTU 0x30 -#define LANG_TSONGA 0x31 -#define LANG_TSWANA 0x32 -#define LANG_VENDA 0x33 -#define LANG_XHOSA 0x34 -#define LANG_ZULU 0x35 - -#define SUBLANG_AZERI_CYRILLIC 0x02 -#define SUBLANG_CHINESE_SINGAPORE 0x04 -#define SUBLANG_CHINESE_SIMPLIFIED 0x02 -#define SUBLANG_NEUTRAL 0x00 -#define SUBLANG_SERBIAN_CYRILLIC 0x03 -#define SUBLANG_UZBEK_CYRILLIC 0x02 #include <host/pshpack2.h> typedef struct tagBITMAPFILEHEADER {

1 0

[jimtabor] 30841: Fix typo in GetWindow/Viewport/OrgEx and move them over to coord.c.
by jimtabor＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: jimtabor Date: Thu Nov 29 00:29:05 2007 New Revision: 30841 URL: http://svn.reactos.org/svn/reactos?rev=30841&view=rev Log: Fix typo in GetWindow/Viewport/OrgEx and move them over to coord.c. Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Thu Nov 29 00:29:05 2007 @@ -242,3 +242,377 @@ return NtGdiModifyWorldTransform(hDC, (CONST LPXFORM) Xform, iMode); } +BOOL +STDCALL +GetViewportExtEx( + HDC hdc, + LPSIZE lpSize + ) +{ + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + + if ((Dc_Attr->flXform & PAGE_EXTENTS_CHANGED) && (Dc_Attr->iMapMode == MM_ISOTROPIC)) + // Something was updated, go to kernel. + return NtGdiGetDCPoint( hdc, GdiGetViewPortExt, (LPPOINT) lpSize ); + else + { + lpSize->cx = Dc_Attr->szlViewportExt.cx; + lpSize->cy = Dc_Attr->szlViewportExt.cy; + } + return TRUE; +} + + +BOOL +STDCALL +GetViewportOrgEx( + HDC hdc, + LPPOINT lpPoint + ) +{ + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + lpPoint->x = Dc_Attr->ptlViewportOrg.x; + lpPoint->y = Dc_Attr->ptlViewportOrg.y; + if (Dc_Attr->dwLayout & LAYOUT_RTL) lpPoint->x = -lpPoint->x; + return TRUE; + // return NtGdiGetDCPoint( hdc, GdiGetViewPortOrg, lpPoint ); +} + + +BOOL +STDCALL +GetWindowExtEx( + HDC hdc, + LPSIZE lpSize + ) +{ + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + lpSize->cx = Dc_Attr->szlWindowExt.cx; + lpSize->cy = Dc_Attr->szlWindowExt.cy; + if (Dc_Attr->dwLayout & LAYOUT_RTL) lpSize->cx = -lpSize->cx; + return TRUE; + // return NtGdiGetDCPoint( hdc, GdiGetWindowExt, (LPPOINT) lpSize ); +} + + +BOOL +STDCALL +GetWindowOrgEx( + HDC hdc, + LPPOINT lpPoint + ) +{ + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + lpPoint->x = Dc_Attr->ptlWindowOrg.x; + lpPoint->y = Dc_Attr->ptlWindowOrg.y; + return TRUE; + //return NtGdiGetDCPoint( hdc, GdiGetWindowOrg, lpPoint ); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetViewportExtEx(HDC hdc, + int nXExtent, + int nYExtent, + LPSIZE lpSize) +{ +#if 0 + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetViewportExtEx(); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetViewportExtEx(); + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + + if (lpSize) + { + lpSize->cx = Dc_Attr->szlWindowExt.cx; + lpSize->cy = Dc_Attr->szlWindowExt.cy; + } + + if ((Dc_Attr->iMapMode == MM_ISOTROPIC) && (Dc_Attr->iMapMode == MM_ANISOTROPIC)) + { + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + { + if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); // Sync up Dc_Attr from Kernel space. + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + Dc_Attr->szlWindowExt.cx = nXExtent; + Dc_Attr->szlWindowExt.cy = nYExtent; + if (Dc_Attr->dwLayout & LAYOUT_RTL) NtGdiMirrorWindowOrg(hdc); + Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + } + return TRUE; +#endif + return NtGdiSetViewportExtEx(hdc, nXExtent, nYExtent, lpSize); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetWindowOrgEx(HDC hdc, + int X, + int Y, + LPPOINT lpPoint) +{ +#if 0 + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetWindowOrgEx(); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetWindowOrgEx(); + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + + if (lpPoint) + { + lpPoint->x = Dc_Attr->ptlWindowOrg.x; + lpPoint->y = Dc_Attr->ptlWindowOrg.y; + } + + if ((Dc_Attr->ptlWindowOrg.x == X) && (Dc_Attr->ptlWindowOrg.y == Y)) + return TRUE; + + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + { + if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); // Sync up Dc_Attr from Kernel space. + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + + Dc_Attr->ptlWindowOrg.x = X; + Dc_Attr->lWindowOrgx = X; + Dc_Attr->ptlWindowOrg.y = Y; + if (Dc_Attr->dwLayout & LAYOUT_RTL) NtGdiMirrorWindowOrg(hdc); + Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + return TRUE; +#endif + return NtGdiSetWindowOrgEx(hdc,X,Y,lpPoint); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetWindowExtEx(HDC hdc, + int nXExtent, + int nYExtent, + LPSIZE lpSize) +{ +#if 0 + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetWindowExtEx(); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetWindowExtEx(); + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + + if (lpSize) + { + lpSize->cx = Dc_Attr->szlWindowExt.cx; + lpSize->cy = Dc_Attr->szlWindowExt.cy; + if (Dc_Attr->dwLayout & LAYOUT_RTL) -lpSize->cx; + } + + if (Dc_Attr->dwLayout & LAYOUT_RTL) + { + NtGdiMirrorWindowOrg(hdc); + Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + } + else if ((Dc_Attr->iMapMode == MM_ISOTROPIC) && (Dc_Attr->iMapMode == MM_ANISOTROPIC)) + { + if ((Dc_Attr->szlWindowExt.cx == nXExtent) && (Dc_Attr->szlWindowExt.cy == nYExtent)) + return TRUE; + + if ((!nXExtent) && (!nYExtent)) return FALSE; + + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + { + if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); // Sync up Dc_Attr from Kernel space. + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + Dc_Attr->szlWindowExt.cx = nXExtent; + Dc_Attr->szlWindowExt.cy = nYExtent; + if (Dc_Attr->dwLayout & LAYOUT_RTL) NtGdiMirrorWindowOrg(hdc); + Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + } + return TRUE; // Return TRUE. +#endif + return NtGdiSetWindowExtEx(hdc, nXExtent, nYExtent, lpSize); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetViewportOrgEx(HDC hdc, + int X, + int Y, + LPPOINT lpPoint) +{ +#if 0 + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetViewportOrgEx(); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetViewportOrgEx(); + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + + if (lpPoint) + { + lpPoint->x = Dc_Attr->ptlViewportOrg.x; + lpPoint->y = Dc_Attr->ptlViewportOrg.y; + if (Dc_Attr->dwLayout & LAYOUT_RTL) -lpPoint->x; + } + Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + Dc_Attr->ptlViewportOrg.x = X; + Dc_Attr->ptlViewportOrg.y = Y; + return TRUE; +#endif + return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); +} + +/* + * @implemented + */ +DWORD +STDCALL +GetLayout(HDC hdc +) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return GDI_ERROR; + return Dc_Attr->dwLayout; +} + + +/* + * @implemented + */ +DWORD +STDCALL +SetLayout(HDC hdc, + DWORD dwLayout) +{ +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetLayout( hdc, dwLayout); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetLayout( hdc, dwLayout); + } + } + } +#endif + if (!GdiIsHandleValid((HGDIOBJ) hdc)) return GDI_ERROR; + return NtGdiSetLayout( hdc, -1, dwLayout); +} + +/* + * @implemented + */ +DWORD +STDCALL +SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout) +{ + if (!GdiIsHandleValid((HGDIOBJ) hdc)) return GDI_ERROR; + return NtGdiSetLayout( hdc, wox, dwLayout); +} + + Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Thu Nov 29 00:29:05 2007 @@ -1035,6 +1035,11 @@ Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); } } +/* One would think that setting the graphics mode to GM_COMPATIBLE + * would also reset the world transformation matrix to the unity + * matrix. However, in Windows, this is not the case. This doesn't + * make a lot of sense to me, but that's the way it is. + */ oMode = Dc_Attr->iGraphicsMode; Dc_Attr->iGraphicsMode = iMode; @@ -1184,313 +1189,6 @@ } return Ret; } - - -BOOL -STDCALL -GetViewportExtEx( - HDC hdc, - LPSIZE lpSize - ) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; - - if ( Dc_Attr->flXform & PAGE_EXTENTS_CHANGED ) // Something was updated, go to kernel. - return NtGdiGetDCPoint( hdc, GdiGetViewPortExt, (LPPOINT) lpSize ); - else - { - lpSize->cx = Dc_Attr->szlViewportExt.cx; - lpSize->cy = Dc_Attr->szlViewportExt.cy; - } - return TRUE; -} - - -BOOL -STDCALL -GetViewportOrgEx( - HDC hdc, - LPPOINT lpPoint - ) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; - lpPoint->x = Dc_Attr->ptlViewportOrg.x; - lpPoint->x = Dc_Attr->ptlViewportOrg.x; - return TRUE; - // return NtGdiGetDCPoint( hdc, GdiGetViewPortOrg, lpPoint ); -} - - -BOOL -STDCALL -GetWindowExtEx( - HDC hdc, - LPSIZE lpSize - ) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; - lpSize->cx = Dc_Attr->szlWindowExt.cx; - lpSize->cy = Dc_Attr->szlWindowExt.cy; - return TRUE; - // return NtGdiGetDCPoint( hdc, GdiGetWindowExt, (LPPOINT) lpSize ); -} - - -BOOL -STDCALL -GetWindowOrgEx( - HDC hdc, - LPPOINT lpPoint - ) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; - lpPoint->x = Dc_Attr->ptlWindowOrg.x; - lpPoint->x = Dc_Attr->ptlWindowOrg.x; - return TRUE; - //return NtGdiGetDCPoint( hdc, GdiGetWindowOrg, lpPoint ); -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetViewportExtEx(HDC hdc, - int nXExtent, - int nYExtent, - LPSIZE lpSize) -{ -#if 0 - PDC_ATTR Dc_Attr; -#if 0 - if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) - return MFDRV_SetViewportExtEx(); - else - { - PLDC pLDC = GdiGetLDC(hdc); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_SetViewportExtEx(); - } - } - } -#endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; - - if (lpSize) - { - lpSize->cx = Dc_Attr->szlWindowExt.cx; - lpSize->cy = Dc_Attr->szlWindowExt.cy; - } - - if ((Dc_Attr->iMapMode == MM_ISOTROPIC) && (Dc_Attr->iMapMode == MM_ANISOTROPIC)) - { - if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) - { - if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) - { - NtGdiFlush(); // Sync up Dc_Attr from Kernel space. - Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); - } - } - - Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); - Dc_Attr->szlWindowExt.cx = nXExtent; - Dc_Attr->szlWindowExt.cy = nYExtent; - } - return TRUE; -#endif - return NtGdiSetViewportExtEx(hdc, nXExtent, nYExtent, lpSize); -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetWindowOrgEx(HDC hdc, - int X, - int Y, - LPPOINT lpPoint) -{ -#if 0 - PDC_ATTR Dc_Attr; -#if 0 - if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) - return MFDRV_SetWindowOrgEx(); - else - { - PLDC pLDC = GdiGetLDC(hdc); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_SetWindowOrgEx(); - } - } - } -#endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; - - if (lpPoint) - { - lpPoint->x = Dc_Attr->ptlWindowOrg.x; - lpPoint->y = Dc_Attr->ptlWindowOrg.y; - } - - if ((Dc_Attr->ptlWindowOrg.x == X) && (Dc_Attr->ptlWindowOrg.y == Y)) - return TRUE; - - if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) - { - if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) - { - NtGdiFlush(); // Sync up Dc_Attr from Kernel space. - Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); - } - } - - Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); - Dc_Attr->ptlWindowOrg.x = X; - Dc_Attr->ptlWindowOrg.y = Y; - return TRUE; -#endif - return NtGdiSetWindowOrgEx(hdc,X,Y,lpPoint); -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetWindowExtEx(HDC hdc, - int nXExtent, - int nYExtent, - LPSIZE lpSize) -{ -#if 0 - PDC_ATTR Dc_Attr; -#if 0 - if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) - return MFDRV_SetWindowExtEx(); - else - { - PLDC pLDC = GdiGetLDC(hdc); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_SetWindowExtEx(); - } - } - } -#endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; - - if (lpSize) - { - lpSize->cx = Dc_Attr->szlWindowExt.cx; - lpSize->cy = Dc_Attr->szlWindowExt.cy; - } - - if ((Dc_Attr->iMapMode == MM_ISOTROPIC) && (Dc_Attr->iMapMode == MM_ANISOTROPIC)) - { - if ((Dc_Attr->szlWindowExt.cx == nXExtent) && (Dc_Attr->szlWindowExt.cy == nYExtent)) - return TRUE; - - if ((!nXExtent) && (!nYExtent)) return FALSE; - - if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) - { - if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) - { - NtGdiFlush(); // Sync up Dc_Attr from Kernel space. - Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); - } - } - - Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); - Dc_Attr->szlWindowExt.cx = nXExtent; - Dc_Attr->szlWindowExt.cy = nYExtent; - } - return TRUE; -#endif - return NtGdiSetWindowExtEx(hdc, nXExtent, nYExtent, lpSize); -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetViewportOrgEx(HDC hdc, - int X, - int Y, - LPPOINT lpPoint) -{ -#if 0 - PDC_ATTR Dc_Attr; -#if 0 - if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) - return MFDRV_SetViewportOrgEx(); - else - { - PLDC pLDC = GdiGetLDC(hdc); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_SetViewportOrgEx(); - } - } - } -#endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; - - if (lpPoint) - { - lpPoint->x = Dc_Attr->ptlViewportOrg.x; - lpPoint->y = Dc_Attr->ptlViewportOrg.y; - } - Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); - Dc_Attr->ptlViewportOrg.x = X; - Dc_Attr->ptlViewportOrg.y = Y; - return TRUE; -#endif - return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); -} - - /* FIXME: include correct header */ HPALETTE STDCALL NtUserSelectPalette(HDC hDC, @@ -1634,60 +1332,4 @@ return Dc_Attr->hlfntNew; } -/* - * @implemented - */ -DWORD -STDCALL -GetLayout(HDC hdc -) -{ - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return GDI_ERROR; - return Dc_Attr->dwLayout; -} - - -/* - * @implemented - */ -DWORD -STDCALL -SetLayout(HDC hdc, - DWORD dwLayout) -{ -#if 0 - if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) - return MFDRV_SetLayout( hdc, dwLayout); - else - { - PLDC pLDC = GdiGetLDC(hdc); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return 0; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_SetLayout( hdc, dwLayout); - } - } - } -#endif - if (!GdiIsHandleValid((HGDIOBJ) hdc)) return GDI_ERROR; - return NtGdiSetLayout( hdc, -1, dwLayout); -} - -/* - * @implemented - */ -DWORD -STDCALL -SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout) -{ - if (!GdiIsHandleValid((HGDIOBJ) hdc)) return GDI_ERROR; - return NtGdiSetLayout( hdc, wox, dwLayout); -} - +

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