August 2007 - Wine-Commits - list.winehq.org

Francois Gouget : wininet: Add a skeleton winineti. h header with fixed prototypes for [GS]etUrlCacheConfigInfo*(), DeleteIE3Cache() and IsUrlCacheEntryExpired*().
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: f33abb6d9615b54910d9f3ab4c367656c5eefea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33abb6d9615b54910d9f3ab4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 10:38:07 2007 +0200 wininet: Add a skeleton winineti.h header with fixed prototypes for [GS]etUrlCacheConfigInfo*(), DeleteIE3Cache() and IsUrlCacheEntryExpired*(). Remove SetUrlCacheConfigInfo*() from wininet.h, it's supposed to be declared in winineti.h. Update win32.api to fix the winapi_check warnings. --- dlls/wininet/internet.c | 5 +- dlls/wininet/urlcache.c | 31 +++++++------- include/Makefile.in | 1 + include/wininet.h | 4 -- include/winineti.h | 108 +++++++++++++++++++++++++++++++++++++++++++++++ tools/winapi/win32.api | 8 ++-- 6 files changed, 131 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f33abb6d9615b54910d9f…

1 0

Francois Gouget : wininet: #undef some macros to avoid a conflict between openssl/ssl.h and wincrypt. h.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: 36d98a32ebeda35ad90aee05cd501fc37235cddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d98a32ebeda35ad90aee05c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 10:36:29 2007 +0200 wininet: #undef some macros to avoid a conflict between openssl/ssl.h and wincrypt.h. --- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 4 ++++ dlls/wininet/netconnection.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b6a29a5..e561228 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -58,6 +58,7 @@ #include "winerror.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" +#include "wincrypt.h" #include "wine/exception.h" @@ -65,7 +66,6 @@ #include "resource.h" #include "wine/unicode.h" -#include "wincrypt.h" WINE_DEFAULT_DEBUG_CHANNEL(wininet); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 76d98f1..6101aca 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -40,6 +40,10 @@ #ifdef HAVE_OPENSSL_SSL_H #define DSA __ssl_DSA /* avoid conflict with commctrl.h */ #undef FAR +/* avoid conflict with wincrypt.h */ +#undef PKCS7_SIGNER_INFO +#undef X509_NAME +#undef X509_CERT_PAIR # include <openssl/ssl.h> #undef FAR #define FAR do_not_use_this_in_wine diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index eca9a8c..40f3a22 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -47,6 +47,7 @@ #include "winbase.h" #include "wininet.h" #include "winerror.h" +#include "wincrypt.h" /* To avoid conflicts with the Unix socket headers. we only need it for * the error codes anyway. */ @@ -55,7 +56,6 @@ #include "wine/debug.h" #include "internet.h" -#include "wincrypt.h" #define RESPONSE_TIMEOUT 30 /* FROM internet.c */

1 0

Roderick Colenbrander : wined3d: Better pixelformat selection code.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: 4647cbb6258a9874dfbb572956a434ecc4e5c345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4647cbb6258a9874dfbb57295… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Aug 9 01:04:30 2007 +0200 wined3d: Better pixelformat selection code. --- dlls/wined3d/context.c | 13 +++ dlls/wined3d/utils.c | 207 ++++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 + 3 files changed, 162 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4647cbb6258a9874dfbb5…

1 0

Francois Gouget : advapi32: Add a prototype for RegDeleteKeyValue*().
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: e1987a524fead9f9dbeacedc85801ebb814e16d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1987a524fead9f9dbeacedc8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 9 10:32:35 2007 +0200 advapi32: Add a prototype for RegDeleteKeyValue*(). --- include/winreg.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winreg.h b/include/winreg.h index 9d246c2..ac8f570 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -155,6 +155,9 @@ LONG WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY); LONG WINAPI RegDeleteKeyA(HKEY,LPCSTR); LONG WINAPI RegDeleteKeyW(HKEY,LPCWSTR); #define RegDeleteKey WINELIB_NAME_AW(RegDeleteKey) +LONG WINAPI RegDeleteKeyValueA(HKEY,LPCSTR,LPCSTR); +LONG WINAPI RegDeleteKeyValueW(HKEY,LPCWSTR,LPCWSTR); +#define RegDeleteKeyValue WINELIB_NAME_AW(RegDeleteKeyValue) LONG WINAPI RegDeleteTreeA(HKEY,LPCSTR); LONG WINAPI RegDeleteTreeW(HKEY,LPCWSTR); #define RegDeleteTree WINELIB_NAME_AW(RegDeleteTree)

1 0

Roderick Colenbrander : wgl: Correctly check GLX capabilities. Use client GLX extensions on ATI hardware to work around driver bugs.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: ae98679ebee2597c8799e6acc944c08eebfc70b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae98679ebee2597c8799e6acc… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 8 16:40:34 2007 +0200 wgl: Correctly check GLX capabilities. Use client GLX extensions on ATI hardware to work around driver bugs. --- dlls/winex11.drv/opengl.c | 94 +++++++++++++++++++++++--------------------- 1 files changed, 49 insertions(+), 45 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ca3c50a..a63ba27 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -82,9 +82,11 @@ struct WineGLInfo { int glxVersion[2]; const char *glxServerVersion; + const char *glxServerVendor; const char *glxServerExtensions; const char *glxClientVersion; + const char *glxClientVendor; const char *glxClientExtensions; const char *glxExtensions; @@ -148,6 +150,8 @@ static WineGLPixelFormat *WineGLPixelFormatList; static int WineGLPixelFormatListSize = 0; static void X11DRV_WineGL_LoadExtensions(void); +static BOOL glxRequireVersion(int requiredVersion); +static BOOL glxRequireExtension(const char *requiredExtension); static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { TRACE(" - size / version : %d / %d\n", ppfd->nSize, ppfd->nVersion); @@ -318,9 +322,11 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) pglXQueryVersion(gdi_display, &WineGLInfo.glxVersion[0], &WineGLInfo.glxVersion[1]); WineGLInfo.glxServerVersion = pglXQueryServerString(gdi_display, screen, GLX_VERSION); + WineGLInfo.glxServerVendor = pglXQueryServerString(gdi_display, screen, GLX_VENDOR); WineGLInfo.glxServerExtensions = pglXQueryServerString(gdi_display, screen, GLX_EXTENSIONS); WineGLInfo.glxClientVersion = pglXGetClientString(gdi_display, GLX_VERSION); + WineGLInfo.glxClientVendor = pglXGetClientString(gdi_display, GLX_VENDOR); WineGLInfo.glxClientExtensions = pglXGetClientString(gdi_display, GLX_EXTENSIONS); WineGLInfo.glxExtensions = pglXQueryExtensionsString(gdi_display, screen); @@ -330,9 +336,9 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) TRACE("GL renderer : %s.\n", pglGetString(GL_RENDERER)); TRACE("GLX version : %d.%d.\n", WineGLInfo.glxVersion[0], WineGLInfo.glxVersion[1]); TRACE("Server GLX version : %s.\n", WineGLInfo.glxServerVersion); - TRACE("Server GLX vendor: : %s.\n", pglXQueryServerString(gdi_display, screen, GLX_VENDOR)); + TRACE("Server GLX vendor: : %s.\n", WineGLInfo.glxServerVendor); TRACE("Client GLX version : %s.\n", WineGLInfo.glxClientVersion); - TRACE("Client GLX vendor: : %s.\n", pglXGetClientString(gdi_display, GLX_VENDOR)); + TRACE("Client GLX vendor: : %s.\n", WineGLInfo.glxClientVendor); TRACE("Direct rendering enabled: %s\n", WineGLInfo.glxDirect ? "True" : "False"); if(vis) XFree(vis); @@ -348,7 +354,6 @@ static BOOL has_opengl(void) { static int init_done; static void *opengl_handle; - const char *glx_extensions; int error_base, event_base; @@ -449,55 +454,54 @@ LOAD_FUNCPTR(glXFreeMemoryNV) * depends on the reported GLX client / server version and on the client / server extension list. * Those don't have to be the same. * - * In general the server GLX information should be used in case of indirect rendering. When direct - * rendering is used, the OpenGL client library is responsible for which GLX calls are available. - * Nvidia's OpenGL drivers are the best in terms of GLX features. At the moment of writing their - * 8762 drivers support 1.3 for the server and 1.4 for the client and they support lots of extensions. - * Unfortunately it is much more complicated for Mesa/DRI-based drivers and ATI's drivers. - * Both sets of drivers report a server version of 1.2 and the client version can be 1.3 or 1.4. - * Further, in case of at least ATI's drivers, one crucial extension needed for our pixel format code - * is only available in the list of server extensions and not in the client list. + * In general the server GLX information lists the capabilities in case of indirect rendering. + * When direct rendering is used, the OpenGL client library is responsible for which GLX calls are + * available and in that case the client GLX informat can be used. + * OpenGL programs should use the 'intersection' of both sets of information which is advertised + * in the GLX version/extension list. When a program does this it works for certain for both + * direct and indirect rendering. * - * The versioning checks below try to take into account the comments from above. + * The problem we are having in this area is that ATI's Linux drivers are broken. For some reason + * they haven't added some very important GLX extensions like GLX_SGIX_fbconfig to their client + * extension list which causes this extension not to be listed. (Wine requires this extension). + * ATI advertises a GLX client version of 1.3 which implies that this fbconfig extension among + * pbuffers is around. + * + * In order to provide users of Ati's proprietary drivers with OpenGL support, we need to detect + * the ATI drivers and from then on use GLX client information for them. */ - /* Depending on the use of direct or indirect rendering we need either the list of extensions - * exported by the client or by the server. - */ - if(WineGLInfo.glxDirect) - glx_extensions = WineGLInfo.glxClientExtensions; - else - glx_extensions = WineGLInfo.glxServerExtensions; - - /* Based on the default opengl context we decide whether direct or indirect rendering is used. - * In case of indirect rendering we check if the GLX version of the server is 1.2 and else - * the client version is checked. - */ - if ((!WineGLInfo.glxDirect && !strcmp("1.2", WineGLInfo.glxServerVersion)) || - (WineGLInfo.glxDirect && !strcmp("1.2", WineGLInfo.glxClientVersion))) - { - if (NULL != strstr(glx_extensions, "GLX_SGIX_fbconfig")) { - pglXChooseFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfigSGIX"); - pglXGetFBConfigAttrib = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttribSGIX"); - pglXGetVisualFromFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfigSGIX"); - } else { - ERR(" glx_version is %s and GLX_SGIX_fbconfig extension is unsupported. Expect problems.\n", WineGLInfo.glxClientVersion); - } - } else { + if(glxRequireVersion(3)) { pglXChooseFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfig"); pglXGetFBConfigAttrib = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttrib"); pglXGetVisualFromFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfig"); - } - - /* The mesa libGL client library seems to forward glXQueryDrawable to the Xserver, so only - * enable this function when the Xserver understand GLX 1.3 or newer - */ - if (!strcmp("1.2", WineGLInfo.glxServerVersion)) + pglXQueryDrawable = (void*)pglXGetProcAddressARB((const GLubyte *) "glXQueryDrawable"); + } else if(glxRequireExtension("GLX_SGIX_fbconfig")) { + pglXChooseFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfigSGIX"); + pglXGetFBConfigAttrib = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttribSGIX"); + pglXGetVisualFromFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfigSGIX"); + + /* The mesa libGL client library seems to forward glXQueryDrawable to the Xserver, so only + * enable this function when the Xserver understand GLX 1.3 or newer + */ pglXQueryDrawable = NULL; - else - pglXQueryDrawable = wine_dlsym(RTLD_DEFAULT, "glXQueryDrawable", NULL, 0); + } else if(strcmp("ATI", WineGLInfo.glxClientVendor) == 0) { + TRACE("Overriding ATI GLX capabilities!\n"); + pglXChooseFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfig"); + pglXGetFBConfigAttrib = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttrib"); + pglXGetVisualFromFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfig"); + pglXQueryDrawable = (void*)pglXGetProcAddressARB((const GLubyte *) "glXQueryDrawable"); + + /* Use client GLX information in case of the ATI drivers. We override the + * capabilities over here and not somewhere else as ATI might better their + * life in the future. In case they release proper drivers this block of + * code won't be called. */ + WineGLInfo.glxExtensions = WineGLInfo.glxClientExtensions; + } else { + ERR(" glx_version is %s and GLX_SGIX_fbconfig extension is unsupported. Expect problems.\n", WineGLInfo.glxServerVersion); + } - if (NULL != strstr(glx_extensions, "GLX_ATI_render_texture")) { + if(glxRequireExtension("GLX_ATI_render_texture")) { pglXBindTexImageARB = (void*)pglXGetProcAddressARB((const GLubyte *) "glXBindTexImageARB"); pglXReleaseTexImageARB = (void*)pglXGetProcAddressARB((const GLubyte *) "glXReleaseTexImageARB"); pglXDrawableAttribARB = (void*)pglXGetProcAddressARB((const GLubyte *) "glXDrawableAttribARB"); @@ -2915,7 +2919,7 @@ static BOOL glxRequireVersion(int requiredVersion) static BOOL glxRequireExtension(const char *requiredExtension) { - if (strstr(WineGLInfo.glxClientExtensions, requiredExtension) == NULL) { + if (strstr(WineGLInfo.glxExtensions, requiredExtension) == NULL) { return FALSE; }

1 0

Roderick Colenbrander : wgl: Rewrite ChoosePixelFormat.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: dee2fc09f5fc68097634dec89910d3667eafa4f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee2fc09f5fc68097634dec89… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Aug 9 01:17:07 2007 +0200 wgl: Rewrite ChoosePixelFormat. --- dlls/winex11.drv/opengl.c | 239 +++++++++++++++++++++++++++++--------------- 1 files changed, 157 insertions(+), 82 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a63ba27..0881198 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1009,105 +1009,180 @@ static int ConvertPixelFormatGLXtoWGL(Display *display, int fmt_id) */ int X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev, const PIXELFORMATDESCRIPTOR *ppfd) { - WineGLPixelFormat *fmt; - int ret = 0; - int value = 0; + WineGLPixelFormat *fmt = NULL; + int ret = 0; + int nPixelFormats; + int value = 0; + int i = 0; + int bestFormat = -1; + int bestColor = -1; + int bestAlpha = -1; + int bestDepth = -1; + int bestStencil = -1; + int bestAux = -1; + int score; - if (!has_opengl()) { - ERR("No libGL on this box - disabling OpenGL support !\n"); - return 0; - } + if (!has_opengl()) { + ERR("No libGL on this box - disabling OpenGL support !\n"); + return 0; + } - if (TRACE_ON(opengl)) { - TRACE("(%p,%p)\n", physDev, ppfd); + if (TRACE_ON(opengl)) { + TRACE("(%p,%p)\n", physDev, ppfd); - dump_PIXELFORMATDESCRIPTOR((const PIXELFORMATDESCRIPTOR *) ppfd); - } + dump_PIXELFORMATDESCRIPTOR((const PIXELFORMATDESCRIPTOR *) ppfd); + } - wine_tsx11_lock(); - if(!visual) { - ERR("Can't get an opengl visual!\n"); - goto choose_exit; - } + wine_tsx11_lock(); + ConvertPixelFormatWGLtoGLX(gdi_display, 0, FALSE /* offscreen */, &nPixelFormats); + for(i=0; i<nPixelFormats; i++) + { + int dwFlags = 0; + int iPixelType = 0; + int alpha=0, color=0, depth=0, stencil=0, aux=0; - fmt = ConvertPixelFormatWGLtoGLX(gdi_display, 1 /* main visual */, FALSE /* offscreen */, &value); - /* In case an fbconfig was found, check if it matches to the requirements of the ppfd */ - if(!fmt) { - ERR("Can't find a matching FBCONFIG_ID for VISUAL_ID 0x%lx!\n", visual->visualid); - } else { - int dwFlags = 0; - int iPixelType = 0; - int value = 0; + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, i+1 /* 1-based index */, FALSE /* offscreen */, &value); + score = 0; - /* Pixel type */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_RENDER_TYPE, &value); - if (value & GLX_RGBA_BIT) - iPixelType = PFD_TYPE_RGBA; - else - iPixelType = PFD_TYPE_COLORINDEX; + /* Pixel type */ + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_RENDER_TYPE, &value); + if (value & GLX_RGBA_BIT) + iPixelType = PFD_TYPE_RGBA; + else + iPixelType = PFD_TYPE_COLORINDEX; - if (ppfd->iPixelType != iPixelType) { - TRACE("pixel type mismatch\n"); - goto choose_exit; - } + if (ppfd->iPixelType != iPixelType) + { + TRACE("pixel type mismatch for iPixelFormat=%d\n", i+1); + continue; + } - /* Doublebuffer */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DOUBLEBUFFER, &value); if (value) dwFlags |= PFD_DOUBLEBUFFER; - if (!(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE) && (ppfd->dwFlags & PFD_DOUBLEBUFFER)) { - if (!(dwFlags & PFD_DOUBLEBUFFER)) { - TRACE("dbl buffer mismatch\n"); - goto choose_exit; - } - } + /* Doublebuffer: + * Ignore doublebuffer when PFD_DOUBLEBUFFER_DONTCARE is set. Further if the flag + * is not set, we must return a format without double buffering. */ + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DOUBLEBUFFER, &value); + if (value) dwFlags |= PFD_DOUBLEBUFFER; + if (!(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE) && ((ppfd->dwFlags^dwFlags) & PFD_DOUBLEBUFFER)) + { + TRACE("dbl buffer mismatch for iPixelFormat=%d\n", i+1); + continue; + } - /* Stereo */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_STEREO, &value); if (value) dwFlags |= PFD_STEREO; - if (!(ppfd->dwFlags & PFD_STEREO_DONTCARE) && (ppfd->dwFlags & PFD_STEREO)) { - if (!(dwFlags & PFD_STEREO)) { - TRACE("stereo mismatch\n"); - goto choose_exit; - } - } + /* Stereo: + * Ignore stereo when PFD_STEREO_DONTCARE is set. Further if the flag + * is not set, we must return a format without stereo support. */ + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_STEREO, &value); + if (value) dwFlags |= PFD_STEREO; + if (!(ppfd->dwFlags & PFD_STEREO_DONTCARE) && ((ppfd->dwFlags^dwFlags) & PFD_STEREO)) + { + TRACE("stereo mismatch for iPixelFormat=%d\n", i+1); + continue; + } - /* Alpha bits */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ALPHA_SIZE, &value); - if (ppfd->iPixelType==PFD_TYPE_RGBA && ppfd->cAlphaBits && !value) { - TRACE("alpha mismatch\n"); - goto choose_exit; - } + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_BUFFER_SIZE, &color); /* cColorBits */ + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ALPHA_SIZE, &alpha); /* cAlphaBits */ + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DEPTH_SIZE, &depth); /* cDepthBits */ + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_STENCIL_SIZE, &stencil); /* cStencilBits */ + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_AUX_BUFFERS, &aux); /* cAuxBuffers */ - /* Depth bits */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DEPTH_SIZE, &value); - if (ppfd->cDepthBits && !value) { - TRACE("depth mismatch\n"); - goto choose_exit; - } + /* Below we will do a number of checks to select the 'best' pixelformat. + * We assume the precedence cColorBits > cAlphaBits > cDepthBits > cStencilBits -> cAuxBuffers. + * The code works by trying to match the most important options as close as possible. + * When a reasonable format is found, we will try to match more options. */ - /* Stencil bits */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_STENCIL_SIZE, &value); - if (ppfd->cStencilBits && !value) { - TRACE("stencil mismatch\n"); - goto choose_exit; - } + /* Color bits */ + if( ((ppfd->cColorBits > bestColor) && (color > bestColor)) || + ((color >= ppfd->cColorBits) && (color < bestColor)) ) + { + bestAlpha = alpha; + bestColor = color; + bestDepth = depth; + bestStencil = stencil; + bestAux = aux; + bestFormat = i; + continue; + } else if(bestColor != color) { /* Do further checks if the format is compatible */ + TRACE("color mismatch for iPixelFormat=%d\n", i+1); + continue; + } + + /* Alpha bits */ + if( ((ppfd->cAlphaBits > bestAlpha) && (alpha > bestAlpha)) || + ((alpha >= ppfd->cAlphaBits) && (alpha < bestAlpha)) ) + { + bestAlpha = alpha; + bestColor = color; + bestDepth = depth; + bestStencil = stencil; + bestAux = aux; + bestFormat = i; + continue; + } else if(bestAlpha != alpha) { + TRACE("alpha mismatch for iPixelFormat=%d\n", i+1); + continue; + } + + /* Depth bits */ + if( ((ppfd->cDepthBits > bestDepth) && (depth > bestDepth)) || + ((depth >= ppfd->cDepthBits) && (depth < bestDepth)) ) + { + bestAlpha = alpha; + bestColor = color; + bestDepth = depth; + bestStencil = stencil; + bestAux = aux; + bestFormat = i; + continue; + } else if(bestDepth != depth) { + TRACE("depth mismatch for iPixelFormat=%d\n", i+1); + continue; + } - /* Aux buffers */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_AUX_BUFFERS, &value); - if (ppfd->cAuxBuffers && !value) { - TRACE("aux mismatch\n"); - goto choose_exit; + /* Stencil bits */ + if( ((ppfd->cStencilBits > bestStencil) && (stencil > bestStencil)) || + ((stencil >= ppfd->cStencilBits) && (stencil < bestStencil)) ) + { + bestAlpha = alpha; + bestColor = color; + bestDepth = depth; + bestStencil = stencil; + bestAux = aux; + bestFormat = i; + continue; + } else if(bestStencil != stencil) { + TRACE("stencil mismatch for iPixelFormat=%d\n", i+1); + continue; + } + + /* Aux buffers */ + if( ((ppfd->cAuxBuffers > bestAux) && (aux > bestAux)) || + ((aux >= ppfd->cAuxBuffers) && (aux < bestAux)) ) + { + bestAlpha = alpha; + bestColor = color; + bestDepth = depth; + bestStencil = stencil; + bestAux = aux; + bestFormat = i; + continue; + } else if(bestAux != aux) { + TRACE("aux mismatch for iPixelFormat=%d\n", i+1); + continue; + } } - /* When we pass all the checks we have found a matching format :) */ - ret = 1; - TRACE("Successfully found a matching mode, returning index: %d\n", ret); - } + if(bestFormat == -1) { + TRACE("No matching mode was found returning 0\n"); + ret = 0; + } + else { + ret = bestFormat+1; /* the return value should be a 1-based index */ + TRACE("Successfully found a matching mode, returning index: %d %x\n", ret, WineGLPixelFormatList[bestFormat-1].fmt_id); + } -choose_exit: - if(!ret) - TRACE("No matching mode was found returning 0\n"); + wine_tsx11_unlock(); - wine_tsx11_unlock(); - return ret; + return ret; } /**

1 0

James Hawkins : msi: Simplify MsiQueryComponentState, with more tests.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: 511bdd9de8ceade99951d227060ad7fc417a9315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=511bdd9de8ceade99951d2270… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Aug 8 18:42:30 2007 -0700 msi: Simplify MsiQueryComponentState, with more tests. --- dlls/msi/msi.c | 116 +++++++++++++++++++++++++++++++++------------- dlls/msi/msipriv.h | 2 + dlls/msi/registry.c | 64 +++++++++++++++++++++++++ dlls/msi/tests/install.c | 15 ++---- dlls/msi/tests/msi.c | 82 ++++++++++++++++++++++++++++++++- 5 files changed, 236 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=511bdd9de8ceade99951d…

1 0

Misha Koshelev : urlmon/tests: Call CHECK_CALLED(OnProgress_SENDINGREQUEST) for FILE_TEST since we SET_EXPECT it.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: 369273e991829f225f4eca1faa1647ed86b8b393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369273e991829f225f4eca1fa… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Aug 8 20:26:15 2007 -0500 urlmon/tests: Call CHECK_CALLED(OnProgress_SENDINGREQUEST) for FILE_TEST since we SET_EXPECT it. --- dlls/urlmon/tests/url.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 1f7415e..532de7e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -912,9 +912,11 @@ static void test_BindToStorage(int protocol, BOOL emul) CHECK_NOT_CALLED(OnProgress_FINDINGRESOURCE); CHECK_NOT_CALLED(OnProgress_CONNECTING); } + } + if(test_protocol == HTTP_TEST || test_protocol == FILE_TEST) CHECK_CALLED(OnProgress_SENDINGREQUEST); + if(test_protocol == HTTP_TEST) CHECK_CALLED(OnResponse); - } CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); if(test_protocol == HTTP_TEST)

1 0

Misha Koshelev : urlmon: Do not use BindToStorage_hack for INTERNET_SCHEME_HTTP.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: 42dea36e5aad11f7ac51052eeee2c5a1994e3a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42dea36e5aad11f7ac51052ee… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Aug 8 20:24:57 2007 -0500 urlmon: Do not use BindToStorage_hack for INTERNET_SCHEME_HTTP. --- dlls/urlmon/tests/url.c | 20 ++++++-------------- dlls/urlmon/umon.c | 9 +-------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index f94edd8..1f7415e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -641,12 +641,9 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR download_state); data_available = TRUE; - if (0) - { - /* FIXME: Uncomment after removing BindToStorage hack. */ ok(pformatetc != NULL, "pformatetx == NULL\n"); if(pformatetc) { - if (mime_type[0]) { + if (mime_type[0]) todo_wine { clipfmt[0] = 0; ok(GetClipboardFormatName(pformatetc->cfFormat, clipfmt, sizeof(clipfmt)-1), "GetClipboardFormatName failed, error %d\n", GetLastError()); @@ -667,7 +664,6 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR ok(U(*pstgmed).pstm != NULL, "pstm == NULL\n"); ok(pstgmed->pUnkForRelease != NULL, "pUnkForRelease == NULL\n"); } - } if(U(*pstgmed).pstm) { do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); @@ -895,17 +891,16 @@ static void test_BindToStorage(int protocol, BOOL emul) DispatchMessage(&msg); } + todo_wine CHECK_NOT_CALLED(QueryInterface_IServiceProvider); CHECK_CALLED(GetBindInfo); CHECK_CALLED(OnStartBinding); if(emulate_protocol) { - todo_wine CHECK_NOT_CALLED(QueryInterface_IServiceProvider); CHECK_CALLED(Start); CHECK_CALLED(UnlockRequest); }else { if(test_protocol == HTTP_TEST) { - CHECK_NOT_CALLED(QueryInterface_IServiceProvider); - todo_wine CHECK_CALLED(QueryInterface_IHttpNegotiate); - todo_wine CHECK_CALLED(BeginningTransaction); + CHECK_CALLED(QueryInterface_IHttpNegotiate); + CHECK_CALLED(BeginningTransaction); /* QueryInterface_IHttpNegotiate2 and GetRootSecurityId * called on WinXP but not on Win98 */ CLEAR_CALLED(QueryInterface_IHttpNegotiate2); @@ -918,12 +913,9 @@ static void test_BindToStorage(int protocol, BOOL emul) CHECK_NOT_CALLED(OnProgress_CONNECTING); } CHECK_CALLED(OnProgress_SENDINGREQUEST); - todo_wine CHECK_CALLED(OnResponse); - todo_wine { CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); } - }else { - todo_wine CHECK_NOT_CALLED(QueryInterface_IServiceProvider); - CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); + CHECK_CALLED(OnResponse); } + CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); if(test_protocol == HTTP_TEST) CLEAR_CALLED(OnProgress_DOWNLOADINGDATA); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index b8c6bfe..c301d89 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -617,12 +617,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, dwService = INTERNET_SERVICE_GOPHER; break; - case INTERNET_SCHEME_HTTP: - if (!url.nPort) - url.nPort = INTERNET_DEFAULT_HTTP_PORT; - dwService = INTERNET_SERVICE_HTTP; - break; - case INTERNET_SCHEME_HTTPS: if (!url.nPort) url.nPort = INTERNET_DEFAULT_HTTPS_PORT; @@ -755,8 +749,7 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, return E_FAIL; } - if(url.nScheme == INTERNET_SCHEME_HTTP - || url.nScheme== INTERNET_SCHEME_HTTPS + if(url.nScheme== INTERNET_SCHEME_HTTPS || url.nScheme== INTERNET_SCHEME_FTP || url.nScheme == INTERNET_SCHEME_GOPHER) return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, pmkToLeft, riid, ppvObject);

1 0

Misha Koshelev : urlmon/tests: Fix clipformat test.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: a893bb32d69f03071fdf183de6c9c9a39b457c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a893bb32d69f03071fdf183de… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Aug 8 20:24:13 2007 -0500 urlmon/tests: Fix clipformat test. --- dlls/urlmon/tests/url.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 031d76f..f94edd8 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -111,6 +111,7 @@ static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static BOOL stopped_binding = FALSE, emulate_protocol = FALSE, data_available = FALSE, http_is_first = TRUE; static DWORD read = 0, bindf = 0; +static CHAR mime_type[512]; static LPCWSTR urls[] = { WINE_ABOUT_URL, @@ -561,6 +562,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP CHECK_EXPECT(OnProgress_MIMETYPEAVAILABLE); ok(download_state == BEFORE_DOWNLOAD, "Download state was %d, expected BEFORE_DOWNLOAD\n", download_state); + WideCharToMultiByte(CP_ACP, 0, szStatusText, -1, mime_type, sizeof(mime_type)-1, NULL, NULL); break; case BINDSTATUS_BEGINDOWNLOADDATA: CHECK_EXPECT(OnProgress_BEGINDOWNLOADDATA); @@ -631,6 +633,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR HRESULT hres; DWORD readed; BYTE buf[512]; + CHAR clipfmt[512]; CHECK_EXPECT2(OnDataAvailable); ok(download_state == DOWNLOADING || download_state == END_DOWNLOAD, @@ -643,7 +646,15 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR /* FIXME: Uncomment after removing BindToStorage hack. */ ok(pformatetc != NULL, "pformatetx == NULL\n"); if(pformatetc) { - ok(pformatetc->cfFormat == 0xc02d, "clipformat=%x\n", pformatetc->cfFormat); + if (mime_type[0]) { + clipfmt[0] = 0; + ok(GetClipboardFormatName(pformatetc->cfFormat, clipfmt, sizeof(clipfmt)-1), + "GetClipboardFormatName failed, error %d\n", GetLastError()); + ok(!lstrcmp(clipfmt, mime_type), "clipformat != mime_type, \"%s\" != \"%s\"\n", + clipfmt, mime_type); + } else { + ok(pformatetc->cfFormat == 0, "clipformat=%x\n", pformatetc->cfFormat); + } ok(pformatetc->ptd == NULL, "ptd = %p\n", pformatetc->ptd); ok(pformatetc->dwAspect == 1, "dwAspect=%u\n", pformatetc->dwAspect); ok(pformatetc->lindex == -1, "lindex=%d\n", pformatetc->lindex); @@ -796,6 +807,7 @@ static void test_BindToStorage(int protocol, BOOL emul) download_state = BEFORE_DOWNLOAD; stopped_binding = FALSE; data_available = FALSE; + mime_type[0] = 0; SET_EXPECT(QueryInterface_IServiceProvider); hres = CreateAsyncBindCtx(0, &bsc, NULL, &bctx);

1 0