February 2009 - Wine-commits

Stefan Dösinger : d3d9: Test table fog and exp fog in the shader fog test.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: e51f2a0e6e37be8ca90db9b5a7616413837d5be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51f2a0e6e37be8ca90db9b5a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 19 18:56:25 2009 +0100 d3d9: Test table fog and exp fog in the shader fog test. --- dlls/d3d9/tests/visual.c | 49 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6c26c6a..f1f140b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1320,9 +1320,9 @@ out: /* This test tests fog in combination with shaders. * What's tested: linear fog (vertex and table) with pixel shader * linear table fog with non foggy vertex shader - * vertex fog with foggy vertex shader - * What's not tested: non linear fog with shader - * table fog with foggy vertex shader + * vertex fog with foggy vertex shader, non-linear + * fog with shader, non-linear fog with foggy shader, + * linear table fog with foggy shader */ static void fog_with_shader_test(IDirect3DDevice9 *device) { @@ -1423,6 +1423,25 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* vertex shader and pixel shader */ + /* The next 4 tests would read the fog coord output, but it isn't available. + * The result is a fully fogged quad, no matter what the Z coord is. This is on + * a geforce 7400, 97.52 driver, Windows Vista, but probably hardware dependent. + * These tests should be disabled if some other hardware behaves differently + */ + {1, 1, D3DFOG_NONE, D3DFOG_NONE, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, + {1, 1, D3DFOG_LINEAR, D3DFOG_NONE, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, + {1, 1, D3DFOG_EXP, D3DFOG_NONE, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, + {1, 1, D3DFOG_EXP2, D3DFOG_NONE, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, + + /* These use the Z coordinate with linear table fog */ {1, 1, D3DFOG_NONE, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, @@ -1432,11 +1451,17 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) {1, 1, D3DFOG_EXP2, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, + /* Non-linear table fog without fog coord */ + {1, 1, D3DFOG_NONE, D3DFOG_EXP, + {0x00ff0000, 0x00e71800, 0x00d12e00, 0x00bd4200, 0x00ab5400, 0x009b6400, + 0x008d7200, 0x007f8000, 0x00738c00, 0x00689700, 0x005ea100}}, + {1, 1, D3DFOG_NONE, D3DFOG_EXP2, + {0x00fd0200, 0x00f50200, 0x00f50a00, 0x00e91600, 0x00d92600, 0x00c73800, + 0x00b24d00, 0x009c6300, 0x00867900, 0x00728d00, 0x005ea100}}, #if 0 /* FIXME: these fail on GeForce 8500 */ /* foggy vertex shader */ @@ -1454,7 +1479,9 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, #endif - /* foggy vertex shader and pixel shader */ + /* foggy vertex shader and pixel shader. First 4 tests with vertex fog, + * all using the fixed fog-coord linear fog + */ {2, 1, D3DFOG_NONE, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, @@ -1468,6 +1495,18 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, + /* These use table fog. Here the shader-provided fog coordinate is + * ignored and the z coordinate used instead + */ + {2, 1, D3DFOG_NONE, D3DFOG_EXP, + {0x00ff0000, 0x00e71800, 0x00d12e00, 0x00bd4200, 0x00ab5400, 0x009b6400, + 0x008d7200, 0x007f8000, 0x00738c00, 0x00689700, 0x005ea100}}, + {2, 1, D3DFOG_NONE, D3DFOG_EXP2, + {0x00fd0200, 0x00f50200, 0x00f50a00, 0x00e91600, 0x00d92600, 0x00c73800, + 0x00b24d00, 0x009c6300, 0x00867900, 0x00728d00, 0x005ea100}}, + {2, 1, D3DFOG_NONE, D3DFOG_LINEAR, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, }; /* NOTE: changing these values will not affect the tests with foggy vertex shader, as the values are hardcoded in the shader*/

1 0

Stefan Dösinger : wined3d: Implement EXP and EXP2 fog in GLSL.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: 66778ed9ec005248106f59e07f716e8e4317e1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=66778ed9ec005248106f59e07… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 2 01:59:13 2009 +0100 wined3d: Implement EXP and EXP2 fog in GLSL. --- dlls/wined3d/glsl_shader.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d83eecb..f67fdd5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3872,10 +3872,16 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, SHADER_BU shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); break; case FOG_EXP: - FIXME("Implement EXP fog in glsl\n"); + /* Fog = e^(-gl_Fog.density * gl_FogFragCoord) */ + shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_FogFragCoord);\n"); + shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);"); + shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); break; case FOG_EXP2: - FIXME("Implement EXP2 fog in glsl\n"); + /* Fog = e^(-(gl_Fog.density * gl_FogFragCoord)^2) */ + shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);\n"); + shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);"); + shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); break; } }

1 0

Stefan Dösinger : WineD3D: Put vertex shader duplication infrastructure in place.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: 8dcd51286d4dddb0724a86ed9505831dbacd64df URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcd51286d4dddb0724a86ed9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 5 19:44:32 2009 +0100 WineD3D: Put vertex shader duplication infrastructure in place. --- dlls/wined3d/arb_program_shader.c | 54 +++++++++++-------- dlls/wined3d/baseshader.c | 3 +- dlls/wined3d/glsl_shader.c | 70 ++++++++++++++++--------- dlls/wined3d/vertexshader.c | 106 +++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 34 +++++++++--- 5 files changed, 167 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8dcd51286d4dddb0724a8…

1 0

Stefan Dösinger : wined3d: Properly set the fog frag coord according to the FOGTABLEMODE.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: 693d9ded47d56846c3dafe7d04115a4f3a01750a URL: http://source.winehq.org/git/wine.git/?a=commit;h=693d9ded47d56846c3dafe7d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 10 02:29:39 2009 +0100 wined3d: Properly set the fog frag coord according to the FOGTABLEMODE. This also fixes the test that an earlier patch broke, so the todo_wine can be removed again. --- dlls/d3d9/tests/visual.c | 12 +++--------- dlls/wined3d/arb_program_shader.c | 11 +++++++++-- dlls/wined3d/glsl_shader.c | 11 +++++++++-- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f7e41e0..6c26c6a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1539,15 +1539,9 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) /* As the red and green component are the result of blending use 5% tolerance on the expected value */ color = getPixelColor(device, 128, 240); - if(test_data[i].vshader == 1 && test_data[i].tfog == 0 && color != test_data[i].color[j]) { - todo_wine ok(color_match(color, test_data[i].color[j], 13), - "fog vs%i ps%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%(todo)\n", - test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]); - } else { - ok(color_match(color, test_data[i].color[j], 13), - "fog vs%i ps%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%\n", - test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]); - } + ok(color_match(color, test_data[i].color[j], 13), + "fog vs%i ps%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%\n", + test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]); } } diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b3627fd..6bc152a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2068,9 +2068,16 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BU /* Base Shader Body */ shader_generate_main( (IWineD3DBaseShader*) This, buffer, reg_maps, function); - /* If this shader doesn't use fog copy the z coord to the fog coord so that we can use table fog */ - if (!reg_maps->fog) + /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used + * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), + * the fog frag coord is thrown away. If the fog frag coord is used, but not written by + * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) + */ + if(args->fog_src == VS_FOG_Z) { shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); + } else if (!reg_maps->fog) { + shader_addline(buffer, "MOV result.fogcoord, 0.0;\n"); + } /* Write the final position. * diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 75f8b03..d83eecb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3912,9 +3912,16 @@ static GLuint shader_glsl_generate_vshader(IWineD3DVertexShader *iface, SHADER_B if (reg_maps->shader_version >= WINED3DVS_VERSION(3,0)) shader_addline(buffer, "order_ps_input(OUT);\n"); else shader_addline(buffer, "order_ps_input();\n"); - /* If this shader doesn't use fog copy the z coord to the fog coord so that we can use table fog */ - if (!reg_maps->fog) + /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used + * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), + * the fog frag coord is thrown away. If the fog frag coord is used, but not written by + * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) + */ + if(args->fog_src == VS_FOG_Z) { shader_addline(buffer, "gl_FogFragCoord = gl_Position.z;\n"); + } else if (!reg_maps->fog) { + shader_addline(buffer, "gl_FogFragCoord = 0.0;\n"); + } /* Write the final position. *

1 0

Rob Shearman : ole32: Fix a test failure in the moniker tests on Win9x.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: ad880ba057853ff5b48ffb4402327ef4088fd2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad880ba057853ff5b48ffb440… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Feb 10 15:32:12 2009 +0000 ole32: Fix a test failure in the moniker tests on Win9x. Also fix a crash in running the tests on Win95. --- dlls/ole32/tests/moniker.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 08ef2ee..3501aa7 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -652,7 +652,9 @@ static void test_ROT(void) ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); todo_wine { - ok(hr == CO_E_WRONG_SERVER_IDENTITY, "IRunningObjectTable_Register should have returned CO_E_WRONG_SERVER_IDENTITY instead of 0x%08x\n", hr); + ok(hr == CO_E_WRONG_SERVER_IDENTITY || + broken(hr == S_OK) /* Win9x */, + "IRunningObjectTable_Register should have returned CO_E_WRONG_SERVER_IDENTITY instead of 0x%08x\n", hr); } if (hr == S_OK) IRunningObjectTable_Revoke(pROT, dwCookie); @@ -918,7 +920,8 @@ static void test_MkParseDisplayName(void) hr = IMoniker_BindToObject(pmk, pbc, NULL, &IID_IUnknown, (LPVOID*)&object); ok_ole_success(hr, IMoniker_BindToObject); - IUnknown_Release(object); + if (SUCCEEDED(hr)) + IUnknown_Release(object); IMoniker_Release(pmk); } IBindCtx_Release(pbc);

1 0

Rob Shearman : ole32: Fix some test failures in the free threaded marshaller tests on Win9x & NT4 .
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: 1e8ae571f5e49bcb6c3e082320ad2af3ae5a9eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8ae571f5e49bcb6c3e08232… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Feb 10 15:32:01 2009 +0000 ole32: Fix some test failures in the free threaded marshaller tests on Win9x & NT4. These platforms only write 8 bytes into the stream so cope appropriately. --- dlls/ole32/tests/marshal.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 73d6a08..45e9950 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2070,21 +2070,26 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * if (mshctx == MSHCTX_INPROC) { DWORD expected_size = round_heap_size(3*sizeof(DWORD) + sizeof(GUID)); - ok(size == expected_size, "size should have been %d instead of %d\n", expected_size, size); + ok(size == expected_size || + broken(size == round_heap_size(2*sizeof(DWORD))) /* Win9x & NT4 */, + "size should have been %d instead of %d\n", expected_size, size); ok(*(DWORD *)marshal_data == mshlflags, "expected 0x%x, but got 0x%x for mshctx\n", mshlflags, *(DWORD *)marshal_data); marshal_data += sizeof(DWORD); ok(*(void **)marshal_data == ptr, "expected %p, but got %p for mshctx\n", ptr, *(void **)marshal_data); marshal_data += sizeof(void *); - if (sizeof(void*) == 4) + if (sizeof(void*) == 4 && size >= 3*sizeof(DWORD)) { ok(*(DWORD *)marshal_data == 0, "expected 0x0, but got 0x%x\n", *(DWORD *)marshal_data); marshal_data += sizeof(DWORD); } - trace("got guid data: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - ((GUID *)marshal_data)->Data1, ((GUID *)marshal_data)->Data2, ((GUID *)marshal_data)->Data3, - ((GUID *)marshal_data)->Data4[0], ((GUID *)marshal_data)->Data4[1], ((GUID *)marshal_data)->Data4[2], ((GUID *)marshal_data)->Data4[3], - ((GUID *)marshal_data)->Data4[4], ((GUID *)marshal_data)->Data4[5], ((GUID *)marshal_data)->Data4[6], ((GUID *)marshal_data)->Data4[7]); + if (size >= 3*sizeof(DWORD) + sizeof(GUID)) + { + trace("got guid data: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + ((GUID *)marshal_data)->Data1, ((GUID *)marshal_data)->Data2, ((GUID *)marshal_data)->Data3, + ((GUID *)marshal_data)->Data4[0], ((GUID *)marshal_data)->Data4[1], ((GUID *)marshal_data)->Data4[2], ((GUID *)marshal_data)->Data4[3], + ((GUID *)marshal_data)->Data4[4], ((GUID *)marshal_data)->Data4[5], ((GUID *)marshal_data)->Data4[6], ((GUID *)marshal_data)->Data4[7]); + } } else {

1 0

Jacek Caban : wininet: Don' t send INTERNET_STATUS_REQUEST_COMPLETE notification from FTP_Connect.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: 08e4846fca02841a917b8fc746ba3ae6bdea6fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e4846fca02841a917b8fc74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 10 16:31:19 2009 +0100 wininet: Don't send INTERNET_STATUS_REQUEST_COMPLETE notification from FTP_Connect. --- dlls/wininet/ftp.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 32607b9..01a8105 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2477,16 +2477,6 @@ lerror: handle = NULL; } - if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) - { - INTERNET_ASYNC_RESULT iar; - - iar.dwResult = bSuccess ? (DWORD_PTR)lpwfs : 0; - iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError(); - SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_REQUEST_COMPLETE, - &iar, sizeof(INTERNET_ASYNC_RESULT)); - } - return handle; }

1 0

Jacek Caban : wininet: Make sure that we have some data buffered before sending INTERNET_STATUS_REQUEST_COMPLETE notification .
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: 19b01f2fca53f90248fc8e0463395d112a44f88e URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b01f2fca53f90248fc8e046… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 10 16:30:45 2009 +0100 wininet: Make sure that we have some data buffered before sending INTERNET_STATUS_REQUEST_COMPLETE notification. --- dlls/wininet/ftp.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 817660a..32607b9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1308,10 +1308,14 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, &iar, sizeof(INTERNET_ASYNC_RESULT)); } - iar.dwResult = bSuccess; - iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError(); - SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, - &iar, sizeof(INTERNET_ASYNC_RESULT)); + if(bSuccess) { + FTP_ReceiveRequestData(lpwh, TRUE); + }else { + iar.dwResult = 0; + iar.dwError = INTERNET_GetLastError(); + SendAsyncCallback(&lpwfs->hdr, lpwfs->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, + &iar, sizeof(INTERNET_ASYNC_RESULT)); + } } lend:

1 0

Jacek Caban : wininet: Added QueryDataAvailable implementation for FTP files.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: f8e6fbffc58c4d7a62034e22ea835c4e60498446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e6fbffc58c4d7a62034e22e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 10 16:29:40 2009 +0100 wininet: Added QueryDataAvailable implementation for FTP files. --- dlls/wininet/ftp.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 62a79df..817660a 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -46,6 +46,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #include <time.h> #include <assert.h> @@ -1146,6 +1149,75 @@ static BOOL FTPFILE_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWOR return res >= 0; } +static void FTP_ReceiveRequestData(WININETFTPFILE *file, BOOL first_notif) +{ + INTERNET_ASYNC_RESULT iar; + BYTE buffer[4096]; + int available; + + TRACE("%p\n", file); + + available = recv(file->nDataSocket, buffer, sizeof(buffer), MSG_PEEK); + + if(available != -1) { + iar.dwResult = (DWORD_PTR)file->hdr.hInternet; + iar.dwError = first_notif ? 0 : available; + }else { + iar.dwResult = 0; + iar.dwError = INTERNET_GetLastError(); + } + + INTERNET_SendCallback(&file->hdr, file->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); +} + +static void FTPFILE_AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) +{ + WININETFTPFILE *file = (WININETFTPFILE*)workRequest->hdr; + + FTP_ReceiveRequestData(file, FALSE); +} + +static DWORD FTPFILE_QueryDataAvailable(WININETHANDLEHEADER *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) +{ + LPWININETFTPFILE file = (LPWININETFTPFILE) hdr; + int retval, unread = 0; + + TRACE("(%p %p %x %lx)\n", file, available, flags, ctx); + +#ifdef FIONREAD + retval = ioctlsocket(file->nDataSocket, FIONREAD, &unread); + if (!retval) + TRACE("%d bytes of queued, but unread data\n", unread); +#else + FIXME("FIONREAD not available\n"); +#endif + + *available = unread; + + if(!unread) { + BYTE byte; + + *available = 0; + + retval = recv(file->nDataSocket, &byte, 1, MSG_PEEK); + if(retval > 0) { + WORKREQUEST workRequest; + + *available = 0; + workRequest.asyncproc = FTPFILE_AsyncQueryDataAvailableProc; + workRequest.hdr = WININET_AddRef( &file->hdr ); + + INTERNET_AsyncCall(&workRequest); + + return ERROR_IO_PENDING; + } + } + + return ERROR_SUCCESS; +} + + static const HANDLEHEADERVtbl FTPFILEVtbl = { FTPFILE_Destroy, NULL, @@ -1155,7 +1227,7 @@ static const HANDLEHEADERVtbl FTPFILEVtbl = { NULL, NULL, FTPFILE_WriteFile, - NULL, + FTPFILE_QueryDataAvailable, NULL };

1 0

Jacek Caban : wininet: Move FtpOpenFile[AW] implementation to avoid forward declaration.
by Alexandre Julliard 11 Feb '09

11 Feb '09

Module: wine Branch: master Commit: a83a817ad08845183dbe13889726fcfed7c996ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83a817ad08845183dbe13889… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 10 16:28:56 2009 +0100 wininet: Move FtpOpenFile[AW] implementation to avoid forward declaration. --- dlls/wininet/ftp.c | 227 ++++++++++++++++++++++++++-------------------------- 1 files changed, 113 insertions(+), 114 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 0289300..83e2b60 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -203,8 +203,6 @@ static BOOL FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszC static BOOL FTP_FtpRenameFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszSrc, LPCWSTR lpszDest); static BOOL FTP_FtpRemoveDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); static BOOL FTP_FtpDeleteFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName); -static HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName, - DWORD fdwAccess, DWORD dwFlags, DWORD_PTR dwContext); static BOOL FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, DWORD_PTR dwContext); @@ -1075,118 +1073,6 @@ lend: return bSuccess; } -/*********************************************************************** - * FtpOpenFileA (WININET.@) - * - * Open a remote file for writing or reading - * - * RETURNS - * HINTERNET handle on success - * NULL on failure - * - */ -HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession, - LPCSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, - DWORD_PTR dwContext) -{ - LPWSTR lpwzFileName; - HINTERNET ret; - - lpwzFileName = lpszFileName?WININET_strdup_AtoW(lpszFileName):NULL; - ret = FtpOpenFileW(hFtpSession, lpwzFileName, fdwAccess, dwFlags, dwContext); - HeapFree(GetProcessHeap(), 0, lpwzFileName); - return ret; -} - - -static void AsyncFtpOpenFileProc(WORKREQUEST *workRequest) -{ - struct WORKREQ_FTPOPENFILEW const *req = &workRequest->u.FtpOpenFileW; - LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr; - - TRACE("%p\n", lpwfs); - - FTP_FtpOpenFileW(lpwfs, req->lpszFilename, - req->dwAccess, req->dwFlags, req->dwContext); - HeapFree(GetProcessHeap(), 0, req->lpszFilename); -} - -/*********************************************************************** - * FtpOpenFileW (WININET.@) - * - * Open a remote file for writing or reading - * - * RETURNS - * HINTERNET handle on success - * NULL on failure - * - */ -HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, - LPCWSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, - DWORD_PTR dwContext) -{ - LPWININETFTPSESSIONW lpwfs; - LPWININETAPPINFOW hIC = NULL; - HINTERNET r = NULL; - - TRACE("(%p,%s,0x%08x,0x%08x,0x%08lx)\n", hFtpSession, - debugstr_w(lpszFileName), fdwAccess, dwFlags, dwContext); - - lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession ); - if (!lpwfs) - { - INTERNET_SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if (WH_HFTPSESSION != lpwfs->hdr.htype) - { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - goto lend; - } - - if ((!lpszFileName) || - ((fdwAccess != GENERIC_READ) && (fdwAccess != GENERIC_WRITE)) || - ((dwFlags & FTP_CONDITION_MASK) > FTP_TRANSFER_TYPE_BINARY)) - { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - goto lend; - } - - if (lpwfs->download_in_progress != NULL) - { - INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); - goto lend; - } - - hIC = lpwfs->lpAppInfo; - if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) - { - WORKREQUEST workRequest; - struct WORKREQ_FTPOPENFILEW *req; - - workRequest.asyncproc = AsyncFtpOpenFileProc; - workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); - req = &workRequest.u.FtpOpenFileW; - req->lpszFilename = WININET_strdupW(lpszFileName); - req->dwAccess = fdwAccess; - req->dwFlags = dwFlags; - req->dwContext = dwContext; - - INTERNET_AsyncCall(&workRequest); - r = NULL; - } - else - { - r = FTP_FtpOpenFileW(lpwfs, lpszFileName, fdwAccess, dwFlags, dwContext); - } - -lend: - WININET_Release( &lpwfs->hdr ); - - return r; -} - /*********************************************************************** * FTPFILE_Destroy(internal) @@ -1365,6 +1251,119 @@ lend: /*********************************************************************** + * FtpOpenFileA (WININET.@) + * + * Open a remote file for writing or reading + * + * RETURNS + * HINTERNET handle on success + * NULL on failure + * + */ +HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession, + LPCSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, + DWORD_PTR dwContext) +{ + LPWSTR lpwzFileName; + HINTERNET ret; + + lpwzFileName = lpszFileName?WININET_strdup_AtoW(lpszFileName):NULL; + ret = FtpOpenFileW(hFtpSession, lpwzFileName, fdwAccess, dwFlags, dwContext); + HeapFree(GetProcessHeap(), 0, lpwzFileName); + return ret; +} + + +static void AsyncFtpOpenFileProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_FTPOPENFILEW const *req = &workRequest->u.FtpOpenFileW; + LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr; + + TRACE("%p\n", lpwfs); + + FTP_FtpOpenFileW(lpwfs, req->lpszFilename, + req->dwAccess, req->dwFlags, req->dwContext); + HeapFree(GetProcessHeap(), 0, req->lpszFilename); +} + +/*********************************************************************** + * FtpOpenFileW (WININET.@) + * + * Open a remote file for writing or reading + * + * RETURNS + * HINTERNET handle on success + * NULL on failure + * + */ +HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, + LPCWSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, + DWORD_PTR dwContext) +{ + LPWININETFTPSESSIONW lpwfs; + LPWININETAPPINFOW hIC = NULL; + HINTERNET r = NULL; + + TRACE("(%p,%s,0x%08x,0x%08x,0x%08lx)\n", hFtpSession, + debugstr_w(lpszFileName), fdwAccess, dwFlags, dwContext); + + lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession ); + if (!lpwfs) + { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (WH_HFTPSESSION != lpwfs->hdr.htype) + { + INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + goto lend; + } + + if ((!lpszFileName) || + ((fdwAccess != GENERIC_READ) && (fdwAccess != GENERIC_WRITE)) || + ((dwFlags & FTP_CONDITION_MASK) > FTP_TRANSFER_TYPE_BINARY)) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + + hIC = lpwfs->lpAppInfo; + if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) + { + WORKREQUEST workRequest; + struct WORKREQ_FTPOPENFILEW *req; + + workRequest.asyncproc = AsyncFtpOpenFileProc; + workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); + req = &workRequest.u.FtpOpenFileW; + req->lpszFilename = WININET_strdupW(lpszFileName); + req->dwAccess = fdwAccess; + req->dwFlags = dwFlags; + req->dwContext = dwContext; + + INTERNET_AsyncCall(&workRequest); + r = NULL; + } + else + { + r = FTP_FtpOpenFileW(lpwfs, lpszFileName, fdwAccess, dwFlags, dwContext); + } + +lend: + WININET_Release( &lpwfs->hdr ); + + return r; +} + + +/*********************************************************************** * FtpGetFileA (WININET.@) * * Retrieve file from the FTP server

1 0