Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[greatlrd] 33680: implemeted test for GdiConvertBitmap, GdiConvertBrush, GdiConvertDC, GdiConvertFont, GdiConvertPalette, GdiConvertRegion, GdiGetLocalBrush, GdiGetLocalDC tested in xp/vista/reactos and works no fault report.
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 17:20:31 2008 New Revision: 33680 URL: http://svn.reactos.org/svn/reactos?rev=33680&view=rev Log: implemeted test for GdiConvertBitmap, GdiConvertBrush, GdiConvertDC, GdiConvertFont, GdiConvertPalette, GdiConvertRegion, GdiGetLocalBrush, GdiGetLocalDC tested in xp/vista/reactos and works no fault report. Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c (with props) trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c (with props) Modified: trunk/rostests/apitests/gdi32api/gdi.h trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi.h?r… ============================================================================== --- trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] Sat May 24 17:20:31 2008 @@ -200,4 +200,14 @@ // RECT VisRectRegion; // 1b8 } DC_ATTR, *PDC_ATTR; - +HDC WINAPI GdiConvertBitmap(HDC hdc); +HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr); +HDC WINAPI GdiConvertDC(HDC hdc); +HFONT WINAPI GdiConvertFont(HFONT hfont); +HPALETTE WINAPI GdiConvertPalette(HPALETTE hpal); +HRGN WINAPI GdiConvertRegion(HRGN hregion); +HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr); +HDC WINAPI GdiGetLocalDC(HDC hdc); + + + Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -12,15 +12,29 @@ #include "tests/CreatePen.c" #include "tests/CreateRectRgn.c" #include "tests/ExtCreatePen.c" +#include "tests/GdiConvertBitmap.c" +#include "tests/GdiConvertBrush.c" +#include "tests/GdiConvertDC.c" +#include "tests/GdiConvertFont.c" +#include "tests/GdiConvertPalette.c" +#include "tests/GdiConvertRegion.c" +#include "tests/GdiGetLocalBrush.c" +#include "tests/GdiGetLocalDC.c" #include "tests/GetClipRgn.c" #include "tests/GetCurrentObject.c" +#include "tests/GetDIBits.c" #include "tests/GetObject.c" #include "tests/GetStockObject.c" -#include "tests/GetDIBits.c" #include "tests/SelectObject.c" #include "tests/SetDCPenColor.c" #include "tests/SetSysColors.c" #include "tests/SetWorldTransform.c" + + + + + + @@ -29,20 +43,28 @@ { { L"AddFontResourceA", Test_AddFontResourceA }, { L"AddFontResourceEx", Test_AddFontResourceEx }, - { L"CreateBitmapIndirect", Test_CreateBitmapIndirect }, + { L"CreateBitmapIndirect", Test_CreateBitmapIndirect }, { L"CreateCompatibleDC", Test_CreateCompatibleDC }, { L"CreateFont", Test_CreateFont }, { L"CreatePen", Test_CreatePen }, { L"CreateRectRgn", Test_CreateRectRgn }, { L"ExtCreatePen", Test_ExtCreatePen }, + { L"GdiConvertBitmap", Test_GdiConvertBitmap }, + { L"GdiConvertBrush", Test_GdiConvertBrush }, + { L"GdiConvertBrush", Test_GdiConvertDC }, + { L"GdiConvertFont", Test_GdiConvertFont }, + { L"GdiConvertPalette", Test_GdiConvertPalette }, + { L"GdiConvertRegion", Test_GdiConvertRegion }, + { L"GdiGetLocalBrush", Test_GdiGetLocalBrush }, + { L"GdiGetLocalDC", Test_GdiGetLocalDC }, { L"GetClipRgn", Test_GetClipRgn }, { L"GetCurrentObject", Test_GetCurrentObject }, + { L"GetDIBits", Test_GetDIBits }, { L"GetObject", Test_GetObject }, { L"GetStockObject", Test_GetStockObject }, - { L"GetDIBits", Test_GetDIBits }, - { L"SetSysColors", Test_SetSysColors }, { L"SelectObject", Test_SelectObject }, { L"SetDCPenColor", Test_SetDCPenColor }, + { L"SetSysColors", Test_SetSysColors }, { L"SetWorldTransform", Test_SetWorldTransform }, }; Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,10 @@ +INT +Test_GdiConvertBitmap(PTESTINFO pti) +{ + RTEST(GdiConvertBitmap((HDC)-1) == (HDC)-1); + RTEST(GdiConvertBitmap((HDC)0) == (HDC)0); + RTEST(GdiConvertBitmap((HDC)1) == (HDC)1); + RTEST(GdiConvertBitmap((HDC)2) == (HDC)2); + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertBitmap.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiConvertBrush(PTESTINFO pti) +{ + RTEST(GdiConvertBrush((HBRUSH)-1) == (HBRUSH)-1); + RTEST(GdiConvertBrush((HBRUSH)0) == (HBRUSH)0); + RTEST(GdiConvertBrush((HBRUSH)1) == (HBRUSH)1); + RTEST(GdiConvertBrush((HBRUSH)2) == (HBRUSH)2); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertBrush.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,10 @@ +INT +Test_GdiConvertDC(PTESTINFO pti) +{ + RTEST(GdiConvertDC((HDC)-1) == (HDC)-1); + RTEST(GdiConvertDC((HDC)0) == (HDC)0); + RTEST(GdiConvertDC((HDC)1) == (HDC)1); + RTEST(GdiConvertDC((HDC)2) == (HDC)2); + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertDC.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiConvertFont(PTESTINFO pti) +{ + RTEST(GdiConvertFont((HFONT)-1) == (HFONT)-1); + RTEST(GdiConvertFont((HFONT)0) == (HFONT)0); + RTEST(GdiConvertFont((HFONT)1) == (HFONT)1); + RTEST(GdiConvertFont((HFONT)2) == (HFONT)2); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertFont.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,9 @@ +INT +Test_GdiConvertPalette(PTESTINFO pti) +{ + RTEST(GdiConvertPalette((HPALETTE)-1) == (HPALETTE)-1); + RTEST(GdiConvertPalette((HPALETTE)0) == (HPALETTE)0); + RTEST(GdiConvertPalette((HPALETTE)1) == (HPALETTE)1); + RTEST(GdiConvertPalette((HPALETTE)2) == (HPALETTE)2); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertPalette.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,12 @@ +INT +Test_GdiConvertRegion(PTESTINFO pti) +{ + RTEST(GdiConvertRegion((HRGN)-1) == (HRGN)-1); + RTEST(GdiConvertRegion((HRGN)0) == (HRGN)0); + RTEST(GdiConvertRegion((HRGN)1) == (HRGN)1); + RTEST(GdiConvertRegion((HRGN)2) == (HRGN)2); + RTEST(GdiConvertRegion((HRGN)3) == (HRGN)3); + RTEST(GdiConvertRegion((HRGN)4) == (HRGN)4); + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/gdi32api/tests/GdiConvertRegion.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,11 @@ +INT +Test_GdiGetLocalBrush(PTESTINFO pti) +{ + RTEST(GdiGetLocalBrush((HBRUSH)-1) == (HBRUSH)-1); + RTEST(GdiGetLocalBrush((HBRUSH)0) == (HBRUSH)0); + RTEST(GdiGetLocalBrush((HBRUSH)1) == (HBRUSH)1); + RTEST(GdiGetLocalBrush((HBRUSH)2) == (HBRUSH)2); + RTEST(GdiGetLocalBrush((HBRUSH)3) == (HBRUSH)3); + RTEST(GdiGetLocalBrush((HBRUSH)4) == (HBRUSH)4); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalBrush.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c [iso-8859-1] Sat May 24 17:20:31 2008 @@ -1,0 +1,11 @@ +INT +Test_GdiGetLocalDC(PTESTINFO pti) +{ + RTEST(GdiGetLocalDC((HDC)-1) == (HDC)-1); + RTEST(GdiGetLocalDC((HDC)0) == (HDC)0); + RTEST(GdiGetLocalDC((HDC)1) == (HDC)1); + RTEST(GdiGetLocalDC((HDC)2) == (HDC)2); + RTEST(GdiGetLocalDC((HDC)3) == (HDC)3); + RTEST(GdiGetLocalDC((HDC)4) == (HDC)4); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GdiGetLocalDC.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 33678: Add functionality to allow dll injection for all apps which link to user32.
by gedmurphy＠svn.reactos.org 24 May '08

24 May '08

Author: gedmurphy Date: Sat May 24 16:21:58 2008 New Revision: 33678 URL: http://svn.reactos.org/svn/reactos?rev=33678&view=rev Log: Add functionality to allow dll injection for all apps which link to user32. Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Sat May 24 16:21:58 2008 @@ -1,6 +1,9 @@ #include <user32.h> #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(user32); + +#define KEY_LENGTH 1024 static ULONG User32TlsIndex; HINSTANCE User32Instance; @@ -9,6 +12,7 @@ PW32PROCESSINFO g_pi = NULL; /* User Mode Pointer */ PW32PROCESSINFO g_kpi = NULL; /* Kernel Mode Pointer */ PSERVERINFO g_psi = NULL; +WCHAR szAppInit[KEY_LENGTH]; PW32PROCESSINFO GetW32ProcessInfo(VOID); @@ -17,6 +21,137 @@ User32GetThreadData() { return ((PUSER32_THREAD_DATA)TlsGetValue(User32TlsIndex)); +} + + +BOOL +GetDllList() +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES Attributes; + BOOL bRet = FALSE; + BOOL bLoad; + HANDLE hKey = NULL; + DWORD dwSize; + PKEY_VALUE_PARTIAL_INFORMATION kvpInfo = NULL; + + UNICODE_STRING szKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows"); + UNICODE_STRING szLoadName = RTL_CONSTANT_STRING(L"LoadAppInit_DLLs"); + UNICODE_STRING szDllsName = RTL_CONSTANT_STRING(L"AppInit_DLLs"); + + InitializeObjectAttributes(&Attributes, &szKeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenKey(&hKey, KEY_READ, &Attributes); + if (NT_SUCCESS(Status)) + { + dwSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(DWORD); + kvpInfo = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!kvpInfo) + goto end; + + Status = NtQueryValueKey(hKey, + &szLoadName, + KeyValuePartialInformation, + kvpInfo, + dwSize, + &dwSize); + if (!NT_SUCCESS(Status)) + goto end; + + RtlMoveMemory(&bLoad, + kvpInfo->Data, + kvpInfo->DataLength); + + HeapFree(GetProcessHeap(), 0, kvpInfo); + kvpInfo = NULL; + + if (bLoad) + { + Status = NtQueryValueKey(hKey, + &szDllsName, + KeyValuePartialInformation, + NULL, + 0, + &dwSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + goto end; + + kvpInfo = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!kvpInfo) + goto end; + + Status = NtQueryValueKey(hKey, + &szDllsName, + KeyValuePartialInformation, + kvpInfo, + dwSize, + &dwSize); + if (NT_SUCCESS(Status)) + { + LPWSTR lpBuffer = (LPWSTR)kvpInfo->Data; + if (lpBuffer != UNICODE_NULL) + { + RtlMoveMemory(szAppInit, + kvpInfo->Data, + min(kvpInfo->DataLength, KEY_LENGTH)); + bRet = TRUE; + } + } + } + } + +end: + if (hKey) + NtClose(hKey); + + if (kvpInfo) + HeapFree(GetProcessHeap(), 0, kvpInfo); + + return bRet; +} + + +VOID +LoadAppInitDlls() +{ + szAppInit[0] = UNICODE_NULL; + + if (GetDllList()) + { + WCHAR buffer[KEY_LENGTH]; + LPWSTR ptr; + LPWSTR seps = L" ,"; + + RtlCopyMemory(buffer, szAppInit, KEY_LENGTH);; + + ptr = wcstok(buffer, seps); + while (ptr) + { + LoadLibraryW(ptr); + ptr = wcstok(NULL, seps); + } + } +} + +VOID +UnloadAppInitDlls() +{ + if (szAppInit[0] != UNICODE_NULL) + { + WCHAR buffer[KEY_LENGTH]; + HMODULE hModule; + LPWSTR ptr; + LPWSTR seps = L" ,"; + + RtlCopyMemory(buffer, szAppInit, KEY_LENGTH); + + ptr = wcstok(buffer, seps); + while (ptr) + { + hModule = GetModuleHandleW(ptr); + FreeLibrary(hModule); + ptr = wcstok(NULL, seps); + } + } } BOOL @@ -77,6 +212,7 @@ InitializeCriticalSection(&U32AccelCacheLock); GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL); InitStockObjects(); + LoadAppInitDlls(); return TRUE; } @@ -95,6 +231,7 @@ MenuCleanup(); MessageCleanup(); DeleteFrameBrushes(); + UnloadAppInitDlls(); GdiDllInitialize(NULL, DLL_PROCESS_DETACH, NULL); TlsFree(User32TlsIndex); }

1 0

[mpiulachs] 33677: - Move every x86 HAL to it's own .rbuild file - Take advantage of r33676
by mpiulachs＠svn.reactos.org 24 May '08

24 May '08

Author: mpiulachs Date: Sat May 24 15:32:44 2008 New Revision: 33677 URL: http://svn.reactos.org/svn/reactos?rev=33677&view=rev Log: - Move every x86 HAL to it's own .rbuild file - Take advantage of r33676 Added: trunk/reactos/hal/halx86/hal_generic.rbuild (with props) trunk/reactos/hal/halx86/hal_generic_pc.rbuild (with props) trunk/reactos/hal/halx86/hal_generic_up.rbuild (with props) trunk/reactos/hal/halx86/halmp.rbuild (with props) trunk/reactos/hal/halx86/halup.rbuild (with props) trunk/reactos/hal/halx86/halxbox.rbuild (with props) Removed: trunk/reactos/hal/halx86/directory.rbuild Modified: trunk/reactos/hal/hal.rbuild Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=33677&r… ============================================================================== --- trunk/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -6,7 +6,12 @@ </directory> <if property="ARCH" value="i386"> <directory name="halx86"> - <xi:include href="halx86/directory.rbuild" /> + <xi:include href="halx86/hal_generic.rbuild" /> + <xi:include href="halx86/hal_generic_up.rbuild" /> + <xi:include href="halx86/hal_generic_pc.rbuild" /> + <xi:include href="halx86/halup.rbuild" /> + <xi:include href="halx86/halmp.rbuild" /> + <xi:include href="halx86/halxbox.rbuild" /> </directory> </if> <if property="ARCH" value="powerpc"> Removed: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/directory.rbuild (removed) @@ -1,69 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="generic"> - <xi:include href="generic/generic.rbuild" /> - </directory> - - <module name="halup" type="kernelmodedll" entrypoint="0"> - <importlibrary definition="../hal/hal_i386.def" /> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="up"> - <file>halinit_up.c</file> - <file>halup.rc</file> - </directory> - </module> - <module name="halmp" type="kernelmodedll" entrypoint="0"> - <importlibrary definition="../hal/hal_i386.def" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="CONFIG_SMP" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="mp"> - <file>apic.c</file> - <file>halinit_mp.c</file> - <file>ioapic.c</file> - <file>ipi_mp.c</file> - <file>mpconfig.c</file> - <file>mps.S</file> - <file>mpsboot.asm</file> - <file>mpsirql.c</file> - <file>processor_mp.c</file> - <file>spinlock.c</file> - <file>halmp.rc</file> - </directory> - </module> - <module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true"> - <importlibrary definition="../hal/hal_i386.def" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_NTHAL_" /> - <define name="SARCH_XBOX" /> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>ntoskrnl</library> - <directory name="generic"> - <file>pci.c</file> - </directory> - <directory name="xbox"> - <file>halinit_xbox.c</file> - <file>part_xbox.c</file> - <file>halxbox.rc</file> - <pch>halxbox.h</pch> - </directory> - </module> -</group> Added: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,31 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <file>beep.c</file> + <file>bios.c</file> + <file>bus.c</file> + <file>cmos.c</file> + <file>dma.c</file> + <file>drive.c</file> + <file>display.c</file> + <file>halinit.c</file> + <file>misc.c</file> + <file>portio.c</file> + <file>profil.c</file> + <file>reboot.c</file> + <file>sysinfo.c</file> + <file>timer.c</file> + <file>systimer.S</file> + <file>v86.s</file> + </directory> + <directory name="include"> + <pch>hal.h</pch> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/hal_generic.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/hal_generic_pc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_pc.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_pc.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic_pc" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <file>pci.c</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/hal_generic_pc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_up.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_up.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic_up" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <file>irq.S</file> + <file>processor.c</file> + <file>spinlock.c</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/hal_generic_up.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmp.rbuild?re… ============================================================================== --- trunk/reactos/hal/halx86/halmp.rbuild (added) +++ trunk/reactos/hal/halx86/halmp.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,29 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="halmp" type="kernelmodedll" entrypoint="0"> + <importlibrary base="hal" definition="hal_i386.def" /> + <bootstrap installbase="$(CDOUTPUT)" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="CONFIG_SMP" /> + <define name="_NTHAL_" /> + <library>hal_generic</library> + <library>hal_generic_pc</library> + <library>ntoskrnl</library> + <directory name="mp"> + <file>apic.c</file> + <file>halinit_mp.c</file> + <file>ioapic.c</file> + <file>ipi_mp.c</file> + <file>mpconfig.c</file> + <file>mps.S</file> + <file>mpsboot.asm</file> + <file>mpsirql.c</file> + <file>processor_mp.c</file> + <file>spinlock.c</file> + <file>halmp.rc</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/halmp.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halup.rbuild?re… ============================================================================== --- trunk/reactos/hal/halx86/halup.rbuild (added) +++ trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="halup" type="kernelmodedll" entrypoint="0"> + <importlibrary base="hal" definition="hal_i386.def" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>hal_generic_pc</library> + <library>ntoskrnl</library> + <directory name="up"> + <file>halinit_up.c</file> + <file>halup.rc</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/halup.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halxbox.rbuild (added) +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,24 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true"> + <importlibrary base="hal" definition="hal_i386.def" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <define name="SARCH_XBOX" /> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>ntoskrnl</library> + <directory name="generic"> + <file>pci.c</file> + </directory> + <directory name="xbox"> + <file>halinit_xbox.c</file> + <file>part_xbox.c</file> + <file>halxbox.rc</file> + <pch>halxbox.h</pch> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/halxbox.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 33676: - Add "base" and "root" support to ImportLibrary. <importlibrary definition="../hal/hal_i386.def" /> -> <importlibrary base="hal" definition="hal_i386.def" />
by mpiulachs＠svn.reactos.org 24 May '08

24 May '08

Author: mpiulachs Date: Sat May 24 15:31:23 2008 New Revision: 33676 URL: http://svn.reactos.org/svn/reactos?rev=33676&view=rev Log: - Add "base" and "root" support to ImportLibrary. <importlibrary definition="../hal/hal_i386.def" /> -> <importlibrary base="hal" definition="hal_i386.def" /> Modified: trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Sat May 24 15:31:23 2008 @@ -791,7 +791,7 @@ e.location, "Only one <importlibrary> is valid per module" ); } - SetImportLibrary ( new ImportLibrary ( project, e, *this ) ); + SetImportLibrary ( new ImportLibrary ( project, e, this ) ); subs_invalid = true; } else if ( e.name == "if" ) @@ -1748,31 +1748,67 @@ ImportLibrary::ImportLibrary ( const Project& project, const XMLElement& node, - const Module& module ) + const Module* module ) : XmlNode ( project, node ), module (module) { + DirectoryLocation directory = SourceDirectory; + const Module* base = module; const XMLAttribute* dllname = node.GetAttribute ( "dllname", false ); const XMLAttribute* definition = node.GetAttribute ( "definition", true ); assert ( definition ); + string relative_path; + const XMLAttribute* att = node.GetAttribute ( "base", false ); + if ( att ) + { + base = project.LocateModule ( att->value ); + if ( !base ) + throw XMLInvalidBuildFileException ( + node.location, + "<importlibrary> attribute 'base' references non-existant module '%s'", + att->value.c_str() ); + + } + + if ( base ) + { + relative_path = base->output->relative_path; + if ( node.value.length () > 0 && node.value != "." ) + relative_path += sSep + node.value; + } + else + relative_path = node.value; + + att = node.GetAttribute ( "root", false ); + if ( att ) + { + if ( att->value == "intermediate" ) + directory = IntermediateDirectory; + else + throw InvalidAttributeValueException ( node.location, + "root", + att->value ); + } + else + { + size_t index = definition->value.rfind ( ".spec.def" ); + if ( index != string::npos ) + directory = IntermediateDirectory; + } + if ( dllname ) this->dllname = dllname->value; - else if ( module.type == StaticLibrary || module.type == HostStaticLibrary ) + else if ( module->type == StaticLibrary || module->type == HostStaticLibrary ) throw XMLInvalidBuildFileException ( node.location, "<importlibrary> dllname attribute required." ); - DirectoryLocation directory = SourceDirectory; - size_t index = definition->value.rfind ( ".spec.def" ); - if ( index != string::npos ) - directory = IntermediateDirectory; - - index = definition->value.find_last_of ( "/\\" ); + size_t index = definition->value.find_last_of ( "/\\" ); if ( index == string::npos ) { source = new FileLocation ( directory, - module.output->relative_path, + base->output->relative_path, definition->value, &node ); } @@ -1781,7 +1817,7 @@ string dir = definition->value.substr ( 0, index ); string name = definition->value.substr ( index + 1); source = new FileLocation ( directory, - NormalizeFilename ( module.output->relative_path + sSep + dir ), + NormalizeFilename ( base->output->relative_path + sSep + dir ), name, &node ); } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Sat May 24 15:31:23 2008 @@ -588,13 +588,13 @@ class ImportLibrary : public XmlNode { public: - const Module& module; + const Module* module; std::string dllname; FileLocation *source; ImportLibrary ( const Project& project, const XMLElement& node, - const Module& module ); + const Module* module ); ~ImportLibrary (); };

1 0

[greatlrd] 33675: merge from win32k-gdi-dx r33674 Implement GdiAddGlsBounds
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 14:02:23 2008 New Revision: 33675 URL: http://svn.reactos.org/svn/reactos?rev=33675&view=rev Log: merge from win32k-gdi-dx r33674 Implement GdiAddGlsBounds Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/misc/stubs.c 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] Sat May 24 14:02:23 2008 @@ -226,3 +226,12 @@ { NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrCode; } + +BOOL +STDCALL +GdiAddGlsBounds(HDC hdc,LPRECT prc) +{ + //FIXME: Lookup what 0x8000 means + return NtGdiSetBoundsRect(hdc, prc, 0x8000 | DCB_ACCUMULATE ) ? TRUE : FALSE; +} + Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Sat May 24 14:02:23 2008 @@ -1078,20 +1078,6 @@ int STDCALL EndFormPage(HDC hdc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - - -/* - * @unimplemented - */ -DWORD -STDCALL -GdiAddGlsBounds(HDC hdc,LPRECT prc) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

1 0

[greatlrd] 33674: Implement GdiAddGlsBounds
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 13:56:57 2008 New Revision: 33674 URL: http://svn.reactos.org/svn/reactos?rev=33674&view=rev Log: Implement GdiAddGlsBounds Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c [iso-8859-1] Sat May 24 13:56:57 2008 @@ -223,3 +223,15 @@ { NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrCode; } + +/* + * @implemented + */ +BOOL +STDCALL +GdiAddGlsBounds(HDC hdc,LPRECT prc) +{ + //FIXME: Lookup what 0x8000 means + return NtGdiSetBoundsRect(hdc, prc, 0x8000 | DCB_ACCUMULATE ) ? TRUE : FALSE; +} + Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Sat May 24 13:56:57 2008 @@ -1114,17 +1114,7 @@ -/* - * @unimplemented - */ -DWORD -STDCALL -GdiAddGlsBounds(HDC hdc,LPRECT prc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented

1 0

[greatlrd] 33673: gdi32 rename GdiSharedHandleTable to pGdiSharedHandleTable, GDI_BatchLimit to GdiBatchLimit, GdiDevCaps to pGdiDevCaps for match windows xp/vista add pGdiSharedMemory it is same as pGdiSharedHandleTable but it is more logic to use pGdiSharedMemory for share memory stuff change GdiBatchLimit init value to 20 to match vista GdiProcessSetup() using now GetAppCompatFlags2 to determent to use GdiBatchLimit or not, if the flag is not set the GdiBatchLimit is set to 0 add include/reac
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 12:02:55 2008 New Revision: 33673 URL: http://svn.reactos.org/svn/reactos?rev=33673&view=rev Log: gdi32 rename GdiSharedHandleTable to pGdiSharedHandleTable, GDI_BatchLimit to GdiBatchLimit, GdiDevCaps to pGdiDevCaps for match windows xp/vista add pGdiSharedMemory it is same as pGdiSharedHandleTable but it is more logic to use pGdiSharedMemory for share memory stuff change GdiBatchLimit init value to 20 to match vista GdiProcessSetup() using now GetAppCompatFlags2 to determent to use GdiBatchLimit or not, if the flag is not set the GdiBatchLimit is set to 0 add include/reactos/dll/user32/user32_ros.h for prototype for GetAppCompatFlags2 Added: branches/win32k-gdi-dx/include/reactos/dll/user32/ branches/win32k-gdi-dx/include/reactos/dll/user32/user32_ros.h (with props) Modified: branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c branches/win32k-gdi-dx/dll/win32/gdi32/objects/brush.c branches/win32k-gdi-dx/dll/win32/gdi32/objects/dc.c branches/win32k-gdi-dx/dll/win32/user32/misc/stubs.c Modified: branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/i… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Sat May 24 12:02:55 2008 @@ -8,13 +8,15 @@ /* DATA **********************************************************************/ +#include <dll/user32/user32_ros.h> extern PGDI_TABLE_ENTRY GdiHandleTable; -extern PGDI_SHARED_HANDLE_TABLE GdiSharedHandleTable; +extern PGDI_SHARED_HANDLE_TABLE pGdiSharedHandleTable; +extern PGDI_SHARED_HANDLE_TABLE pGdiSharedMemory; extern HANDLE hProcessHeap; extern HANDLE CurrentProcessId; -extern DWORD GDI_BatchLimit; -extern PDEVCAPS GdiDevCaps; +extern DWORD GdiBatchLimit; +extern PDEVCAPS pGdiDevCaps; typedef INT (CALLBACK* EMFPLAYPROC)( Modified: branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -11,8 +11,18 @@ extern HGDIOBJ stock_objects[]; BOOL SetStockObjects = FALSE; -PDEVCAPS GdiDevCaps = NULL; + +PGDI_TABLE_ENTRY GdiHandleTable = NULL; +HANDLE CurrentProcessId = NULL; + +/* Note match vista */ +PDEVCAPS pGdiDevCaps = NULL; PGDIHANDLECACHE GdiHandleCache = NULL; +PGDI_SHARED_HANDLE_TABLE pGdiSharedHandleTable = NULL; +PGDI_SHARED_HANDLE_TABLE pGdiSharedMemory = NULL; +DWORD GdiBatchLimit = 20; + + /* * GDI32.DLL does have an entry point for disable threadlibrarycall,. The initialization is done by a call @@ -37,20 +47,33 @@ return TRUE; } - VOID WINAPI GdiProcessSetup (VOID) { + hProcessHeap = GetProcessHeap(); + CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; - /* map the gdi handle table to user space */ - GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - GdiDevCaps = &GdiSharedHandleTable->DevCaps; - CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; - GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; - GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; + /* map the gdi handle table to user space */ + pGdiSharedMemory = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + pGdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + pGdiDevCaps = &pGdiSharedMemory->DevCaps; + GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; + + /* why does vista send down 0x400 to GetAppCompatFlags2 no doc in msdn found + * 0x200 GdiBatchLimit is ON if this is not set in AppCompatFlags2 no GdiBatchLimit is active */ + + if ((GetAppCompatFlags2( (HTASK) 0x400) & 0x200) == 0x200) + { + GdiBatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; + } + else + { + /* GdiBatchLimit set to 0 */ + GdiBatchLimit = 0; + } } Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -2022,7 +2022,7 @@ STDCALL DdQueryDisplaySettingsUniqueness() { - return GdiSharedHandleTable->flDeviceUniq; + return pGdiSharedMemory->flDeviceUniq; } /* Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -28,10 +28,7 @@ #include "precomp.h" -PGDI_TABLE_ENTRY GdiHandleTable = NULL; -PGDI_SHARED_HANDLE_TABLE GdiSharedHandleTable = NULL; -HANDLE CurrentProcessId = NULL; -DWORD GDI_BatchLimit = 1; + BOOL @@ -171,7 +168,7 @@ STDCALL GdiSetBatchLimit(DWORD Limit) { - DWORD OldLimit = GDI_BatchLimit; + DWORD OldLimit = GdiBatchLimit; if ( (!Limit) || (Limit >= GDI_BATCH_LIMIT)) @@ -180,7 +177,7 @@ } GdiFlush(); - GDI_BatchLimit = Limit; + GdiBatchLimit = Limit; return OldLimit; } @@ -192,7 +189,7 @@ STDCALL GdiGetBatchLimit() { - return GDI_BatchLimit; + return GdiBatchLimit; } /* Modified: branches/win32k-gdi-dx/dll/win32/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/o… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/objects/brush.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/objects/brush.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -344,7 +344,7 @@ pTeb->GdiBatchCount++; DPRINT("Loading the Flush!! COUNT-> %d\n", pTeb->GdiBatchCount); - if (pTeb->GdiBatchCount >= GDI_BatchLimit) + if (pTeb->GdiBatchCount >= GdiBatchLimit) { DPRINT("Call GdiFlush!!\n"); NtGdiFlush(); Modified: branches/win32k-gdi-dx/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/o… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/objects/dc.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -347,7 +347,7 @@ pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); pTeb->GdiBatchCount++; - if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); + if (pTeb->GdiBatchCount >= GdiBatchLimit) NtGdiFlush(); return TRUE; } break; @@ -1404,7 +1404,7 @@ pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); pTeb->GdiTebBatch.HDC = (ULONG)hDC; pTeb->GdiBatchCount++; - if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); + if (pTeb->GdiBatchCount >= GdiBatchLimit) NtGdiFlush(); return pDc_Attr->hlfntNew; } #endif Modified: branches/win32k-gdi-dx/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/user32/… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/user32/misc/stubs.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -118,6 +118,7 @@ return ti->AppCompatFlags; } + /* * @implemented */ @@ -129,6 +130,10 @@ /* If there is no threadinfo (?!), then return 0 */ if (!ti) return 0; + + /* return value for bit + * 0x200 GdiBatchLimit is Activate in gdi32 + */ return ti->AppCompatFlags2; } Added: branches/win32k-gdi-dx/include/reactos/dll/user32/user32_ros.h URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/include/reactos/d… ============================================================================== --- branches/win32k-gdi-dx/include/reactos/dll/user32/user32_ros.h (added) +++ branches/win32k-gdi-dx/include/reactos/dll/user32/user32_ros.h [iso-8859-1] Sat May 24 12:02:55 2008 @@ -1,0 +1,1 @@ +DWORD STDCALL GetAppCompatFlags2(HTASK hTask); Propchange: branches/win32k-gdi-dx/include/reactos/dll/user32/user32_ros.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 33672: - remove 'basename' , no such attribute exists for <importlibrary>
by mpiulachs＠svn.reactos.org 24 May '08

24 May '08

Author: mpiulachs Date: Sat May 24 10:33:49 2008 New Revision: 33672 URL: http://svn.reactos.org/svn/reactos?rev=33672&view=rev Log: - remove 'basename' , no such attribute exists for <importlibrary> Modified: trunk/reactos/hal/hal/hal.rbuild Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=336… ============================================================================== --- trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] Sat May 24 10:33:49 2008 @@ -2,7 +2,7 @@ <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> <module name="hal" type="kernelmodedll"> - <importlibrary basename="hal" definition="hal_$(ARCH).def" /> + <importlibrary definition="hal_$(ARCH).def" /> <include base="ntoskrnl">include</include> <library>ntoskrnl</library> <define name="_NTHAL_" />

1 0

[pschweitzer] 33671: Set default return of IRP_MJ_QUERY_INFORMATION to STATUS_INVALID_PARAMETER
by pschweitzer＠svn.reactos.org 24 May '08

24 May '08

Author: pschweitzer Date: Sat May 24 04:06:53 2008 New Revision: 33671 URL: http://svn.reactos.org/svn/reactos?rev=33671&view=rev Log: Set default return of IRP_MJ_QUERY_INFORMATION to STATUS_INVALID_PARAMETER Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] Sat May 24 04:06:53 2008 @@ -390,7 +390,7 @@ default: DPRINT("Unimplemented information class %u\n", FileInformationClass); - Status = STATUS_NOT_SUPPORTED; + Status = STATUS_INVALID_PARAMETER; break; } Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sat May 24 04:06:53 2008 @@ -835,7 +835,7 @@ RC = STATUS_NOT_IMPLEMENTED; break; default: - RC = STATUS_NOT_SUPPORTED; + RC = STATUS_INVALID_PARAMETER; } if (!(FCB->Flags & FCB_IS_PAGE_FILE)) Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sat May 24 04:06:53 2008 @@ -248,7 +248,7 @@ default: DPRINT("Unimplemented information class %u\n", FileInformationClass); - Status = STATUS_NOT_SUPPORTED; + Status = STATUS_INVALID_PARAMETER; } Irp->IoStatus.Status = Status;

1 0

[pschweitzer] 33670: - Imported dciman32.dll from Wine HEAD - Added it to bootcd - Update README.WINE
by pschweitzer＠svn.reactos.org 24 May '08

24 May '08

Author: pschweitzer Date: Sat May 24 03:42:53 2008 New Revision: 33670 URL: http://svn.reactos.org/svn/reactos?rev=33670&view=rev Log: - Imported dciman32.dll from Wine HEAD - Added it to bootcd - Update README.WINE Added: trunk/reactos/dll/win32/dciman32/ trunk/reactos/dll/win32/dciman32/dciman32.rbuild (with props) trunk/reactos/dll/win32/dciman32/dciman32.spec (with props) trunk/reactos/dll/win32/dciman32/dciman_main.c (with props) trunk/reactos/include/psdk/dciddi.h (with props) trunk/reactos/include/psdk/dciman.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=336… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat May 24 03:42:53 2008 @@ -92,6 +92,7 @@ <property name="BASEADDRESS_WINSPOOL" value="0x72f50000" /> <property name="BASEADDRESS_MSDMO" value="0x73670000" /> <property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> + <property name="BASEADDRESS_DCIMAN32" value="0x73b10000" /> <property name="BASEADDRESS_LZ32" value="0x73d80000" /> <property name="BASEADDRESS_COREDLL" value="0x73d80000" /> <property name="BASEADDRESS_KSUSER" value="0x73ea0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat May 24 03:42:53 2008 @@ -237,6 +237,7 @@ dll\win32\cryptnet\cryptnet.dll 1 dll\win32\cryptui\cryptui.dll 1 dll\win32\dbghelp\dbghelp.dll 1 +dll\win32\dciman32\dciman32.dll 1 dll\win32\devmgr\devmgr.dll 1 dll\win32\dhcpcsvc\dhcpcsvc.dll 1 dll\win32\dnsapi\dnsapi.dll 1 Added: trunk/reactos/dll/win32/dciman32/dciman32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dciman32/dciman3… ============================================================================== --- trunk/reactos/dll/win32/dciman32/dciman32.rbuild (added) +++ trunk/reactos/dll/win32/dciman32/dciman32.rbuild [iso-8859-1] Sat May 24 03:42:53 2008 @@ -1,0 +1,17 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="dciman32" type="win32dll" baseaddress="${BASEADDRESS_DCIMAN32}" installbase="system32" installname="dciman32.dll" allowwarnings="true"> + <importlibrary definition="dciman32.spec.def" /> + <include base="dciman32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <file>dciman_main.c</file> + <file>dciman32.spec</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/dciman32/dciman32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/dciman32/dciman32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dciman32/dciman3… ============================================================================== --- trunk/reactos/dll/win32/dciman32/dciman32.spec (added) +++ trunk/reactos/dll/win32/dciman32/dciman32.spec [iso-8859-1] Sat May 24 03:42:53 2008 @@ -1,0 +1,21 @@ +@ stub DCIBeginAccess +@ stdcall DCICloseProvider(long) +@ stub DCICreateOffscreen +@ stub DCICreateOverlay +@ stdcall DCICreatePrimary(long ptr) +@ stub DCIDestroy +@ stub DCIDraw +@ stub DCIEndAccess +@ stub DCIEnum +@ stdcall DCIOpenProvider() +@ stub DCISetClipList +@ stub DCISetDestination +@ stub DCISetSrcDestClip +@ stdcall -private DllEntryPoint(long long ptr) DllMain +@ stub GetDCRegionData +@ stub GetWindowRegionData +@ stub WinWatchClose +@ stub WinWatchDidStatusChange +@ stub WinWatchGetClipList +@ stub WinWatchNotify +@ stub WinWatchOpen Propchange: trunk/reactos/dll/win32/dciman32/dciman32.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dciman32/dciman_… ============================================================================== --- trunk/reactos/dll/win32/dciman32/dciman_main.c (added) +++ trunk/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sat May 24 03:42:53 2008 @@ -1,0 +1,72 @@ +/* + * Implementation of DCIMAN32 - DCI Manager + * "Device Context Interface" ? + * + * Copyright 2000 Marcus Meissner + * + * This library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "dciman.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dciman); + +/*********************************************************************** + * DllEntryPoint (DCIMAN32.@) + * + * DCIMAN32 initialisation routine. + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); + return TRUE; +} + + +/*********************************************************************** + * DCIOpenProvider (DCIMAN32.@) + */ +HDC WINAPI +DCIOpenProvider(void) { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +/*********************************************************************** + * DCICloseProvider (DCIMAN32.@) + */ +void WINAPI +DCICloseProvider(HDC hdc) { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return; +} + +/************************************************************************** + * DCICreatePrimary (DCIMAN32.@) + */ +int WINAPI +DCICreatePrimary(HDC hdc, LPDCISURFACEINFO *pDciSurfaceInfo) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + FIXME("%p %p\n", hdc, pDciSurfaceInfo); + return DCI_FAIL_UNSUPPORTED; +} Propchange: trunk/reactos/dll/win32/dciman32/dciman_main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat May 24 03:42:53 2008 @@ -70,6 +70,9 @@ <directory name="dbghelp"> <xi:include href="dbghelp/dbghelp.rbuild" /> </directory> +<directory name="dciman32"> + <xi:include href="dciman32/dciman32.rbuild" /> +</directory> <directory name="devmgr"> <xi:include href="devmgr/devmgr.rbuild" /> </directory> Added: trunk/reactos/include/psdk/dciddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dciddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dciddi.h (added) +++ trunk/reactos/include/psdk/dciddi.h [iso-8859-1] Sat May 24 03:42:53 2008 @@ -1,0 +1,83 @@ +/* + * DCI driver interface + * + * Copyright (C) 2001 Ove Kaaven + * + * This library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_DCIDDI_H +#define __WINE_DCIDDI_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* DCI Command Escape */ +#define DCICOMMAND 3075 +#define DCI_VERSION 0x0100 + +#define DCICREATEPRIMARYSURFACE 1 +#define DCICREATEOFFSCREENSURFACE 2 +#define DCICREATEOVERLAYSURFACE 3 +#define DCIENUMSURFACE 4 +#define DCIESCAPE 5 + +/* DCI Errors */ +#define DCI_OK 0 +#define DCI_FAIL_GENERIC -1 +#define DCI_FAIL_UNSUPPORTEDVERSION -2 +#define DCI_FAIL_INVALIDSURFACE -3 +#define DCI_FAIL_UNSUPPORTED -4 + + +typedef int DCIRVAL; /* DCI callback return type */ + +/***************************************************************************** + * Escape command structures + */ +typedef struct _DCICMD { + DWORD dwCommand; + DWORD dwParam1; + DWORD dwParam2; + DWORD dwVersion; + DWORD dwReserved; +} DCICMD,*LPDCICMD; + +typedef struct _DCISURFACEINFO { + DWORD dwSize; + DWORD dwDCICaps; + DWORD dwCompression; + DWORD dwMask[3]; + DWORD dwWidth; + DWORD dwHeight; + LONG lStride; + DWORD dwBitCount; + ULONG_PTR dwOffSurface; + WORD wSelSurface; + WORD wReserved; + DWORD dwReserved1; + DWORD dwReserved2; + DWORD dwReserved3; + DCIRVAL (CALLBACK *BeginAccess)(LPVOID, LPRECT); + void (CALLBACK *EndAccess)(LPVOID); + void (CALLBACK *DestroySurface)(LPVOID); +} DCISURFACEINFO, *LPDCISURFACEINFO; + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __WINE_DCIDDI_H */ Propchange: trunk/reactos/include/psdk/dciddi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/dciman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dciman.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dciman.h (added) +++ trunk/reactos/include/psdk/dciman.h [iso-8859-1] Sat May 24 03:42:53 2008 @@ -1,0 +1,38 @@ +/* + * DCI driver interface + * + * Copyright (C) 2005 Francois Gouget + * + * This library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_DCIMAN +#define _INC_DCIMAN + +#include <dciddi.h> + +#ifdef __cplusplus +extern "C" { +#endif + +HDC WINAPI DCIOpenProvider(void); +void WINAPI DCICloseProvider(HDC); +int WINAPI DCICreatePrimary(HDC,LPDCISURFACEINFO*); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _INC_DCIMAN */ Propchange: trunk/reactos/include/psdk/dciman.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 24 03:42:53 2008 @@ -44,6 +44,7 @@ reactos/dll/win32/cryptdll # Autosync reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/dbghelp # Synced to Wine-20080106 +reactos/dll/win32/dciman32 # Synced to Wine-1_0-rc2 reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Autosync

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008