Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[jimtabor] 39153: - Quick implemention of NtUserGetInternalWindowPos with internal support function IntGetWindowPlacement.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jan 27 15:57:15 2009 New Revision: 39153 URL: http://svn.reactos.org/svn/reactos?rev=39153&view=rev Log: - Quick implemention of NtUserGetInternalWindowPos with internal support function IntGetWindowPlacement. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jan 27 15:57:15 2009 @@ -1185,6 +1185,54 @@ { return ((Window->Status & WINDOWSTATUS_DESTROYING) == WINDOWSTATUS_DESTROYING); } + + +BOOL +FASTCALL +IntGetWindowPlacement(PWINDOW_OBJECT Window, WINDOWPLACEMENT *lpwndpl) +{ + PWINDOW Wnd; + POINT Size; + + Wnd = Window->Wnd; + if (!Wnd) return FALSE; + + if(lpwndpl->length != sizeof(WINDOWPLACEMENT)) + { + return FALSE; + } + + lpwndpl->flags = 0; + if (0 == (Wnd->Style & WS_VISIBLE)) + { + lpwndpl->showCmd = SW_HIDE; + } + else if (0 != (Window->Flags & WINDOWOBJECT_RESTOREMAX) || + 0 != (Wnd->Style & WS_MAXIMIZE)) + { + lpwndpl->showCmd = SW_MAXIMIZE; + } + else if (0 != (Wnd->Style & WS_MINIMIZE)) + { + lpwndpl->showCmd = SW_MINIMIZE; + } + else if (0 != (Wnd->Style & WS_VISIBLE)) + { + lpwndpl->showCmd = SW_SHOWNORMAL; + } + + Size.x = Wnd->WindowRect.left; + Size.y = Wnd->WindowRect.top; + WinPosInitInternalPos(Window, &Size, + &Wnd->WindowRect); + + lpwndpl->rcNormalPosition = Wnd->InternalPos.NormalRect; + lpwndpl->ptMinPosition = Wnd->InternalPos.IconPos; + lpwndpl->ptMaxPosition = Wnd->InternalPos.MaxPos; + + return TRUE; +} + /* FUNCTIONS *****************************************************************/ @@ -2988,16 +3036,78 @@ /* - * @unimplemented + * @implemented */ DWORD APIENTRY -NtUserGetInternalWindowPos( HWND hwnd, +NtUserGetInternalWindowPos( HWND hWnd, LPRECT rectWnd, LPPOINT ptIcon) { - UNIMPLEMENTED - - return 0; + PWINDOW_OBJECT Window; + PWINDOW Wnd; + DWORD Ret = 0; + BOOL Hit = FALSE; + WINDOWPLACEMENT wndpl; + + UserEnterShared(); + + if (!(Window = UserGetWindowObject(hWnd)) || !Window->Wnd) + { + Hit = FALSE; + goto Exit; + } + Wnd = Window->Wnd; + + _SEH2_TRY + { + if(rectWnd) + { + ProbeForWrite(rectWnd, + sizeof(RECT), + 1); + } + if(ptIcon) + { + ProbeForWrite(ptIcon, + sizeof(POINT), + 1); + } + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Hit = TRUE; + } + _SEH2_END; + + + if (IntGetWindowPlacement(Window, &wndpl) && !Hit) + { + _SEH2_TRY + { + if (rectWnd) + { + RtlCopyMemory(rectWnd, &wndpl.rcNormalPosition , sizeof(RECT)); + } + if (ptIcon) + { + RtlCopyMemory(ptIcon, &wndpl.ptMinPosition, sizeof(POINT)); + } + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Hit = TRUE; + } + _SEH2_END; + + if (!Hit) Ret = wndpl.showCmd; + } +Exit: + UserLeave(); + return Ret; } DWORD

15 years, 11 months

[janderwald] 39152: - Fix msvc project generation for kernel mode drivers without a driver entry

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jan 27 15:52:36 2009 New Revision: 39152 URL: http://svn.reactos.org/svn/reactos?rev=39152&view=rev Log: - Fix msvc project generation for kernel mode drivers without a driver entry Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] Tue Jan 27 15:52:36 2009 @@ -471,7 +471,7 @@ { fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); - if (module.GetEntryPoint(false) == "0") + if (module.GetEntryPoint(false) == "0" && sys == false) fprintf ( OUT, "AdditionalOptions=\"/noentry\"" ); if (configuration.VSProjectVersion == "9.00") @@ -544,7 +544,10 @@ if ( sys ) { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + if (module.GetEntryPoint(false) == "0") + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /noentry /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + else + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 );

15 years, 11 months

[tkreuzer] 39151: hal: fix some ULONG/ULONG_PTR issues

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 27 15:35:00 2009 New Revision: 39151 URL: http://svn.reactos.org/svn/reactos?rev=39151&view=rev Log: hal: fix some ULONG/ULONG_PTR issues Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c [iso-8859-1] Tue Jan 27 15:35:00 2009 @@ -934,18 +934,18 @@ CommonBase = (PULONG)COMMON_AREA; /* Copy bootstrap code to common area */ - memcpy((PVOID)((ULONG)CommonBase + PAGE_SIZE), + memcpy((PVOID)((ULONG_PTR)CommonBase + PAGE_SIZE), &APstart, - (ULONG)&APend - (ULONG)&APstart + 1); + (ULONG_PTR)&APend - (ULONG_PTR)&APstart + 1); /* Set shutdown code */ CMOS_WRITE(0xF, 0xA); /* Set warm reset vector */ - ps = (PUSHORT)((ULONG)BIOSBase + 0x467); + ps = (PUSHORT)((ULONG_PTR)BIOSBase + 0x467); *ps = (COMMON_AREA + PAGE_SIZE) & 0xF; - ps = (PUSHORT)((ULONG)BIOSBase + 0x469); + ps = (PUSHORT)((ULONG_PTR)BIOSBase + 0x469); *ps = (COMMON_AREA + PAGE_SIZE) >> 4; #endif

15 years, 11 months

[dchapyshev] 39150: - Partially implement User32InitializeImmEntryTable

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Jan 27 15:23:44 2009 New Revision: 39150 URL: http://svn.reactos.org/svn/reactos?rev=39150&view=rev Log: - Partially implement User32InitializeImmEntryTable Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/imm.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Tue Jan 27 15:23:44 2009 @@ -131,6 +131,7 @@ /* Internal Thread Data */ extern HINSTANCE User32Instance; +extern HINSTANCE hImmInstance; /* Critical Section*/ extern RTL_CRITICAL_SECTION User32Crit; 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] Tue Jan 27 15:23:44 2009 @@ -310,6 +310,7 @@ break; case DLL_PROCESS_DETACH: + if (hImmInstance) FreeLibrary(hImmInstance); CleanupThread(); Cleanup(); break; Modified: trunk/reactos/dll/win32/user32/misc/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/imm.… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/imm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/imm.c [iso-8859-1] Tue Jan 27 15:23:44 2009 @@ -12,18 +12,77 @@ #include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(user32); -/* - * @unimplemented - */ -DWORD WINAPI User32InitializeImmEntryTable(PVOID p) -{ - UNIMPLEMENTED; + +typedef struct +{ + BOOL (WINAPI* pImmIsIME) (HKL); + HIMC (WINAPI* pImmAssociateContext) (HWND, HIMC); +} Imm32ApiTable; + +Imm32ApiTable *pImmApiTable = {0}; +HINSTANCE hImmInstance = NULL; + + +static BOOL IsInitialized() +{ + return (hImmInstance != NULL) ? TRUE : FALSE; +} + +/* + * This function should not be implemented, it is used, + * if you can not load function from imm32.dll + */ +BOOL WINAPI IMM_ImmIsIME(HKL hKL) +{ return 0; } +/* See comment for IMM_ImmIsIME */ +HIMC WINAPI IMM_ImmAssociateContext(HWND hwnd, HIMC himc) +{ + return 0; +} + +/* + * @unimplemented + */ +BOOL WINAPI User32InitializeImmEntryTable(DWORD dwUnknown) +{ + UNIMPLEMENTED; + + if (dwUnknown != 0x19650412) /* FIXME */ + return FALSE; + + if (IsInitialized()) + return TRUE; + + hImmInstance = LoadLibraryW(L"imm32.dll"); + if (!hImmInstance) + return FALSE; + + ZeroMemory(pImmApiTable, sizeof(Imm32ApiTable)); + + pImmApiTable->pImmIsIME = (BOOL (WINAPI*)(HKL)) GetProcAddress(hImmInstance, "ImmIsIME"); + if (!pImmApiTable->pImmIsIME) + pImmApiTable->pImmIsIME = IMM_ImmIsIME; + + pImmApiTable->pImmAssociateContext = (HIMC (WINAPI*)(HWND, HIMC)) GetProcAddress(hImmInstance, "ImmAssociateContext"); + if (!pImmApiTable->pImmAssociateContext) + pImmApiTable->pImmAssociateContext = IMM_ImmAssociateContext; + + /* + * TODO: Load more functions from imm32.dll + * Function like IMPSetIMEW, IMPQueryIMEW etc. call functions + * from imm32.dll through pointers in the structure pImmApiTable. + * I do not know whether it is necessary to initialize a table + * of functions to load user32 (DLL_PROCESS_ATTACH) + */ + + return TRUE; +} + /* * @unimplemented */

15 years, 11 months

[janderwald] 39149: - Register sysaudio device interfaces

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jan 27 14:02:50 2009 New Revision: 39149 URL: http://svn.reactos.org/svn/reactos?rev=39149&view=rev Log: - Register sysaudio device interfaces Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Tue Jan 27 14:02:50 2009 @@ -11,17 +11,19 @@ #include <ntddk.h> #include <ks.h> +#define YDEBUG #include <debug.h> //#include <dxsdk/mediaobj.h> #include "sysaudio.h" + + const GUID KS_CATEGORY_AUDIO = {0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; - VOID NTAPI SysAudio_Unload(IN PDRIVER_OBJECT DriverObject) { - DPRINT("SysAudio_Unload called\n"); + DPRINT1("SysAudio_Unload called\n"); } NTSTATUS @@ -77,6 +79,14 @@ return STATUS_SUCCESS; } + +const GUID KSCATEGORY_AUDIO_DEVICE = {0xFBF6F530L, 0x07B9, 0x11D2, {0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}}; +const GUID KSCATEGORY_PREFERRED_WAVEOUT_DEVICE = {0xD6C5066EL, 0x72C1, 0x11D2, {0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}}; +const GUID KSCATEGORY_PREFERRED_WAVEIN_DEVICE = {0xD6C50671L, 0x72C1, 0x11D2, {0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}}; +const GUID KSCATEGORY_PREFERRED_MIDIOUT_DEVICE = {0xD6C50674L, 0x72C1, 0x11D2, {0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}}; + + + NTSTATUS NTAPI SysAudio_AddDevice( @@ -90,8 +100,9 @@ PDEVICE_OBJECT NextDeviceObject; KSOBJECT_CREATE_ITEM CreateItem; SYSAUDIODEVEXT *DeviceExtension; - - DPRINT("SysAudio_AddDevice called\n"); + UNICODE_STRING SymbolicLink; + + DPRINT1("SysAudio_AddDevice called\n"); /* create the device */ Status = IoCreateDevice(DriverObject, @@ -166,12 +177,36 @@ DeviceInterfaceChangeCallback, (PVOID)DeviceExtension, &DeviceExtension->EchoCancelNotificationEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoRegisterPlugPlayNotification failed with %x\n", Status); + return Status; + } #endif - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoRegisterPlugPlayNotification failed with %x\n", Status); - return Status; - } + + Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &KSCATEGORY_PREFERRED_MIDIOUT_DEVICE, NULL, &SymbolicLink); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to register KSCATEGORY_PREFERRED_MIDIOUT_DEVICE interface\n"); + return Status; + } + RtlFreeUnicodeString(&SymbolicLink); + + Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &KSCATEGORY_PREFERRED_WAVEIN_DEVICE, NULL, &SymbolicLink); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEIN_DEVICE interface\n"); + return Status; + } + RtlFreeUnicodeString(&SymbolicLink); + + Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &KSCATEGORY_PREFERRED_WAVEOUT_DEVICE, NULL, &SymbolicLink); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEOUT_DEVICE interface\n"); + return Status; + } + RtlFreeUnicodeString(&SymbolicLink); /* set io flags */ DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; @@ -192,9 +227,7 @@ IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DPRINT("System audio graph builder (sysaudio) started\n"); - - + DPRINT1("System audio graph builder (sysaudio) started\n"); DPRINT1("Setting KS function handlers\n"); KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CREATE);

15 years, 11 months

[arty] 39148: Not sure if anybody else uses ccache, but this saves almost 800 recompilations every time wmc runs.

by arty＠svn.reactos.org

Author: arty Date: Tue Jan 27 13:58:30 2009 New Revision: 39148 URL: http://svn.reactos.org/svn/reactos?rev=39148&view=rev Log: Not sure if anybody else uses ccache, but this saves almost 800 recompilations every time wmc runs. Modified: trunk/reactos/tools/wmc/write.c Modified: trunk/reactos/tools/wmc/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/write.c?rev=3914… ============================================================================== --- trunk/reactos/tools/wmc/write.c [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/write.c [iso-8859-1] Tue Jan 27 13:58:30 2009 @@ -91,7 +91,7 @@ "/* This file is generated with wmc version " PACKAGE_VERSION ". Do not edit! */\n" "/* Source : %s */\n" "/* Cmdline: %s */\n" - "/* Date : %s */\n" + // "/* Date : %s */\n" "\n" ;

15 years, 11 months

[dchapyshev] 39147: - Add file for imm-functions - Move all imm-functions to imm.c

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Jan 27 13:06:46 2009 New Revision: 39147 URL: http://svn.reactos.org/svn/reactos?rev=39147&view=rev Log: - Add file for imm-functions - Move all imm-functions to imm.c Added: trunk/reactos/dll/win32/user32/misc/imm.c (with props) Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.rbuild Added: trunk/reactos/dll/win32/user32/misc/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/imm.… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/imm.c (added) +++ trunk/reactos/dll/win32/user32/misc/imm.c [iso-8859-1] Tue Jan 27 13:06:46 2009 @@ -1,0 +1,146 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS user32.dll + * FILE: dll/win32/user32/misc/imm.c + * PURPOSE: User32.dll Imm functions + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + * UPDATE HISTORY: + * 01/27/2009 Created + */ + +#include <user32.h> + +#include <wine/debug.h> + + +WINE_DEFAULT_DEBUG_CHANNEL(user32); + +/* + * @unimplemented + */ +DWORD WINAPI User32InitializeImmEntryTable(PVOID p) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +IMPSetIMEW(HWND hwnd, LPIMEPROW ime) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +IMPQueryIMEW(LPIMEPROW ime) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +IMPGetIMEW(HWND hwnd, LPIMEPROW ime) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +IMPSetIMEA(HWND hwnd, LPIMEPROA ime) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +IMPQueryIMEA(LPIMEPROA ime) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +IMPGetIMEA(HWND hwnd, LPIMEPROA ime) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +LRESULT +WINAPI +SendIMEMessageExW(HWND hwnd, LPARAM lparam) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +LRESULT +WINAPI +SendIMEMessageExA(HWND hwnd, LPARAM lparam) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +WINNLSEnableIME(HWND hwnd, BOOL enable) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +WINNLSGetEnableStatus(HWND hwnd) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +UINT +WINAPI +WINNLSGetIMEHotkey(HWND hwnd) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: trunk/reactos/dll/win32/user32/misc/imm.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Tue Jan 27 13:06:46 2009 @@ -448,127 +448,6 @@ /* * @unimplemented */ -UINT -WINAPI -WINNLSGetIMEHotkey( HWND hwnd) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -WINNLSEnableIME( HWND hwnd, BOOL enable) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -WINNLSGetEnableStatus( HWND hwnd) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -IMPSetIMEW( HWND hwnd, LPIMEPROW ime) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -IMPQueryIMEW( LPIMEPROW ime) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -IMPGetIMEW( HWND hwnd, LPIMEPROW ime) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -IMPSetIMEA( HWND hwnd, LPIMEPROA ime) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -IMPQueryIMEA( LPIMEPROA ime) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -IMPGetIMEA( HWND hwnd, LPIMEPROA ime) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -LRESULT -WINAPI -SendIMEMessageExW(HWND hwnd,LPARAM lparam) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -LRESULT -WINAPI -SendIMEMessageExA(HWND hwnd, LPARAM lparam) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ BOOL WINAPI DisplayExitWindowsWarnings(ULONG flags) { UNIMPLEMENTED; @@ -689,14 +568,3 @@ UNIMPLEMENTED; return FALSE; } - - -/* - * @unimplemented - */ -DWORD WINAPI User32InitializeImmEntryTable(PVOID p) -{ - UNIMPLEMENTED; - return 0; -} - Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Tue Jan 27 13:06:46 2009 @@ -37,6 +37,7 @@ <file>dllmain.c</file> <file>exit.c</file> <file>exticon.c</file> + <file>imm.c</file> <file>misc.c</file> <file>object.c</file> <file>resources.c</file>

15 years, 11 months

[dchapyshev] 39146: - Direct call NtSetInternalWindowPos - Add TODO for GetInternalWindowPos

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Jan 27 12:47:08 2009 New Revision: 39146 URL: http://svn.reactos.org/svn/reactos?rev=39146&view=rev Log: - Direct call NtSetInternalWindowPos - Add TODO for GetInternalWindowPos Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.def Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Tue Jan 27 12:47:08 2009 @@ -138,21 +138,6 @@ VOID WINAPI LoadRemoteFonts ( VOID ) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -VOID -WINAPI -SetInternalWindowPos( - HWND hwnd, - UINT showCmd, - LPRECT rect, - LPPOINT pt - ) { UNIMPLEMENTED; } Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] Tue Jan 27 12:47:08 2009 @@ -289,7 +289,7 @@ GetIconInfo@8 GetInputDesktop@0 GetInputState@0 -GetInternalWindowPos@12 +GetInternalWindowPos@12 ; TODO: direct call NtUserGetInternalWindowPos GetKBCodePage@0 GetKeyNameTextA@12 GetKeyNameTextW@12 @@ -607,7 +607,7 @@ SetDoubleClickTime@4 SetFocus@4=NtUserSetFocus@4 SetForegroundWindow@4 -SetInternalWindowPos@16 +SetInternalWindowPos@16=NtUserSetInternalWindowPos@16 SetKeyboardState@4=NtUserSetKeyboardState@4 SetLastErrorEx@8 SetLayeredWindowAttributes@16=NtUserSetLayeredWindowAttributes@16

15 years, 11 months

[dreimer] 39145: Synched recent changes into PS too.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jan 27 12:28:59 2009 New Revision: 39145 URL: http://svn.reactos.org/svn/reactos?rev=39145&view=rev Log: Synched recent changes into PS too. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Tue Jan 27 12:28:59 2009 @@ -31,34 +31,26 @@ # Apply modified obj and out paths for deletion. # + if ($ENV:ROS_ARCH -eq $null) { + $ENV:ROS_ARCH = "i386" + } + if ($_ROSBE_OBJPATH -eq $null) { - if ($ENV:ROS_ARCH -ne $null) { - $_ROSBE_OBJCLEANPATH = "obj-$ENV:ROS_ARCH" - } else { - $_ROSBE_OBJCLEANPATH = "obj-i386" - } + $_ROSBE_OBJCLEANPATH = "$_ROSBE_ROSSOURCEDIR\obj-$ENV:ROS_ARCH" } else { $_ROSBE_OBJCLEANPATH = "$_ROSBE_OBJPATH" } if ($_ROSBE_OUTPATH -eq $null) { - if ($ENV:ROS_ARCH -ne $null) { - $_ROSBE_OUTCLEANPATH = "output-$ENV:ROS_ARCH" - } else { - $_ROSBE_OUTCLEANPATH = "output-i386" - } + $_ROSBE_OUTCLEANPATH = "$_ROSBE_ROSSOURCEDIR\output-$ENV:ROS_ARCH" } else { $_ROSBE_OUTCLEANPATH = "$_ROSBE_OUTPATH" } - if ($ENV:ROS_ARCH -ne $null) { - $_ROSBE_MAKEFILE = "makefile-$ENV:ROS_ARCH.auto" + if ($ENV:ROS_ARCH -eq "i386") { + $_ROSBE_MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto" } else { - $_ROSBE_MAKEFILE = "makefile.auto" - } - - if ($ENV:ROS_ARCH -eq $null) { - $ENV:ROS_ARCH = "i386" + $_ROSBE_MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto" } if (Test-Path "$_ROSBE_MAKEFILE") { @@ -82,8 +74,8 @@ $ENV:ROS_ARCH = $null } - if (Test-Path "reactos") { - $null = (Remove-Item "reactos" -recurse -force) + if (Test-Path "$_ROSBE_ROSSOURCEDIR\reactos") { + $null = (Remove-Item "$_ROSBE_ROSSOURCEDIR\reactos" -recurse -force) } }

15 years, 11 months

[dchapyshev] 39144: - Sync gdiplus with Wine head

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Jan 27 12:03:33 2009 New Revision: 39144 URL: http://svn.reactos.org/svn/reactos?rev=39144&view=rev Log: - Sync gdiplus with Wine head Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/pen.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/include/psdk/gdiplusenums.h trunk/reactos/include/psdk/gdiplusgpstubs.h Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] Tue Jan 27 12:03:33 2009 @@ -53,6 +53,14 @@ (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); break; + case BrushTypeHatchFill: + *clone = GdipAlloc(sizeof(GpHatch)); + if (!*clone) return OutOfMemory; + + memcpy(*clone, brush, sizeof(GpHatch)); + + (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); + break; case BrushTypePathGradient:{ GpPathGradient *src, *dest; INT count; @@ -120,6 +128,67 @@ ERR("not implemented for brush type %d\n", brush->bt); return NotImplemented; } + + return Ok; +} + +static LONG HatchStyleToHatch(HatchStyle hatchstyle) +{ + switch (hatchstyle) + { + case HatchStyleHorizontal: return HS_HORIZONTAL; + case HatchStyleVertical: return HS_VERTICAL; + case HatchStyleForwardDiagonal: return HS_FDIAGONAL; + case HatchStyleBackwardDiagonal: return HS_BDIAGONAL; + case HatchStyleCross: return HS_CROSS; + case HatchStyleDiagonalCross: return HS_DIAGCROSS; + default: return 0; + } +} + +/****************************************************************************** + * GdipCreateHatchBrush [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) +{ + COLORREF fgcol = ARGB2COLORREF(forecol); + + TRACE("(%d, %d, %d, %p)\n", hatchstyle, forecol, backcol, brush); + + if(!brush) return InvalidParameter; + + *brush = GdipAlloc(sizeof(GpHatch)); + if (!*brush) return OutOfMemory; + + switch (hatchstyle) + { + case HatchStyleHorizontal: + case HatchStyleVertical: + case HatchStyleForwardDiagonal: + case HatchStyleBackwardDiagonal: + case HatchStyleCross: + case HatchStyleDiagonalCross: + /* Brushes that map to BS_HATCHED */ + (*brush)->brush.lb.lbStyle = BS_HATCHED; + (*brush)->brush.lb.lbColor = fgcol; + (*brush)->brush.lb.lbHatch = HatchStyleToHatch(hatchstyle); + break; + + default: + FIXME("Unimplemented hatch style %d\n", hatchstyle); + + (*brush)->brush.lb.lbStyle = BS_SOLID; + (*brush)->brush.lb.lbColor = fgcol; + (*brush)->brush.lb.lbHatch = 0; + break; + } + + + (*brush)->brush.gdibrush = CreateBrushIndirect(&(*brush)->brush.lb); + (*brush)->brush.bt = BrushTypeHatchFill; + (*brush)->forecol = forecol; + (*brush)->backcol = backcol; + (*brush)->hatchstyle = hatchstyle; return Ok; } @@ -644,6 +713,39 @@ if(!brush || !type) return InvalidParameter; *type = brush->bt; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetHatchBackgroundColor(GpHatch *brush, ARGB *backcol) +{ + TRACE("(%p, %p)\n", brush, backcol); + + if(!brush || !backcol) return InvalidParameter; + + *backcol = brush->backcol; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch *brush, ARGB *forecol) +{ + TRACE("(%p, %p)\n", brush, forecol); + + if(!brush || !forecol) return InvalidParameter; + + *forecol = brush->forecol; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch *brush, HatchStyle *hatchstyle) +{ + TRACE("(%p, %p)\n", brush, hatchstyle); + + if(!brush || !hatchstyle) return InvalidParameter; + + *hatchstyle = brush->hatchstyle; return Ok; } @@ -1331,3 +1433,17 @@ return ret; } + +GpStatus WINGDIPAPI GdipRotateLineTransform(GpLineGradient* brush, + REAL angle, GpMatrixOrder order) +{ + static int calls; + + if(!brush) + return InvalidParameter; + + if(!(calls++)) + FIXME("(%p, %.2f, %d) stub\n", brush, angle, order); + + return NotImplemented; +} Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Tue Jan 27 12:03:33 2009 @@ -96,7 +96,7 @@ @ stdcall GdipCreateHBITMAPFromBitmap(ptr ptr long) @ stub GdipCreateHICONFromBitmap @ stdcall GdipCreateHalftonePalette() -@ stub GdipCreateHatchBrush +@ stdcall GdipCreateHatchBrush(long long long ptr) @ stdcall GdipCreateImageAttributes(ptr) @ stdcall GdipCreateLineBrush(ptr ptr long long long ptr) @ stdcall GdipCreateLineBrushFromRect(ptr long long long long ptr) @@ -275,9 +275,9 @@ @ stdcall GdipGetGenericFontFamilyMonospace(ptr) @ stdcall GdipGetGenericFontFamilySansSerif(ptr) @ stdcall GdipGetGenericFontFamilySerif(ptr) -@ stub GdipGetHatchBackgroundColor -@ stub GdipGetHatchForegroundColor -@ stub GdipGetHatchStyle +@ stdcall GdipGetHatchBackgroundColor(ptr ptr) +@ stdcall GdipGetHatchForegroundColor(ptr ptr) +@ stdcall GdipGetHatchStyle(ptr ptr) @ stub GdipGetHemfFromMetafile @ stub GdipGetImageAttributesAdjustedPalette @ stdcall GdipGetImageBounds(ptr ptr ptr) @@ -480,12 +480,12 @@ @ stub GdipResetPageTransform @ stdcall GdipResetPath(ptr) @ stub GdipResetPathGradientTransform -@ stub GdipResetPenTransform +@ stdcall GdipResetPenTransform(ptr) @ stdcall GdipResetTextureTransform(ptr) @ stdcall GdipResetWorldTransform(ptr) @ stdcall GdipRestoreGraphics(ptr long) @ stdcall GdipReversePath(ptr) -@ stub GdipRotateLineTransform +@ stdcall GdipRotateLineTransform(ptr long long) @ stdcall GdipRotateMatrix(ptr long long) @ stub GdipRotatePathGradientTransform @ stub GdipRotatePenTransform @@ -499,7 +499,7 @@ @ stub GdipScaleLineTransform @ stdcall GdipScaleMatrix(ptr long long long) @ stub GdipScalePathGradientTransform -@ stub GdipScalePenTransform +@ stdcall GdipScalePenTransform(ptr long long long) @ stdcall GdipScaleTextureTransform(ptr long long long) @ stdcall GdipScaleWorldTransform(ptr long long long) @ stdcall GdipSetAdjustableArrowCapFillState(ptr long) Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Tue Jan 27 12:03:33 2009 @@ -109,6 +109,13 @@ HBRUSH gdibrush; GpBrushType bt; LOGBRUSH lb; +}; + +struct GpHatch{ + GpBrush brush; + HatchStyle hatchstyle; + ARGB forecol; + ARGB backcol; }; struct GpSolidFill{ Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Tue Jan 27 12:03:33 2009 @@ -3229,7 +3229,7 @@ m = *(graphics->worldtrans); - ret = GdipMultiplyMatrix(&m, (GpMatrix*)matrix, order); + ret = GdipMultiplyMatrix(&m, matrix, order); if(ret == Ok) *(graphics->worldtrans) = m; Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Tue Jan 27 12:03:33 2009 @@ -1068,7 +1068,35 @@ else GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - (*((GpBitmap**) image))->format = (bmch->bcBitCount << 8) | PixelFormatGDI; + switch(bmch->bcBitCount) + { + case 1: + (*((GpBitmap**) image))->format = PixelFormat1bppIndexed; + break; + case 4: + (*((GpBitmap**) image))->format = PixelFormat4bppIndexed; + break; + case 8: + (*((GpBitmap**) image))->format = PixelFormat8bppIndexed; + break; + case 16: + (*((GpBitmap**) image))->format = PixelFormat16bppRGB565; + break; + case 24: + (*((GpBitmap**) image))->format = PixelFormat24bppRGB; + break; + case 32: + (*((GpBitmap**) image))->format = PixelFormat32bppRGB; + break; + case 48: + (*((GpBitmap**) image))->format = PixelFormat48bppRGB; + break; + default: + FIXME("Bit depth %d is not fully supported yet\n", bmch->bcBitCount); + (*((GpBitmap**) image))->format = (bmch->bcBitCount << 8) | PixelFormatGDI; + break; + } + GdipFree(pbmi); } else if(type == PICTYPE_METAFILE || type == PICTYPE_ENHMETAFILE){ @@ -1180,7 +1208,7 @@ *output = GdipAlloc(*output_size); - bmp_file_hdr = (BITMAPFILEHEADER*) *output; + bmp_file_hdr = *output; bmp_file_hdr->bfType = BITMAP_FORMAT_BMP; bmp_file_hdr->bfSize = *output_size; bmp_file_hdr->bfOffBits = Modified: trunk/reactos/dll/win32/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/pen.c?re… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/pen.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/pen.c [iso-8859-1] Tue Jan 27 12:03:33 2009 @@ -385,6 +385,32 @@ return Ok; } +GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen) +{ + static int calls; + + if(!pen) + return InvalidParameter; + + if(!(calls++)) + FIXME("(%p) stub\n", pen); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) +{ + static int calls; + + if(!pen) + return InvalidParameter; + + if(!(calls++)) + FIXME("(%p, %.2f, %.2f, %d) stub\n", pen, sx, sy, order); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) { TRACE("(%p, %p)\n", pen, brush); Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Tue Jan 27 12:03:33 2009 @@ -268,7 +268,6 @@ out: GdipFree(left); - delete_element(right); GdipDeleteRegion(path_region); return stat; } @@ -315,7 +314,6 @@ out: GdipFree(left); - delete_element(right); GdipDeleteRegion(rect_region); return stat; } @@ -373,7 +371,6 @@ if (stat != Ok) { GdipFree(left); - delete_element(right); return OutOfMemory; } Modified: trunk/reactos/include/psdk/gdiplusenums.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusenums.… ============================================================================== --- trunk/reactos/include/psdk/gdiplusenums.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusenums.h [iso-8859-1] Tue Jan 27 12:03:33 2009 @@ -355,6 +355,67 @@ MetafileFrameUnitDocument = UnitDocument, MetafileFrameUnitMillimeter = UnitMillimeter, MetafileFrameUnitGdi +}; + +enum HatchStyle +{ + HatchStyleHorizontal = 0, + HatchStyleVertical = 1, + HatchStyleForwardDiagonal = 2, + HatchStyleBackwardDiagonal = 3, + HatchStyleCross = 4, + HatchStyleDiagonalCross = 5, + HatchStyle05Percent = 6, + HatchStyle10Percent = 7, + HatchStyle20Percent = 8, + HatchStyle25Percent = 9, + HatchStyle30Percent = 10, + HatchStyle40Percent = 11, + HatchStyle50Percent = 12, + HatchStyle60Percent = 13, + HatchStyle70Percent = 14, + HatchStyle75Percent = 15, + HatchStyle80Percent = 16, + HatchStyle90Percent = 17, + HatchStyleLightDownwardDiagonal = 18, + HatchStyleLightUpwardDiagonal = 19, + HatchStyleDarkDownwardDiagonal = 20, + HatchStyleDarkUpwardDiagonal = 21, + HatchStyleWideDownwardDiagonal = 22, + HatchStyleWideUpwardDiagonal = 23, + HatchStyleLightVertical = 24, + HatchStyleLightHorizontal = 25, + HatchStyleNarrowVertical = 26, + HatchStyleNarrowHorizontal = 27, + HatchStyleDarkVertical = 28, + HatchStyleDarkHorizontal = 29, + HatchStyleDashedDownwardDiagonal = 30, + HatchStyleDashedUpwardDiagonal = 31, + HatchStyleDashedHorizontal = 32, + HatchStyleDashedVertical = 33, + HatchStyleSmallConfetti = 34, + HatchStyleLargeConfetti = 35, + HatchStyleZigZag = 36, + HatchStyleWave = 37, + HatchStyleDiagonalBrick = 38, + HatchStyleHorizontalBrick = 39, + HatchStyleWeave = 40, + HatchStylePlaid = 41, + HatchStyleDivot = 42, + HatchStyleDottedGrid = 43, + HatchStyleDottedDiamond = 44, + HatchStyleShingle = 45, + HatchStyleTrellis = 46, + HatchStyleSphere = 47, + HatchStyleSmallGrid = 48, + HatchStyleSmallCheckerBoard = 49, + HatchStyleLargeCheckerBoard = 50, + HatchStyleOutlinedDiamond = 51, + HatchStyleSolidDiamond = 52, + HatchStyleTotal = 53, + HatchStyleLargeGrid = HatchStyleCross, + HatchStyleMin = HatchStyleHorizontal, + HatchStyleMax = HatchStyleTotal - 1 }; #ifndef __cplusplus @@ -395,6 +456,7 @@ typedef enum GpTestControlEnum GpTestControlEnum; typedef enum MetafileFrameUnit MetafileFrameUnit; typedef enum PenType PenType; +typedef enum HatchStyle HatchStyle; #endif /* end of c typedefs */ Modified: trunk/reactos/include/psdk/gdiplusgpstubs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusgpstub… ============================================================================== --- trunk/reactos/include/psdk/gdiplusgpstubs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusgpstubs.h [iso-8859-1] Tue Jan 27 12:03:33 2009 @@ -23,6 +23,7 @@ class GpGraphics {}; class GpBrush {}; +class GpHatch : public GpBrush {}; class GpSolidFill : public GpBrush {}; class GpPath {}; class GpMatrix {}; @@ -49,6 +50,7 @@ typedef struct GpGraphics GpGraphics; typedef struct GpPen GpPen; typedef struct GpBrush GpBrush; +typedef struct GpHatch GpHatch; typedef struct GpSolidFill GpSolidFill; typedef struct GpPath GpPath; typedef struct GpMatrix GpMatrix;

15 years, 11 months

← Newer
1
...
8
9
10
11
12
13
14
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009