wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Rico Schüller : d3dx9: Merge get/is_valid_constant().
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 918abfef6a7a7e0d14fec9000205146af804b9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918abfef6a7a7e0d14fec9000… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:34 2013 +0200 d3dx9: Merge get/is_valid_constant(). --- dlls/d3dx9_36/shader.c | 47 ++++++++++++++++------------------------------- 1 files changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8b089d2..6ad5f92 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -610,11 +610,6 @@ static inline BOOL is_vertex_shader(DWORD version) return (version & 0xffff0000) == 0xfffe0000; } -static inline struct ctab_constant *constant_from_handle(D3DXHANDLE handle) -{ - return (struct ctab_constant *)handle; -} - static inline D3DXHANDLE handle_from_constant(struct ctab_constant *constant) { return (D3DXHANDLE)constant; @@ -708,54 +703,44 @@ static struct ctab_constant *get_constant_by_name(struct ID3DXConstantTableImpl return NULL; } -static struct ctab_constant *is_valid_sub_constant(struct ctab_constant *parent, struct ctab_constant *constant) +static struct ctab_constant *is_valid_sub_constant(struct ctab_constant *parent, D3DXHANDLE handle) { + struct ctab_constant *c; UINT i, count; - /* all variable have at least elements = 1, but no elements */ + /* all variable have at least elements = 1, but not always elements */ if (!parent->constants) return NULL; - if (parent->desc.Elements > 1) count = parent->desc.Elements; - else count = parent->desc.StructMembers; - + count = parent->desc.Elements > 1 ? parent->desc.Elements : parent->desc.StructMembers; for (i = 0; i < count; ++i) { - if (&parent->constants[i] == constant) - return constant; + if (handle_from_constant(&parent->constants[i]) == handle) + return &parent->constants[i]; - if (is_valid_sub_constant(&parent->constants[i], constant)) - return constant; + c = is_valid_sub_constant(&parent->constants[i], handle); + if (c) return c; } return NULL; } -static inline struct ctab_constant *is_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) +static inline struct ctab_constant *get_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) { - struct ctab_constant *c = constant_from_handle(handle); + struct ctab_constant *c; UINT i; - if (!c) return NULL; + if (!handle) return NULL; for (i = 0; i < table->desc.Constants; ++i) { - if (&table->constants[i] == c) - return c; + if (handle_from_constant(&table->constants[i]) == handle) + return &table->constants[i]; - if (is_valid_sub_constant(&table->constants[i], c)) - return c; + c = is_valid_sub_constant(&table->constants[i], handle); + if (c) return c; } - return NULL; -} - -static inline struct ctab_constant *get_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) -{ - struct ctab_constant *constant = is_valid_constant(table, handle); - - if (!constant) constant = get_constant_by_name(table, NULL, handle); - - return constant; + return get_constant_by_name(table, NULL, handle); } static inline void set_float_shader_constant(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device,

1 0

Rico Schüller : d3dx9: Improve shader constant table parsing.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: e6e09eb465e2752cd2d4daed132635a157b87c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e09eb465e2752cd2d4daed1… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:23 2013 +0200 d3dx9: Improve shader constant table parsing. --- dlls/d3dx9_36/shader.c | 89 ++++++++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1d6a677..8b089d2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1554,58 +1554,63 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru } else { - WORD offsetdiff = 0; + WORD offsetdiff = type->Columns * type->Rows; + BOOL fail = FALSE; - switch (type->Class) + size = type->Columns * type->Rows; + + switch (regset) { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - offsetdiff = 1; - size = 1; + case D3DXRS_BOOL: + fail = type->Class != D3DXPC_SCALAR && type->Class != D3DXPC_VECTOR + && type->Class != D3DXPC_MATRIX_ROWS && type->Class != D3DXPC_MATRIX_COLUMNS; break; - case D3DXPC_MATRIX_ROWS: - size = is_element ? type->Rows : max(type->Rows, type->Columns); - offsetdiff = type->Rows; - break; + case D3DXRS_FLOAT4: + case D3DXRS_INT4: + switch (type->Class) + { + case D3DXPC_VECTOR: + size = 1; + /* fall through */ + case D3DXPC_SCALAR: + offsetdiff = type->Rows * 4; + break; + + case D3DXPC_MATRIX_ROWS: + offsetdiff = type->Rows * 4; + size = is_element ? type->Rows : max(type->Rows, type->Columns); + break; - case D3DXPC_MATRIX_COLUMNS: - size = type->Columns; - offsetdiff = type->Columns; + case D3DXPC_MATRIX_COLUMNS: + offsetdiff = type->Columns * 4; + size = type->Columns; + break; + + default: + fail = TRUE; + break; + } break; - case D3DXPC_OBJECT: + case D3DXRS_SAMPLER: size = 1; + fail = type->Class != D3DXPC_OBJECT; break; default: - FIXME("Unhandled type class %s\n", debug_d3dxparameter_class(type->Class)); + fail = TRUE; break; } - /* offset in bytes => offsetdiff * components(4) * sizeof(DWORD) */ - if (offset) *offset += offsetdiff * 4 * 4; - - /* int and bool registerset have different sizes */ - if (regset == D3DXRS_INT4 || regset == D3DXRS_BOOL) + if (fail) { - switch (type->Class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - size = type->Columns; - break; - - case D3DXPC_MATRIX_ROWS: - case D3DXPC_MATRIX_COLUMNS: - size = 4 * type->Columns; - break; - - default: - FIXME("Unhandled type class %s\n", debug_d3dxparameter_class(type->Class)); - break; - } + FIXME("Unhandled register set %s, type class %s\n", debug_d3dxparameter_registerset(regset), + debug_d3dxparameter_class(type->Class)); } + + /* offset in bytes => offsetdiff * sizeof(DWORD) */ + if (offset) *offset += offsetdiff * 4; } constant->desc.RegisterCount = max(0, min(max - index, size)); @@ -1719,6 +1724,18 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, offset ? &offset : NULL, constant_info[i].Name, constant_info[i].RegisterSet); if (hr != D3D_OK) goto error; + + /* + * Set the register count, it may differ for D3DXRS_INT4, because somehow + * it makes the assumption that the register size is 1 instead of 4, so the + * count is 4 times bigger. This holds true only for toplevel shader + * constants. The count of elements and members is always based on a + * register size of 4. + */ + if (object->constants[i].desc.RegisterSet == D3DXRS_INT4) + { + object->constants[i].desc.RegisterCount = constant_info[i].RegisterCount; + } } *constant_table = &object->ID3DXConstantTable_iface;

1 0

Frédéric Delanoy : server: Update French translation of manpage.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 91cb426ca7b7279c3dc40077f46b3e6fa05fe383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91cb426ca7b7279c3dc40077f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 16:54:11 2013 +0200 server: Update French translation of manpage. --- server/wineserver.fr.man.in | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/server/wineserver.fr.man.in b/server/wineserver.fr.man.in index c3ed295..22893b2 100644 --- a/server/wineserver.fr.man.in +++ b/server/wineserver.fr.man.in @@ -2,7 +2,8 @@ .SH NOM wineserver \- le serveur Wine .SH SYNOPSIS -.BI wineserver\ [options] +.B wineserver +.RI [ options ] .SH DESCRIPTION .B wineserver est un démon qui fournit à Wine à peu près les mêmes services @@ -14,7 +15,7 @@ il peut être utile de le démarrer explicitement avec certaines options, détaillées ci-après. .SH OPTIONS .TP -\fB\-d\fI[n]\fR, \fB--debug\fI[=n] +\fB\-d\fR[\fIn\fR], \fB--debug\fR[\fB=\fIn\fR] Définit le niveau de débogage à .IR n . 0 signifie aucune information de débogage, 1 est le niveau normal et 2 indique @@ -23,7 +24,7 @@ un débogage plus important. Si n'est pas spécifié, la valeur par défaut est 1. La sortie de débogage sera stderr. \fBwine\fR(1) active automatiquement le débogage au niveau normal lorsqu'il démarre \fBwineserver\fR si l'option +server est indiquée dans la variable -WINEDEBUG. +\fBWINEDEBUG\fR. .TP .BR \-f ", " --foreground Laisse le serveur au premier plan pour un débogage plus aisé, par @@ -32,15 +33,15 @@ exemple lorsqu'il est exécuté dans un débogueur. .BR \-h ", " --help Affiche un message d'aide. .TP -\fB\-k\fI[n]\fR, \fB--kill\fI[=n] +\fB\-k\fR[\fIn\fR], \fB--kill\fR[\fB=\fIn\fR] Termine le .B wineserver actuellement exécuté en lui envoyant facultativement le signal \fIn\fR. Si -aucun signal n'est spécifié, un signal SIGINT est envoyé en premier, -puis un signal SIGKILL. L'instance de \fBwineserver\fR à arrêter -est déterminée par la variable d'environnement WINEPREFIX. +aucun signal n'est spécifié, un signal \fBSIGINT\fR est envoyé en premier, +puis un signal \fBSIGKILL\fR. L'instance de \fBwineserver\fR à arrêter +est déterminée par la variable d'environnement \fBWINEPREFIX\fR. .TP -\fB\-p\fI[n]\fR, \fB--persistent\fI[=n] +\fB\-p\fR[\fIn\fR], \fB--persistent\fR[\fB=\fIn\fR] Spécifie le délai de persistance de \fBwineserver\fR, c'est-à-dire le temps pendant lequel le serveur continuera à tourner après que tous les processus clients se sont terminés. Ceci évite le coût inhérent à l'arrêt @@ -56,9 +57,9 @@ Affiche les informations sur la version et se termine. Attend que le .B wineserver actuellement exécuté se termine. -.SH VARIABLES D'ENVIRONNEMENT +.SH ENVIRONNEMENT .TP -.I WINEPREFIX +.B WINEPREFIX Si définie, cette variable indique le nom du répertoire où .B wineserver stocke ses données (\fI$HOME/.wine\fR par défaut). Tous les processus @@ -68,11 +69,11 @@ utilisant le même (c'est-à-dire pour un même utilisateur) partagent certains éléments comme la base de registre, la mémoire partagée et les objets du noyau. En donnant à -.I WINEPREFIX +.B WINEPREFIX une valeur spécifique pour différents processus Wine, il est possible d'exécuter plusieurs sessions de Wine totalement indépendantes. .TP -.I WINESERVER +.B WINESERVER Spécifie le chemin et le nom de l'exécutable .B wineserver qui sera lancé automatiquement par \fBwine\fR. @@ -89,17 +90,16 @@ Répertoire contenant les données utilisateur gérées par .BI /tmp/.wine- uid Répertoire contenant le socket de serveur Unix et le fichier de verrouillage. Ces fichiers sont créés dans un sous-répertoire dont le nom est dérivé -des périphérique et numéros d'inodes du répertoire WINEPREFIX. +des périphérique et numéros d'inodes du répertoire \fBWINEPREFIX\fR. .SH AUTEURS L'auteur originel de .B wineserver est Alexandre Julliard. Beaucoup d'autres personnes ont contribué des nouvelles fonctionnalités -et des corrections de bogues. Référez-vous au fichier Changelog dans la distribution de Wine -pour les détails complets. -.SH BOGUES -Si vous détectez un bogue, veuillez le signaler (en anglais) sur le +et des corrections de bugs. Pour une liste complète, consultez l'historique git. +.SH BUGS +Les bugs peuvent être signalés (en anglais) sur le .UR http://bugs.winehq.org -.B système de suivi de bogues de Wine +.B système de suivi des problèmes de Wine .UE . .SH DISPONIBILITÉ .B wineserver @@ -108,4 +108,8 @@ fait partie de la distribution de Wine, disponible depuis WineHQ, le .B quartier général des développeurs de Wine .UE . .SH "VOIR AUSSI" -.BR wine (1). +.BR wine (1), +.br +.UR http://www.winehq.org/help +.B Documentation et support de Wine +.UE .

1 0

Frédéric Delanoy : server: Make wineserver manpage conform to common manpages conventions.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: c350ae14da251e3162f119a2098fd98f9a32275b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c350ae14da251e3162f119a20… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 16:54:10 2013 +0200 server: Make wineserver manpage conform to common manpages conventions. --- server/wineserver.man.in | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/wineserver.man.in b/server/wineserver.man.in index 0837bac..82136a3 100644 --- a/server/wineserver.man.in +++ b/server/wineserver.man.in @@ -25,7 +25,7 @@ extra verbose debugging. If is not specified, the default is 1. The debug output will be sent to stderr. \fBwine\fR(1) will automatically enable normal level debugging when starting \fBwineserver\fR if the +server option is set in the -WINEDEBUG variable. +\fBWINEDEBUG\fR variable. .TP .BR \-f ", " --foreground Make the server remain in the foreground for easier debugging, for @@ -38,8 +38,8 @@ Display a help message. Kill the currently running .BR wineserver , optionally by sending signal \fIn\fR. If no signal is specified, sends -a SIGINT first and then a SIGKILL. The instance of \fBwineserver\fR -that is killed is selected based on the WINEPREFIX environment +a \fBSIGINT\fR first and then a \fBSIGKILL\fR. The instance of \fBwineserver\fR +that is killed is selected based on the \fBWINEPREFIX\fR environment variable. .TP \fB\-p\fR[\fIn\fR], \fB--persistent\fR[\fB=\fIn\fR] @@ -57,9 +57,9 @@ Display version information and exit. Wait until the currently running .B wineserver terminates. -.SH ENVIRONMENT VARIABLES +.SH ENVIRONMENT .TP -.I WINEPREFIX +.B WINEPREFIX If set, the content of this variable is taken as the name of the directory where .B wineserver stores its data (the default is \fI$HOME/.wine\fR). All @@ -69,11 +69,11 @@ processes using the same (i.e.: same user) share certain things like registry, shared memory and kernel objects. By setting -.I WINEPREFIX +.B WINEPREFIX to different values for different Wine processes, it is possible to run a number of truly independent Wine sessions. .TP -.I WINESERVER +.B WINESERVER Specifies the path and name of the .B wineserver binary that will be launched automatically by \fBwine\fR. If not set, @@ -90,7 +90,7 @@ Directory containing user specific data managed by .BI /tmp/.wine- uid Directory containing the server Unix socket and the lock file. These files are created in a subdirectory generated from the -WINEPREFIX directory device and inode numbers. +\fBWINEPREFIX\fR directory device and inode numbers. .SH AUTHORS The original author of .B wineserver

1 0

Frédéric Delanoy : loader: Update French translation of wine manpage.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: e62805d9cc09e16d1636ccb5cf57ef3ba75dea5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62805d9cc09e16d1636ccb5c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 16:33:48 2013 +0200 loader: Update French translation of wine manpage. --- loader/wine.fr.man.in | 181 ++++++++++++++++++++----------------------------- 1 files changed, 74 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e62805d9cc09e16d1636c…

1 0

Frédéric Delanoy : loader: Fix invalid groff in Polish wine manpage.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 67bc772bb931b148a0a7fb187f903dc4347a8582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67bc772bb931b148a0a7fb187… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 15:01:16 2013 +0200 loader: Fix invalid groff in Polish wine manpage. --- loader/wine.pl.man.in | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/loader/wine.pl.man.in b/loader/wine.pl.man.in index c8636d2..4aebf68 100644 --- a/loader/wine.pl.man.in +++ b/loader/wine.pl.man.in @@ -79,13 +79,12 @@ Poprzez ustawianie na inne wartości dla różnych procesów .B wine jest możliwe uruchamianie kilka prawdziwie niezależnych procesów -.B wine -. +.BR wine . .TP .I WINESERVER Określa ścieżkę i nazwę programu binarnego .B wineserver -. Jeżeli nie ustawione, Wine będzie próbował załadować +Jeżeli nie ustawione, Wine będzie próbował załadować .BR @bindir@/wineserver i jeśli zakończy się to niepowodzeniem to będzie szukał pliku o nazwie "wineserver" w podanej ścieżce i kilku innych miejscach prawdopodobnego występowania.

1 0

Marcus Meissner : gdiplus/tests: Check return code of GdipGetClipBounds ( Coverity).
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 716f1152932717cabe030ed39ccf3d9dfdafd7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=716f1152932717cabe030ed39… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 20 09:09:08 2013 +0200 gdiplus/tests: Check return code of GdipGetClipBounds (Coverity). --- dlls/gdiplus/tests/graphics.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 15c5e43..27c2c13 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -707,7 +707,9 @@ static void test_BeginContainer2(void) status = GdipEndContainer(graphics, cont2); expect(Ok, status); - GdipGetClipBounds(graphics, &clip); + status = GdipGetClipBounds(graphics, &clip); + expect(Ok, status); + ok(fabs(defClip[0] - clip.X) < 0.0001 && fabs(defClip[1] - clip.Y) < 0.0001 && fabs(defClip[2] - clip.Width) < 0.0001 &&

1 0

Ken Sharp : po: Update English neutral resource.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 038e624134968497d6cb3315af74f73099da84f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038e624134968497d6cb3315a… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Fri Jul 19 18:51:50 2013 +0100 po: Update English neutral resource. --- po/en.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/en.po b/po/en.po index 8c2ff50..35180a1 100644 --- a/po/en.po +++ b/po/en.po @@ -969,7 +969,7 @@ msgid "" "Please reenter margins." msgstr "" "Margins overlap or fall outside Paper boundaries.\n" -"Please reenter margins." +"Please re-enter margins." #: comdlg32.rc:60 msgid "The 'Number of copies' field cannot be empty." @@ -6348,15 +6348,15 @@ msgstr "No more bindings.\n" #: winerror.mc:3446 msgid "Can't logon with inter-domain trust account.\n" -msgstr "Can't logon with inter-domain trust account.\n" +msgstr "Can't log on with inter-domain trust account.\n" #: winerror.mc:3451 msgid "Can't logon with workstation trust account.\n" -msgstr "Can't logon with workstation trust account.\n" +msgstr "Can't log on with workstation trust account.\n" #: winerror.mc:3456 msgid "Can't logon with server trust account.\n" -msgstr "Can't logon with server trust account.\n" +msgstr "Can't log on with server trust account.\n" #: winerror.mc:3461 msgid "Domain trust information inconsistent.\n" @@ -8689,7 +8689,7 @@ msgid "" "device name is spelled correctly." msgstr "" "Cannot find the specified device. Make sure it is installed or that the " -"device name is spelled correctly." +"device name is spelt correctly." #: winmm.rc:83 msgid ""

1 0

Huw Davies : gdi32: Ignore max_extent if nfit is NULL.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: cf9cb6c11837910b646a33e09e45ec9f91434214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9cb6c11837910b646a33e09… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 22 14:07:36 2013 +0100 gdi32: Ignore max_extent if nfit is NULL. --- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/tests/font.c | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c6bd65b..cc66000 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1186,7 +1186,7 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT for (i = 0; i < count; i++) { unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + (i + 1) * dc->charExtra; - if (dx > (unsigned int)max_ext) break; + if (nfit && dx > (unsigned int)max_ext) break; if (dxs) dxs[i] = dx; } if (nfit) *nfit = i; @@ -1323,7 +1323,7 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, INT max_ext, for (i = 0; i < count; i++) { unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + (i + 1) * dc->charExtra; - if (dx > (unsigned int)max_ext) break; + if (nfit && dx > (unsigned int)max_ext) break; if (dxs) dxs[i] = dx; } if (nfit) *nfit = i; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6ee8db4..2fc7069 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1207,7 +1207,7 @@ static void test_text_extents(void) { static const WCHAR wt[] = {'O','n','e','\n','t','w','o',' ','3',0}; LPINT extents; - INT i, len, fit1, fit2; + INT i, len, fit1, fit2, extents2[3]; LOGFONTA lf; TEXTMETRICA tm; HDC hdc; @@ -1269,7 +1269,6 @@ static void test_text_extents(void) GetTextExtentExPointW(hdc, wt, 2, 0, NULL, NULL, &sz1); ok(sz1.cx == sz2.cx && sz1.cy == sz2.cy, "GetTextExtentExPointW with lpnFit and alpDx both NULL returns incorrect results\n"); - HeapFree(GetProcessHeap(), 0, extents); /* extents functions fail with -ve counts (the interesting case being -1) */ ret = GetTextExtentPointA(hdc, "o", -1, &sz); @@ -1314,6 +1313,27 @@ static void test_text_extents(void) hfont = SelectObject(hdc, hfont); DeleteObject(hfont); + + /* non-MM_TEXT mapping mode */ + lf.lfHeight = 2000; + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + + SetMapMode( hdc, MM_HIMETRIC ); + ret = GetTextExtentExPointW(hdc, wt, 3, 0, NULL, extents, &sz); + ok(ret, "got %d\n", ret); + ok(sz.cx == extents[2], "got %d vs %d\n", sz.cx, extents[2]); + + ret = GetTextExtentExPointW(hdc, wt, 3, extents[1], &fit1, extents2, &sz2); + ok(ret, "got %d\n", ret); + ok(fit1 == 2, "got %d\n", fit1); + ok(sz2.cx == sz.cx, "got %d vs %d\n", sz2.cx, sz.cx); + for(i = 0; i < 2; i++) + ok(extents2[i] == extents[i], "%d: %d, %d\n", i, extents2[i], extents[i]); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + HeapFree(GetProcessHeap(), 0, extents); ReleaseDC(NULL, hdc); }

1 0

Qian Hong : kernel32/nls: Updated LOCALE_SENGLANGUAGE for multiple Chinese variants to match Win7' s behavior.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: b2472c09bafe95728345d41c6e3cd39a7517c823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2472c09bafe95728345d41c6… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Jul 22 16:57:22 2013 +0800 kernel32/nls: Updated LOCALE_SENGLANGUAGE for multiple Chinese variants to match Win7's behavior. --- dlls/kernel32/nls/zhh.nls | 2 +- dlls/kernel32/nls/zhi.nls | 2 +- dlls/kernel32/nls/zhm.nls | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls index 009a6cf..4227a58 100644 --- a/dlls/kernel32/nls/zhh.nls +++ b/dlls/kernel32/nls/zhh.nls @@ -99,7 +99,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Hong Kong S.A.R." LOCALE_SENGCURRNAME "Hong Kong Dollar" - LOCALE_SENGLANGUAGE "Chinese" + LOCALE_SENGLANGUAGE "Chinese (Traditional)" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "HKD" LOCALE_SISO3166CTRYNAME "HK" diff --git a/dlls/kernel32/nls/zhi.nls b/dlls/kernel32/nls/zhi.nls index 7b299dd..4e41054 100644 --- a/dlls/kernel32/nls/zhi.nls +++ b/dlls/kernel32/nls/zhi.nls @@ -99,7 +99,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Singapore" LOCALE_SENGCURRNAME "Singapore Dollar" - LOCALE_SENGLANGUAGE "Chinese" + LOCALE_SENGLANGUAGE "Chinese (Simplified)" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "SGD" LOCALE_SISO3166CTRYNAME "SG" diff --git a/dlls/kernel32/nls/zhm.nls b/dlls/kernel32/nls/zhm.nls index 9d10fc5..19ef0b7 100644 --- a/dlls/kernel32/nls/zhm.nls +++ b/dlls/kernel32/nls/zhm.nls @@ -99,7 +99,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Macau S.A.R." LOCALE_SENGCURRNAME "Macau Pataca" - LOCALE_SENGLANGUAGE "Chinese" + LOCALE_SENGLANGUAGE "Chinese (Traditional)" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "MOP" LOCALE_SISO3166CTRYNAME "MO"

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
45
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 July 2013