Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[greatlrd] 37582: Sorry fix a typo
by greatlrd＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: greatlrd Date: Sun Nov 23 05:02:22 2008 New Revision: 37582 URL: http://svn.reactos.org/svn/reactos?rev=37582&view=rev Log: Sorry fix a typo Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sun Nov 23 05:02:22 2008 @@ -285,7 +285,7 @@ { /* Destory the surface */ - if ( pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE) == DDHAL_SURFCB32_DESTROYSURFACE) && + if ( (( pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE) == DDHAL_SURFCB32_DESTROYSURFACE) && (pDciSurface_int->DciSurface_lcl.SurfaceLocal.hDDSurface != 0) ) { /* setup data to destory primary surface if we got one */

1 0

[greatlrd] 37581: Finish Implement DCIDestroy() it free all alloc res now.
by greatlrd＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: greatlrd Date: Sun Nov 23 05:00:11 2008 New Revision: 37581 URL: http://svn.reactos.org/svn/reactos?rev=37581&view=rev Log: Finish Implement DCIDestroy() it free all alloc res now. Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sun Nov 23 05:00:11 2008 @@ -176,7 +176,7 @@ DDSurfaceDesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_VISIBLE ; /* Setup DDHAL_CREATESURFACEDATA for createsurface */ - lpcsd.lpDD = pDciSurface_int->DciSurface_lcl.SurfaceGlobal.lpDD; + lpcsd.lpDD = &pDciSurface_int->DciSurface_lcl.DirectDrawGlobal; lpcsd.lpDDSurfaceDesc = &DDSurfaceDesc; SurfaceLocal_List[0] = &pDciSurface_int->DciSurface_lcl.SurfaceLocal; lpcsd.lplpSList = SurfaceLocal_List; @@ -269,6 +269,7 @@ void WINAPI DCIDestroy(LPDCISURFACEINFO pDciSurfaceInfo) { + DDHAL_DESTROYSURFACEDATA lpcsd; LPDCISURFACE_INT pDciSurface_int = NULL; if (pDciSurfaceInfo != NULL) { @@ -278,18 +279,28 @@ /* If we lost the primary surface we do not destory it, */ if (pDciSurface_int->DciSurface_lcl.LostSurface == FALSE) { - /* Fixme destore the primary surface */ - - /* Check see if dx hal support DestroySurface */ - if ( (pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE) == DDHAL_SURFCB32_DESTROYSURFACE) - { - // lpcsd.DestroySurface = pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.DestroySurface; - } - - - /* Destroy the Ddraw object */ + + /* Check see if we have a Ddraw object or not */ if (pDciSurface_int->DciSurface_lcl.DirectDrawGlobal.hDD != 0) { + + /* Destory the surface */ + if ( pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE) == DDHAL_SURFCB32_DESTROYSURFACE) && + (pDciSurface_int->DciSurface_lcl.SurfaceLocal.hDDSurface != 0) ) + { + /* setup data to destory primary surface if we got one */ + lpcsd.lpDD = &pDciSurface_int->DciSurface_lcl.DirectDrawGlobal; + lpcsd.lpDDSurface = &pDciSurface_int->DciSurface_lcl.SurfaceLocal; + lpcsd.ddRVal = DDERR_GENERIC; + lpcsd.DestroySurface = pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.DestroySurface; + + /* Destory the surface */ + lpcsd.DestroySurface(&lpcsd); + + /* Do noting if we fail to destory the surface */ + } + + /* Destroy the Ddraw object */ DdDeleteDirectDrawObject(&pDciSurface_int->DciSurface_lcl.DirectDrawGlobal); }

1 0

[gbrunmar] 37580: Build and use native d3d9 module and not wine's wrapper
by gbrunmar＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: gbrunmar Date: Sun Nov 23 04:14:09 2008 New Revision: 37580 URL: http://svn.reactos.org/svn/reactos?rev=37580&view=rev Log: Build and use native d3d9 module and not wine's wrapper Modified: branches/reactx/reactos/boot/bootdata/packages/reactos.dff branches/reactx/reactos/dll/directx/directx.rbuild branches/reactx/reactos/dll/directx/wine/wine.rbuild Modified: branches/reactx/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/boot/bootdata/pa… ============================================================================== --- branches/reactx/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/reactx/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Nov 23 04:14:09 2008 @@ -141,7 +141,7 @@ dll\directx\qedit\qedit.dll 1 dll\directx\wine\d3d8\d3d8.dll 1 dll\directx\wine\wined3d\wined3d.dll 1 -dll\directx\wine\d3d9\d3d9.dll 1 +dll\directx\d3d9\d3d9.dll 1 dll\keyboard\kbda1\kbda1.dll 1 dll\keyboard\kbda2\kbda2.dll 1 Modified: branches/reactx/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/dire… ============================================================================== --- branches/reactx/reactos/dll/directx/directx.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/directx.rbuild [iso-8859-1] Sun Nov 23 04:14:09 2008 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="d3d9"> + <xi:include href="d3d9/d3d9.rbuild" /> + </directory> <directory name="d3d8thk"> <xi:include href="d3d8thk/d3d8thk.rbuild" /> </directory> Modified: branches/reactx/reactos/dll/directx/wine/wine.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… ============================================================================== --- branches/reactx/reactos/dll/directx/wine/wine.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/wine/wine.rbuild [iso-8859-1] Sun Nov 23 04:14:09 2008 @@ -7,7 +7,7 @@ <directory name="d3d8"> <xi:include href="d3d8/d3d8.rbuild" /> </directory> - <directory name="d3d9"> + </group>

1 0

[dchapyshev] 37579: - Implement ActivateActCtx, AddRefActCtx, CreateActCtxW, DeactivateActCtx, FindActCtxSectionStringW, GetCurrentActCtx, ReleaseActCtx All based on Wine
by dchapyshev＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: dchapyshev Date: Sun Nov 23 04:10:29 2008 New Revision: 37579 URL: http://svn.reactos.org/svn/reactos?rev=37579&view=rev Log: - Implement ActivateActCtx, AddRefActCtx, CreateActCtxW, DeactivateActCtx, FindActCtxSectionStringW, GetCurrentActCtx, ReleaseActCtx All based on Wine Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] Sun Nov 23 04:10:29 2008 @@ -1,3 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/misc/actctx.c + * PURPOSE: Comm functions + * PROGRAMMERS: Jacek Caban for CodeWeavers + * Eric Pouech + * Jon Griffiths + * Dmitry Chapyshev (dmitry(a)reactos.org) + */ + #include <k32.h> #define NDEBUG @@ -123,9 +134,15 @@ ULONG_PTR *ulCookie ) { + NTSTATUS Status; + DPRINT("ActivateActCtx(%p %p)\n", hActCtx, ulCookie ); - if (ulCookie) - *ulCookie = ACTCTX_FAKE_COOKIE; + + if ((Status = RtlActivateActivationContext(0, hActCtx, ulCookie))) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } return TRUE; } @@ -139,6 +156,7 @@ ) { DPRINT("AddRefActCtx(%p)\n", hActCtx); + RtlAddRefActivationContext(hActCtx); } /* @@ -150,15 +168,17 @@ PCACTCTXW pActCtx ) { + NTSTATUS Status; + HANDLE hActCtx; + DPRINT("CreateActCtxW(%p %08lx)\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0); - if (!pActCtx) + if ((Status = RtlCreateActivationContext(&hActCtx, &pActCtx))) + { + SetLastError(RtlNtStatusToDosError(Status)); return INVALID_HANDLE_VALUE; - if (pActCtx->cbSize != sizeof *pActCtx) - return INVALID_HANDLE_VALUE; - if (pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL) - return INVALID_HANDLE_VALUE; - return ACTCTX_FAKE_HANDLE; + } + return hActCtx; } /* @@ -172,8 +192,7 @@ ) { DPRINT("DeactivateActCtx(%08lx %08lx)\n", dwFlags, ulCookie); - if (ulCookie != ACTCTX_FAKE_COOKIE) - return FALSE; + RtlDeactivateActivationContext(dwFlags, ulCookie); return TRUE; } @@ -207,8 +226,16 @@ PACTCTX_SECTION_KEYED_DATA ReturnedData ) { - DPRINT("%s() is UNIMPLEMENTED!\n", __FUNCTION__); - return FALSE; + UNICODE_STRING us; + NTSTATUS Status; + + RtlInitUnicodeString(&us, lpStringToFind); + if ((Status = RtlFindActivationContextSectionString(dwFlags, lpExtensionGuid, ulSectionId, &us, ReturnedData))) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + return TRUE; } /* @@ -219,8 +246,14 @@ GetCurrentActCtx( HANDLE *phActCtx) { + NTSTATUS Status; + DPRINT("GetCurrentActCtx(%p)\n", phActCtx); - *phActCtx = ACTCTX_FAKE_HANDLE; + if ((Status = RtlGetActiveActivationContext(phActCtx))) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } return TRUE; } @@ -255,6 +288,7 @@ ) { DPRINT("ReleaseActCtx(%p)\n", hActCtx); + RtlReleaseActivationContext(hActCtx); } /*

1 0

[dchapyshev] 37578: - Add stubs for RtlActivateActivationContext and RtlCreateActivationContext
by dchapyshev＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: dchapyshev Date: Sun Nov 23 04:02:20 2008 New Revision: 37578 URL: http://svn.reactos.org/svn/reactos?rev=37578&view=rev Log: - Add stubs for RtlActivateActivationContext and RtlCreateActivationContext Modified: trunk/reactos/dll/ntdll/def/ntdll_i386.def trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/dll/ntdll/def/ntdll_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll_i386.d… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] Sun Nov 23 04:02:20 2008 @@ -435,7 +435,7 @@ RtlAcquireResourceShared@8 RtlAcquireSRWLockExclusive@4 RtlAcquireSRWLockShared@4 -;RtlActivateActivationContext +RtlActivateActivationContext@12 ;RtlActivateActivationContextEx RtlActivateActivationContextUnsafeFast@8 RtlAddAccessAllowedAce@16 @@ -520,7 +520,7 @@ RtlCopyString@8 RtlCopyUnicodeString@8 RtlCreateAcl@12 -;RtlCreateActivationContext +RtlCreateActivationContext@8 ;RtlCreateAndSetSD RtlCreateAtomTable@8 ;RtlCreateBootStatusDataFile Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Nov 23 04:02:20 2008 @@ -2832,6 +2832,15 @@ #ifdef NTOS_MODE_USER NTSYSAPI +NTSTATUS +NTAPI +RtlActivateActivationContext( + IN ULONG Unknown, + IN HANDLE Handle, + OUT PULONG_PTR Cookie +); + +NTSYSAPI VOID NTAPI RtlAddRefActivationContext( @@ -2852,6 +2861,14 @@ NTAPI RtlAllocateActivationContextStack( IN PVOID *Context +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlCreateActivationContext( + OUT PHANDLE Handle, + IN OUT PVOID ReturnedData ); NTSYSAPI @@ -2903,10 +2920,10 @@ NTAPI RtlFindActivationContextSectionString( IN ULONG dwFlags, - IN const GUID *lpExtensionGuid, + IN const GUID *ExtensionGuid, IN ULONG SectionType, IN PUNICODE_STRING SectionName, - IN PVOID ReturnedData + IN OUT PVOID ReturnedData ); NTSYSAPI Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=37578… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sun Nov 23 04:02:20 2008 @@ -59,10 +59,10 @@ NTSTATUS NTAPI RtlFindActivationContextSectionString(IN ULONG dwFlags, - IN const GUID *lpExtensionGuid, + IN const GUID *ExtensionGuid, IN ULONG SectionType, IN PUNICODE_STRING SectionName, - IN PVOID ReturnedData) + IN OUT PVOID ReturnedData) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -122,3 +122,19 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS +NTAPI +RtlActivateActivationContext(IN ULONG Unknown, IN HANDLE Handle, OUT PULONG_PTR Cookie) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +RtlCreateActivationContext(OUT PHANDLE Handle, IN OUT PVOID ReturnedData) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +}

1 0

[greatlrd] 37577: Impement part of DCIDestroy Implement DCISetClipList Implement DCISetSrcDestClip Implement WinWatchNotify. BugFix : DciCreatePrimary. forget check see if hal support create surface or not.
by greatlrd＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: greatlrd Date: Sun Nov 23 03:54:48 2008 New Revision: 37577 URL: http://svn.reactos.org/svn/reactos?rev=37577&view=rev Log: Impement part of DCIDestroy Implement DCISetClipList Implement DCISetSrcDestClip Implement WinWatchNotify. BugFix : DciCreatePrimary. forget check see if hal support create surface or not. Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] Sun Nov 23 03:54:48 2008 @@ -5,18 +5,18 @@ DCICreateOffscreen@40 DCICreateOverlay@12 DCICreatePrimary@8 -; DCIDestroy + DCIDestroy@4 DCIDraw@4 ; DCIEndAccess DCIEnum@20 DCIOpenProvider@0 -; DCISetClipList + DCISetClipList@8 DCISetDestination@12 -; DCISetSrcDestClip + DCISetSrcDestClip@16 ; GetDCRegionData ; GetWindowRegionData ; WinWatchClose ; WinWatchDidStatusChange ; WinWatchGetClipList -; WinWatchNotify + WinWatchNotify@12 ; WinWatchOpen Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sun Nov 23 03:54:48 2008 @@ -20,6 +20,7 @@ DDRAWI_DDRAWSURFACE_LCL SurfaceLocal; DDHAL_DDCALLBACKS DDCallbacks; DDHAL_DDSURFACECALLBACKS DDSurfaceCallbacks; + } DCISURFACE_LCL, *LPDCISURFACE_LCL; typedef struct _DCISURFACE_INT @@ -181,10 +182,15 @@ lpcsd.lplpSList = SurfaceLocal_List; lpcsd.dwSCnt = 1; lpcsd.ddRVal = DDERR_GENERIC; - lpcsd.CreateSurface = pDciSurface_int->DciSurface_lcl.DDCallbacks.CreateSurface; + + /* Check see if dx hal support CreateSurface */ + if ( (pDciSurface_int->DciSurface_lcl.DDCallbacks.dwFlags & DDHAL_CB32_CREATESURFACE) == DDHAL_CB32_CREATESURFACE) + { + lpcsd.CreateSurface = pDciSurface_int->DciSurface_lcl.DDCallbacks.CreateSurface; + } /* Now try create our surface */ - if (lpcsd.CreateSurface != NULL) + if (lpcsd.CreateSurface != NULL ) { retvalue = lpcsd.CreateSurface(&lpcsd); } @@ -261,6 +267,44 @@ return retvalue; } +void WINAPI DCIDestroy(LPDCISURFACEINFO pDciSurfaceInfo) +{ + LPDCISURFACE_INT pDciSurface_int = NULL; + if (pDciSurfaceInfo != NULL) + { + /* Get the internal data for our pdci struct */ + pDciSurface_int = (LPDCISURFACE_INT) (((DWORD) pDciSurfaceInfo) - sizeof(DCISURFACE_LCL)) ; + + /* If we lost the primary surface we do not destory it, */ + if (pDciSurface_int->DciSurface_lcl.LostSurface == FALSE) + { + /* Fixme destore the primary surface */ + + /* Check see if dx hal support DestroySurface */ + if ( (pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE) == DDHAL_SURFCB32_DESTROYSURFACE) + { + // lpcsd.DestroySurface = pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.DestroySurface; + } + + + /* Destroy the Ddraw object */ + if (pDciSurface_int->DciSurface_lcl.DirectDrawGlobal.hDD != 0) + { + DdDeleteDirectDrawObject(&pDciSurface_int->DciSurface_lcl.DirectDrawGlobal); + } + + /* Free the alloc memmory for the internal and for pDciSurfaceInfo */ + HeapFree(GetProcessHeap(), 0, pDciSurface_int); + } + } +} + + +/***********************************************************************************************************/ +/***********************************************************************************************************/ +/***********************************************************************************************************/ +/* All function under here are not supported in windows nt / ReactOS, they only return error code or false */ +/***********************************************************************************************************/ /*++ * @name int WINAPI DCICreateOffscreen(HDC hdc) @@ -371,6 +415,70 @@ { return DCI_FAIL_UNSUPPORTED; } - - - +/*++ +* @name DCIRVAL WINAPI DCISetClipList(LPDCIOFFSCREEN pdci, LPRGNDATA prd) +* @implemented +* +* Not supported in windows, it only return DCI_FAIL_UNSUPPORTED. + +* @return +* DCI_FAIL_UNSUPPORTED +* +* @remarks. +* None +* +*--*/ +DCIRVAL WINAPI +DCISetClipList(LPDCIOFFSCREEN pdci, + LPRGNDATA prd) +{ + return DCI_FAIL_UNSUPPORTED; +} + +/*++ +* @name DCIRVAL WINAPI DCISetSrcDestClip(LPDCIOFFSCREEN pdci, LPRECT srcrc, LPRECT destrc, LPRGNDATA prd) +* @implemented +* +* Not supported in windows, it only return DCI_FAIL_UNSUPPORTED. + +* @return +* DCI_FAIL_UNSUPPORTED +* +* @remarks. +* None +* +*--*/ +DCIRVAL WINAPI +DCISetSrcDestClip(LPDCIOFFSCREEN pdci, + LPRECT srcrc, + LPRECT destrc, + LPRGNDATA prd) +{ + return DCI_FAIL_UNSUPPORTED; +} + +/*++ +* @name BOOL WINAPI WinWatchNotify(HWINWATCH hWW, WINWATCHNOTIFYPROC NotifyCallback, LPARAM NotifyParam ); +* @implemented +* +* Not supported in windows, it only return FALSE. + +* @return +* FALSE +* +* @remarks. +* None +* +*--*/ +BOOL WINAPI +WinWatchNotify(HWINWATCH hWW, + WINWATCHNOTIFYPROC NotifyCallback, + LPARAM NotifyParam ) +{ + return FALSE; +} + + + + +

1 0

[gbrunmar] 37576: Fixed build when including the native d3d9 project
by gbrunmar＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: gbrunmar Date: Sun Nov 23 03:33:41 2008 New Revision: 37576 URL: http://svn.reactos.org/svn/reactos?rev=37576&view=rev Log: Fixed build when including the native d3d9 project Modified: branches/reactx/reactos/dll/directx/d3d9/adapter.c Modified: branches/reactx/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d9… ============================================================================== --- branches/reactx/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] Sun Nov 23 03:33:41 2008 @@ -6,7 +6,6 @@ * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ -#define _WIN32_WINNT 0x0502 #include "d3d9_common.h" #include <d3d9.h> #include <ddraw.h>

1 0

[dchapyshev] 37575: - Fix RtlFindActivationContextSectionString prototype
by dchapyshev＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: dchapyshev Date: Sun Nov 23 02:57:19 2008 New Revision: 37575 URL: http://svn.reactos.org/svn/reactos?rev=37575&view=rev Log: - Fix RtlFindActivationContextSectionString prototype Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Nov 23 02:57:19 2008 @@ -2902,11 +2902,11 @@ NTSTATUS NTAPI RtlFindActivationContextSectionString( - IN PVOID Unknown0, - IN PVOID Unknown1, + IN ULONG dwFlags, + IN const GUID *lpExtensionGuid, IN ULONG SectionType, IN PUNICODE_STRING SectionName, - IN PVOID Unknown2 + IN PVOID ReturnedData ); NTSYSAPI Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=37575… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sun Nov 23 02:57:19 2008 @@ -58,11 +58,11 @@ NTSTATUS NTAPI -RtlFindActivationContextSectionString(IN PVOID Unknown0, - IN PVOID Unknown1, +RtlFindActivationContextSectionString(IN ULONG dwFlags, + IN const GUID *lpExtensionGuid, IN ULONG SectionType, IN PUNICODE_STRING SectionName, - IN PVOID Unknown2) + IN PVOID ReturnedData) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED;

1 0

[dchapyshev] 37574: - Fix IsValidLanguageGroup and EnumSystemLanguageGroups. +102 passed tests
by dchapyshev＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: dchapyshev Date: Sun Nov 23 02:19:35 2008 New Revision: 37574 URL: http://svn.reactos.org/svn/reactos?rev=37574&view=rev Log: - Fix IsValidLanguageGroup and EnumSystemLanguageGroups. +102 passed tests Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Sun Nov 23 02:19:35 2008 @@ -50,22 +50,8 @@ LONG_PTR param; } ENUM_UILANG_CALLBACK; -static const WCHAR szLocaleKeyName[] = - -{ - 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\','N','l','s','\\','L','o','c','a','l','e',0 -}; - -static const WCHAR szLangGroupsKeyName[] = { - 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\','N','l','s','\\', - 'L','a','n','g','u','a','g','e',' ','G','r','o','u','p','s',0 -}; - -extern const unsigned int CollationTable[]; +static const WCHAR szLocaleKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\NLS\\Locale"; +static const WCHAR szLangGroupsKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\NLS\\Language Groups"; /****************************************************************************** * @implemented @@ -378,6 +364,8 @@ } FreeResource( hResource ); } + else DPRINT1("FindResourceExW() failed\n"); + return bRet; } @@ -753,7 +741,7 @@ if (!hKey) { - DPRINT1("NLS_RegOpenKey() failed\n"); + DPRINT1("NLS_RegOpenKey() failed, KeyName='%S'\n", szLangGroupsKeyName); return FALSE; } @@ -2291,82 +2279,37 @@ DWORD dwFlags) { static const WCHAR szFormat[] = { '%','x','\0' }; - UNICODE_STRING szNlsKeyName = - RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\System\\CurrentControlSet\\Control\\Nls"); - UNICODE_STRING szLangGroupsKeyName = - RTL_CONSTANT_STRING(L"Language Groups"); - const int MAX_VALUE_NAME = 16; - const int MAX_VALUE_SYMB = 128; - - BOOL bNtQuery; - PKEY_VALUE_PARTIAL_INFORMATION kvpiInfo; - - WCHAR szValueName[MAX_VALUE_NAME]; - UNICODE_STRING ucsValueName; - DWORD dwRetSize; - PWSTR pwszValueData; - - DWORD dwSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + MAX_VALUE_SYMB * sizeof(WCHAR); - - OBJECT_ATTRIBUTES oaAttr; - HANDLE hkey, hRootKey; + WCHAR szValueName[16], szValue[2]; BOOL bSupported = FALSE, bInstalled = FALSE; - - DPRINT("IsValidLanguageGroup() called\n"); - - kvpiInfo = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - dwSize); + HANDLE hKey; + switch (dwFlags) { - case LGRPID_INSTALLED: - case LGRPID_SUPPORTED: - - InitializeObjectAttributes(&oaAttr, &szNlsKeyName, 0, 0, NULL); - if(NtOpenKey(&hRootKey, KEY_ALL_ACCESS, &oaAttr) != STATUS_SUCCESS) return FALSE; - - InitializeObjectAttributes(&oaAttr, &szLangGroupsKeyName, 0, hRootKey, NULL); - if(NtOpenKey(&hkey, KEY_ALL_ACCESS, &oaAttr) != STATUS_SUCCESS) return FALSE; - - if(hRootKey) NtClose(hRootKey); - - swprintf(szValueName, szFormat, (ULONG)LanguageGroup); - RtlInitUnicodeString(&ucsValueName, szValueName); - - bNtQuery = NtQueryValueKey(hkey, - &ucsValueName, - KeyValuePartialInformation, - kvpiInfo, - dwSize, - &dwRetSize); - if(hkey) NtClose(hkey); - - if(bNtQuery == STATUS_SUCCESS && - kvpiInfo->DataLength == sizeof(DWORD)) - { - pwszValueData = (PWSTR)&kvpiInfo->Data[0]; - bSupported = TRUE; - if(pwszValueData[0] == L'1') bInstalled = TRUE; - } - else - { - DPRINT("NtQueryValueKey() failed (Status %lx)\n", bNtQuery); - RtlFreeHeap(RtlGetProcessHeap(), 0, kvpiInfo); - return FALSE; - } + case LGRPID_INSTALLED: + case LGRPID_SUPPORTED: + + hKey = NLS_RegOpenKey( 0, szLangGroupsKeyName ); + + swprintf( szValueName, szFormat, LanguageGroup ); + + if (NLS_RegGetDword( hKey, szValueName, (LPDWORD)szValue )) + { + bSupported = TRUE; + + if (szValue[0] == '1') + bInstalled = TRUE; + } + + if (hKey) + NtClose( hKey ); break; } - RtlFreeHeap(RtlGetProcessHeap(), 0, kvpiInfo); - - if((dwFlags == LGRPID_SUPPORTED && bSupported) || - (dwFlags == LGRPID_INSTALLED && bInstalled)) - { - DPRINT("Language group is supported and installed\n"); + if ((dwFlags == LGRPID_SUPPORTED && bSupported) || + (dwFlags == LGRPID_INSTALLED && bInstalled)) return TRUE; - } return FALSE; }

1 0

[greatlrd] 37573: Remove the spec file with def file, no stack coruptions now. implement DCICreateOffscreen, DCICreateOverlay, DCIDraw, DCIEnum, DCISetDestination
by greatlrd＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: greatlrd Date: Sun Nov 23 01:58:18 2008 New Revision: 37573 URL: http://svn.reactos.org/svn/reactos?rev=37573&view=rev Log: Remove the spec file with def file, no stack coruptions now. implement DCICreateOffscreen, DCICreateOverlay, DCIDraw, DCIEnum, DCISetDestination Added: branches/reactx/reactos/dll/win32/dciman32/dciman32.def (with props) Removed: branches/reactx/reactos/dll/win32/dciman32/dciman32.spec Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.rbuild branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Added: branches/reactx/reactos/dll/win32/dciman32/dciman32.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.def (added) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] Sun Nov 23 01:58:18 2008 @@ -1,0 +1,22 @@ + +EXPORTS +; DCIBeginAccess + DCICloseProvider@4 + DCICreateOffscreen@40 + DCICreateOverlay@12 + DCICreatePrimary@8 +; DCIDestroy + DCIDraw@4 +; DCIEndAccess + DCIEnum@20 + DCIOpenProvider@0 +; DCISetClipList + DCISetDestination@12 +; DCISetSrcDestClip +; GetDCRegionData +; GetWindowRegionData +; WinWatchClose +; WinWatchDidStatusChange +; WinWatchGetClipList +; WinWatchNotify +; WinWatchOpen Propchange: branches/reactx/reactos/dll/win32/dciman32/dciman32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.rbuild [iso-8859-1] Sun Nov 23 01:58:18 2008 @@ -2,13 +2,13 @@ <!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" /> + <importlibrary definition="dciman32.def" /> <include base="dciman32">.</include> - <file>dciman_main.c</file> - <file>dciman32.spec</file> <library>kernel32</library> <library>ntdll</library> <library>gdi32</library> - <library>user32</library> + <library>user32</library> + + <file>dciman_main.c</file> </module> </group> Removed: branches/reactx/reactos/dll/win32/dciman32/dciman32.spec URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.spec [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.spec (removed) @@ -1,21 +1,0 @@ -@ 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 Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sun Nov 23 01:58:18 2008 @@ -262,4 +262,115 @@ } - +/*++ +* @name int WINAPI DCICreateOffscreen(HDC hdc) +* @implemented +* +* Not supported in windows, it only return DCI_FAIL_UNSUPPORTED. + +* @return +* DCI_FAIL_UNSUPPORTED +* +* @remarks. +* None +* +*--*/ +int WINAPI +DCICreateOffscreen(HDC hdc, + DWORD dwCompression, + DWORD dwRedMask, + DWORD dwGreenMask, + DWORD dwBlueMask, + DWORD dwWidth, + DWORD dwHeight, + DWORD dwDCICaps, + DWORD dwBitCount, + LPDCIOFFSCREEN *lplpSurface) +{ + return DCI_FAIL_UNSUPPORTED; +} + +/*++ +* @name int WINAPI DCICreateOverlay(HDC hdc, LPVOID lpOffscreenSurf, LPDCIOVERLAY *lplpSurface) +* @implemented +* +* Not supported in windows, it only return DCI_FAIL_UNSUPPORTED. + +* @return +* DCI_FAIL_UNSUPPORTED +* +* @remarks. +* None +* +*--*/ +int WINAPI +DCICreateOverlay(HDC hdc, + LPVOID lpOffscreenSurf, + LPDCIOVERLAY *lplpSurface) +{ + return DCI_FAIL_UNSUPPORTED; +} + +/*++ +* @name DCIRVAL WINAPI DCISetDestination(LPDCIOFFSCREEN pdci, LPRECT dst, LPRECT src) +* @implemented +* +* Not supported in windows, it only return DCI_FAIL_UNSUPPORTED. + +* @return +* DCI_FAIL_UNSUPPORTED +* +* @remarks. +* None +* +*--*/ +DCIRVAL WINAPI +DCISetDestination(LPDCIOFFSCREEN pdci, LPRECT dst, LPRECT src) +{ + return DCI_FAIL_UNSUPPORTED; +} + +/*++ +* @name DCIRVAL WINAPI DCIDraw(LPDCIOFFSCREEN pdci) +* @implemented +* +* Not supported in windows, it only return DCI_FAIL_UNSUPPORTED. + +* @return +* DCI_FAIL_UNSUPPORTED +* +* @remarks. +* None +* +*--*/ +DCIRVAL WINAPI +DCIDraw(LPDCIOFFSCREEN pdci) +{ + return DCI_FAIL_UNSUPPORTED; +} + +/*++ +* @name int WINAPI DCIEnum(HDC hdc, LPRECT lprDst, LPRECT lprSrc, LPVOID lpFnCallback, LPVOID lpContext); +* @implemented +* +* Not supported in windows, it only return DCI_FAIL_UNSUPPORTED. + +* @return +* DCI_FAIL_UNSUPPORTED +* +* @remarks. +* None +* +*--*/ +int WINAPI +DCIEnum(HDC hdc, + LPRECT lprDst, + LPRECT lprSrc, + LPVOID lpFnCallback, + LPVOID lpContext) +{ + return DCI_FAIL_UNSUPPORTED; +} + + +

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
66
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 November 2008