wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Józef Kucia : wined3d: Avoid trying to get backup DC when context is no longer associated with swapchain.
by Alexandre Julliard 06 Oct '16

06 Oct '16

Module: wine Branch: master Commit: 6f7e0d3dba6e8be7973a955c27349c49c64e1434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7e0d3dba6e8be7973a955c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 5 11:17:05 2016 +0200 wined3d: Avoid trying to get backup DC when context is no longer associated with swapchain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f249587..89cc9ce 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1069,7 +1069,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) * a swapchain, so we can't use the swapchain to get a backup dc. To * make this work windowless contexts would need to be handled by the * device. */ - if (ctx->destroyed) + if (ctx->destroyed || !swapchain) { FIXME("Unable to get backup dc for destroyed context %p.\n", ctx); context_set_current(NULL);

1 0

Józef Kucia : wined3d: Avoid using "context-> swapchain" in context_update_window().
by Alexandre Julliard 06 Oct '16

06 Oct '16

Module: wine Branch: master Commit: 8673dca87df76b8f94be65c82e4a1a389c13dd9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8673dca87df76b8f94be65c82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 5 11:17:04 2016 +0200 wined3d: Avoid using "context->swapchain" in context_update_window(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e8d9abc..f249587 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1114,18 +1114,18 @@ static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HD } } -static void context_update_window(struct wined3d_context *context) +static void context_update_window(struct wined3d_context *context, HWND win_handle) { - if (context->win_handle == context->swapchain->win_handle) + if (context->win_handle == win_handle) return; TRACE("Updating context %p window from %p to %p.\n", - context, context->win_handle, context->swapchain->win_handle); + context, context->win_handle, win_handle); if (context->hdc) wined3d_release_dc(context->win_handle, context->hdc); - context->win_handle = context->swapchain->win_handle; + context->win_handle = win_handle; context->hdc_is_private = FALSE; context->hdc_has_format = FALSE; context->needs_set = 1; @@ -3519,6 +3519,7 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_surface *target) { struct wined3d_context *current_context = context_get_current(); + struct wined3d_swapchain *swapchain = NULL; struct wined3d_texture *target_texture; unsigned int target_sub_resource_idx; struct wined3d_context *context; @@ -3558,11 +3559,11 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str { context = current_context; } - else if (target_texture->swapchain) + else if ((swapchain = target_texture->swapchain)) { TRACE("Rendering onscreen.\n"); - context = swapchain_get_context(target_texture->swapchain); + context = swapchain_get_context(swapchain); } else { @@ -3571,13 +3572,19 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str /* Stay with the current context if possible. Otherwise use the * context for the primary swapchain. */ if (current_context && current_context->device == device) + { context = current_context; + } else - context = swapchain_get_context(device->swapchains[0]); + { + swapchain = device->swapchains[0]; + context = swapchain_get_context(swapchain); + } } context_enter(context); - context_update_window(context); + if (swapchain) + context_update_window(context, swapchain->win_handle); context_setup_target(context, target_texture, target_sub_resource_idx); if (!context->valid) return context;

1 0

Józef Kucia : wined3d: Store pointer to device in wined3d_context.
by Alexandre Julliard 06 Oct '16

06 Oct '16

Module: wine Branch: master Commit: 79787263cc847fdb32b8c7610499a9884775e3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=79787263cc847fdb32b8c7610… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 5 11:17:03 2016 +0200 wined3d: Store pointer to device in wined3d_context. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++++-------------- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context.c | 9 +++++---- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 20 ++++++++++---------- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 7 files changed, 34 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79787263cc847fdb32b8c…

1 0

Austin English : subst: Add stub program.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: 7756d6ba9b0213d5533eb5248e62716e7e8409b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7756d6ba9b0213d5533eb5248… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 5 01:04:59 2016 -0500 subst: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/subst/Makefile.in | 5 +++++ programs/subst/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index e4f23e7..e3181e0 100755 --- a/configure +++ b/configure @@ -1554,6 +1554,7 @@ enable_services enable_shutdown enable_spoolsv enable_start +enable_subst enable_svchost enable_systeminfo enable_taskkill @@ -18489,6 +18490,7 @@ wine_fn_config_test programs/services/tests services.exe_test wine_fn_config_program shutdown enable_shutdown install wine_fn_config_program spoolsv enable_spoolsv install wine_fn_config_program start enable_start clean,install +wine_fn_config_program subst enable_subst install wine_fn_config_program svchost enable_svchost install wine_fn_config_program systeminfo enable_systeminfo install wine_fn_config_program taskkill enable_taskkill clean,install diff --git a/configure.ac b/configure.ac index e97cd17..741a4ef 100644 --- a/configure.ac +++ b/configure.ac @@ -3580,6 +3580,7 @@ WINE_CONFIG_TEST(programs/services/tests) WINE_CONFIG_PROGRAM(shutdown,,[install]) WINE_CONFIG_PROGRAM(spoolsv,,[install]) WINE_CONFIG_PROGRAM(start,,[clean,install]) +WINE_CONFIG_PROGRAM(subst,,[install]) WINE_CONFIG_PROGRAM(svchost,,[install]) WINE_CONFIG_PROGRAM(systeminfo,,[install]) WINE_CONFIG_PROGRAM(taskkill,,[clean,install]) diff --git a/programs/subst/Makefile.in b/programs/subst/Makefile.in new file mode 100644 index 0000000..63d574f --- /dev/null +++ b/programs/subst/Makefile.in @@ -0,0 +1,5 @@ +MODULE = subst.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/subst/main.c b/programs/subst/main.c new file mode 100644 index 0000000..5af524d --- /dev/null +++ b/programs/subst/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(subst); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Piotr Caban : msvcp110: Fix num_get structure layout.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: a4be8a31e526a6657bc4a30b197d785048b8f5ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4be8a31e526a6657bc4a30b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 5 17:04:48 2016 +0200 msvcp110: Fix num_get structure layout. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 42 ++++++++++++++++++++++++++++++------------ dlls/msvcp90/msvcp90.h | 2 ++ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f5b13db..fe5bd33 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4926,7 +4926,9 @@ DEFINE_THISCALL_WRAPPER(num_get_wchar__Init, 8) void __thiscall num_get_wchar__Init(num_get *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER <= 100 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QAE@ABV_Locinfo@1@I@Z */ @@ -5145,11 +5147,18 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator wchar_t sep = 0, digits[11], *digits_pos; const char *grouping, *groups; BOOL error = FALSE, got_digit = FALSE, got_nonzero = FALSE; + const _Cvtvec *cvt; TRACE("(%p %p %p %p)\n", dest, first, last, loc); +#if _MSVCP_VER <= 100 + cvt = &this->cvt; +#else + cvt = &ctype_wchar_use_facet(loc)->cvt; +#endif + for(i=0; i<10; i++) - digits[i] = mb_to_wc('0'+i, &this->cvt); + digits[i] = mb_to_wc('0'+i, cvt); digits[10] = 0; numpunct_wchar_grouping(numpunct, &grouping_bstr); @@ -5163,10 +5172,10 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator istreambuf_iterator_wchar_val(first); /* get sign */ - if(first->strbuf && first->val==mb_to_wc('-', &this->cvt)) { + if(first->strbuf && first->val==mb_to_wc('-', cvt)) { *dest++ = '-'; istreambuf_iterator_wchar_inc(first); - }else if(first->strbuf && first->val==mb_to_wc('+', &this->cvt)) { + }else if(first->strbuf && first->val==mb_to_wc('+', cvt)) { *dest++ = '+'; istreambuf_iterator_wchar_inc(first); } @@ -5222,14 +5231,14 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator } /* read exponent, if any */ - if(first->strbuf && (first->val==mb_to_wc('e', &this->cvt) || first->val==mb_to_wc('E', &this->cvt))) { + if(first->strbuf && (first->val==mb_to_wc('e', cvt) || first->val==mb_to_wc('E', cvt))) { *dest++ = 'e'; istreambuf_iterator_wchar_inc(first); - if(first->strbuf && first->val==mb_to_wc('-', &this->cvt)) { + if(first->strbuf && first->val==mb_to_wc('-', cvt)) { *dest++ = '-'; istreambuf_iterator_wchar_inc(first); - }else if(first->strbuf && first->val==mb_to_wc('+', &this->cvt)) { + }else if(first->strbuf && first->val==mb_to_wc('+', cvt)) { *dest++ = '+'; istreambuf_iterator_wchar_inc(first); } @@ -5326,14 +5335,21 @@ static int num_get__Getifld(const num_get *this, char *dest, istreambuf_iterator char *dest_beg = dest, *dest_end = dest+24; const char *grouping, *groups; BOOL error = TRUE, dest_empty = TRUE, found_zero = FALSE; + const _Cvtvec *cvt; TRACE("(%p %p %p %04x %p)\n", dest, first, last, fmtflags, loc); +#if _MSVCP_VER <= 100 + cvt = &this->cvt; +#else + cvt = &ctype_wchar_use_facet(loc)->cvt; +#endif + for(i=0; i<10; i++) - digits[i] = mb_to_wc('0'+i, &this->cvt); + digits[i] = mb_to_wc('0'+i, cvt); for(i=0; i<6; i++) { - digits[10+i] = mb_to_wc('a'+i, &this->cvt); - digits[16+i] = mb_to_wc('A'+i, &this->cvt); + digits[10+i] = mb_to_wc('a'+i, cvt); + digits[16+i] = mb_to_wc('A'+i, cvt); } numpunct_wchar_grouping(numpunct, &grouping_bstr); @@ -5353,10 +5369,10 @@ static int num_get__Getifld(const num_get *this, char *dest, istreambuf_iterator base = 10; istreambuf_iterator_wchar_val(first); - if(first->strbuf && first->val==mb_to_wc('-', &this->cvt)) { + if(first->strbuf && first->val==mb_to_wc('-', cvt)) { *dest++ = '-'; istreambuf_iterator_wchar_inc(first); - }else if(first->strbuf && first->val==mb_to_wc('+', &this->cvt)) { + }else if(first->strbuf && first->val==mb_to_wc('+', cvt)) { *dest++ = '+'; istreambuf_iterator_wchar_inc(first); } @@ -5364,7 +5380,7 @@ static int num_get__Getifld(const num_get *this, char *dest, istreambuf_iterator if(first->strbuf && first->val==digits[0]) { found_zero = TRUE; istreambuf_iterator_wchar_inc(first); - if(first->strbuf && (first->val==mb_to_wc('x', &this->cvt) || first->val==mb_to_wc('X', &this->cvt))) { + if(first->strbuf && (first->val==mb_to_wc('x', cvt) || first->val==mb_to_wc('X', cvt))) { if(!base || base == 22) { found_zero = FALSE; istreambuf_iterator_wchar_inc(first); @@ -6191,7 +6207,9 @@ DEFINE_THISCALL_WRAPPER(num_get_char__Init, 8) void __thiscall num_get_char__Init(num_get *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER <= 100 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QAE@ABV_Locinfo@1@I@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index a841f91..86b787b 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -510,7 +510,9 @@ unsigned short __thiscall basic_streambuf_wchar_sputc(basic_streambuf_wchar*, wc /* class num_get<char> */ typedef struct { locale_facet facet; +#if _MSVCP_VER <= 100 _Cvtvec cvt; +#endif } num_get; num_get* num_get_char_use_facet(const locale*);

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: 3911780a8bafd3f4b4e71c5d9cf9706d189a34b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3911780a8bafd3f4b4e71c5d9… Author: Kim Malmo <berencamlost(a)msn.com> Date: Wed Oct 5 13:45:53 2016 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index def5854..f547e05 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8108,7 +8108,7 @@ msgstr "Min datamaskin" #: shell32.rc:159 msgid "Control Panel" -msgstr "Control Panel" +msgstr "Kontrollpanel" #: shell32.rc:166 msgid "Select" @@ -8462,7 +8462,7 @@ msgstr "%d byte" #: shlwapi.rc:31 msgctxt "time unit: hours" msgid " hr" -msgstr " hr" +msgstr " t" #: shlwapi.rc:32 msgctxt "time unit: minutes" @@ -8472,7 +8472,7 @@ msgstr " min" #: shlwapi.rc:33 msgctxt "time unit: seconds" msgid " sec" -msgstr " sec" +msgstr " sek" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -10217,7 +10217,7 @@ msgstr "" "XCOPY\t\tKopierer kildefiler eller et katalogtre til et mål\n" "EXIT\t\tAvslutter CMD\n" "\n" -"Skriv HELP <kommando> for mer informasjon om kommandoene ovenfor\n" +"Skriv HELP <kommando> for mer informasjon om kommandoene ovenfor.\n" #: cmd.rc:353 msgid "Are you sure?" @@ -11936,8 +11936,8 @@ msgstr "" " /? Vis denne informasjonen og avslutt.\n" " [filnavn] Plasseringen til filen som inneholder registerinformasjonen " "som\n" -" skal importeres. Når brukt med [/E], spesifiserer dette \n" -" alternativet plasseringen hvor registerinformasjonen vil \n" +" skal importeres. Når brukt med [/E], spesifiserer dette\n" +" alternativet plasseringen hvor registerinformasjonen vil\n" " bli eksportert.\n" " [reg_key] Registernøkkelen som skal modifiseres.\n" "\n" @@ -11987,8 +11987,8 @@ msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" -"regedit: Kan ikke konvertere heksadesimale data. En ugyldig verdi " -"inntraffved \"%1\".\n" +"regedit: Kan ikke konvertere heksadesimale data. En ugyldig verdi inntraff " +"ved \"%1\".\n" #: regedit.rc:370 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" @@ -12206,7 +12206,9 @@ msgstr "" msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" -msgstr "regsvr32: Ugyldig eller ukjent bryter [%1]\n" +msgstr "" +"regsvr32: Ugyldig eller ukjent bryter [%1]\n" +"\n" #: regsvr32.rc:42 msgid "regsvr32: Failed to load DLL '%1'\n"

1 0

Huw Davies : riched20: Remove an unnecessary call to ME_SaveTempStyle().
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: beffb6f671a5d420805a05511d812d2fef353bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beffb6f671a5d420805a05511… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 10:08:28 2016 +0100 riched20: Remove an unnecessary call to ME_SaveTempStyle(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d7abaa2..e2a44d3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2576,7 +2576,6 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, if(editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) { ME_Style *style = ME_GetInsertStyle(editor, 0); - ME_SaveTempStyle(editor, style); ME_ContinueCoalescingTransaction(editor); ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style);

1 0

Huw Davies : riched20: Set the format of the final eop to be that of the last char.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: e1f943863b9124b4eb40daf83fe16cf4a12849e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f943863b9124b4eb40daf83… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 10:08:27 2016 +0100 riched20: Set the format of the final eop to be that of the last char. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 12 +++++++++++- dlls/riched20/tests/editor.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 78cb50c..d7abaa2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1648,7 +1648,17 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (newto > to + (editor->bEmulateVersion10 ? 1 : 0)) { WCHAR lastchar[3] = {'\0', '\0'}; int linebreakSize = editor->bEmulateVersion10 ? 2 : 1; - ME_Cursor linebreakCursor = *selEnd; + ME_Cursor linebreakCursor = *selEnd, lastcharCursor = *selEnd; + CHARFORMAT2W cf; + + /* Set the final eop to the char fmt of the last char */ + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_ALL2; + ME_MoveCursorChars(editor, &lastcharCursor, -1, FALSE); + ME_GetCharFormat(editor, &lastcharCursor, &linebreakCursor, &cf); + ME_SetSelection(editor, newto, -1); + ME_SetSelectionCharFormat(editor, &cf); + ME_SetSelection(editor, newto, newto); ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize, FALSE); ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE, FALSE); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 218e20e..351695a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8372,6 +8372,42 @@ static void test_background(void) DestroyWindow(hwndRichEdit); } +static void test_eop_char_fmt(void) +{ + HWND edit = new_richedit( NULL ); + const char *rtf = "{\\rtf1{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 Arial;}{\\f1\\fnil\\fcharset2 Symbol;}}" + "{\\fs10{\\pard\\fs16\\fi200\\li360\\f0 First\\par" + "\\f0\\fs25 Second\\par" + "{\\f0\\fs26 Third}\\par" + "{\\f0\\fs22 Fourth}\\par}}}"; + EDITSTREAM es; + CHARFORMAT2W cf; + int i, num, expect_height; + + es.dwCookie = (DWORD_PTR)&rtf; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + num = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( num == 25, "got %d\n", num ); + + for (i = 0; i <= num; i++) + { + SendMessageW( edit, EM_SETSEL, i, i + 1 ); + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_SIZE; + SendMessageW( edit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf ); + ok( cf.dwMask & CFM_SIZE, "%d: got %08x\n", i, cf.dwMask ); + if (i < 6) expect_height = 160; + else if (i < 13) expect_height = 250; + else if (i < 18) expect_height = 260; + else if (i == 18 || i == 25) expect_height = 250; + else expect_height = 220; + ok( cf.yHeight == expect_height, "%d: got %d\n", i, cf.yHeight ); + } + + DestroyWindow( edit ); +} + START_TEST( editor ) { BOOL ret; @@ -8443,6 +8479,7 @@ START_TEST( editor ) test_alignment_style(); test_rtf_specials(); test_background(); + test_eop_char_fmt(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Huw Davies : riched20: Set a temporary insert style for the new paragraph.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: 2dbcddc6605e7e7ebad75e27774136063b6dd80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbcddc6605e7e7ebad75e277… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 10:08:26 2016 +0100 riched20: Set a temporary insert style for the new paragraph. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7b934fe..78cb50c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2392,7 +2392,6 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) } style = ME_GetInsertStyle(editor, 0); - ME_SaveTempStyle(editor, style); ME_ContinueCoalescingTransaction(editor); if (shift_is_down) ME_InsertEndRowFromCursor(editor, 0); @@ -2401,12 +2400,13 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_InsertTextFromCursor(editor, 0, &endl, 1, style); else ME_InsertTextFromCursor(editor, 0, endlv10, 2, style); - ME_ReleaseStyle(style); ME_CommitCoalescingUndo(editor); SetCursor(NULL); ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor, FALSE); + ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ + ME_ReleaseStyle(style); } return TRUE; }

1 0

Huw Davies : riched20: Alter ME_SaveTempStyle() to accept the new style.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: ac6a0d8923068ef99ccdb626fd2f2264ac2d198d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6a0d8923068ef99ccdb626f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 10:08:25 2016 +0100 riched20: Alter ME_SaveTempStyle() to accept the new style. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 6 +++--- dlls/riched20/editor.h | 2 +- dlls/riched20/style.c | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4adc74f..7b934fe 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2392,7 +2392,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) } style = ME_GetInsertStyle(editor, 0); - ME_SaveTempStyle(editor); + ME_SaveTempStyle(editor, style); ME_ContinueCoalescingTransaction(editor); if (shift_is_down) ME_InsertEndRowFromCursor(editor, 0); @@ -2566,7 +2566,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, if(editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) { ME_Style *style = ME_GetInsertStyle(editor, 0); - ME_SaveTempStyle(editor); + ME_SaveTempStyle(editor, style); ME_ContinueCoalescingTransaction(editor); ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style); @@ -4538,7 +4538,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_Style *style = ME_GetInsertStyle(editor, 0); hIMC = ITextHost_TxImmGetContext(editor->texthost); ME_DeleteSelection(editor); - ME_SaveTempStyle(editor); + ME_SaveTempStyle(editor, style); if (lParam & (GCS_RESULTSTR|GCS_COMPSTR)) { LPWSTR lpCompStr = NULL; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index c62b3a4..b0a8a1a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -76,7 +76,7 @@ ME_Style *ME_ApplyStyle(ME_TextEditor *ed, ME_Style *sSrc, CHARFORMAT2W *style) HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) DECLSPEC_HIDDEN; void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) DECLSPEC_HIDDEN; void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; -void ME_SaveTempStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; +void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) DECLSPEC_HIDDEN; void ME_ClearTempStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]) DECLSPEC_HIDDEN; void ME_DumpStyle(ME_Style *s) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 06c0e6f..0d2c16a 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -513,12 +513,13 @@ ME_Style *ME_GetInsertStyle(ME_TextEditor *editor, int nCursor) } } -void ME_SaveTempStyle(ME_TextEditor *editor) +void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) { ME_Style *old_style = editor->pBuffer->pCharStyle; - editor->pBuffer->pCharStyle = ME_GetInsertStyle(editor, 0); - if (old_style) - ME_ReleaseStyle(old_style); + + if (style) ME_AddRefStyle( style ); + editor->pBuffer->pCharStyle = style; + if (old_style) ME_ReleaseStyle( old_style ); } void ME_ClearTempStyle(ME_TextEditor *editor)

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
46
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 October 2016