Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[khornicek] 37512: - free all resources before returning (CID 644)
by khornicek＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: khornicek Date: Fri Nov 21 08:20:54 2008 New Revision: 37512 URL: http://svn.reactos.org/svn/reactos?rev=37512&view=rev Log: - free all resources before returning (CID 644) Modified: trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/monoChain.cc Modified: trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/monoChain.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/n… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/monoChain.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/monoChain.cc [iso-8859-1] Fri Nov 21 08:20:54 2008 @@ -670,7 +670,8 @@ if(MC_sweepY(total_num_chains, array, ranges)) { loopList->deleteLoopList(); - free(array); + free(array); + free(ranges); *retSampledLines = NULL; return NULL; }

1 0

[sginsberg] 37511: - Update a comment
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 07:45:40 2008 New Revision: 37511 URL: http://svn.reactos.org/svn/reactos?rev=37511&view=rev Log: - Update a comment Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Fri Nov 21 07:45:40 2008 @@ -85,8 +85,8 @@ CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); } - /* Uninitialize file cache if. */ - CcUninitializeCacheMap (FileObject, &pFcb->RFCB.FileSize, NULL); + /* Uninitialize the cache (should be done even if caching was never initialized) */ + CcUninitializeCacheMap(FileObject, &pFcb->RFCB.FileSize, NULL); if (pFcb->OpenHandleCount != 0) {

1 0

[khornicek] 37510: - store the next node in a separate variable so we won't loose it after freeing the current node (CID 1296)
by khornicek＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: khornicek Date: Fri Nov 21 07:20:22 2008 New Revision: 37510 URL: http://svn.reactos.org/svn/reactos?rev=37510&view=rev Log: - store the next node in a separate variable so we won't loose it after freeing the current node (CID 1296) Modified: trunk/reactos/dll/win32/glu32/libtess/dict.c Modified: trunk/reactos/dll/win32/glu32/libtess/dict.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libtess/di… ============================================================================== --- trunk/reactos/dll/win32/glu32/libtess/dict.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libtess/dict.c [iso-8859-1] Fri Nov 21 07:20:22 2008 @@ -67,10 +67,13 @@ /* really __gl_dictListDeleteDict */ void dictDeleteDict( Dict *dict ) { - DictNode *node; + DictNode *node, *next; - for( node = dict->head.next; node != &dict->head; node = node->next ) { + node = dict->head.next; + while(node != &dict->head) { + next = node->next; memFree( node ); + node = next; } memFree( dict ); }

1 0

[greatlrd] 37509: Add Threadlock for DDraw_AddRef Add Threadlock for DDraw_Release Add Threadlock for DDraw->Compact BugFix : Remove wrong zeromemory in StartDirectDrawHel discovery by Pigglesworth Cleanup : reactivate hal support in DDrawSurface->Lock and DDrawSurface->UnLock
by greatlrd＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: greatlrd Date: Fri Nov 21 06:42:25 2008 New Revision: 37509 URL: http://svn.reactos.org/svn/reactos?rev=37509&view=rev Log: Add Threadlock for DDraw_AddRef Add Threadlock for DDraw_Release Add Threadlock for DDraw->Compact BugFix : Remove wrong zeromemory in StartDirectDrawHel discovery by Pigglesworth Cleanup : reactivate hal support in DDrawSurface->Lock and DDrawSurface->UnLock Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c branches/reactx/reactos/dll/directx/ddraw/startup.c Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] Fri Nov 21 06:42:25 2008 @@ -134,6 +134,19 @@ return retVal; } +/*++ +* @name DDraw->AddRef +* @implemented +* +* The function DDraw->AddRef count of all ref counter in the COM object DDraw-> + +* @return +* Returns the local Ref counter value for the COM object +* +* @remarks. +* none +* +*--*/ ULONG WINAPI Main_DirectDraw_AddRef (LPDDRAWI_DIRECTDRAW_INT This) { @@ -141,13 +154,20 @@ DX_WINDBG_trace(); - _SEH_TRY - { + /* Lock the thread so nothing can change the COM while we updating it */ + AcquireDDThreadLock(); + + _SEH_TRY + { + /* Count up the internal ref counter */ This->dwIntRefCnt++; + + /* Count up the internal local ref counter */ This->lpLcl->dwLocalRefCnt++; if (This->lpLcl->lpGbl != NULL) { + /* Count up the internal gobal ref counter */ This->lpLcl->lpGbl->dwRefCnt++; } } @@ -166,6 +186,10 @@ } _SEH_END; + /* Release the thread lock */ + ReleaseDDThreadLock(); + + /* Return the local Ref counter */ return retValue; } @@ -178,6 +202,10 @@ ULONG Counter = 0; DX_WINDBG_trace(); + + /* Lock the thread so nothing can change the COM while we updating it */ + AcquireDDThreadLock(); + _SEH_TRY { if (This!=NULL) @@ -213,30 +241,48 @@ { } _SEH_END; + + /* Release the thread lock */ + ReleaseDDThreadLock(); + return Counter; } + HRESULT WINAPI Main_DirectDraw_Initialize (LPDDRAWI_DIRECTDRAW_INT This, LPGUID lpGUID) { return DDERR_ALREADYINITIALIZED; } -/* - * Main_DirectDraw_Compact - * ms say this one is not implement but it return DDERR_NOEXCLUSIVEMODE - * when no exclusive owner are set in corpativelevel - */ + +/*++ +* @name DDraw->Compact +* @implemented +* +* The function DDraw->Compact only return two diffent return value, they are DD_OK and DERR_NOEXCLUSIVEMODE +* if we are in Exclusive mode we return DERR_NOEXCLUSIVEMODE, other wise we return DD_OK + +* @return +* Returns only Error code DD_OK or DERR_NOEXCLUSIVEMODE +* +* @remarks. +* Microsoft say Compact is not implement in ddraw.dll, but Compact return DDERR_NOEXCLUSIVEMODE or DD_OK +* +*--*/ HRESULT WINAPI Main_DirectDraw_Compact(LPDDRAWI_DIRECTDRAW_INT This) { HRESULT retVal = DD_OK; DX_WINDBG_trace(); - // EnterCriticalSection(&ddcs); - - _SEH_TRY - { + + /* Lock the thread so nothing can change the COM while we updating it */ + AcquireDDThreadLock(); + + _SEH_TRY + { + /* Check see if Exclusive mode have been activate */ if (This->lpLcl->lpGbl->lpExclusiveOwner != This->lpLcl) { retVal = DDERR_NOEXCLUSIVEMODE; @@ -246,7 +292,10 @@ { } _SEH_END; - // LeaveCriticalSection(&ddcs); + + /* Release the thread lock */ + ReleaseDDThreadLock(); + return retVal; } Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Fri Nov 21 06:42:25 2008 @@ -415,12 +415,6 @@ /* Zero out members in DDHAL_LOCKDATA */ ZeroMemory(&mdLock, sizeof(DDHAL_LOCKDATA)); - if ( (ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & - DDHAL_SURFCB32_UNLOCK) == DDHAL_SURFCB32_UNLOCK) - { - ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags -=DDHAL_SURFCB32_UNLOCK; - ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags -=DDHAL_SURFCB32_LOCK; - } /* Check if we got HAL support for this api */ if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & DDHAL_SURFCB32_LOCK) == DDHAL_SURFCB32_LOCK) @@ -524,12 +518,6 @@ ZeroMemory(&mdUnLock, sizeof(DDHAL_UNLOCKDATA)); /* Check if we got HAL support for this api */ - if ( (This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & - DDHAL_SURFCB32_UNLOCK) == DDHAL_SURFCB32_UNLOCK) - { - This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags -=DDHAL_SURFCB32_UNLOCK; - This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags -=DDHAL_SURFCB32_LOCK; - } if (( This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & DDHAL_SURFCB32_UNLOCK) == DDHAL_SURFCB32_UNLOCK) { Modified: branches/reactx/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] Fri Nov 21 06:42:25 2008 @@ -301,7 +301,7 @@ hel_ret = StartDirectDrawHel(iface, reenable); break; } -DX_STUB_str("here\n"); + if (hal_ret!=DD_OK) { if (hel_ret!=DD_OK) @@ -367,10 +367,6 @@ return DD_FALSE; } } - } - else - { - RtlZeroMemory(ddgbl.lpDDCBtmp,sizeof(DDHAL_CALLBACKS)); } ddgbl.lpDDCBtmp->HELDD.CanCreateSurface = HelDdCanCreateSurface;

1 0

[khornicek] 37508: - reshuffle the code a bit - fix CID 521 run 2
by khornicek＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: khornicek Date: Fri Nov 21 06:20:48 2008 New Revision: 37508 URL: http://svn.reactos.org/svn/reactos?rev=37508&view=rev Log: - reshuffle the code a bit - fix CID 521 run 2 Modified: trunk/reactos/dll/win32/glu32/libutil/error.c Modified: trunk/reactos/dll/win32/glu32/libutil/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libutil/er… ============================================================================== --- trunk/reactos/dll/win32/glu32/libutil/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libutil/error.c [iso-8859-1] Fri Nov 21 06:20:48 2008 @@ -43,47 +43,46 @@ #include <stdio.h> #include <stdlib.h> -static const char *glErrorStrings[GL_OUT_OF_MEMORY - GL_INVALID_ENUM + 1] = { - "invalid enumerant", - "invalid value", - "invalid operation", - "stack overflow", - "stack underflow", - "out of memory", -}; - -static const char *gluErrorStrings[GLU_INVALID_OPERATION - GLU_INVALID_ENUM + 1] = { - "invalid enumerant", - "invalid value", - "out of memory", - "", /* never used but need placeholder */ - "invalid operation", -}; - -#define NERRORS (sizeof(errorStrings)/sizeof(errorStrings[0])) - const GLubyte* GLAPIENTRY gluErrorString(GLenum errorCode) { - if (errorCode == 0) { - return (const unsigned char *) "no error"; - } - if ((errorCode >= GL_INVALID_ENUM) && (errorCode <= GL_OUT_OF_MEMORY)) { - return (const unsigned char *) glErrorStrings[errorCode - GL_INVALID_ENUM]; - } - if (errorCode == GL_TABLE_TOO_LARGE) { - return (const unsigned char *) "table too large"; - } - if ((errorCode >= GLU_INVALID_ENUM) && (errorCode <= GLU_INVALID_OPERATION)) { - return (const unsigned char *) gluErrorStrings[errorCode - GLU_INVALID_ENUM]; - } - if ((errorCode >= GLU_NURBS_ERROR1) && (errorCode <= GLU_NURBS_ERROR37)) { - return (const unsigned char *) __gluNURBSErrorString(errorCode - (GLU_NURBS_ERROR1 - 1)); - } - if ((errorCode >= GLU_TESS_ERROR1) && (errorCode <= GLU_TESS_ERROR8)) { - return (const unsigned char *) __gluTessErrorString(errorCode - (GLU_TESS_ERROR1 - 1)); + switch (errorCode) + { + case GL_NO_ERROR: + return (const GLubyte *) "no error"; + case GL_INVALID_ENUM: + return (const GLubyte *) "invalid enumerant"; + case GL_INVALID_VALUE: + return (const GLubyte *) "invalid value"; + case GL_INVALID_OPERATION: + return (const GLubyte *) "invalid operation"; + case GL_STACK_OVERFLOW: + return (const GLubyte *) "stack overflow"; + case GL_STACK_UNDERFLOW: + return (const GLubyte *) "stack underflow"; + case GL_OUT_OF_MEMORY: + return (const GLubyte *) "out of memory"; + case GL_TABLE_TOO_LARGE: + return (const GLubyte *) "table too large"; + case GLU_INVALID_ENUM: + return (const GLubyte *) "invalid enumerant"; + case GLU_INVALID_VALUE: + return (const GLubyte *) "invalid value"; + case GLU_OUT_OF_MEMORY: + return (const GLubyte *) "out of memory"; + case GLU_INCOMPATIBLE_GL_VERSION: + return (const GLubyte *) "incompatible gl version"; + case GLU_INVALID_OPERATION: + return (const GLubyte *) "invalid operation"; } - return 0; + if ((errorCode >= GLU_NURBS_ERROR1) && (errorCode <= GLU_NURBS_ERROR37)) { + return (const GLubyte *) __gluNURBSErrorString(errorCode - (GLU_NURBS_ERROR1 - 1)); + } + if ((errorCode >= GLU_TESS_ERROR1) && (errorCode <= GLU_TESS_ERROR6)) { + return (const GLubyte *) __gluTessErrorString(errorCode - (GLU_TESS_ERROR1 - 1)); + } + + return (const GLubyte *) 0; }

1 0

[tkreuzer] 37507: Fix definitions of PFN_COUNT and (S)PFN_NUMBER
by tkreuzer＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: tkreuzer Date: Fri Nov 21 05:32:37 2008 New Revision: 37507 URL: http://svn.reactos.org/svn/reactos?rev=37507&view=rev Log: Fix definitions of PFN_COUNT and (S)PFN_NUMBER Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Fri Nov 21 05:32:37 2008 @@ -4926,11 +4926,6 @@ IoModifyAccess } LOCK_OPERATION; -typedef ULONG PFN_COUNT; - -typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; -typedef ULONG PFN_NUMBER, *PPFN_NUMBER; - #define FLUSH_MULTIPLE_MAXIMUM 32 typedef enum _MM_SYSTEM_SIZE { @@ -5423,6 +5418,8 @@ #ifdef _X86_ +typedef ULONG PFN_COUNT; +typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; typedef ULONG PFN_NUMBER, *PPFN_NUMBER; #define PASSIVE_LEVEL 0 @@ -5527,6 +5524,10 @@ #define KI_USER_SHARED_DATA 0xffdf0000 #elif defined(__x86_64__) + +typedef ULONG PFN_COUNT; +typedef LONG64 SPFN_NUMBER, *PSPFN_NUMBER; +typedef ULONG64 PFN_NUMBER, *PPFN_NUMBER; #define PASSIVE_LEVEL 0 #define LOW_LEVEL 0 @@ -5641,6 +5642,8 @@ #elif defined(__PowerPC__) +typedef ULONG PFN_COUNT; +typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; typedef ULONG PFN_NUMBER, *PPFN_NUMBER; #define PASSIVE_LEVEL 0 @@ -5714,6 +5717,8 @@ #error MIPS Headers are totally incorrect +typedef ULONG PFN_COUNT; +typedef LONG SPFN_NUMBER, *PSPFN_NUMBER; typedef ULONG PFN_NUMBER, *PPFN_NUMBER; #define PASSIVE_LEVEL 0

1 0

[khornicek] 37506: - don't leak resources, CID 609+610 run 2
by khornicek＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: khornicek Date: Fri Nov 21 04:31:18 2008 New Revision: 37506 URL: http://svn.reactos.org/svn/reactos?rev=37506&view=rev Log: - don't leak resources, CID 609+610 run 2 Modified: trunk/reactos/dll/win32/glu32/libutil/mipmap.c Modified: trunk/reactos/dll/win32/glu32/libutil/mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libutil/mi… ============================================================================== --- trunk/reactos/dll/win32/glu32/libutil/mipmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libutil/mipmap.c [iso-8859-1] Fri Nov 21 04:31:18 2008 @@ -3483,10 +3483,15 @@ } beforeImage = malloc(image_size(widthin, heightin, format, GL_UNSIGNED_SHORT)); + if (beforeImage == NULL) { + return GLU_OUT_OF_MEMORY; + } + afterImage = malloc(image_size(widthout, heightout, format, GL_UNSIGNED_SHORT)); - if (beforeImage == NULL || afterImage == NULL) { - return GLU_OUT_OF_MEMORY; + if (afterImage == NULL) { + free(beforeImage); + return GLU_OUT_OF_MEMORY; } retrieveStoreModes(&psm); @@ -7339,9 +7344,14 @@ beforeImage = malloc(imageSize3D(widthIn, heightIn, depthIn, format, GL_UNSIGNED_SHORT)); + if (beforeImage == NULL) { + return GLU_OUT_OF_MEMORY; + } + afterImage = malloc(imageSize3D(widthOut, heightOut, depthOut, format, GL_UNSIGNED_SHORT)); - if (beforeImage == NULL || afterImage == NULL) { + if (afterImage == NULL) { + free(beforeImage); return GLU_OUT_OF_MEMORY; } retrieveStoreModes3D(&psm);

1 0

[greatlrd] 37505: From old code when I started on DCIMAN Implement DllMain Implement DCIOpenProvider Implement DCICloseProvider
by greatlrd＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: greatlrd Date: Fri Nov 21 04:17:34 2008 New Revision: 37505 URL: http://svn.reactos.org/svn/reactos?rev=37505&view=rev Log: >From old code when I started on DCIMAN Implement DllMain Implement DCIOpenProvider Implement DCICloseProvider Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.rbuild branches/reactx/reactos/dll/win32/dciman32/dciman_main.c 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] Fri Nov 21 04:17:34 2008 @@ -4,12 +4,11 @@ <module name="dciman32" type="win32dll" baseaddress="${BASEADDRESS_DCIMAN32}" installbase="system32" installname="dciman32.dll" allowwarnings="true"> <importlibrary definition="dciman32.spec" /> <include base="dciman32">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> <file>dciman_main.c</file> <file>dciman32.spec</file> - <library>wine</library> <library>kernel32</library> <library>ntdll</library> + <library>gdi32</library> + <library>user32</library> </module> </group> 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] Fri Nov 21 04:17:34 2008 @@ -1,70 +1,91 @@ -/* - * 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 <windows.h> +#include <dciman.h> -#include "windows.h" -#include "dciman.h" -#include "wine/debug.h" +CRITICAL_SECTION ddcs; -WINE_DEFAULT_DEBUG_CHANNEL(dciman); +BOOL +WINAPI +DllMain( HINSTANCE hModule, DWORD ul_reason_for_call, LPVOID reserved ) +{ + switch(ul_reason_for_call) + { + case DLL_PROCESS_DETACH: + DeleteCriticalSection( &ddcs ); + break; -/*********************************************************************** - * DllEntryPoint (DCIMAN32.@) - * - * DCIMAN32 initialisation routine. - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); + case DLL_PROCESS_ATTACH: + InitializeCriticalSection( &ddcs ); + break; + } return TRUE; } +/*++ +* @name HDC WINAPI DCIOpenProvider(void) +* @implemented +* +* The function DCIOpenProvider are almost same as CreateDC, it is more simple to use, +* you do not need type which monitor or graphic card you want to use, it will use +* the current one that the program is running on, so it simple create a hdc, and +* you can use gdi32 api without any problem -/*********************************************************************** - * DCIOpenProvider (DCIMAN32.@) - */ +* @return +* Returns a hdc that it have create by gdi32.dll CreateDC +* +* @remarks. +* None +* +*--*/ HDC WINAPI -DCIOpenProvider(void) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; +DCIOpenProvider(void) +{ + HDC hDC; + if (GetSystemMetrics(SM_CMONITORS) > 1) + { + /* FIXME we need add more that one mointor support for DCIOpenProvider, need exaime how */ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; + } + else + { + /* Note Windows using the word "Display" not with big letter to create the hdc + * MS gdi32 does not care if the Display spell with big or small letters */ + + /* Note it only create a hDC handle and send it back. */ + hDC = CreateDCW(L"Display",NULL, NULL, NULL); + } + + return hDC; } -/*********************************************************************** - * DCICloseProvider (DCIMAN32.@) - */ +/*++ +* @name void WINAPI DCICloseProvider(HDC hdc) +* @implemented +* +* Same as DeleteDC, it call indirecly to DeleteDC, it simple free and destory the hdc. + +* @return +* None +* +* @remarks. +* None +* +*--*/ void WINAPI -DCICloseProvider(HDC hdc) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return; +DCICloseProvider(HDC hDC) +{ + /* Note it only delete the hdc */ + DeleteDC(hDC); } -/************************************************************************** - * DCICreatePrimary (DCIMAN32.@) - */ + int WINAPI DCICreatePrimary(HDC hdc, LPDCISURFACEINFO *pDciSurfaceInfo) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - FIXME("%p %p\n", hdc, pDciSurfaceInfo); return DCI_FAIL_UNSUPPORTED; } + + +

1 0

[fireball] 37504: - Always uninit cache for a file object (official documentation requires this).
by fireball＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: fireball Date: Fri Nov 21 04:17:14 2008 New Revision: 37504 URL: http://svn.reactos.org/svn/reactos?rev=37504&view=rev Log: - Always uninit cache for a file object (official documentation requires this). Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Fri Nov 21 04:17:14 2008 @@ -84,11 +84,10 @@ CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); } + /* Uninitialize file cache if. */ - if (FileObject->SectionObjectPointer->SharedCacheMap) - { - CcUninitializeCacheMap (FileObject, &pFcb->RFCB.FileSize, NULL); - } + CcUninitializeCacheMap (FileObject, &pFcb->RFCB.FileSize, NULL); + if (pFcb->OpenHandleCount != 0) { IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess);

1 0

[khornicek] 37503: - fix some checks, verified in win xp
by khornicek＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: khornicek Date: Fri Nov 21 03:58:07 2008 New Revision: 37503 URL: http://svn.reactos.org/svn/reactos?rev=37503&view=rev Log: - fix some checks, verified in win xp Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] Fri Nov 21 03:58:07 2008 @@ -49,7 +49,7 @@ return CLASS_E_NOAGGREGATION; } - if(!pDDSD->dwFlags & DDSD_CAPS) + if(!(pDDSD->dwFlags & DDSD_CAPS)) { return DDERR_INVALIDPARAMS; } @@ -64,14 +64,14 @@ return DDERR_INVALIDCAPS; } - if(!(pDDSD->dwFlags & DDSD_HEIGHT) && !(pDDSD->dwFlags & DDSD_HEIGHT) - && !(pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + if((!(pDDSD->dwFlags & DDSD_HEIGHT) || !(pDDSD->dwFlags & DDSD_WIDTH)) + && !(pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) { return DDERR_INVALIDPARAMS; } - else if(pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwFlags & DDSD_HEIGHT - && pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + else if(((pDDSD->dwFlags & DDSD_HEIGHT) || (pDDSD->dwFlags & DDSD_WIDTH)) + && (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) { return DDERR_INVALIDPARAMS; }

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
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