August 2008 - Wine-commits - list.winehq.org

Dmitry Timoshkov : mlang: Remove debugging stuff.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 59e2155432b0f7e3f7b4ca50d9faf2ccfd599a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e2155432b0f7e3f7b4ca50d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Aug 3 14:22:33 2008 +0900 mlang: Remove debugging stuff. --- dlls/mlang/tests/mlang.c | 31 ------------------------------- 1 files changed, 0 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59e2155432b0f7e3f7b4c…

1 0

Stefan Dösinger : wined3d: Initialize the texture op function properly.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 228f2cf3c22124958a0f049a4463718a96267a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=228f2cf3c22124958a0f049a4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 1 11:47:24 2008 -0500 wined3d: Initialize the texture op function properly. --- dlls/wined3d/utils.c | 3 +++ dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a9fc780..98f7eef 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1792,6 +1792,7 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting for(i = 0; i < GL_LIMITS(texture_stages); i++) { IWineD3DBaseTextureImpl *texture; + settings->op[i].padding = 0; if(stateblock->textureState[i][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) { settings->op[i].cop = WINED3DTOP_DISABLE; settings->op[i].aop = WINED3DTOP_DISABLE; @@ -1800,6 +1801,8 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting settings->op[i].aarg0 = settings->op[i].aarg1 = settings->op[i].aarg2 = 0x3F; settings->op[i].color_correction = WINED3DFMT_UNKNOWN; settings->op[i].dst = resultreg; + settings->op[i].tex_type = tex_1d; + settings->op[i].projected = proj_none; i++; break; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7ba6617..453c92a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -745,9 +745,10 @@ struct texture_stage_op unsigned cop : 5, aop : 5; unsigned carg1 : 6, carg2 : 6, carg0 : 6; unsigned tex_type : 3; - unsigned dst : 1; + unsigned dst : 1; /* Total of 32 bits */ unsigned aarg1 : 6, aarg2 : 6, aarg0 : 6; unsigned projected : 2; + unsigned padding : 12; /* Total of 64 bits */ WINED3DFORMAT color_correction; };

1 0

Stefan Dösinger : wined3d: Clamp results in the arbfp pipeline replacement.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 016efe7d94304321c4a5e7df98d0a4d8d1256dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=016efe7d94304321c4a5e7df9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Aug 2 13:48:05 2008 -0500 wined3d: Clamp results in the arbfp pipeline replacement. Fixed function processing can only deal with values between 0 and 1 generally. Clamp the results of instructions that could produce bigger or smaller values. --- dlls/wined3d/arb_program_shader.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0fdb76d..4e1fe09 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2462,16 +2462,16 @@ static void gen_ffp_instr(SHADER_BUFFER *buffer, unsigned int stage, BOOL color, shader_addline(buffer, "SUB arg2, %s, const.w;\n", arg2); arg2 = "arg2"; case WINED3DTOP_ADD: - shader_addline(buffer, "ADD %s%s, %s, %s;\n", dstreg, dstmask, arg1, arg2); + shader_addline(buffer, "ADD_SAT %s%s, %s, %s;\n", dstreg, dstmask, arg1, arg2); break; case WINED3DTOP_SUBTRACT: - shader_addline(buffer, "SUB %s%s, %s, %s;\n", dstreg, dstmask, arg1, arg2); + shader_addline(buffer, "SUB_SAT %s%s, %s, %s;\n", dstreg, dstmask, arg1, arg2); break; case WINED3DTOP_ADDSMOOTH: shader_addline(buffer, "SUB arg1, const.x, %s;\n", arg1); - shader_addline(buffer, "MAD %s%s, arg1, %s, %s;\n", dstreg, dstmask, arg2, arg1); + shader_addline(buffer, "MAD_SAT %s%s, arg1, %s, %s;\n", dstreg, dstmask, arg2, arg1); break; case WINED3DTOP_BLENDCURRENTALPHA: @@ -2493,24 +2493,24 @@ static void gen_ffp_instr(SHADER_BUFFER *buffer, unsigned int stage, BOOL color, case WINED3DTOP_BLENDTEXTUREALPHAPM: shader_addline(buffer, "SUB arg0.a, const.x, %s;\n", arg1); - shader_addline(buffer, "MAD %s%s, %s, arg0.a, %s;\n", dstreg, dstmask, arg2, arg1); + shader_addline(buffer, "MAD_SAT %s%s, %s, arg0.a, %s;\n", dstreg, dstmask, arg2, arg1); break; /* D3DTOP_PREMODULATE ???? */ case WINED3DTOP_MODULATEINVALPHA_ADDCOLOR: shader_addline(buffer, "SUB arg0.a, const.x, %s;\n", arg1); - shader_addline(buffer, "MAD %s%s, arg0.a, %s, %s;\n", dstreg, dstmask, arg2, arg1); + shader_addline(buffer, "MAD_SAT %s%s, arg0.a, %s, %s;\n", dstreg, dstmask, arg2, arg1); break; case WINED3DTOP_MODULATEALPHA_ADDCOLOR: - shader_addline(buffer, "MAD %s%s, %s.a, %s, %s;\n", dstreg, dstmask, arg1, arg2, arg1); + shader_addline(buffer, "MAD_SAT %s%s, %s.a, %s, %s;\n", dstreg, dstmask, arg1, arg2, arg1); break; case WINED3DTOP_MODULATEINVCOLOR_ADDALPHA: shader_addline(buffer, "SUB arg0, const.x, %s;\n", arg1); - shader_addline(buffer, "MAD %s%s, arg0, %s, %s.a;\n", dstreg, dstmask, arg2, arg1); + shader_addline(buffer, "MAD_SAT %s%s, arg0, %s, %s.a;\n", dstreg, dstmask, arg2, arg1); break; case WINED3DTOP_MODULATECOLOR_ADDALPHA: - shader_addline(buffer, "MAD %s%s, %s, %s, %s.a;\n", dstreg, dstmask, arg1, arg2, arg1); + shader_addline(buffer, "MAD_SAT %s%s, %s, %s, %s.a;\n", dstreg, dstmask, arg1, arg2, arg1); break; case WINED3DTOP_DOTPRODUCT3: @@ -2521,11 +2521,11 @@ static void gen_ffp_instr(SHADER_BUFFER *buffer, unsigned int stage, BOOL color, } shader_addline(buffer, "SUB arg1, %s, const.w;\n", arg1); shader_addline(buffer, "SUB arg2, %s, const.w;\n", arg2); - shader_addline(buffer, "DP3 %s%s, arg1, arg2;\n", dstreg, dstmask); + shader_addline(buffer, "DP3_SAT %s%s, arg1, arg2;\n", dstreg, dstmask); break; case WINED3DTOP_MULTIPLYADD: - shader_addline(buffer, "MAD %s%s, %s, %s, %s;\n", dstreg, dstmask, arg1, arg2, arg0); + shader_addline(buffer, "MAD_SAT %s%s, %s, %s, %s;\n", dstreg, dstmask, arg1, arg2, arg0); break; case WINED3DTOP_LERP: @@ -2556,7 +2556,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB BOOL tex_read[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; BOOL bump_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; const char *textype; - const char *instr; + const char *instr, *sat; char colorcor_dst[8]; GLuint ret; DWORD arg0, arg1, arg2; @@ -2653,6 +2653,13 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB default: textype = "unexpected_textype"; break; } + if(settings->op[stage].cop == WINED3DTOP_BUMPENVMAP || + settings->op[stage].cop == WINED3DTOP_BUMPENVMAPLUMINANCE) { + sat = ""; + } else { + sat = "_SAT"; + } + if(settings->op[stage].projected == proj_none) { instr = "TEX"; } else if(settings->op[stage].projected == proj_count4) { @@ -2670,11 +2677,11 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB shader_addline(&buffer, "SWZ arg1, bumpmat%u, y, w, 0, 0;\n", stage - 1); shader_addline(&buffer, "DP3 ret.g, arg1, tex%u;\n", stage - 1); shader_addline(&buffer, "ADD ret, ret, fragment.texcoord[%u];\n", stage); - shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", - instr, stage, stage, textype); + shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", + instr, sat, stage, stage, textype); } else { - shader_addline(&buffer, "%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", - instr, stage, stage, stage, textype); + shader_addline(&buffer, "%s%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", + instr, sat, stage, stage, stage, textype); } sprintf(colorcor_dst, "tex%u", stage);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: a793888a286ee1853a23ef9ca153f1c90a7d0bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a793888a286ee1853a23ef9ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 4 10:20:20 2008 +0200 Assorted spelling fixes. --- dlls/kernel32/tests/codepage.c | 2 +- dlls/kernel32/tests/profile.c | 6 +++--- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 7ca4a6f..7ea89a2 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -355,7 +355,7 @@ START_TEST(codepage) test_negative_dest_length(); test_overlapped_buffers(); - /* WideCharToMultiByte has two code pathes, test both here */ + /* WideCharToMultiByte has two code paths, test both here */ test_string_conversion(NULL); test_string_conversion(&bUsedDefaultChar); } diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 46dfe72..2ea3955 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -417,7 +417,7 @@ static void test_GetPrivateProfileString(void) /* lpAppName is empty, lpDefault has trailing blank characters */ lstrcpyA(buf, "kumquat"); - /* lpDefault must be writeable (trailing blanks are removed inplace in win9x) */ + /* lpDefault must be writable (trailing blanks are removed inplace in win9x) */ lstrcpyA(def_val, "default "); ret = GetPrivateProfileStringA("", "name1", def_val, buf, MAX_PATH, filename); @@ -426,7 +426,7 @@ static void test_GetPrivateProfileString(void) /* lpAppName is empty, many blank characters in lpDefault */ lstrcpyA(buf, "kumquat"); - /* lpDefault must be writeable (trailing blanks are removed inplace in win9x) */ + /* lpDefault must be writable (trailing blanks are removed inplace in win9x) */ lstrcpyA(def_val, "one two "); ret = GetPrivateProfileStringA("", "name1", def_val, buf, MAX_PATH, filename); @@ -478,7 +478,7 @@ static void test_GetPrivateProfileString(void) /* lpKeyName is empty, lpDefault has trailing blank characters */ lstrcpyA(buf, "kumquat"); - /* lpDefault must be writeable (trailing blanks are removed inplace in win9x) */ + /* lpDefault must be writable (trailing blanks are removed inplace in win9x) */ lstrcpyA(def_val, "default "); ret = GetPrivateProfileStringA("section1", "", def_val, buf, MAX_PATH, filename); diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4f0e897..0fdb76d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -758,7 +758,7 @@ static void gen_color_correction(SHADER_BUFFER *buffer, const char *reg, const c case WINED3DFMT_ATI2N: /* GL_ATI_texture_compression_3dc returns the two channels as luminance-alpha, - * which means the first one is replicated accross .rgb, and the 2nd one is in + * which means the first one is replicated across .rgb, and the 2nd one is in * .a. We need the 2nd in .g * * GL_EXT_texture_compression_rgtc returns the values in .rg, however, they @@ -2222,7 +2222,7 @@ static HRESULT arbfp_alloc(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; struct shader_arb_priv *priv; /* Share private data between the shader backend and the pipeline replacement, if both - * are the arb implementation. This is needed to figure out wether ARBfp should be disabled + * are the arb implementation. This is needed to figure out whether ARBfp should be disabled * if no pixel shader is bound or not */ if(This->shader_backend == &arb_program_shader_backend) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 80c4411..925a07c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1346,7 +1346,7 @@ static void shader_glsl_color_correction(SHADER_OPCODE_ARG* arg) { case WINED3DFMT_ATI2N: /* GL_ATI_texture_compression_3dc returns the two channels as luminance-alpha, - * which means the first one is replicated accross .rgb, and the 2nd one is in + * which means the first one is replicated across .rgb, and the 2nd one is in * .a. We need the 2nd in .g * * GL_EXT_texture_compression_rgtc returns the values in .rg, however, they

1 0

Paul Vriens : crypt32/tests: Don't crash on some win9x boxes.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 1542bbd81c37d5c04d559d51dae372d4a2863fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1542bbd81c37d5c04d559d51d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 4 11:48:33 2008 +0200 crypt32/tests: Don't crash on some win9x boxes. --- dlls/crypt32/tests/crl.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 561953b..0bd0e5c 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -161,17 +161,22 @@ static void testAddCRL(void) ok(!ret && (GLE == CRYPT_E_ASN1_EOD || GLE == OSS_MORE_INPUT), "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", GLE); - /* Weird--bad add disposition leads to an access violation in Windows. */ - ret = CertAddEncodedCRLToStore(0, X509_ASN_ENCODING, signedCRL, - sizeof(signedCRL), 0, NULL); - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == E_INVALIDARG /* Vista */), - "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08x\n", GetLastError()); - ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, - sizeof(signedCRL), 0, NULL); - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == E_INVALIDARG /* Vista */), - "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); + /* Weird--bad add disposition leads to an access violation in Windows. + * Both tests crash on some win9x boxes. + */ + if (0) + { + ret = CertAddEncodedCRLToStore(0, X509_ASN_ENCODING, signedCRL, + sizeof(signedCRL), 0, NULL); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG /* Vista */), + "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08x\n", GetLastError()); + ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, + sizeof(signedCRL), 0, NULL); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG /* Vista */), + "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08x\n", GetLastError()); + } /* Weird--can add a CRL to the NULL store (does this have special meaning?) */

1 0

Dmitry Timoshkov : mlang: Add a test for a CodePageToCodePages failure, make it pass under Wine.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: cfe0f97067581ddd28ed19964d81b259104e5edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe0f97067581ddd28ed19964… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Aug 3 14:21:35 2008 +0900 mlang: Add a test for a CodePageToCodePages failure, make it pass under Wine. --- dlls/mlang/mlang.c | 8 +++--- dlls/mlang/tests/mlang.c | 60 ++++++++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 412427e..0170631 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1883,7 +1883,6 @@ static HRESULT WINAPI fnIMLangFontLink_CodePageToCodePages( BOOL rc; TRACE("(%p) Seeking %u\n",This, uCodePage); - memset(&cs, 0, sizeof(cs)); rc = TranslateCharsetInfo((DWORD*)uCodePage, &cs, TCI_SRCCODEPAGE); @@ -1891,11 +1890,12 @@ static HRESULT WINAPI fnIMLangFontLink_CodePageToCodePages( { *pdwCodePages = cs.fs.fsCsb[0]; TRACE("resulting CodePages 0x%x\n",*pdwCodePages); + return S_OK; } - else - TRACE("CodePage Not Found\n"); - return S_OK; + TRACE("CodePage Not Found\n"); + *pdwCodePages = 0; + return E_FAIL; } static HRESULT WINAPI fnIMLangFontLink_CodePagesToCodePage( diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index b173842..c0f9b88 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -640,36 +640,44 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) static void IMLangFontLink_Test(IMLangFontLink* iMLFL) { - DWORD dwCodePages = 0; - DWORD dwManyCodePages = 0; - UINT CodePage = 0; - - ok(IMLangFontLink_CodePageToCodePages(iMLFL, 932, &dwCodePages)==S_OK, - "IMLangFontLink_CodePageToCodePages failed\n"); - ok (dwCodePages != 0, "No CodePages returned\n"); - ok(IMLangFontLink_CodePagesToCodePage(iMLFL, dwCodePages, 1035, - &CodePage)==S_OK, - "IMLangFontLink_CodePagesToCodePage failed\n"); + DWORD dwCodePages, dwManyCodePages; + UINT CodePage; + HRESULT ret; + + dwCodePages = ~0u; + ret = IMLangFontLink_CodePageToCodePages(iMLFL, -1, &dwCodePages); + ok(ret == E_FAIL, "IMLangFontLink_CodePageToCodePages should fail: %x\n", ret); + ok(dwCodePages == 0, "expected 0, got %u\n", dwCodePages); + + dwCodePages = 0; + ret = IMLangFontLink_CodePageToCodePages(iMLFL, 932, &dwCodePages); + ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %x\n", ret); + ok(dwCodePages == FS_JISJAPAN, "expected FS_JISJAPAN, got %08x\n", dwCodePages); + CodePage = 0; + ret = IMLangFontLink_CodePagesToCodePage(iMLFL, dwCodePages, 1035, &CodePage); + ok(ret == S_OK, "IMLangFontLink_CodePagesToCodePage error %x\n", ret); ok(CodePage == 932, "Incorrect CodePage Returned (%i)\n",CodePage); - ok(IMLangFontLink_CodePageToCodePages(iMLFL, 1252, &dwCodePages)==S_OK, - "IMLangFontLink_CodePageToCodePages failed\n"); - dwManyCodePages = dwManyCodePages | dwCodePages; - ok(IMLangFontLink_CodePageToCodePages(iMLFL, 1256, &dwCodePages)==S_OK, - "IMLangFontLink_CodePageToCodePages failed\n"); - dwManyCodePages = dwManyCodePages | dwCodePages; - ok(IMLangFontLink_CodePageToCodePages(iMLFL, 874, &dwCodePages)==S_OK, - "IMLangFontLink_CodePageToCodePages failed\n"); - dwManyCodePages = dwManyCodePages | dwCodePages; - - ok(IMLangFontLink_CodePagesToCodePage(iMLFL, dwManyCodePages, 1256, - &CodePage)==S_OK, - "IMLangFontLink_CodePagesToCodePage failed\n"); + dwManyCodePages = 0; + ret = IMLangFontLink_CodePageToCodePages(iMLFL, 1252, &dwManyCodePages); + ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %x\n", ret); + ok(dwManyCodePages == FS_LATIN1, "expected FS_LATIN1, got %08x\n", dwManyCodePages); + dwCodePages = 0; + ret = IMLangFontLink_CodePageToCodePages(iMLFL, 1256, &dwCodePages); + ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %x\n", ret); + ok(dwCodePages == FS_ARABIC, "expected FS_ARABIC, got %08x\n", dwCodePages); + dwManyCodePages |= dwCodePages; + ret = IMLangFontLink_CodePageToCodePages(iMLFL, 874, &dwCodePages); + ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %x\n", ret); + ok(dwCodePages == FS_THAI, "expected FS_THAI, got %08x\n", dwCodePages); + dwManyCodePages |= dwCodePages; + + ret = IMLangFontLink_CodePagesToCodePage(iMLFL, dwManyCodePages, 1256, &CodePage); + ok(ret == S_OK, "IMLangFontLink_CodePagesToCodePage error %x\n", ret); ok(CodePage == 1256, "Incorrect CodePage Returned (%i)\n",CodePage); - ok(IMLangFontLink_CodePagesToCodePage(iMLFL, dwManyCodePages, 936, - &CodePage)==S_OK, - "IMLangFontLink_CodePagesToCodePage failed\n"); + ret = IMLangFontLink_CodePagesToCodePage(iMLFL, dwManyCodePages, 936, &CodePage); + ok(ret == S_OK, "IMLangFontLink_CodePagesToCodePage error %x\n", ret); ok(CodePage == 1252, "Incorrect CodePage Returned (%i)\n",CodePage); }

1 0

Dmitry Timoshkov : mlang: Remove noise from mlang test output.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 253a6971a324146d5037a4f53b1e55fb5836ad32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253a6971a324146d5037a4f53… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Aug 3 14:21:54 2008 +0900 mlang: Remove noise from mlang test output. --- dlls/mlang/tests/mlang.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index c0f9b88..e6f136a 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -305,7 +305,6 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) TRACE_2("Call IMultiLanguage2_EnumCodePages\n"); ret = IMultiLanguage2_EnumCodePages(iML2, flags, LANG_NEUTRAL, &iEnumCP); - trace("IMultiLanguage2_EnumCodePages = %08x, iEnumCP = %p\n", ret, iEnumCP); ok(ret == S_OK && iEnumCP, "IMultiLanguage2_EnumCodePages: expected S_OK/!NULL, got %08x/%p\n", ret, iEnumCP); TRACE_2("Call IEnumCodePage_Reset\n"); @@ -324,7 +323,6 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) n = total * 2; TRACE_2("Call IEnumCodePage_Next\n"); ret = IEnumCodePage_Next(iEnumCP, 0, cpinfo, &n); - trace("IEnumCodePage_Next = %08x, n = %u\n", ret, n); ok(ret == S_FALSE && n == 0, "IEnumCodePage_Next: expected S_FALSE/0, got %08x/%u\n", ret, n); n = total * 2; @@ -382,8 +380,9 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) else trace("TranslateCharsetInfo failed for cp %u\n", cpinfo[i].uiFamilyCodePage); +#ifdef DUMP_CP_INFO trace("%u: codepage %u family %u\n", i, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); - +#endif /* Win95 does not support UTF-7 */ if (cpinfo[i].uiCodePage == CP_UTF7) continue; @@ -551,7 +550,6 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) TRACE_2("Call IMultiLanguage2_EnumScripts\n"); ret = IMultiLanguage2_EnumScripts(iML2, flags, LANG_NEUTRAL, &iEnumScript); - trace("IMultiLanguage2_EnumScripts = %08x, iEnumScript = %p\n", ret, iEnumScript); ok(ret == S_OK && iEnumScript, "IMultiLanguage2_EnumScripts: expected S_OK/!NULL, got %08x/%p\n", ret, iEnumScript); TRACE_2("Call IEnumScript_Reset\n"); @@ -602,8 +600,8 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) wine_dbgstr_w(sinfo[i].wszDescription), wine_dbgstr_w(sinfo[i].wszFixedWidthFont), wine_dbgstr_w(sinfo[i].wszProportionalFont)); -#endif trace("%u codepage %u\n", i, sinfo[i].uiCodePage); +#endif } /* now IEnumScript_Next should fail, since pointer is at the end */ @@ -1328,8 +1326,6 @@ START_TEST(mlang) TRACE_2("Call CoCreateInstance\n"); ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, &IID_IMultiLanguage2, (void **)&iML2); - - trace("ret = %08x, MultiLanguage2 iML2 = %p\n", ret, iML2); if (ret != S_OK || !iML2) return; test_rfc1766(iML2); @@ -1366,8 +1362,6 @@ START_TEST(mlang) ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, &IID_IMLangFontLink, (void **)&iMLFL); - - trace("ret = %08x, IMLangFontLink iMLFL = %p\n", ret, iMLFL); if (ret != S_OK || !iML2) return; IMLangFontLink_Test(iMLFL);

1 0

Dmitry Timoshkov : mlang: Do not use MAX_PATH for not path related things.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 0786923e3203ec6d63663e1917a222664d71efac URL: http://source.winehq.org/git/wine.git/?a=commit;h=0786923e3203ec6d63663e191… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Aug 3 14:22:12 2008 +0900 mlang: Do not use MAX_PATH for not path related things. --- dlls/mlang/tests/mlang.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index e6f136a..3782844 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -70,15 +70,14 @@ static BOOL init_function_ptrs(void) #define TRACE_2 OutputDebugStringA -static CHAR string1[MAX_PATH], string2[MAX_PATH]; - #define ok_w2(format, szString1, szString2) \ \ - if (lstrcmpW(szString1, szString2) != 0) \ + if (lstrcmpW((szString1), (szString2)) != 0) \ { \ - WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ - WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ - ok(0, format, string1, string2); \ + CHAR string1[256], string2[256]; \ + WideCharToMultiByte(CP_ACP, 0, (szString1), -1, string1, 256, NULL, NULL); \ + WideCharToMultiByte(CP_ACP, 0, (szString2), -1, string2, 256, NULL, NULL); \ + ok(0, (format), string1, string2); \ } static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2)

1 0

Hans Leidekker : wininet: Use getaddrinfo for thread-safe resolving if available.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: daa2fdfccb29f5a17b7c900d5f01cc2c05c92817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa2fdfccb29f5a17b7c900d5… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Aug 2 23:21:23 2008 +0200 wininet: Use getaddrinfo for thread-safe resolving if available. --- dlls/wininet/utility.c | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index b0d9c9c..ff914f4 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); +#ifndef HAVE_GETADDRINFO + /* critical section to protect non-reentrant gethostbyname() */ static CRITICAL_SECTION cs_gethostbyname; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -50,6 +52,8 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION cs_gethostbyname = { &critsect_debug, -1, 0, 0, 0, 0 }; +#endif + #define TIME_STRING_LEN 30 time_t ConvertTimeString(LPCWSTR asctime) @@ -142,7 +146,12 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, WCHAR *found; char *name; int len, sz; +#ifdef HAVE_GETADDRINFO + struct addrinfo *res, hints; + int ret; +#else struct hostent *phe; +#endif TRACE("%s\n", debugstr_w(lpszServerName)); @@ -158,27 +167,45 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, len = strlenW(lpszServerName); sz = WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, NULL, 0, NULL, NULL ); - name = HeapAlloc(GetProcessHeap(), 0, sz+1); + if (!(name = HeapAlloc( GetProcessHeap(), 0, sz + 1 ))) return FALSE; WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, name, sz, NULL, NULL ); name[sz] = 0; +#ifdef HAVE_GETADDRINFO + memset( &hints, 0, sizeof(struct addrinfo) ); + hints.ai_family = AF_INET; + + ret = getaddrinfo( name, NULL, &hints, &res ); + HeapFree( GetProcessHeap(), 0, name ); + if (ret != 0) + { + TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); + return FALSE; + } + memset( psa, 0, sizeof(struct sockaddr_in) ); + memcpy( &psa->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); + psa->sin_family = res->ai_family; + psa->sin_port = htons(nServerPort); + + freeaddrinfo( res ); +#else EnterCriticalSection( &cs_gethostbyname ); phe = gethostbyname(name); HeapFree( GetProcessHeap(), 0, name ); if (NULL == phe) { - TRACE("Failed to get hostname: (%s)\n", debugstr_w(lpszServerName) ); + TRACE("failed to get address of %s (%d)\n", debugstr_w(lpszServerName), h_errno); LeaveCriticalSection( &cs_gethostbyname ); return FALSE; } - memset(psa,0,sizeof(struct sockaddr_in)); memcpy((char *)&psa->sin_addr, phe->h_addr, phe->h_length); psa->sin_family = phe->h_addrtype; psa->sin_port = htons(nServerPort); LeaveCriticalSection( &cs_gethostbyname ); +#endif return TRUE; }

1 0

Hans Leidekker : wininet: Properly initialize access type when no proxy is configured.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 3c43a6568fc3d25d9bbebe2350eb747fe3c1dfeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c43a6568fc3d25d9bbebe235… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Aug 2 23:21:54 2008 +0200 wininet: Properly initialize access type when no proxy is configured. --- dlls/wininet/internet.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a306fd2..d06298f 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -410,8 +410,11 @@ static BOOL INTERNET_ConfigureProxy( LPWININETAPPINFOW lpwai ) TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwai->lpszProxy)); enabled = 1; } - if (!enabled) TRACE("Proxy is not enabled.\n"); - + if (!enabled) + { + TRACE("Proxy is not enabled.\n"); + lpwai->dwAccessType = INTERNET_OPEN_TYPE_DIRECT; + } RegCloseKey( key ); return (enabled > 0); }

1 0