February 2014 - Wine-devel - list.winehq.org

Re: (resend)winemac.drv: Improve positioning of IME client window based on caret
by Ken Thomases 20 Feb '14

20 Feb '14

On Feb 19, 2014, at 9:00 PM, Aric Stewart wrote: > + gti.rcCaret.right = gti.rcCaret.left + 1; Out of curiosity, was there a problem with leaving the rectangle with its original width? I wonder if, for an input method operating in right-to-left mode, it would be good to have the right edge of the caret rect so the candidate window can be aligned underneath it. (Presumably, the input method would take care of that automatically, as it just thinks of this rect as the character rect and, for right-to-left input, the right edge would be the beginning.) Otherwise, this looks good to me. -Ken

2 3

Re: winemac.drv: Improve positioning of IME client window based on caret
by Ken Thomases 20 Feb '14

20 Feb '14

On Feb 19, 2014, at 3:08 AM, Aric Stewart wrote: > diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c > index 2c74f6e..066c77a 100644 > --- a/dlls/winemac.drv/ime.c > +++ b/dlls/winemac.drv/ime.c > @@ -1585,14 +1585,20 @@ BOOL query_ime_char_rect(macdrv_query* query) > if (focus && (focus == hwnd || IsChild(hwnd, focus)) && > GetClientRect(focus, &charpos.rcDocument)) > { > + HDC hdc = GetDC(focus); > + TEXTMETRICA tm; > + > if (!GetCaretPos((POINT*)&charpos.rcDocument)) > charpos.rcDocument.left = charpos.rcDocument.top = 0; > > + GetTextMetricsA(hdc, &tm); > charpos.rcDocument.right = charpos.rcDocument.left + 1; > + charpos.rcDocument.bottom = charpos.rcDocument.top + tm.tmHeight; > MapWindowPoints(focus, 0, (POINT*)&charpos.rcDocument, 2); > > *rect = cgrect_from_rect(charpos.rcDocument); > ret = TRUE; > + ReleaseDC(focus, hdc); > } > } I don't think this does what you want. GetDC() typically returns a DC whose parameters were reset. It doesn't know what font has previously been used in the window. So, you're basically getting the metrics for the System font. I suppose that may be better than nothing. Also, you don't check if GetTextMetricsA() succeeded. Perhaps using GetGUIThreadInfo() and the rcCaret field of the GUITHREADINFO structure would be better than using GetCaretPos(). In that case, you'd map the coordinates from hwndCaret (which may be different from "focus") to the screen. Be sure to read the remarks in the MSDN docs for the GetGUIThreadInfo() function about how to use rcCaret, although it's not clear to me if Wine implements this faithfully. -Ken

2 8

Re: [PATCH 8/8] ddraw/tests: Test that DirectDraw doesn't modify the pixel format of the window it targets. (try 2, resend)
by Marvin 20 Feb '14

20 Feb '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=5032 Your paranoid android. === w2000pro (32 bit ddraw2) === ddraw2.c:2405: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2407: Test failed: Expected message 0x46, but didn't receive it. ddraw2.c:2409: Test failed: Expected screen size 640x480, got 0x0. ddraw2.c:2414: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw2.c:2435: Test failed: Expected surface width 640, got 1024. ddraw2.c:2437: Test failed: Expected surface height 480, got 768. ddraw2.c:2441: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw2.c:2452: Test failed: Expected message 0x46, but didn't receive it. ddraw2.c:2454: Test failed: Expected screen size 1024x768, got 0x0. ddraw2.c:2465: Test failed: Expected surface width 640, got 1024. ddraw2.c:2467: Test failed: Expected surface height 480, got 768. ddraw2.c:2530: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2540: Test failed: Expected message 0x7e, but didn't receive it. ddraw2.c:2566: Test failed: Expected surface width 640, got 1024. ddraw2.c:2568: Test failed: Expected surface height 480, got 768. ddraw2.c:2583: Test failed: Expected message 0x7e, but didn't receive it. ddraw2.c:2594: Test failed: Expected surface width 640, got 1024. ddraw2.c:2596: Test failed: Expected surface height 480, got 768. ddraw2.c:2662: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2664: Test failed: Expected message 0x7e, but didn't receive it. ddraw2.c:2690: Test failed: Expected surface width 640, got 1024. ddraw2.c:2692: Test failed: Expected surface height 480, got 768. ddraw2.c:2707: Test failed: Expected message 0x7e, but didn't receive it. ddraw2.c:2718: Test failed: Expected surface width 640, got 1024. ddraw2.c:2720: Test failed: Expected surface height 480, got 768. ddraw2.c:2748: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2757: Test failed: Expected message 0x5, but didn't receive it. ddraw2.c:2759: Test failed: Expected screen size 1024x768, got 0x0. ddraw2.c:2787: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2801: Test failed: Expected surface width 640, got 1024. ddraw2.c:2803: Test failed: Expected surface height 480, got 768. ddraw2.c:2814: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2825: Test failed: Expected message 0x5, but didn't receive it. ddraw2.c:2829: Test failed: Expected screen size 2 1024x768, got 0x0. ddraw2.c:2834: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw2.c:2838: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 112, 100}. ddraw2.c:2861: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw2.c:2896: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2906: Test failed: Got unexpected screen width 1024. ddraw2.c:2908: Test failed: Got unexpected screen height 768. ddraw2.c:2921: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2923: Test failed: Got unexpected screen width 1024. ddraw2.c:2925: Test failed: Got unexpected screen height 768. ddraw2.c:2929: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2931: Test failed: Got unexpected screen width 1024. ddraw2.c:2933: Test failed: Got unexpected screen height 768. ddraw2.c:2952: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2954: Test failed: Got unexpected screen width 1024. ddraw2.c:2956: Test failed: Got unexpected screen height 768. ddraw2.c:2960: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2962: Test failed: Got unexpected screen width 1024. ddraw2.c:2964: Test failed: Got unexpected screen height 768. ddraw2.c:2984: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:2986: Test failed: Got unexpected screen width 1024. ddraw2.c:2988: Test failed: Got unexpected screen height 768. ddraw2.c:2993: Test failed: Got unexpected screen width 1024. ddraw2.c:2995: Test failed: Got unexpected screen height 768. ddraw2.c:3008: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:3010: Test failed: Got unexpected screen width 1024. ddraw2.c:3012: Test failed: Got unexpected screen height 768. ddraw2.c:3016: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:3018: Test failed: Got unexpected screen width 1024. ddraw2.c:3020: Test failed: Got unexpected screen height 768. ddraw2.c:3028: Test failed: Got unexpected screen width 1024. ddraw2.c:3030: Test failed: Got unexpected screen height 768. ddraw2.c:3042: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:3044: Test failed: Got unexpected screen width 1024. ddraw2.c:3046: Test failed: Got unexpected screen height 768. ddraw2.c:3231: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:3231: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:3231: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:3277: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw2.c:3231: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:3290: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw2.c:3231: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:3306: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw2.c:3231: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:3325: Test failed: Display mode restored after ddraw1-ddraw2 SetCooperativeLevel() call sequence ddraw2.c:3231: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw2.c:4536: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:4754: Test failed: Failed to create surface, hr 0x88760091. ddraw2: unhandled exception c0000005 at 00426825 === w8 (32 bit ddraw2) === No test summary line found Failure running script in VM: network read timed out === w2000pro (32 bit ddraw1) === ddraw1.c:2194: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2196: Test failed: Expected message 0x46, but didn't receive it. ddraw1.c:2198: Test failed: Expected screen size 640x480, got 0x0. ddraw1.c:2203: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw1.c:2224: Test failed: Expected surface width 640, got 1024. ddraw1.c:2226: Test failed: Expected surface height 480, got 768. ddraw1.c:2230: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw1.c:2241: Test failed: Expected message 0x46, but didn't receive it. ddraw1.c:2243: Test failed: Expected screen size 1024x768, got 0x0. ddraw1.c:2254: Test failed: Expected surface width 640, got 1024. ddraw1.c:2256: Test failed: Expected surface height 480, got 768. ddraw1.c:2319: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2329: Test failed: Expected message 0x7e, but didn't receive it. ddraw1.c:2355: Test failed: Expected surface width 640, got 1024. ddraw1.c:2357: Test failed: Expected surface height 480, got 768. ddraw1.c:2372: Test failed: Expected message 0x7e, but didn't receive it. ddraw1.c:2383: Test failed: Expected surface width 640, got 1024. ddraw1.c:2385: Test failed: Expected surface height 480, got 768. ddraw1.c:2451: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2453: Test failed: Expected message 0x7e, but didn't receive it. ddraw1.c:2479: Test failed: Expected surface width 640, got 1024. ddraw1.c:2481: Test failed: Expected surface height 480, got 768. ddraw1.c:2496: Test failed: Expected message 0x7e, but didn't receive it. ddraw1.c:2507: Test failed: Expected surface width 640, got 1024. ddraw1.c:2509: Test failed: Expected surface height 480, got 768. ddraw1.c:2537: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2551: Test failed: Expected surface width 640, got 1024. ddraw1.c:2553: Test failed: Expected surface height 480, got 768. ddraw1.c:2563: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 1024, 768}. ddraw1.c:2596: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2606: Test failed: Got unexpected screen width 1024. ddraw1.c:2608: Test failed: Got unexpected screen height 768. ddraw1.c:2621: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2623: Test failed: Got unexpected screen width 1024. ddraw1.c:2625: Test failed: Got unexpected screen height 768. ddraw1.c:2629: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2631: Test failed: Got unexpected screen width 1024. ddraw1.c:2633: Test failed: Got unexpected screen height 768. ddraw1.c:2652: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2654: Test failed: Got unexpected screen width 1024. ddraw1.c:2656: Test failed: Got unexpected screen height 768. ddraw1.c:2660: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2662: Test failed: Got unexpected screen width 1024. ddraw1.c:2664: Test failed: Got unexpected screen height 768. ddraw1.c:2684: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2686: Test failed: Got unexpected screen width 1024. ddraw1.c:2688: Test failed: Got unexpected screen height 768. ddraw1.c:2693: Test failed: Got unexpected screen width 1024. ddraw1.c:2695: Test failed: Got unexpected screen height 768. ddraw1.c:2708: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2710: Test failed: Got unexpected screen width 1024. ddraw1.c:2712: Test failed: Got unexpected screen height 768. ddraw1.c:2716: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2718: Test failed: Got unexpected screen width 1024. ddraw1.c:2720: Test failed: Got unexpected screen height 768. ddraw1.c:2728: Test failed: Got unexpected screen width 1024. ddraw1.c:2730: Test failed: Got unexpected screen height 768. ddraw1.c:2742: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw1.c:2744: Test failed: Got unexpected screen width 1024. ddraw1.c:2746: Test failed: Got unexpected screen height 768. ddraw1.c:3855: Test failed: Failed to set display mode, hr 0x80004001. === w8 (32 bit ddraw1) === ddraw1.c:4115: Test failed: Got unexpected refcount 3. ddraw1.c:4134: Test failed: Got unexpected refcount 3. ddraw1.c:4141: Test failed: Got unexpected hr 0. ddraw1.c:4144: Test failed: Got unexpected refcount 3. ddraw1.c:4146: Test failed: Got unexpected refcount 2. ddraw1.c:4152: Test failed: Got unexpected hr 0. ddraw1.c:4155: Test failed: Got unexpected refcount 2. ddraw1.c:4157: Test failed: Got unexpected refcount 1. === w2000pro (32 bit ddraw7) === ddraw7.c:2255: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2257: Test failed: Expected message 0x46, but didn't receive it. ddraw7.c:2259: Test failed: Expected screen size 640x480, got 0x0. ddraw7.c:2264: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw7.c:2285: Test failed: Expected surface width 640, got 1024. ddraw7.c:2287: Test failed: Expected surface height 480, got 768. ddraw7.c:2291: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw7.c:2302: Test failed: Expected message 0x46, but didn't receive it. ddraw7.c:2304: Test failed: Expected screen size 1024x768, got 0x0. ddraw7.c:2315: Test failed: Expected surface width 640, got 1024. ddraw7.c:2317: Test failed: Expected surface height 480, got 768. ddraw7.c:2380: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2382: Test failed: Expected message 0x7e, but didn't receive it. ddraw7.c:2408: Test failed: Expected surface width 640, got 1024. ddraw7.c:2410: Test failed: Expected surface height 480, got 768. ddraw7.c:2425: Test failed: Expected message 0x7e, but didn't receive it. ddraw7.c:2436: Test failed: Expected surface width 640, got 1024. ddraw7.c:2438: Test failed: Expected surface height 480, got 768. ddraw7.c:2504: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2506: Test failed: Expected message 0x7e, but didn't receive it. ddraw7.c:2532: Test failed: Expected surface width 640, got 1024. ddraw7.c:2534: Test failed: Expected surface height 480, got 768. ddraw7.c:2549: Test failed: Expected message 0x7e, but didn't receive it. ddraw7.c:2560: Test failed: Expected surface width 640, got 1024. ddraw7.c:2562: Test failed: Expected surface height 480, got 768. ddraw7.c:2590: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2599: Test failed: Expected message 0x5, but didn't receive it. ddraw7.c:2601: Test failed: Expected screen size 1024x768, got 0x0. ddraw7.c:2629: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2643: Test failed: Expected surface width 640, got 1024. ddraw7.c:2645: Test failed: Expected surface height 480, got 768. ddraw7.c:2656: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2667: Test failed: Expected message 0x5, but didn't receive it. ddraw7.c:2671: Test failed: Expected screen size 2 1024x768, got 0x0. ddraw7.c:2676: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw7.c:2680: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 112, 100}. ddraw7.c:2703: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw7.c:2737: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2739: Test failed: Got unexpected screen width 1024. ddraw7.c:2741: Test failed: Got unexpected screen height 768. ddraw7.c:2754: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2756: Test failed: Got unexpected screen width 1024. ddraw7.c:2758: Test failed: Got unexpected screen height 768. ddraw7.c:2762: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2764: Test failed: Got unexpected screen width 1024. ddraw7.c:2766: Test failed: Got unexpected screen height 768. ddraw7.c:2785: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2787: Test failed: Got unexpected screen width 1024. ddraw7.c:2789: Test failed: Got unexpected screen height 768. ddraw7.c:2793: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2795: Test failed: Got unexpected screen width 1024. ddraw7.c:2797: Test failed: Got unexpected screen height 768. ddraw7.c:2817: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2819: Test failed: Got unexpected screen width 1024. ddraw7.c:2821: Test failed: Got unexpected screen height 768. ddraw7.c:2826: Test failed: Got unexpected screen width 1024. ddraw7.c:2828: Test failed: Got unexpected screen height 768. ddraw7.c:2841: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2843: Test failed: Got unexpected screen width 1024. ddraw7.c:2845: Test failed: Got unexpected screen height 768. ddraw7.c:2849: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2851: Test failed: Got unexpected screen width 1024. ddraw7.c:2853: Test failed: Got unexpected screen height 768. ddraw7.c:2861: Test failed: Got unexpected screen width 1024. ddraw7.c:2863: Test failed: Got unexpected screen height 768. ddraw7.c:2875: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:2877: Test failed: Got unexpected screen width 1024. ddraw7.c:2879: Test failed: Got unexpected screen height 768. ddraw7.c:3185: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:3185: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:3185: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:3231: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw7.c:3185: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:3244: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw7.c:3185: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:3260: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw7.c:3185: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:3279: Test failed: Display mode restored after ddraw1-ddraw7 SetCooperativeLevel() call sequence ddraw7.c:3185: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw7.c:5017: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:5236: Test failed: Failed to create surface, hr 0x88760091. ddraw7: unhandled exception c0000005 at 0045BF78 === w8 (32 bit ddraw7) === Timeout Failure running script in VM: network read timed out === w2000pro (32 bit ddraw4) === ddraw4.c:2529: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:2531: Test failed: Expected message 0x46, but didn't receive it. ddraw4.c:2533: Test failed: Expected screen size 640x480, got 0x0. ddraw4.c:2538: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw4.c:2559: Test failed: Expected surface width 640, got 1024. ddraw4.c:2561: Test failed: Expected surface height 480, got 768. ddraw4.c:2565: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw4.c:2576: Test failed: Expected message 0x46, but didn't receive it. ddraw4.c:2578: Test failed: Expected screen size 1024x768, got 0x0. ddraw4.c:2589: Test failed: Expected surface width 640, got 1024. ddraw4.c:2591: Test failed: Expected surface height 480, got 768. ddraw4.c:2654: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:2656: Test failed: Expected message 0x7e, but didn't receive it. ddraw4.c:2682: Test failed: Expected surface width 640, got 1024. ddraw4.c:2684: Test failed: Expected surface height 480, got 768. ddraw4.c:2699: Test failed: Expected message 0x7e, but didn't receive it. ddraw4.c:2710: Test failed: Expected surface width 640, got 1024. ddraw4.c:2712: Test failed: Expected surface height 480, got 768. ddraw4.c:2778: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:2780: Test failed: Expected message 0x7e, but didn't receive it. ddraw4.c:2806: Test failed: Expected surface width 640, got 1024. ddraw4.c:2808: Test failed: Expected surface height 480, got 768. ddraw4.c:2823: Test failed: Expected message 0x7e, but didn't receive it. ddraw4.c:2834: Test failed: Expected surface width 640, got 1024. ddraw4.c:2836: Test failed: Expected surface height 480, got 768. ddraw4.c:2864: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:2873: Test failed: Expected message 0x5, but didn't receive it. ddraw4.c:2875: Test failed: Expected screen size 1024x768, got 0x0. ddraw4.c:2903: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:2917: Test failed: Expected surface width 640, got 1024. ddraw4.c:2919: Test failed: Expected surface height 480, got 768. ddraw4.c:2930: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:2941: Test failed: Expected message 0x5, but didn't receive it. ddraw4.c:2945: Test failed: Expected screen size 2 1024x768, got 0x0. ddraw4.c:2950: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw4.c:2954: Test failed: Expected {0, 0, 1024, 768}, got {0, 0, 112, 100}. ddraw4.c:2977: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 1024, 768}. ddraw4.c:3011: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3013: Test failed: Got unexpected screen width 1024. ddraw4.c:3015: Test failed: Got unexpected screen height 768. ddraw4.c:3028: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3030: Test failed: Got unexpected screen width 1024. ddraw4.c:3032: Test failed: Got unexpected screen height 768. ddraw4.c:3036: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3038: Test failed: Got unexpected screen width 1024. ddraw4.c:3040: Test failed: Got unexpected screen height 768. ddraw4.c:3059: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3061: Test failed: Got unexpected screen width 1024. ddraw4.c:3063: Test failed: Got unexpected screen height 768. ddraw4.c:3067: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3069: Test failed: Got unexpected screen width 1024. ddraw4.c:3071: Test failed: Got unexpected screen height 768. ddraw4.c:3091: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3093: Test failed: Got unexpected screen width 1024. ddraw4.c:3095: Test failed: Got unexpected screen height 768. ddraw4.c:3100: Test failed: Got unexpected screen width 1024. ddraw4.c:3102: Test failed: Got unexpected screen height 768. ddraw4.c:3115: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3117: Test failed: Got unexpected screen width 1024. ddraw4.c:3119: Test failed: Got unexpected screen height 768. ddraw4.c:3123: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3125: Test failed: Got unexpected screen width 1024. ddraw4.c:3127: Test failed: Got unexpected screen height 768. ddraw4.c:3135: Test failed: Got unexpected screen width 1024. ddraw4.c:3137: Test failed: Got unexpected screen height 768. ddraw4.c:3149: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3151: Test failed: Got unexpected screen width 1024. ddraw4.c:3153: Test failed: Got unexpected screen height 768. ddraw4.c:3462: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3462: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3462: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3508: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw4.c:3462: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3521: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw4.c:3462: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3537: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw4.c:3462: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:3556: Test failed: Display mode restored after ddraw1-ddraw4 SetCooperativeLevel() call sequence ddraw4.c:3462: Test failed: SetDisplayMode failed, hr 0x80004001. ddraw4.c:5139: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:5358: Test failed: Failed to create surface, hr 0x88760091. ddraw4: unhandled exception c0000005 at 00440B85 === w8 (32 bit ddraw4) === Failure running script in VM: timed out waiting for the child process

2 1

Re: [PATCH 7/8] d3d8/tests: Test that Direct3D8 doesn't modify the pixel format of the window it targets. (try 2, resend)
by Marvin 20 Feb '14

20 Feb '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=5031 Your paranoid android. === w8 (32 bit device) === device.c:2572: Test failed: Expected foreground window 00030180, got 00010048. device.c:3268: Test failed: Expected wndproc 0x410530, got 0x410530.

2 1

Re: [PATCH 6/8] d3d9/tests: Test that Direct3D9 doesn't modify the pixel format of the window it targets. (try 4, resend)
by Marvin 20 Feb '14

20 Feb '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=5030 Your paranoid android. === w2000pro (32 bit device) === device.c:321: Test failed: Failed to create IDirect3D9Device (8876086c) device.c:494: Test failed: Failed to create IDirect3D9Device (8876086c) device.c:209: Test failed: Failed to create IDirect3D9Device (8876086c) device.c:257: Test failed: Failed to create IDirect3D9Device (8876086c) device.c:815: Test failed: Failed to create IDirect3D9Device (8876086c) device.c:1484: Test failed: IDirect3D9_CreateDevice failed with 8876086c device.c:1642: Test failed: IDirect3D9_CreateDevice failed with 8876086c device.c:1715: Test failed: IDirect3D9_CreateDevice failed with 8876086c device.c:2063: Test failed: IDirect3D9_CreateDevice failed with 8876086c

2 1

Re: [PATCH] user32: Fix RealGetWindowClass() to return what it's supposed to for same process windows (try3)
by Alexandre Julliard 19 Feb '14

19 Feb '14

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -1098,22 +1098,81 @@ INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count ) > return ret; > } > > +static const struct builtin_class_descr *builtin_classes[] = > +{ > + &BUTTON_builtin_class, > + &COMBO_builtin_class, > + &DIALOG_builtin_class, > + &EDIT_builtin_class, > + &LISTBOX_builtin_class, > + &MDICLIENT_builtin_class, > + &SCROLL_builtin_class, > + &STATIC_builtin_class > +}; There's no need to add this either, you can simply store the pointer. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/4] d3d9/tests: Test that Direct3D9 doesn't modify the pixel format of the window it targets. (try 4)
by Henri Verbeet 19 Feb '14

19 Feb '14

On 17 February 2014 22:25, Ken Thomases <ken(a)codeweavers.com> wrote: > dlls/d3d9/tests/device.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 144 insertions(+) > Unfortunately this fails here: ../../../tools/runtest -q -P wine -T ../../.. -M d3d9.dll -p d3d9_test.exe.so device && touch device.ok ... device.c:7547: Test succeeded X Error of failed request: BadMatch (invalid parameter attributes) Major opcode of failed request: 154 (GLX) Minor opcode of failed request: 11 (X_GLXSwapBuffers) Serial number of failed request: 4929 Current serial number in output stream: 4933 make: *** [device.ok] Error 1

2 13

Re: shell32: Ensure that tmpdir contains long path name.
by Marvin 19 Feb '14

19 Feb '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=5017 Your paranoid android. === wxppro (32 bit shlexec) === shlexec.c:1211: Test failed: expected 1 args, got 4 shlexec.c:2283: Test failed: argcA expected 5, but got 4 === w8 (32 bit shlexec) === shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtD34F.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD34F.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:1532: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD34F.tmp\test file.noassoc") failed: rc=33 err=2 shlexec.c:1564: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD34F.tmp\test file.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtD34F.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD34F.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:1532: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD34F.tmp\test file.shlexec.noassoc") failed: rc=33 err=2 shlexec.c:1564: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD34F.tmp\test file.shlexec.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtD34F.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD34F.tmp\wtD35F.tmp" Exec") WaitForSingleObject returned 258

1 0

Re: [PATCH] user32: Use public define for Dialog class atom
by Dmitry Timoshkov 18 Feb '14

18 Feb '14

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > /* Built-in class names (see _Undocumented_Windows_ p.418) */ > #define POPUPMENU_CLASS_ATOM MAKEINTATOM(32768) /* PopupMenu */ > #define DESKTOP_CLASS_ATOM MAKEINTATOM(32769) /* Desktop */ > -#define DIALOG_CLASS_ATOM MAKEINTATOM(32770) /* Dialog */ > #define WINSWITCH_CLASS_ATOM MAKEINTATOM(32771) /* WinSwitch */ > #define ICONTITLE_CLASS_ATOM MAKEINTATOM(32772) /* IconTitle */ This list is very handy when searching for an atom constant in the user32 code, also there is no point in breaking "grep CLASS_ATOM" in favour of a dubious use of just one constant from a public header. -- Dmitry.

1 0

Re: [PATCH] user32: Fix RealGetWindowClass() to return what it's supposed to for same process windows (try2)
by Alexandre Julliard 18 Feb '14

18 Feb '14

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -1098,13 +1098,62 @@ INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count ) > return ret; > } > > +struct builtinclass_name > +{ > + const char *nameA; > + const WCHAR *nameW; > + int len; > +}; > + > +static const WCHAR buttonW[] = {'B','u','t','t','o','n',0}; > +static const WCHAR comboboxW[] = {'C','o','m','b','o','B','o','x',0}; > +static const WCHAR dialogW[] = {'#','3','2','7','7','0',0}; > +static const WCHAR editW[] = {'E','d','i','t',0}; > +static const WCHAR listboxW[] = {'L','i','s','t','B','o','x',0}; > +static const WCHAR mdiclientW[] = {'M','D','I','C','l','i','e','n','t',0}; > +static const WCHAR scrollbarW[] = {'S','c','r','o','l','l','B','a','r',0}; > +static const WCHAR staticW[] = {'S','t','a','t','i','c',0}; > + > +static const struct builtinclass_name builtinclass_names[BUILTINTYPE_MAX] = > +{ > + { "Button", buttonW, sizeof(buttonW)/sizeof(WCHAR) }, > + { "ComboBox", comboboxW, sizeof(comboboxW)/sizeof(WCHAR) }, > + { "#32770", dialogW, sizeof(dialogW)/sizeof(WCHAR) }, > + { "Edit", editW, sizeof(editW)/sizeof(WCHAR) }, > + { "ListBox", listboxW, sizeof(listboxW)/sizeof(WCHAR) }, > + { "MDIClient", mdiclientW, sizeof(mdiclientW)/sizeof(WCHAR) }, > + { "ScrollBar", scrollbarW, sizeof(scrollbarW)/sizeof(WCHAR) }, > + { "Static", staticW, sizeof(staticW)/sizeof(WCHAR) } > +}; You should use the existing builtin class descriptors instead of duplicating that info. -- Alexandre Julliard julliard(a)winehq.org

1 0