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

Vincent Povirk : windowscodecs: Register all formats supported by the BMP decoder.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: 1e0046788fc8621df8bd9d3d3cdc45ff0a913f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0046788fc8621df8bd9d3d3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 13 10:46:43 2009 -0500 windowscodecs: Register all formats supported by the BMP decoder. --- dlls/windowscodecs/regsvr.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index f901315..b6327f3 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -585,8 +585,10 @@ static GUID const * const bmp_formats[] = { &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat16bppBGR555, + &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, + &GUID_WICPixelFormat32bppBGRA, NULL };

1 0

Henri Verbeet : wined3d: Make RTL_READTEX the default rendertarget locking method.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: ecd2dc7603382388665daa83a60fa0e4a5eadb38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd2dc7603382388665daa83a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 14 09:23:25 2009 +0200 wined3d: Make RTL_READTEX the default rendertarget locking method. For most cards this should make more sense than RTL_READDRAW, even if e.g. surface_upload_data() has some room for improvement. --- dlls/wined3d/surface.c | 1 - dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 29ad00d..781a6b2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1518,7 +1518,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */); /* drop through */ - case RTL_AUTO: case RTL_READDRAW: IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, fullsurface ? NULL : &This->dirtyRect); break; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 881f90e..4feb509 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -41,7 +41,7 @@ wined3d_settings_t wined3d_settings = PS_HW, /* Hardware by default */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ - RTL_AUTO, /* Automatically determine best locking method */ + RTL_READTEX, /* Default render target locking method */ PCI_VENDOR_NONE,/* PCI Vendor ID */ PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in FillGLCaps */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8df99f6..5f88afd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -267,7 +267,6 @@ static inline float float_24_to_32(DWORD in) #define SHADER_NONE 4 #define RTL_DISABLE -1 -#define RTL_AUTO 0 #define RTL_READDRAW 1 #define RTL_READTEX 2

1 0

Henri Verbeet : wined3d: Add a separate function for guessing the card.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: 779ad6b9f1f5025dc3298028fa0692f46516b33f URL: http://source.winehq.org/git/wine.git/?a=commit;h=779ad6b9f1f5025dc3298028f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 14 09:23:24 2009 +0200 wined3d: Add a separate function for guessing the card. --- dlls/wined3d/directx.c | 888 +++++++++++++++++++++++++----------------------- 1 files changed, 464 insertions(+), 424 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=779ad6b9f1f5025dc3298…

1 0

Henri Verbeet : wined3d: Add a separate function for guessing the driver version.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: 93218c6602e098e5a91f312aba18668368972bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=93218c6602e098e5a91f312ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 14 09:23:23 2009 +0200 wined3d: Add a separate function for guessing the driver version. Note that I don't necessarily think the ATI path for example will work correctly. This patch is just for moving it out of IWineD3DImpl_FillGLCaps(). --- dlls/wined3d/directx.c | 234 +++++++++++++++++++++--------------------------- 1 files changed, 101 insertions(+), 133 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d8fe791..9e5609d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -964,6 +964,105 @@ static DWORD wined3d_parse_gl_version(const char *gl_version) return MAKEDWORD_VERSION(major, minor); } +static DWORD wined3d_guess_driver_version(const char *gl_version, GL_Vendors vendor) +{ + int major, minor; + const char *ptr; + DWORD ret; + + /* Now parse the driver specific string which we'll report to the app. */ + switch (vendor) + { + case VENDOR_NVIDIA: + ptr = strstr(gl_version, "NVIDIA"); + if (!ptr) return 0; + + ptr = strstr(ptr, " "); + if (!ptr) return 0; + + while (isspace(*ptr)) ++ptr; + if (!*ptr) return 0; + + major = atoi(ptr); + while (isdigit(*ptr)) ++ptr; + + if (*ptr++ != '.') return 0; + + minor = atoi(ptr); + minor = major * 100 + minor; + major = 10; + break; + + case VENDOR_ATI: + major = minor = 0; + + ptr = strchr(gl_version, '-'); + if (!ptr) return 0; + + ++ptr; + + /* Check if version number is of the form x.y.z. */ + if (strlen(ptr) < 5 + || !isdigit(ptr[0]) || ptr[1] != '.' + || !isdigit(ptr[2]) || ptr[3] != '.' + || !isdigit(ptr[4])) + { + return 0; + } + + major = ptr[0] - '0'; + minor = ((ptr[2] - '0') << 8) | (ptr[4] - '0'); + break; + + case VENDOR_INTEL: + /* Apple and Mesa version strings look differently, but both provide intel drivers. */ + if (strstr(gl_version, "APPLE")) + { + /* [0-9]+.[0-9]+ APPLE-[0-9]+.[0.9]+.[0.9]+ + * We only need the first part, and use the APPLE as identification + * "1.2 APPLE-1.4.56". */ + ptr = gl_version; + + major = atoi(ptr); + while (isdigit(*ptr)) ++ptr; + + if (*ptr++ != '.') return 0; + + minor = atoi(ptr); + break; + } + /* Fallthrough */ + + case VENDOR_MESA: + ptr = strstr(gl_version, "Mesa"); + if (!ptr) return 0; + + ptr = strstr(ptr, " "); + if (!ptr) return 0; + + while (isspace(*ptr)) ++ptr; + if (!*ptr) return 0; + + major = atoi(ptr); + while (isdigit(*ptr)) ++ptr; + + if (*ptr++ != '.') return 0; + + minor = atoi(ptr); + break; + + default: + FIXME("Unhandled vendor %#x.\n", vendor); + return 0; + } + + ret = MAKEDWORD_VERSION(major, minor); + TRACE_(d3d_caps)("Found driver version %s -> %d.%d -> 0x%08x.\n", + debugstr_a(gl_version), major, minor, ret); + + return ret; +} + static GL_Vendors wined3d_guess_vendor(const char *gl_vendor, const char *gl_renderer) { if (strstr(gl_vendor, "NVIDIA")) @@ -992,10 +1091,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) const char *GL_Extensions = NULL; const char *WGL_Extensions = NULL; const char *gl_string = NULL; - const char *gl_string_cursor = NULL; GLint gl_max; GLfloat gl_floatv[2]; - int major = 1, minor = 0; unsigned i; HDC hdc; unsigned int vidmem=0; @@ -1045,137 +1142,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) return FALSE; } gl_version = wined3d_parse_gl_version(gl_string); - - /* Now parse the driver specific string which we'll report to the app. */ - switch (gl_info->gl_vendor) - { - case VENDOR_NVIDIA: - gl_string_cursor = strstr(gl_string, "NVIDIA"); - if (!gl_string_cursor) - { - ERR_(d3d_caps)("Invalid nVidia version string: %s.\n", debugstr_a(gl_string)); - break; - } - - gl_string_cursor = strstr(gl_string_cursor, " "); - if (!gl_string_cursor) - { - ERR_(d3d_caps)("Invalid nVidia version string: %s.\n", debugstr_a(gl_string)); - break; - } - - while (*gl_string_cursor == ' ') ++gl_string_cursor; - - if (!*gl_string_cursor) - { - ERR_(d3d_caps)("Invalid nVidia version string: %s.\n", debugstr_a(gl_string)); - break; - } - - major = atoi(gl_string_cursor); - while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') ++gl_string_cursor; - - if (*gl_string_cursor++ != '.') - { - ERR_(d3d_caps)("Invalid nVidia version string: %s.\n", debugstr_a(gl_string)); - break; - } - - minor = atoi(gl_string_cursor); - minor = major * 100 + minor; - major = 10; - break; - - case VENDOR_ATI: - major = minor = 0; - gl_string_cursor = strchr(gl_string, '-'); - if (gl_string_cursor) - { - ++gl_string_cursor; - - /* Check if version number is of the form x.y.z. */ - if (*gl_string_cursor < '0' || *gl_string_cursor > '9' - || gl_string_cursor[1] != '.' - || gl_string_cursor[2] < '0' || gl_string_cursor[2] > '9' - || gl_string_cursor[3] != '.' - || gl_string_cursor[4] < '0' || gl_string_cursor[4] > '9') - /* Mark version number as malformed. */ - gl_string_cursor = 0; - } - - if (!gl_string_cursor) - { - WARN_(d3d_caps)("malformed GL_VERSION (%s).\n", debugstr_a(gl_string)); - } - else - { - major = *gl_string_cursor - '0'; - minor = (gl_string_cursor[2] - '0') * 256 + (gl_string_cursor[4] - '0'); - } - break; - - case VENDOR_INTEL: - /* Apple and Mesa version strings look differently, but both provide intel drivers. */ - if (strstr(gl_string, "APPLE")) - { - /* [0-9]+.[0-9]+ APPLE-[0-9]+.[0.9]+.[0.9]+ - * We only need the first part, and use the APPLE as identification - * "1.2 APPLE-1.4.56". */ - gl_string_cursor = gl_string; - major = atoi(gl_string_cursor); - while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') ++gl_string_cursor; - - if (*gl_string_cursor++ != '.') - { - ERR_(d3d_caps)("Invalid MacOS-Intel version string: %s.\n", debugstr_a(gl_string)); - break; - } - - minor = atoi(gl_string_cursor); - break; - } - /* Fallthrough */ - - case VENDOR_MESA: - gl_string_cursor = strstr(gl_string, "Mesa"); - gl_string_cursor = strstr(gl_string_cursor, " "); - while (*gl_string_cursor && ' ' == *gl_string_cursor) ++gl_string_cursor; - if (*gl_string_cursor) - { - char tmp[16]; - int cursor = 0; - - while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') - { - tmp[cursor++] = *gl_string_cursor; - ++gl_string_cursor; - } - tmp[cursor] = 0; - major = atoi(tmp); - - if (*gl_string_cursor != '.') WARN_(d3d_caps)("malformed GL_VERSION (%s).\n", debugstr_a(gl_string)); - ++gl_string_cursor; - - cursor = 0; - while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') - { - tmp[cursor++] = *gl_string_cursor; - ++gl_string_cursor; - } - tmp[cursor] = 0; - minor = atoi(tmp); - } - break; - - default: - major = 0; - minor = 9; - break; - } - - gl_info->driver_version = MAKEDWORD_VERSION(major, minor); - TRACE_(d3d_caps)("found driver version (%s)->%i.%i->(0x%08x).\n", - debugstr_a(gl_string), major, minor, gl_info->driver_version); + gl_info->driver_version = wined3d_guess_driver_version(gl_string, gl_info->gl_vendor); + if (!gl_info->driver_version) FIXME_(d3d_caps)("Unrecognized GL_VERSION %s.\n", debugstr_a(gl_string)); /* Current Windows drivers have versions like 6.14.... (some older have an earlier version). */ gl_info->driver_version_hipart = MAKEDWORD_VERSION(6, 14);

1 0

Henri Verbeet : wined3d: Add a separate function for parsing the GL version .
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: b94e89dae93f6472a85d537e8232175dbafb6fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94e89dae93f6472a85d537e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 14 09:23:22 2009 +0200 wined3d: Add a separate function for parsing the GL version. --- dlls/wined3d/directx.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c7e2f04..d8fe791 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -946,6 +946,24 @@ static void fixup_extensions(struct wined3d_gl_info *gl_info, const char *gl_ren } } +static DWORD wined3d_parse_gl_version(const char *gl_version) +{ + const char *ptr = gl_version; + int major, minor; + + major = atoi(ptr); + if (major <= 0) ERR_(d3d_caps)("Invalid opengl major version: %d.\n", major); + + while (isdigit(*ptr)) ++ptr; + if (*ptr++ != '.') ERR_(d3d_caps)("Invalid opengl version string: %s.\n", debugstr_a(gl_version)); + + minor = atoi(ptr); + + TRACE_(d3d_caps)("Found OpenGL version: %d.%d.\n", major, minor); + + return MAKEDWORD_VERSION(major, minor); +} + static GL_Vendors wined3d_guess_vendor(const char *gl_vendor, const char *gl_renderer) { if (strstr(gl_vendor, "NVIDIA")) @@ -1026,19 +1044,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) HeapFree(GetProcessHeap(), 0, gl_renderer); return FALSE; } - - /* First, parse the generic opengl version. This is supposed not to be - * convoluted with driver specific information. */ - gl_string_cursor = gl_string; - - major = atoi(gl_string_cursor); - if (major <= 0) ERR_(d3d_caps)("Invalid opengl major version: %d.\n", major); - while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') ++gl_string_cursor; - if (*gl_string_cursor++ != '.') ERR_(d3d_caps)("Invalid opengl version string: %s.\n", debugstr_a(gl_string)); - - minor = atoi(gl_string_cursor); - TRACE_(d3d_caps)("Found OpenGL version: %d.%d.\n", major, minor); - gl_version = MAKEDWORD_VERSION(major, minor); + gl_version = wined3d_parse_gl_version(gl_string); /* Now parse the driver specific string which we'll report to the app. */ switch (gl_info->gl_vendor)

1 0

Henri Verbeet : wined3d: Add a separate function for guessing the vendor.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: a1402e06777ef771ab7bfb63dbb4f744bae4357e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1402e06777ef771ab7bfb63d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 14 09:23:21 2009 +0200 wined3d: Add a separate function for guessing the vendor. --- dlls/wined3d/directx.c | 49 ++++++++++++++++++++++------------------------- 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0876039..c7e2f04 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -946,6 +946,28 @@ static void fixup_extensions(struct wined3d_gl_info *gl_info, const char *gl_ren } } +static GL_Vendors wined3d_guess_vendor(const char *gl_vendor, const char *gl_renderer) +{ + if (strstr(gl_vendor, "NVIDIA")) + return VENDOR_NVIDIA; + + if (strstr(gl_vendor, "ATI")) + return VENDOR_ATI; + + if (strstr(gl_vendor, "Intel(R)") + || strstr(gl_renderer, "Intel(R)") + || strstr(gl_vendor, "Intel Inc.")) + return VENDOR_INTEL; + + if (strstr(gl_vendor, "Mesa") + || strstr(gl_vendor, "Tungsten Graphics, Inc.")) + return VENDOR_MESA; + + FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning VENDOR_WINE.\n", debugstr_a(gl_vendor)); + + return VENDOR_WINE; +} + /* Context activation is done by the caller. */ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) { @@ -992,32 +1014,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) HeapFree(GetProcessHeap(), 0, gl_renderer); return FALSE; } - - /* Fill in the GL vendor */ - if (strstr(gl_string, "NVIDIA")) - { - gl_info->gl_vendor = VENDOR_NVIDIA; - } - else if (strstr(gl_string, "ATI")) - { - gl_info->gl_vendor = VENDOR_ATI; - } - else if (strstr(gl_string, "Intel(R)") - || strstr(gl_renderer, "Intel(R)") - || strstr(gl_string, "Intel Inc.")) - { - gl_info->gl_vendor = VENDOR_INTEL; - } - else if (strstr(gl_string, "Mesa") - || strstr(gl_string, "Tungsten Graphics, Inc.")) - { - gl_info->gl_vendor = VENDOR_MESA; - } - else - { - FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Setting VENDOR_WINE.\n", debugstr_a(gl_string)); - gl_info->gl_vendor = VENDOR_WINE; - } + gl_info->gl_vendor = wined3d_guess_vendor(gl_string, gl_renderer); TRACE_(d3d_caps)("found GL_VENDOR (%s)->(0x%04x)\n", debugstr_a(gl_string), gl_info->gl_vendor); /* Parse the GL_VERSION field into major and minor information */

1 0

Henri Verbeet : wined3d: Escape GL strings with debugstr_a() in IWineD3DImpl_FillGLCaps().
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: c573d0a4c912751865f5dce6788b1a4d0f34141a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c573d0a4c912751865f5dce67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 14 09:23:20 2009 +0200 wined3d: Escape GL strings with debugstr_a() in IWineD3DImpl_FillGLCaps(). --- dlls/wined3d/directx.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 22a05cf..0876039 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -968,7 +968,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) ENTER_GL(); gl_string = (const char *)glGetString(GL_RENDERER); - TRACE_(d3d_caps)("GL_RENDERER: %s.\n", gl_string); + TRACE_(d3d_caps)("GL_RENDERER: %s.\n", debugstr_a(gl_string)); if (!gl_string) { ERR_(d3d_caps)("Received a NULL GL_RENDERER.\n"); @@ -985,7 +985,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) memcpy(gl_renderer, gl_string, len); gl_string = (const char *)glGetString(GL_VENDOR); - TRACE_(d3d_caps)("GL_VENDOR: %s.\n", gl_string); + TRACE_(d3d_caps)("GL_VENDOR: %s.\n", debugstr_a(gl_string)); if (!gl_string) { ERR_(d3d_caps)("Received a NULL GL_VENDOR.\n"); @@ -1015,14 +1015,14 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) } else { - FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Setting VENDOR_WINE.\n", gl_string); + FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Setting VENDOR_WINE.\n", debugstr_a(gl_string)); gl_info->gl_vendor = VENDOR_WINE; } TRACE_(d3d_caps)("found GL_VENDOR (%s)->(0x%04x)\n", debugstr_a(gl_string), gl_info->gl_vendor); /* Parse the GL_VERSION field into major and minor information */ gl_string = (const char *)glGetString(GL_VERSION); - TRACE_(d3d_caps)("GL_VERSION: %s.\n", gl_string); + TRACE_(d3d_caps)("GL_VERSION: %s.\n", debugstr_a(gl_string)); if (!gl_string) { ERR_(d3d_caps)("Received a NULL GL_VERSION.\n"); @@ -1243,7 +1243,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) memcpy(current_ext, start, len); current_ext[len] = '\0'; - TRACE_(d3d_caps)("- %s\n", current_ext); + TRACE_(d3d_caps)("- %s\n", debugstr_a(current_ext)); for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { @@ -2005,7 +2005,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) memcpy(ThisExtn, Start, len); ThisExtn[len] = '\0'; - TRACE_(d3d_caps)("- %s\n", ThisExtn); + TRACE_(d3d_caps)("- %s\n", debugstr_a(ThisExtn)); if (!strcmp(ThisExtn, "WGL_ARB_pbuffer")) { gl_info->supported[WGL_ARB_PBUFFER] = TRUE;

1 0

Andrew Eikum : comctl32/tests: Add tests for wizard dialog navigation.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: 70f4ce36a045c50f9e1a666ce34f7830fcc19712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f4ce36a045c50f9e1a666ce… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 13 17:36:56 2009 -0500 comctl32/tests: Add tests for wizard dialog navigation. --- dlls/comctl32/tests/propsheet.c | 135 +++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/resources.h | 10 +++ dlls/comctl32/tests/rsrc.rc | 34 ++++++++++ 3 files changed, 179 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 4164f68..f7e7174 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -20,10 +20,14 @@ #include <windows.h> #include <commctrl.h> +#include "resources.h" + #include "wine/test.h" static HWND parent; +static LONG active_page = -1; + static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) { switch(msg) @@ -199,9 +203,140 @@ static void test_disableowner(void) DestroyWindow(parent); } +static LRESULT CALLBACK nav_page_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch(msg){ + case WM_NOTIFY: + { + LPNMHDR hdr = (LPNMHDR)lparam; + switch(hdr->code){ + case PSN_SETACTIVE: + active_page = PropSheet_HwndToIndex(hdr->hwndFrom, hwnd); + break; + case PSN_KILLACTIVE: + /* prevent navigation away from the fourth page */ + if(active_page == 3){ + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, TRUE); + return TRUE; + } + } + break; + } + } + return DefWindowProc(hwnd, msg, wparam, lparam); +} + +static void test_wiznavigation(void) +{ + HPROPSHEETPAGE hpsp[4]; + PROPSHEETPAGEA psp[4]; + PROPSHEETHEADERA psh; + HWND hdlg, control; + LONG_PTR controlID; + LRESULT defidres; + const INT nextID = 12324; + const INT backID = 12323; + + /* create the property sheet pages */ + memset(psp, 0, sizeof(PROPSHEETPAGEA) * 4); + + psp[0].dwSize = sizeof(PROPSHEETPAGEA); + psp[0].hInstance = GetModuleHandleW(NULL); + U(psp[0]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_INTRO); + psp[0].pfnDlgProc = nav_page_proc; + hpsp[0] = CreatePropertySheetPageA(&psp[0]); + + psp[1].dwSize = sizeof(PROPSHEETPAGEA); + psp[1].hInstance = GetModuleHandleW(NULL); + U(psp[1]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_EDIT); + psp[1].pfnDlgProc = nav_page_proc; + hpsp[1] = CreatePropertySheetPageA(&psp[1]); + + psp[2].dwSize = sizeof(PROPSHEETPAGEA); + psp[2].hInstance = GetModuleHandleW(NULL); + U(psp[2]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_RADIO); + psp[2].pfnDlgProc = nav_page_proc; + hpsp[2] = CreatePropertySheetPageA(&psp[2]); + + psp[3].dwSize = sizeof(PROPSHEETPAGEA); + psp[3].hInstance = GetModuleHandleW(NULL); + U(psp[3]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_EXIT); + psp[3].pfnDlgProc = nav_page_proc; + hpsp[3] = CreatePropertySheetPageA(&psp[3]); + + /* set up the property sheet dialog */ + memset(&psh, 0, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_MODELESS | PSH_WIZARD; + psh.pszCaption = "A Wizard"; + psh.nPages = 4; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = hpsp; + hdlg = (HWND)PropertySheetA(&psh); + + ok(active_page == 0, "Active page should be 0. Is: %d\n", active_page); + + control = GetFocus(); + controlID = GetWindowLongPtr(control, GWLP_ID); + ok(controlID == nextID, "Focus should have been set to the Next button. Expected: %d, Found: %ld\n", nextID, controlID); + + /* simulate pressing the Next button */ + SendMessage(hdlg, PSM_PRESSBUTTON, PSBTN_NEXT, 0); + ok(active_page == 1, "Active page should be 1 after pressing Next. Is: %d\n", active_page); + + control = GetFocus(); + controlID = GetWindowLongPtr(control, GWLP_ID); + ok(controlID == IDC_PS_EDIT1, "Focus should be set to the first item on the second page. Expected: %d, Found: %ld\n", IDC_PS_EDIT1, controlID); + + defidres = SendMessage(hdlg, DM_GETDEFID, 0, 0); + ok(defidres == MAKELRESULT(nextID, DC_HASDEFID), "Expected default button ID to be %d, is %d\n", nextID, LOWORD(defidres)); + + /* set the focus to the second edit box on this page */ + SetFocus(GetNextDlgTabItem(hdlg, control, FALSE)); + + /* press next again */ + SendMessage(hdlg, PSM_PRESSBUTTON, PSBTN_NEXT, 0); + ok(active_page == 2, "Active page should be 2 after pressing Next. Is: %d\n", active_page); + + control = GetFocus(); + controlID = GetWindowLongPtr(control, GWLP_ID); + ok(controlID == IDC_PS_RADIO1, "Focus should have been set to item on third page. Expected: %d, Found %ld\n", IDC_PS_RADIO1, controlID); + + /* back button */ + SendMessage(hdlg, PSM_PRESSBUTTON, PSBTN_BACK, 0); + ok(active_page == 1, "Active page should be 1 after pressing Back. Is: %d\n", active_page); + + control = GetFocus(); + controlID = GetWindowLongPtr(control, GWLP_ID); + ok(controlID == IDC_PS_EDIT1, "Focus should have been set to the first item on second page. Expected: %d, Found %ld\n", IDC_PS_EDIT1, controlID); + + defidres = SendMessage(hdlg, DM_GETDEFID, 0, 0); + ok(defidres == MAKELRESULT(backID, DC_HASDEFID), "Expected default button ID to be %d, is %d\n", backID, LOWORD(defidres)); + + /* press next twice */ + SendMessage(hdlg, PSM_PRESSBUTTON, PSBTN_NEXT, 0); + ok(active_page == 2, "Active page should be 2 after pressing Next. Is: %d\n", active_page); + SendMessage(hdlg, PSM_PRESSBUTTON, PSBTN_NEXT, 0); + ok(active_page == 3, "Active page should be 3 after pressing Next. Is: %d\n", active_page); + + control = GetFocus(); + controlID = GetWindowLongPtr(control, GWLP_ID); + ok(controlID == nextID, "Focus should have been set to the Next button. Expected: %d, Found: %ld\n", nextID, controlID); + + /* try to navigate away, but shouldn't be able to */ + SendMessage(hdlg, PSM_PRESSBUTTON, PSBTN_BACK, 0); + ok(active_page == 3, "Active page should still be 3 after pressing Back. Is: %d\n", active_page); + + defidres = SendMessage(hdlg, DM_GETDEFID, 0, 0); + ok(defidres == MAKELRESULT(nextID, DC_HASDEFID), "Expected default button ID to be %d, is %d\n", nextID, LOWORD(defidres)); + + DestroyWindow(hdlg); +} + START_TEST(propsheet) { test_title(); test_nopage(); test_disableowner(); + test_wiznavigation(); } diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h index c99633d..8459fc8 100644 --- a/dlls/comctl32/tests/resources.h +++ b/dlls/comctl32/tests/resources.h @@ -31,4 +31,14 @@ #define IDS_TBADD5 20 #define IDS_TBADD7 22 +#define IDD_PROP_PAGE_INTRO 30 +#define IDD_PROP_PAGE_EDIT 31 +#define IDD_PROP_PAGE_RADIO 32 +#define IDD_PROP_PAGE_EXIT 33 + +#define IDC_PS_EDIT1 1000 +#define IDC_PS_EDIT2 1001 +#define IDC_PS_RADIO1 1010 +#define IDC_PS_RADIO2 1011 + #endif /* __WINE_COMCTL32_TEST_RESOURCES_H */ diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index bf195b6..06e382e 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -30,6 +30,40 @@ FONT 8, "MS Shell Dlg" LTEXT "Test", -1, 10, 6, 100, 8 } +IDD_PROP_PAGE_INTRO DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Edit Control Page" +FONT 8, "MS Shell Dlg" +{ + LTEXT "This is a test property sheet!", -1, 10, 6, 100, 8 +} + +IDD_PROP_PAGE_EDIT DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Edit Control Page" +FONT 8, "MS Shell Dlg" +{ + EDITTEXT IDC_PS_EDIT1, 5, 5, 150, 140, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE + EDITTEXT IDC_PS_EDIT2, 5, 160, 150, 28, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE +} + +IDD_PROP_PAGE_RADIO DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Edit Control Page" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Radio1", IDC_PS_RADIO1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 20, 20, 39, 10 + CONTROL "Radio2", IDC_PS_RADIO2, "Button", BS_AUTORADIOBUTTON, 20, 40, 39, 10 +} + +IDD_PROP_PAGE_EXIT DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Edit Control Page" +FONT 8, "MS Shell Dlg" +{ + LTEXT "This has been a test property sheet!", -1, 10, 6, 170, 8 +} + STRINGTABLE { IDS_TBADD1 "abc"

1 0

Andrew Eikum : user32/tests: Add tests for saving and restoring control focus.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: c1c22e25c2ab4950d1b0fc3c8f2183b9291addec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c22e25c2ab4950d1b0fc3c8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 13 17:36:49 2009 -0500 user32/tests: Add tests for saving and restoring control focus. --- dlls/user32/tests/dialog.c | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index fd4c225..dfb2483 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1069,6 +1069,63 @@ static void test_MessageBoxFontTest(void) DestroyWindow(hDlg); } +static void test_SaveRestoreFocus(void) +{ + HWND hDlg; + HRSRC hResource; + HANDLE hTemplate; + DLGTEMPLATE* pTemplate; + LONG_PTR foundId; + HWND foundHwnd; + + /* create the dialog */ + hResource = FindResourceA(g_hinst, "MULTI_EDIT_DIALOG", RT_DIALOG); + hTemplate = LoadResource(g_hinst, hResource); + pTemplate = LockResource(hTemplate); + + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, messageBoxFontDlgWinProc, 0); + ok (hDlg != 0, "Failed to create test dialog.\n"); + + foundId = GetWindowLongPtr(GetFocus(), GWLP_ID); + ok (foundId == 1000, "First edit box should have gained focus on dialog creation. Expected: %d, Found: %ld\n", 1000, foundId); + + /* de- then reactivate the dialog */ + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), 0); + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + + foundId = GetWindowLongPtr(GetFocus(), GWLP_ID); + ok (foundId == 1000, "First edit box should have regained focus after dialog reactivation. Expected: %d, Found: %ld\n", 1000, foundId); + + /* select the next tabbable item */ + SetFocus(GetNextDlgTabItem(hDlg, GetFocus(), FALSE)); + + foundId = GetWindowLongPtr(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus. Expected: %d, Found: %ld\n", 1001, foundId); + + /* de- then reactivate the dialog */ + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), 0); + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + + foundId = GetWindowLongPtr(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus after dialog reactivation. Expected: %d, Found: %ld\n", 1001, foundId); + + /* disable the 2nd box */ + EnableWindow(GetFocus(), FALSE); + + foundHwnd = GetFocus(); + ok (foundHwnd == NULL, "Second edit box should have lost focus after being disabled. Expected: %p, Found: %p\n", NULL, foundHwnd); + + /* de- then reactivate the dialog */ + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), 0); + SendMessage(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + + foundHwnd = GetFocus(); + ok (foundHwnd == NULL, "No controls should have gained focus after dialog reactivation. Expected: %p, Found: %p\n", NULL, foundHwnd); + + /* clean up */ + DestroyWindow(hDlg); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -1083,4 +1140,5 @@ START_TEST(dialog) test_DialogBoxParamA(); test_DisabledDialogTest(); test_MessageBoxFontTest(); + test_SaveRestoreFocus(); }

1 0

Andrew Eikum : comctl32: Correctly assign focus and default button in property sheet wizards.
by Alexandre Julliard Aug. 14, 2009

Aug. 14, 2009

Module: wine Branch: master Commit: ac34e22ef36e865a2a85153d6f469cf9027d3a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac34e22ef36e865a2a85153d6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 13 17:36:35 2009 -0500 comctl32: Correctly assign focus and default button in property sheet wizards. --- dlls/comctl32/propsheet.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 0d76297..e767444 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1549,6 +1549,7 @@ static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo) { HWND hwndTabCtrl; HWND hwndLineHeader; + HWND control; LPCPROPSHEETPAGEW ppshpage; TRACE("active_page %d, index %d\n", psInfo->active_page, index); @@ -1569,6 +1570,10 @@ static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo) { PROPSHEET_SetTitleW(hwndDlg, psInfo->ppshheader.dwFlags, psInfo->proppage[index].pszText); + + control = GetNextDlgTabItem(psInfo->proppage[index].hwndPage, NULL, FALSE); + if(control != NULL) + SetFocus(control); } if (psInfo->active_page != -1) @@ -1631,7 +1636,11 @@ static BOOL PROPSHEET_Back(HWND hwndDlg) if (idx >= 0 && idx < psInfo->nPages) { if (PROPSHEET_CanSetCurSel(hwndDlg)) + { + SetFocus(GetDlgItem(hwndDlg, IDC_BACK_BUTTON)); + SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); PROPSHEET_SetCurSel(hwndDlg, idx, -1, 0); + } } return TRUE; } @@ -1669,7 +1678,11 @@ static BOOL PROPSHEET_Next(HWND hwndDlg) if (idx < psInfo->nPages ) { if (PROPSHEET_CanSetCurSel(hwndDlg) != FALSE) + { + SetFocus(GetDlgItem(hwndDlg, IDC_NEXT_BUTTON)); + SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); PROPSHEET_SetCurSel(hwndDlg, idx, 1, 0); + } } return TRUE; @@ -3408,6 +3421,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* set up the Next and Back buttons by default */ PROPSHEET_SetWizButtons(hwnd, PSWIZB_BACK|PSWIZB_NEXT); + SetFocus(GetDlgItem(hwnd, IDC_NEXT_BUTTON)); /* Set up fonts */ SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); @@ -3494,6 +3508,10 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PROPSHEET_UnChanged(hwnd, NULL); + /* wizards set their focus during init */ + if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) + return FALSE; + return TRUE; }

1 0