wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

André Hentschel : wwn: Use protocol relative urls
by Jeremy Newman 27 Sep '13

27 Sep '13

1 0

Alexandre Julliard : Wine release 1.7.3
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: website Branch: master Commit: 8b972afe3a692a2f400c4e3caa041b743ea3208e URL: http://source.winehq.org/git/website.git/?a=commit;h=8b972afe3a692a2f400c4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 20:40:27 2013 +0200 Wine release 1.7.3 --- news/en/2013092701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2013092701.xml b/news/en/2013092701.xml new file mode 100644 index 0000000..3dce258 --- /dev/null +++ b/news/en/2013092701.xml @@ -0,0 +1,16 @@ +<news> +<date>September 27, 2013</date> +<title>Wine 1.7.3 Released</title> +<body> + The Wine development release 1.7.3 is now available. + <a href="{$root}/announce/1.7.3">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 24.</li> + <li>Preparation work for the Direct3D command stream.</li> + <li>Window management fixes in the Mac driver.</li> + <li>Support for IPHLPAPI functions on Android.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.3 : Alexandre Julliard : Release 1.7.3
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: refs/tags/wine-1.7.3 Tag: 9171214231c86e5a6fc84912dc78ec58d93af7d5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=9171214231c86e5a6fc84912dc78… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 20:32:14 2013 +0200 Release 1.7.3

1 0

Alexandre Julliard : Release 1.7.3.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: d9cd943056f5ca6e3a616475ad71bc92ce8f5a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9cd943056f5ca6e3a616475a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 20:32:14 2013 +0200 Release 1.7.3. --- ANNOUNCE | 760 ++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 385 insertions(+), 397 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9cd943056f5ca6e3a616…

1 0

Aric Stewart : imm32: ImmGetDescriptionA return does not include NULL byte.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: cae71ef219420b0e6d3340593e88511cb3d61295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae71ef219420b0e6d3340593… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 26 13:47:32 2013 -0500 imm32: ImmGetDescriptionA return does not include NULL byte. --- dlls/imm32/imm.c | 5 ++++- dlls/imm32/tests/imm32.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 29bf4af..93e71af 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1540,7 +1540,10 @@ UINT WINAPI ImmGetDescriptionA( HeapFree( GetProcessHeap(), 0, buf ); - return len; + if (len == 0) + return 0; + + return len - 1; } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7162f82..f92b2c1 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -665,13 +665,16 @@ static void test_ImmGetDescription(void) lret = ImmGetDescriptionA(hkl, descA, ret + 1); ok(lret, "ImmGetDescriptionA failed, expected != 0 received 0.\n"); - todo_wine ok(lret == ret, "ImmGetDescriptionA failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + ok(lret == ret, "ImmGetDescriptionA failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); ret /= 2; /* try to copy partially */ lret = ImmGetDescriptionW(hkl, descW, ret + 1); ok(lret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); ok(lret == ret, "ImmGetDescriptionW failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + lret = ImmGetDescriptionA(hkl, descA, ret + 1); + ok(!lret, "ImmGetDescriptionA should fail\n"); + ret = ImmGetDescriptionW(hkl, descW, 1); ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret);

1 0

Jacek Caban : mshtml: Added IHTMLFormElement::sumit tests.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 66988a681a6bf8d04eb93d75dd33e6665b9099b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66988a681a6bf8d04eb93d75d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 27 15:22:43 2013 +0200 mshtml: Added IHTMLFormElement::sumit tests. --- dlls/mshtml/tests/htmldoc.c | 228 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 216 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66988a681a6bf8d04eb93…

1 0

Jacek Caban : mshtml: Try to not use nsIDOMHTMLFormElement:: Submit for IHTMLFormElelement::submit implementation.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: e61de218ee3f0924252ea690be72f01d8c9bfb05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61de218ee3f0924252ea690b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 27 15:22:30 2013 +0200 mshtml: Try to not use nsIDOMHTMLFormElement::Submit for IHTMLFormElelement::submit implementation. --- dlls/mshtml/binding.h | 2 + dlls/mshtml/htmlform.c | 55 ++++++++++++++++-- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/navigate.c | 127 +++++++++++++++++++++++++++++------------- dlls/mshtml/persist.c | 50 ++++++++++++++++- 5 files changed, 191 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e61de218ee3f0924252ea…

1 0

Huw Davies : dbghelp: Skip the dllprefix when matching PE with ELF modules.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 5c7c954658ff330a43bbe53cd8d5dad423b75de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7c954658ff330a43bbe53cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 27 11:14:42 2013 +0100 dbghelp: Skip the dllprefix when matching PE with ELF modules. --- dlls/dbghelp/Makefile.in | 2 +- dlls/dbghelp/module.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 3fb7b52..a9bf073 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -1,6 +1,6 @@ MODULE = dbghelp.dll IMPORTLIB = dbghelp -EXTRADEFS = -D_IMAGEHLP_SOURCE_ +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DDLLPREFIX='"$(DLLPREFIX)"' IMPORTS = psapi DELAYIMPORTS = version EXTRALIBS = @ZLIB@ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 6bea436..521cdb3f 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -422,6 +422,16 @@ static BOOL module_is_container_loaded(const struct process* pcs, size_t len; struct module* module; PCWSTR filename, modname; + static WCHAR* dll_prefix; + static int dll_prefix_len; + + if (!dll_prefix) + { + dll_prefix_len = MultiByteToWideChar( CP_UNIXCP, 0, DLLPREFIX, -1, NULL, 0 ); + dll_prefix = HeapAlloc( GetProcessHeap(), 0, dll_prefix_len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, DLLPREFIX, -1, dll_prefix, dll_prefix_len ); + dll_prefix_len--; + } if (!base) return FALSE; filename = get_filename(ImageName, NULL); @@ -434,6 +444,7 @@ static BOOL module_is_container_loaded(const struct process* pcs, base < module->module.BaseOfImage + module->module.ImageSize) { modname = get_filename(module->module.LoadedImageName, NULL); + if (dll_prefix_len && !strncmpW( modname, dll_prefix, dll_prefix_len )) modname += dll_prefix_len; if (!strncmpiW(modname, filename, len) && !memcmp(modname + len, S_DotSoW, 3 * sizeof(WCHAR))) {

1 0

Piotr Caban : msvcr90: Don't forward exception constructors to msvcrt.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 8b21fefbf66595849e837c91811ab6627164c111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b21fefbf66595849e837c918… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 12:00:44 2013 +0200 msvcr90: Don't forward exception constructors to msvcrt. --- dlls/msvcr90/msvcr90.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 16 ++++---- 2 files changed, 89 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 4787867..7640738 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -18,17 +18,58 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <config.h> + #include <stdarg.h> #include "stdio.h" #include "windef.h" #include "winbase.h" +#ifdef __i386__ + +#define THISCALL(func) __thiscall_ ## func +#define __thiscall __stdcall +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) + +extern void *call_thiscall_func; +__ASM_GLOBAL_FUNC(call_thiscall_func, + "popl %eax\n\t" + "popl %edx\n\t" + "popl %ecx\n\t" + "pushl %eax\n\t" + "jmp *%edx\n\t") + +#define call_func1(func,this) ((void* (WINAPI*)(void*,void*))&call_thiscall_func)(func,this) +#define call_func2(func,this,a) ((void* (WINAPI*)(void*,void*,const void*))&call_thiscall_func)(func,this,(const void*)(a)) +#define call_func3(func,this,a,b) ((void* (WINAPI*)(void*,void*,const void*,const void*))&call_thiscall_func)(func,this,(const void*)(a),(const void*)(b)) + +#else /* __i386__ */ + +#define __thiscall __cdecl +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ + +#define call_func1(func,this) func(this) +#define call_func2(func,this,a) func(this,a) +#define call_func3(func,this,a,b) func(this,a,b) + +#endif /* __i386__ */ + typedef void (__cdecl *MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); static void* (__cdecl *MSVCRT_operator_new)(size_t); static void (__cdecl *MSVCRT_operator_delete)(void*); static MSVCRT__se_translator_function (__cdecl *MSVCRT__set_se_translator)(MSVCRT__se_translator_function); +static void* (__thiscall *MSVCRT_exception_ctor)(void*, const char**); +static void* (__thiscall *MSVCRT_exception_ctor_noalloc)(void*, char**, int); +static void* (__thiscall *MSVCRT_exception_copy_ctor)(void*, const void*); +static void (__thiscall *MSVCRT_exception_dtor)(void*); static void init_cxx_funcs(void) { @@ -40,6 +81,10 @@ static void init_cxx_funcs(void) MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z"); MSVCRT__set_se_translator = (void*)GetProcAddress(hmod, "?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z"); + MSVCRT_exception_ctor = (void*)GetProcAddress(hmod, "??0exception@@QEAA@AEBQEBD@Z"); + MSVCRT_exception_ctor_noalloc = (void*)GetProcAddress(hmod, "??0exception@@QEAA@AEBQEBDH@Z"); + MSVCRT_exception_copy_ctor = (void*)GetProcAddress(hmod, "??0exception@@QEAA@AEBV0@@Z"); + MSVCRT_exception_dtor = (void*)GetProcAddress(hmod, "??1exception@@UEAA@XZ"); } else { @@ -47,6 +92,10 @@ static void init_cxx_funcs(void) MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z"); MSVCRT__set_se_translator = (void*)GetProcAddress(hmod, "?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z"); + MSVCRT_exception_ctor = (void*)GetProcAddress(hmod, "??0exception@@QAE@ABQBD@Z"); + MSVCRT_exception_ctor_noalloc = (void*)GetProcAddress(hmod, "??0exception@@QAE@ABQBDH@Z"); + MSVCRT_exception_copy_ctor = (void*)GetProcAddress(hmod, "??0exception@@QAE@ABV0@@Z"); + MSVCRT_exception_dtor = (void*)GetProcAddress(hmod, "??1exception@@UAE@XZ"); } } @@ -116,3 +165,35 @@ MSVCRT__se_translator_function CDECL MSVCR90__set_se_translator(MSVCRT__se_trans { return MSVCRT__set_se_translator(func); } + +/* ??0exception@std@@QAE@ABQBD@Z */ +/* ??0exception@std@@QEAA@AEBQEBD@Z */ +DEFINE_THISCALL_WRAPPER(exception_ctor, 8) +void* __thiscall exception_ctor(void *this, const char **name) +{ + return call_func2(MSVCRT_exception_ctor, this, name); +} + +/* ??0exception@std@@QAE@ABQBDH@Z */ +/* ??0exception@std@@QEAA@AEBQEBDH@Z */ +DEFINE_THISCALL_WRAPPER(exception_ctor_noalloc, 12) +void* __thiscall exception_ctor_noalloc(void *this, char **name, int noalloc) +{ + return call_func3(MSVCRT_exception_ctor_noalloc, this, name, noalloc); +} + +/* ??0exception@std@@QAE@ABV01@@Z */ +/* ??0exception@std@@QEAA@AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(exception_copy_ctor, 8) +void* __thiscall exception_copy_ctor(void *this, const void *rhs) +{ + return call_func2(MSVCRT_exception_copy_ctor, this, rhs); +} + +/* ??1exception@std@@UAE@XZ */ +/* ??1exception@std@@UEAA@XZ */ +DEFINE_THISCALL_WRAPPER(exception_dtor, 4) +void __thiscall exception_dtor(void *this) +{ + call_func1(MSVCRT_exception_dtor, this); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3632599..36cf2e4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -12,12 +12,12 @@ @ cdecl -arch=win64 ??0bad_typeid@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0bad_typeid@@QEAA@AEBV0@@Z @ thiscall -arch=i386 ??0bad_typeid@std@@QAE@PBD@Z(ptr str) msvcrt.??0bad_typeid@@QAE@PBD@Z @ cdecl -arch=win64 ??0bad_typeid@std@@QEAA@PEBD@Z(ptr str) msvcrt.??0bad_typeid@@QEAA@PEBD@Z -@ thiscall -arch=i386 ??0exception@std@@QAE@ABQBD@Z(ptr ptr) msvcrt.??0exception@@QAE@ABQBD@Z -@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBD@Z(ptr ptr) msvcrt.??0exception@@QEAA@AEBQEBD@Z -@ thiscall -arch=i386 ??0exception@std@@QAE@ABQBDH@Z(ptr ptr long) msvcrt.??0exception@@QAE@ABQBDH@Z -@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBDH@Z(ptr ptr long) msvcrt.??0exception@@QEAA@AEBQEBDH@Z -@ thiscall -arch=i386 ??0exception@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0exception@@QAE@ABV0@@Z -@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0exception@@QEAA@AEBV0@@Z +@ thiscall -arch=i386 ??0exception@std@@QAE@ABQBD@Z(ptr ptr) exception_ctor +@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBD@Z(ptr ptr) exception_ctor +@ thiscall -arch=i386 ??0exception@std@@QAE@ABQBDH@Z(ptr ptr long) exception_ctor_noalloc +@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBDH@Z(ptr ptr long) exception_ctor_noalloc +@ thiscall -arch=i386 ??0exception@std@@QAE@ABV01@@Z(ptr ptr) exception_copy_ctor +@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBV01@@Z(ptr ptr) exception_copy_ctor @ thiscall -arch=i386 ??0exception@std@@QAE@XZ(ptr) msvcrt.??0exception@@QAE@XZ @ cdecl -arch=win64 ??0exception@std@@QEAA@XZ(ptr) msvcrt.??0exception@@QEAA@XZ @ thiscall -arch=i386 ??1__non_rtti_object@std@@UAE@XZ(ptr) msvcrt.??1__non_rtti_object@@UAE@XZ @@ -26,8 +26,8 @@ @ cdecl -arch=win64 ??1bad_cast@std@@UEAA@XZ(ptr) msvcrt.??1bad_cast@@UEAA@XZ @ thiscall -arch=i386 ??1bad_typeid@std@@UAE@XZ(ptr) msvcrt.??1bad_typeid@@UAE@XZ @ cdecl -arch=win64 ??1bad_typeid@std@@UEAA@XZ(ptr) msvcrt.??1bad_typeid@@UEAA@XZ -@ thiscall -arch=i386 ??1exception@std@@UAE@XZ(ptr) msvcrt.??1exception@@UAE@XZ -@ cdecl -arch=win64 ??1exception@std@@UEAA@XZ(ptr) msvcrt.??1exception@@UEAA@XZ +@ thiscall -arch=i386 ??1exception@std@@UAE@XZ(ptr) exception_dtor +@ cdecl -arch=win64 ??1exception@std@@UEAA@XZ(ptr) exception_dtor @ cdecl -arch=arm ??1type_info@@UAA@XZ(ptr) msvcrt.??1type_info@@UAA@XZ @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) msvcrt.??1type_info@@UAE@XZ @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) msvcrt.??1type_info@@UEAA@XZ

1 0

Frédéric Delanoy : user32: Use BOOL type where appropriate.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 2dd332789b5816c41e7598c4b9e933548656b69d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd332789b5816c41e7598c4b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 27 08:43:21 2013 +0200 user32: Use BOOL type where appropriate. --- dlls/user32/text.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index a32792e..12432b8 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -357,7 +357,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, unsigned int *chars_used, SIZE *size) { WCHAR *p; - int word_fits; + BOOL word_fits; SCRIPT_LOGATTR *sla; SCRIPT_ANALYSIS sa; int i; @@ -395,7 +395,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, /* If there was one or the first character didn't fit then */ if (word_fits) { - int next_is_space; + BOOL next_is_space; /* break the line before/after that character */ if (!(format & (DT_RIGHT | DT_CENTER)) || *p != SPACE) p++; @@ -562,7 +562,7 @@ static int TEXT_Reprefix (const WCHAR *str, unsigned int ns, * newline representation or nothing */ -static int remainder_is_none_or_newline (int num_chars, const WCHAR *str) +static BOOL remainder_is_none_or_newline (int num_chars, const WCHAR *str) { if (!num_chars) return TRUE; if (*str != LF && *str != CR) return FALSE; @@ -615,10 +615,8 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, int seg_i, seg_count, seg_j; int max_seg_width; int num_fit; - int word_broken; - int line_fits; + BOOL word_broken, line_fits, ellipsified; unsigned int j_in_seg; - int ellipsified; *pprefix_offset = -1; /* For each text segment in the line */ @@ -699,7 +697,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, * combined, and may differ between versions (to say nothing of the * several bugs in the Microsoft versions). */ - word_broken = 0; + word_broken = FALSE; line_fits = (num_fit >= j_in_seg); if (!line_fits && (format & DT_WORDBREAK)) { @@ -712,19 +710,19 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, TEXT_SkipChars (count, &s, seg_count, str+seg_i, i-seg_i, chars_used, !(format & DT_NOPREFIX)); i = s - str; - word_broken = 1; + word_broken = TRUE; } pellip->before = j_in_seg; pellip->under = 0; pellip->after = 0; pellip->len = 0; - ellipsified = 0; + ellipsified = FALSE; if (!line_fits && (format & DT_PATH_ELLIPSIS)) { TEXT_PathEllipsify (hdc, dest + seg_j, maxl-seg_j, &j_in_seg, max_seg_width, &size, *p_retstr, pellip); line_fits = (size.cx <= max_seg_width); - ellipsified = 1; + ellipsified = TRUE; } /* NB we may end up ellipsifying a word-broken or path_ellipsified * string */ @@ -885,7 +883,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; ellipsis_data ellip; - int invert_y=0; + BOOL invert_y=FALSE; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); @@ -935,7 +933,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, GetWindowExtEx(hdc, &window_ext); GetViewportExtEx(hdc, &viewport_ext); if ((window_ext.cy > 0) != (viewport_ext.cy > 0)) - invert_y = 1; + invert_y = TRUE; } if (dtp)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
65
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 September 2013