October 2016 - Wine-Commits

Huw Davies : wordpad: Add list labelling menu.
by Alexandre Julliard Oct. 10, 2016

Oct. 10, 2016

Module: wine Branch: master Commit: c11d931ea33068faeae931430de7a23a722310e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11d931ea33068faeae931430… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 13:13:05 2016 +0100 wordpad: Add list labelling menu. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 38 +++++++++++++++++++++++++++++++------- programs/wordpad/wordpad.h | 12 +++++++++--- programs/wordpad/wordpad.rc | 10 +++++++++- 3 files changed, 49 insertions(+), 11 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index ea6e11d..dc3918e 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -79,6 +79,8 @@ static WCHAR units_inW[MAX_STRING_LEN]; static WCHAR units_inchW[MAX_STRING_LEN]; static WCHAR units_ptW[MAX_STRING_LEN]; +static int last_bullet = PFN_BULLET; + static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ); typedef enum @@ -1886,7 +1888,7 @@ static LRESULT OnCreate( HWND hWnd ) AddButton(hFormatBarWnd, 5, ID_ALIGN_CENTER); AddButton(hFormatBarWnd, 6, ID_ALIGN_RIGHT); AddSeparator(hFormatBarWnd); - AddButton(hFormatBarWnd, 7, ID_BULLET); + AddButton(hFormatBarWnd, 7, ID_BULLETONOFF); SendMessageW(hFormatBarWnd, TB_AUTOSIZE, 0, 0); @@ -1994,7 +1996,7 @@ static LRESULT OnUser( HWND hWnd ) SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_ALIGN_CENTER, (pf.wAlignment == PFA_CENTER)); SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_ALIGN_RIGHT, (pf.wAlignment == PFA_RIGHT)); - SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_BULLET, (pf.wNumbering & PFN_BULLET)); + SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_BULLETONOFF, pf.wNumbering ? TRUE : FALSE); return 0; } @@ -2351,30 +2353,45 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessageW(hwndEditor, EM_REDO, 0, 0); return 0; + case ID_BULLETONOFF: case ID_BULLET: + case ID_NUMBERING: + case ID_LCLETTER: + case ID_UCLETTER: + case ID_LCROMAN: + case ID_UCROMAN: { PARAFORMAT2 pf; - + WORD new_number = LOWORD(wParam) - ID_BULLET + PFN_BULLET; pf.cbSize = sizeof(pf); pf.dwMask = PFM_NUMBERING; SendMessageW(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf); - pf.dwMask = PFM_NUMBERING | PFM_NUMBERINGSTART | PFM_NUMBERINGTAB | PFM_OFFSET | PFM_OFFSETINDENT; + pf.dwMask = PFM_NUMBERING | PFM_NUMBERINGSTART | PFM_NUMBERINGSTYLE | PFM_NUMBERINGTAB | PFM_OFFSET | PFM_OFFSETINDENT; - if(pf.wNumbering == PFN_BULLET) + if(pf.wNumbering && ((pf.wNumbering == new_number) || (LOWORD(wParam) == ID_BULLETONOFF))) { pf.wNumbering = 0; pf.wNumberingStart = 0; + pf.wNumberingStyle = 0; pf.wNumberingTab = 0; pf.dxOffset = 0; pf.dxStartIndent = -360; } else { - pf.wNumbering = PFN_BULLET; + pf.dxStartIndent = pf.wNumbering ? 0 : 360; + + if (LOWORD(wParam) == ID_BULLETONOFF) + pf.wNumbering = last_bullet; + else + { + pf.wNumbering = new_number; + last_bullet = pf.wNumbering; + } pf.wNumberingStart = 1; + pf.wNumberingStyle = PFNS_PERIOD; pf.wNumberingTab = 360; pf.dxOffset = 360; - pf.dxStartIndent = 360; } SendMessageW(hwndEditor, EM_SETPARAFORMAT, 0, (LPARAM)&pf); @@ -2502,7 +2519,14 @@ static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam ) CheckMenuItem(hMenu, ID_ALIGN_LEFT, (nAlignment == PFA_LEFT) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, ID_ALIGN_CENTER, (nAlignment == PFA_CENTER) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, ID_ALIGN_RIGHT, (nAlignment == PFA_RIGHT) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_BULLET, ((pf.wNumbering == PFN_BULLET) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(hMenu, ID_NUMBERING, ((pf.wNumbering == PFN_ARABIC) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(hMenu, ID_LCLETTER, ((pf.wNumbering == PFN_LCLETTER) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(hMenu, ID_UCLETTER, ((pf.wNumbering == PFN_UCLETTER) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(hMenu, ID_LCROMAN, ((pf.wNumbering == PFN_LCROMAN) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(hMenu, ID_UCROMAN, ((pf.wNumbering == PFN_UCROMAN) ? MF_CHECKED : MF_UNCHECKED)); + EnableMenuItem(hMenu, ID_EDIT_UNDO, SendMessageW(hwndEditor, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(hMenu, ID_EDIT_REDO, SendMessageW(hwndEditor, EM_CANREDO, 0, 0) ? diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 0cde557..901b19c 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -73,9 +73,15 @@ #define ID_EDIT_CUT 1311 #define ID_EDIT_PASTE 1312 #define ID_EDIT_CLEAR 1313 -#define ID_BULLET 1314 - -#define ID_FONTSETTINGS 1315 +#define ID_BULLETONOFF 1314 +#define ID_BULLET 1315 +#define ID_NUMBERING 1316 +#define ID_LCLETTER 1317 +#define ID_UCLETTER 1318 +#define ID_LCROMAN 1319 +#define ID_UCROMAN 1320 + +#define ID_FONTSETTINGS 1330 #define ID_FORMAT_BOLD 1400 #define ID_FORMAT_ITALIC 1401 diff --git a/programs/wordpad/wordpad.rc b/programs/wordpad/wordpad.rc index ff4f823..147beea 100644 --- a/programs/wordpad/wordpad.rc +++ b/programs/wordpad/wordpad.rc @@ -81,7 +81,15 @@ BEGIN POPUP "F&ormat" BEGIN MENUITEM "&Font...", ID_FONTSETTINGS - MENUITEM "&Bullet points" ID_BULLET + POPUP "&Lists" + BEGIN + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "Numbers" ID_NUMBERING + MENUITEM "Letters - lower case" ID_LCLETTER + MENUITEM "Letters - upper case" ID_UCLETTER + MENUITEM "Roman numerals - lower case" ID_LCROMAN + MENUITEM "Roman numerals - upper case" ID_UCROMAN + END MENUITEM "&Paragraph..." ID_PARAFORMAT MENUITEM "&Tabs..." ID_TABSTOPS POPUP "Backgroun&d"

1 0

Huw Davies : riched20: Add support for arabic number labelled lists.
by Alexandre Julliard Oct. 10, 2016

Oct. 10, 2016

Module: wine Branch: master Commit: db783986dcbad4f9f4c25db7bfda893148e5acab URL: http://source.winehq.org/git/wine.git/?a=commit;h=db783986dcbad4f9f4c25db7b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 13:13:02 2016 +0100 riched20: Add support for arabic number labelled lists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 1 + dlls/riched20/para.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++--- dlls/riched20/string.c | 6 +-- 3 files changed, 100 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7d46692..237036c 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -101,6 +101,7 @@ void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) DECLSPEC_HIDDEN; ME_String *ME_MakeStringConst(const WCHAR *str, int len) DECLSPEC_HIDDEN; +ME_String *ME_MakeStringEmpty(int len) DECLSPEC_HIDDEN; void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN; BOOL ME_AppendString(ME_String *s, const WCHAR *append, int len) DECLSPEC_HIDDEN; ME_String *ME_VSplitString(ME_String *orig, int nVPos) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 3c62da2..ffd0a1d 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -128,6 +128,59 @@ static void ME_UpdateTableFlags(ME_DisplayItem *para) para->member.para.fmt.wEffects &= ~PFE_TABLE; } +static inline BOOL para_num_same_list( const PARAFORMAT2 *item, const PARAFORMAT2 *base ) +{ + return item->wNumbering == base->wNumbering && + item->wNumberingStart == base->wNumberingStart && + item->wNumberingStyle == base->wNumberingStyle && + !(item->wNumberingStyle & PFNS_NEWNUMBER); +} + +static int para_num_get_num( ME_Paragraph *para ) +{ + ME_DisplayItem *prev; + int num = para->fmt.wNumberingStart; + + for (prev = para->prev_para; prev->type == diParagraph; + para = &prev->member.para, prev = prev->member.para.prev_para, num++) + { + if (!para_num_same_list( &prev->member.para.fmt, &para->fmt )) break; + } + return num; +} + +static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) +{ + /* max 5 digits + '(' + ')' */ + ME_String *str = ME_MakeStringEmpty( 5 + 2 ); + WCHAR *p = str->szData; + static const WCHAR fmtW[] = {'%', 'd', 0}; + + if (!str) return NULL; + + if ((para->fmt.wNumberingStyle & 0xf00) == PFNS_PARENS) + *p++ = '('; + + p += sprintfW( p, fmtW, num ); + + switch (para->fmt.wNumberingStyle & 0xf00) + { + case PFNS_PARENS: + case PFNS_PAREN: + *p++ = ')'; + *p = 0; + break; + + case PFNS_PERIOD: + *p++ = '.'; + *p = 0; + break; + } + + str->nLen = p - str->szData; + return str; +} + void para_num_init( ME_Context *c, ME_Paragraph *para ) { ME_Style *style; @@ -144,18 +197,28 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) { style = para->eop_run->style; - cf.cbSize = sizeof(cf); - cf.dwMask = CFM_FACE | CFM_CHARSET; - memcpy( cf.szFaceName, bullet_font, sizeof(bullet_font) ); - cf.bCharSet = SYMBOL_CHARSET; - style = ME_ApplyStyle( c->editor, style, &cf ); + if (para->fmt.wNumbering == PFN_BULLET) + { + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_FACE | CFM_CHARSET; + memcpy( cf.szFaceName, bullet_font, sizeof(bullet_font) ); + cf.bCharSet = SYMBOL_CHARSET; + style = ME_ApplyStyle( c->editor, style, &cf ); + } + else + { + ME_AddRefStyle( style ); + } para->para_num.style = style; } if (!para->para_num.text) { - para->para_num.text = ME_MakeStringConst( bullet_str, 1 ); + if (para->fmt.wNumbering != PFN_BULLET) + para->para_num.text = para_num_get_str( para, para_num_get_num( para ) ); + else + para->para_num.text = ME_MakeStringConst( bullet_str, 1 ); } old_font = ME_SelectStyleFont( c, para->para_num.style ); @@ -177,6 +240,17 @@ void para_num_clear( struct para_num *pn ) pn->text = NULL; } +static void para_num_clear_list( ME_Paragraph *para, const PARAFORMAT2 *orig_fmt ) +{ + do + { + para->nFlags |= MEPF_REWRAP; + para_num_clear( &para->para_num ); + if (para->next_para->type != diParagraph) break; + para = &para->next_para->member.para; + } while (para_num_same_list( &para->fmt, orig_fmt )); +} + static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PARAFORMAT2 *pFmt) { PARAFORMAT2 copy; @@ -244,7 +318,15 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PA #undef COPY_FIELD if (memcmp(&copy, &para->fmt, sizeof(PARAFORMAT2))) + { para->nFlags |= MEPF_REWRAP; + if (((dwMask & PFM_NUMBERING) && (copy.wNumbering != para->fmt.wNumbering)) || + ((dwMask & PFM_NUMBERINGSTART) && (copy.wNumberingStart != para->fmt.wNumberingStart)) || + ((dwMask & PFM_NUMBERINGSTYLE) && (copy.wNumberingStyle != para->fmt.wNumberingStyle))) + { + para_num_clear_list( para, &copy ); + } + } return TRUE; } @@ -277,6 +359,10 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, run_para = ME_GetParagraph(run); assert(run_para->member.para.fmt.cbSize == sizeof(PARAFORMAT2)); + /* Clear any cached para numbering following this paragraph */ + if (run_para->member.para.fmt.wNumbering) + para_num_clear_list( &run_para->member.para, &run_para->member.para.fmt ); + new_para->member.para.text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); end_run = ME_MakeRun(style, run_flags); @@ -399,6 +485,10 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, assert(tp->member.para.next_para); assert(tp->member.para.next_para->type == diParagraph); + /* Clear any cached para numbering following this paragraph */ + if (tp->member.para.fmt.wNumbering) + para_num_clear_list( &tp->member.para, &tp->member.para.fmt ); + pNext = tp->member.para.next_para; /* Need to locate end-of-paragraph run here, in order to know end_len */ diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 47aceca..cfb149a 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -55,7 +55,7 @@ static void heap_string_free(ME_String *s) } /* Create a buffer (uninitialized string) of size nMaxChars */ -static ME_String *ME_MakeStringB(int nMaxChars) +ME_String *ME_MakeStringEmpty(int nMaxChars) { ME_String *s = make_string( heap_string_free ); @@ -74,7 +74,7 @@ static ME_String *ME_MakeStringB(int nMaxChars) ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) { - ME_String *s = ME_MakeStringB(nMaxChars); + ME_String *s = ME_MakeStringEmpty(nMaxChars); if (!s) return NULL; memcpy(s->szData, szText, s->nLen * sizeof(WCHAR)); @@ -85,7 +85,7 @@ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) { int i; - ME_String *s = ME_MakeStringB(nMaxChars); + ME_String *s = ME_MakeStringEmpty(nMaxChars); if (!s) return NULL; for (i = 0; i < nMaxChars; i++)

1 0

Józef Kucia : wined3d: Call GL functions through gl_info.gl_ops in context_dump_fbo_attachment() .
by Alexandre Julliard Oct. 10, 2016

Oct. 10, 2016

Module: wine Branch: master Commit: 4116d72078ef7bca677254070f0eeb3c2d450123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4116d72078ef7bca677254070… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 10 10:22:37 2016 +0200 wined3d: Call GL functions through gl_info.gl_ops in context_dump_fbo_attachment(). 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 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 25a3ac6..87d417c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -266,10 +266,10 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G { gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &old_texture); - glBindTexture(GL_TEXTURE_CUBE_MAP, name); - glGetTexLevelParameteriv(face, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); - glGetTexLevelParameteriv(face, level, GL_TEXTURE_WIDTH, &width); - glGetTexLevelParameteriv(face, level, GL_TEXTURE_HEIGHT, &height); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP, name); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(face, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(face, level, GL_TEXTURE_WIDTH, &width); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(face, level, GL_TEXTURE_HEIGHT, &height); tex_target = GL_TEXTURE_CUBE_MAP; tex_type_str = "cube"; @@ -287,14 +287,14 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture); while (gl_info->gl_ops.gl.p_glGetError()); - glBindTexture(texture_type[i].target, name); + gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, name); if (!gl_info->gl_ops.gl.p_glGetError()) { tex_target = texture_type[i].target; tex_type_str = texture_type[i].str; break; } - glBindTexture(texture_type[i].target, old_texture); + gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, old_texture); } if (!tex_type_str) { @@ -302,15 +302,15 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G return; } - glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); - glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); - glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); } FIXME(" %s: %s texture %d, %dx%d, format %#x.\n", debug_fboattachment(attachment), tex_type_str, name, width, height, fmt); - glBindTexture(tex_target, old_texture); + gl_info->gl_ops.gl.p_glBindTexture(tex_target, old_texture); checkGLcall("Guess texture type"); } else if (type == GL_NONE)

1 0

Józef Kucia : wined3d: Get wined3d creation flags from d3d_info.
by Alexandre Julliard Oct. 10, 2016

Oct. 10, 2016

Module: wine Branch: master Commit: 9f85ec5082a55ac430ea548bacecdaf4997d425c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f85ec5082a55ac430ea548ba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 10 10:22:33 2016 +0200 wined3d: Get wined3d creation flags from d3d_info. 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/glsl_shader.c | 6 +++--- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3d5e03f..4d9d9e7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1160,7 +1160,7 @@ static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_con return; get_modelview_matrix(context, state, 0, &mv); - if (context->device->wined3d->flags & WINED3D_LEGACY_FFP_LIGHTING) + if (context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_FFP_LIGHTING) invert_matrix_3d(&mv, &mv); else invert_matrix(&mv, &mv); @@ -2203,7 +2203,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont { if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) { - if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "layout(%spixel_center_integer) in vec4 gl_FragCoord;\n", ps_args->render_offscreen ? "" : "origin_upper_left, "); else if (!ps_args->render_offscreen) @@ -5948,7 +5948,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context { if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) shader_addline(buffer, "vpos = gl_FragCoord;\n"); - else if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + else if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); else diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 71f47d6..9c1ddb0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1712,7 +1712,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 gl_info->gl_ops.gl.p_glEnable(GL_POLYGON_OFFSET_FILL); checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL)"); - if (context->device->wined3d->flags & WINED3D_LEGACY_DEPTH_BIAS) + if (context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_DEPTH_BIAS) { float bias = -(float)const_bias.d; gl_info->gl_ops.gl.p_glPolygonOffset(bias, bias); @@ -4655,7 +4655,7 @@ static void viewport_miscpart_cc(struct wined3d_context *context, const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; /* See get_projection_matrix() in utils.c for a discussion about those * values. */ - float pixel_center_offset = context->device->wined3d->flags + float pixel_center_offset = context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : -1.0f / 128.0f; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_viewport vp = state->viewport; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2d86b51..2171611 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4513,7 +4513,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w * driver, but small enough to prevent it from interfering with any * anti-aliasing. */ - if (!clip_control && context->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + if (!clip_control && context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else center_offset = -1.0f / 64.0f; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3887f91..45701cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3524,7 +3524,7 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte { float center_offset; - if (context->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else center_offset = -1.0f / 64.0f;

1 0

Vincent Povirk : gdiplus: Add FIXME for EMF records we need to implement.
by Alexandre Julliard Oct. 10, 2016

Oct. 10, 2016

Module: wine Branch: master Commit: 2054c8fe6ffcab3ea22756a664eb00cadece1bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2054c8fe6ffcab3ea22756a66… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 7 16:03:42 2016 -0500 gdiplus: Add FIXME for EMF records we need to implement. These records cause state tracking in gdi32, but the state tracking doesn't work correctly because we didn't pass a DC to EnumEnhMetaFile. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f9ed14c..409a6c4 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1131,6 +1131,26 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { ENHMETARECORD *record; + switch (recordType) + { + case EMR_SETMAPMODE: + case EMR_SAVEDC: + case EMR_RESTOREDC: + case EMR_SETWINDOWORGEX: + case EMR_SETWINDOWEXTEX: + case EMR_SETVIEWPORTORGEX: + case EMR_SETVIEWPORTEXTEX: + case EMR_EXTSELECTCLIPRGN: + case EMR_SETWORLDTRANSFORM: + case EMR_SCALEVIEWPORTEXTEX: + case EMR_SCALEWINDOWEXTEX: + case EMR_MODIFYWORLDTRANSFORM: + FIXME("not implemented for record type %x\n", recordType); + break; + default: + break; + } + record = heap_alloc_zero(dataSize + 8); if (record)

1 0

Huw Davies : riched20: Add support for roman numeral labelled lists.
by Alexandre Julliard Oct. 10, 2016

Oct. 10, 2016

Module: wine Branch: master Commit: 0df058d84739689a9ddfdf71dc6eb55f2a7f09f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df058d84739689a9ddfdf71d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 13:13:04 2016 +0100 riched20: Add support for roman numeral labelled lists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index b762df7..d94e213 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -151,11 +151,24 @@ static int para_num_get_num( ME_Paragraph *para ) static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) { - /* max 5 digits + '(' + ')' */ - ME_String *str = ME_MakeStringEmpty( 5 + 2 ); + /* max 4 Roman letters (representing '8') / decade + '(' + ')' */ + ME_String *str = ME_MakeStringEmpty( 20 + 2 ); WCHAR *p = str->szData; static const WCHAR fmtW[] = {'%', 'd', 0}; static const WORD letter_base[] = { 1, 26, 26 * 26, 26 * 26 * 26 }; + /* roman_base should start on a '5' not a '1', otherwise the 'total' code will need adjusting. + 'N' and 'O' are what MS uses for 5000 and 10000, their version doesn't work well above 30000, + but we'll use 'P' as the obvious extension, this gets us up to 2^16, which is all we care about. */ + static const struct + { + int base; + char letter; + } + roman_base[] = + { + {50000, 'P'}, {10000, 'O'}, {5000, 'N'}, {1000, 'M'}, + {500, 'D'}, {100, 'C'}, {50, 'L'}, {10, 'X'}, {5, 'V'}, {1, 'I'} + }; int i, len; WORD letter, total, char_offset = 0; @@ -194,6 +207,40 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) p += len; *p = 0; break; + + case PFN_LCROMAN: + char_offset = 'a' - 'A'; + /* fall through */ + case PFN_UCROMAN: + if (!num) num = 1; + + for (i = 0; i < sizeof(roman_base) / sizeof(roman_base[0]); i++) + { + if (i > 0) + { + if (i % 2 == 0) /* eg 5000, check for 9000 */ + total = roman_base[i].base + 4 * roman_base[i + 1].base; + else /* eg 1000, check for 4000 */ + total = 4 * roman_base[i].base; + + if (num / total) + { + *p++ = roman_base[(i & ~1) + 1].letter + char_offset; + *p++ = roman_base[i - 1].letter + char_offset; + num -= total; + continue; + } + } + + len = num / roman_base[i].base; + while (len--) + { + *p++ = roman_base[i].letter + char_offset; + num -= roman_base[i].base; + } + } + *p = 0; + break; } switch (para->fmt.wNumberingStyle & 0xf00)

1 0

Józef Kucia : wined3d: Call GL functions through gl_info.gl_ops in ffp_blit_blit_surface().
by Alexandre Julliard Oct. 10, 2016

Oct. 10, 2016

Module: wine Branch: master Commit: 26a9c3a4e67c8bdcea58ad8068c0d5046f60d44c URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a9c3a4e67c8bdcea58ad806… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 10 10:22:34 2016 +0200 wined3d: Call GL functions through gl_info.gl_ops in ffp_blit_blit_surface(). 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/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 522874b..d44d0ba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3266,6 +3266,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_texture *src_texture = src_surface->container; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; /* Blit from offscreen surface to render target */ @@ -3277,15 +3278,16 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, color_key); context = context_acquire(device, dst_surface); + gl_info = context->gl_info; if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) - glEnable(GL_ALPHA_TEST); + gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); surface_blt_to_drawable(device, context, filter, !!color_key, src_surface, src_rect, dst_surface, dst_rect); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) - glDisable(GL_ALPHA_TEST); + gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); context_release(context);

1 0

Kimmo Myllyvirta : wined3d: Clear texture flag from correct format when color fixup is not supported.
by Alexandre Julliard Oct. 10, 2016

Oct. 10, 2016

Module: wine Branch: master Commit: a6911a13b8e016e4d3ff0c6f7e1f49a6f1cf1bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6911a13b8e016e4d3ff0c6f7… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Mon Oct 10 09:29:07 2016 +0300 wined3d: Clear texture flag from correct format when color fixup is not supported. Signed-off-by: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8e83040..2d86b51 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3245,7 +3245,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ if (!adapter->shader_backend->shader_color_fixup_supported(format->color_fixup) || !adapter->fragment_pipe->color_fixup_supported(format->color_fixup)) - format_clear_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_clear_flag(format, WINED3DFMT_FLAG_TEXTURE); } /* GL_EXT_texture_compression_s3tc does not support 3D textures. Some Windows drivers

1 0

Marcus Meissner : webservices: Add error checking (Coverity).
by Alexandre Julliard Oct. 10, 2016

Oct. 10, 2016

Module: wine Branch: master Commit: 9767b5ebcf15d40811448cd013e0c55a20edfbcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9767b5ebcf15d40811448cd01… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 9 09:40:57 2016 +0200 webservices: Add error checking (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 445d877..2b9c9d7 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -466,7 +466,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS if (!handle || !msg || !desc) return E_INVALIDARG; - WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + if ((hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL )) != S_OK) return hr; if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) return hr; if ((hr = message_set_action( msg, desc->action )) != S_OK) return hr;

1 0

Nikolay Sivov : include: Update to latest dwrite revision.
by Alexandre Julliard Oct. 10, 2016

Oct. 10, 2016

Module: wine Branch: master Commit: 04e64b138fbfff60e974cef31584e8bbaad72102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e64b138fbfff60e974cef31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 9 23:35:59 2016 +0300 include: Update to latest dwrite revision. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2dbasetypes.h | 12 ------ include/dcommon.h | 14 +++++++ include/dwrite_3.idl | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 12 deletions(-) diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index e5acff2..b231081 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -29,12 +29,6 @@ typedef struct D3DCOLORVALUE typedef D3DCOLORVALUE D2D_COLOR_F; -typedef struct D2D_POINT_2F -{ - FLOAT x; - FLOAT y; -} D2D_POINT_2F; - typedef struct D2D_MATRIX_3X2_F { float _11; @@ -59,12 +53,6 @@ typedef struct D2D_SIZE_F float height; } D2D_SIZE_F; -typedef struct D2D_SIZE_U -{ - UINT32 width; - UINT32 height; -} D2D_SIZE_U; - typedef struct D2D_POINT_2U { UINT32 x; diff --git a/include/dcommon.h b/include/dcommon.h index 56445a3..a516e8a 100644 --- a/include/dcommon.h +++ b/include/dcommon.h @@ -43,4 +43,18 @@ typedef struct D2D1_PIXEL_FORMAT D2D1_ALPHA_MODE alphaMode; } D2D1_PIXEL_FORMAT; +typedef struct D2D_POINT_2F +{ + FLOAT x; + FLOAT y; +} D2D_POINT_2F, D2D1_POINT_2F; + +typedef POINT D2D_POINT_2L, D2D1_POINT_2L; + +typedef struct D2D_SIZE_U +{ + UINT32 width; + UINT32 height; +} D2D_SIZE_U, D2D1_SIZE_U; + #endif /* __WINE_DCOMMON_H */ diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 9e7a4c6..afe7e84 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -397,3 +397,104 @@ interface IDWriteFactory3 : IDWriteFactory2 HRESULT GetFontDownloadQueue(IDWriteFontDownloadQueue **queue); } + +typedef enum DWRITE_GLYPH_IMAGE_FORMATS +{ + DWRITE_GLYPH_IMAGE_FORMATS_NONE = 0, + DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE = 1 << 0, + DWRITE_GLYPH_IMAGE_FORMATS_CFF = 1 << 1, + DWRITE_GLYPH_IMAGE_FORMATS_COLR = 1 << 2, + DWRITE_GLYPH_IMAGE_FORMATS_SVG = 1 << 3, + DWRITE_GLYPH_IMAGE_FORMATS_PNG = 1 << 4, + DWRITE_GLYPH_IMAGE_FORMATS_JPEG = 1 << 5, + DWRITE_GLYPH_IMAGE_FORMATS_TIFF = 1 << 6, + DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7 +} DWRITE_GLYPH_IMAGE_FORMATS; + +typedef struct DWRITE_GLYPH_IMAGE_DATA +{ + void const *imageData; + UINT32 imageDataSize; + UINT32 uniqueDataId; + UINT32 pixelsPerEm; + D2D1_SIZE_U pixelSize; + D2D1_POINT_2L horizontalLeftOrigin; + D2D1_POINT_2L horizontalRightOrigin; + D2D1_POINT_2L verticalTopOrigin; + D2D1_POINT_2L verticalBottomOrigin; +} DWRITE_GLYPH_IMAGE_DATA; + +[ + local, + object, + uuid(27f2a904-4eb8-441d-9678-0563f53e3e2f) +] +interface IDWriteFontFace4 : IDWriteFontFace3 +{ + HRESULT GetGlyphImageFormats_( + UINT16 glyph, + UINT32 ppem_first, + UINT32 ppem_last, + DWRITE_GLYPH_IMAGE_FORMATS *formats); + DWRITE_GLYPH_IMAGE_FORMATS GetGlyphImageFormats(); + HRESULT GetGlyphImageData( + UINT16 glyph, + UINT32 ppem, + DWRITE_GLYPH_IMAGE_FORMATS format, + DWRITE_GLYPH_IMAGE_DATA *data, + void **context); + void ReleaseGlyphImageData(void *context); +} + +typedef struct DWRITE_COLOR_GLYPH_RUN1 +{ + DWRITE_GLYPH_RUN glyphRun; + DWRITE_GLYPH_RUN_DESCRIPTION *glyphRunDescription; + FLOAT baselineOriginX; + FLOAT baselineOriginY; + DWRITE_COLOR_F runColor; + UINT16 paletteIndex; + DWRITE_GLYPH_IMAGE_FORMATS glyphImageFormat; + DWRITE_MEASURING_MODE measuringMode; +} DWRITE_COLOR_GLYPH_RUN1; + +[ + local, + object, + uuid(7c5f86da-c7a1-4f05-b8e1-55a179fe5a35) +] +interface IDWriteColorGlyphRunEnumerator1 : IDWriteColorGlyphRunEnumerator +{ + HRESULT GetCurrentRun( + DWRITE_COLOR_GLYPH_RUN1 const **run); +} + +[ + local, + object, + uuid(4b0b5bd3-0797-4549-8ac5-fe915cc53856) +] +interface IDWriteFactory4 : IDWriteFactory3 +{ + HRESULT TranslateColorGlyphRun( + D2D1_POINT_2F baseline_origin, + DWRITE_GLYPH_RUN const *run, + DWRITE_GLYPH_RUN_DESCRIPTION const *run_desc, + DWRITE_GLYPH_IMAGE_FORMATS desired_formats, + DWRITE_MEASURING_MODE measuring_mode, + DWRITE_MATRIX const *transform, + UINT32 palette, + IDWriteColorGlyphRunEnumerator1 **layers); + + HRESULT ComputeGlyphOrigins_( + DWRITE_GLYPH_RUN const *run, + D2D1_POINT_2F baseline_origin, + D2D1_POINT_2F *origins); + + HRESULT ComputeGlyphOrigins( + DWRITE_GLYPH_RUN const *run, + DWRITE_MEASURING_MODE measuring_mode, + D2D1_POINT_2F baseline_origin, + DWRITE_MATRIX const *transform, + D2D1_POINT_2F *origins); +}

1 0