September 2010 - Wine-commits

Henri Verbeet : wined3d: Move texture states to wined3d_state.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: 5b3c1a2082f78eba5061c84ad2f41988feb8a26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3c1a2082f78eba5061c84ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 16 11:19:57 2010 +0200 wined3d: Move texture states to wined3d_state. --- dlls/wined3d/arb_program_shader.c | 45 +++++++++++++------------- dlls/wined3d/ati_fragment_shader.c | 8 ++-- dlls/wined3d/device.c | 49 ++++++++++++++++------------ dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/glsl_shader.c | 19 ++++++----- dlls/wined3d/nvidia_texture_shader.c | 57 ++++++++++++++++++--------------- dlls/wined3d/state.c | 54 ++++++++++++++++--------------- dlls/wined3d/stateblock.c | 53 ++++++++++++++++--------------- dlls/wined3d/utils.c | 40 +++++++++++++---------- dlls/wined3d/wined3d_private.h | 6 ++-- 10 files changed, 179 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b3c1a2082f78eba5061c…

1 0

Henri Verbeet : wined3d: Move sampler states to wined3d_state.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: 8fdfc736bffa7e0c07772c37ac5d907c9c8d1d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdfc736bffa7e0c07772c37a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 16 11:19:58 2010 +0200 wined3d: Move sampler states to wined3d_state. --- dlls/wined3d/device.c | 50 +++++++++++++++++---------------------- dlls/wined3d/state.c | 10 ++++--- dlls/wined3d/stateblock.c | 42 ++++++++++++++++++--------------- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +-- 5 files changed, 54 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fdfc736bffa7e0c07772…

1 0

Ričardas Barkauskas : wined3d: Add NVDB support.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: dc1356484c0ad6f35b99e37ce6afd90dc6021662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1356484c0ad6f35b99e37ce… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Thu Sep 16 09:58:26 2010 +0300 wined3d: Add NVDB support. --- dlls/wined3d/directx.c | 16 ++++++++++++++++ dlls/wined3d/state.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 3 +++ dlls/wined3d/wined3d_gl.h | 12 ++++++++++++ include/wine/wined3d.idl | 1 + 5 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1616def..fb7c657 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -105,6 +105,7 @@ static const struct { {"GL_EXT_blend_equation_separate", EXT_BLEND_EQUATION_SEPARATE, 0 }, {"GL_EXT_blend_func_separate", EXT_BLEND_FUNC_SEPARATE, 0 }, {"GL_EXT_blend_minmax", EXT_BLEND_MINMAX, 0 }, + {"GL_EXT_depth_bounds_test", EXT_DEPTH_BOUNDS_TEST, 0 }, {"GL_EXT_draw_buffers2", EXT_DRAW_BUFFERS2, 0 }, {"GL_EXT_fog_coord", EXT_FOG_COORD, 0 }, {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT, 0 }, @@ -3611,6 +3612,21 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, const struct TRACE_(d3d_caps)("[FAILED]\n"); return FALSE; + /* Depth bound test. To query if the card supports it CheckDeviceFormat with the special + * format MAKEFOURCC('N','V','D','B') is used. + * It is enabled by setting D3DRS_ADAPTIVETESS_X render state to MAKEFOURCC('N','V','D','B') and + * then controlled by setting D3DRS_ADAPTIVETESS_Z (zMin) and D3DRS_ADAPTIVETESS_W (zMax) + * to test value. + */ + case WINED3DFMT_NVDB: + if (gl_info->supported[EXT_DEPTH_BOUNDS_TEST]) + { + TRACE_(d3d_caps)("[OK]\n"); + return TRUE; + } + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; + case WINED3DFMT_NVHU: case WINED3DFMT_NVHS: /* These formats seem to be similar to the HILO formats in GL_NV_texture_shader. NVHU diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5d0d1df..34a417d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1880,6 +1880,42 @@ static void state_tessellation(DWORD state, IWineD3DStateBlockImpl *stateblock, stateblock->state.render_states[WINED3DRS_ENABLEADAPTIVETESSELLATION]); } +static void state_nvdb(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +{ + union { + DWORD d; + float f; + } zmin, zmax; + + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (stateblock->state.render_states[WINED3DRS_ADAPTIVETESS_X] == WINED3DFMT_NVDB) + { + zmin.d = stateblock->state.render_states[WINED3DRS_ADAPTIVETESS_Z]; + zmax.d = stateblock->state.render_states[WINED3DRS_ADAPTIVETESS_W]; + + /* If zmin is larger than zmax INVALID_VALUE error is generated. + * In d3d9 test is not performed in this case*/ + if (zmin.f <= zmax.f) + { + glEnable(GL_DEPTH_BOUNDS_TEST_EXT); + checkGLcall("glEnable(GL_DEPTH_BOUNDS_TEST_EXT)"); + GL_EXTCALL(glDepthBoundsEXT(zmin.f, zmax.f)); + checkGLcall("glDepthBoundsEXT(...)"); + } + else { + glDisable(GL_DEPTH_BOUNDS_TEST_EXT); + checkGLcall("glDisable(GL_DEPTH_BOUNDS_TEST_EXT)"); + } + } + else { + glDisable(GL_DEPTH_BOUNDS_TEST_EXT); + checkGLcall("glDisable(GL_DEPTH_BOUNDS_TEST_EXT)"); + } + + state_tessellation(state, stateblock, context); +} + static void state_wrapu(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { if (stateblock->state.render_states[WINED3DRS_WRAPU]) @@ -5078,6 +5114,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ADAPTIVETESS_Y), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_ADAPTIVETESS_Z), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_ADAPTIVETESS_W), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_nvdb }, EXT_DEPTH_BOUNDS_TEST }, { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa }, ARB_MULTISAMPLE }, { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa_w }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9c539bf..9000468 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -129,6 +129,7 @@ static const struct StaticPixelFormatDesc formats[] = {WINED3DFMT_R16G16B16A16_SNORM, 0x0, 0x0, 0x0, 0x0, 8, 0, 0}, /* Vendor-specific formats */ {WINED3DFMT_ATI2N, 0x0, 0x0, 0x0, 0x0, 1, 0, 0}, + {WINED3DFMT_NVDB, 0x0, 0x0, 0x0, 0x0, 0, 0, 0}, {WINED3DFMT_NVHU, 0x0, 0x0, 0x0, 0x0, 2, 0, 0}, {WINED3DFMT_NVHS, 0x0, 0x0, 0x0, 0x0, 2, 0, 0}, }; @@ -167,6 +168,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_R8G8B8X8_UNORM, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_FOURCC | WINED3DFMT_FLAG_BROKEN_PITCH}, + {WINED3DFMT_NVDB, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_NVHU, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_NVHS, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_R32_FLOAT, WINED3DFMT_FLAG_FLOAT}, @@ -1626,6 +1628,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_VERTEXDATA); FMT_TO_STR(WINED3DFMT_R8G8_SNORM_Cx); FMT_TO_STR(WINED3DFMT_ATI2N); + FMT_TO_STR(WINED3DFMT_NVDB); FMT_TO_STR(WINED3DFMT_NVHU); FMT_TO_STR(WINED3DFMT_NVHS); FMT_TO_STR(WINED3DFMT_R32G32B32A32_TYPELESS); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 7003a60..9c2c0c1 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1787,6 +1787,7 @@ typedef enum wined3d_gl_extension EXT_BLEND_FUNC_SEPARATE, EXT_BLEND_MINMAX, EXT_DRAW_BUFFERS2, + EXT_DEPTH_BOUNDS_TEST, EXT_FOG_COORD, EXT_FRAMEBUFFER_BLIT, EXT_FRAMEBUFFER_MULTISAMPLE, @@ -2982,6 +2983,14 @@ typedef void (WINE_GLAPI *PGLFNBLENDEQUATIONSEPARATEEXTPROC)(GLenum modeRGB, GLe typedef void (WINE_GLAPI *PGLFNBLENDFUNCSEPARATEEXTPROC)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +/* GL_EXT_depth_bounds_test */ +#ifndef GL_EXT_depth_bounds_test +#define GL_EXT_depth_bounds_test 1 +#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 +#define GL_DEPTH_BOUNDS_EXT 0x8891 +#endif +typedef void (WINE_GLAPI *PGLFNDEPTHBOUNDSEXTPROC)(GLclampd zmin, GLclampd zmax); + /* GL_EXT_draw_buffers2 */ typedef GLvoid (WINE_GLAPI *PGLFNCOLORMASKINDEXEDEXTPROC)(GLuint buffer_idx, GLboolean r, GLboolean g, GLboolean b, GLboolean a); @@ -4221,6 +4230,9 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma /* GL_EXT_blend_func_separate */ \ USE_GL_FUNC(PGLFNBLENDEQUATIONSEPARATEEXTPROC, \ glBlendEquationSeparateEXT, EXT_BLEND_EQUATION_SEPARATE, NULL) \ + /* GL_EXT_depth_bounds_test */ \ + USE_GL_FUNC(PGLFNDEPTHBOUNDSEXTPROC, \ + glDepthBoundsEXT, EXT_DEPTH_BOUNDS_TEST, NULL) \ /* GL_EXT_draw_buffers2 */ \ USE_GL_FUNC(PGLFNCOLORMASKINDEXEDEXTPROC, \ glColorMaskIndexedEXT, EXT_DRAW_BUFFERS2, NULL) \ diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 53bfeae..c0aac50 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -271,6 +271,7 @@ enum wined3d_format_id WINED3DFMT_R8G8_B8G8 = WINEMAKEFOURCC('R','G','B','G'), WINED3DFMT_ATI2N = WINEMAKEFOURCC('A','T','I','2'), WINED3DFMT_INST = WINEMAKEFOURCC('I','N','S','T'), + WINED3DFMT_NVDB = WINEMAKEFOURCC('N','V','D','B'), WINED3DFMT_NVHU = WINEMAKEFOURCC('N','V','H','U'), WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'),

1 0

Ričardas Barkauskas : d3d9/tests: Test NVDB ( depth bounds test) behavior.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: b099eeb8c41adecb1373a856c32a50225a0c5d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b099eeb8c41adecb1373a856c… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Tue Sep 14 01:04:53 2010 +0300 d3d9/tests: Test NVDB (depth bounds test) behavior. --- dlls/d3d9/tests/visual.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 48aad75..0c39456 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10549,6 +10549,125 @@ static void depth_clamp_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); } +static void depth_bounds_test(IDirect3DDevice9 *device) +{ + const struct tvertex quad1[] = + { + { 0, 0, 0.0f, 1, 0xfff9e814}, + { 640, 0, 0.0f, 1, 0xfff9e814}, + { 0, 480, 1.0f, 1, 0xfff9e814}, + { 640, 480, 1.0f, 1, 0xfff9e814}, + }; + const struct tvertex quad2[] = + { + { 0, 0, 0.6f, 1, 0xff002b7f}, + { 640, 0, 0.6f, 1, 0xff002b7f}, + { 0, 480, 0.6f, 1, 0xff002b7f}, + { 640, 480, 0.6f, 1, 0xff002b7f}, + }; + const struct tvertex quad3[] = + { + { 0, 100, 0.6f, 1, 0xfff91414}, + { 640, 100, 0.6f, 1, 0xfff91414}, + { 0, 160, 0.6f, 1, 0xfff91414}, + { 640, 160, 0.6f, 1, 0xfff91414}, + }; + + union { + DWORD d; + float f; + } tmpvalue; + + IDirect3D9 *d3d = NULL; + IDirect3DSurface9 *offscreen_surface = NULL; + D3DCOLOR color; + HRESULT hr; + + IDirect3DDevice9_GetDirect3D(device, &d3d); + if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_SURFACE, MAKEFOURCC('N','V','D','B')) != D3D_OK) { + skip("No NVDB (depth bounds test) support\n"); + IDirect3D9_Release(d3d); + return; + } + IDirect3D9_Release(d3d); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, + MAKEFOURCC('N','V','D','B'), D3DPOOL_DEFAULT, &offscreen_surface, NULL); + todo_wine ok(hr != D3D_OK, "Able to create surface, hr = %08x\n", hr); + if(offscreen_surface) + { + IDirect3DSurface9_Release(offscreen_surface); + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_ALWAYS); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(*quad1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_X, MAKEFOURCC('N','V','D','B')); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + tmpvalue.f = 0.625; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_Z, tmpvalue.d); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + tmpvalue.f = 0.75; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_W, tmpvalue.d); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + tmpvalue.f = 0.75; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_Z, tmpvalue.d); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(*quad3)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ADAPTIVETESS_X, 0); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + color = getPixelColor(device, 150, 130); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 200); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 300-5); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 300+5); + ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color);/**/ + color = getPixelColor(device, 150, 330); + ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color); + color = getPixelColor(device, 150, 360-5); + ok(color_match(color, 0x00002b7f, 1), "color 0x%08x.\n", color);/**/ + color = getPixelColor(device, 150, 360+5); + ok(color_match(color, 0x00f9e814, 1), "color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); +} + static void depth_buffer_test(IDirect3DDevice9 *device) { static const struct vertex quad1[] = @@ -11246,6 +11365,7 @@ START_TEST(visual) depth_buffer_test(device_ptr); shadow_test(device_ptr); fp_special_test(device_ptr); + depth_bounds_test(device_ptr); cleanup: if(device_ptr) {

1 0

Mikko Rasa : secur32: Add some more schannel tests.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: f2377e8981ab44926461ae9a6cefc52778b38231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2377e8981ab44926461ae9a6… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Tue Sep 7 18:36:36 2010 +0300 secur32: Add some more schannel tests. --- dlls/secur32/tests/Makefile.in | 2 +- dlls/secur32/tests/schannel.c | 285 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2377e8981ab44926461a…

1 0

André Hentschel : shell32: Update German translation.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: fe0df211a1f732cdaffc997ebb7ae5ed97effa49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0df211a1f732cdaffc997eb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 15 23:56:20 2010 +0200 shell32: Update German translation. --- dlls/shell32/shell32_De.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index 018b977..ed33c1c 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -287,6 +287,24 @@ STRINGTABLE IDS_COMMON_PICTURES "Bilder" IDS_COMMON_VIDEO "Videos" IDS_CDBURN_AREA "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning" + IDS_CONTACTS "Kontakte" + IDS_LINKS "Links" + IDS_PHOTO_ALBUMS "Bilder\\Diashows" + IDS_PLAYLISTS "Musik\\Wiedergabelisten" + IDS_PUBLIC_DOWNLOADS "Downloads" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Bibliotheken" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Ringtones" + IDS_SAMPLE_MUSIC "Musik\\Beispielmusik" + IDS_SAMPLE_PICTURES "Bilder\\Beispielbilder" + IDS_SAMPLE_PLAYLISTS "Musik\\Beispielwiedergabelisten" + IDS_SAMPLE_VIDEOS "Videos\\Beispielvideos" + IDS_SAVED_GAMES "Gespeicherte Spiele" + IDS_SAVED_SEARCHES "Suchvorgänge" + IDS_USER_PROFILES "Benutzer" + IDS_COMMON_OEM_LINKS "OEM Links" + IDS_DOCUMENTS "Dokumente" + IDS_DOWNLOADS "Downloads" IDS_NEWFOLDER "Neuer Ordner"

1 0

Vladimir Panteleev : user32: Fix VK_RETURN handling in IsDialogMessage for dialogs without an IDOK.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 592d994f0077c19dc9fa2db988f70d5d4c2a9cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=592d994f0077c19dc9fa2db98… Author: Vladimir Panteleev <vladimir(a)thecybershadow.net> Date: Tue Sep 14 16:46:55 2010 +0300 user32: Fix VK_RETURN handling in IsDialogMessage for dialogs without an IDOK. --- dlls/user32/dialog.c | 6 ++---- dlls/user32/tests/dialog.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index aac8a4d..052fbff 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1221,10 +1221,8 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) else if (DC_HASDEFID == HIWORD(dw = SendMessageW (hwndDlg, DM_GETDEFID, 0, 0))) { HWND hwndDef = GetDlgItem(hwndDlg, LOWORD(dw)); - if (!hwndDef || !IsWindowEnabled(hwndDef)) - return TRUE; - SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), - (LPARAM)GetDlgItem(hwndDlg, LOWORD(dw))); + if (hwndDef ? IsWindowEnabled(hwndDef) : LOWORD(dw)==IDOK) + SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), (LPARAM)hwndDef); } else { diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b7727da..736c99d 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1000,6 +1000,28 @@ static INT_PTR CALLBACK TestDefButtonDlgProc (HWND hDlg, UINT uiMsg, return FALSE; } +static INT_PTR CALLBACK TestReturnKeyDlgProc (HWND hDlg, UINT uiMsg, + WPARAM wParam, LPARAM lParam) +{ + static int received_idok = 0; + switch (uiMsg) + { + case WM_INITDIALOG: + { + MSG msg = {hDlg, WM_KEYDOWN, VK_RETURN, 0x011c0001}; + IsDialogMessage(hDlg, &msg); + } + ok(received_idok, "WM_COMMAND not received\n"); + EndDialog(hDlg, 0); + return TRUE; + case WM_COMMAND: + ok(wParam==IDOK, "Expected IDOK\n"); + received_idok = 1; + return TRUE; + } + return FALSE; +} + static void test_DialogBoxParamA(void) { INT_PTR ret; @@ -1044,6 +1066,8 @@ static void test_DialogBoxParamA(void) ret = DialogBoxParamA(GetModuleHandle(NULL), "TEST_EMPTY_DIALOG", 0, TestDefButtonDlgProc, 0); ok(ret == IDOK, "Expected IDOK\n"); + + DialogBoxParamA(GetModuleHandle(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); } static void test_DisabledDialogTest(void)

1 0

Detlef Riekenberg : inetcpl: Add initial applet.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: e9b8d71dfb4b94273af44c7ae3b8225df19e62a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9b8d71dfb4b94273af44c7ae… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 10 00:02:44 2010 +0200 inetcpl: Add initial applet. --- configure | 1 + configure.ac | 1 + dlls/inetcpl.cpl/Makefile.in | 14 +++++ dlls/inetcpl.cpl/cpl_En.rc | 30 +++++++++++ dlls/inetcpl.cpl/inetcpl.c | 98 +++++++++++++++++++++++++++++++++++++ dlls/inetcpl.cpl/inetcpl.cpl.spec | 25 +++++++++ dlls/inetcpl.cpl/inetcpl.h | 27 ++++++++++ dlls/inetcpl.cpl/inetcpl.rc | 34 +++++++++++++ 8 files changed, 230 insertions(+), 0 deletions(-) diff --git a/configure b/configure index c47168d..6ba2a56 100755 --- a/configure +++ b/configure @@ -14660,6 +14660,7 @@ wine_fn_config_dll imm32 enable_imm32 imm32 wine_fn_config_test dlls/imm32/tests imm32_test wine_fn_config_dll inetcomm enable_inetcomm inetcomm wine_fn_config_test dlls/inetcomm/tests inetcomm_test +wine_fn_config_dll inetcpl.cpl enable_inetcpl_cpl wine_fn_config_dll inetmib1 enable_inetmib1 wine_fn_config_test dlls/inetmib1/tests inetmib1_test wine_fn_config_dll infosoft enable_infosoft diff --git a/configure.ac b/configure.ac index 0fe8ebe..a7f6b2b 100644 --- a/configure.ac +++ b/configure.ac @@ -2439,6 +2439,7 @@ WINE_CONFIG_DLL(imm32,,[imm32]) WINE_CONFIG_TEST(dlls/imm32/tests) WINE_CONFIG_DLL(inetcomm,,[inetcomm]) WINE_CONFIG_TEST(dlls/inetcomm/tests) +WINE_CONFIG_DLL(inetcpl.cpl) WINE_CONFIG_DLL(inetmib1) WINE_CONFIG_TEST(dlls/inetmib1/tests) WINE_CONFIG_DLL(infosoft) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in new file mode 100644 index 0000000..653fa0f --- /dev/null +++ b/dlls/inetcpl.cpl/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = inetcpl.cpl + +C_SRCS = \ + inetcpl.c + +RC_SRCS = \ + cpl_En.rc \ + inetcpl.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/inetcpl.cpl/cpl_En.rc b/dlls/inetcpl.cpl/cpl_En.rc new file mode 100644 index 0000000..9b2161f --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_En.rc @@ -0,0 +1,30 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Internet Settings" + IDS_CPL_INFO "Configure Wine Internet Browser and related settings" +END diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c new file mode 100644 index 0000000..1f1ca66 --- /dev/null +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -0,0 +1,98 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define NONAMELESSUNION + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <cpl.h> + +#include "wine/debug.h" + +#include "inetcpl.h" + + +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); + +/********************************************************************* + * DllMain (inetcpl.@) + */ +BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %d, %p)\n", hdll, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hdll); + } + return TRUE; +} + +/********************************************************************* + * CPlApplet (inetcpl.@) + * + * Control Panel entry point + * + * PARAMS + * hWnd [I] Handle for the Control Panel Window + * command [I] CPL_* Command + * lParam1 [I] first extra Parameter + * lParam2 [I] second extra Parameter + * + * RETURNS + * Depends on the command + * + */ +LONG CALLBACK CPlApplet(HWND hWnd, UINT command, LPARAM lParam1, LPARAM lParam2) +{ + TRACE("(%p, %u, 0x%lx, 0x%lx)\n", hWnd, command, lParam1, lParam2); + + switch (command) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return 1; + + case CPL_INQUIRE: + { + CPLINFO *appletInfo = (CPLINFO *) lParam2; + + appletInfo->idIcon = 0; + appletInfo->idName = IDS_CPL_NAME; + appletInfo->idInfo = IDS_CPL_INFO; + appletInfo->lData = 0; + return TRUE; + } + + case CPL_DBLCLK: + FIXME("not implemented yet\n"); + break; + } + + return FALSE; +} diff --git a/dlls/inetcpl.cpl/inetcpl.cpl.spec b/dlls/inetcpl.cpl/inetcpl.cpl.spec new file mode 100644 index 0000000..4394145 --- /dev/null +++ b/dlls/inetcpl.cpl/inetcpl.cpl.spec @@ -0,0 +1,25 @@ +@ stub ClearMyTracksByProcessW +@ stub AddInternetPropertySheets +@ stub AddInternetPropertySheetsEx +@ stdcall CPlApplet(long long long long) +@ stub DisplayPopupWindowManagementDialog +@ stub DllInstall +@ stub GetAddSitesDisplayUrl +@ stub ImportExportPFX +@ stub LaunchAddSitesDialog +@ stub LaunchConnectionDialog +@ stub LaunchInternetControlPanel +@ stub LaunchPerSitePrivacyActionDialog +@ stub LaunchPopupWindowManagementDialog +@ stub LaunchPrivacyDialog +@ stub LaunchSecurityDialog +@ stub LaunchSecurityDialogEx +@ stub LaunchSiteCertDialog +@ stub OpenFontsDialog +@ stub OpenFontsDialogEx +@ stub OpenLanguageDialog +@ stub ResetIEtoDefaults +@ stub ShowDeleteBrowsingHistoryDialog +@ stub ShowFeedOptionsDialog +@ stub ShowLanguageDialog +@ stub SiteCert_RunFromCmdLine diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h new file mode 100644 index 0000000..85b362e --- /dev/null +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -0,0 +1,27 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <windef.h> +#include <winuser.h> + +/* strings */ +#define IDS_CPL_NAME 1 +#define IDS_CPL_INFO 2 diff --git a/dlls/inetcpl.cpl/inetcpl.rc b/dlls/inetcpl.cpl/inetcpl.rc new file mode 100644 index 0000000..8dea319 --- /dev/null +++ b/dlls/inetcpl.cpl/inetcpl.rc @@ -0,0 +1,34 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +#define WINE_FILENAME_STR "inetcpl.cpl" +#define WINE_FILEDESCRIPTION_STR "Internet Control Panel" + +/* Same Version as IE 8 on WinXP */ +#define WINE_FILEVERSION 8,0,6001,18939 +#define WINE_FILEVERSION_STR "8.00.6001.18939" + +#define WINE_PRODUCTVERSION 8,0,6001,18939 +#define WINE_PRODUCTVERSION_STR "8.00.6001.18939" + +#include "wine/wine_common_ver.rc"

1 0

Detlef Riekenberg : inetcpl: Add an applet icon.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: da488eacb3180c39f3fb1ab53a181b3fda130391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da488eacb3180c39f3fb1ab53… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 10 13:23:10 2010 +0200 inetcpl: Add an applet icon. --- dlls/inetcpl.cpl/Makefile.in | 3 + dlls/inetcpl.cpl/inetcpl.c | 2 +- dlls/inetcpl.cpl/inetcpl.h | 3 + dlls/inetcpl.cpl/inetcpl.ico | Bin 0 -> 25214 bytes dlls/inetcpl.cpl/inetcpl.rc | 3 + dlls/inetcpl.cpl/inetcpl.svg | 265 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 275 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da488eacb3180c39f3fb1…

1 0

Detlef Riekenberg : inetcpl: Add German translation.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: c9d2fb352b177b86cb542f524fc70116cec2e38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d2fb352b177b86cb542f524… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 10 13:32:43 2010 +0200 inetcpl: Add German translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_De.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 294cdbf..93bf2ac 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ inetcpl.c RC_SRCS = \ + cpl_De.rc \ cpl_En.rc \ inetcpl.rc diff --git a/dlls/inetcpl.cpl/cpl_De.rc b/dlls/inetcpl.cpl/cpl_De.rc new file mode 100644 index 0000000..397f0cd --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_De.rc @@ -0,0 +1,32 @@ +/* + * German resources for the Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +#pragma code_page(65001) + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Internet Einstellungen" + IDS_CPL_INFO "Wine Internet Browser und zugehörige Einstellungen anpassen." +END

1 0