October 2012 - Wine-commits

Henri Verbeet : wined3d: Implement WINED3DSIH_USHR in the GLSL shader backend.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: e31945b8aac8a629a643519a23702c957bd5db1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31945b8aac8a629a643519a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 23:08:02 2012 +0200 wined3d: Implement WINED3DSIH_USHR in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7269212..a66107c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2208,20 +2208,21 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) struct glsl_src_param src0_param; struct glsl_src_param src1_param; DWORD write_mask; - char op; + const char *op; /* Determine the GLSL operator to use based on the opcode */ switch (ins->handler_idx) { - case WINED3DSIH_ADD: op = '+'; break; - case WINED3DSIH_AND: op = '&'; break; - case WINED3DSIH_DIV: op = '/'; break; - case WINED3DSIH_IADD: op = '+'; break; - case WINED3DSIH_MUL: op = '*'; break; - case WINED3DSIH_SUB: op = '-'; break; - case WINED3DSIH_XOR: op = '^'; break; + case WINED3DSIH_ADD: op = "+"; break; + case WINED3DSIH_AND: op = "&"; break; + case WINED3DSIH_DIV: op = "/"; break; + case WINED3DSIH_IADD: op = "+"; break; + case WINED3DSIH_MUL: op = "*"; break; + case WINED3DSIH_SUB: op = "-"; break; + case WINED3DSIH_USHR: op = ">>"; break; + case WINED3DSIH_XOR: op = "^"; break; default: - op = ' '; + op = "<unhandled operator>"; FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); break; } @@ -2229,7 +2230,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) write_mask = shader_glsl_append_dst(buffer, ins); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_addline(buffer, "%s %c %s);\n", src0_param.param_str, op, src1_param.param_str); + shader_addline(buffer, "%s %s %s);\n", src0_param.param_str, op, src1_param.param_str); } static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) @@ -5466,7 +5467,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, /* WINED3DSIH_UDIV */ shader_glsl_udiv, - /* WINED3DSIH_USHR */ NULL, + /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, };

1 0

Henri Verbeet : user32: Implement GetRawInputDeviceList().
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 3ed797b265572751e0b45d6292f54ddb4876ffc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed797b265572751e0b45d629… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 23:08:03 2012 +0200 user32: Implement GetRawInputDeviceList(). --- dlls/user32/input.c | 28 ++++++++++++++++++++++------ dlls/user32/message.c | 3 --- dlls/user32/user_private.h | 3 +++ 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 3ca71a6..76c05df 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -478,14 +478,30 @@ BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO plii) /****************************************************************** * GetRawInputDeviceList (USER32.@) */ -UINT WINAPI GetRawInputDeviceList(PRAWINPUTDEVICELIST pRawInputDeviceList, PUINT puiNumDevices, UINT cbSize) +UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_count, UINT size) { - FIXME("(pRawInputDeviceList=%p, puiNumDevices=%p, cbSize=%d) stub!\n", pRawInputDeviceList, puiNumDevices, cbSize); + TRACE("devices %p, device_count %p, size %u.\n", devices, device_count, size); - if(pRawInputDeviceList) - memset(pRawInputDeviceList, 0, sizeof *pRawInputDeviceList); - *puiNumDevices = 0; - return 0; + if (size != sizeof(*devices) || !device_count) return ~0U; + + if (!devices) + { + *device_count = 2; + return 0; + } + + if (*device_count < 2) + { + *device_count = 2; + return ~0U; + } + + devices[0].hDevice = WINE_MOUSE_HANDLE; + devices[0].dwType = RIM_TYPEMOUSE; + devices[1].hDevice = WINE_KEYBOARD_HANDLE; + devices[1].dwType = RIM_TYPEKEYBOARD; + + return 2; } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index fa52207..c1fe036 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -51,9 +51,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msg); WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(key); -#define WINE_MOUSE_HANDLE ((HANDLE)1) -#define WINE_KEYBOARD_HANDLE ((HANDLE)2) - #define WM_NCMOUSEFIRST WM_NCMOUSEMOVE #define WM_NCMOUSELAST (WM_NCMOUSEFIRST+(WM_MOUSELAST-WM_MOUSEFIRST)) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 3afc7cf..6d717fa 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -35,6 +35,9 @@ #define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313 +#define WINE_MOUSE_HANDLE ((HANDLE)1) +#define WINE_KEYBOARD_HANDLE ((HANDLE)2) + struct window_surface; /* internal messages codes */

1 0

Francois Gouget : msvcp100: Make MSVCP_basic_string_char_append_len_ch() static.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 8e6934fae78d2254bec52e2103c78d8e8083dba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6934fae78d2254bec52e210… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 17 23:24:37 2012 +0200 msvcp100: Make MSVCP_basic_string_char_append_len_ch() static. --- dlls/msvcp100/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp100/string.c b/dlls/msvcp100/string.c index ae597fb..7faf95f 100644 --- a/dlls/msvcp100/string.c +++ b/dlls/msvcp100/string.c @@ -399,7 +399,7 @@ MSVCP_size_t MSVCP_basic_string_char_length(const basic_string_char *this) /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ID@Z */ /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_KD@Z */ -basic_string_char* MSVCP_basic_string_char_append_len_ch(basic_string_char *this, MSVCP_size_t count, char ch) +static basic_string_char* MSVCP_basic_string_char_append_len_ch(basic_string_char *this, MSVCP_size_t count, char ch) { TRACE("%p %lu %c\n", this, count, ch);

1 0

Francois Gouget : wined3d: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 23470870a1fac9a07eaf5bc9355b896c7200f3e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23470870a1fac9a07eaf5bc93… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 17 23:24:43 2012 +0200 wined3d: Add a trailing '\n' to a Wine trace. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7213d05..b18a99f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2186,7 +2186,7 @@ static enum wined3d_pci_device select_card_handler(const struct gl_vendor_select TRACE("Applying card selector \"%s\".\n", table[i].description); return table[i].select_card(gl_info, gl_renderer); } - FIXME("Couldn't find a suitable card selector for GL vendor %04x (using GL_RENDERER %s)", + FIXME("Couldn't find a suitable card selector for GL vendor %04x (using GL_RENDERER %s)\n", gl_vendor, debugstr_a(gl_renderer)); return PCI_DEVICE_NONE;

1 0

Francois Gouget : shell32: Standardize on the ShellExecuteEx() terminology.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 68c1bf507d4c114c79660e010f0fb2a1f43ecdf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c1bf507d4c114c79660e010… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 17 23:25:56 2012 +0200 shell32: Standardize on the ShellExecuteEx() terminology. --- dlls/shell32/shlexec.c | 108 +++++++++++++++++++++--------------------- dlls/shell32/tests/shlexec.c | 16 +++--- 2 files changed, 62 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68c1bf507d4c114c79660…

1 0

Jacek Caban : vbscript: Added support for HTML comments.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 290f5631993ddd77df7be1b836f0948d6929d39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=290f5631993ddd77df7be1b83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 11:49:17 2012 +0200 vbscript: Added support for HTML comments. --- dlls/vbscript/compile.c | 4 ++-- dlls/vbscript/lex.c | 26 +++++++++++++++++++------- dlls/vbscript/parse.h | 3 ++- dlls/vbscript/parser.y | 5 ++++- dlls/vbscript/vbscript.c | 4 ++-- dlls/vbscript/vbscript.h | 2 +- 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 327d97b..58afdf4 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1644,7 +1644,7 @@ static void release_compiler(compile_ctx_t *ctx) release_vbscode(ctx->code); } -HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) +HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, vbscode_t **ret) { function_t *new_func; function_decl_t *func_decl; @@ -1653,7 +1653,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) vbscode_t *code; HRESULT hres; - hres = parse_script(&ctx.parser, src); + hres = parse_script(&ctx.parser, src, delimiter); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 8e971e2..65d2334 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -320,6 +320,16 @@ static void skip_spaces(parser_ctx_t *ctx) ctx->ptr++; } +static int comment_line(parser_ctx_t *ctx) +{ + ctx->ptr = strchrW(ctx->ptr, '\n'); + if(ctx->ptr) + ctx->ptr++; + else + ctx->ptr = ctx->end; + return tNL; +} + static int parse_next_token(void *lval, parser_ctx_t *ctx) { WCHAR c; @@ -347,18 +357,12 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) ctx->ptr++; return tNL; case '\'': - ctx->ptr = strchrW(ctx->ptr, '\n'); - if(ctx->ptr) - ctx->ptr++; - else - ctx->ptr = ctx->end; - return tNL; + return comment_line(ctx); case ':': case ')': case ',': case '=': case '+': - case '-': case '*': case '/': case '^': @@ -366,6 +370,11 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '.': case '_': return *ctx->ptr++; + case '-': + if(ctx->is_html && ctx->ptr[1] == '-' && ctx->ptr[2] == '>') + return comment_line(ctx); + ctx->ptr++; + return '-'; case '(': /* NOTE: * We resolve empty brackets in lexer instead of parser to avoid complex conflicts @@ -392,6 +401,9 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '=': ctx->ptr++; return tLTEQ; + case '!': + if(ctx->is_html && ctx->ptr[1] == '-' && ctx->ptr[2] == '-') + return comment_line(ctx); } return '<'; case '>': diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index df8f9b5..74e0a8a 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -253,6 +253,7 @@ typedef struct { BOOL option_explicit; BOOL parse_complete; + BOOL is_html; HRESULT hres; int last_token; @@ -265,7 +266,7 @@ typedef struct { vbsheap_t heap; } parser_ctx_t; -HRESULT parse_script(parser_ctx_t*,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; void *parser_alloc(parser_ctx_t*,size_t) DECLSPEC_HIDDEN; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3f86b04..8a2a9e3 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -919,8 +919,10 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) return ret; } -HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) +HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter) { + const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; + ctx->code = ctx->ptr = code; ctx->end = ctx->code + strlenW(ctx->code); @@ -934,6 +936,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) ctx->stats = ctx->stats_tail = NULL; ctx->class_decls = NULL; ctx->option_explicit = FALSE; + ctx->is_html = delimiter && !strcmpiW(delimiter, html_delimiterW); parser_parse(ctx); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 05132a6..1195f85 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -612,7 +612,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); if(FAILED(hres)) return hres; @@ -672,7 +672,7 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 41982da..2ce93b6 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -326,7 +326,7 @@ struct _vbscode_t { }; void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; -HRESULT compile_script(script_ctx_t*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,function_t*,IDispatch*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Added HTML comments tests.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 214fab85689389d10ace7b8132254f8d05a8eda0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=214fab85689389d10ace7b813… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 11:49:35 2012 +0200 vbscript: Added HTML comments tests. --- dlls/vbscript/tests/run.c | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 24a3c8d..4c22cb0 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1419,7 +1419,7 @@ static void close_script(IActiveScript *script) ok(!ref, "ref=%u\n", ref); } -static HRESULT parse_script(DWORD flags, BSTR script_str) +static HRESULT parse_script(DWORD flags, BSTR script_str, const WCHAR *delim) { IActiveScriptParse *parser; IActiveScript *engine; @@ -1446,7 +1446,7 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) test_counter = 0; - hres = IActiveScriptParse_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, script_str, NULL, NULL, delim, 0, 0, 0, NULL, NULL); IActiveScript_Close(engine); @@ -1464,7 +1464,7 @@ static void parse_script_af(DWORD flags, const char *src) HRESULT hres; tmp = a2bstr(src); - hres = parse_script(flags, tmp); + hres = parse_script(flags, tmp, NULL); SysFreeString(tmp); ok(hres == S_OK, "parse_script failed: %08x\n", hres); } @@ -1475,7 +1475,7 @@ static HRESULT parse_script_ar(const char *src) HRESULT hres; tmp = a2bstr(src); - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, NULL); SysFreeString(tmp); return hres; } @@ -1485,6 +1485,20 @@ static void parse_script_a(const char *src) parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); } +#define parse_htmlscript_a(a) _parse_htmlscript_a(__LINE__,a) +static void _parse_htmlscript_a(unsigned line, const char *src) +{ + BSTR tmp; + HRESULT hres; + + static const WCHAR script_delimW[] = {'<','/','S','C','R','I','P','T','>',0}; + + tmp = a2bstr(src); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, script_delimW); + SysFreeString(tmp); + ok_(__FILE__,line)(hres == S_OK, "parse_script failed: %08x\n", hres); +} + static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, const char *src) { IDispatchEx *dispex; @@ -1742,7 +1756,7 @@ static void run_from_file(const char *filename) return; strict_dispid_check = FALSE; - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str, NULL); SysFreeString(script_str); ok(hres == S_OK, "parse_script failed: %08x\n", hres); } @@ -1770,7 +1784,7 @@ static void run_from_res(const char *name) SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, str, NULL); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); @@ -1859,6 +1873,20 @@ static void run_tests(void) CHECK_CALLED(global_propargput1_d); CHECK_CALLED(global_propargput1_i); + parse_htmlscript_a(""); + parse_htmlscript_a("\n"); + parse_htmlscript_a("\n\n"); + + hres = parse_script_ar(" <>\nCall reportSuccess()\n-->\n"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + next_cnt = 0; SET_EXPECT(collectionobj_newenum_i); SET_EXPECT(Next);

1 0

Jacek Caban : mshtml: Added HTML comments in VBScript code tests.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: b5691b5e6335f3733a79e796001c791b0f9f2383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5691b5e6335f3733a79e7960… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 11:49:53 2012 +0200 mshtml: Added HTML comments in VBScript code tests. --- dlls/mshtml/tests/vbtest.html | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index 44212e7..c965f42 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -1,6 +1,7 @@ <html> <head> <script type="text/vbscript"> + </script> <script> ' Verifies that we're in VBScript although there is no type specified

1 0

Huw Davies : gdi32: Make get_glyph_bitmap return a dib_info structure in order to avoid code duplication .
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 64e2ad5709312c886e5cbff8740fce195f01561d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e2ad5709312c886e5cbff87… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 18 12:55:05 2012 +0100 gdi32: Make get_glyph_bitmap return a dib_info structure in order to avoid code duplication. --- dlls/gdi32/dibdrv/graphics.c | 74 +++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 846b08e..a811a75 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -441,24 +441,13 @@ static inline void get_text_bkgnd_masks( dibdrv_physdev *pdev, rop_mask *mask ) } static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHMETRICS *metrics, - const struct gdi_image_bits *image, DWORD text_color, + const dib_info *glyph_dib, DWORD text_color, const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; RECT rect, clipped_rect; POINT src_origin; - dib_info glyph_dib; - - glyph_dib.bit_count = 8; - glyph_dib.width = metrics->gmBlackBoxX; - glyph_dib.height = metrics->gmBlackBoxY; - glyph_dib.rect.left = 0; - glyph_dib.rect.top = 0; - glyph_dib.rect.right = metrics->gmBlackBoxX; - glyph_dib.rect.bottom = metrics->gmBlackBoxY; - glyph_dib.stride = get_dib_stride( metrics->gmBlackBoxX, 8 ); - glyph_dib.bits = *image; rect.left = origin->x + metrics->gmptGlyphOrigin.x; rect.top = origin->y - metrics->gmptGlyphOrigin.y; @@ -473,7 +462,7 @@ static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHME src_origin.x = clipped_rect.left - rect.left; src_origin.y = clipped_rect.top - rect.top; - pdev->dib.funcs->draw_glyph( &pdev->dib, &clipped_rect, &glyph_dib, &src_origin, + pdev->dib.funcs->draw_glyph( &pdev->dib, &clipped_rect, glyph_dib, &src_origin, text_color, ranges ); } } @@ -491,7 +480,7 @@ static const int padding[4] = {0, 3, 2, 1}; * using only values 0 or 16. */ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS *metrics, - struct gdi_image_bits *image ) + dib_info *glyph_dib ) { UINT ggo_flags = aa_flags | GGO_GLYPH_INDEX; static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; @@ -499,12 +488,12 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS int i, x, y; DWORD ret, size; BYTE *buf, *dst, *src; - int pad, stride; + int pad; - image->ptr = NULL; - image->is_copy = FALSE; - image->free = free_heap_bits; - image->param = NULL; + glyph_dib->bits.ptr = NULL; + glyph_dib->bits.is_copy = FALSE; + glyph_dib->bits.free = free_heap_bits; + glyph_dib->bits.param = NULL; indices[0] = index; @@ -519,9 +508,17 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS if (!ret) return ERROR_SUCCESS; /* empty glyph */ /* We'll convert non-antialiased 1-bpp bitmaps to 8-bpp, so these sizes relate to 8-bpp */ + glyph_dib->bit_count = 8; + glyph_dib->width = metrics->gmBlackBoxX; + glyph_dib->height = metrics->gmBlackBoxY; + glyph_dib->rect.left = 0; + glyph_dib->rect.top = 0; + glyph_dib->rect.right = metrics->gmBlackBoxX; + glyph_dib->rect.bottom = metrics->gmBlackBoxY; + glyph_dib->stride = get_dib_stride( metrics->gmBlackBoxX, glyph_dib->bit_count ); + pad = padding[ metrics->gmBlackBoxX % 4 ]; - stride = get_dib_stride( metrics->gmBlackBoxX, 8 ); - size = metrics->gmBlackBoxY * stride; + size = metrics->gmBlackBoxY * glyph_dib->stride; buf = HeapAlloc( GetProcessHeap(), 0, size ); if (!buf) return ERROR_OUTOFMEMORY; @@ -538,7 +535,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS for (y = metrics->gmBlackBoxY - 1; y >= 0; y--) { src = buf + y * get_dib_stride( metrics->gmBlackBoxX, 1 ); - dst = buf + y * stride; + dst = buf + y * glyph_dib->stride; if (pad) memset( dst + metrics->gmBlackBoxX, 0, pad ); @@ -548,11 +545,11 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS } else if (pad) { - for (y = 0, dst = buf; y < metrics->gmBlackBoxY; y++, dst += stride) + for (y = 0, dst = buf; y < metrics->gmBlackBoxY; y++, dst += glyph_dib->stride) memset( dst + metrics->gmBlackBoxX, 0, pad ); } - image->ptr = buf; + glyph_dib->bits.ptr = buf; return ERROR_SUCCESS; } @@ -592,26 +589,15 @@ BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits for (i = 0; i < count; i++) { GLYPHMETRICS metrics; - struct gdi_image_bits image; + dib_info glyph_dib; - err = get_glyph_bitmap( hdc, (UINT)str[i], aa_flags, &metrics, &image ); + err = get_glyph_bitmap( hdc, (UINT)str[i], aa_flags, &metrics, &glyph_dib ); if (err) continue; - if (image.ptr) + if (glyph_dib.bits.ptr) { RECT rect, clipped_rect; POINT src_origin; - dib_info glyph_dib; - - glyph_dib.bit_count = 8; - glyph_dib.width = metrics.gmBlackBoxX; - glyph_dib.height = metrics.gmBlackBoxY; - glyph_dib.rect.left = 0; - glyph_dib.rect.top = 0; - glyph_dib.rect.right = metrics.gmBlackBoxX; - glyph_dib.rect.bottom = metrics.gmBlackBoxY; - glyph_dib.stride = get_dib_stride( metrics.gmBlackBoxX, 8 ); - glyph_dib.bits = image; rect.left = x + metrics.gmptGlyphOrigin.x; rect.top = y - metrics.gmptGlyphOrigin.y; @@ -627,7 +613,7 @@ BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits fg_pixel, glyph_intensities ); } } - if (image.free) image.free( &image ); + free_dib_info( &glyph_dib ); if (dx) { @@ -698,15 +684,15 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, for (i = 0; i < count; i++) { GLYPHMETRICS metrics; - struct gdi_image_bits image; + dib_info glyph_dib; - err = get_glyph_bitmap( dev->hdc, (UINT)str[i], aa_flags, &metrics, &image ); + err = get_glyph_bitmap( dev->hdc, (UINT)str[i], aa_flags, &metrics, &glyph_dib ); if (err) continue; - if (image.ptr) - draw_glyph( pdev, &origin, &metrics, &image, text_color, ranges, &clipped_rects, &bounds ); + if (glyph_dib.bits.ptr) + draw_glyph( pdev, &origin, &metrics, &glyph_dib, text_color, ranges, &clipped_rects, &bounds ); - if (image.free) image.free( &image ); + free_dib_info( &glyph_dib ); if (dx) {

1 0

Hans Leidekker : credui: Show the save password checkbox if both CREDUI_FLAGS_DO_NOT_PERSIST and CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX are specified .
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: ab179341e2c1f1f833adc16b91ed7e3e24502209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab179341e2c1f1f833adc16b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 14:16:05 2012 +0200 credui: Show the save password checkbox if both CREDUI_FLAGS_DO_NOT_PERSIST and CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX are specified. --- dlls/credui/credui_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 5a8c05c..e3e964f 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -410,7 +410,9 @@ static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) SetWindowTextW(hwndDlg, title); } - if (params->dwFlags & (CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_PERSIST)) + if (params->dwFlags & CREDUI_FLAGS_PERSIST || + (params->dwFlags & CREDUI_FLAGS_DO_NOT_PERSIST && + !(params->dwFlags & CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX))) ShowWindow(GetDlgItem(hwndDlg, IDC_SAVE), SW_HIDE); else if (params->fSave) CheckDlgButton(hwndDlg, IDC_SAVE, BST_CHECKED);

1 0