June 2009 - Wine-commits - list.winehq.org

Matej Spindler : regedit: Update Slovenian translation.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 8d9c0ec231efddb38c04bb996ef3ae1d2da173b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9c0ec231efddb38c04bb996… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Jun 25 19:42:40 2009 +0200 regedit: Update Slovenian translation. --- programs/regedit/Si.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Si.rc b/programs/regedit/Si.rc index 9c6cf32..ce04db1 100644 --- a/programs/regedit/Si.rc +++ b/programs/regedit/Si.rc @@ -283,6 +283,7 @@ BEGIN ID_EDIT_COPYKEYNAME "Kopira ime izbranega ključa na odložišče" ID_EDIT_FIND "Poišče znakovni niz v ključu, vrednosti ali vsebini vrednosti" ID_EDIT_FINDNEXT "Poišče naslednjo ponovitev iskanega besedila" + ID_EDIT_EXPORT "Izvozi izbrano vejo registra v tekstovno datoteko" END STRINGTABLE DISCARDABLE

1 0

Matej Spindler : shell32: Update Slovenian translation.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 47aed6dcec56eb83709a437291ad1be21d9016ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=47aed6dcec56eb83709a43729… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Jun 25 20:55:38 2009 +0200 shell32: Update Slovenian translation. --- dlls/shell32/shell32_Si.rc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Si.rc b/dlls/shell32/shell32_Si.rc index 24db7ee..24c36c3 100644 --- a/dlls/shell32/shell32_Si.rc +++ b/dlls/shell32/shell32_Si.rc @@ -280,9 +280,11 @@ STRINGTABLE IDS_NEWFOLDER "Nova mapa" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Wine Nadzorna Plošča" + IDS_CPANEL_NAME "Ime" + IDS_CPANEL_DESCRIPTION "Opis" + + IDS_SHLEXEC_NOASSOC "Noben Okenski program ni nastavljen, da bi odpiral ta tip datotek." } STRINGTABLE

1 0

Tobias Jakobi : wined3d: Enable constant packing for NP2 texcoord fixup.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: ef7f769be6dbc4655f6363cd7ed3670f8b1dfc01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef7f769be6dbc4655f6363cd7… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jun 17 23:26:38 2009 +0200 wined3d: Enable constant packing for NP2 texcoord fixup. Previously every texture that was flagged for NP2 fixup used a vec2 uniform in the shader to store texture dimensions. Turns out that the GLSL compilers just maps vec2 to vec4, so essentially wasting 2 floats. The new code only uses vec4 uniforms but packs dimensions info of 2 textures into a single uniform. --- dlls/wined3d/glsl_shader.c | 104 ++++++++++++++++++++++++++++--------------- 1 files changed, 68 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bd5724a..2fc8586 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -103,7 +103,7 @@ struct glsl_shader_prog_link { GLint vuniformI_locations[MAX_CONST_I]; GLint puniformI_locations[MAX_CONST_I]; GLint posFixup_location; - GLint np2Fixup_location[MAX_FRAGMENT_SAMPLERS]; + GLint np2Fixup_location; GLint bumpenvmat_location[MAX_TEXTURES]; GLint luminancescale_location[MAX_TEXTURES]; GLint luminanceoffset_location[MAX_TEXTURES]; @@ -572,24 +572,31 @@ static void shader_glsl_load_np2fixup_constants( return; } - if (prog->ps_args.np2_fixup) { - UINT i; - UINT fixup = prog->ps_args.np2_fixup; + if (prog->ps_args.np2_fixup && -1 != prog->np2Fixup_location) { const WineD3D_GL_Info* gl_info = &deviceImpl->adapter->gl_info; const IWineD3DStateBlockImpl* stateBlock = (const IWineD3DStateBlockImpl*) deviceImpl->stateBlock; + UINT i; + UINT fixup = prog->ps_args.np2_fixup; + GLfloat np2fixup_constants[4 * MAX_FRAGMENT_SAMPLERS]; for (i = 0; fixup; fixup >>= 1, ++i) { - if (-1 != prog->np2Fixup_location[i]) { - const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i]; - if (!tex) { - FIXME("Nonexistent texture is flagged for NP2 texcoord fixup\n"); - continue; - } else { - const float tex_dim[2] = {tex->baseTexture.pow2Matrix[0], tex->baseTexture.pow2Matrix[5]}; - GL_EXTCALL(glUniform2fvARB(prog->np2Fixup_location[i], 1, tex_dim)); - } + const unsigned char idx = prog->np2Fixup_info->idx[i]; + const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i]; + GLfloat* tex_dim = &np2fixup_constants[(idx >> 1) * 4]; + + if (!tex) { + FIXME("Nonexistent texture is flagged for NP2 texcoord fixup\n"); + continue; + } + + if (idx % 2) { + tex_dim[2] = tex->baseTexture.pow2Matrix[0]; tex_dim[3] = tex->baseTexture.pow2Matrix[5]; + } else { + tex_dim[0] = tex->baseTexture.pow2Matrix[0]; tex_dim[1] = tex->baseTexture.pow2Matrix[5]; } } + + GL_EXTCALL(glUniform4fvARB(prog->np2Fixup_location, prog->np2Fixup_info->num_consts, np2fixup_constants)); } } @@ -776,10 +783,11 @@ static int vec4_varyings(DWORD shader_major, const WineD3D_GL_Info *gl_info) /** Generate the variable & register declarations for the GLSL output target */ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const shader_reg_maps *reg_maps, SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, - const struct ps_compile_args *ps_args) + struct shader_glsl_ctx_priv *ctx_priv) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; + const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args; unsigned int i, extra_constants_needed = 0; const local_constant *lconst; @@ -922,15 +930,6 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s } else { shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i); } - - if (pshader && ps_args->np2_fixup & (1 << i)) - { - /* NP2/RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] - * while D3D has them in the (normalized) [0,1]x[0,1] range. - * samplerNP2Fixup stores texture dimensions and is updated through - * shader_glsl_load_np2fixup_constants when the sampler changes. */ - shader_addline(buffer, "uniform vec2 %csamplerNP2Fixup%u;\n", prefix, i); - } break; case WINED3DSTT_CUBE: shader_addline(buffer, "uniform samplerCube %csampler%u;\n", prefix, i); @@ -945,7 +944,38 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s } } } - + + /* 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. */ + if (pshader && ps_args->np2_fixup) { + + struct ps_np2fixup_info* const fixup = ctx_priv->cur_np2fixup_info; + UINT cur = 0; + + /* NP2/RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] + * while D3D has them in the (normalized) [0,1]x[0,1] range. + * samplerNP2Fixup stores texture dimensions and is updated through + * shader_glsl_load_np2fixup_constants when the sampler changes. */ + + for (i = 0; i < This->baseShader.limits.sampler; ++i) { + if (reg_maps->sampler_type[i]) { + if (!(ps_args->np2_fixup & (1 << i))) continue; + + if (WINED3DSTT_2D != reg_maps->sampler_type[i]) { + FIXME("Non-2D texture is flagged for NP2 texcoord fixup.\n"); + continue; + } + + fixup->idx[i] = cur++; + } + } + + fixup->num_consts = (cur + 1) >> 1; + shader_addline(buffer, "uniform vec4 %csamplerNP2Fixup[%u];\n", prefix, fixup->num_consts); + } + /* Declare address variables */ for (i = 0; i < This->baseShader.limits.address; i++) { if (reg_maps->address[i]) @@ -1679,7 +1709,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; fixup = priv->cur_ps_args->color_fixup[sampler]; sampler_base = "Psampler"; @@ -1707,7 +1737,11 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s shader_addline(ins->ctx->buffer, ", %s)%s);\n", bias, dst_swizzle); } else { if (np2_fixup) { - shader_addline(ins->ctx->buffer, " * PsamplerNP2Fixup%u)%s);\n", sampler, dst_swizzle); + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const unsigned char idx = priv->cur_np2fixup_info->idx[sampler]; + + shader_addline(ins->ctx->buffer, " * PsamplerNP2Fixup[%u].%s)%s);\n", idx >> 1, + (idx % 2) ? "zw" : "xy", dst_swizzle); } else if(dx && dy) { shader_addline(ins->ctx->buffer, ", %s, %s)%s);\n", dx, dy, dst_swizzle); } else { @@ -3658,7 +3692,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, } /* Base Declarations */ - shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, args); + shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, &priv_ctx); /* Pack 3.0 inputs */ if (reg_maps->shader_version.major >= 3 && args->vp_mode != vertexshader) @@ -3747,7 +3781,7 @@ static GLuint shader_glsl_generate_vshader(IWineD3DVertexShaderImpl *This, priv_ctx.cur_vs_args = args; /* Base Declarations */ - shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, NULL); + shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, &priv_ctx); /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, &priv_ctx); @@ -4053,7 +4087,6 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use if(pshader) { char name[32]; - WORD map; for(i = 0; i < MAX_TEXTURES; i++) { sprintf(name, "bumpenvmat%u", i); @@ -4064,13 +4097,12 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use entry->luminanceoffset_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); } - map = ps_compile_args.np2_fixup; - for (i = 0; map; map >>= 1, ++i) - { - if (!(map & 1)) continue; - - sprintf(name, "PsamplerNP2Fixup%u", i); - entry->np2Fixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + if (ps_compile_args.np2_fixup) { + if (entry->np2Fixup_info) { + entry->np2Fixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "PsamplerNP2Fixup")); + } else { + FIXME("NP2 texcoord fixup needed for this pixelshader, but no fixup uniform found."); + } } }

1 0

Tobias Jakobi : wined3d: Force NP2 fixup constant reloading in shader_glsl_select.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: a9f912466b94a93b84a0b30d374b7448faff4b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f912466b94a93b84a0b30d3… Author: Tobias Jakobi <tjakobi(a)xdf79.math.uni-bielefeld.de> Date: Fri May 29 15:01:44 2009 +0200 wined3d: Force NP2 fixup constant reloading in shader_glsl_select. --- dlls/wined3d/glsl_shader.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2fc8586..e797889 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4250,6 +4250,13 @@ static void shader_glsl_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { if (program_id) TRACE("Using GLSL program %u\n", program_id); GL_EXTCALL(glUseProgramObjectARB(program_id)); checkGLcall("glUseProgramObjectARB"); + + /* In case that NP2 texcoord fixup data is found for the selected program, trigger a reload of the + * constants. This has to be done because it can't be guaranteed that sampler() (from state.c) is + * called between selecting the shader and using it, which results in wrong fixup for some frames. */ + if (priv->glsl_program && priv->glsl_program->np2Fixup_info) { + This->shader_backend->shader_load_np2fixup_constants(iface, usePS, useVS); + } } /* GL locking is done by the caller */

1 0

Paul Vriens : comctl32/tests: Fix test failures on comctl32 < 5.80.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 7665699411a0a3b1cd7444d9d6e2035f1d007b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7665699411a0a3b1cd7444d9d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 25 11:49:14 2009 +0200 comctl32/tests: Fix test failures on comctl32 < 5.80. --- dlls/comctl32/tests/updown.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 433c190..f2b3cc2 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -426,8 +426,14 @@ static void test_updown_pos32(void) expect(0,low); expect(1000,high); - /* Set position to 500, don't check return since it is unset*/ - SendMessage(updown, UDM_SETPOS32, 0 , 500 ); + /* Set position to 500 */ + r = SendMessage(updown, UDM_SETPOS32, 0 , 500 ); + if (!r) + { + win_skip("UDM_SETPOS32 and UDM_GETPOS32 need 5.80\n"); + return; + } + expect(100,r); /* As set by test_updown_pos() */ /* Since UDM_SETBUDDYINT was not set at creation bRet will always be true as a return from UDM_GETPOS32 */

1 0

Hans Leidekker : wininet: Improve the PrivacyGet/SetZonePreferenceW stubs.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: deeb3a9fcb3a05908063ada858071c7a99779f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=deeb3a9fcb3a05908063ada85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 25 11:52:14 2009 +0200 wininet: Improve the PrivacyGet/SetZonePreferenceW stubs. --- dlls/wininet/internet.c | 8 +++++++- dlls/wininet/tests/internet.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4bb25e7..7fc3d4b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3815,12 +3815,16 @@ DWORD WINAPI InternetConfirmZoneCrossingW( HWND hWnd, LPWSTR szUrlPrev, LPWSTR s return ERROR_SUCCESS; } +static DWORD zone_preference = 3; + /*********************************************************************** * PrivacySetZonePreferenceW (WININET.@) */ DWORD WINAPI PrivacySetZonePreferenceW( DWORD zone, DWORD type, DWORD template, LPCWSTR preference ) { FIXME( "%x %x %x %s: stub\n", zone, type, template, debugstr_w(preference) ); + + zone_preference = template; return 0; } @@ -3830,7 +3834,9 @@ DWORD WINAPI PrivacySetZonePreferenceW( DWORD zone, DWORD type, DWORD template, DWORD WINAPI PrivacyGetZonePreferenceW( DWORD zone, DWORD type, LPDWORD template, LPWSTR preference, LPDWORD length ) { - FIXME( "%x %x: stub\n", zone, type ); + FIXME( "%x %x %p %p %p: stub\n", zone, type, template, preference, length ); + + if (template) *template = zone_preference; return 0; } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5f36c3d..728c8dc 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -795,6 +795,33 @@ static void test_IsDomainLegalCookieDomainW(void) ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); } +static void test_PrivacyGetSetZonePreferenceW(void) +{ + DWORD ret, zone, type, template, old_template; + + zone = 3; + type = 0; + ret = PrivacyGetZonePreferenceW(zone, type, NULL, NULL, NULL); + ok(ret == 0, "expected ret == 0, got %u\n", ret); + + old_template = 0; + ret = PrivacyGetZonePreferenceW(zone, type, &old_template, NULL, NULL); + ok(ret == 0, "expected ret == 0, got %u\n", ret); + + template = 5; + ret = PrivacySetZonePreferenceW(zone, type, template, NULL); + ok(ret == 0, "expected ret == 0, got %u\n", ret); + + template = 0; + ret = PrivacyGetZonePreferenceW(zone, type, &template, NULL, NULL); + ok(ret == 0, "expected ret == 0, got %u\n", ret); + ok(template == 5, "expected template == 5, got %u\n", template); + + template = 5; + ret = PrivacySetZonePreferenceW(zone, type, old_template, NULL); + ok(ret == 0, "expected ret == 0, got %u\n", ret); +} + /* ############################### */ START_TEST(internet) @@ -833,4 +860,6 @@ START_TEST(internet) win_skip("IsDomainLegalCookieDomainW (or ordinal 117) is not available\n"); else test_IsDomainLegalCookieDomainW(); + + test_PrivacyGetSetZonePreferenceW(); }

1 0

Dmitry Timoshkov : mlang: Make it possible to build the mlang test with PSDK.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 3bd36c841918e2060028976fced09dfd0c1cf2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd36c841918e2060028976fc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jun 25 19:28:40 2009 +0900 mlang: Make it possible to build the mlang test with PSDK. --- dlls/mlang/tests/mlang.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 54ab987..4530a09 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -50,6 +50,9 @@ static HRESULT (WINAPI *pConvertINetMultiByteToUnicode)(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT); static HRESULT (WINAPI *pConvertINetUnicodeToMultiByte)(LPDWORD, DWORD, LPCWSTR, LPINT, LPSTR, LPINT); +static HRESULT (WINAPI *pRfc1766ToLcidA)(LCID *, LPCSTR); +static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); + typedef struct lcid_tag_table { LPCSTR rfc1766; LCID lcid; @@ -239,6 +242,8 @@ static BOOL init_function_ptrs(void) pConvertINetMultiByteToUnicode = (void *)GetProcAddress(hMlang, "ConvertINetMultiByteToUnicode"); pConvertINetUnicodeToMultiByte = (void *)GetProcAddress(hMlang, "ConvertINetUnicodeToMultiByte"); + pRfc1766ToLcidA = (void *)GetProcAddress(hMlang, "Rfc1766ToLcidA"); + pLcidToRfc1766A = (void *)GetProcAddress(hMlang, "LcidToRfc1766A"); pGetCPInfoExA = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetCPInfoExA"); @@ -1137,7 +1142,7 @@ static void test_Rfc1766ToLcid(void) for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { lcid = -1; - ret = Rfc1766ToLcidA(&lcid, lcid_table[i].rfc1766); + ret = pRfc1766ToLcidA(&lcid, lcid_table[i].rfc1766); /* IE <6.0 guess 0x412 (ko) from "kok" */ ok( (ret == lcid_table[i].hr) || @@ -1147,15 +1152,13 @@ static void test_Rfc1766ToLcid(void) ok( (lcid == lcid_table[i].lcid) || broken(lcid == lcid_table[i].broken_lcid), /* IE <6.0 */ "#%02d: got LCID 0x%x (expected 0x%x)\n", i, lcid, lcid_table[i].lcid); - } - ret = Rfc1766ToLcidA(&lcid, NULL); + ret = pRfc1766ToLcidA(&lcid, NULL); ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret); - ret = Rfc1766ToLcidA(NULL, "en"); + ret = pRfc1766ToLcidA(NULL, "en"); ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret); - } static void test_GetNumberOfCodePageInfo(IMultiLanguage2 *iML2) @@ -1220,7 +1223,7 @@ static void test_LcidToRfc1766(void) memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; - hr = LcidToRfc1766A(lcid_table[i].lcid, buffer, MAX_RFC1766_NAME); + hr = pLcidToRfc1766A(lcid_table[i].lcid, buffer, MAX_RFC1766_NAME); /* IE <5.0 does not recognize 0x180c (fr-mc) and 0x457 (kok) */ ok( (hr == lcid_table[i].hr) || @@ -1243,22 +1246,21 @@ static void test_LcidToRfc1766(void) memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; - hr = LcidToRfc1766A(-1, buffer, MAX_RFC1766_NAME); + hr = pLcidToRfc1766A(-1, buffer, MAX_RFC1766_NAME); ok(hr == E_FAIL, "got 0x%08x and '%s' (expected E_FAIL)\n", hr, buffer); - hr = LcidToRfc1766A(LANG_ENGLISH, NULL, MAX_RFC1766_NAME); + hr = pLcidToRfc1766A(LANG_ENGLISH, NULL, MAX_RFC1766_NAME); ok(hr == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", hr); memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; - hr = LcidToRfc1766A(LANG_ENGLISH, buffer, -1); + hr = pLcidToRfc1766A(LANG_ENGLISH, buffer, -1); ok(hr == E_INVALIDARG, "got 0x%08x and '%s' (expected E_INVALIDARG)\n", hr, buffer); memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; - hr = LcidToRfc1766A(LANG_ENGLISH, buffer, 0); + hr = pLcidToRfc1766A(LANG_ENGLISH, buffer, 0); ok(hr == E_INVALIDARG, "got 0x%08x and '%s' (expected E_INVALIDARG)\n", hr, buffer); - } static void test_GetRfc1766Info(IMultiLanguage2 *iML2)

1 0

Rein Klazes : gdi32/tests: Show that there is an upper limit to the width of a font that can be specified .
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 08ca2fa6a9576c7b202915b4e111db3dcd2aaf67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08ca2fa6a9576c7b202915b4e… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jun 25 09:40:46 2009 +0200 gdi32/tests: Show that there is an upper limit to the width of a font that can be specified. --- dlls/gdi32/tests/font.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 88e1797..b8b5084 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2911,10 +2911,82 @@ static void test_GetGlyphOutline(void) DeleteDC(hdc); } +/* bug #9995: there is a limit to the character width that can be specified */ +void test_GetTextMetrics2( const char *fontname) +{ + HFONT of, hf; + HDC hdc; + TEXTMETRICA tm; + LOGFONTA lf; + BOOL ret; + int avecharw[3], maxcharw[3]; + + if (!is_truetype_font_installed( fontname)) { + skip("%s is not installed\n", fontname); + return; + } + hdc = CreateCompatibleDC(0); + ok( hdc != NULL, "CreateCompatibleDC failed\n"); + /* select width = 0 */ + hf = CreateFontA( -11, 0, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, + DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, + DEFAULT_QUALITY, VARIABLE_PITCH, + fontname); + ok( hf != NULL, "CreateFontA failed\n"); + of = SelectObject( hdc, hf); + ret = GetObjectA( hf, sizeof( lf), &lf); + ret = GetTextMetricsA( hdc, &tm); + ok(ret, "GetTextMetricsA error %u, ", GetLastError()); + avecharw[0] =tm.tmAveCharWidth; + maxcharw[0] =tm.tmMaxCharWidth; + SelectObject( hdc, of); + DeleteObject( hf); + /* select LARGE width = 1023 */ + hf = CreateFontA( -11, 1023, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, + DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, + DEFAULT_QUALITY, VARIABLE_PITCH, + fontname); + ok( hf != NULL, "CreateFontA failed\n"); + of = SelectObject( hdc, hf); + ret = GetObjectA( hf, sizeof( lf), &lf); + ret = GetTextMetricsA( hdc, &tm); + ok(ret, "GetTextMetricsA error %u, ", GetLastError()); + avecharw[1] =tm.tmAveCharWidth; + maxcharw[1] =tm.tmMaxCharWidth; + SelectObject( hdc, of); + DeleteObject( hf); + /* select TOOLARGE width = 1536 */ + hf = CreateFontA( -11, 1536, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, + DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, + DEFAULT_QUALITY, VARIABLE_PITCH, + fontname); + ok( hf != NULL, "CreateFontA failed\n"); + of = SelectObject( hdc, hf); + ret = GetObjectA( hf, sizeof( lf), &lf); + ret = GetTextMetricsA( hdc, &tm); + ok(ret, "GetTextMetricsA error %u, ", GetLastError()); + avecharw[2] =tm.tmAveCharWidth; + maxcharw[2] =tm.tmMaxCharWidth; + SelectObject( hdc, of); + DeleteObject( hf); + /* tests */ + ok( avecharw[1] > 10 * avecharw[0], "Av. charwidth not large ( %d cmp.to %d)\n", + avecharw[1], avecharw[0]); + ok( maxcharw[1] > 10 * maxcharw[0], "Max charwidth not large ( %d cmp.to %d)\n", + maxcharw[1], maxcharw[0]); +todo_wine { + ok( avecharw[2] == avecharw[0], "Unexpected Av. charwidth ( %d cmp.to %d)\n", + avecharw[2], avecharw[0]); + ok( maxcharw[2] == maxcharw[0], "Unexpected Max charwidth ( %d cmp.to %d)\n", + maxcharw[2], maxcharw[0]); +} + /* clean up */ + DeleteDC(hdc); +} + START_TEST(font) { init(); - test_logfont(); test_bitmap_font(); test_outline_font(); @@ -2949,4 +3021,6 @@ START_TEST(font) test_GdiRealizationInfo(); test_GetTextFace(); test_GetGlyphOutline(); + test_GetTextMetrics2( "Tahoma"); + test_GetTextMetrics2( "Arial"); }

1 0

Detlef Riekenberg : browseui: Add a stub for DllInstall.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 395e41103e9d9cb996e3567aedbb261ef380bb75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395e41103e9d9cb996e3567ae… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jun 25 00:26:32 2009 +0200 browseui: Add a stub for DllInstall. --- dlls/browseui/browseui.spec | 2 +- dlls/browseui/browseui_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/browseui.spec b/dlls/browseui/browseui.spec index 5d1d2d3..b7a2a7a 100644 --- a/dlls/browseui/browseui.spec +++ b/dlls/browseui/browseui.spec @@ -1,6 +1,6 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllGetVersion(ptr) -@ stub DllInstall +@ stdcall -private DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 54e9c52..f09d817 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -212,3 +212,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *ppvOut) FIXME("CLSID %s not supported\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; } + +/*********************************************************************** + * DllInstall (BROWSEUI.@) + */ +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%s, %s): stub\n", bInstall ? "TRUE" : "FALSE", debugstr_w(cmdline)); + return S_OK; +}

1 0

Alexandre Julliard : msi: The dialog units are based on a 12-point font size, despite the documentation.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 3271362a26072223f985ab3bf3e3d73dd99440dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3271362a26072223f985ab3bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 25 12:09:45 2009 +0200 msi: The dialog units are based on a 12-point font size, despite the documentation. --- dlls/msi/dialog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 495e033..025a227 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -171,7 +171,7 @@ static HWND hMsiHiddenWindow; static INT msi_dialog_scale_unit( msi_dialog *dialog, INT val ) { - return (dialog->scale * val + 5) / 10; + return MulDiv( val, dialog->scale, 12 ); } static msi_control *msi_dialog_find_control( msi_dialog *dialog, LPCWSTR name ) @@ -2911,7 +2911,7 @@ static INT msi_dialog_get_sans_serif_height( HWND hwnd ) if (hdc) { memset( &lf, 0, sizeof lf ); - lf.lfHeight = MulDiv(10, GetDeviceCaps(hdc, LOGPIXELSY), 72); + lf.lfHeight = MulDiv(12, GetDeviceCaps(hdc, LOGPIXELSY), 72); strcpyW( lf.lfFaceName, szSansSerif ); hFont = CreateFontIndirectW(&lf); if (hFont)

1 0