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

Detlef Riekenberg : urlmon/tests: Handle BSCF_SKIPDRAINDATAFORFILEURLS to fix failures on IE8.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: b5eb3be433b7845cedd39e8451e2b8cebdf25276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5eb3be433b7845cedd39e845… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun May 3 12:51:00 2009 +0200 urlmon/tests: Handle BSCF_SKIPDRAINDATAFORFILEURLS to fix failures on IE8. --- dlls/urlmon/tests/protocol.c | 4 +++- include/urlmon.idl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index e136d4b..a973211 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -599,7 +599,9 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR ok(ulProgress == ulProgressMax, "ulProgress (%d) != ulProgressMax (%d)\n", ulProgress, ulProgressMax); ok(ulProgressMax == 13, "ulProgressMax=%d, expected 13\n", ulProgressMax); - ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION), + /* BSCF_SKIPDRAINDATAFORFILEURLS added in IE8 */ + ok((grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION)) || + (grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION | BSCF_SKIPDRAINDATAFORFILEURLS)), "grcfBSCF = %08x\n", grfBSCF); }else if(!binding_test && (tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST || tested_protocol == FTP_TEST)) { if(!(grfBSCF & BSCF_LASTDATANOTIFICATION) || (grfBSCF & BSCF_DATAFULLYAVAILABLE)) diff --git a/include/urlmon.idl b/include/urlmon.idl index 93bdd0f..20bf28e 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -198,7 +198,9 @@ interface IBindStatusCallback : IUnknown BSCF_INTERMEDIATEDATANOTIFICATION = 0x02, BSCF_LASTDATANOTIFICATION = 0x04, BSCF_DATAFULLYAVAILABLE = 0x08, - BSCF_AVAILABLEDATASIZEUNKNOWN = 0x10 + BSCF_AVAILABLEDATASIZEUNKNOWN = 0x10, + BSCF_SKIPDRAINDATAFORFILEURLS = 0x20, + BSCF_64BITLENGTHDOWNLOAD = 0x40 } BSCF; typedef enum BINDSTATUS

1 0

Detlef Riekenberg : wininet/tests: Prefer winehq.org over winehq.com.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 648693802b17e59feb7721d05fbcd1bd4fa896f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=648693802b17e59feb7721d05… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun May 3 14:27:24 2009 +0200 wininet/tests: Prefer winehq.org over winehq.com. --- dlls/wininet/tests/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 3c1b3da..176f3d8 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -197,7 +197,7 @@ static void test_InternetQueryOptionA(void) ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code %d\n", err); HeapFree(GetProcessHeap(),0,buffer); - hurl = InternetConnectA(hinet,"www.winehq.com",INTERNET_DEFAULT_HTTP_PORT,NULL,NULL,INTERNET_SERVICE_HTTP,0,0); + hurl = InternetConnectA(hinet,"www.winehq.org",INTERNET_DEFAULT_HTTP_PORT,NULL,NULL,INTERNET_SERVICE_HTTP,0,0); SetLastError(0xdeadbeef); len=0;

1 0

Roderick Colenbrander : wingdi.h: Add missing png/jpeg compression flags.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 3f02040f156c58deb3921faecb65a01c5dfd3ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f02040f156c58deb3921faec… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun May 3 22:58:33 2009 +0200 wingdi.h: Add missing png/jpeg compression flags. --- include/wingdi.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index 96a0d20..a6cdd64 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1876,6 +1876,8 @@ typedef struct { #define BI_RLE8 1 #define BI_RLE4 2 #define BI_BITFIELDS 3 +#define BI_JPEG 4 +#define BI_PNG 5 typedef struct tagBITMAPINFO {

1 0

Austin English : crypt32/tests: Print a better error if no Verisign root certificates available.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: efa555596b30134261920ea12d8c324f9bef34b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efa555596b30134261920ea12… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 3 19:05:00 2009 -0500 crypt32/tests: Print a better error if no Verisign root certificates available. --- dlls/crypt32/tests/chain.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index f7efe64..c880df9 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1184,9 +1184,10 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected, ok(got->dwErrorStatus == expected->dwErrorStatus || broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == (expected->dwErrorStatus & ~ignore->dwErrorStatus)), - "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", + "Chain %d, element [%d,%d]: expected error %08x, got %08x. %08x is " + "expected if no valid Verisign root certificate is available.\n", testIndex, chainIndex, elementIndex, expected->dwErrorStatus, - got->dwErrorStatus); + got->dwErrorStatus, CERT_TRUST_IS_UNTRUSTED_ROOT); if (got->dwInfoStatus == expected->dwInfoStatus) ok(got->dwInfoStatus == expected->dwInfoStatus, "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", @@ -1264,9 +1265,10 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, ~chainStatus->statusToIgnore.dwErrorStatus) == (chainStatus->status.dwErrorStatus & ~chainStatus->statusToIgnore.dwErrorStatus)), - "Chain %d: expected error %08x, got %08x\n", + "Chain %d: expected error %08x, got %08x. %08x is expected if no valid " + "Verisign root certificate is available.\n", testIndex, chainStatus->status.dwErrorStatus, - chain->TrustStatus.dwErrorStatus); + chain->TrustStatus.dwErrorStatus, CERT_TRUST_IS_UNTRUSTED_ROOT); if (todo & TODO_INFO && chain->TrustStatus.dwInfoStatus != chainStatus->status.dwInfoStatus) todo_wine ok(chain->TrustStatus.dwInfoStatus ==

1 0

Austin English : ws2_32/tests: Add initial tests for WSAStartup.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 3cf5eb6d967f1454688c1a79d97ab9e283dded34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf5eb6d967f1454688c1a79d… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 3 19:38:43 2009 -0500 ws2_32/tests: Add initial tests for WSAStartup. --- dlls/ws2_32/tests/sock.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 54ffee7..c90f391 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -836,6 +836,37 @@ out: client_stop (); } +/* Tests for WSAStartup */ + +/* This should fail. WSAStartup should be called before any network function is used. */ +static void test_WithoutWSAStartup(void) +{ + LPVOID ptr; + + WSASetLastError(0xdeadbeef); + ptr = gethostbyname("localhost"); + + todo_wine ok(ptr == NULL, "gethostbyname() succeeded unexpectedly: %d\n", WSAGetLastError()); + todo_wine ok(WSAGetLastError() == WSANOTINITIALISED, "gethostbyname() failed with unexpected error: %d\n", + WSAGetLastError()); +} + +static void test_WithWSAStartup(void) +{ + WSADATA data; + WORD version = MAKEWORD( 2, 2 ); + INT res; + LPVOID ptr; + + res = WSAStartup( version, &data ); + ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); + + ptr = gethostbyname("localhost"); + ok(ptr != NULL, "gethostbyname() failed unexpectedly: %d\n", WSAGetLastError()); + + WSACleanup(); +} + /**************** Main program utility functions ***************/ static void Init (void) @@ -2513,6 +2544,12 @@ static void test_GetAddrInfoW(void) START_TEST( sock ) { int i; + +/* Leave these tests at the beginning. They depend on WSAStartup not having been + * called, which is done by Init() below. */ + test_WithoutWSAStartup(); + test_WithWSAStartup(); + Init(); test_set_getsockopt();

1 0

Dmitry Timoshkov : msvfw32: Remove useless and harmful traces from ICDecompress.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: c3dce7dcceeb6e9c9e02aca6a827b69d22e67a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3dce7dcceeb6e9c9e02aca6a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 4 16:02:18 2009 +0900 msvfw32: Remove useless and harmful traces from ICDecompress. --- dlls/msvfw32/msvideo_main.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 7483218..962d6ef 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -680,8 +680,6 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat, TRACE("(%p,%d,%p,%p,%p,%p)\n",hic,dwFlags,lpbiFormat,lpData,lpbi,lpBits); - TRACE("lpBits[0] == %x\n",((LPDWORD)lpBits)[0]); - icd.dwFlags = dwFlags; icd.lpbiInput = lpbiFormat; icd.lpInput = lpData; @@ -691,8 +689,6 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat, icd.ckid = 0; ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD_PTR)&icd,sizeof(ICDECOMPRESS)); - TRACE("lpBits[0] == %x\n",((LPDWORD)lpBits)[0]); - TRACE("-> %d\n",ret); return ret;

1 0

Henri Verbeet : wined3d: Get rid of the remaining WINED3DSP_REGNUM_MASK usage.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 6eb43e35c994820cfb7e0119e51ed60a88d19ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb43e35c994820cfb7e0119e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 4 09:49:27 2009 +0200 wined3d: Get rid of the remaining WINED3DSP_REGNUM_MASK usage. --- dlls/wined3d/baseshader.c | 119 +++++++++++++++++++++++---------------------- 1 files changed, 61 insertions(+), 58 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 9bdad17..f627ec0 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -724,21 +724,24 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m else if (ins.handler_idx == WINED3DSIH_LOOP || ins.handler_idx == WINED3DSIH_REP) { - DWORD reg; + struct wined3d_shader_src_param src, rel_addr; - if(ins.handler_idx == WINED3DSIH_LOOP) { - reg = pToken[1]; - } else { - reg = pToken[0]; + shader_sm1_read_src_param(&pToken, &src, &rel_addr, shader_version); + + /* Rep and Loop always use an integer constant for the control parameters */ + if (ins.handler_idx == WINED3DSIH_REP) + { + reg_maps->integer_constants |= 1 << src.register_idx; + } + else + { + shader_sm1_read_src_param(&pToken, &src, &rel_addr, shader_version); + reg_maps->integer_constants |= 1 << src.register_idx; } cur_loop_depth++; if(cur_loop_depth > max_loop_depth) max_loop_depth = cur_loop_depth; - pToken += param_size; - - /* Rep and Loop always use an integer constant for the control parameters */ - reg_maps->integer_constants |= (1 << (reg & WINED3DSP_REGNUM_MASK)); } else if (ins.handler_idx == WINED3DSIH_ENDLOOP || ins.handler_idx == WINED3DSIH_ENDREP) @@ -748,62 +751,16 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m /* For subroutine prototypes */ else if (ins.handler_idx == WINED3DSIH_LABEL) { + struct wined3d_shader_src_param src, rel_addr; - DWORD snum = *pToken & WINED3DSP_REGNUM_MASK; - reg_maps->labels[snum] = 1; - pToken += param_size; + shader_sm1_read_src_param(&pToken, &src, &rel_addr, shader_version); + reg_maps->labels[src.register_idx] = 1; } /* Set texture, address, temporary registers */ else { int i, limit; - /* Declare 1.X samplers implicitly, based on the destination reg. number */ - if (WINED3DSHADER_VERSION_MAJOR(shader_version) == 1 - && pshader /* Filter different instructions with the same enum values in VS */ - && (ins.handler_idx == WINED3DSIH_TEX - || ins.handler_idx == WINED3DSIH_TEXBEM - || ins.handler_idx == WINED3DSIH_TEXBEML - || ins.handler_idx == WINED3DSIH_TEXDP3TEX - || ins.handler_idx == WINED3DSIH_TEXM3x2TEX - || ins.handler_idx == WINED3DSIH_TEXM3x3SPEC - || ins.handler_idx == WINED3DSIH_TEXM3x3TEX - || ins.handler_idx == WINED3DSIH_TEXM3x3VSPEC - || ins.handler_idx == WINED3DSIH_TEXREG2AR - || ins.handler_idx == WINED3DSIH_TEXREG2GB - || ins.handler_idx == WINED3DSIH_TEXREG2RGB)) - { - /* Fake sampler usage, only set reserved bit and ttype */ - DWORD sampler_code = *pToken & WINED3DSP_REGNUM_MASK; - - TRACE("Setting fake 2D sampler for 1.x pixelshader\n"); - reg_maps->sampler_type[sampler_code] = WINED3DSTT_2D; - - /* texbem is only valid with < 1.4 pixel shaders */ - if (ins.handler_idx == WINED3DSIH_TEXBEM - || ins.handler_idx == WINED3DSIH_TEXBEML) - { - reg_maps->bumpmat[sampler_code] = TRUE; - if (ins.handler_idx == WINED3DSIH_TEXBEML) - { - reg_maps->luminanceparams[sampler_code] = TRUE; - } - } - } - if (ins.handler_idx == WINED3DSIH_NRM) - { - reg_maps->usesnrm = 1; - } - else if (pshader && ins.handler_idx == WINED3DSIH_BEM) - { - DWORD regnum = *pToken & WINED3DSP_REGNUM_MASK; - reg_maps->bumpmat[regnum] = TRUE; - } - else if (ins.handler_idx == WINED3DSIH_DSY) - { - reg_maps->usesdsy = 1; - } - /* This will loop over all the registers and try to * make a bitmask of the ones we're interested in. * @@ -831,6 +788,52 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m shader_record_register_usage(This, reg_maps, dst_param.register_type, dst_param.register_idx, !!dst_param.rel_addr, pshader); } + + /* Declare 1.X samplers implicitly, based on the destination reg. number */ + if (WINED3DSHADER_VERSION_MAJOR(shader_version) == 1 + && pshader /* Filter different instructions with the same enum values in VS */ + && (ins.handler_idx == WINED3DSIH_TEX + || ins.handler_idx == WINED3DSIH_TEXBEM + || ins.handler_idx == WINED3DSIH_TEXBEML + || ins.handler_idx == WINED3DSIH_TEXDP3TEX + || ins.handler_idx == WINED3DSIH_TEXM3x2TEX + || ins.handler_idx == WINED3DSIH_TEXM3x3SPEC + || ins.handler_idx == WINED3DSIH_TEXM3x3TEX + || ins.handler_idx == WINED3DSIH_TEXM3x3VSPEC + || ins.handler_idx == WINED3DSIH_TEXREG2AR + || ins.handler_idx == WINED3DSIH_TEXREG2GB + || ins.handler_idx == WINED3DSIH_TEXREG2RGB)) + { + /* Fake sampler usage, only set reserved bit and ttype */ + DWORD sampler_code = dst_param.register_idx; + + TRACE("Setting fake 2D sampler for 1.x pixelshader\n"); + reg_maps->sampler_type[sampler_code] = WINED3DSTT_2D; + + /* texbem is only valid with < 1.4 pixel shaders */ + if (ins.handler_idx == WINED3DSIH_TEXBEM + || ins.handler_idx == WINED3DSIH_TEXBEML) + { + reg_maps->bumpmat[sampler_code] = TRUE; + if (ins.handler_idx == WINED3DSIH_TEXBEML) + { + reg_maps->luminanceparams[sampler_code] = TRUE; + } + } + } + else if (pshader && ins.handler_idx == WINED3DSIH_BEM) + { + reg_maps->bumpmat[dst_param.register_idx] = TRUE; + } + } + + if (ins.handler_idx == WINED3DSIH_NRM) + { + reg_maps->usesnrm = 1; + } + else if (ins.handler_idx == WINED3DSIH_DSY) + { + reg_maps->usesdsy = 1; } limit = ins.src_count + (ins.predicate ? 1 : 0);

1 0

Henri Verbeet : wined3d: Move SM 1-3 parsing functions to their own file.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 5a7afd9b2a6b9304ff6c0212ce22d972f831cf99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a7afd9b2a6b9304ff6c0212c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 4 09:49:27 2009 +0200 wined3d: Move SM 1-3 parsing functions to their own file. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/baseshader.c | 282 +------------------------------------ dlls/wined3d/shader_sm1.c | 304 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 11 ++ 4 files changed, 318 insertions(+), 280 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a7afd9b2a6b9304ff6c0…

1 0

Henri Verbeet : wined3d: Create a frontend for parsing shaders.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 2378108eb9de8d7dbe38ca7b4c5c05fcc7cb3bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2378108eb9de8d7dbe38ca7b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 4 09:49:27 2009 +0200 wined3d: Create a frontend for parsing shaders. --- dlls/wined3d/arb_program_shader.c | 12 ++++-- dlls/wined3d/baseshader.c | 70 ++++++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 12 ++++-- dlls/wined3d/pixelshader.c | 8 +++-- dlls/wined3d/shader_sm1.c | 19 +++++++--- dlls/wined3d/vertexshader.c | 9 +++-- dlls/wined3d/wined3d_private.h | 44 ++++++++++++++--------- 7 files changed, 104 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2378108eb9de8d7dbe38c…

1 0

Vincent Povirk : gdiplus: Correct the lfHeight calculation in GdipCreateFontFromLogfontW.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 47e70af50b252153bc76a1bf71e02a56dfea762e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e70af50b252153bc76a1bf7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 1 11:09:23 2009 -0500 gdiplus: Correct the lfHeight calculation in GdipCreateFontFromLogfontW. Negative lfHeight values do not include internal leading. This was making fonts created from LOGFONT structures larger than they should be. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 68540e4..0b582a7 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -195,7 +195,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, oldfont = SelectObject(hdc, hfont); GetTextMetricsW(hdc, &textmet); - (*font)->lfw.lfHeight = -textmet.tmHeight; + (*font)->lfw.lfHeight = -(textmet.tmHeight-textmet.tmInternalLeading); (*font)->lfw.lfWeight = textmet.tmWeight; (*font)->lfw.lfCharSet = textmet.tmCharSet;

1 0