wine-commits July 2009

wine-commits@winehq.org

4 participants
1067 discussions

Michael Stefaniuc : winedbg: Include the local resource header last.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 34f771c2070ad9a5bdd5fdfab3d5e76808642049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f771c2070ad9a5bdd5fdfab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 10:15:12 2009 +0200 winedbg: Include the local resource header last. --- programs/winedbg/crashdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index db25021..4a24dcc 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" #include "debugger.h" #include "wingdi.h" #include "winuser.h" @@ -27,6 +26,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "resource.h" #define MAX_PROGRAM_NAME_LENGTH 80

1 0

Henri Verbeet : wined3d: Use flags for driver quirks.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 40bc47901c9cdc9c17ddf3d24011232df41ee82f URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bc47901c9cdc9c17ddf3d24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 1 09:46:19 2009 +0200 wined3d: Use flags for driver quirks. --- dlls/wined3d/arb_program_shader.c | 10 ++++++---- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/glsl_shader.c | 10 ++++++---- dlls/wined3d/vertexshader.c | 8 ++++---- dlls/wined3d/wined3d_gl.h | 5 ++--- dlls/wined3d/wined3d_private.h | 5 +++++ 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e438366..28118c7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -49,9 +49,10 @@ static BOOL need_mova_const(IWineD3DBaseShader *shader, const WineD3D_GL_Info *g } static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { - if(!GL_SUPPORT(NV_VERTEX_PROGRAM) || /* Need to init colors */ - gl_info->arb_vs_offset_limit || /* Have to init texcoords */ - gl_info->set_texcoord_w) { /* Load the immval offset */ + if (!GL_SUPPORT(NV_VERTEX_PROGRAM) /* Need to init colors. */ + || gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT /* Load the immval offset. */ + || gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) /* Have to init texcoords. */ + { return TRUE; } return FALSE; @@ -3751,7 +3752,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, if(!GL_SUPPORT(NV_VERTEX_PROGRAM)) { shader_addline(buffer, "MOV result.color.secondary, -helper_const.wwwy;\n"); - if((GLINFO_LOCATION).set_texcoord_w && !device->frag_pipe->ffp_proj_control) { + if ((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W && !device->frag_pipe->ffp_proj_control) + { int i; for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { if(This->baseShader.reg_maps.texcoord_mask[i] != 0 && diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eda6854..523528f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -950,7 +950,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->vs_arb_max_instructions = gl_max; TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM native instructions: %d\n", gl_info->vs_arb_max_instructions); - gl_info->arb_vs_offset_limit = test_arb_vs_offset_limit(gl_info); + if (test_arb_vs_offset_limit(gl_info)) gl_info->quirks |= WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT; } if (gl_info->supported[ARB_VERTEX_SHADER]) { glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &gl_max); @@ -4196,11 +4196,11 @@ static void quirk_texcoord_w(WineD3D_GL_Info *gl_info) { * performance negatively. */ TRACE("Enabling vertex texture coord fixes in vertex shaders\n"); - gl_info->set_texcoord_w = TRUE; + gl_info->quirks |= WINED3D_QUIRK_SET_TEXCOORD_W; } static void quirk_clip_varying(WineD3D_GL_Info *gl_info) { - gl_info->glsl_clip_varying = TRUE; + gl_info->quirks |= WINED3D_QUIRK_GLSL_CLIP_VARYING; } struct driver_quirk diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 501023d..f7b193e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -776,7 +776,7 @@ static int vec4_varyings(DWORD shader_major, const WineD3D_GL_Info *gl_info) if(shader_major > 3) return ret; /* 3.0 shaders may need an extra varying for the clip coord on some cards(mostly dx10 ones) */ - if(gl_info->glsl_clip_varying) ret -= 1; + if (gl_info->quirks & WINED3D_QUIRK_GLSL_CLIP_VARYING) ret -= 1; return ret; } @@ -3529,8 +3529,9 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs * Take care about the texcoord .w fixup though if we're using the fixed function fragment pipeline */ device = (IWineD3DDeviceImpl *) vs->baseShader.device; - if((GLINFO_LOCATION).set_texcoord_w && ps_major == 0 && vs_major > 0 && - !device->frag_pipe->ffp_proj_control) { + if (((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W) + && ps_major == 0 && vs_major > 0 && !device->frag_pipe->ffp_proj_control) + { shader_addline(&buffer, "void order_ps_input() {\n"); for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { if(vs->baseShader.reg_maps.texcoord_mask[i] != 0 && @@ -3575,7 +3576,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs { if (semantic_idx < 8) { - if (!(GLINFO_LOCATION).set_texcoord_w || ps_major > 0) write_mask |= WINED3DSP_WRITEMASK_3; + if (!((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) + write_mask |= WINED3DSP_WRITEMASK_3; shader_addline(&buffer, "gl_TexCoord[%u]%s = OUT[%u]%s;\n", semantic_idx, reg_mask, i, reg_mask); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 6c1440d..6348e1c 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -280,10 +280,10 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader vshader_set_limits(This); - if(deviceImpl->vs_selected_mode == SHADER_ARB && - (GLINFO_LOCATION).arb_vs_offset_limit && - This->min_rel_offset <= This->max_rel_offset) { - + if (deviceImpl->vs_selected_mode == SHADER_ARB + && ((GLINFO_LOCATION).quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) + && This->min_rel_offset <= This->max_rel_offset) + { if(This->max_rel_offset - This->min_rel_offset > 127) { FIXME("The difference between the minimum and maximum relative offset is > 127\n"); FIXME("Which this OpenGL implementation does not support. Try using GLSL\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2d3cc3a..da35319 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4000,10 +4000,9 @@ typedef struct _WineD3D_GL_Info { GL_VSVersion vs_nv_version; GL_VSVersion vs_ati_version; - BOOL arb_vs_offset_limit; - BOOL set_texcoord_w; DWORD reserved_glsl_constants; - BOOL glsl_clip_varying; + + DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ffee326..7af5719 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -43,6 +43,11 @@ #include "wine/list.h" #include "wine/rbtree.h" +/* Driver quirks */ +#define WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT 0x00000001 +#define WINED3D_QUIRK_SET_TEXCOORD_W 0x00000002 +#define WINED3D_QUIRK_GLSL_CLIP_VARYING 0x00000004 + /* Texture format fixups */ enum fixup_channel_source

1 0

Henri Verbeet : wined3d: Move the driver_quirk structure to directx.c.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: c475789bb60b7e702d91b257bfa878f1a89b10e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c475789bb60b7e702d91b257b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 1 09:46:18 2009 +0200 wined3d: Move the driver_quirk structure to directx.c. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_gl.h | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1512a31..eda6854 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4203,6 +4203,13 @@ static void quirk_clip_varying(WineD3D_GL_Info *gl_info) { gl_info->glsl_clip_varying = TRUE; } +struct driver_quirk +{ + BOOL (*match)(const WineD3D_GL_Info *gl_info); + void (*apply)(WineD3D_GL_Info *gl_info); + const char *description; +}; + struct driver_quirk quirk_table[] = { { match_ati_r300_to_500, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 9f508a8..2d3cc3a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4016,10 +4016,4 @@ typedef struct _WineD3D_GL_Info { } WineD3D_GL_Info; #undef USE_GL_FUNC -struct driver_quirk { - BOOL (*match)(const WineD3D_GL_Info *gl_info); - void (*apply)(WineD3D_GL_Info *gl_info); - const char *description; -}; - #endif /* __WINE_WINED3D_GL */

1 0

Henri Verbeet : wined3d: Try to activate the original context for queries.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 50419daa11b921237a0203e713450b7776ea3463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50419daa11b921237a0203e71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 1 09:46:17 2009 +0200 wined3d: Try to activate the original context for queries. --- dlls/wined3d/query.c | 166 +++++++++++++++++++++++++++++++------------------- 1 files changed, 103 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50419daa11b921237a020…

1 0

Henri Verbeet : wined3d: Recognize geometry shaders in shader_trace_init().
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: ca69ec0e852a6f2e877f1c93d7a37d6f857bf9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca69ec0e852a6f2e877f1c93d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 1 09:46:16 2009 +0200 wined3d: Recognize geometry shaders in shader_trace_init(). --- dlls/wined3d/baseshader.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 45463f0..63a9e96 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1138,14 +1138,34 @@ void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data, { struct wined3d_shader_version shader_version; const DWORD* pToken = pFunction; + const char *type_prefix; DWORD i; TRACE("Parsing %p\n", pFunction); fe->shader_read_header(fe_data, &pToken, &shader_version); - TRACE("%s_%u_%u\n", shader_is_pshader_version(shader_version.type) ? "ps": "vs", - shader_version.major, shader_version.minor); + switch (shader_version.type) + { + case WINED3D_SHADER_TYPE_VERTEX: + type_prefix = "vs"; + break; + + case WINED3D_SHADER_TYPE_GEOMETRY: + type_prefix = "gs"; + break; + + case WINED3D_SHADER_TYPE_PIXEL: + type_prefix = "ps"; + break; + + default: + FIXME("Unhandled shader type %#x.\n", shader_version.type); + type_prefix = "unknown"; + break; + } + + TRACE("%s_%u_%u\n", type_prefix, shader_version.major, shader_version.minor); while (!fe->shader_is_end(fe_data, &pToken)) {

1 0

Henri Verbeet : wined3d: Replace "pshader" checks with explicit type checks in shader_get_registers_used().
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 5df58b7f89a9cfbe7920024ed90b1dcdd39b7f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df58b7f89a9cfbe7920024ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 1 09:46:15 2009 +0200 wined3d: Replace "pshader" checks with explicit type checks in shader_get_registers_used(). --- dlls/wined3d/baseshader.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 52e0813..45463f0 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -402,7 +402,6 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 struct wined3d_shader_version shader_version; unsigned int cur_loop_depth = 0, max_loop_depth = 0; const DWORD* pToken = byte_code; - char pshader; /* There are some minor differences between pixel and vertex shaders */ @@ -417,7 +416,6 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 fe->shader_read_header(fe_data, &pToken, &shader_version); reg_maps->shader_version = shader_version; - pshader = shader_is_pshader_version(shader_version.type); reg_maps->constf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*reg_maps->constf) * ((constf_size + 31) / 32)); @@ -503,7 +501,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 pToken += 4; /* In pixel shader 1.X shaders, the constants are clamped between [-1;1] */ - if (shader_version.major == 1 && pshader) + if (shader_version.major == 1 && shader_version.type == WINED3D_SHADER_TYPE_PIXEL) { float *value = (float *) lconst->value; if(value[0] < -1.0) value[0] = -1.0; @@ -613,12 +611,14 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 /* WINED3DSPR_TEXCRDOUT is the same as WINED3DSPR_OUTPUT. _OUTPUT can be > MAX_REG_TEXCRD and * is used in >= 3.0 shaders. Filter 3.0 shaders to prevent overflows, and also filter pixel * shaders because TECRDOUT isn't used in them, but future register types might cause issues */ - if (!pshader && shader_version.major < 3 && dst_param.reg.type == WINED3DSPR_TEXCRDOUT) + if (shader_version.type == WINED3D_SHADER_TYPE_VERTEX && shader_version.major < 3 + && dst_param.reg.type == WINED3DSPR_TEXCRDOUT) { reg_maps->texcoord_mask[dst_param.reg.idx] |= dst_param.write_mask; } - if (pshader && dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) + if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL + && dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) { /* Many 2.0 and 3.0 pixel shaders end with a MOV from a temp register to * COLOROUT 0. If we know this in advance, the ARB shader backend can skip

1 0

Andrew Nguyen : reg: Support the /h flag as a synonymous help flag.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 7ec4ba32b25531f438c061f4d5a0b7b8f28792a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ec4ba32b25531f438c061f4d… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jul 1 00:41:45 2009 -0500 reg: Support the /h flag as a synonymous help flag. --- programs/reg/reg.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 9ebfd32..a538d81 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -352,6 +352,7 @@ int wmain(int argc, WCHAR *argvW[]) static const WCHAR queryW[] = {'q','u','e','r','y',0}; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; + static const WCHAR slashHW[] = {'/','h',0}; static const WCHAR slashSW[] = {'/','s',0}; static const WCHAR slashTW[] = {'/','t',0}; static const WCHAR slashVW[] = {'/','v',0}; @@ -359,7 +360,8 @@ int wmain(int argc, WCHAR *argvW[]) static const WCHAR slashVEW[] = {'/','v','e',0}; static const WCHAR slashHelpW[] = {'/','?',0}; - if (argc < 2 || !lstrcmpW(argvW[1], slashHelpW)) + if (argc < 2 || !lstrcmpW(argvW[1], slashHelpW) + || !lstrcmpiW(argvW[1], slashHW)) { reg_message(STRING_USAGE); return 0; @@ -375,7 +377,8 @@ int wmain(int argc, WCHAR *argvW[]) reg_message(STRING_INVALID_CMDLINE); return 1; } - else if (argc == 3 && !lstrcmpW(argvW[2], slashHelpW)) + else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || + !lstrcmpiW(argvW[2], slashHW))) { reg_message(STRING_ADD_USAGE); return 0; @@ -410,7 +413,8 @@ int wmain(int argc, WCHAR *argvW[]) reg_message(STRING_INVALID_CMDLINE); return 1; } - else if (argc == 3 && !lstrcmpW(argvW[2], slashHelpW)) + else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || + !lstrcmpiW(argvW[2], slashHW))) { reg_message(STRING_DELETE_USAGE); return 0; @@ -440,7 +444,8 @@ int wmain(int argc, WCHAR *argvW[]) reg_message(STRING_INVALID_CMDLINE); return 1; } - else if (argc == 3 && !lstrcmpW(argvW[2], slashHelpW)) + else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || + !lstrcmpiW(argvW[2], slashHW))) { reg_message(STRING_QUERY_USAGE); return 0;

1 0

Andrew Nguyen : reg: Correct the sense of return values for registry operations.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 070d9f91ab1f938c3303b29c68397478656be119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=070d9f91ab1f938c3303b29c6… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jul 1 00:41:41 2009 -0500 reg: Correct the sense of return values for registry operations. --- programs/reg/reg.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index aa9d440..9ebfd32 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -147,14 +147,14 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, if (key_name[0]=='\\' && key_name[1]=='\\') { reg_message(STRING_NO_REMOTE); - return 0; + return 1; } p = strchrW(key_name,'\\'); if (!p) { reg_message(STRING_INVALID_KEY); - return 0; + return 1; } p++; @@ -162,13 +162,13 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, if (!root) { reg_message(STRING_INVALID_KEY); - return 0; + return 1; } if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS) { reg_message(STRING_INVALID_KEY); - return 0; + return 1; } if (value_name || data) @@ -190,7 +190,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, { RegCloseKey(subkey); reg_message(STRING_INVALID_CMDLINE); - return 0; + return 1; } if (data) @@ -203,7 +203,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, RegCloseKey(subkey); reg_message(STRING_SUCCESS); - return 1; + return 0; } static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, @@ -220,14 +220,14 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, if (key_name[0]=='\\' && key_name[1]=='\\') { reg_message(STRING_NO_REMOTE); - return 0; + return 1; } p = strchrW(key_name,'\\'); if (!p) { reg_message(STRING_INVALID_KEY); - return 0; + return 1; } p++; @@ -235,19 +235,19 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, if (!root) { reg_message(STRING_INVALID_KEY); - return 0; + return 1; } if (value_name && value_empty) { reg_message(STRING_INVALID_CMDLINE); - return 0; + return 1; } if (value_empty && value_all) { reg_message(STRING_INVALID_CMDLINE); - return 0; + return 1; } if (!force) @@ -260,16 +260,16 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) { reg_message(STRING_CANNOT_FIND); - return 0; + return 1; } reg_message(STRING_SUCCESS); - return 1; + return 0; } if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS) { reg_message(STRING_CANNOT_FIND); - return 0; + return 1; } if (value_all) @@ -283,7 +283,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, { RegCloseKey(subkey); reg_message(STRING_INVALID_CMDLINE); - return 0; + return 1; } rc = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -292,7 +292,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, { /* FIXME: failure */ RegCloseKey(subkey); - return 0; + return 1; } maxValue++; szValue = HeapAlloc(GetProcessHeap(),0,maxValue*sizeof(WCHAR)); @@ -320,7 +320,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, { RegCloseKey(subkey); reg_message(STRING_CANNOT_FIND); - return 0; + return 1; } } else if (value_empty) @@ -330,7 +330,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, RegCloseKey(subkey); reg_message(STRING_SUCCESS); - return 1; + return 0; } static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,

1 0

Aurimas Fišeras : wineconsole: Add Lithuanian translation.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 726891ad8a3b14c9939f68e4a0cb46eb247f2a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=726891ad8a3b14c9939f68e4a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jun 30 23:23:25 2009 +0300 wineconsole: Add Lithuanian translation. --- programs/wineconsole/Makefile.in | 1 + programs/wineconsole/wineconsole_Lt.rc | 139 ++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index e7aba97..6ef22f7 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -25,6 +25,7 @@ RC_SRCS = \ wineconsole_Hu.rc \ wineconsole_It.rc \ wineconsole_Ko.rc \ + wineconsole_Lt.rc \ wineconsole_Nl.rc \ wineconsole_No.rc \ wineconsole_Pl.rc \ diff --git a/programs/wineconsole/wineconsole_Lt.rc b/programs/wineconsole/wineconsole_Lt.rc new file mode 100644 index 0000000..2e05466 --- /dev/null +++ b/programs/wineconsole/wineconsole_Lt.rc @@ -0,0 +1,139 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 "wineconsole_res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN +IDS_EDIT, "&Taisa" +IDS_DEFAULT, "Nustatyti &numatytasias" +IDS_PROPERTIES, "&Savybės" +IDS_MARK, "&Žymėti" +IDS_COPY, "&Kopijuoti" +IDS_PASTE, "Į&dėti" +IDS_SELECTALL, "&Pažymėti viską" +IDS_SCROLL, "&Slinkti" +IDS_SEARCH, "&Ieškoti" +IDS_FNT_DISPLAY, "Kiekvienas simbolis yra %ld pikselių pločio ir %ld pikselių aukščio" +IDS_FNT_PREVIEW_1, "Čia yra testas" +IDS_FNT_PREVIEW_2, "" +IDS_DLG_TIT_DEFAULT, "Konfigūracija - numatytosios nuostatos" +IDS_DLG_TIT_CURRENT, "Konfigūracija - dabartinės nuostatos" +IDS_DLG_TIT_ERROR, "Konfigūracijos klaida" +IDS_DLG_ERR_SBWINSIZE, "Ekrano buferio dydis turi būti didesnis arba lygus lango buferiui" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: nepavyko išnagrinėti įvykio identifikatoriaus\n" +IDS_CMD_INVALID_BACKEND "wineconsole: neteisinga posistemė\n" +IDS_CMD_INVALID_OPTION "wineconsole: neatpažintas komandinės eilutės parametras\n" +IDS_CMD_ABOUT "Paleidžia programą Wine pulte\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: nepavyko paleisti programos %s.\n"\ + "Neteisinga komanda.\n" + +IDS_USAGE_HEADER "\nNaudojimas:\n wineconsole [parametrai] <komanda>\n\nParametrai:\n" +IDS_USAGE_BACKEND " --backend={user|curses} „User“ sukurs naują langą, „curses“ mėgins\n"\ + " sukonfigūruoti dabartinį terminalą kaip Wine pultą\n" +IDS_USAGE_COMMAND " <komanda> Wine programa paleidimui pulte\n" +IDS_USAGE_FOOTER "\nPavyzdys:\n wineconsole cmd\nPaleidžia Wine komandų interpretatorių Wine pulte\n\n" + +END + +IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Parinktys " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Žymeklio dydis", -1, 10, 11, 60, 44, BS_GROUPBOX + AUTORADIOBUTTON "&Mažas", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Vidutinis", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Didelis", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP + + GROUPBOX "Valdymas", -1, 75, 11, 125, 44, BS_GROUPBOX + LTEXT "Iškylantis meniu", -1, 79, 23, 60, 20 + AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 149, 23, 50, 10, WS_TABSTOP + AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 149, 33, 50, 10, WS_TABSTOP + LTEXT "Greitas redagavimas", -1, 79, 43, 70, 10 + AUTOCHECKBOX "įjun&gti", IDC_OPT_QUICK_EDIT, 149, 43, 50, 10, WS_TABSTOP + + GROUPBOX "Komandų istorija", -1, 10, 57, 190, 35, BS_GROUPBOX + LTEXT "Prisimintų &komandų skaičius:", -1, 14, 67, 78, 18 + EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + AUTOCHECKBOX "&Šalinti vienodas", IDC_OPT_HIST_NODOUBLE, 130, 67, 60, 18, WS_TABSTOP|BS_MULTILINE +} + +IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Šriftas " +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Šriftas", -1, 5, 5, 24, 8 + LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL + LTEXT "&Spalva", -1, 100, 5, 50, 8 + CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 + CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 + LTEXT "&Dydis", -1, 158, 5, 40, 8 + LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL + CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 + LTEXT "", IDC_FNT_FONT_INFO, 124, 76, 80, 27 +} + +IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Konfigūracija " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Buferio dydis", -1, 10, 11, 100, 42, BS_GROUPBOX + LTEXT "&Plotis:", -1, 14, 25, 54, 9 + EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "&Aukštis:", -1, 14, 39, 54, 9 + EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "Lango dydis", -1, 10, 55, 100, 42 + LTEXT "P&lotis:", -1, 14, 69, 54, 9 + EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "A&ukštis:", -1, 14, 83, 54, 9 + EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "Programos pabaiga", -1, 115, 11, 80, 42, BS_GROUPBOX + AUTOCHECKBOX "Už&daryti pultą", IDC_CNF_CLOSE_EXIT, 119, 25, 72, 20, WS_TABSTOP + + GROUPBOX "Laida", -1, 115, 55, 80, 42 + COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 72, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP +} + +IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 170, 60 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Pulto parametrai" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 10, 10, 150, 31, BS_GROUPBOX + AUTORADIOBUTTON "Išsaugoti vėlesniems seansams", IDC_SAV_SAVE, 14, 15, 140, 10, WS_TABSTOP + AUTORADIOBUTTON "Keisti tik dabartinį seansą", IDC_SAV_SESSION, 14, 27, 140, 10, WS_TABSTOP + + PUSHBUTTON "Gerai", IDOK, 35, 45, 35, 12 + PUSHBUTTON "Atsisakyti", IDCANCEL, 80, 45, 35, 12 +}

1 0

Aric Stewart : msctf: Implement ITfDocumentMgr::EnumContexts.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 7de0b8299db9ebe839919cb90885a89ff46eeadd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de0b8299db9ebe839919cb90… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 14:47:12 2009 -0500 msctf: Implement ITfDocumentMgr::EnumContexts. --- dlls/msctf/documentmgr.c | 153 ++++++++++++++++++++++++++++++++++++- dlls/msctf/tests/inputprocessor.c | 33 ++++++++ include/msctf.idl | 21 +++++ 3 files changed, 205 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index f5ea71f..66f0f50 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -52,6 +52,16 @@ typedef struct tagDocumentMgr { ITfThreadMgrEventSink* ThreadMgrSink; } DocumentMgr; +typedef struct tagEnumTfContext { + const IEnumTfContextsVtbl *Vtbl; + LONG refCount; + + DWORD index; + DocumentMgr *docmgr; +} EnumTfContext; + +static HRESULT EnumTfContext_Constructor(DocumentMgr* mgr, IEnumTfContexts **ppOut); + static inline DocumentMgr *impl_from_ITfSourceVtbl(ITfSource *iface) { return (DocumentMgr *)((char *)iface - FIELD_OFFSET(DocumentMgr,SourceVtbl)); @@ -233,8 +243,8 @@ static HRESULT WINAPI DocumentMgr_GetBase(ITfDocumentMgr *iface, ITfContext **pp static HRESULT WINAPI DocumentMgr_EnumContexts(ITfDocumentMgr *iface, IEnumTfContexts **ppEnum) { DocumentMgr *This = (DocumentMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This,ppEnum); + return EnumTfContext_Constructor(This, ppEnum); } static const ITfDocumentMgrVtbl DocumentMgr_DocumentMgrVtbl = @@ -317,3 +327,142 @@ HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumen *ppOut = (ITfDocumentMgr*)This; return S_OK; } + +/************************************************** + * IEnumTfContexts implementaion + **************************************************/ +static void EnumTfContext_Destructor(EnumTfContext *This) +{ + TRACE("destroying %p\n", This); + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI EnumTfContext_QueryInterface(IEnumTfContexts *iface, REFIID iid, LPVOID *ppvOut) +{ + EnumTfContext *This = (EnumTfContext *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumTfContexts)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI EnumTfContext_AddRef(IEnumTfContexts *iface) +{ + EnumTfContext *This = (EnumTfContext*)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI EnumTfContext_Release(IEnumTfContexts *iface) +{ + EnumTfContext *This = (EnumTfContext *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + EnumTfContext_Destructor(This); + return ret; +} + +static HRESULT WINAPI EnumTfContext_Next(IEnumTfContexts *iface, + ULONG ulCount, ITfContext **rgContext, ULONG *pcFetched) +{ + EnumTfContext *This = (EnumTfContext *)iface; + ULONG fetched = 0; + + TRACE("(%p)\n",This); + + if (rgContext == NULL) return E_POINTER; + + while (fetched < ulCount) + { + if (This->index > 1) + break; + + if (!This->docmgr->contextStack[This->index]) + break; + + *rgContext = This->docmgr->contextStack[This->index]; + ITfContext_AddRef(*rgContext); + + ++This->index; + ++fetched; + ++rgContext; + } + + if (pcFetched) *pcFetched = fetched; + return fetched == ulCount ? S_OK : S_FALSE; +} + +static HRESULT WINAPI EnumTfContext_Skip( IEnumTfContexts* iface, ULONG celt) +{ + EnumTfContext *This = (EnumTfContext *)iface; + TRACE("(%p)\n",This); + This->index += celt; + return S_OK; +} + +static HRESULT WINAPI EnumTfContext_Reset( IEnumTfContexts* iface) +{ + EnumTfContext *This = (EnumTfContext *)iface; + TRACE("(%p)\n",This); + This->index = 0; + return S_OK; +} + +static HRESULT WINAPI EnumTfContext_Clone( IEnumTfContexts *iface, + IEnumTfContexts **ppenum) +{ + EnumTfContext *This = (EnumTfContext *)iface; + HRESULT res; + + TRACE("(%p)\n",This); + + if (ppenum == NULL) return E_POINTER; + + res = EnumTfContext_Constructor(This->docmgr, ppenum); + if (SUCCEEDED(res)) + { + EnumTfContext *new_This = (EnumTfContext *)*ppenum; + new_This->index = This->index; + } + return res; +} + +static const IEnumTfContextsVtbl IEnumTfContexts_Vtbl ={ + EnumTfContext_QueryInterface, + EnumTfContext_AddRef, + EnumTfContext_Release, + + EnumTfContext_Clone, + EnumTfContext_Next, + EnumTfContext_Reset, + EnumTfContext_Skip +}; + +static HRESULT EnumTfContext_Constructor(DocumentMgr *mgr, IEnumTfContexts **ppOut) +{ + EnumTfContext *This; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(EnumTfContext)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->Vtbl= &IEnumTfContexts_Vtbl; + This->refCount = 1; + This->docmgr = mgr; + + TRACE("returning %p\n", This); + *ppOut = (IEnumTfContexts*)This; + return S_OK; +} diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index ba43570..9b266ba 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1113,6 +1113,35 @@ static void test_Activate(void) ok(SUCCEEDED(hr),"Failed to Activate text service\n"); } + +static void test_EnumContexts(ITfDocumentMgr *dm, ITfContext *search) +{ + HRESULT hr; + IEnumTfContexts* pEnum; + BOOL found = FALSE; + + hr = ITfDocumentMgr_EnumContexts(dm,&pEnum); + ok(SUCCEEDED(hr),"EnumContexts failed\n"); + if (SUCCEEDED(hr)) + { + ULONG fetched; + ITfContext *cxt; + while (IEnumTfContexts_Next(pEnum, 1, &cxt, &fetched) == S_OK) + { + if (!search) + found = TRUE; + else if (search == cxt) + found = TRUE; + ITfContext_Release(cxt); + } + IEnumTfContexts_Release(pEnum); + } + if (search) + ok(found,"Did not find proper ITfContext\n"); + else + ok(!found,"Found an ITfContext we should should not have\n"); +} + static inline int check_context_refcount(ITfContext *iface) { IUnknown_AddRef(iface); @@ -1183,6 +1212,8 @@ static void test_startSession(void) hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, NULL, &cxt3, &editCookie); ok(SUCCEEDED(hr),"CreateContext Failed\n"); + test_EnumContexts(g_dm, NULL); + hr = ITfContext_GetDocumentMgr(cxt,&dmtest); ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %x\n",hr); ok(dmtest == g_dm, "Wrong documentmgr\n"); @@ -1199,6 +1230,8 @@ static void test_startSession(void) ok(test_OnInitDocumentMgr == SINK_FIRED, "OnInitDocumentMgr sink not fired\n"); ok(test_ACP_AdviseSink == SINK_FIRED,"TextStoreACP_AdviseSink not fired\n"); + test_EnumContexts(g_dm, cxt); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); diff --git a/include/msctf.idl b/include/msctf.idl index ef362e0..6b341d2 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -953,3 +953,24 @@ interface ITfCompartmentEventSink : IUnknown HRESULT OnChange( [in] REFGUID rguid); } + +[ + object, + uuid(8f1a7ea6-1654-4502-a86e-b2902344d507), + pointer_default(unique) +] +interface IEnumTfContexts : IUnknown +{ + HRESULT Clone( + [out] IEnumTfContexts **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfContext **rgContext, + [out] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +};

1 0

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 July 2009