March 2010 - Wine-commits - list.winehq.org

Hwang YunSong : wordpad: Update Korean translation.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 5c5f37a6c733c931b9517f679496c7fb472f2d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5f37a6c733c931b9517f679… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Mar 2 10:12:25 2010 +0900 wordpad: Update Korean translation. --- programs/wordpad/Ko.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index fd39d96..8111083 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -127,7 +127,7 @@ BEGIN MENUITEM "��ȫ��" ID_COLOR_FUCHSIA MENUITEM "��" ID_COLOR_AQUA MENUITEM "�Ͼ�" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "�ڵ�" ID_COLOR_AUTOMATIC END END @@ -236,11 +236,11 @@ BEGIN STRING_PREVIEW_PREVPAGE, "�� " STRING_PREVIEW_TWOPAGES, "�� " STRING_PREVIEW_ONEPAGE, "�� " - STRING_PREVIEW_ZOOMIN, "Zoom in" - STRING_PREVIEW_ZOOMOUT, "Zoom out" + STRING_PREVIEW_ZOOMIN, "Ȯ��" + STRING_PREVIEW_ZOOMOUT, "��" STRING_PREVIEW_CLOSE, "�ݱ�" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" + STRING_PREVIEW_PAGE, "��" + STRING_PREVIEW_PAGES, "��" STRING_UNITS_CM, "cm" END

1 0

Christian Costa : d3dx9_36: Remove useless HEAP_ZERO_MEMORY flag ( spotted by Henri Verbeet).
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: a942fe6fd7dba666cc9e68ac263572082e77d540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a942fe6fd7dba666cc9e68ac2… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Mar 2 08:37:07 2010 +0100 d3dx9_36: Remove useless HEAP_ZERO_MEMORY flag (spotted by Henri Verbeet). --- dlls/d3dx9_36/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 5de3cad..9acad32 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -611,7 +611,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* pFunction, object->lpVtbl = &ID3DXConstantTable_Vtbl; object->ref = 1; - object->ctab = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + object->ctab = HeapAlloc(GetProcessHeap(), 0, size); if (!object->ctab) { HeapFree(GetProcessHeap(), 0, object);

1 0

Austin English : urlmon: Add a stub for AsyncInstallDistributionUnit.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: cdb8e1871560fa10558048cb6448e62b164e593d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb8e1871560fa10558048cb6… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 1 19:49:41 2010 -0600 urlmon: Add a stub for AsyncInstallDistributionUnit. --- dlls/urlmon/umon.c | 11 +++++++++++ dlls/urlmon/urlmon.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index e6e20b9..5e6a8f6 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -755,3 +755,14 @@ HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi ) FIXME("%s %p\n", debugstr_w(szDistUnit), psdi ); return E_FAIL; } + +/*********************************************************************** + * AsyncInstallDistributionUnit (URLMON.@) + */ +HRESULT WINAPI AsyncInstallDistributionUnit( LPCWSTR szDistUnit, LPCWSTR szTYPE, + LPCWSTR szExt, DWORD dwFileVersionMS, DWORD dwFileVersionLS, + LPCWSTR szURL, IBindCtx *pbc, LPVOID pvReserved, DWORD flags ) +{ + FIXME(": stub\n"); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index dbb8fa9..a67004a 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -6,7 +6,7 @@ #3 stub IsJITInProgress @ stub AsyncGetClassBits -@ stub AsyncInstallDistributionUnit +@ stdcall AsyncInstallDistributionUnit(ptr ptr ptr long long ptr ptr ptr long) @ stdcall BindAsyncMoniker(ptr long ptr ptr ptr) @ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) @ stub CoInstall

1 0

Alexandre Goujon : configure: Add dll name recognition for cygwin.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 2b05c84016958a86247b278aa764618d9ae3cb76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b05c84016958a86247b278aa… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Mon Mar 1 21:39:39 2010 +0100 configure: Add dll name recognition for cygwin. --- aclocal.m4 | 2 +- configure | 64 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b05c84016958a86247b2…

1 0

Alexandre Goujon : configure: Define _WIN32 when compiling on Windows.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: ac0a38cf57cc9b947133a092e4f5f8973b60e41b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0a38cf57cc9b947133a092e… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Mon Mar 1 21:39:40 2010 +0100 configure: Define _WIN32 when compiling on Windows. --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure b/configure index dacc6fc..5ecb68f 100755 --- a/configure +++ b/configure @@ -4104,6 +4104,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} + CFLAGS="$CFLAGS -D_WIN32" ;; i[3456789]86*) enable_win16=${enable_win16:-yes} diff --git a/configure.ac b/configure.ac index f7cf4b9..0796200 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,7 @@ case $host in ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} + CFLAGS="$CFLAGS -D_WIN32" ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes}

1 0

Roderick Colenbrander : opengl32: Update opengl extensions.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 6c84c3f9ad141ef38e411df4cd3af2f767957e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c84c3f9ad141ef38e411df4c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 2 11:38:19 2010 +0100 opengl32: Update opengl extensions. --- dlls/opengl32/opengl_ext.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index e446382..e3c767e 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -731,6 +731,8 @@ enum extensions EXT_glMTexCoord2fvSGIS, EXT_glMakeBufferNonResidentNV, EXT_glMakeBufferResidentNV, + EXT_glMakeNamedBufferNonResidentNV, + EXT_glMakeNamedBufferResidentNV, EXT_glMapBuffer, EXT_glMapBufferARB, EXT_glMapBufferRange, @@ -921,8 +923,6 @@ enum extensions EXT_glNamedFramebufferTextureEXT, EXT_glNamedFramebufferTextureFaceEXT, EXT_glNamedFramebufferTextureLayerEXT, - EXT_glNamedMakeBufferNonResidentNV, - EXT_glNamedMakeBufferResidentNV, EXT_glNamedProgramLocalParameter4dEXT, EXT_glNamedProgramLocalParameter4dvEXT, EXT_glNamedProgramLocalParameter4fEXT, @@ -7570,6 +7570,22 @@ static void WINAPI wine_glMakeBufferResidentNV( GLenum target, GLenum access ) { LEAVE_GL(); } +static void WINAPI wine_glMakeNamedBufferNonResidentNV( GLuint buffer ) { + void (*func_glMakeNamedBufferNonResidentNV)( GLuint ) = extension_funcs[EXT_glMakeNamedBufferNonResidentNV]; + TRACE("(%d)\n", buffer ); + ENTER_GL(); + func_glMakeNamedBufferNonResidentNV( buffer ); + LEAVE_GL(); +} + +static void WINAPI wine_glMakeNamedBufferResidentNV( GLuint buffer, GLenum access ) { + void (*func_glMakeNamedBufferResidentNV)( GLuint, GLenum ) = extension_funcs[EXT_glMakeNamedBufferResidentNV]; + TRACE("(%d, %d)\n", buffer, access ); + ENTER_GL(); + func_glMakeNamedBufferResidentNV( buffer, access ); + LEAVE_GL(); +} + static GLvoid* WINAPI wine_glMapBuffer( GLenum target, GLenum access ) { GLvoid* ret_value; GLvoid* (*func_glMapBuffer)( GLenum, GLenum ) = extension_funcs[EXT_glMapBuffer]; @@ -9100,22 +9116,6 @@ static void WINAPI wine_glNamedFramebufferTextureLayerEXT( GLuint framebuffer, G LEAVE_GL(); } -static void WINAPI wine_glNamedMakeBufferNonResidentNV( GLuint buffer ) { - void (*func_glNamedMakeBufferNonResidentNV)( GLuint ) = extension_funcs[EXT_glNamedMakeBufferNonResidentNV]; - TRACE("(%d)\n", buffer ); - ENTER_GL(); - func_glNamedMakeBufferNonResidentNV( buffer ); - LEAVE_GL(); -} - -static void WINAPI wine_glNamedMakeBufferResidentNV( GLuint buffer, GLenum access ) { - void (*func_glNamedMakeBufferResidentNV)( GLuint, GLenum ) = extension_funcs[EXT_glNamedMakeBufferResidentNV]; - TRACE("(%d, %d)\n", buffer, access ); - ENTER_GL(); - func_glNamedMakeBufferResidentNV( buffer, access ); - LEAVE_GL(); -} - static void WINAPI wine_glNamedProgramLocalParameter4dEXT( GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w ) { void (*func_glNamedProgramLocalParameter4dEXT)( GLuint, GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble ) = extension_funcs[EXT_glNamedProgramLocalParameter4dEXT]; TRACE("(%d, %d, %d, %f, %f, %f, %f)\n", program, target, index, x, y, z, w ); @@ -15755,6 +15755,8 @@ const OpenGL_extension extension_registry[NB_EXTENSIONS] = { { "glMTexCoord2fvSGIS", "GL_SGIS_multitexture", wine_glMTexCoord2fvSGIS }, { "glMakeBufferNonResidentNV", "GL_NV_shader_buffer_load", wine_glMakeBufferNonResidentNV }, { "glMakeBufferResidentNV", "GL_NV_shader_buffer_load", wine_glMakeBufferResidentNV }, + { "glMakeNamedBufferNonResidentNV", "GL_NV_shader_buffer_load", wine_glMakeNamedBufferNonResidentNV }, + { "glMakeNamedBufferResidentNV", "GL_NV_shader_buffer_load", wine_glMakeNamedBufferResidentNV }, { "glMapBuffer", "GL_VERSION_1_5", wine_glMapBuffer }, { "glMapBufferARB", "GL_ARB_vertex_buffer_object", wine_glMapBufferARB }, { "glMapBufferRange", "GL_ARB_map_buffer_range", wine_glMapBufferRange }, @@ -15945,8 +15947,6 @@ const OpenGL_extension extension_registry[NB_EXTENSIONS] = { { "glNamedFramebufferTextureEXT", "GL_EXT_direct_state_access", wine_glNamedFramebufferTextureEXT }, { "glNamedFramebufferTextureFaceEXT", "GL_EXT_direct_state_access", wine_glNamedFramebufferTextureFaceEXT }, { "glNamedFramebufferTextureLayerEXT", "GL_EXT_direct_state_access", wine_glNamedFramebufferTextureLayerEXT }, - { "glNamedMakeBufferNonResidentNV", "GL_NV_shader_buffer_load", wine_glNamedMakeBufferNonResidentNV }, - { "glNamedMakeBufferResidentNV", "GL_NV_shader_buffer_load", wine_glNamedMakeBufferResidentNV }, { "glNamedProgramLocalParameter4dEXT", "GL_EXT_direct_state_access", wine_glNamedProgramLocalParameter4dEXT }, { "glNamedProgramLocalParameter4dvEXT", "GL_EXT_direct_state_access", wine_glNamedProgramLocalParameter4dvEXT }, { "glNamedProgramLocalParameter4fEXT", "GL_EXT_direct_state_access", wine_glNamedProgramLocalParameter4fEXT },

1 0

Marcus Meissner : windowscodecs: Handle old libpng.so using distros ( as SLE 10).
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 615e0e64f9fa3a910c58af2a382943546d3230a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=615e0e64f9fa3a910c58af2a3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 27 23:13:21 2010 +0100 windowscodecs: Handle old libpng.so using distros (as SLE 10). --- configure | 84 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 5 ++ dlls/windowscodecs/pngformat.c | 12 ++++++ include/config.h.in | 3 + 4 files changed, 104 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5ecb68f..6d98218 100755 --- a/configure +++ b/configure @@ -11060,6 +11060,49 @@ _ACEOF fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_expand_gray_1_2_4_to_8 in -lpng" >&5 +$as_echo_n "checking for png_set_expand_gray_1_2_4_to_8 in -lpng... " >&6; } +if test "${ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng -lm -lz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char png_set_expand_gray_1_2_4_to_8 (); +int +main () +{ +return png_set_expand_gray_1_2_4_to_8 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8=yes +else + ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&5 +$as_echo "$ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&6; } +if test "x$ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" = x""yes; then : + +$as_echo "#define HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 1" >>confdefs.h + + +fi + elif test -n "$X_CFLAGS" -a "x$with_png" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" @@ -11132,6 +11175,47 @@ _ACEOF fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_expand_gray_1_2_4_to_8 in -lpng" >&5 +$as_echo_n "checking for png_set_expand_gray_1_2_4_to_8 in -lpng... " >&6; } +if test "${ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng $X_LIBS -lm -lz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char png_set_expand_gray_1_2_4_to_8 (); +int +main () +{ +return png_set_expand_gray_1_2_4_to_8 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8=yes +else + ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&5 +$as_echo "$ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&6; } +if test "x$ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" = x""yes; then : + $as_echo "#define HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 1" >>confdefs.h + +fi + fi fi if test "x$ac_cv_lib_soname_png" = "x"; then : diff --git a/configure.ac b/configure.ac index 0796200..8eb37a2 100644 --- a/configure.ac +++ b/configure.ac @@ -1420,6 +1420,9 @@ dnl **** Check for libpng **** if test "$ac_cv_header_png_h" = "yes" then WINE_CHECK_SONAME(png,png_create_read_struct,,,-lm -lz,[[libpng[[0-9]]*]]) + AC_CHECK_LIB(png,png_set_expand_gray_1_2_4_to_8, + [AC_DEFINE(HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8,1,[Define to 1 if libpng has the png_set_expand_gray_1_2_4_to_8 function.])] + ,,-lm -lz) elif test -n "$X_CFLAGS" -a "x$with_png" != "xno" then dnl libpng is in the X directory on Mac OS X @@ -1432,6 +1435,8 @@ then then AC_SUBST(PNGINCL,"$X_CFLAGS") WINE_CHECK_SONAME(png,png_create_read_struct,,,[$X_LIBS -lm -lz],[[libpng[[0-9]]*]]) + AC_CHECK_LIB(png,png_set_expand_gray_1_2_4_to_8, + [AC_DEFINE(HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8,1)],,[$X_LIBS -lm -lz]) fi fi WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 482ea90..22b37b0 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -60,7 +60,11 @@ MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); MAKE_FUNCPTR(png_set_error_fn); +#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); +#else +MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); +#endif MAKE_FUNCPTR(png_set_filler); MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_IHDR); @@ -103,7 +107,11 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); LOAD_FUNCPTR(png_set_error_fn); +#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8); +#else + LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); +#endif LOAD_FUNCPTR(png_set_filler); LOAD_FUNCPTR(png_set_gray_to_rgb); LOAD_FUNCPTR(png_set_IHDR); @@ -306,7 +314,11 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p { if (bit_depth < 8) { +#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 ppng_set_expand_gray_1_2_4_to_8(This->png_ptr); +#else + ppng_set_gray_1_2_4_to_8(This->png_ptr); +#endif bit_depth = 8; } ppng_set_gray_to_rgb(This->png_ptr); diff --git a/include/config.h.in b/include/config.h.in index 4e8fcd1..7c34980 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -582,6 +582,9 @@ /* Define to 1 if you have the <png.h> header file. */ #undef HAVE_PNG_H +/* Define to 1 if libpng has the png_set_expand_gray_1_2_4_to_8 function. */ +#undef HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 + /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL

1 0

Alexandre Julliard : winex11: Don' t try to create the owner window if it belongs to a different thread.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 9cd1ce2510536e73cb94dc99ea29a9d189288f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd1ce2510536e73cb94dc99e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 17:06:19 2010 +0100 winex11: Don't try to create the owner window if it belongs to a different thread. --- dlls/winex11.drv/window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1847527..47f7245 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1005,7 +1005,8 @@ static Window get_owner_whole_window( HWND owner ) if (!(data = X11DRV_get_win_data( owner ))) { - if (!(data = X11DRV_create_win_data( owner ))) + if (GetWindowThreadProcessId( owner, NULL ) != GetCurrentThreadId() || + !(data = X11DRV_create_win_data( owner ))) return (Window)GetPropA( owner, whole_window_prop ); } else if (!data->managed) /* make it managed */

1 0

Paul Chitescu : qedit: A full format is required when connecting either pin of the SampleGrabber.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 1d39e74c7aee86b8a142c0625e406504f9b47640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d39e74c7aee86b8a142c0625… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Mon Mar 1 09:57:40 2010 -0800 qedit: A full format is required when connecting either pin of the SampleGrabber. --- dlls/qedit/samplegrabber.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index b4912eb..d09d554 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1014,6 +1014,10 @@ SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE } else type = &This->sg->mtype; + if (!IsEqualGUID(&type->formattype, &FORMAT_None) && + !IsEqualGUID(&type->formattype, &GUID_NULL) && + !type->pbFormat) + return VFW_E_TYPE_NOT_ACCEPTED; hr = IPin_ReceiveConnection(receiver,(IPin*)&This->lpVtbl,type); if (FAILED(hr)) return hr; @@ -1054,6 +1058,10 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M !IsEqualGUID(&This->sg->mtype.formattype,&FORMAT_None) && !IsEqualGUID(&This->sg->mtype.formattype,&type->formattype)) return VFW_E_TYPE_NOT_ACCEPTED; + if (!IsEqualGUID(&type->formattype, &FORMAT_None) && + !IsEqualGUID(&type->formattype, &GUID_NULL) && + !type->pbFormat) + return VFW_E_TYPE_NOT_ACCEPTED; if (This->sg->mtype.pbFormat) CoTaskMemFree(This->sg->mtype.pbFormat); This->sg->mtype = *type;

1 0

Roderick Colenbrander : wined3d: Fix multisampling on cards without 32-bit RGB fbconfigs.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: ccea415c77b0e3b5ad93d90ad80cbab5132b3b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccea415c77b0e3b5ad93d90ad… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 1 17:32:53 2010 +0100 wined3d: Fix multisampling on cards without 32-bit RGB fbconfigs. --- dlls/wined3d/directx.c | 26 ++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 41d63b7..457cb85 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2702,7 +2702,10 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, U continue; if(cfgs[i].blueSize != blueSize) continue; - if(cfgs[i].alphaSize != alphaSize) + /* Not all drivers report alpha-less formats since they use 32-bit anyway, so accept alpha even if we didn't ask for it. */ + if(alphaSize && cfgs[i].alphaSize != alphaSize) + continue; + if(cfgs[i].colorSize != (glDesc->byte_count << 3)) continue; TRACE("Found iPixelFormat=%d to support MultiSampleType=%d for format %s\n", cfgs[i].iPixelFormat, MultiSampleType, debug_d3dformat(SurfaceFormat)); @@ -4772,8 +4775,8 @@ BOOL InitAdapters(IWineD3DImpl *This) if (gl_info->supported[WGL_ARB_PIXEL_FORMAT]) { int attribute; - int attribs[10]; - int values[10]; + int attribs[11]; + int values[11]; int nAttribs = 0; attribute = WGL_NUMBER_PIXEL_FORMATS_ARB; @@ -4785,6 +4788,7 @@ BOOL InitAdapters(IWineD3DImpl *This) attribs[nAttribs++] = WGL_GREEN_BITS_ARB; attribs[nAttribs++] = WGL_BLUE_BITS_ARB; attribs[nAttribs++] = WGL_ALPHA_BITS_ARB; + attribs[nAttribs++] = WGL_COLOR_BITS_ARB; attribs[nAttribs++] = WGL_DEPTH_BITS_ARB; attribs[nAttribs++] = WGL_STENCIL_BITS_ARB; attribs[nAttribs++] = WGL_DRAW_TO_WINDOW_ARB; @@ -4805,12 +4809,13 @@ BOOL InitAdapters(IWineD3DImpl *This) cfgs->greenSize = values[1]; cfgs->blueSize = values[2]; cfgs->alphaSize = values[3]; - cfgs->depthSize = values[4]; - cfgs->stencilSize = values[5]; - cfgs->windowDrawable = values[6]; - cfgs->iPixelType = values[7]; - cfgs->doubleBuffer = values[8]; - cfgs->auxBuffers = values[9]; + cfgs->colorSize = values[4]; + cfgs->depthSize = values[5]; + cfgs->stencilSize = values[6]; + cfgs->windowDrawable = values[7]; + cfgs->iPixelType = values[8]; + cfgs->doubleBuffer = values[9]; + cfgs->auxBuffers = values[10]; cfgs->pbufferDrawable = FALSE; /* Check for pbuffer support when it is around as @@ -4837,7 +4842,7 @@ BOOL InitAdapters(IWineD3DImpl *This) } } - TRACE("iPixelFormat=%d, iPixelType=%#x, doubleBuffer=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d, windowDrawable=%d, pbufferDrawable=%d\n", cfgs->iPixelFormat, cfgs->iPixelType, cfgs->doubleBuffer, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->windowDrawable, cfgs->pbufferDrawable); + TRACE("iPixelFormat=%d, iPixelType=%#x, doubleBuffer=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d, samples=%d, windowDrawable=%d, pbufferDrawable=%d\n", cfgs->iPixelFormat, cfgs->iPixelType, cfgs->doubleBuffer, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->numSamples, cfgs->windowDrawable, cfgs->pbufferDrawable); cfgs++; } } @@ -4871,6 +4876,7 @@ BOOL InitAdapters(IWineD3DImpl *This) cfgs->greenSize = ppfd.cGreenBits; cfgs->blueSize = ppfd.cBlueBits; cfgs->alphaSize = ppfd.cAlphaBits; + cfgs->colorSize = ppfd.cColorBits; cfgs->depthSize = ppfd.cDepthBits; cfgs->stencilSize = ppfd.cStencilBits; cfgs->pbufferDrawable = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a51ea54..0b0e25c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1238,7 +1238,7 @@ typedef struct WineD3D_PixelFormat { int iPixelFormat; /* WGL pixel format */ int iPixelType; /* WGL pixel type e.g. WGL_TYPE_RGBA_ARB, WGL_TYPE_RGBA_FLOAT_ARB or WGL_TYPE_COLORINDEX_ARB */ - int redSize, greenSize, blueSize, alphaSize; + int redSize, greenSize, blueSize, alphaSize, colorSize; int depthSize, stencilSize; BOOL windowDrawable; BOOL pbufferDrawable;

1 0