December 2006 - Wine-commits

Roderick Colenbrander : winex11.drv: pbuffer detection.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: c026faaeed9035aff21b31ee167e3a8f3018d88d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c026faaeed9035aff21b31ee1… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Dec 19 20:24:25 2006 +0100 winex11.drv: pbuffer detection. --- dlls/winex11.drv/opengl.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 418067a..cb7366a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2947,7 +2947,18 @@ static void X11DRV_WineGL_LoadExtensions if (glxRequireExtension("GLX_ARB_multisample")) register_extension(&WGL_ARB_multisample); - if (glxRequireVersion(3) && glxRequireExtension("GLX_SGIX_pbuffer")) + /* In general pbuffer functionality requires support in the X-server. The functionality is + * available either when the GLX_SGIX_pbuffer is present or when the GLX server version is 1.3. + * All display drivers except for Nvidia's use the GLX module from Xfree86/Xorg which only + * supports GLX 1.2. The endresult is that only Nvidia's drivers support pbuffers. + * + * The only other drive which has pbuffer support is Ati's FGLRX driver. They provide clientside GLX 1.3 support + * without support in the X-server (which other Mesa based drivers require). + * + * Support pbuffers when the GLX version is 1.3 and GLX_SGIX_pbuffer is available. Further pbuffers can + * also be supported when GLX_ATI_render_texture is available. This extension depends on pbuffers, so when it + * is available pbuffers must be available too. */ + if ( (glxRequireVersion(3) && glxRequireExtension("GLX_SGIX_pbuffer")) || glxRequireExtension("GLX_ATI_render_texture")) register_extension(&WGL_ARB_pbuffer); register_extension(&WGL_ARB_pixel_format);

1 0

Alexandre Julliard : ntdll: Fixed typo in map_image.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: e5477b35f45850734655b96301664bbad1107737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5477b35f45850734655b9630… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 20 12:31:20 2006 +0100 ntdll: Fixed typo in map_image. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ff16adc..152af7b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1081,7 +1081,7 @@ static NTSTATUS map_image( HANDLE hmappi sec->PointerToRawData, (int)pos, file_size, map_size, sec->Characteristics ); if (map_file_into_view( view, shared_fd, sec->VirtualAddress, map_size, pos, - VPROT_COMMITTED | VPROT_READ | PROT_WRITE, + VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, FALSE ) != STATUS_SUCCESS) { ERR_(module)( "Could not map shared section %.8s\n", sec->Name );

1 0

Hans Leidekker : winedump: Start dumping . NET specific bits from PE executables.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 1698c44ed33d00434c8f79b6d93d024f5be7a52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1698c44ed33d00434c8f79b6d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Dec 19 22:26:56 2006 +0100 winedump: Start dumping .NET specific bits from PE executables. --- include/winnt.h | 51 ++++++++++++++++++++++++++++++++++++++++ tools/winedump/main.c | 2 +- tools/winedump/pe.c | 45 ++++++++++++++++++++++++++++++++++- tools/winedump/winedump.man.in | 6 ++-- 4 files changed, 99 insertions(+), 5 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 812ab80..651e507 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3060,6 +3060,57 @@ typedef struct _IMAGE_DEBUG_DIRECTORY { #define IMAGE_DEBUG_TYPE_BORLAND 9 #define IMAGE_DEBUG_TYPE_RESERVED10 10 +typedef enum ReplacesCorHdrNumericDefines +{ + COMIMAGE_FLAGS_ILONLY = 0x00000001, + COMIMAGE_FLAGS_32BITREQUIRED = 0x00000002, + COMIMAGE_FLAGS_IL_LIBRARY = 0x00000004, + COMIMAGE_FLAGS_STRONGNAMESIGNED = 0x00000008, + COMIMAGE_FLAGS_TRACKDEBUGDATA = 0x00010000, + + COR_VERSION_MAJOR_V2 = 2, + COR_VERSION_MAJOR = COR_VERSION_MAJOR_V2, + COR_VERSION_MINOR = 0, + COR_DELETED_NAME_LENGTH = 8, + COR_VTABLEGAP_NAME_LENGTH = 8, + + NATIVE_TYPE_MAX_CB = 1, + COR_ILMETHOD_SECT_SMALL_MAX_DATASIZE = 0xff, + + IMAGE_COR_MIH_METHODRVA = 0x01, + IMAGE_COR_MIH_EHRVA = 0x02, + IMAGE_COR_MIH_BASICBLOCK = 0x08, + + COR_VTABLE_32BIT = 0x01, + COR_VTABLE_64BIT = 0x02, + COR_VTABLE_FROM_UNMANAGED = 0x04, + COR_VTABLE_CALL_MOST_DERIVED = 0x10, + + IMAGE_COR_EATJ_THUNK_SIZE = 32, + + MAX_CLASS_NAME = 1024, + MAX_PACKAGE_NAME = 1024, +} ReplacesCorHdrNumericDefines; + +typedef struct IMAGE_COR20_HEADER +{ + DWORD cb; + WORD MajorRuntimeVersion; + WORD MinorRuntimeVersion; + + IMAGE_DATA_DIRECTORY MetaData; + DWORD Flags; + DWORD EntryPointToken; + + IMAGE_DATA_DIRECTORY Resources; + IMAGE_DATA_DIRECTORY StrongNameSignature; + IMAGE_DATA_DIRECTORY CodeManagerTable; + IMAGE_DATA_DIRECTORY VTableFixups; + IMAGE_DATA_DIRECTORY ExportAddressTableJumps; + IMAGE_DATA_DIRECTORY ManagedNativeHeader; + +} IMAGE_COR20_HEADER, *PIMAGE_COR20_HEADER; + typedef struct _IMAGE_COFF_SYMBOLS_HEADER { DWORD NumberOfSymbols; DWORD LvaToFirstSymbol; diff --git a/tools/winedump/main.c b/tools/winedump/main.c index ad24379..a760ee6 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -221,7 +221,7 @@ static const struct my_option option_tab {"-C", DUMP, 0, do_symdmngl, "-C Turns on symbol demangling"}, {"-f", DUMP, 0, do_dumphead, "-f Dumps file header information"}, {"-G", DUMP, 0, do_rawdebug, "-G Dumps raw debug information"}, - {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls)"}, + {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls, clr)"}, {"-x", DUMP, 0, do_dumpall, "-x Dumps everything"}, {NULL, NONE, 0, NULL, NULL} }; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index e05274f..b4eed92 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -139,7 +139,7 @@ static const char * const DirectoryNames "EXPORT", "IMPORT", "RESOURCE", "EXCEPTION", "SECURITY", "BASERELOC", "DEBUG", "ARCHITECTURE", "GLOBALPTR", "TLS", "LOAD_CONFIG", "Bound IAT", - "IAT", "Delay IAT", "COM Descript", "" + "IAT", "Delay IAT", "CLR Header", "" }; static const char *get_magic_type(WORD magic) @@ -786,6 +786,47 @@ static void dump_dir_debug(void) printf("\n"); } +static inline void print_clrflags(const char *title, WORD value) +{ + printf(" %-34s 0x%X\n", title, value); +#define X(f,s) if (value & f) printf(" %s\n", s) + X(COMIMAGE_FLAGS_ILONLY, "ILONLY"); + X(COMIMAGE_FLAGS_32BITREQUIRED, "32BITREQUIRED"); + X(COMIMAGE_FLAGS_IL_LIBRARY, "IL_LIBRARY"); + X(COMIMAGE_FLAGS_STRONGNAMESIGNED, "STRONGNAMESIGNED"); + X(COMIMAGE_FLAGS_TRACKDEBUGDATA, "TRACKDEBUGDATA"); +#undef X +} + +static inline void print_clrdirectory(const char *title, const IMAGE_DATA_DIRECTORY *dir) +{ + printf(" %-23s rva: 0x%-8x size: 0x%-8x\n", title, dir->VirtualAddress, dir->Size); +} + +static void dump_dir_clr_header(void) +{ + unsigned int size = 0; + const IMAGE_COR20_HEADER *dir = get_dir_and_size(IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, &size); + + if (!dir) return; + + printf( "CLR Header\n" ); + print_dword( "Header Size", dir->cb ); + print_ver( "Required runtime version", dir->MajorRuntimeVersion, dir->MinorRuntimeVersion ); + print_clrflags( "Flags", dir->Flags ); + print_dword( "EntryPointToken", dir->EntryPointToken ); + printf("\n"); + printf( "CLR Data Directory\n" ); + print_clrdirectory( "MetaData", &dir->MetaData ); + print_clrdirectory( "Resources", &dir->Resources ); + print_clrdirectory( "StrongNameSignature", &dir->StrongNameSignature ); + print_clrdirectory( "CodeManagerTable", &dir->CodeManagerTable ); + print_clrdirectory( "VTableFixups", &dir->VTableFixups ); + print_clrdirectory( "ExportAddressTableJumps", &dir->ExportAddressTableJumps ); + print_clrdirectory( "ManagedNativeHeader", &dir->ManagedNativeHeader ); + printf("\n"); +} + static void dump_dir_tls(void) { IMAGE_TLS_DIRECTORY64 dir; @@ -1227,6 +1268,8 @@ void pe_dump(void) dump_dir_resource(); if (all || !strcmp(globals.dumpsect, "tls")) dump_dir_tls(); + if (all || !strcmp(globals.dumpsect, "clr")) + dump_dir_clr_header(); #if 0 /* FIXME: not implemented yet */ if (all || !strcmp(globals.dumpsect, "reloc")) diff --git a/tools/winedump/winedump.man.in b/tools/winedump/winedump.man.in index 0a2ca24..5a05c43 100644 --- a/tools/winedump/winedump.man.in +++ b/tools/winedump/winedump.man.in @@ -72,10 +72,10 @@ This option dumps only the standard PE h along with the COFF sections available in the file. .IP "\fB-j \fIsect_name\fR" Dumps only the content of section sect_name (import, -export, debug). +export, debug, resource, tls, clr). To dump only a given directory, specify them using this -option. Currently only the import, export and debug -directories are implemented. +option. Currently the import, export, debug, resource, +tls and clr directories are implemented. .IP \fB-x\fR Dumps everything. This command prints all available information about the

1 0

Andrew Talbot : gdi32: Remove unused function.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 3d412007979dcdc0224f12f7ee9aedd13c662135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d412007979dcdc0224f12f7e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Dec 19 19:04:55 2006 +0000 gdi32: Remove unused function. --- dlls/gdi32/gdiobj.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 772952d..54b69b5 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -75,13 +75,6 @@ static CRITICAL_SECTION_DEBUG critsect_d }; static SYSLEVEL GDI_level = { { &critsect_debug, -1, 0, 0, 0, 0 }, 3 }; -inline static BOOL get_bool(char *buffer) -{ - return (buffer[0] == 'y' || buffer[0] == 'Y' || - buffer[0] == 't' || buffer[0] == 'T' || - buffer[0] == '1'); -} - /**************************************************************************** *

1 0

Huw Davies : gdi32: Improve the fontconfig filtering hack so that Mac suitcase fonts get through .
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 7329144c5845089de67dbe1e91165491e5f8f045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7329144c5845089de67dbe1e9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 19 21:21:27 2006 +0000 gdi32: Improve the fontconfig filtering hack so that Mac suitcase fonts get through. --- dlls/gdi32/freetype.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9344515..86d3455 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -155,6 +155,7 @@ MAKE_FUNCPTR(FcObjectSetCreate); MAKE_FUNCPTR(FcObjectSetDestroy); MAKE_FUNCPTR(FcPatternCreate); MAKE_FUNCPTR(FcPatternDestroy); +MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetString); #ifndef SONAME_LIBFONTCONFIG #define SONAME_LIBFONTCONFIG "libfontconfig.so" @@ -1221,6 +1222,7 @@ LOAD_FUNCPTR(FcObjectSetCreate); LOAD_FUNCPTR(FcObjectSetDestroy); LOAD_FUNCPTR(FcPatternCreate); LOAD_FUNCPTR(FcPatternDestroy); +LOAD_FUNCPTR(FcPatternGetBool); LOAD_FUNCPTR(FcPatternGetString); #undef LOAD_FUNCPTR @@ -1230,20 +1232,30 @@ LOAD_FUNCPTR(FcPatternGetString); pat = pFcPatternCreate(); os = pFcObjectSetCreate(); pFcObjectSetAdd(os, FC_FILE); + pFcObjectSetAdd(os, FC_SCALABLE); fontset = pFcFontList(config, pat, os); if(!fontset) return; for(i = 0; i < fontset->nfont; i++) { + FcBool scalable; + if(pFcPatternGetString(fontset->fonts[i], FC_FILE, 0, (FcChar8**)&file) != FcResultMatch) continue; TRACE("fontconfig: %s\n", file); /* We're just interested in OT/TT fonts for now, so this hack just - picks up the standard extensions to save time loading every other - font */ + picks up the scalable fonts without extensions .pf[ab] to save time + loading every other font */ + + if(pFcPatternGetBool(fontset->fonts[i], FC_SCALABLE, 0, &scalable) == FcResultMatch && !scalable) + { + TRACE("not scalable\n"); + continue; + } + len = strlen( file ); if(len < 4) continue; ext = &file[ len - 3 ]; - if(!strcasecmp(ext, "ttf") || !strcasecmp(ext, "ttc") || !strcasecmp(ext, "otf")) + if(strcasecmp(ext, "pfa") && strcasecmp(ext, "pfb")) AddFontFileToList(file, NULL, ADDFONT_EXTERNAL_FONT); } pFcFontSetDestroy(fontset);

1 0

Ulrich Czekalla : winex11.drv: Don' t crash when called with a NULL gl context.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: b2f33ffbbb342b0e03ed1a26239946de1808c73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f33ffbbb342b0e03ed1a262… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Tue Dec 19 11:02:56 2006 -0500 winex11.drv: Don't crash when called with a NULL gl context. --- dlls/winex11.drv/opengl.c | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 07e076d..418067a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1795,7 +1795,9 @@ static void WINAPI X11DRV_wglDisable(GLe if (cap == GL_SCISSOR_TEST) { Wine_GLContext *ctx = (Wine_GLContext *) NtCurrentTeb()->glContext; - ctx->scissor_enabled = FALSE; + + if (ctx) + ctx->scissor_enabled = FALSE; } else { @@ -1810,7 +1812,9 @@ static void WINAPI X11DRV_wglEnable(GLen if (cap == GL_SCISSOR_TEST) { Wine_GLContext *ctx = (Wine_GLContext *) NtCurrentTeb()->glContext; - ctx->scissor_enabled = TRUE; + + if (ctx) + ctx->scissor_enabled = TRUE; } else { @@ -1861,12 +1865,14 @@ static void WINAPI X11DRV_wglGetIntegerv static GLboolean WINAPI X11DRV_wglIsEnabled(GLenum cap) { - GLboolean enabled; + GLboolean enabled = False; if (cap == GL_SCISSOR_TEST) { Wine_GLContext *ctx = (Wine_GLContext *) NtCurrentTeb()->glContext; - enabled = ctx->scissor_enabled; + + if (ctx) + enabled = ctx->scissor_enabled; } else { @@ -1881,24 +1887,30 @@ static void WINAPI X11DRV_wglScissor(GLi { Wine_GLContext *ctx = (Wine_GLContext *) NtCurrentTeb()->glContext; - ctx->scissor.left = x; - ctx->scissor.top = y; - ctx->scissor.right = x + width; - ctx->scissor.bottom = y + height; + if (ctx) + { + ctx->scissor.left = x; + ctx->scissor.top = y; + ctx->scissor.right = x + width; + ctx->scissor.bottom = y + height; - sync_current_drawable(TRUE); + sync_current_drawable(TRUE); + } } static void WINAPI X11DRV_wglViewport(GLint x, GLint y, GLsizei width, GLsizei height) { Wine_GLContext *ctx = (Wine_GLContext *) NtCurrentTeb()->glContext; - ctx->viewport.left = x; - ctx->viewport.top = y; - ctx->viewport.right = x + width; - ctx->viewport.bottom = y + height; + if (ctx) + { + ctx->viewport.left = x; + ctx->viewport.top = y; + ctx->viewport.right = x + width; + ctx->viewport.bottom = y + height; - sync_current_drawable(TRUE); + sync_current_drawable(TRUE); + } } /**

1 0

Rob Shearman : ole32: Fix the HMETAFILEPICT user marshaling test to use the size
by Alexandre Julliard 19 Dec '06

19 Dec '06

Module: wine Branch: master Commit: 307ab51793a2d436956a5eac277fdc00bf3bc86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=307ab51793a2d436956a5eac2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 19 13:03:33 2006 +0000 ole32: Fix the HMETAFILEPICT user marshaling test to use the size derived from the return value of HMETAFILEPICT_UserMarshal instead of the value returned by HMETAFILEPICT_UserSize, as the latter over-estimates the size on Windows. Remove some unnecessary casts. --- dlls/ole32/tests/usrmarshal.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 2ce7384..28c6687 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -204,7 +204,7 @@ static void test_marshal_HENHMETAFILE(vo size = HENHMETAFILE_UserSize(&flags, 0, &hemf); ok(size == 8, "size should be 8 bytes, not %d\n", size); - buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); HENHMETAFILE_UserMarshal(&flags, buffer, &hemf); wirehemf = buffer; ok(*(DWORD *)wirehemf == WDT_REMOTE_CALL, "wirestgm + 0x0 should be WDT_REMOTE_CALL instead of 0x%08x\n", *(DWORD *)wirehemf); @@ -239,7 +239,7 @@ static void test_marshal_HMETAFILE(void) size = HMETAFILE_UserSize(&flags, 0, &hmf); ok(size > 20, "size should be at least 20 bytes, not %d\n", size); - buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); HMETAFILE_UserMarshal(&flags, buffer, &hmf); wirehmf = buffer; ok(*(DWORD *)wirehmf == WDT_REMOTE_CALL, "wirestgm + 0x0 should be WDT_REMOTE_CALL instead of 0x%08x\n", *(DWORD *)wirehmf); @@ -266,7 +266,7 @@ static void test_marshal_HMETAFILE(void) size = HMETAFILE_UserSize(&flags, 0, &hmf); ok(size == 8, "size should be 8 bytes, not %d\n", size); - buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); HMETAFILE_UserMarshal(&flags, buffer, &hmf); wirehmf = buffer; ok(*(DWORD *)wirehmf == WDT_REMOTE_CALL, "wirestgm + 0x0 should be WDT_REMOTE_CALL instead of 0x%08x\n", *(DWORD *)wirehmf); @@ -286,7 +286,7 @@ static void test_marshal_HMETAFILE(void) static void test_marshal_HMETAFILEPICT(void) { - unsigned char *buffer; + unsigned char *buffer, *buffer_end; ULONG size; ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); HMETAFILEPICT hmfp; @@ -305,8 +305,8 @@ static void test_marshal_HMETAFILEPICT(v size = HMETAFILEPICT_UserSize(&flags, 0, &hmfp); ok(size > 20, "size should be at least 20 bytes, not %d\n", size); trace("size is %d\n", size); - buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); - HMETAFILEPICT_UserMarshal(&flags, buffer, &hmfp); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + buffer_end = HMETAFILEPICT_UserMarshal(&flags, buffer, &hmfp); wirehmfp = buffer; ok(*(DWORD *)wirehmfp == WDT_REMOTE_CALL, "wirestgm + 0x0 should be WDT_REMOTE_CALL instead of 0x%08x\n", *(DWORD *)wirehmfp); wirehmfp += sizeof(DWORD); @@ -326,12 +326,12 @@ static void test_marshal_HMETAFILEPICT(v ok(*(DWORD *)wirehmfp == (DWORD)(DWORD_PTR)pmfp->hMF, "wirestgm + 0x1c should be pmfp->hMF instead of 0x%08x\n", *(DWORD *)wirehmfp); GlobalUnlock(hmfp); wirehmfp += sizeof(DWORD); - todo_wine { - ok(*(DWORD *)wirehmfp == (size - 0x34), "wirestgm + 0x20 should be size - 0x34 instead of 0x%08x\n", *(DWORD *)wirehmfp); + /* Note use (buffer_end - buffer) instead of size here, because size is an + * overestimate with native */ + ok(*(DWORD *)wirehmfp == (buffer_end - buffer - 0x28), "wirestgm + 0x20 should be size - 0x34 instead of 0x%08x\n", *(DWORD *)wirehmfp); wirehmfp += sizeof(DWORD); - ok(*(DWORD *)wirehmfp == (size - 0x34), "wirestgm + 0x24 should be size - 0x34 instead of 0x%08x\n", *(DWORD *)wirehmfp); + ok(*(DWORD *)wirehmfp == (buffer_end - buffer - 0x28), "wirestgm + 0x24 should be size - 0x34 instead of 0x%08x\n", *(DWORD *)wirehmfp); wirehmfp += sizeof(DWORD); - } ok(*(WORD *)wirehmfp == 1, "wirehmfp + 0x28 should be 1 instead of 0x%08x\n", *(DWORD *)wirehmfp); wirehmfp += sizeof(DWORD); /* ... rest of data not tested - refer to tests for GetMetaFileBits

1 0

Juris Smotrovs : user32: Extend the support for SWP_STATECHANGED for all windows.
by Alexandre Julliard 19 Dec '06

19 Dec '06

Module: wine Branch: master Commit: 00982465c460bf6f1021bf94002847589a9b7dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00982465c460bf6f1021bf940… Author: Juris Smotrovs <juris.smotrovs(a)sets.lv> Date: Tue Dec 19 19:35:42 2006 +0800 user32: Extend the support for SWP_STATECHANGED for all windows. --- dlls/user32/tests/msg.c | 24 +++++++++++++----- dlls/winex11.drv/window.c | 4 +- dlls/winex11.drv/winpos.c | 59 ++++++++++++++++++++++----------------------- 3 files changed, 48 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00982465c460bf6f1021b…

1 0

Stefan Dösinger : wined3d: Add WINED3DRS_STIPPLEPATTERNxy.
by Alexandre Julliard 19 Dec '06

19 Dec '06

Module: wine Branch: master Commit: f661a8287cfe94063d96bbf7aaeb6f9ee3befde5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f661a8287cfe94063d96bbf7a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 17 17:21:30 2006 +0100 wined3d: Add WINED3DRS_STIPPLEPATTERNxy. --- dlls/wined3d/state.c | 65 ++++++++++++++++++++--------------------- dlls/wined3d/utils.c | 32 ++++++++++++++++++++ include/wine/wined3d_types.h | 34 ++++++++++++++++++++++ 3 files changed, 98 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f661a8287cfe94063d96b…

1 0

Stefan Dösinger : wined3d: Catch nop render state changes.
by Alexandre Julliard 19 Dec '06

19 Dec '06

Module: wine Branch: master Commit: 062b6ffc5c30141968472e88280e9334ccb536a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062b6ffc5c30141968472e882… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 15 19:16:36 2006 +0100 wined3d: Catch nop render state changes. --- dlls/wined3d/device.c | 47 +++++++++++++++++++++++++++++++---------------- dlls/wined3d/drawprim.c | 16 ++-------------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a4a270..32fc71b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2068,6 +2068,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSwapChainImpl *swapchain; + DWORD state; TRACE("(%p)->(%p,%p)\n", This, pPresentationParameters, D3DCB_CreateAdditionalSwapChain); if(This->d3d_initialized) return WINED3DERR_INVALIDCALL; @@ -2148,6 +2149,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl /* Clear the screen */ IWineD3DDevice_Clear((IWineD3DDevice *) This, 0, NULL, WINED3DCLEAR_STENCIL|WINED3DCLEAR_ZBUFFER|WINED3DCLEAR_TARGET, 0x00, 1.0, 0); + /* Mark all states dirty. The Setters will not mark a state dirty when the new value is equal to the old value + * This might create a problem in 2 situations: + * ->The D3D default value is 0, but the opengl default value is something else + * ->D3D7 unintialized D3D and reinitializes it. This way the context is destroyed, be the stateblock unchanged + */ + for(state = 0; state <= STATE_HIGHEST; state++) { + IWineD3DDeviceImpl_MarkStateDirty(This, state); + } + This->d3d_initialized = TRUE; return WINED3D_OK; } @@ -3316,8 +3326,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, WINED3DRENDERSTATETYPE State, DWORD Value) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + DWORD oldValue = This->stateBlock->renderState[State]; TRACE("(%p)->state = %s(%d), value = %d\n", This, debug_d3drenderstate(State), State, Value); + This->updateStateBlock->changed.renderState[State] = TRUE; This->updateStateBlock->set.renderState[State] = TRUE; This->updateStateBlock->renderState[State] = Value; @@ -3328,7 +3340,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(State)); + /* Compared here and not before the assignment to allow proper stateblock recording */ + if(Value == oldValue) { + TRACE("Application is setting the old value over, nothing to do\n"); + } else { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(State)); + } return WINED3D_OK; } @@ -4546,19 +4563,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DBaseTexture_Release(oldTexture); } - /* Reset color keying */ + /* Color keying is affected by the texture. Temporarily mark the color key state (=alpha test) + * dirty until textures are integrated with the state management + */ if(Stage == 0 && This->stateBlock->renderState[WINED3DRS_COLORKEYENABLE]) { - BOOL enable_ckey = FALSE; - - if(pTexture) { - IWineD3DSurfaceImpl *surf = (IWineD3DSurfaceImpl *) ((IWineD3DTextureImpl *)pTexture)->surfaces[0]; - if(surf->CKeyFlags & DDSD_CKSRCBLT) enable_ckey = TRUE; - } - - if(enable_ckey) { - glAlphaFunc(GL_NOTEQUAL, 0.0); - checkGLcall("glAlphaFunc"); - } + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORKEYENABLE)); } return WINED3D_OK; @@ -6007,6 +6016,7 @@ static void device_reapply_stateblock(IW BOOL oldRecording; IWineD3DStateBlockImpl *oldUpdateStateBlock; + DWORD i; /* Disable recording */ oldUpdateStateBlock = This->updateStateBlock; @@ -6017,6 +6027,13 @@ static void device_reapply_stateblock(IW /* Reapply the state block */ IWineD3DStateBlock_Apply((IWineD3DStateBlock *)This->stateBlock); + /* Temporaryily mark all render states dirty to force reapplication + * until the context management for is integrated with the state management + */ + for(i = 1; i < WINEHIGHEST_RENDER_STATE; i++) { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(i)); + } + /* Restore recording */ This->isRecordingState = oldRecording; This->updateStateBlock = oldUpdateStateBlock; @@ -6030,7 +6047,6 @@ static void device_reapply_stateblock(IW * make this unnecessary */ static void device_render_to_texture(IWineD3DDeviceImpl* This, BOOL isTexture) { - DWORD cullMode; BOOL oldRecording; IWineD3DStateBlockImpl *oldUpdateStateBlock; @@ -6049,8 +6065,7 @@ static void device_render_to_texture(IWi } This->last_was_rhw = FALSE; This->proj_valid = FALSE; - IWineD3DDevice_GetRenderState((IWineD3DDevice*) This, WINED3DRS_CULLMODE, &cullMode); - IWineD3DDevice_SetRenderState((IWineD3DDevice*) This, WINED3DRS_CULLMODE, cullMode); + IWineD3DDeviceImpl_MarkStateDirty(This, WINED3DRS_CULLMODE); /* Restore recording */ This->isRecordingState = oldRecording; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 06a86ae..6ac7462 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -332,20 +332,8 @@ static void primitiveInitState( } else if(This->stateBlock->renderState[WINED3DRS_FOGENABLE] && This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] != WINED3DFOG_NONE) { - - if(GL_SUPPORT(EXT_FOG_COORD)) { - glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); - checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT)\n"); - /* Reapply the fog range */ - IWineD3DDevice_SetRenderState(iface, WINED3DRS_FOGSTART, This->stateBlock->renderState[WINED3DRS_FOGSTART]); - IWineD3DDevice_SetRenderState(iface, WINED3DRS_FOGEND, This->stateBlock->renderState[WINED3DRS_FOGEND]); - /* Restore the fog mode */ - IWineD3DDevice_SetRenderState(iface, WINED3DRS_FOGTABLEMODE, This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE]); - } else { - /* Enable GL_FOG again because we disabled it above */ - glEnable(GL_FOG); - checkGLcall("glEnable(GL_FOG)"); - } + /* Reapply the fog */ + StateTable[STATE_RENDER(WINED3DRS_FOGENABLE)].apply(STATE_RENDER(WINED3DRS_FOGSTART), This->stateBlock); } } }

1 0