wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Alexandre Julliard : winex11: Use an X11 error handler to catch BadMatch errors from XGetImage.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 4c6a40977998c0aa7f9f5fa26021b5c5a4d3520c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6a40977998c0aa7f9f5fa26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 22:47:31 2011 +0100 winex11: Use an X11 error handler to catch BadMatch errors from XGetImage. --- dlls/winex11.drv/bitblt.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c1df77a..9830327 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -582,6 +582,12 @@ int main() #endif /* BITBLT_TEST */ +/* handler for XGetImage BadMatch errors */ +static int XGetImage_handler( Display *dpy, XErrorEvent *event, void *arg ) +{ + return (event->request_code == X_GetImage && event->error_code == BadMatch); +} + /*********************************************************************** * BITBLT_GetDstArea * @@ -1423,16 +1429,23 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, } else { - Pixmap pixmap; + X11DRV_expect_error( gdi_display, XGetImage_handler, NULL ); + image = XGetImage( gdi_display, physdev->drawable, + physdev->dc_rect.left + x, physdev->dc_rect.top + y, + width, height, AllPlanes, ZPixmap ); + if (X11DRV_check_error()) + { + /* use a temporary pixmap to avoid the BadMatch error */ + Pixmap pixmap; - wine_tsx11_lock(); - /* use a temporary pixmap to avoid BadMatch errors */ - pixmap = XCreatePixmap( gdi_display, root_window, width, height, depth ); - XCopyArea( gdi_display, physdev->drawable, pixmap, get_bitmap_gc(depth), - physdev->dc_rect.left + x, physdev->dc_rect.top + y, width, height, 0, 0 ); - image = XGetImage( gdi_display, pixmap, 0, 0, width, height, AllPlanes, ZPixmap ); - XFreePixmap( gdi_display, pixmap ); - wine_tsx11_unlock(); + wine_tsx11_lock(); + pixmap = XCreatePixmap( gdi_display, root_window, width, height, depth ); + XCopyArea( gdi_display, physdev->drawable, pixmap, get_bitmap_gc(depth), + physdev->dc_rect.left + x, physdev->dc_rect.top + y, width, height, 0, 0 ); + image = XGetImage( gdi_display, pixmap, 0, 0, width, height, AllPlanes, ZPixmap ); + XFreePixmap( gdi_display, pixmap ); + wine_tsx11_unlock(); + } } if (!image) return ERROR_OUTOFMEMORY;

1 0

Alexandre Julliard : wineps: Fall through to the null driver for Polyline and Polygon.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: d45eb00abc82c73c64191ad4b0c58201ca41e252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45eb00abc82c73c64191ad4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 22:29:46 2011 +0100 wineps: Fall through to the null driver for Polyline and Polygon. --- dlls/wineps.drv/graphics.c | 18 ------------------ dlls/wineps.drv/init.c | 4 ++-- dlls/wineps.drv/psdrv.h | 2 -- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 41f6e91..5459ce4 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -351,15 +351,6 @@ BOOL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWO /*********************************************************************** - * PSDRV_Polyline - */ -BOOL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) -{ - return PSDRV_PolyPolyline( dev, pt, (LPDWORD) &count, 1 ); -} - - -/*********************************************************************** * PSDRV_PolyPolygon */ BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) @@ -402,15 +393,6 @@ BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT p /*********************************************************************** - * PSDRV_Polygon - */ -BOOL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) -{ - return PSDRV_PolyPolygon( dev, pt, &count, 1 ); -} - - -/*********************************************************************** * PSDRV_PolyBezier */ BOOL PSDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e61df3e..9cba84a 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -897,8 +897,8 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pPolyDraw */ PSDRV_PolyPolygon, /* pPolyPolygon */ PSDRV_PolyPolyline, /* pPolyPolyline */ - PSDRV_Polygon, /* pPolygon */ - PSDRV_Polyline, /* pPolyline */ + NULL, /* pPolygon */ + NULL, /* pPolyline */ NULL, /* pPolylineTo */ PSDRV_PutImage, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index b86f527..a11048c 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -450,8 +450,6 @@ extern BOOL PSDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) DECLS extern BOOL PSDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; extern BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) DECLSPEC_HIDDEN; extern BOOL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern DWORD PSDRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add a null driver implementation for Polyline and Polygon.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 25e300dcade3653452bfd6dd445abd1836792ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e300dcade3653452bfd6dd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 22:29:16 2011 +0100 gdi32: Add a null driver implementation for Polyline and Polygon. --- dlls/gdi32/driver.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 0610347..26048b4 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -477,24 +477,27 @@ static BOOL nulldrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL nulldrv_PolyPolygon( PHYSDEV dev, const POINT *points, const INT *counts, UINT polygons ) { - /* FIXME: could be implemented with Polygon */ return TRUE; } static BOOL nulldrv_PolyPolyline( PHYSDEV dev, const POINT *points, const DWORD *counts, DWORD lines ) { - /* FIXME: could be implemented with Polyline */ return TRUE; } static BOOL nulldrv_Polygon( PHYSDEV dev, const POINT *points, INT count ) { - return TRUE; + INT counts[1] = { count }; + + return PolyPolygon( dev->hdc, points, counts, 1 ); } static BOOL nulldrv_Polyline( PHYSDEV dev, const POINT *points, INT count ) { - return TRUE; + DWORD counts[1] = { count }; + + if (count < 0) return FALSE; + return PolyPolyline( dev->hdc, points, counts, 1 ); } static UINT nulldrv_RealizeDefaultPalette( PHYSDEV dev )

1 0

Frédéric Delanoy : French translation for release 1.3.34
by Jeremy Newman 06 Dec '11

06 Dec '11

Module: website Branch: master Commit: 3f8a1b7c2b748a2984e2e85a94b8d0a8a415cf1c URL: http://source.winehq.org/git/website.git/?a=commit;h=3f8a1b7c2b748a2984e2e8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 2 23:29:34 2011 +0100 French translation for release 1.3.34 --- news/fr/2011120201.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011120201.xml b/news/fr/2011120201.xml new file mode 100644 index 0000000..4d75967 --- /dev/null +++ b/news/fr/2011120201.xml @@ -0,0 +1,20 @@ +<news> +<date>2 décembre 2011</date> +<title>Sortie de Wine 1.3.34</title> +<body> + La version de développement 1.3.34 de Wine est disponible. + <a href="{$root}/announce/1.3.34">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du bytecode dans JavaScript.</li> + <li>Prise en charge des dégradés dans le moteur DIB.</li> + <li>Quelques améliorations dans Uniscribe.</li> + <li>Correctifs dans les changements de mode DirectDraw.</li> + <li>Plusieurs nouvelles fonctions dans le système d'exécutions MSVC.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.34.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.3.34 freigegeben
by Jeremy Newman 06 Dec '11

06 Dec '11

Module: website Branch: master Commit: e058458f09b09bf52a81e65806702f614787fe28 URL: http://source.winehq.org/git/website.git/?a=commit;h=e058458f09b09bf52a81e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 2 23:23:33 2011 +0100 Wine 1.3.34 freigegeben --- news/de/2011120201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011120201.xml b/news/de/2011120201.xml new file mode 100644 index 0000000..38f0333 --- /dev/null +++ b/news/de/2011120201.xml @@ -0,0 +1,17 @@ +<news> +<date>2. Dezember 2011</date> +<title>Wine 1.3.34 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.34 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.34">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Bytecode Unterstützung in JavaScript.</li> + <li>Unterstützung für Farbverläufe in der DIB Engine.</li> + <li>Einige Uniscribe Verbesserungen.</li> + <li>Fehlerbehebungen für die DirectDraw Modusumschaltung.</li> + <li>Ein paar MSVC Runtime Funktionen mehr.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.34.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : user32: Convert dialogs to po files.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 95f81d10c9c852b72c6513eca0a2d0e066457f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f81d10c9c852b72c6513eca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 21:23:22 2011 +0100 user32: Convert dialogs to po files. --- dlls/user32/Makefile.in | 34 +-------------- dlls/user32/resources/user32_Bg.rc | 48 --------------------- dlls/user32/resources/user32_Ca.rc | 38 ---------------- dlls/user32/resources/user32_Cs.rc | 41 ------------------ dlls/user32/resources/user32_Da.rc | 51 ---------------------- dlls/user32/resources/user32_De.rc | 51 ---------------------- dlls/user32/resources/user32_En.rc | 48 --------------------- dlls/user32/resources/user32_Eo.rc | 49 --------------------- dlls/user32/resources/user32_Es.rc | 49 --------------------- dlls/user32/resources/user32_Fi.rc | 49 --------------------- dlls/user32/resources/user32_Fr.rc | 54 ----------------------- dlls/user32/resources/user32_He.rc | 53 ----------------------- dlls/user32/resources/user32_Hu.rc | 49 --------------------- dlls/user32/resources/user32_It.rc | 52 ---------------------- dlls/user32/resources/user32_Ja.rc | 51 ---------------------- dlls/user32/resources/user32_Ko.rc | 49 --------------------- dlls/user32/resources/user32_Lt.rc | 51 ---------------------- dlls/user32/resources/user32_Nl.rc | 50 --------------------- dlls/user32/resources/user32_No.rc | 49 --------------------- dlls/user32/resources/user32_Pl.rc | 49 --------------------- dlls/user32/resources/user32_Pt.rc | 67 ----------------------------- dlls/user32/resources/user32_Ro.rc | 51 ---------------------- dlls/user32/resources/user32_Ru.rc | 51 ---------------------- dlls/user32/resources/user32_Si.rc | 50 --------------------- dlls/user32/resources/user32_Sk.rc | 48 --------------------- dlls/user32/resources/user32_Sr.rc | 81 ----------------------------------- dlls/user32/resources/user32_Sv.rc | 49 --------------------- dlls/user32/resources/user32_Tr.rc | 48 --------------------- dlls/user32/resources/user32_Uk.rc | 49 --------------------- dlls/user32/resources/user32_Wa.rc | 43 ------------------ dlls/user32/resources/user32_Zh.rc | 83 ------------------------------------ dlls/user32/user32.rc | 27 ++++++++++++ po/ar.po | 73 ++++++++++++++++++++++--------- po/bg.po | 75 +++++++++++++++++++++----------- po/ca.po | 71 +++++++++++++++++++++--------- po/cs.po | 76 ++++++++++++++++++++++----------- po/da.po | 70 +++++++++++++++++++++--------- po/de.po | 70 +++++++++++++++++++++--------- po/el.po | 71 +++++++++++++++++++++--------- po/en.po | 70 +++++++++++++++++++++--------- po/en_US.po | 70 +++++++++++++++++++++--------- po/eo.po | 70 +++++++++++++++++++++--------- po/es.po | 70 +++++++++++++++++++++--------- po/fa.po | 73 ++++++++++++++++++++++--------- po/fi.po | 73 +++++++++++++++++++++---------- po/fr.po | 70 +++++++++++++++++++++--------- po/he.po | 70 +++++++++++++++++++++--------- po/hi.po | 71 +++++++++++++++++++++--------- po/hu.po | 70 +++++++++++++++++++++--------- po/it.po | 70 +++++++++++++++++++++--------- po/ja.po | 70 +++++++++++++++++++++--------- po/ko.po | 70 +++++++++++++++++++++--------- po/lt.po | 70 +++++++++++++++++++++--------- po/ml.po | 71 +++++++++++++++++++++--------- po/nb_NO.po | 70 +++++++++++++++++++++--------- po/nl.po | 70 +++++++++++++++++++++--------- po/or.po | 71 +++++++++++++++++++++--------- po/pa.po | 71 +++++++++++++++++++++--------- po/pl.po | 70 +++++++++++++++++++++--------- po/pt_BR.po | 70 +++++++++++++++++++++--------- po/pt_PT.po | 70 +++++++++++++++++++++--------- po/rm.po | 71 +++++++++++++++++++++--------- po/ro.po | 70 +++++++++++++++++++++--------- po/ru.po | 70 +++++++++++++++++++++--------- po/sk.po | 70 +++++++++++++++++++++--------- po/sl.po | 70 +++++++++++++++++++++--------- po/sr_RS(a)cyrillic.po | 70 +++++++++++++++++++++--------- po/sr_RS(a)latin.po | 70 +++++++++++++++++++++--------- po/sv.po | 70 +++++++++++++++++++++--------- po/te.po | 71 +++++++++++++++++++++--------- po/th.po | 73 ++++++++++++++++++++++--------- po/tr.po | 70 +++++++++++++++++++++--------- po/uk.po | 70 +++++++++++++++++++++--------- po/wa.po | 78 ++++++++++++++++++++++----------- po/wine.pot | 70 +++++++++++++++++++++--------- po/zh_CN.po | 70 +++++++++++++++++++++--------- po/zh_TW.po | 70 +++++++++++++++++++++--------- 77 files changed, 2215 insertions(+), 2586 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95f81d10c9c852b72c651…

1 0

Alexandre Julliard : shell32: Convert dialogs to po files.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 28d54b7b1cc8cccc889d43c95624c990406799d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d54b7b1cc8cccc889d43c95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 21:09:27 2011 +0100 shell32: Convert dialogs to po files. --- dlls/shell32/Makefile.in | 34 +-------- dlls/shell32/shell32.rc | 74 ++++++++++++++++++ dlls/shell32/shell32_Bg.rc | 65 ---------------- dlls/shell32/shell32_Ca.rc | 98 ------------------------ dlls/shell32/shell32_Cs.rc | 69 ----------------- dlls/shell32/shell32_Da.rc | 100 ------------------------- dlls/shell32/shell32_De.rc | 100 ------------------------- dlls/shell32/shell32_En.rc | 96 ------------------------ dlls/shell32/shell32_Eo.rc | 68 ----------------- dlls/shell32/shell32_Es.rc | 98 ------------------------ dlls/shell32/shell32_Fi.rc | 97 ------------------------ dlls/shell32/shell32_Fr.rc | 103 ------------------------- dlls/shell32/shell32_He.rc | 104 -------------------------- dlls/shell32/shell32_Hu.rc | 99 ------------------------ dlls/shell32/shell32_It.rc | 102 ------------------------- dlls/shell32/shell32_Ja.rc | 99 ------------------------ dlls/shell32/shell32_Ko.rc | 101 ------------------------- dlls/shell32/shell32_Lt.rc | 99 ------------------------ dlls/shell32/shell32_Nl.rc | 99 ------------------------ dlls/shell32/shell32_No.rc | 99 ------------------------ dlls/shell32/shell32_Pl.rc | 98 ------------------------ dlls/shell32/shell32_Pt.rc | 140 ---------------------------------- dlls/shell32/shell32_Ro.rc | 99 ------------------------ dlls/shell32/shell32_Ru.rc | 100 ------------------------- dlls/shell32/shell32_Si.rc | 98 ------------------------ dlls/shell32/shell32_Sk.rc | 50 ------------ dlls/shell32/shell32_Sr.rc | 177 -------------------------------------------- dlls/shell32/shell32_Sv.rc | 98 ------------------------ dlls/shell32/shell32_Tr.rc | 65 ---------------- dlls/shell32/shell32_Uk.rc | 100 ------------------------- dlls/shell32/shell32_Wa.rc | 55 -------------- dlls/shell32/shell32_Zh.rc | 135 --------------------------------- po/ar.po | 106 +++++++++++++++++++------- po/bg.po | 110 ++++++++++++++++++++------- po/ca.po | 106 +++++++++++++++++++------- po/cs.po | 110 ++++++++++++++++++++------- po/da.po | 106 +++++++++++++++++++------- po/de.po | 106 +++++++++++++++++++------- po/el.po | 107 +++++++++++++++++++------- po/en.po | 104 +++++++++++++++++++------- po/en_US.po | 106 +++++++++++++++++++------- po/eo.po | 108 ++++++++++++++++++++------- po/es.po | 106 +++++++++++++++++++------- po/fa.po | 106 +++++++++++++++++++------- po/fi.po | 104 +++++++++++++++++++------- po/fr.po | 106 +++++++++++++++++++------- po/he.po | 106 +++++++++++++++++++------- po/hi.po | 105 +++++++++++++++++++------- po/hu.po | 106 +++++++++++++++++++------- po/it.po | 106 +++++++++++++++++++------- po/ja.po | 106 +++++++++++++++++++------- po/ko.po | 105 +++++++++++++++++++------- po/lt.po | 106 +++++++++++++++++++------- po/ml.po | 105 +++++++++++++++++++------- po/nb_NO.po | 106 +++++++++++++++++++------- po/nl.po | 106 +++++++++++++++++++------- po/or.po | 105 +++++++++++++++++++------- po/pa.po | 105 +++++++++++++++++++------- po/pl.po | 105 +++++++++++++++++++------- po/pt_BR.po | 106 +++++++++++++++++++------- po/pt_PT.po | 106 +++++++++++++++++++------- po/rm.po | 107 ++++++++++++++++++++------- po/ro.po | 106 +++++++++++++++++++------- po/ru.po | 106 +++++++++++++++++++------- po/sk.po | 107 ++++++++++++++++++++------- po/sl.po | 106 +++++++++++++++++++------- po/sr_RS(a)cyrillic.po | 111 +++++++++++++++++++-------- po/sr_RS(a)latin.po | 106 +++++++++++++++++++------- po/sv.po | 106 +++++++++++++++++++------- po/te.po | 105 +++++++++++++++++++------- po/th.po | 109 ++++++++++++++++++++------- po/tr.po | 109 ++++++++++++++++++++------- po/uk.po | 106 +++++++++++++++++++------- po/wa.po | 106 +++++++++++++++++++------- po/wine.pot | 104 +++++++++++++++++++------- po/zh_CN.po | 104 +++++++++++++++++++------- po/zh_TW.po | 107 ++++++++++++++++++++------- 77 files changed, 3586 insertions(+), 4213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28d54b7b1cc8cccc889d4…

1 0

Alexandre Julliard : comctl32: Convert dialogs to po files.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 64f4c4161c0066bc0c61bab06ce9253cb2c77bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f4c4161c0066bc0c61bab06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 20:38:21 2011 +0100 comctl32: Convert dialogs to po files. --- dlls/comctl32/Makefile.in | 34 +---------- dlls/comctl32/comctl32.rc | 47 ++++++++++++++ dlls/comctl32/comctl_Bg.rc | 70 --------------------- dlls/comctl32/comctl_Ca.rc | 68 --------------------- dlls/comctl32/comctl_Cs.rc | 74 ---------------------- dlls/comctl32/comctl_Da.rc | 71 --------------------- dlls/comctl32/comctl_De.rc | 70 --------------------- dlls/comctl32/comctl_El.rc | 68 --------------------- dlls/comctl32/comctl_En.rc | 68 --------------------- dlls/comctl32/comctl_Eo.rc | 68 --------------------- dlls/comctl32/comctl_Es.rc | 68 --------------------- dlls/comctl32/comctl_Fr.rc | 75 ----------------------- dlls/comctl32/comctl_He.rc | 74 ---------------------- dlls/comctl32/comctl_Hu.rc | 68 --------------------- dlls/comctl32/comctl_It.rc | 72 ---------------------- dlls/comctl32/comctl_Ja.rc | 71 --------------------- dlls/comctl32/comctl_Ko.rc | 71 --------------------- dlls/comctl32/comctl_Lt.rc | 71 --------------------- dlls/comctl32/comctl_Nl.rc | 70 --------------------- dlls/comctl32/comctl_No.rc | 68 --------------------- dlls/comctl32/comctl_Pl.rc | 69 --------------------- dlls/comctl32/comctl_Pt.rc | 70 --------------------- dlls/comctl32/comctl_Ro.rc | 71 --------------------- dlls/comctl32/comctl_Ru.rc | 73 ---------------------- dlls/comctl32/comctl_Si.rc | 70 --------------------- dlls/comctl32/comctl_Sk.rc | 71 --------------------- dlls/comctl32/comctl_Sr.rc | 121 ------------------------------------ dlls/comctl32/comctl_Sv.rc | 68 --------------------- dlls/comctl32/comctl_Th.rc | 68 --------------------- dlls/comctl32/comctl_Tr.rc | 68 --------------------- dlls/comctl32/comctl_Uk.rc | 75 ----------------------- dlls/comctl32/comctl_Zh.rc | 123 ------------------------------------- po/ar.po | 139 ++++++++++++++++++++++++++++++------------ po/bg.po | 136 +++++++++++++++++++++++++++++------------ po/ca.po | 135 +++++++++++++++++++++++++++++------------ po/cs.po | 136 +++++++++++++++++++++++++++++------------ po/da.po | 135 +++++++++++++++++++++++++++++------------ po/de.po | 135 +++++++++++++++++++++++++++++------------ po/el.po | 140 +++++++++++++++++++++++++++++------------- po/en.po | 135 +++++++++++++++++++++++++++++------------ po/en_US.po | 135 +++++++++++++++++++++++++++++------------ po/eo.po | 136 +++++++++++++++++++++++++++++------------ po/es.po | 135 +++++++++++++++++++++++++++++------------ po/fa.po | 139 ++++++++++++++++++++++++++++++------------ po/fi.po | 145 ++++++++++++++++++++++++++++++++------------ po/fr.po | 135 +++++++++++++++++++++++++++++------------ po/he.po | 135 +++++++++++++++++++++++++++++------------ po/hi.po | 137 +++++++++++++++++++++++++++++------------ po/hu.po | 136 +++++++++++++++++++++++++++++------------ po/it.po | 135 +++++++++++++++++++++++++++++------------ po/ja.po | 135 +++++++++++++++++++++++++++++------------ po/ko.po | 135 +++++++++++++++++++++++++++++------------ po/lt.po | 135 +++++++++++++++++++++++++++++------------ po/ml.po | 137 +++++++++++++++++++++++++++++------------ po/nb_NO.po | 135 +++++++++++++++++++++++++++++------------ po/nl.po | 135 +++++++++++++++++++++++++++++------------ po/or.po | 137 +++++++++++++++++++++++++++++------------ po/pa.po | 137 +++++++++++++++++++++++++++++------------ po/pl.po | 135 +++++++++++++++++++++++++++++------------ po/pt_BR.po | 135 +++++++++++++++++++++++++++++------------ po/pt_PT.po | 135 +++++++++++++++++++++++++++++------------ po/rm.po | 138 ++++++++++++++++++++++++++++++------------ po/ro.po | 135 +++++++++++++++++++++++++++++------------ po/ru.po | 135 +++++++++++++++++++++++++++++------------ po/sk.po | 142 +++++++++++++++++++++++++++++-------------- po/sl.po | 135 +++++++++++++++++++++++++++++------------ po/sr_RS(a)cyrillic.po | 136 +++++++++++++++++++++++++++++------------ po/sr_RS(a)latin.po | 136 +++++++++++++++++++++++++++++------------ po/sv.po | 135 +++++++++++++++++++++++++++++------------ po/te.po | 137 +++++++++++++++++++++++++++++------------ po/th.po | 136 +++++++++++++++++++++++++++++------------ po/tr.po | 135 +++++++++++++++++++++++++++++------------ po/uk.po | 135 +++++++++++++++++++++++++++++------------ po/wa.po | 141 ++++++++++++++++++++++++++++++------------ po/wine.pot | 135 +++++++++++++++++++++++++++++------------ po/zh_CN.po | 136 +++++++++++++++++++++++++++++------------ po/zh_TW.po | 136 +++++++++++++++++++++++++++++------------ 77 files changed, 4399 insertions(+), 4027 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64f4c4161c0066bc0c61b…

1 0

Alex Henrie : user32: If a dialog has no tab-accessible controls, set focus to first control (with tests).
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 59c398b8ed46e0852386ad913c0f0a658a196523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c398b8ed46e0852386ad913… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 2 00:37:01 2011 -0700 user32: If a dialog has no tab-accessible controls, set focus to first control (with tests). --- dlls/user32/dialog.c | 2 ++ dlls/user32/tests/dialog.c | 28 ++++++++++++++++++++++++++-- dlls/user32/tests/resource.rc | 8 ++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index b9e739a..c6b2455 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -695,6 +695,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (dlgProc) { HWND focus = GetNextDlgTabItem( hwnd, 0, FALSE ); + if (!focus) focus = GetNextDlgGroupItem( hwnd, 0, FALSE ); if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)focus, param ) && IsWindow( hwnd ) && ((~template.style & DS_CONTROL) || (template.style & WS_VISIBLE))) { @@ -702,6 +703,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, * WM_INITDIALOG may have changed the tab order, so find the first * tabstop control again. */ dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); + if (!dlgInfo->hwndFocus) dlgInfo->hwndFocus = GetNextDlgGroupItem( hwnd, 0, FALSE ); if( dlgInfo->hwndFocus ) SetFocus( dlgInfo->hwndFocus ); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index fa14b36..404aeee 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -832,8 +832,7 @@ static void test_initial_focus(void) { /* Test 1: * This test intentionally returns FALSE in response to WM_INITDIALOG - * without setting focus to a control. This is not allowed according to - * MSDN, but it is exactly what MFC's CFormView does. + * without setting focus to a control. This is what MFC's CFormView does. * * Since the WM_INITDIALOG handler returns FALSE without setting the focus, * the focus should initially be NULL. Later, when we manually set focus to @@ -915,6 +914,31 @@ static void test_initial_focus(void) DestroyWindow(hDlg); } + + /* Test 4: + * If the dialog has no tab-accessible controls, set focus to first control */ + { + HWND hDlg; + HRSRC hResource; + HANDLE hTemplate; + DLGTEMPLATE* pTemplate; + HWND hLabel; + + hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG_2", RT_DIALOG); + hTemplate = LoadResource(g_hinst, hResource); + pTemplate = LockResource(hTemplate); + + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); + g_hwndInitialFocusT1 = GetFocus(); + hLabel = GetDlgItem(hDlg, 200); + ok (hDlg != 0, "Failed to create test dialog.\n"); + + ok ((g_hwndInitialFocusT1 == hLabel), + "Focus should have been set to the first control, expected (%p) got (%p).\n", + hLabel, g_hwndInitialFocusT1); + + DestroyWindow(hDlg); + } } static void test_GetDlgItemText(void) diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index cce1478..be47038 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -99,6 +99,14 @@ FONT 8, "MS Shell Dlg" EDITTEXT 200,4,4,50,14 } +FOCUS_TEST_DIALOG_2 DIALOG 0, 0, 60, 30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Test dialog" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Hello world", 200,4,4,50,14 +} + IDD_DIALOG DIALOG 0, 0, 186, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog"

1 0

Frédéric Delanoy : dinput: Clarify a translatable string.
by Alexandre Julliard 05 Dec '11

05 Dec '11

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011