wine-commits July 2009

wine-commits@winehq.org

4 participants
1067 discussions

Henri Verbeet : wined3d: Fix some cast-qual warnings.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 9cf78880022626080d6ee69a2ed4b7cd7e436d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf78880022626080d6ee69a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:11 2009 +0200 wined3d: Fix some cast-qual warnings. --- dlls/wined3d/baseshader.c | 8 ++++---- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3590d21..12fc28c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -750,7 +750,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 } reg_maps->loop_depth = max_loop_depth; - This->baseShader.functionLength = ((char *)pToken - (char *)byte_code); + This->baseShader.functionLength = ((const char *)pToken - (const char *)byte_code); return WINED3D_OK; } @@ -925,13 +925,13 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, switch (reg->immconst_type) { case WINED3D_IMMCONST_FLOAT: - TRACE("%.8e", *(float *)reg->immconst_data); + TRACE("%.8e", *(const float *)reg->immconst_data); break; case WINED3D_IMMCONST_FLOAT4: TRACE("%.8e, %.8e, %.8e, %.8e", - *(float *)&reg->immconst_data[0], *(float *)&reg->immconst_data[1], - *(float *)&reg->immconst_data[2], *(float *)&reg->immconst_data[3]); + *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], + *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); break; default: diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bed6d84..bd5ddba 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -577,7 +577,7 @@ static ULONG STDMETHODCALLTYPE buffer_AddRef(IWineD3DBuffer *iface) } /* Context activation is done by the caller. */ -const BYTE *buffer_get_sysmem(struct wined3d_buffer *This) +BYTE *buffer_get_sysmem(struct wined3d_buffer *This) { /* AllocatedMemory exists if the buffer is double buffered or has no buffer object at all */ if(This->resource.allocatedMemory) return This->resource.allocatedMemory; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 34266e9..82a5fb8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1335,13 +1335,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_FLOAT: - sprintf(register_name, "%.8e", *(float *)reg->immconst_data); + sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); break; case WINED3D_IMMCONST_FLOAT4: sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", - *(float *)&reg->immconst_data[0], *(float *)&reg->immconst_data[1], - *(float *)&reg->immconst_data[2], *(float *)&reg->immconst_data[3]); + *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], + *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); break; default: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 164e3bb..d8c56e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2395,7 +2395,7 @@ struct wined3d_buffer extern const IWineD3DBufferVtbl wined3d_buffer_vtbl; const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer_object); -const BYTE *buffer_get_sysmem(struct wined3d_buffer *This); +BYTE *buffer_get_sysmem(struct wined3d_buffer *This); /* IWineD3DRendertargetView */ struct wined3d_rendertarget_view

1 0

Henri Verbeet : wined3d: Get rid of the useless "fragcolor" variable in shader_glsl_generate_pshader().
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 95d9b1271fd513dc63eb27adef20079e53c8ab3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d9b1271fd513dc63eb27ade… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:10 2009 +0200 wined3d: Get rid of the useless "fragcolor" variable in shader_glsl_generate_pshader(). --- dlls/wined3d/glsl_shader.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 07b1cb2..34266e9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3676,7 +3676,6 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, struct { const struct shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; - const char *fragcolor; const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; struct shader_glsl_ctx_priv priv_ctx; @@ -3718,16 +3717,15 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, struct shader_addline(buffer, "gl_FragData[0] = R0;\n"); } - fragcolor = "gl_FragData[0]"; if(args->srgb_correction) { - shader_addline(buffer, "tmp0.xyz = pow(%s.xyz, vec3(%f, %f, %f)) * vec3(%f, %f, %f) - vec3(%f, %f, %f);\n", - fragcolor, srgb_pow, srgb_pow, srgb_pow, srgb_mul_high, srgb_mul_high, srgb_mul_high, + shader_addline(buffer, "tmp0.xyz = pow(gl_FragData[0].xyz, vec3(%f, %f, %f)) * vec3(%f, %f, %f) - vec3(%f, %f, %f);\n", + srgb_pow, srgb_pow, srgb_pow, srgb_mul_high, srgb_mul_high, srgb_mul_high, srgb_sub_high, srgb_sub_high, srgb_sub_high); - shader_addline(buffer, "tmp1.xyz = %s.xyz * srgb_mul_low.xyz;\n", fragcolor); - shader_addline(buffer, "%s.x = %s.x < srgb_comparison.x ? tmp1.x : tmp0.x;\n", fragcolor, fragcolor); - shader_addline(buffer, "%s.y = %s.y < srgb_comparison.y ? tmp1.y : tmp0.y;\n", fragcolor, fragcolor); - shader_addline(buffer, "%s.z = %s.z < srgb_comparison.z ? tmp1.z : tmp0.z;\n", fragcolor, fragcolor); - shader_addline(buffer, "%s = clamp(%s, 0.0, 1.0);\n", fragcolor, fragcolor); + shader_addline(buffer, "tmp1.xyz = gl_FragData[0].xyz * srgb_mul_low.xyz;\n"); + shader_addline(buffer, "gl_FragData[0].x = gl_FragData[0].x < srgb_comparison.x ? tmp1.x : tmp0.x;\n"); + shader_addline(buffer, "gl_FragData[0].y = gl_FragData[0].y < srgb_comparison.y ? tmp1.y : tmp0.y;\n"); + shader_addline(buffer, "gl_FragData[0].z = gl_FragData[0].z < srgb_comparison.z ? tmp1.z : tmp0.z;\n"); + shader_addline(buffer, "gl_FragData[0] = clamp(gl_FragData[0], 0.0, 1.0);\n"); } /* Pixel shader < 3.0 do not replace the fog stage. * This implements linear fog computation and blending. @@ -3743,19 +3741,19 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, struct shader_addline(buffer, "float fogstart = -1.0 / (gl_Fog.end - gl_Fog.start);\n"); shader_addline(buffer, "float fogend = gl_Fog.end * -fogstart;\n"); shader_addline(buffer, "float Fog = clamp(gl_FogFragCoord * fogstart + fogend, 0.0, 1.0);\n"); - shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); break; case FOG_EXP: /* Fog = e^(-gl_Fog.density * gl_FogFragCoord) */ shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_FogFragCoord);\n"); shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); - shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); break; case FOG_EXP2: /* Fog = e^(-(gl_Fog.density * gl_FogFragCoord)^2) */ shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);\n"); shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); - shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); break; } }

1 0

Henri Verbeet : wined3d: Allow shader_buffer_init() to fail.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 483d552e219310ef9962a8ce0e365c8f5d2c0663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d552e219310ef9962a8ce0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:09 2009 +0200 wined3d: Allow shader_buffer_init() to fail. --- dlls/wined3d/arb_program_shader.c | 26 ++++++++++++++++++++++---- dlls/wined3d/baseshader.c | 9 ++++++++- dlls/wined3d/glsl_shader.c | 6 +++++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8c0ad40..e48d5e3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4006,7 +4006,12 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * pixelshader_update_samplers(&shader->baseShader.reg_maps, ((IWineD3DDeviceImpl *)shader->baseShader.device)->stateBlock->textures); - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } + ret = shader_arb_generate_pshader(shader, &buffer, args, &shader_data->gl_shaders[shader_data->num_gl_shaders]); shader_buffer_free(&buffer); @@ -4076,7 +4081,12 @@ static struct arb_vs_compiled_shader *find_arb_vshader(IWineD3DVertexShaderImpl shader_data->gl_shaders[shader_data->num_gl_shaders].args = *args; - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } + ret = shader_arb_generate_vshader(shader, &buffer, args, &shader_data->gl_shaders[shader_data->num_gl_shaders]); shader_buffer_free(&buffer); @@ -5541,7 +5551,11 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi } /* Shader header */ - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } shader_addline(&buffer, "!!ARBfp1.0\n"); @@ -6304,7 +6318,11 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu struct arbfp_blit_priv *priv = device->blit_priv; /* Shader header */ - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } ENTER_GL(); GL_EXTCALL(glGenProgramsARB(1, &shader)); diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 2f9410a..3590d21 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -146,10 +146,17 @@ void shader_buffer_clear(struct wined3d_shader_buffer *buffer) buffer->newline = TRUE; } -void shader_buffer_init(struct wined3d_shader_buffer *buffer) +BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) { buffer->buffer = HeapAlloc(GetProcessHeap(), 0, SHADER_PGMSIZE); + if (!buffer->buffer) + { + ERR("Failed to allocate shader buffer memory.\n"); + return FALSE; + } + shader_buffer_clear(buffer); + return TRUE; } void shader_buffer_free(struct wined3d_shader_buffer *buffer) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3433201..07b1cb2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4456,7 +4456,11 @@ static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { struct shader_glsl_priv *priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_glsl_priv)); SIZE_T stack_size = wined3d_log2i(max(GL_LIMITS(vshader_constantsF), GL_LIMITS(pshader_constantsF))) + 1; - shader_buffer_init(&priv->shader_buffer); + if (!shader_buffer_init(&priv->shader_buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + goto fail; + } priv->stack = HeapAlloc(GetProcessHeap(), 0, stack_size * sizeof(*priv->stack)); if (!priv->stack) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ecc3ee3..164e3bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2601,7 +2601,7 @@ typedef struct IWineD3DBaseShaderImpl { } IWineD3DBaseShaderImpl; void shader_buffer_clear(struct wined3d_shader_buffer *buffer); -void shader_buffer_init(struct wined3d_shader_buffer *buffer); +BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer); void shader_buffer_free(struct wined3d_shader_buffer *buffer); void shader_cleanup(IWineD3DBaseShader *iface); void shader_dump_src_param(const struct wined3d_shader_src_param *param,

1 0

Henri Verbeet : wined3d: Rename "SHADER_BUFFER" to something sane.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 40b411958bd6dba819d92eea8b796da9762de804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b411958bd6dba819d92eea8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:08 2009 +0200 wined3d: Rename "SHADER_BUFFER" to something sane. --- dlls/wined3d/arb_program_shader.c | 140 +++++++++++++++++++------------------ dlls/wined3d/baseshader.c | 12 ++-- dlls/wined3d/glsl_shader.c | 50 +++++++------- dlls/wined3d/wined3d_private.h | 27 ++++---- 4 files changed, 116 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40b411958bd6dba819d92…

1 0

Henri Verbeet : wined3d: Reuse the shader buffer between shaders.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: bddc4d3f0d5b999d56a7049f34272cd7d1dae692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddc4d3f0d5b999d56a7049f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:07 2009 +0200 wined3d: Reuse the shader buffer between shaders. --- dlls/wined3d/baseshader.c | 9 +++- dlls/wined3d/glsl_shader.c | 117 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 65 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bddc4d3f0d5b999d56a70…

1 0

Francois Gouget : winapi: Modify parse_c_typedef() to get rid of the $finished variable.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: def8d4f40157bafd7a4ee0553750252ccfb6d98c URL: http://source.winehq.org/git/wine.git/?a=commit;h=def8d4f40157bafd7a4ee0553… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 09:52:11 2009 +0200 winapi: Modify parse_c_typedef() to get rid of the $finished variable. --- tools/winapi/c_parser.pm | 60 ++++++++++++++++----------------------------- 1 files changed, 21 insertions(+), 39 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 27f5317..3a00039 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -1569,60 +1569,49 @@ sub parse_c_typedef($$$$) my $line = $$refline; my $column = $$refcolumn; - my $type; - if (!$self->_parse_c("typedef", \$_, \$line, \$column)) { return 0; } - my $finished = 0; - - if ($finished) { - # Nothing - } elsif ($self->parse_c_enum(\$_, \$line, \$column)) { - $finished = 1; - } - - my $kind; - my $_name; - my @field_type_names; - my @field_names; - my @names; - if ($finished) { - # Nothing - } elsif ($self->parse_c_struct_union(\$_, \$line, \$column, - \$kind, \$_name, \@field_type_names, \@field_names, \@names)) + my ($kind, $name, @field_type_names, @field_names, @names); + my ($linkage, $type_name); + if ($self->parse_c_enum(\$_, \$line, \$column)) +{ + # Nothing to do + } + elsif ($self->parse_c_struct_union(\$_, \$line, \$column, + \$kind, \$name, \@field_type_names, \@field_names, \@names)) { my $base_name; - foreach my $name (@names) + foreach my $_name (@names) { - if ($name =~ /^\w+$/) + if ($_name =~ /^\w+$/) { - $base_name = $name; + $base_name = $_name; last; } } - $base_name="$kind $_name" if (!defined $base_name and defined $_name); + $base_name="$kind $name" if (!defined $base_name and defined $name); $base_name=$kind if (!defined $base_name); - foreach my $name (@names) { - if ($name =~ /^\w+$/) { + foreach my $_name (@names) { + if ($_name =~ /^\w+$/) { my $type = $self->{CREATE_TYPE}(); $type->kind($kind); - $type->_name($_name); - $type->name($name); + $type->_name($name); + $type->name($_name); $type->field_type_names([@field_type_names]); $type->field_names([@field_names]); $self->{FOUND_TYPE}($type); - } elsif ($name =~ /^(\*+)\s*(?:RESTRICTED_POINTER\s+)?(\w+)$/) { + } elsif ($_name =~ /^(\*+)\s*(?:RESTRICTED_POINTER\s+)?(\w+)$/) { my $type_name = "$base_name $1"; - $name = $2; + $_name = $2; my $type = $self->{CREATE_TYPE}(); $type->kind(""); - $type->name($name); + $type->name($_name); $type->field_type_names([$type_name]); $type->field_names([""]); @@ -1631,16 +1620,9 @@ sub parse_c_typedef($$$$) $self->_parse_c_error($_, $line, $column, "typedef 2"); } } - - $finished = 1; } - - my $linkage; - my $type_name; - my $name; - if ($finished) { - # Nothing - } elsif ($self->parse_c_variable(\$_, \$line, \$column, \$linkage, \$type_name, \$name)) { + elsif ($self->parse_c_variable(\$_, \$line, \$column, \$linkage, \$type_name, \$name)) + { $type_name =~ s/\s+/ /g; if(defined($type_name) && defined($name)) {

1 0

Francois Gouget : winapi: Introduce a pseudo-loop in parse_c_variable() to get rid of the $finished variable.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 6f5ae45846584223f0cc97af6db87668235f1105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5ae45846584223f0cc97af6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 09:52:08 2009 +0200 winapi: Introduce a pseudo-loop in parse_c_variable() to get rid of the $finished variable. --- tools/winapi/c_parser.pm | 212 ++++++++++++++++++++++------------------------ 1 files changed, 103 insertions(+), 109 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 5841185..27f5317 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -1710,126 +1710,120 @@ sub parse_c_variable($$$$$$$) } } - my $finished = 0; - - if($finished) { - # Nothing - } elsif(/^$/) { - return 0; - } elsif (s/^(enum\s+|interface\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { - my $kind = $1; - my $_name = $2; - $self->_update_c_position($&, \$line, \$column); - - if(defined($_name)) { - $type = "$kind $_name { }"; - } else { - $type = "$kind { }"; - } + return 0 if(/^$/); - $finished = 1; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s+DECLSPEC_ALIGN$.*?$|\s*(?:const\s*|volatile\s*)?\*)*)\s*(\w+)\s*(\[.*?\]$|:\s*(\d+)$|\{)?//s) { - $type = "$sign$1"; - $name = $2; - - if (defined($3)) { - my $bits = $4; - local $_ = $3; - if (/^\[/) { - $type .= $_; - } elsif (/^:/) { - $type .= ":$bits"; - } elsif (/^\{/) { - # Nothing - } - } - - $type = $self->_format_c_type($type); - - $finished = 1; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*)\s*:\s*(\d+)$//s) { - $type = "$sign$1:$2"; - $name = ""; - $type = $self->_format_c_type($type); - - $finished = 1; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { - $type = $self->_format_c_type("$sign$1$3"); - $name = $2; - - $finished = 1; - } elsif($self->_parse_c('DEFINE_GUID', \$_, \$line, \$column, \$match)) { # Windows specific - $type = $match; - $finished = 1; - } else { - $self->_parse_c_warning($_, $line, $column, "variable", "'$_'"); - $finished = 1; - } - - if($finished) { - # Nothing - } elsif($self->_parse_c('SEQ_DEFINEBUF', \$_, \$line, \$column, \$match)) { # Linux specific - $type = $match; - $finished = 1; - } elsif($self->_parse_c('DEFINE_REGS_ENTRYPOINT_\w+|DPQ_DECL_\w+|HANDLER_DEF|IX86_ONLY', # Wine specific - \$_, \$line, \$column, \$match)) + finished: while (1) { - $type = $match; - $finished = 1; - } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*$\w+$', \$_, \$line, \$column, \$match)) { - $type = $match; - $finished = 1; - } elsif(s/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*//s) { - my $kind = $1; - my $_name = $2; - $self->_update_c_position($&, \$line, \$column); + if (s/^(enum\s+|interface\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { + my $kind = $1; + my $_name = $2; + $self->_update_c_position($&, \$line, \$column); + + if(defined($_name)) { + $type = "$kind $_name { }"; + } else { + $type = "$kind { }"; + } - if(defined($_name)) { - $type = "struct $_name { }"; - } else { - $type = "struct { }"; - } - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s*(?:\*\s*)*//s) { - $type = $&; - $type =~ s/\s//g; - } else { - return 0; - } + last finished; + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s+DECLSPEC_ALIGN$.*?$|\s*(?:const\s*|volatile\s*)?\*)*)\s*(\w+)\s*(\[.*?\]$|:\s*(\d+)$|\{)?//s) { + $type = "$sign$1"; + $name = $2; + + if (defined($3)) { + my $bits = $4; + local $_ = $3; + if (/^\[/) { + $type .= $_; + } elsif (/^:/) { + $type .= ":$bits"; + } elsif (/^\{/) { + # Nothing + } + } - # $output->write("*** $type: '$_'\n"); + $type = $self->_format_c_type($type); + + last finished; + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*)\s*:\s*(\d+)$//s) { + $type = "$sign$1:$2"; + $name = ""; + $type = $self->_format_c_type($type); + + last finished; + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { + $type = $self->_format_c_type("$sign$1$3"); + $name = $2; + + last finished; + } elsif($self->_parse_c('DEFINE_GUID', \$_, \$line, \$column, \$match)) { # Windows specific + $type = $match; + last finished; + } else { + $self->_parse_c_warning($_, $line, $column, "variable", "'$_'"); + last finished; + } - # $self->_parse_c_warning($_, $line, $column, "variable2", ""); + if($self->_parse_c('SEQ_DEFINEBUF', \$_, \$line, \$column, \$match)) { # Linux specific + $type = $match; + last finished; + } elsif($self->_parse_c('DEFINE_REGS_ENTRYPOINT_\w+|DPQ_DECL_\w+|HANDLER_DEF|IX86_ONLY', # Wine specific + \$_, \$line, \$column, \$match)) + { + $type = $match; + last finished; + } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*$\w+$', \$_, \$line, \$column, \$match)) { + $type = $match; + last finished; + } elsif(s/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*//s) { + my $kind = $1; + my $_name = $2; + $self->_update_c_position($&, \$line, \$column); + + if(defined($_name)) { + $type = "struct $_name { }"; + } else { + $type = "struct { }"; + } + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s*(?:\*\s*)*//s) { + $type = $&; + $type =~ s/\s//g; + } else { + return 0; + } - if($finished) { - # Nothing - } elsif(s/^WINAPI\s*//) { - $self->_update_c_position($&, \$line, \$column); - } + # $output->write("*** $type: '$_'\n"); - if($finished) { - # Nothing - } elsif(s/^($(?:$CALL_CONVENTION)?\s*\*?\s*(?:$CALL_CONVENTION)?\w+\s*(?:\[[^\]]*\]\s*)*$)\s*$//) { - $self->_update_c_position($&, \$line, \$column); + # $self->_parse_c_warning($_, $line, $column, "variable2", ""); - $name = $1; - $name =~ s/\s//g; + if(s/^WINAPI\s*//) { + $self->_update_c_position($&, \$line, \$column); + } - $self->_parse_c_until_one_of("\$", \$_, \$line, \$column); - if(s/^\)//) { $column++; } - $self->_parse_c_until_one_of("\\S", \$_, \$line, \$column); + if(s/^($(?:$CALL_CONVENTION)?\s*\*?\s*(?:$CALL_CONVENTION)?\w+\s*(?:\[[^\]]*\]\s*)*$)\s*$//) { + $self->_update_c_position($&, \$line, \$column); - if(!s/^(?:=\s*|,\s*|$)//) { - return 0; - } - } elsif(s/^(?:\*\s*)*(?:const\s+|volatile\s+)?(\w+)\s*(?:\[[^\]]*\]\s*)*\s*(?:=\s*|,\s*|$)//) { - $self->_update_c_position($&, \$line, \$column); + $name = $1; + $name =~ s/\s//g; - $name = $1; - $name =~ s/\s//g; - } elsif(/^$/) { - $name = ""; - } else { - return 0; + $self->_parse_c_until_one_of("\$", \$_, \$line, \$column); + if(s/^\)//) { $column++; } + $self->_parse_c_until_one_of("\\S", \$_, \$line, \$column); + + if(!s/^(?:=\s*|,\s*|$)//) { + return 0; + } + } elsif(s/^(?:\*\s*)*(?:const\s+|volatile\s+)?(\w+)\s*(?:\[[^\]]*\]\s*)*\s*(?:=\s*|,\s*|$)//) { + $self->_update_c_position($&, \$line, \$column); + + $name = $1; + $name =~ s/\s//g; + } elsif(/^$/) { + $name = ""; + } else { + return 0; + } + last finished; } # $output->write("$type: $name: '$_'\n");

1 0

Hwang YunSong : notepad: Updated Korean resource.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 3ce23c9802fe1a201e5c449acfca93db1766e92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce23c9802fe1a201e5c449ac… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:17:03 2009 +0900 notepad: Updated Korean resource. --- programs/notepad/Ko.rc | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index b838cbf..56167de 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -114,12 +114,22 @@ STRING_TOOLARGE, "%s �ٸ� ��⸦ ��Ͻʽÿ�." STRING_NOTEXT, "�Է�� ϴ�.\ \n�� Է�� õ��Ͻʽÿ�" -STRING_DOESNOTEXIST, "%s\n�� ϴ�.\n\n \ +STRING_DOESNOTEXIST, "%s\ �� ϴ�.\n\n \ �� ðڽ��ϱ�?" -STRING_NOTSAVED, "%s\n�� Ǿ��ϴ�.\n\n \ +STRING_NOTSAVED, "%s\ �� Ǿ��ϴ�.\n\n \ �� Ͻðڽ��ϱ�?" STRING_NOTFOUND, "%s ��ڿ�� ã�� ϴ�." STRING_OUT_OF_MEMORY, "�� ۾�� Ϸ��ϴ� �� ʿ�� ޸𸮰� ��մϴ�.\ -\n�� ޸�� Ȯ��ϱ� �� ϳ� �̻�� α׷�� ݾ� �ֽʽÿ�.\n" +\n�� ޸�� Ȯ��ϱ� �� ϳ� �̻�� α׷�� ݾ� �ֽʽÿ�." + +STRING_UNICODE_LE, "��ڵ� (UTF-16)" +STRING_UNICODE_BE, "��ڵ� (UTF-16 ��-��)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +��ڵ� ��ڸ� ��ϰ� �ִ� �� %s ��ڵ�� \n\ +�� ϸ� �� ս�� Դϴ�.\n\ +�� ڸ� ��Ϸ�� Ҹ� Ŭ��ϰ�, ��ڵ� ��Ӵٿ�� ڵ� \n\ +�ɼ� �� ϳ�� Ͻʽÿ�t.\n\ +��Ͻðڽ��ϱ�?" }

1 0

Hwang YunSong : cryptui: Updated Korean resource.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 7cecc0cb8255ff9f0492599900e368e31869dd84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cecc0cb8255ff9f049259990… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:12:45 2009 +0900 cryptui: Updated Korean resource. --- dlls/cryptui/cryptui_Ko.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/cryptui/cryptui_Ko.rc b/dlls/cryptui/cryptui_Ko.rc index 6cbf6fe..2533a4e 100644 --- a/dlls/cryptui/cryptui_Ko.rc +++ b/dlls/cryptui/cryptui_Ko.rc @@ -404,22 +404,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "�� :", -1, 21,1,195,10 AUTORADIOBUTTON "&DER-��ȣȭ�� X.509 (.cer)", - IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "Ba&se64-��ȣȭ�� X.509 (.cer):", - IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "��ȣ �޽�� ǥ��/PKCS #7 �޽��(&C) (.p7b)", - IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON CHECKBOX "�� ο� �ִ� �� (&I)", - IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "�� ȯ(&P)/PKCS #12 (.pfx)", - IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "�� ο� �ִ� �� (&U)", - IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "�� ȣȭ ��(&E)", - IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "��Ⱑ ��ϸ� �� Ű ��(&K)", - IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED END

1 0

Hwang YunSong : cryptdlg: Updated Korean resource.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 246c99916d73028709d7f4da876cc71f4554e8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=246c99916d73028709d7f4da8… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:08:31 2009 +0900 cryptdlg: Updated Korean resource. --- dlls/cryptdlg/cryptdlg_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_Ko.rc b/dlls/cryptdlg/cryptdlg_Ko.rc index 548a74d..e9a6d9d 100644 --- a/dlls/cryptdlg/cryptdlg_Ko.rc +++ b/dlls/cryptdlg/cryptdlg_Ko.rc @@ -29,7 +29,7 @@ STRINGTABLE DISCARDABLE IDS_POLICY_ID "��å �ĺ��: " IDS_POLICY_QUALIFIER_INFO "��å �� " IDS_POLICY_QUALIFIER_ID "��å �� ̵�=" - IDS_CPS "CPS" + IDS_CPS "CPS"/*�� */ IDS_USER_NOTICE "�� " IDS_QUALIFIER "��" IDS_NOTICE_REF "�� "

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