August 2009 - Wine-Commits - list.winehq.org

André Hentschel : winemaker: Parse libraries of vcproj-files.
by Alexandre Julliard Aug. 11, 2009

Aug. 11, 2009

Module: wine Branch: master Commit: c9cea6f2942eedcb3683097deabc7071c243fd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9cea6f2942eedcb3683097de… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 10 17:44:09 2009 +0200 winemaker: Parse libraries of vcproj-files. --- tools/winemaker | 60 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 35 insertions(+), 25 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 79572c3..060e207 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.7.2"; +my $version="0.7.3"; use Cwd; use File::Basename; @@ -726,11 +726,9 @@ sub source_scan_project_file($$$) @prj_target_options=split(" /", $prj_target_ldflags); $prj_target_ldflags=""; $prj_target_libs=$prj_target_options[0]; - #print "\n$prj_target_libs bevor\n"; $prj_target_libs=~s/\\/\//g; $prj_target_libs=~s/\.lib//g; $prj_target_libs=~s/\s+/ -l/g; - #print "\n$prj_target_libs after\n"; shift (@prj_target_options); foreach ( @prj_target_options ) { if ($_ eq "") { @@ -908,34 +906,46 @@ sub source_scan_project_file($$$) foreach my $vc_configuration_tools ($vc_configuration->findnodes('Tool')) { my @find_tool = $vc_configuration_tools->attributes; - if ($find_tool[0]->getValue ne "VCCLCompilerTool") {next;} - foreach my $vc_configuration_tool ($vc_configuration_tools->attributes) { - if ($vc_configuration_tool->getName eq "Optimization") {$prj_target_cflags.="-O".$vc_configuration_tool->getValue." ";} - if ($vc_configuration_tool->getName eq "WarningLevel") { - if ($vc_configuration_tool->getValue==0) { - $prj_target_cflags.="-w "; - } elsif ($vc_configuration_tool->getValue<4) { - $prj_target_cflags.="-W "; - } elsif ($vc_configuration_tool->getValue==4) { - $prj_target_cflags.="-Wall "; - } elsif ($vc_configuration_tool->getValue eq "X") { - $prj_target_cflags.="-Werror "; + if ($find_tool[0]->getValue eq "VCCLCompilerTool") { + foreach my $vc_compiler_tool ($vc_configuration_tools->attributes) { + if ($vc_compiler_tool->getName eq "Optimization") {$prj_target_cflags.="-O".$vc_compiler_tool->getValue." ";} + if ($vc_compiler_tool->getName eq "WarningLevel") { + if ($vc_compiler_tool->getValue==0) { + $prj_target_cflags.="-w "; + } elsif ($vc_compiler_tool->getValue<4) { + $prj_target_cflags.="-W "; + } elsif ($vc_compiler_tool->getValue==4) { + $prj_target_cflags.="-Wall "; + } elsif ($vc_compiler_tool->getValue eq "X") { + $prj_target_cflags.="-Werror "; + } + } + if ($vc_compiler_tool->getName eq "PreprocessorDefinitions") { + $configt=$vc_compiler_tool->getValue; + $configt=~s/;/ -D/g; + $prj_target_cflags.="-D".$configt." "; + } + if ($vc_compiler_tool->getName eq "AdditionalIncludeDirectories") { + $configt=$vc_compiler_tool->getValue; + $configt=~s/\\/\//g; + $configt=~s/;/ -I/g; + push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$configt; } } - if ($vc_configuration_tool->getName eq "PreprocessorDefinitions") { - $configt=$vc_configuration_tool->getValue; - $configt=~s/;/ -D/g; - $prj_target_cflags.="-D".$configt." "; - } - if ($vc_configuration_tool->getName eq "AdditionalIncludeDirectories") { - $configt=$vc_configuration_tool->getValue; - $configt=~s/\\/\//g; - $configt=~s/;/ -I/g; - push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$configt; + } + if ($find_tool[0]->getValue eq "VCLinkerTool") { + foreach my $vc_linker_tool ($vc_configuration_tools->attributes) { + if ($vc_linker_tool->getName eq "AdditionalDependencies") { + $prj_target_libs=" ".$vc_linker_tool->getValue; + $prj_target_libs=~s/\\/\//g; + $prj_target_libs=~s/\.lib//g; + $prj_target_libs=~s/\s+/ -l/g; + } } } } + push @{@$project_settings[$T_LIBRARIES]},$prj_target_libs; push @{@$project_settings[$T_CEXTRA]},$prj_target_cflags; push @{@$project_settings[$T_CXXEXTRA]},$prj_target_cflags; }

1 0

Marcus Meissner : winemenubuilder: Check for NULL allocation (Coverity).
by Alexandre Julliard Aug. 11, 2009

Aug. 11, 2009

Module: wine Branch: master Commit: b123102ae52ff0948dc79fb9cf8f901e2a7c0997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b123102ae52ff0948dc79fb9c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Aug 11 10:04:55 2009 +0200 winemenubuilder: Check for NULL allocation (Coverity). --- programs/winemenubuilder/winemenubuilder.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 15ce483..ba6fa64 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -724,6 +724,7 @@ static char* heap_printf(const char *format, ...) HeapFree(GetProcessHeap(), 0, buffer); } va_end(args); + if (!buffer) return NULL; ret = HeapReAlloc(GetProcessHeap(), 0, buffer, strlen(buffer) + 1 ); if (!ret) ret = buffer; return ret;

1 0

Henri Verbeet : wined3d: Make the "temporary" shader_reg_maps member a bitmap.
by Alexandre Julliard Aug. 11, 2009

Aug. 11, 2009

Module: wine Branch: master Commit: 6fa9fa15dadcbf53fd0afa72c504a050d8ecd99a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa9fa15dadcbf53fd0afa72c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 11 09:42:16 2009 +0200 wined3d: Make the "temporary" shader_reg_maps member a bitmap. --- dlls/wined3d/arb_program_shader.c | 26 +++++++++++++------------- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 08ca52f..ed3ab72 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -659,9 +659,9 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s } } - for(i = 0; i < This->baseShader.limits.temporary; i++) { - if (reg_maps->temporary[i]) - shader_addline(buffer, "TEMP R%u;\n", i); + for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + { + if (map & 1) shader_addline(buffer, "TEMP R%u;\n", i); } for (i = 0; i < This->baseShader.limits.address; i++) { @@ -3215,21 +3215,21 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct BOOL dcl_tmp = args->super.srgb_correction, dcl_td = FALSE; BOOL want_nv_prog = FALSE; struct arb_pshader_private *shader_priv = This->backend_priv; + DWORD map; char srgbtmp[4][4]; unsigned int i, found = 0; - for(i = 0; i < This->baseShader.limits.temporary; i++) { - - /* Don't overwrite the color source */ - if(This->color0_mov && i == This->color0_reg) continue; - else if(reg_maps->shader_version.major < 2 && i == 0) continue; + for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + { + if (!(map & 1) + || (This->color0_mov && i == This->color0_reg) + || (reg_maps->shader_version.major < 2 && i == 0)) + continue; - if(reg_maps->temporary[i]) { - sprintf(srgbtmp[found], "R%u", i); - found++; - if(found == 4) break; - } + sprintf(srgbtmp[found], "R%u", i); + ++found; + if (found == 4) break; } switch(found) { diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1669c7c..12c5fba 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -262,7 +262,7 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh break; case WINED3DSPR_TEMP: - reg_maps->temporary[reg->idx] = 1; + reg_maps->temporary |= 1 << reg->idx; break; case WINED3DSPR_INPUT: diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3fd92fd..33b723a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1038,9 +1038,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } /* Declare temporary variables */ - for(i = 0; i < This->baseShader.limits.temporary; i++) { - if (reg_maps->temporary[i]) - shader_addline(buffer, "vec4 R%u;\n", i); + for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + { + if (map & 1) shader_addline(buffer, "vec4 R%u;\n", i); } /* Declare attributes */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f95adcb..ca79262 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -629,7 +629,7 @@ typedef struct shader_reg_maps { struct wined3d_shader_version shader_version; BYTE texcoord; /* MAX_REG_TEXCRD, 8 */ - char temporary[MAX_REG_TEMP]; /* pixel, vertex */ + DWORD temporary; /* MAX_REG_TEMP, 32 */ char address[MAX_REG_ADDR]; /* vertex */ char labels[MAX_LABELS]; /* pixel, vertex */ DWORD *constf; /* pixel, vertex */

1 0

Henri Verbeet : wined3d: Make the "texcoord" shader_reg_maps member a bitmap.
by Alexandre Julliard Aug. 11, 2009

Aug. 11, 2009

Module: wine Branch: master Commit: 50853e295bb4e14f6e206162f9279c37ad1909e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50853e295bb4e14f6e206162f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 11 09:42:15 2009 +0200 wined3d: Make the "texcoord" shader_reg_maps member a bitmap. --- dlls/wined3d/arb_program_shader.c | 12 +++++++----- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/glsl_shader.c | 15 ++++++--------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 991fe69..08ca52f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -615,6 +615,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s char pshader = shader_is_pshader_version(reg_maps->shader_version.type); unsigned max_constantsF; const local_constant *lconst; + DWORD map; /* In pixel shaders, all private constants are program local, we don't need anything * from program.env. Thus we can advertise the full set of constants in pixel shaders. @@ -668,10 +669,11 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s shader_addline(buffer, "ADDRESS A%d;\n", i); } - if(pshader && reg_maps->shader_version.major == 1 && reg_maps->shader_version.minor <= 3) { - for(i = 0; i < This->baseShader.limits.texcoord; i++) { - if (reg_maps->texcoord[i] && pshader) - shader_addline(buffer,"TEMP T%u;\n", i); + if (pshader && reg_maps->shader_version.major == 1 && reg_maps->shader_version.minor <= 3) + { + for (i = 0, map = reg_maps->texcoord; map; map >>= 1, ++i) + { + if (map & 1) shader_addline(buffer, "TEMP T%u;\n", i); } } @@ -3923,7 +3925,7 @@ static void find_clip_texcoord(IWineD3DPixelShaderImpl *ps) { for(i = GL_LIMITS(texture_stages); i > 0; i--) { - if(!ps->baseShader.reg_maps.texcoord[i - 1]) + if (!(ps->baseShader.reg_maps.texcoord & (1 << (i - 1)))) { shader_priv->clipplane_emulation = i; return; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ec05dd9..1669c7c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -257,7 +257,7 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh switch (reg->type) { case WINED3DSPR_TEXTURE: /* WINED3DSPR_ADDR */ - if (shader_type == WINED3D_SHADER_TYPE_PIXEL) reg_maps->texcoord[reg->idx] = 1; + if (shader_type == WINED3D_SHADER_TYPE_PIXEL) reg_maps->texcoord |= 1 << reg->idx; else reg_maps->address[reg->idx] = 1; break; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0737c35..3fd92fd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -814,6 +814,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i, extra_constants_needed = 0; const local_constant *lconst; + DWORD map; /* There are some minor differences between pixel and vertex shaders */ char pshader = shader_is_pshader_version(reg_maps->shader_version.type); @@ -1009,9 +1010,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } /* Declare texture coordinate temporaries and initialize them */ - for (i = 0; i < This->baseShader.limits.texcoord; i++) { - if (reg_maps->texcoord[i]) - shader_addline(buffer, "vec4 T%u = gl_TexCoord[%u];\n", i, i); + for (i = 0, map = reg_maps->texcoord; map; map >>= 1, ++i) + { + if (map & 1) shader_addline(buffer, "vec4 T%u = gl_TexCoord[%u];\n", i, i); } /* Declare input register varyings. Only pixel shader, vertex shaders have that declared in the @@ -1045,13 +1046,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont /* Declare attributes */ if (reg_maps->shader_version.type == WINED3D_SHADER_TYPE_VERTEX) { - WORD map = reg_maps->input_registers; - - for (i = 0; map; map >>= 1, ++i) + for (i = 0, map = reg_maps->input_registers; map; map >>= 1, ++i) { - if (!(map & 1)) continue; - - shader_addline(buffer, "attribute vec4 attrib%i;\n", i); + if (map & 1) shader_addline(buffer, "attribute vec4 attrib%i;\n", i); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b67086..f95adcb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -628,7 +628,7 @@ struct wined3d_shader_version typedef struct shader_reg_maps { struct wined3d_shader_version shader_version; - char texcoord[MAX_REG_TEXCRD]; /* pixel < 3.0 */ + BYTE texcoord; /* MAX_REG_TEXCRD, 8 */ char temporary[MAX_REG_TEMP]; /* pixel, vertex */ char address[MAX_REG_ADDR]; /* vertex */ char labels[MAX_LABELS]; /* pixel, vertex */

1 0

Henri Verbeet : wined3d: Fix the type of the shader_reg_maps bitfields.
by Alexandre Julliard Aug. 11, 2009

Aug. 11, 2009

Module: wine Branch: master Commit: a282380f08883a282f45af0eba6c1811248b8f32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a282380f08883a282f45af0eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 11 09:42:14 2009 +0200 wined3d: Fix the type of the shader_reg_maps bitfields. --- dlls/wined3d/wined3d_private.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f5b898b..8b67086 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -644,19 +644,19 @@ typedef struct shader_reg_maps WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - unsigned usesnrm : 1; - unsigned vpos : 1; - unsigned usesdsx : 1; - unsigned usesdsy : 1; - unsigned usestexldd : 1; - unsigned usesmova : 1; - unsigned usesfacing : 1; - unsigned usesrelconstF : 1; - unsigned fog : 1; - unsigned usestexldl : 1; - unsigned usesifc : 1; - unsigned usescall : 1; - unsigned padding : 4; + WORD usesnrm : 1; + WORD vpos : 1; + WORD usesdsx : 1; + WORD usesdsy : 1; + WORD usestexldd : 1; + WORD usesmova : 1; + WORD usesfacing : 1; + WORD usesrelconstF : 1; + WORD fog : 1; + WORD usestexldl : 1; + WORD usesifc : 1; + WORD usescall : 1; + WORD padding : 4; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth;

1 0

Henri Verbeet : wined3d: Correctly check for luminance bumpmap parameters in shader_generate_glsl_declarations ().
by Alexandre Julliard Aug. 11, 2009

Aug. 11, 2009

Module: wine Branch: master Commit: b2ace3b1ab3109a3cd9f390b5af1baa7ff81b920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ace3b1ab3109a3cd9f390b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 11 09:42:13 2009 +0200 wined3d: Correctly check for luminance bumpmap parameters in shader_generate_glsl_declarations(). --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 706b065..0737c35 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -905,7 +905,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "uniform mat2 bumpenvmat%d;\n", i); - if(reg_maps->luminanceparams) { + if (reg_maps->luminanceparams[i]) + { shader_addline(buffer, "uniform float luminancescale%d;\n", i); shader_addline(buffer, "uniform float luminanceoffset%d;\n", i); extra_constants_needed++;

1 0

Henri Verbeet : wined3d: Handle GetData() on event queries that aren' t started yet.
by Alexandre Julliard Aug. 11, 2009

Aug. 11, 2009

Module: wine Branch: master Commit: 76fdf2c1a5909d11a351796a8a5819cfbf90e7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fdf2c1a5909d11a351796a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 11 09:42:12 2009 +0200 wined3d: Handle GetData() on event queries that aren't started yet. This fixes a regression introduced by fb77678e9f1bc5e1baa20f241d2fc00a718496e3. --- dlls/wined3d/query.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 6627b09..2a2c1b1 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -347,6 +347,14 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void if (!pData || !dwSize) return S_OK; + if (!query->context) + { + ERR("Query not started, returning TRUE.\n"); + *data = TRUE; + + return S_OK; + } + if (query->context->tid != GetCurrentThreadId()) { /* See comment in IWineD3DQuery::Issue, event query codeblock */

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Aug. 11, 2009

Aug. 11, 2009

Module: wine Branch: master Commit: e74efb54872180b23f090f1e1fa78e45fd9cb455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e74efb54872180b23f090f1e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 11 09:03:12 2009 +0200 Assorted spelling fixes. --- dlls/urlmon/sec_mgr.c | 2 +- dlls/urlmon/tests/sec_mgr.c | 2 +- dlls/user32/tests/menu.c | 2 +- dlls/winealsa.drv/dsoutput.c | 2 +- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index d54b2bf..9d0e799 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -689,7 +689,7 @@ static LPDWORD build_zonemap_from_reg(void) WCHAR name[32]; HKEY hkey; LPDWORD data = NULL; - DWORD allocated = 6; /* space for the zonecount and Zone "0" upto Zone "4" */ + DWORD allocated = 6; /* space for the zonecount and Zone "0" up to Zone "4" */ DWORD used = 0; DWORD res; DWORD len; diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index c7774ec..e607259 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -496,7 +496,7 @@ static void test_GetZoneAttributes(void) if (FAILED(hr)) return; - /* native urlmon has Zone "0" upto Zone "4" since IE4 */ + /* native urlmon has Zone "0" up to Zone "4" since IE4 */ for (i = 0; i < 5; i++) { memset(buffer, -1, sizeof(buffer)); hr = IInternetZoneManager_GetZoneAttributes(zonemgr, i, pZA); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 7ffe29a..a388103 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3023,7 +3023,7 @@ static void test_menu_maxdepth(void) hmenus[i] = CreatePopupMenu(); if( !hmenus[i]) break; } - ok( i == NR_MENUS, "could not create more then %d menu's\n", i); + ok( i == NR_MENUS, "could not create more than %d menu's\n", i); for( i = 1; i < NR_MENUS; i++) { ret = AppendMenuA( hmenus[i], MF_POPUP, (UINT_PTR)hmenus[i-1],"test"); if( !ret) break; diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 9c6d7fd..6d0df21 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -400,7 +400,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, ret = snd_pcm_writei(This->pcm, pvAudio1, writelen); if (ret == -EPIPE) { - WARN("Underrun occured\n"); + WARN("Underrun occurred\n"); snd_pcm_prepare(This->pcm); ret = snd_pcm_writei(This->pcm, pvAudio1, writelen); snd_pcm_start(This->pcm); diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c7eeb8f..991fe69 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1245,8 +1245,8 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if (flags & TEX_DERIV) { - if(flags & TEX_PROJ) FIXME("Projected texture sampling with custom derivates\n"); - if(flags & TEX_BIAS) FIXME("Biased texture sampling with custom derivates\n"); + if(flags & TEX_PROJ) FIXME("Projected texture sampling with custom derivatives\n"); + if(flags & TEX_BIAS) FIXME("Biased texture sampling with custom derivatives\n"); shader_addline(buffer, "TXD%s %s, %s, %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, dsx, dsy,sampler_idx, tex_type); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0f5871e..706b065 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -973,7 +973,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont /* Declare uniforms for NP2 texcoord fixup: * This is NOT done inside the loop that declares the texture samplers since the NP2 fixup code * is currently only used for the GeforceFX series and when forcing the ARB_npot extension off. - * Modern cards just skip the code anyway, so put it inside a seperate loop. */ + * Modern cards just skip the code anyway, so put it inside a separate loop. */ if (pshader && ps_args->np2_fixup) { struct ps_np2fixup_info* const fixup = ctx_priv->cur_np2fixup_info;

1 0

Francois Gouget : setupapi: Remove a space before an ellipsis.
by Alexandre Julliard Aug. 11, 2009

Aug. 11, 2009

Module: wine Branch: master Commit: b4aede60b014ef27c448e3e63cf92e78b867386a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4aede60b014ef27c448e3e63… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 11 09:02:38 2009 +0200 setupapi: Remove a space before an ellipsis. --- dlls/setupapi/No.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/No.rc b/dlls/setupapi/No.rc index bbb9556..afe945d 100644 --- a/dlls/setupapi/No.rc +++ b/dlls/setupapi/No.rc @@ -56,5 +56,5 @@ BEGIN CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Bla ...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Bla...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

Francois Gouget : taskmgr: Remove spaces before '\n'.
by Alexandre Julliard Aug. 11, 2009

Aug. 11, 2009

Module: wine Branch: master Commit: 17242310221a00755987c8dc2cb10187d8350aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17242310221a00755987c8dc2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 11 09:02:25 2009 +0200 taskmgr: Remove spaces before '\n'. --- programs/taskmgr/Ru.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/Ru.rc b/programs/taskmgr/Ru.rc index a905872..fd42d6d 100644 --- a/programs/taskmgr/Ru.rc +++ b/programs/taskmgr/Ru.rc @@ -542,9 +542,9 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_WARNING_TITLE "Предупреждение диспетчера задач" - IDS_PRIORITY_CHANGE_MESSAGE "ВНИМАНИЕ! Изменение класса приоритета этого \n\процесса может привести к нежелательным результатам, \n\в том числе к нестабильной работе системы. Вы \n\действительно хотите изменить класс приоритета?" + IDS_PRIORITY_CHANGE_MESSAGE "ВНИМАНИЕ! Изменение класса приоритета этого\n\процесса может привести к нежелательным результатам,\n\в том числе к нестабильной работе системы. Вы\n\действительно хотите изменить класс приоритета?" IDS_PRIORITY_UNABLE2CHANGE "Невозможно сменить приоритет." - IDS_TERMINATE_MESSAGE "ВНИМАНИЕ! Завершение процесса может \nпривести к нежелательным результатам, в том числе \nк потере данных или к нестабильной работе системы. \nВы действительно хотите завершить процесс?" + IDS_TERMINATE_MESSAGE "ВНИМАНИЕ! Завершение процесса может\nпривести к нежелательным результатам, в том числе\nк потере данных или к нестабильной работе системы.\nВы действительно хотите завершить процесс?" IDS_TERMINATE_UNABLE2TERMINATE "Невозможно завершить процесс" IDS_DEBUG_MESSAGE "ВНИМАНИЕ! Отладка этого процесса может привести к потере данных.\nВы действительно хотите использовать отладчик?" IDS_AFFINITY_ERROR_MESSAGE "Процессу должен соответствовать хотя бы один ЦП."

1 0