Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[fireball] 31299: Filip Navara <xnavara at volny dot cz> 's christmas gift - Fix certain cases of deallocation inside registry hives. - Add debug output in case of a problem in HvpRemoveFree.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Dec 18 13:13:45 2007 New Revision: 31299 URL: http://svn.reactos.org/svn/reactos?rev=31299&view=rev Log: Filip Navara <xnavara at volny dot cz> 's christmas gift - Fix certain cases of deallocation inside registry hives. - Add debug output in case of a problem in HvpRemoveFree. Modified: trunk/reactos/lib/cmlib/hivecell.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c (original) +++ trunk/reactos/lib/cmlib/hivecell.c Tue Dec 18 13:13:45 2007 @@ -205,7 +205,7 @@ PHCELL_INDEX FreeCellData; PHCELL_INDEX pFreeCellOffset; HSTORAGE_TYPE Storage; - ULONG Index; + ULONG Index, FreeListIndex; ASSERT(RegistryHive->ReadOnly == FALSE); @@ -223,6 +223,24 @@ } pFreeCellOffset = FreeCellData; } + + /* Something bad happened, print a useful trace info and bugcheck */ + CMLTRACE(CMLIB_HCELL_DEBUG, "-- beginning of HvpRemoveFree trace --\n"); + CMLTRACE(CMLIB_HCELL_DEBUG, "block we are about to free: %08x\n", CellIndex); + CMLTRACE(CMLIB_HCELL_DEBUG, "chosen free list index: %d\n", Index); + for (FreeListIndex = 0; FreeListIndex < 24; FreeListIndex++) + { + CMLTRACE(CMLIB_HCELL_DEBUG, "free list [%d]: ", FreeListIndex); + pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[FreeListIndex]; + while (*pFreeCellOffset != HCELL_NIL) + { + CMLTRACE(CMLIB_HCELL_DEBUG, "%08x ", *pFreeCellOffset); + FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); + pFreeCellOffset = FreeCellData; + } + CMLTRACE(CMLIB_HCELL_DEBUG, "\n"); + } + CMLTRACE(CMLIB_HCELL_DEBUG, "-- end of HvpRemoveFree trace --\n"); ASSERT(FALSE); } @@ -466,11 +484,23 @@ { if ((ULONG_PTR)Neighbor + Neighbor->Size == (ULONG_PTR)Free) { - Neighbor->Size += Free->Size; + HCELL_INDEX NeighborCellIndex = + (HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + + Bin->FileOffset) | (CellIndex & HCELL_TYPE_MASK); + + if (HvpComputeFreeListIndex(Neighbor->Size) != + HvpComputeFreeListIndex(Neighbor->Size + Free->Size)) + { + HvpRemoveFree(RegistryHive, Neighbor, NeighborCellIndex); + Neighbor->Size += Free->Size; + HvpAddFree(RegistryHive, Neighbor, NeighborCellIndex); + } + else + Neighbor->Size += Free->Size; + if (CellType == Stable) - HvMarkCellDirty(RegistryHive, - (HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + - Bin->FileOffset), FALSE); + HvMarkCellDirty(RegistryHive, NeighborCellIndex, FALSE); + return; } Neighbor = (PHCELL)((ULONG_PTR)Neighbor + Neighbor->Size);

16 years, 9 months

[cfinck] 31298: Revert 31292, 31294 and 31297. Every change I try for fixing the build in one component breaks the build for another component. winebuild wasn't synchronized completely to the Wine version anyway, and the current Wine version removed support for the --pedll option we use, so a full clean sync isn't possible.

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Dec 18 02:36:09 2007 New Revision: 31298 URL: http://svn.reactos.org/svn/reactos?rev=31298&view=rev Log: Revert 31292, 31294 and 31297. Every change I try for fixing the build in one component breaks the build for another component. winebuild wasn't synchronized completely to the Wine version anyway, and the current Wine version removed support for the --pedll option we use, so a full clean sync isn't possible. Modified: trunk/reactos/tools/winebuild/Makefile.in trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/import.c trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/parser.c trunk/reactos/tools/winebuild/relay.c trunk/reactos/tools/winebuild/res16.c trunk/reactos/tools/winebuild/res32.c trunk/reactos/tools/winebuild/spec16.c trunk/reactos/tools/winebuild/spec32.c trunk/reactos/tools/winebuild/utils.c trunk/reactos/tools/winebuild/winebuild.man.in trunk/reactos/tools/winebuild/winglue.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/winebuild/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/Makefile.i… Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?r… Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… Modified: trunk/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/parser.c?r… Modified: trunk/reactos/tools/winebuild/relay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/relay.c?re… Modified: trunk/reactos/tools/winebuild/res16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res16.c?re… Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… Modified: trunk/reactos/tools/winebuild/spec16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec16.c?r… Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… Modified: trunk/reactos/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/utils.c?re… Modified: trunk/reactos/tools/winebuild/winebuild.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?…

16 years, 9 months

[cfinck] 31297: Get rid of make_internal_name() and only use the name or export name now, also for stub functions. This is already done this way when creating the SPEC files, but wasn't done when creating the C files with the stubs.

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Dec 18 02:22:34 2007 New Revision: 31297 URL: http://svn.reactos.org/svn/reactos?rev=31297&view=rev Log: Get rid of make_internal_name() and only use the name or export name now, also for stub functions. This is already done this way when creating the SPEC files, but wasn't done when creating the C files with the stubs. Modified: trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/spec32.c (original) +++ trunk/reactos/tools/winebuild/spec32.c Tue Dec 18 02:22:34 2007 @@ -61,28 +61,6 @@ } return 0; } - -/******************************************************************* - * make_internal_name - * - * Generate an internal name for an entry point. Used for stubs etc. - */ -static const char *make_internal_name( const ORDDEF *odp, DLLSPEC *spec, const char *prefix ) -{ - static char buffer[256]; - if (odp->name || odp->export_name) - { - char *p; - sprintf( buffer, "__wine_%s_%s_%s", prefix, spec->file_name, - odp->name ? odp->name : odp->export_name ); - /* make sure name is a legal C identifier */ - for (p = buffer; *p; p++) if (!isalnum(*p) && *p != '_') break; - if (!*p) return buffer; - } - sprintf( buffer, "__wine_%s_%s_%d", prefix, make_c_identifier(spec->file_name), odp->ordinal ); - return buffer; -} - /******************************************************************* * output_relay_debug @@ -353,7 +331,7 @@ { const ORDDEF *odp = &spec->entry_points[i]; if (odp->type != TYPE_STUB) continue; - output( "void %s(void) ", make_internal_name( odp, spec, "stub" ) ); + output( "void %s(void) ", (odp->name ? odp->name : odp->export_name) ); if (odp->name) output( "{ __wine_spec_unimplemented_stub(__wine_spec_file_name, \"%s\"); }\n", odp->name ); else if (odp->export_name) @@ -624,7 +602,7 @@ } if (NULL != odp->name) { - output("=%s", make_internal_name( odp, spec, "stub" )); + output("=%s", odp->name); } break; }

16 years, 9 months

Re: [ros-diffs] [cfinck] 31296: Rename DSOUND_DllRegisterServer to DllRegisterServer and DSOUND_DllUnregisterServer to DllUnregisterServer. (the same is already done in the other DirectX DLL's with SPEC files) I wonder how dsound.dll could be compile

by Steven Edwards

Hello, On Dec 17, 2007 5:01 PM, <cfinck(a)svn.reactos.org> wrote: > URL: http://svn.reactos.org/svn/reactos?rev=31296&view=rev > Log: > Rename DSOUND_DllRegisterServer to DllRegisterServer and DSOUND_DllUnregisterServer to DllUnregisterServer. (the same is already done in the other DirectX DLL's with SPEC files) > I wonder how dsound.dll could be compiled in the past cause the SPEC file never referenced to these functions. Maybe there was a bug in older versions of binutils. Perhaps it was ignoring unresolved exports marked PRIVATE. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 9 months

[cfinck] 31296: Rename DSOUND_DllRegisterServer to DllRegisterServer and DSOUND_DllUnregisterServer to DllUnregisterServer. (the same is already done in the other DirectX DLL's with SPEC files) I wonder how dsound.dll could be compiled in the past cause the SPEC file never referenced to these functions. This should fix the build breakage.

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Dec 18 01:01:06 2007 New Revision: 31296 URL: http://svn.reactos.org/svn/reactos?rev=31296&view=rev Log: Rename DSOUND_DllRegisterServer to DllRegisterServer and DSOUND_DllUnregisterServer to DllUnregisterServer. (the same is already done in the other DirectX DLL's with SPEC files) I wonder how dsound.dll could be compiled in the past cause the SPEC file never referenced to these functions. This should fix the build breakage. Modified: trunk/reactos/dll/directx/dsound/regsvr.c Modified: trunk/reactos/dll/directx/dsound/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/regsvr.… ============================================================================== --- trunk/reactos/dll/directx/dsound/regsvr.c (original) +++ trunk/reactos/dll/directx/dsound/regsvr.c Tue Dec 18 01:01:06 2007 @@ -556,7 +556,7 @@ /*********************************************************************** * DllRegisterServer (DSOUND.@) */ -HRESULT WINAPI DSOUND_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -571,7 +571,7 @@ /*********************************************************************** * DllUnregisterServer (DSOUND.@) */ -HRESULT WINAPI DSOUND_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr;

16 years, 9 months

[gbrunmar] 31295: * Check SDKVersion and print error message if debug flag is specified. * New CreateD3D9 internal function to create a valid IDirect3D9 object.

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Tue Dec 18 00:22:40 2007 New Revision: 31295 URL: http://svn.reactos.org/svn/reactos?rev=31295&view=rev Log: * Check SDKVersion and print error message if debug flag is specified. * New CreateD3D9 internal function to create a valid IDirect3D9 object. Modified: trunk/reactos/dll/directx/d3d9/d3d9.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Tue Dec 18 00:22:40 2007 @@ -13,42 +13,46 @@ #include <debug.h> -DLLAPI +#define DEBUG_MESSAGE_BUFFER_SIZE 512 + +static LPCSTR D3dError_WrongSdkVersion = + "D3D ERROR: D3D header version mismatch.\n" + "The application was compiled against and will only work with " + "D3D_SDK_VERSION (%d), but the currently installed runtime is " + "version (%d).\n" + "Recompile the application against the appropriate SDK for the installed runtime.\n" + "\n"; + HRESULT Direct3DShaderValidatorCreate9(void) { UNIMPLEMENTED return 0; } -DLLAPI HRESULT PSGPError(void) { UNIMPLEMENTED return 0; } -DLLAPI HRESULT PSGPSampleTexture(void) { UNIMPLEMENTED return 0; } -DLLAPI -HRESULT DebugSetLevel(void) +HRESULT DebugSetLevel(void) { UNIMPLEMENTED return 0; } -DLLAPI HRESULT DebugSetMute(DWORD dw1) { UNIMPLEMENTED return 0; } -DLLAPI IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { HINSTANCE hDebugDll; @@ -56,6 +60,7 @@ DWORD LoadDebugDllSize; LPDIRECT3D9 D3D9Obj = 0; LPDIRECT3DCREATE9 DebugDirect3DCreate9 = 0; + CHAR DebugMessageBuffer[DEBUG_MESSAGE_BUFFER_SIZE]; UNIMPLEMENTED @@ -70,10 +75,23 @@ { DebugDirect3DCreate9 = (LPDIRECT3DCREATE9)GetProcAddress(hDebugDll, "Direct3DCreate9"); - D3D9Obj = DebugDirect3DCreate9(SDKVersion); + return DebugDirect3DCreate9(SDKVersion); } } } + + if ((SDKVersion & 0x7FFFFFFF) != D3D_SDK_VERSION || (SDKVersion & 0x7FFFFFFF) != D3D9b_SDK_VERSION) + { + if (SDKVersion & 0x80000000) + { + FormatDebugString(DebugMessageBuffer, DEBUG_MESSAGE_BUFFER_SIZE, D3dError_WrongSdkVersion, SDKVersion, D3D_SDK_VERSION); + OutputDebugStringA(DebugMessageBuffer); + } + + return NULL; + } + + CreateD3D9(&D3D9Obj); return D3D9Obj; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Tue Dec 18 00:22:40 2007 @@ -7,9 +7,13 @@ */ #include "d3d9_helpers.h" +#include <stdio.h> +#include <ddraw.h> +#include "d3d9_private.h" static LPCSTR D3dDebugRegPath = "Software\\Microsoft\\Direct3D"; + BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize) { @@ -32,3 +36,46 @@ return TRUE; } + +HRESULT FormatDebugString(IN OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ) +{ + int BytesWritten; + va_list vargs; + + if (BufferSize == 0) + return DDERR_INVALIDPARAMS; + + va_start(vargs, FormatString); + BytesWritten = _vsnprintf(Buffer, BufferSize-1, FormatString, vargs); + + if (BytesWritten < BufferSize) + return DDERR_GENERIC; + + Buffer[BufferSize-1] = '\0'; + + return 0; +} + +HRESULT CreateD3D9(IDirect3D9** ppDirect3D9) +{ + LPDIRECTD3D9_INT pDirect3D9; + + if (ppDirect3D9 == 0) + return DDERR_INVALIDPARAMS; + + pDirect3D9 = HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECTD3D9_INT)); + + if (0 == pDirect3D9) + return DDERR_OUTOFMEMORY; + + pDirect3D9->unknown000007 = 0; + pDirect3D9->lpInt = 0; + + //pDirect3D9->lpVtbl = &IDirect3D3_Vtbl; + pDirect3D9->dwProcessId = GetCurrentThreadId(); + pDirect3D9->dwIntRefCnt = 1; + + *ppDirect3D9 = (IDirect3D9*)pDirect3D9; + + return ERROR_SUCCESS; +} Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h Tue Dec 18 00:22:40 2007 @@ -6,6 +6,14 @@ * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ +#include <d3d9.h> #include <windows.h> +/* Reads a registry value if it's of the correct value type */ BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize); + +/* Formats debug strings */ +HRESULT FormatDebugString(IN OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ); + +/* Creates a Direct3D9 object */ +HRESULT CreateD3D9(IDirect3D9** ppDirect3D9); Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Tue Dec 18 00:22:40 2007 @@ -11,9 +11,9 @@ #define DLLAPI __declspec(dllexport) -typedef IDirect3D9* WINAPI (*LPDIRECT3DCREATE9)(UINT); +typedef IDirect3D9* (WINAPI *LPDIRECT3DCREATE9)(UINT); -struct _tagDIRECTD3D9_INT_ +typedef struct _tagDIRECTD3D9_INT_ { /* 0x0000 */ LPVOID lpVtbl; /* LPDIRECTD3D9 functoions table */ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; @@ -4594,4 +4594,4 @@ /* 0x47ac */ DWORD unknown004587; /* 0x47b0 */ DWORD unknown004588; /* 0x47b4 */ DWORD unknown004589; /*? 0x00000020 */ -} *DIRECTD3D9_INT; +} DIRECTD3D9_INT, *LPDIRECTD3D9_INT;

16 years, 9 months

[fireball] 31294: - It should use only host headers.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Dec 17 23:53:08 2007 New Revision: 31294 URL: http://svn.reactos.org/svn/reactos?rev=31294&view=rev Log: - It should use only host headers. Modified: trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/import.c trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/parser.c trunk/reactos/tools/winebuild/res16.c trunk/reactos/tools/winebuild/res32.c trunk/reactos/tools/winebuild/spec32.c trunk/reactos/tools/winebuild/utils.c trunk/reactos/tools/winebuild/winglue.h Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… ============================================================================== --- trunk/reactos/tools/winebuild/build.h (original) +++ trunk/reactos/tools/winebuild/build.h Mon Dec 17 23:53:08 2007 @@ -30,8 +30,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> - -#include "winglue.h" typedef enum { Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/import.c (original) +++ trunk/reactos/tools/winebuild/import.c Mon Dec 17 23:53:08 2007 @@ -35,8 +35,7 @@ # include <unistd.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" struct import Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… ============================================================================== --- trunk/reactos/tools/winebuild/main.c (original) +++ trunk/reactos/tools/winebuild/main.c Mon Dec 17 23:53:08 2007 @@ -36,8 +36,7 @@ # include <getopt.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" int UsePIC = 0; @@ -49,7 +48,7 @@ int save_temps = 0; int link_ext_symbols = 0; -#ifdef __i386__ +#if defined(__i386__) || defined(__x86_64__) enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; Modified: trunk/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/parser.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/parser.c (original) +++ trunk/reactos/tools/winebuild/parser.c Mon Dec 17 23:53:08 2007 @@ -32,8 +32,7 @@ #include <stdlib.h> #include <string.h> -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" int current_line = 0; Modified: trunk/reactos/tools/winebuild/res16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res16.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/res16.c (original) +++ trunk/reactos/tools/winebuild/res16.c Mon Dec 17 23:53:08 2007 @@ -38,8 +38,7 @@ #include <sys/mman.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" /* Unicode string or integer id */ Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/res32.c (original) +++ trunk/reactos/tools/winebuild/res32.c Mon Dec 17 23:53:08 2007 @@ -37,8 +37,7 @@ #include <sys/mman.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" /* Unicode string or integer id */ Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/spec32.c (original) +++ trunk/reactos/tools/winebuild/spec32.c Mon Dec 17 23:53:08 2007 @@ -30,8 +30,7 @@ #include <stdarg.h> #include <string.h> -#include "windef.h" -#include "winbase.h" +#include "winglue.h" //#include "wine/exception.h" #include "build.h" Modified: trunk/reactos/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/utils.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/utils.c (original) +++ trunk/reactos/tools/winebuild/utils.c Mon Dec 17 23:53:08 2007 @@ -31,8 +31,7 @@ # include <unistd.h> #endif -#include "windef.h" -#include "winnt.h" +#include "winglue.h" #include "build.h" #define MAX_TMP_FILES 8 Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?… ============================================================================== --- trunk/reactos/tools/winebuild/winglue.h (original) +++ trunk/reactos/tools/winebuild/winglue.h Mon Dec 17 23:53:08 2007 @@ -1,10 +1,136 @@ #ifndef _WINGLUE_H #define _WINGLUE_H -/* Stuff missing in the host's PSDK */ -#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 +typedef unsigned char BYTE; +typedef unsigned short WORD; +typedef unsigned long DWORD; +typedef unsigned short WCHAR; +#if defined(_WIN64) +typedef unsigned __int64 UINT_PTR; +#else +typedef unsigned int UINT_PTR; +#endif + +#define LOBYTE(w) ((BYTE)(w)) +#define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF)) + +#define DLL_PROCESS_ATTACH 1 +#define DLL_PROCESS_DETACH 0 + +#define IMAGE_FILE_EXECUTABLE_IMAGE 2 +#define IMAGE_FILE_LARGE_ADDRESS_AWARE 32 +#define IMAGE_FILE_32BIT_MACHINE 256 +#define IMAGE_FILE_DLL 8192 +#define IMAGE_SUBSYSTEM_NATIVE 1 +#define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 +#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 +#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 +#define IMAGE_FILE_MACHINE_UNKNOWN 0 +#define IMAGE_FILE_MACHINE_I386 0x014c #define IMAGE_FILE_MACHINE_ALPHA 0x0184 +#define IMAGE_FILE_MACHINE_POWERPC 0x01f0 +#define IMAGE_FILE_MACHINE_AMD64 0x8664 +#define IMAGE_NT_SIGNATURE 0x00004550 +#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 240 +#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x10b +#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x20b +#if defined(_WIN64) +#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER IMAGE_SIZEOF_NT_OPTIONAL64_HEADER +#define IMAGE_NT_OPTIONAL_HDR_MAGIC IMAGE_NT_OPTIONAL_HDR64_MAGIC +#else +#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER IMAGE_SIZEOF_NT_OPTIONAL32_HEADER +#define IMAGE_NT_OPTIONAL_HDR_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC +#endif + +#ifdef __GNUC__ +#ifndef NONAMELESSUNION +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +#define _ANONYMOUS_UNION __extension__ +#define _ANONYMOUS_STRUCT __extension__ +#else +#if defined(__cplusplus) +#define _ANONYMOUS_UNION __extension__ +#endif /* __cplusplus */ +#endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */ +#endif /* NONAMELESSUNION */ +#elif defined(__WATCOMC__) || defined(_MSC_VER) +#define _ANONYMOUS_UNION +#define _ANONYMOUS_STRUCT +#endif /* __GNUC__/__WATCOMC__ */ +#ifndef _ANONYMOUS_UNION +#define _ANONYMOUS_UNION +#define _UNION_NAME(x) x +#define DUMMYUNIONNAME u +#define DUMMYUNIONNAME2 u2 +#define DUMMYUNIONNAME3 u3 +#define DUMMYUNIONNAME4 u4 +#define DUMMYUNIONNAME5 u5 +#define DUMMYUNIONNAME6 u6 +#define DUMMYUNIONNAME7 u7 +#define DUMMYUNIONNAME8 u8 +#else +#define _UNION_NAME(x) +#define DUMMYUNIONNAME +#define DUMMYUNIONNAME2 +#define DUMMYUNIONNAME3 +#define DUMMYUNIONNAME4 +#define DUMMYUNIONNAME5 +#define DUMMYUNIONNAME6 +#define DUMMYUNIONNAME7 +#define DUMMYUNIONNAME8 +#endif +#ifndef _ANONYMOUS_STRUCT +#define _ANONYMOUS_STRUCT +#define _STRUCT_NAME(x) x +#define DUMMYSTRUCTNAME s +#define DUMMYSTRUCTNAME2 s2 +#define DUMMYSTRUCTNAME3 s3 +#else +#define _STRUCT_NAME(x) +#define DUMMYSTRUCTNAME +#define DUMMYSTRUCTNAME2 +#define DUMMYSTRUCTNAME3 +#endif + +typedef struct _IMAGE_RESOURCE_DIRECTORY { + DWORD Characteristics; + DWORD TimeDateStamp; + WORD MajorVersion; + WORD MinorVersion; + WORD NumberOfNamedEntries; + WORD NumberOfIdEntries; +} IMAGE_RESOURCE_DIRECTORY,*PIMAGE_RESOURCE_DIRECTORY; +_ANONYMOUS_STRUCT typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { + _ANONYMOUS_UNION union { + _ANONYMOUS_STRUCT struct { + DWORD NameOffset:31; + DWORD NameIsString:1; + }DUMMYSTRUCTNAME; + DWORD Name; + WORD Id; + } DUMMYUNIONNAME; + _ANONYMOUS_UNION union { + DWORD OffsetToData; + _ANONYMOUS_STRUCT struct { + DWORD OffsetToDirectory:31; + DWORD DataIsDirectory:1; + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME2; +} IMAGE_RESOURCE_DIRECTORY_ENTRY,*PIMAGE_RESOURCE_DIRECTORY_ENTRY; +typedef struct _IMAGE_RESOURCE_DATA_ENTRY { + DWORD OffsetToData; + DWORD Size; + DWORD CodePage; + DWORD Reserved; +} IMAGE_RESOURCE_DATA_ENTRY,*PIMAGE_RESOURCE_DATA_ENTRY; + +#ifndef max +#define max(a,b) ((a)>(b)?(a):(b)) +#endif +#ifndef min +#define min(a,b) ((a)<(b)?(a):(b)) +#endif #endif /* _WINGLUE_H */

16 years, 9 months

[jimtabor] 31293: First restructure and reorder the code. Identify bugs and make corrections. Found DCX_CACHE sets to owned DCEs, we do not hold dcattr after ReleaseDC as we should and did not handle ClassDCs correctly. Will continue.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Dec 17 23:23:31 2007 New Revision: 31293 URL: http://svn.reactos.org/svn/reactos?rev=31293&view=rev Log: First restructure and reorder the code. Identify bugs and make corrections. Found DCX_CACHE sets to owned DCEs, we do not hold dcattr after ReleaseDC as we should and did not handle ClassDCs correctly. Will continue. Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h Mon Dec 17 23:23:31 2007 @@ -25,14 +25,15 @@ typedef struct tagDCE { - struct tagDCE *next; + LIST_ENTRY List; HDC hDC; HWND hwndCurrent; HWND hwndDC; HRGN hClipRgn; - DCE_TYPE type; + PVOID Class; DWORD DCXFlags; PEPROCESS pProcess; + DWORD Count; HANDLE Self; } DCE; /* PDCE already declared at top of file */ @@ -40,7 +41,7 @@ #define DCX_DCEEMPTY 0x00000800 #define DCX_DCEBUSY 0x00001000 #define DCX_DCEDIRTY 0x00002000 -#define DCX_DCOWNED 0x00008000 +#define DCX_DCPOWNED 0x00008000 #define DCX_USESTYLE 0x00010000 #define DCX_KEEPCLIPRGN 0x00040000 #define DCX_NOCLIPCHILDREN 0x00080000 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Mon Dec 17 23:23:31 2007 @@ -1,30 +1,10 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/ntuser/windc.c + * PURPOSE: Keyboard layout management + * COPYRIGHT: Copyright 2007 ReactOS * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Window classes - * FILE: subsys/win32k/ntuser/class.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISION HISTORY: - * 06-06-2001 CSH Created */ /* INCLUDES ******************************************************************/ @@ -40,187 +20,162 @@ static PDCE FirstDce = NULL; static PDC defaultDCstate = NULL; -//static INT DCECount = 0; +//static INT DCECount = 0; // Count of DCE in system. #define DCX_CACHECOMPAREMASK (DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | \ DCX_CACHE | DCX_WINDOW | DCX_PARENTCLIP) /* FUNCTIONS *****************************************************************/ +// +// This should be moved to dc.c or dcutil.c. +// HDC FASTCALL DceCreateDisplayDC(VOID) { - HDC hDC; - UNICODE_STRING DriverName; - RtlInitUnicodeString(&DriverName, L"DISPLAY"); - hDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); - return hDC; -} - -VOID FASTCALL -DceInit(VOID) -{ - + HDC hDC; + UNICODE_STRING DriverName; + RtlInitUnicodeString(&DriverName, L"DISPLAY"); + hDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); +// +// If NULL, first time through! Build the default window dc! +// + if (hDC && !defaultDCstate) // Ultra HAX! Dedicated to GvG! + { // This is a cheesy way to do this. + PDC dc = DC_LockDc ( hDC ); + defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); + RtlZeroMemory(defaultDCstate, sizeof(DC)); + IntGdiCopyToSaveState(dc, defaultDCstate); + DC_UnlockDc( dc ); + } + return hDC; } static HRGN FASTCALL DceGetVisRgn(PWINDOW_OBJECT Window, ULONG Flags, HWND hWndChild, ULONG CFlags) { - HRGN VisRgn; - - VisRgn = VIS_ComputeVisibleRegion(Window, - 0 == (Flags & DCX_WINDOW), - 0 != (Flags & DCX_CLIPCHILDREN), - 0 != (Flags & DCX_CLIPSIBLINGS)); - - if (VisRgn == NULL) + HRGN VisRgn; + + VisRgn = VIS_ComputeVisibleRegion( Window, + 0 == (Flags & DCX_WINDOW), + 0 != (Flags & DCX_CLIPCHILDREN), + 0 != (Flags & DCX_CLIPSIBLINGS)); + + if (VisRgn == NULL) VisRgn = NtGdiCreateRectRgn(0, 0, 0, 0); - return VisRgn; -} - -/* - * NtUserGetWindowDC - * - * The NtUserGetWindowDC function retrieves the device context (DC) for the - * entire window, including title bar, menus, and scroll bars. A window device - * context permits painting anywhere in a window, because the origin of the - * device context is the upper-left corner of the window instead of the client - * area. - * - * Status - * @implemented - */ - -DWORD STDCALL -NtUserGetWindowDC(HWND hWnd) -{ - return (DWORD)NtUserGetDCEx(hWnd, 0, DCX_USESTYLE | DCX_WINDOW); -} - -DWORD FASTCALL -UserGetWindowDC(PWINDOW_OBJECT Wnd) -{ - return (DWORD)UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW); -} - -HDC STDCALL -NtUserGetDC(HWND hWnd) -{ -#if 0 - if (!hWnd) - { // MSDN: - //"hWnd [in] Handle to the window whose DC is to be retrieved. - // If this value is NULL, GetDC retrieves the DC for the entire screen." - hWnd = IntGetDesktopWindow(); - if (hWnd) - return NtUserGetDCEx(hWnd, NULL, DCX_CACHE | DCX_WINDOW); - else - return NULL; - } - return NtUserGetDCEx(hWnd, NULL, DCX_USESTYLE); -#endif -// We have a problem here! - return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); -} + return VisRgn; +} + PDCE FASTCALL DceAllocDCE(PWINDOW_OBJECT Window OPTIONAL, DCE_TYPE Type) { - PDCE pDce; - PWINDOW Wnd = NULL; - - if (Window) - Wnd = Window->Wnd; - - pDce = ExAllocatePoolWithTag(PagedPool, sizeof(DCE), TAG_PDCE); - if(!pDce) + PDCE pDce; + PWINDOW Wnd = NULL; + PVOID Class = NULL; + + if (Window) Wnd = Window->Wnd; + + if (Wnd) Class = Wnd->Class; + + if (Type == DCE_CLASS_DC) + { + PDCE pdce; + KeEnterCriticalRegion(); + pdce = FirstDce; + do + { + if (pdce->Class == Class) + { + pdce->Count++; + KeLeaveCriticalRegion(); + return pdce; + } + pdce = (PDCE)pdce->List.Flink; + } while (pdce != FirstDce); + KeLeaveCriticalRegion(); + } + + pDce = ExAllocatePoolWithTag(PagedPool, sizeof(DCE), TAG_PDCE); + if(!pDce) return NULL; - pDce->hDC = DceCreateDisplayDC(); - if(!pDce->hDC) - { + pDce->hDC = DceCreateDisplayDC(); + if (!pDce->hDC) + { ExFreePoolWithTag(pDce, TAG_PDCE); return NULL; - } -// -// If NULL, first time through! Build the default window dc! -// - if (NULL == defaultDCstate) // Ultra HAX! Dedicated to GvG! - { // This is a cheesy way to do this. - PDC dc = DC_LockDc ( pDce->hDC ); - defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); - RtlZeroMemory(defaultDCstate, sizeof(DC)); - IntGdiCopyToSaveState(dc, defaultDCstate); - DC_UnlockDc( dc ); - } - - pDce->hwndCurrent = (Window ? Window->hSelf : NULL); - pDce->hClipRgn = NULL; - pDce->pProcess = NULL; - - KeEnterCriticalRegion(); - pDce->next = FirstDce; - FirstDce = pDce; - KeLeaveCriticalRegion(); - - DCU_SetDcUndeletable(pDce->hDC); - - if (Type == DCE_WINDOW_DC) //Window DCE have ownership. - { // Process should already own it. - pDce->pProcess = PsGetCurrentProcess(); - } - else - { - PDC dc = DC_LockDc ( pDce->hDC ); - DPRINT("FREE DCATTR!!!! NOT DCE_WINDOW_DC!!!!! hDC-> %x\n", pDce->hDC); - MmCopyFromCaller(&dc->Dc_Attr, dc->pDc_Attr, sizeof(DC_ATTR)); - DC_UnlockDc( dc ); - DC_FreeDcAttr(pDce->hDC); // Free the dcattr! - DC_SetOwnership(pDce->hDC, NULL); // This hDC is inaccessible! - } - - if (Type != DCE_CACHE_DC) + } + + pDce->hwndCurrent = (Window ? Window->hSelf : NULL); + pDce->hClipRgn = NULL; + pDce->pProcess = NULL; + pDce->Class = Class; + pDce->Count = 1; + + KeEnterCriticalRegion(); + if (FirstDce == NULL) + { + FirstDce = pDce; + InitializeListHead(&FirstDce->List); + } + else + InsertTailList(&FirstDce->List, &pDce->List); + KeLeaveCriticalRegion(); + + DCU_SetDcUndeletable(pDce->hDC); + + if (Type == DCE_WINDOW_DC || Type == DCE_CLASS_DC) //Window DCE have ownership. + { // Process should already own it. + pDce->pProcess = PsGetCurrentProcess(); + } + else + { + PDC dc = DC_LockDc ( pDce->hDC ); + DPRINT("FREE DCATTR!!!! NOT DCE_WINDOW_DC!!!!! hDC-> %x\n", pDce->hDC); + MmCopyFromCaller(&dc->Dc_Attr, dc->pDc_Attr, sizeof(DC_ATTR)); + DC_UnlockDc( dc ); + DC_FreeDcAttr(pDce->hDC); // Free the dcattr! + DC_SetOwnership(pDce->hDC, NULL); // This hDC is inaccessible! + } + + if (Type == DCE_CACHE_DC) + { + pDce->DCXFlags = DCX_CACHE | DCX_DCEEMPTY; + } + else + { + pDce->DCXFlags = DCX_DCEBUSY; + if (Wnd) { - pDce->DCXFlags = DCX_DCEBUSY; - - if (Wnd) + if (Type == DCE_WINDOW_DC) { - if (Wnd->Style & WS_CLIPCHILDREN) - { - pDce->DCXFlags |= DCX_CLIPCHILDREN; - } - if (Wnd->Style & WS_CLIPSIBLINGS) - { - pDce->DCXFlags |= DCX_CLIPSIBLINGS; - } + if (Wnd->Style & WS_CLIPCHILDREN) pDce->DCXFlags |= DCX_CLIPCHILDREN; + if (Wnd->Style & WS_CLIPSIBLINGS) pDce->DCXFlags |= DCX_CLIPSIBLINGS; } } - else - { - pDce->DCXFlags = DCX_CACHE | DCX_DCEEMPTY; - } - - return(pDce); + } + return(pDce); } VOID static STDCALL DceSetDrawable(PWINDOW_OBJECT Window OPTIONAL, HDC hDC, ULONG Flags, BOOL SetClipOrigin) { - PWINDOW Wnd; - DC *dc = DC_LockDc(hDC); - if(!dc) + PWINDOW Wnd; + DC *dc = DC_LockDc(hDC); + if(!dc) return; - if (Window == NULL) - { + if (Window == NULL) + { dc->w.DCOrgX = 0; dc->w.DCOrgY = 0; - } - else - { + } + else + { Wnd = Window->Wnd; if (Flags & DCX_WINDOW) { @@ -232,8 +187,8 @@ dc->w.DCOrgX = Wnd->ClientRect.left; dc->w.DCOrgY = Wnd->ClientRect.top; } - } - DC_UnlockDc(dc); + } + DC_UnlockDc(dc); } @@ -282,6 +237,7 @@ IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); dc = DC_LockDc ( dce->hDC ); + // Clean the DC IntGdiCopyFromSaveState(dc, defaultDCstate, dce->hDC ); // Was SetDCState. dce->DCXFlags &= ~DCX_DCEBUSY; @@ -489,8 +445,14 @@ DCE* DceEmpty = NULL; DCE* DceUnused = NULL; KeEnterCriticalRegion(); - for (Dce = FirstDce; Dce != NULL; Dce = Dce->next) - { + Dce = FirstDce; + do + { +// The reason for this you may ask? +// Well, it seems ReactOS calls GetDC with out first creating a desktop DC window! +// Need to test for null here. Not sure if this is a bug or a feature. + if (!Dce) break; + if ((Dce->DCXFlags & (DCX_CACHE | DCX_DCEBUSY)) == DCX_CACHE) { DceUnused = Dce; @@ -509,13 +471,11 @@ break; } } - } + Dce = (PDCE)Dce->List.Flink; + } while (Dce != FirstDce); KeLeaveCriticalRegion(); - if (Dce == NULL) - { - Dce = (DceEmpty == NULL) ? DceUnused : DceEmpty; - } + Dce = (DceEmpty == NULL) ? DceUnused : DceEmpty; if (Dce == NULL) { @@ -597,6 +557,11 @@ if (Dce->DCXFlags & DCX_CACHE) { DPRINT("ENTER!!!!!! DCX_CACHE!!!!!! hDC-> %x\n", Dce->hDC); + if (Dce->pProcess) + { + DPRINT1("POWNED!\n"); + return NULL; // should assert here. + } // Need to set ownership so Sync dcattr will work. DC_SetOwnership( Dce->hDC, PsGetCurrentProcess()); DC_AllocateDcAttr( Dce->hDC ); // Allocate new dcattr @@ -606,148 +571,47 @@ return(Dce->hDC); } - - -HDC STDCALL -NtUserGetDCEx(HWND hWnd OPTIONAL, HANDLE ClipRegion, ULONG Flags) -{ - PWINDOW_OBJECT Wnd=NULL; - DECLARE_RETURN(HDC); - - DPRINT("Enter NtUserGetDCEx\n"); - UserEnterExclusive(); - - if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) - { - RETURN(NULL); - } - - RETURN( UserGetDCEx(Wnd, ClipRegion, Flags)); - -CLEANUP: - DPRINT("Leave NtUserGetDCEx, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - -BOOL FASTCALL -DCE_Cleanup(PDCE pDce) -{ - PDCE PrevInList; - KeEnterCriticalRegion(); - if (pDce == FirstDce) - { - FirstDce = pDce->next; - PrevInList = pDce; - } - else - { - for (PrevInList = FirstDce; NULL != PrevInList; PrevInList = PrevInList->next) - { - if (pDce == PrevInList->next) - { - PrevInList->next = pDce->next; - break; - } - } - assert(NULL != PrevInList); - } - KeLeaveCriticalRegion(); - return NULL != PrevInList; -} - -HWND FASTCALL -IntWindowFromDC(HDC hDc) -{ - DCE *Dce; - HWND Ret = NULL; - KeEnterCriticalRegion(); - for (Dce = FirstDce; Dce != NULL; Dce = Dce->next) - { - if(Dce->hDC == hDc) - { - Ret = Dce->hwndCurrent; - break; - } - } - KeLeaveCriticalRegion(); - return Ret; -} - - -INT FASTCALL -UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc, BOOL EndPaint) -{ - DCE *dce; - INT nRet = 0; - - dce = FirstDce; - - DPRINT("%p %p\n", Window, hDc); - KeEnterCriticalRegion(); - while (dce && (dce->hDC != hDc)) - { - dce = dce->next; - } - KeLeaveCriticalRegion(); - if (dce && (dce->DCXFlags & DCX_DCEBUSY)) - { - nRet = DceReleaseDC(dce, EndPaint); - } - - return nRet; -} - - /*********************************************************************** * DceFreeDCE */ PDCE FASTCALL DceFreeDCE(PDCE pdce, BOOLEAN Force) - { - DCE *ret; - - if (NULL == pdce) +{ + DCE *ret; + BOOL Hit = FALSE; + + if (NULL == pdce) return NULL; + + ret = (PDCE) pdce->List.Flink; + +#if 0 /* FIXME */ + SetDCHook(pdce->hDC, NULL, 0L); +#endif + + if (Force && !GDIOBJ_OwnedByCurrentProcess(GdiHandleTable, pdce->hDC)) + { + DPRINT1("Change ownership for DCE!\n"); + + if (!IsObjectDead((HGDIOBJ) pdce->hDC)) + DC_SetOwnership( pdce->hDC, PsGetCurrentProcess()); + else { - return NULL; + DPRINT1("Attempted to change ownership of an DCEhDC 0x%x currently being destroyed!!!\n",pdce->hDC); + Hit = TRUE; } - - ret = pdce->next; - - #if 0 /* FIXME */ - - SetDCHook(pdce->hDC, NULL, 0L); - #endif - - if(Force && !GDIOBJ_OwnedByCurrentProcess(GdiHandleTable, pdce->hDC)) - { - DPRINT1("Change ownership for DCE!\n"); - - if(!IsObjectDead((HGDIOBJ) pdce->hDC)) - DC_SetOwnership( pdce->hDC, PsGetCurrentProcess()); - else - { - DPRINT1("Attempted to change ownership of an DCEhDC 0x%x currently being destroyed!!!\n",pdce->hDC); - } - } - - IntGdiDeleteDC(pdce->hDC, TRUE); + } + + if (!Hit) IntGdiDeleteDC(pdce->hDC, TRUE); - if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) - { + if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) + { NtGdiDeleteObject(pdce->hClipRgn); - } - - DCE_Cleanup(pdce); - ExFreePoolWithTag(pdce, TAG_PDCE); - - if (FirstDce == NULL) - { - ExFreePoolWithTag(defaultDCstate, TAG_DC); - defaultDCstate = NULL; - } - return ret; + } + + RemoveEntryList(&pdce->List); + ExFreePoolWithTag(pdce, TAG_PDCE); + + return ret; } /*********************************************************************** @@ -758,26 +622,33 @@ void FASTCALL DceFreeWindowDCE(PWINDOW_OBJECT Window) { - DCE *pDCE; - - pDCE = FirstDce; - KeEnterCriticalRegion(); - while (pDCE) - { + PDCE pDCE; + + pDCE = FirstDce; + KeEnterCriticalRegion(); + do + { if (pDCE->hwndCurrent == Window->hSelf) { - if (pDCE == Window->Dce) /* owned or Class DCE*/ + if (!(pDCE->DCXFlags & DCX_CACHE)) /* owned or Class DCE*/ { - if (Window->Wnd->Class->Style & CS_OWNDC) /* owned DCE*/ + if (Window->Wnd->Class->Style & CS_CLASSDC || + Window->Wnd->Style & CS_CLASSDC) /* Test Class first */ + { + if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ + DceDeleteClipRgn(pDCE); + pDCE->hwndCurrent = 0; + } + else if (Window->Wnd->Class->Style & CS_OWNDC || + Window->Wnd->Style & CS_OWNDC) /* owned DCE*/ { pDCE = DceFreeDCE(pDCE, FALSE); Window->Dce = NULL; continue; } - else if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ - { - DceDeleteClipRgn(pDCE); - pDCE->hwndCurrent = 0; + else + { + ASSERT(FALSE); } } else @@ -795,14 +666,13 @@ DceReleaseDC(pDCE, FALSE); } - pDCE->DCXFlags &= DCX_CACHE; pDCE->DCXFlags |= DCX_DCEEMPTY; pDCE->hwndCurrent = 0; } } - pDCE = pDCE->next; - } - KeLeaveCriticalRegion(); + pDCE = (PDCE) pDCE->List.Flink; + } while (pDCE != FirstDce); + KeLeaveCriticalRegion(); } VOID FASTCALL @@ -828,7 +698,8 @@ return; } pDCE = FirstDce; - while (pDCE) + if(!pDCE) return; // Another null test! + do { if (0 == (pDCE->DCXFlags & DCX_DCEEMPTY)) { @@ -841,7 +712,7 @@ CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent); if (NULL == CurrentWindow) { - pDCE = pDCE->next; + pDCE = (PDCE) pDCE->List.Flink; continue; } } @@ -849,11 +720,7 @@ dc = DC_LockDc(pDCE->hDC); if (dc == NULL) { -// if (Window->hSelf != pDCE->hwndCurrent) -// { -// UserDerefObject(CurrentWindow); -// } - pDCE = pDCE->next; + pDCE = (PDCE) pDCE->List.Flink; continue; } if (Window == CurrentWindow || IntIsChildWindow(Window, CurrentWindow)) @@ -889,14 +756,134 @@ if (Window->hSelf != pDCE->hwndCurrent) { - // IntEngWindowChanged(CurrentWindow, WOC_RGN_CLIENT); +// IntEngWindowChanged(CurrentWindow, WOC_RGN_CLIENT); // UserDerefObject(CurrentWindow); } } - pDCE = pDCE->next; - } -} - + pDCE =(PDCE) pDCE->List.Flink; + } while (pDCE != FirstDce); +} + +HDC +FASTCALL +IntGetDC(PWINDOW_OBJECT Window) +{ + if (!Window) + { // MSDN: + //"hWnd [in] Handle to the window whose DC is to be retrieved. + // If this value is NULL, GetDC retrieves the DC for the entire screen." + Window = UserGetWindowObject(IntGetDesktopWindow()); + if (Window) + return UserGetDCEx(Window, NULL, DCX_CACHE | DCX_WINDOW); + else + return NULL; + } + return UserGetDCEx(Window, NULL, DCX_USESTYLE); +} + +HWND FASTCALL +IntWindowFromDC(HDC hDc) +{ + DCE *Dce; + HWND Ret = NULL; + KeEnterCriticalRegion(); + Dce = FirstDce; + do + { + if(Dce->hDC == hDc) + { + Ret = Dce->hwndCurrent; + break; + } + Dce = (PDCE)Dce->List.Flink; + } while (Dce != FirstDce); + KeLeaveCriticalRegion(); + return Ret; +} + +INT FASTCALL +UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc, BOOL EndPaint) +{ + PDCE dce; + INT nRet = 0; + BOOL Hit = FALSE; + + DPRINT("%p %p\n", Window, hDc); + dce = FirstDce; + KeEnterCriticalRegion(); + do + { + if (dce->hDC == hDc) + { + Hit = TRUE; + break; + } + + dce = (PDCE) dce->List.Flink; + } + while (dce != FirstDce ); + KeLeaveCriticalRegion(); + + if ( Hit && (dce->DCXFlags & DCX_DCEBUSY)) + { + nRet = DceReleaseDC(dce, EndPaint); + } + + return nRet; +} + +DWORD FASTCALL +UserGetWindowDC(PWINDOW_OBJECT Wnd) +{ + return (DWORD)UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW); +} + +HDC STDCALL +NtUserGetDCEx(HWND hWnd OPTIONAL, HANDLE ClipRegion, ULONG Flags) +{ + PWINDOW_OBJECT Wnd=NULL; + DECLARE_RETURN(HDC); + + DPRINT("Enter NtUserGetDCEx\n"); + UserEnterExclusive(); + + if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) + { + RETURN(NULL); + } + + RETURN( UserGetDCEx(Wnd, ClipRegion, Flags)); + +CLEANUP: + DPRINT("Leave NtUserGetDCEx, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +/* + * NtUserGetWindowDC + * + * The NtUserGetWindowDC function retrieves the device context (DC) for the + * entire window, including title bar, menus, and scroll bars. A window device + * context permits painting anywhere in a window, because the origin of the + * device context is the upper-left corner of the window instead of the client + * area. + * + * Status + * @implemented + */ +DWORD STDCALL +NtUserGetWindowDC(HWND hWnd) +{ + return (DWORD)NtUserGetDCEx(hWnd, 0, DCX_USESTYLE | DCX_WINDOW); +} + +HDC STDCALL +NtUserGetDC(HWND hWnd) +{ +// We have a problem here! Should call IntGetDC. + return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); +} #define COPY_DEVMODE_VALUE_TO_CALLER(dst, src, member) \ Status = MmCopyToCaller(&(dst)->member, &(src)->member, sizeof ((src)->member)); \ @@ -991,7 +978,6 @@ } #undef COPY_DEVMODE_VALUE_TO_CALLER - LONG STDCALL 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 (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Mon Dec 17 23:23:31 2007 @@ -1785,12 +1785,10 @@ /* Insert the window into the thread's window list. */ InsertTailList (&PsGetCurrentThreadWin32Thread()->WindowListHead, &Window->ThreadListEntry); + /* Handle "CS_CLASSDC", it is tested first. */ + if (dwStyle & CS_CLASSDC) Window->Dce = DceAllocDCE(Window, DCE_CLASS_DC); /* Allocate a DCE for this window. */ - if (dwStyle & CS_OWNDC) - { - Window->Dce = DceAllocDCE(Window, DCE_WINDOW_DC); - } - /* FIXME: Handle "CS_CLASSDC" */ + else if (dwStyle & CS_OWNDC) Window->Dce = DceAllocDCE(Window, DCE_WINDOW_DC); Pos.x = x; Pos.y = y;

16 years, 9 months

[fireball] 31292: Sync winebuild (keeping ReactOS-specific changes). 3 days ago Michael Stefaniuc winebuild: Remove duplicate declaration of variable ... 6 days ago Alexandre Julliard winebuild: Don't set the IMAGE_FILE_DLL flag on native ... 10 days ago Alexandre Julliard winebuild: Also optimize out imports that are only ... 10 days ago Alexandre Julliard winebuild: Improved checks for missing forward entry ... 10 days ago Alexandre Julliard winebuild: Print a warning when failing to import a

by fireball＠svn.reactos.org

Author: fireball Date: Mon Dec 17 23:17:36 2007 New Revision: 31292 URL: http://svn.reactos.org/svn/reactos?rev=31292&view=rev Log: Sync winebuild (keeping ReactOS-specific changes). 3 days ago Michael Stefaniuc winebuild: Remove duplicate declaration of variable ... 6 days ago Alexandre Julliard winebuild: Don't set the IMAGE_FILE_DLL flag on native ... 10 days ago Alexandre Julliard winebuild: Also optimize out imports that are only ... 10 days ago Alexandre Julliard winebuild: Improved checks for missing forward entry ... 10 days ago Alexandre Julliard winebuild: Print a warning when failing to import a ... 2007-11-07 Alexandre Julliard winebuild: Add a few nops to stub entry points to make ... 2007-10-26 Alexandre Julliard winebuild: Add a -ordinal flag for entry points that ... 2007-09-10 Dmitry Timoshkov winebuild: Add IMAGE_FILE_32BIT_MACHINE flag for a ... 2007-07-19 Alexandre Julliard ntdll: Move private data to make room in the TEB for ... 2007-05-29 Dmitry Timoshkov winebuild: Mark builtin DLLs as IMAGE_FILE_LARGE_ADDRES ... 2007-05-24 Alexandre Julliard winebuild: Set the IMAGE_FILE_EXECUTABLE_IMAGE flag ... 2007-05-21 Dmitry Timoshkov winebuild: Fix compilation warnings in 64-bit mode. 2007-04-25 Rob Shearman winebuild: Refer to strings used in generated stubs ... 2007-04-09 Dmitry Timoshkov winebuild: Check if a given forward does exist in one ... 2007-03-17 Andrew Talbot winebuild: Replace inline static with static inline. 2007-03-05 Joris Huizer winebuild: sign-compare fixes. 2006-12-27 Alexandre Julliard make_makefiles: Generate the top-level .gitignore file. 2006-12-07 Alexandre Julliard winebuild: Added --nxcompat option, and mark all module ... 2006-12-04 Alexandre Julliard winebuild: Check for illegal characters in entry point ... 2006-10-12 Andrew Talbot winebuild: Cast-qual warning fix. 2006-09-14 Alexandre Julliard makefiles: Generate the dependencies line to avoid ... 2006-08-23 Andrew Talbot winebuild: Cast-qual warnings fix. 2006-08-11 Alexandre Julliard winebuild: Added output() function to properly deal ... 2006-08-07 Alexandre Julliard makefiles: Use make dependencies to create installation ... 2006-07-11 Ge van Geldorp winebuild: Save registers which might contain parameter ... 2006-07-11 Ge van Geldorp winebuild: Reserve enough space for null function pointer. 2006-07-10 Alexandre Julliard Take advantage of the recursive nature of .gitignore ... 2006-06-19 Alexandre Julliard winebuild: Get rid of the data16 prefix, it shouldn't ... 2006-06-13 Alexandre Julliard winebuild: Fix a few printf format warnings by casting ... 2006-05-23 Jonathan Ernst Update the address of the Free Software Foundation. 2006-04-18 Alexandre Julliard winebuild: Disable linking to external symbols by default. 2006-04-18 Alexandre Julliard winebuild: Fixed index in module table for delayed ... 2006-04-05 Alexandre Julliard winebuild: Remove a no longer necessary movzwl instruction. 2006-02-16 Robert Shearman winebuild: Correction for manpage. 2006-02-14 Mike Frysinger Add support for 'make install DESTDIR'. 2006-01-24 Alexandre Julliard winebuild: Get rid of the default ignored symbols list. 2006-01-23 Alexandre Julliard winebuild: Always import atof, the MS version is different. 2006-01-21 Marcus Meissner winebuild: Output a .note.GNU-stack section to allow ... 2006-01-20 Alexandre Julliard winebuild: Moved offset definitions to relay.c since ... 2006-01-20 Alexandre Julliard ntdll: Move the %gs register to the ntdll_thread_regs ... Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/winebuild/Makefile.in trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/import.c trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/parser.c trunk/reactos/tools/winebuild/relay.c trunk/reactos/tools/winebuild/res16.c trunk/reactos/tools/winebuild/res32.c trunk/reactos/tools/winebuild/spec16.c trunk/reactos/tools/winebuild/spec32.c trunk/reactos/tools/winebuild/utils.c trunk/reactos/tools/winebuild/winebuild.man.in trunk/reactos/tools/winebuild/winglue.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/winebuild/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/Makefile.i… Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?r… Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… Modified: trunk/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/parser.c?r… Modified: trunk/reactos/tools/winebuild/relay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/relay.c?re… Modified: trunk/reactos/tools/winebuild/res16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res16.c?re… Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… Modified: trunk/reactos/tools/winebuild/spec16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec16.c?r… Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… Modified: trunk/reactos/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/utils.c?re… Modified: trunk/reactos/tools/winebuild/winebuild.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?…

16 years, 9 months

[gedmurphy] 31291: - Don't leak bitmaps in the CopyIcon call. - Pass the call on, don't call straight into win32k

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Dec 17 19:31:10 2007 New Revision: 31291 URL: http://svn.reactos.org/svn/reactos?rev=31291&view=rev Log: - Don't leak bitmaps in the CopyIcon call. - Pass the call on, don't call straight into win32k Modified: trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c Mon Dec 17 19:31:10 2007 @@ -35,6 +35,7 @@ /* FUNCTIONS *****************************************************************/ + HICON ICON_CreateIconFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot) { @@ -147,16 +148,19 @@ */ HICON STDCALL -CopyIcon( - HICON hIcon) -{ - ICONINFO IconInfo; - - if(GetIconInfo((HANDLE)hIcon, &IconInfo)) - { - return NtUserCreateCursorIconHandle(&IconInfo, FALSE); - } - return (HICON)0; +CopyIcon(HICON hIcon) +{ + HICON hRetIcon = NULL; + ICONINFO IconInfo; + + if(GetIconInfo(hIcon, &IconInfo)) + { + hRetIcon = CreateIconIndirect(&IconInfo); + DeleteObject(IconInfo.hbmColor); + DeleteObject(IconInfo.hbmMask); + } + + return hRetIcon; }

16 years, 9 months

← Newer
1
...
21
22
23
24
25
26
27
...
61
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 December 2007