October 2007 - Wine-commits

Stefan Dösinger : wined3d: Reverse the position fixup if the pshader is reading vpos.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 9c6cdda1472b45deb4ed1d90ddb802e4f56f6fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6cdda1472b45deb4ed1d90d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 14 13:11:00 2007 +0200 wined3d: Reverse the position fixup if the pshader is reading vpos. --- dlls/wined3d/baseshader.c | 3 +++ dlls/wined3d/glsl_shader.c | 36 +++++++++++++++++++++++++++++++++++- dlls/wined3d/pixelshader.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 5 ++++- 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 6533810..67888b2 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -418,6 +418,9 @@ HRESULT shader_get_registers_used( else if (WINED3DSPR_RASTOUT == regtype && reg == 1) reg_maps->fog = 1; + + else if (WINED3DSPR_MISCTYPE == regtype && reg == 0 && pshader) + reg_maps->vpos = 1; } } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b0ca134..47859fe 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -469,6 +469,20 @@ void shader_glsl_load_constants( checkGLcall("glGetUniformLocationARB"); GL_EXTCALL(glUniform4fvARB(pos, 1, mul_low)); } + if(((IWineD3DPixelShaderImpl *) pshader)->vpos_uniform) { + float correction_params[4]; + pos = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); + checkGLcall("glGetUniformLocationARB"); + if(deviceImpl->render_offscreen) { + correction_params[0] = 0.0; + correction_params[1] = 1.0; + } else { + /* position is window relative, not viewport relative */ + correction_params[0] = ((IWineD3DSurfaceImpl *) deviceImpl->render_targets[0])->currentDesc.Height; + correction_params[1] = -1.0; + } + GL_EXTCALL(glUniform4fvARB(pos, 1, correction_params)); + } } } @@ -528,6 +542,7 @@ void shader_generate_glsl_declarations( shader_addline(buffer, "uniform vec4 srgb_mul_low;\n"); shader_addline(buffer, "uniform vec4 srgb_comparison;\n"); ps_impl->srgb_mode_hardcoded = 0; + extra_constants_needed++; } else { ps_impl->srgb_mode_hardcoded = 1; shader_addline(buffer, "const vec4 srgb_mul_low = {%f, %f, %f, %f};\n", @@ -544,6 +559,22 @@ void shader_generate_glsl_declarations( ps_impl->srgb_enabled = 0; ps_impl->srgb_mode_hardcoded = 1; } + if(reg_maps->vpos) { + if(This->baseShader.limits.constant_float + extra_constants_needed + 1 < GL_LIMITS(pshader_constantsF)) { + shader_addline(buffer, "uniform vec4 ycorrection;\n"); + ((IWineD3DPixelShaderImpl *) This)->vpos_uniform = 1; + extra_constants_needed++; + } else { + /* This happens because we do not have proper tracking of the constant registers that are + * actually used, only the max limit of the shader version + */ + FIXME("Cannot find a free uniform for vpos correction params\n"); + shader_addline(buffer, "const vec4 ycorrection = {%f, %f, 0.0, 0.0};\n", + device->render_offscreen ? 0.0 : ((IWineD3DSurfaceImpl *) device->render_targets[0])->currentDesc.Height, + device->render_offscreen ? 1.0 : -1.0); + } + shader_addline(buffer, "vec4 vpos;\n"); + } } /* Declare texture samplers */ @@ -621,6 +652,9 @@ void shader_generate_glsl_declarations( /* Start the main program */ shader_addline(buffer, "void main() {\n"); + if(pshader && reg_maps->vpos) { + shader_addline(buffer, "vpos = vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1) - 0.5;\n"); + } } /***************************************************************************** @@ -836,7 +870,7 @@ static void shader_glsl_get_register_name( case WINED3DSPR_MISCTYPE: if (reg == 0) { /* vPos */ - sprintf(tmpStr, "gl_FragCoord"); + sprintf(tmpStr, "vpos"); } else { /* gl_FrontFacing could be used for vFace, but note that * gl_FrontFacing is a bool, while vFace is a float for diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 7b9a2c4..245c6b0 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -592,6 +592,13 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_CompileShader(IWineD3DPixelShader WARN("Recompiling shader because srgb correction is different and hardcoded\n"); goto recompile; } + if(This->baseShader.reg_maps.vpos && !This->vpos_uniform) { + if(This->render_offscreen != deviceImpl->render_offscreen || + This->height != ((IWineD3DSurfaceImpl *) deviceImpl->render_targets[0])->currentDesc.Height) { + WARN("Recompiling shader because vpos is used, hard compiled and changed\n"); + goto recompile; + } + } return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9457615..1cfd622 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1652,7 +1652,7 @@ typedef struct shader_reg_maps { * Use 0 as default (bit 31 is always 1 on a valid token) */ DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; char bumpmat, luminanceparams; - char usesnrm; + char usesnrm, vpos; /* Whether or not a loop is used in this shader */ char loop; @@ -2083,6 +2083,9 @@ typedef struct IWineD3DPixelShaderImpl { char srgb_mode_hardcoded; UINT srgb_low_const; UINT srgb_cmp_const; + char vpos_uniform; + BOOL render_offscreen; + UINT height; #if 0 /* needs reworking */ PSHADERINPUTDATA input;

1 0

Stefan Dösinger : wined3d: Take care against overwriting a source register in cmp.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 6dc11616d56323b7ea39fd85debeef589d52ac01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc11616d56323b7ea39fd85d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 9 16:54:51 2007 +0200 wined3d: Take care against overwriting a source register in cmp. --- dlls/wined3d/glsl_shader.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 47859fe..d82d24c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1513,6 +1513,17 @@ void shader_glsl_cmp(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src2_param; DWORD write_mask, cmp_channel = 0; unsigned int i, j; + char mask_char[6]; + BOOL temp_destination = FALSE; + + DWORD src0reg = arg->src[0] & WINED3DSP_REGNUM_MASK; + DWORD src1reg = arg->src[1] & WINED3DSP_REGNUM_MASK; + DWORD src2reg = arg->src[2] & WINED3DSP_REGNUM_MASK; + DWORD src0regtype = shader_get_regtype(arg->src[0]); + DWORD src1regtype = shader_get_regtype(arg->src[1]); + DWORD src2regtype = shader_get_regtype(arg->src[2]); + DWORD dstreg = arg->dst & WINED3DSP_REGNUM_MASK; + DWORD dstregtype = shader_get_regtype(arg->dst); /* Cycle through all source0 channels */ for (i=0; i<4; i++) { @@ -1524,16 +1535,38 @@ void shader_glsl_cmp(SHADER_OPCODE_ARG* arg) { cmp_channel = WINED3DSP_WRITEMASK_0 << j; } } - write_mask = shader_glsl_append_dst_ext(arg->buffer, arg, arg->dst & (~WINED3DSP_SWIZZLE_MASK | write_mask)); - if (!write_mask) continue; + + /* Splitting the cmp instruction up in multiple lines imposes a problem: + * The first lines may overwrite source parameters of the following lines. + * Deal with that by using a temporary destination register if needed + */ + if((src0reg == dstreg && src0regtype == dstregtype) || + (src1reg == dstreg && src1regtype == dstregtype) || + (src2reg == dstreg && src2regtype == dstregtype)) { + + write_mask = shader_glsl_get_write_mask(arg->dst & (~WINED3DSP_SWIZZLE_MASK | write_mask), mask_char); + if (!write_mask) continue; + shader_addline(arg->buffer, "tmp0%s = (", mask_char); + temp_destination = TRUE; + } else { + write_mask = shader_glsl_append_dst_ext(arg->buffer, arg, arg->dst & (~WINED3DSP_SWIZZLE_MASK | write_mask)); + if (!write_mask) continue; + } shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], cmp_channel, &src0_param); shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); - shader_addline(arg->buffer, "%s >= 0.0 ? %s : %s);\n", - src0_param.param_str, src1_param.param_str, src2_param.param_str); + shader_addline(arg->buffer, "%s >= 0.0 ? %s : %s);\n", + src0_param.param_str, src1_param.param_str, src2_param.param_str); } + + if(temp_destination) { + shader_glsl_get_write_mask(arg->dst, mask_char); + shader_glsl_append_dst_ext(arg->buffer, arg, arg->dst); + shader_addline(arg->buffer, "tmp0%s);\n", mask_char); + } + } /** Process the CND opcode in GLSL (dst = (src0 > 0.5) ? src1 : src2) */

1 0

Stefan Dösinger : wined3d: d3d ignores the sign of the input value in the log instruction.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 3d3369a77c407288efdca0f8cfe642ecd1a8aa4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3369a77c407288efdca0f8c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 9 21:24:53 2007 +0200 wined3d: d3d ignores the sign of the input value in the log instruction. --- dlls/wined3d/glsl_shader.c | 21 +++++++++++++++++++++ dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d82d24c..90062b8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1346,6 +1346,27 @@ void shader_glsl_pow(SHADER_OPCODE_ARG *arg) { } } +/* Process the WINED3DSIO_LOG instruction in GLSL (dst = log2(|src0|)) + * Src0 is a scalar. Note that D3D uses the absolute of src0, while + * GLSL uses the value as-is. */ +void shader_glsl_log(SHADER_OPCODE_ARG *arg) { + SHADER_BUFFER *buffer = arg->buffer; + glsl_src_param_t src0_param; + DWORD dst_write_mask; + size_t dst_size; + + dst_write_mask = shader_glsl_append_dst(buffer, arg); + dst_size = shader_glsl_get_write_mask_size(dst_write_mask); + + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param); + + if (dst_size > 1) { + shader_addline(buffer, "vec%d(log2(abs(%s))));\n", dst_size, src0_param.param_str); + } else { + shader_addline(buffer, "log2(abs(%s)));\n", src0_param.param_str); + } +} + /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ void shader_glsl_map2gl(SHADER_OPCODE_ARG* arg) { CONST SHADER_OPCODE* curOpcode = arg->opcode; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 245c6b0..8b2977b 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -167,7 +167,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_SGE, "sge", "SGE", 1, 3, pshader_hw_map2gl, shader_glsl_compare, 0, 0}, {WINED3DSIO_ABS, "abs", "ABS", 1, 2, pshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_EXP, "exp", "EX2", 1, 2, pshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, - {WINED3DSIO_LOG, "log", "LG2", 1, 2, pshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {WINED3DSIO_LOG, "log", "LG2", 1, 2, pshader_hw_map2gl, shader_glsl_log, 0, 0}, {WINED3DSIO_EXPP, "expp", "EXP", 1, 2, pshader_hw_map2gl, shader_glsl_expp, 0, 0}, {WINED3DSIO_LOGP, "logp", "LOG", 1, 2, pshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_DST, "dst", "DST", 1, 3, pshader_hw_map2gl, shader_glsl_dst, 0, 0}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1cfd622..da4a90c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1839,6 +1839,7 @@ extern void shader_glsl_call(SHADER_OPCODE_ARG* arg); extern void shader_glsl_callnz(SHADER_OPCODE_ARG* arg); extern void shader_glsl_label(SHADER_OPCODE_ARG* arg); extern void shader_glsl_pow(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_log(SHADER_OPCODE_ARG* arg); extern void shader_glsl_texldl(SHADER_OPCODE_ARG* arg); /** GLSL Pixel Shader Prototypes */

1 0

Rob Shearman : server: Move set_security_object to handle. c and set_object_sd to object.c.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 5af809abfd5c13c6a3aec9f72c1651d6fb871da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af809abfd5c13c6a3aec9f72… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 2 15:54:51 2007 +0100 server: Move set_security_object to handle.c and set_object_sd to object.c. These both don't operate on tokens so token.c is not the right place for them to be implemented. --- server/handle.c | 27 +++++++++ server/object.c | 89 +++++++++++++++++++++++++++++ server/object.h | 1 + server/security.h | 53 ++++++++++++++++++ server/token.c | 160 ++-------------------------------------------------- 5 files changed, 177 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5af809abfd5c13c6a3aec…

1 0

Jacek Caban : mshtml: Pass the IDispatch interface of the element right-clicked on to IDocHostUIHandler_ShowContextMenu if applicable instead of always the document 's one.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: f5ef66a36951f88542d3bce8a612c5897d9f9314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ef66a36951f88542d3bce8a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 14:20:59 2007 +0200 mshtml: Pass the IDispatch interface of the element right-clicked on to IDocHostUIHandler_ShowContextMenu if applicable instead of always the document's one. Found by Rob Shearman. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/olecmd.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3038d6f..3db047f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -362,7 +362,7 @@ NSContainer *NSContainer_Create(HTMLDocument*,NSContainer*); void NSContainer_Release(NSContainer*); void HTMLDocument_LockContainer(HTMLDocument*,BOOL); -void show_context_menu(HTMLDocument*,DWORD,POINT*); +void show_context_menu(HTMLDocument*,DWORD,POINT*,IDispatch*); void notif_focus(HTMLDocument*); void show_tooltip(HTMLDocument*,DWORD,DWORD,LPCWSTR); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 19bf85c..23b2193 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -997,7 +997,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList FIXME("aContextFlags=%08x\n", aContextFlags); }; - show_context_menu(This->doc, dwID, &pt); + show_context_menu(This->doc, dwID, &pt, (IDispatch*)HTMLDOMNODE(get_node(This->doc, aNode))); return NS_OK; } diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index b33d305..a137057 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -852,14 +852,14 @@ static const IOleCommandTargetVtbl OleCommandTargetVtbl = { OleCommandTarget_Exec }; -void show_context_menu(HTMLDocument *This, DWORD dwID, POINT *ppt) +void show_context_menu(HTMLDocument *This, DWORD dwID, POINT *ppt, IDispatch *elem) { HMENU menu_res, menu; DWORD cmdid; HRESULT hres; hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt, - (IUnknown*)CMDTARGET(This), (IDispatch*)HTMLDOC(This)); + (IUnknown*)CMDTARGET(This), elem); if(hres == S_OK) return;

1 0

Konstantin Kondratyuk : net.exe: Add Russian resources.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 62484719334cd76aa9c133ba894107639fb5ba53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62484719334cd76aa9c133ba8… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Tue Oct 2 17:25:11 2007 +0400 net.exe: Add Russian resources. --- programs/net/Ru.rc | 40 ++++++++++++++++++++++++++++++++++++++++ programs/net/rsrc.rc | 1 + 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/programs/net/Ru.rc b/programs/net/Ru.rc new file mode 100644 index 0000000..17c2c81 --- /dev/null +++ b/programs/net/Ru.rc @@ -0,0 +1,40 @@ +/* + * NET.EXE - Wine-compatible net program + * Russian language support + * + * Copyright (C) 2007 Konstantin Kondratyuk (Etersoft) + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "��:\n\nNET [ HELP | START | STOP ]\n" + STRING_START_USAGE, "�� .\n" + STRING_STOP_USAGE, "�� .\n" + STRING_STOP_DEP, "�� : %s\n" + STRING_CANT_STOP, "�� %s\n" + STRING_NO_SCM, "�� .\n" + STRING_NO_SVCHANDLE, "�� .\n" + STRING_START_SVC, "�� %s.\n" + STRING_START_SVC_SUCCESS, "�� %s �� .\n" + STRING_START_SVC_FAIL, "�� %s.\n" + STRING_STOP_SVC, "�� %s.\n" + STRING_STOP_SVC_SUCCESS, "�� %s �� .\n" + STRING_STOP_SVC_FAIL, "�� %s.\n" + STRING_HELP_USAGE, "��:\n\nNET HELP ��\n -��-\nNET �� /HELP\n\n �� :\n NET HELP NET START NET STOP\n" +} diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc index 3125252..a6a1c40 100644 --- a/programs/net/rsrc.rc +++ b/programs/net/rsrc.rc @@ -24,3 +24,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" #include "Ko.rc" +#include "Ru.rc"

1 0

Huw Davies : gdi32: TrueType fonts from the data directory should be added to the registry.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 5af70f49c6a673f7122d267db005824a460744ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af70f49c6a673f7122d267db… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 2 14:30:04 2007 +0100 gdi32: TrueType fonts from the data directory should be added to the registry. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f3c76da..1db51ca 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2112,7 +2112,7 @@ BOOL WineEngInit(void) if (data_dir && (unixname = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + sizeof("/fonts/")))) { strcpy(unixname, data_dir); strcat(unixname, "/fonts/"); - ReadFontDir(unixname, FALSE); + ReadFontDir(unixname, TRUE); HeapFree(GetProcessHeap(), 0, unixname); }

1 0

Huw Davies : gdi32: Only cache the glyph metrics when rendering to a monochrome bitmap or when just retrieving the metrics .
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 70c212937aa06815e72b6e232375dc0844914064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c212937aa06815e72b6e232… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 2 11:56:54 2007 +0100 gdi32: Only cache the glyph metrics when rendering to a monochrome bitmap or when just retrieving the metrics. --- dlls/gdi32/freetype.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1db51ca..b45c6c4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3500,7 +3500,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, DWORD width, height, pitch, needed = 0; FT_Bitmap ft_bitmap; FT_Error err; - INT left, right, top = 0, bottom = 0; + INT left, right, top = 0, bottom = 0, adv, lsb, bbx; FT_Angle angle = 0; FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; float widthRatio = 1.0; @@ -3551,9 +3551,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, left = (INT)(ft_face->glyph->metrics.horiBearingX * widthRatio) & -64; right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) * widthRatio + 63) & -64; - FONT_GM(font,glyph_index)->adv = (INT)((ft_face->glyph->metrics.horiAdvance * widthRatio) + 63) >> 6; - FONT_GM(font,glyph_index)->lsb = left >> 6; - FONT_GM(font,glyph_index)->bbx = (right - left) >> 6; + adv = (INT)((ft_face->glyph->metrics.horiAdvance * widthRatio) + 63) >> 6; + lsb = left >> 6; + bbx = (right - left) >> 6; /* Scaling transform */ if(font->aveWidth) { @@ -3609,7 +3609,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; bottom = (ft_face->glyph->metrics.horiBearingY - ft_face->glyph->metrics.height) & -64; - lpgm->gmCellIncX = FONT_GM(font,glyph_index)->adv; + lpgm->gmCellIncX = adv; lpgm->gmCellIncY = 0; } else { INT xc, yc; @@ -3650,8 +3650,14 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, lpgm->gmptGlyphOrigin.x = left >> 6; lpgm->gmptGlyphOrigin.y = top >> 6; - FONT_GM(font,glyph_index)->gm = *lpgm; - FONT_GM(font,glyph_index)->init = TRUE; + if(format == GGO_METRICS || format == GGO_BITMAP) + { + FONT_GM(font,glyph_index)->gm = *lpgm; + FONT_GM(font,glyph_index)->adv = adv; + FONT_GM(font,glyph_index)->lsb = lsb; + FONT_GM(font,glyph_index)->bbx = bbx; + FONT_GM(font,glyph_index)->init = TRUE; + } if(format == GGO_METRICS) return 1; /* FIXME */

1 0

Huw Davies : gdi32: Let the WINE_GGO_GRAY16_BITMAP case load a bitmap.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 05bb6f6ce4619921407e1f1e82a0e8d9cf9fb5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05bb6f6ce4619921407e1f1e8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 2 14:24:34 2007 +0100 gdi32: Let the WINE_GGO_GRAY16_BITMAP case load a bitmap. --- dlls/gdi32/freetype.c | 81 +++++++++++++++++++++++++++++++------------------ 1 files changed, 51 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b45c6c4..62563e8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3533,7 +3533,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, if (!font->gm[glyph_index / GM_BLOCK_SIZE]) font->gm[glyph_index / GM_BLOCK_SIZE] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(GM) * GM_BLOCK_SIZE); - if(font->orientation || (format != GGO_METRICS && format != GGO_BITMAP) || font->aveWidth || lpmat) + if(font->orientation || (format != GGO_METRICS && format != GGO_BITMAP && format != WINE_GGO_GRAY16_BITMAP) || font->aveWidth || lpmat) load_flags |= FT_LOAD_NO_BITMAP; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); @@ -3650,7 +3650,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, lpgm->gmptGlyphOrigin.x = left >> 6; lpgm->gmptGlyphOrigin.y = top >> 6; - if(format == GGO_METRICS || format == GGO_BITMAP) + if(format == GGO_METRICS || format == GGO_BITMAP || format == WINE_GGO_GRAY16_BITMAP) { FONT_GM(font,glyph_index)->gm = *lpgm; FONT_GM(font,glyph_index)->adv = adv; @@ -3662,7 +3662,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, if(format == GGO_METRICS) return 1; /* FIXME */ - if(ft_face->glyph->format != ft_glyph_format_outline && format != GGO_BITMAP) { + if(ft_face->glyph->format != ft_glyph_format_outline && format != GGO_BITMAP && format != WINE_GGO_GRAY16_BITMAP) { TRACE("loaded a bitmap\n"); return GDI_ERROR; } @@ -3728,34 +3728,55 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, needed = pitch * height; if(!buf || !buflen) break; - ft_bitmap.width = width; - ft_bitmap.rows = height; - ft_bitmap.pitch = pitch; - ft_bitmap.pixel_mode = ft_pixel_mode_grays; - ft_bitmap.buffer = buf; - - if(needsTransform) { - pFT_Outline_Transform(&ft_face->glyph->outline, &transMat); - } - - pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); - - memset(ft_bitmap.buffer, 0, buflen); - - pFT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); - if(format == GGO_GRAY2_BITMAP) - mult = 4; - else if(format == GGO_GRAY4_BITMAP) - mult = 16; - else if(format == GGO_GRAY8_BITMAP) - mult = 64; - else if(format == WINE_GGO_GRAY16_BITMAP) - break; - else { - assert(0); - break; - } + switch(ft_face->glyph->format) { + case ft_glyph_format_bitmap: + { + BYTE *src = ft_face->glyph->bitmap.buffer, *dst = buf; + INT h = ft_face->glyph->bitmap.rows; + INT x; + while(h--) { + for(x = 0; x < pitch; x++) + dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0; + src += ft_face->glyph->bitmap.pitch; + dst += pitch; + } + return needed; + } + case ft_glyph_format_outline: + { + ft_bitmap.width = width; + ft_bitmap.rows = height; + ft_bitmap.pitch = pitch; + ft_bitmap.pixel_mode = ft_pixel_mode_grays; + ft_bitmap.buffer = buf; + + if(needsTransform) + pFT_Outline_Transform(&ft_face->glyph->outline, &transMat); + + pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); + + memset(ft_bitmap.buffer, 0, buflen); + + pFT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); + + if(format == GGO_GRAY2_BITMAP) + mult = 4; + else if(format == GGO_GRAY4_BITMAP) + mult = 16; + else if(format == GGO_GRAY8_BITMAP) + mult = 64; + else if(format == WINE_GGO_GRAY16_BITMAP) + return needed; + else { + assert(0); + break; + } + } + default: + FIXME("loaded glyph format %x\n", ft_face->glyph->format); + return GDI_ERROR; + } start = buf; for(row = 0; row < height; row++) {

1 0

Roy Shea : net.exe: Added missing service name.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: c8c43acc2b5dba5cf1b30777daad522f34ffbf31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c43acc2b5dba5cf1b30777d… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Tue Oct 2 10:00:45 2007 -0700 net.exe: Added missing service name. --- programs/net/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 73e1763..4bc3652 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -99,8 +99,8 @@ static BOOL net_service(int operation, char *service_name) output_string(STRING_START_SVC, service_display_name); result = StartService(serviceHandle, 0, NULL); - if(result) output_string(STRING_START_SVC_SUCCESS); - else output_string(STRING_START_SVC_FAIL); + if(result) output_string(STRING_START_SVC_SUCCESS, service_display_name); + else output_string(STRING_START_SVC_FAIL, service_display_name); break; case NET_STOP: output_string(STRING_STOP_SVC, service_display_name);

1 0