wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Henri Verbeet : wined3d: Only invert viewport y for onscreen destinations in surface_depth_blt().
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 46215689221aa820b94d2ce288613d6e0b373f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46215689221aa820b94d2ce28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 00:40:31 2011 +0200 wined3d: Only invert viewport y for onscreen destinations in surface_depth_blt(). This fixes a regression introduced by 032f8702edc769ba42e23034ef9dcc3854efd928. --- dlls/wined3d/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 132a98a..2bf1436 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5579,7 +5579,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa /* GL locking is done by the caller */ static void surface_depth_blt(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, - GLuint texture, GLsizei w, GLsizei h, GLenum target) + GLuint texture, GLint x, GLint y, GLsizei w, GLsizei h, GLenum target) { struct wined3d_device *device = surface->resource.device; GLint compare_mode = GL_NONE; @@ -5598,7 +5598,7 @@ static void surface_depth_blt(struct wined3d_surface *surface, const struct wine glDepthFunc(GL_ALWAYS); glDepthMask(GL_TRUE); glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); - glViewport(0, surface->pow2Height - h, w, h); + glViewport(x, y, w, h); SetRect(&rect, 0, h, w, 0); surface_get_blt_info(target, &rect, surface->pow2Width, surface->pow2Height, &info); @@ -5773,7 +5773,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, surface, FALSE); /* Do the actual blit */ - surface_depth_blt(surface, gl_info, device->depth_blt_texture, w, h, bind_target); + surface_depth_blt(surface, gl_info, device->depth_blt_texture, 0, 0, w, h, bind_target); checkGLcall("depth_blt"); if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id); @@ -5791,7 +5791,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co context_bind_fbo(context, GL_FRAMEBUFFER, NULL); surface_depth_blt(surface, gl_info, surface->texture_name, - w, h, surface->texture_target); + 0, surface->pow2Height - h, w, h, surface->texture_target); checkGLcall("depth_blt"); if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id);

1 0

Henri Verbeet : wined3d: Require ARB_shader_texture_lod for SM3.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: c51db63ba4eda7e2cb565ebadf5ede8fe6e1a9dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51db63ba4eda7e2cb565ebad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 00:40:30 2011 +0200 wined3d: Require ARB_shader_texture_lod for SM3. --- dlls/wined3d/glsl_shader.c | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1cf7f22..b2e6c00 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4927,25 +4927,9 @@ static BOOL shader_glsl_dirty_const(void) static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) { - /* NVIDIA GeForce 6 / 7 or ATI R4xx / R5xx cards with GLSL support - * support SM3, but older NVIDIA / ATI models with GLSL support only - * support SM2. In case of NVIDIA we can detect SM3 support based on the - * version of NV_vertex_program / NV_fragment_program. For other cards we - * try to detect SM3 based on the maximum number of native fragment - * program instructions. PS2.0 requires at least 96 instructions, 2.0a/b - * goes up to 512. Assume that if the number of instructions is 512 or - * less we have to do with SM2 hardware. NOTE: SM3 requires 512 or more - * instructions but ATI and NVIDIA offer more than that (1024 vs 4096) on - * their most basic SM3 hardware. - * - * ARB_shader_texture_lod is a requirement for SM3 (texldd). Ideally we'd - * make this a hard requirement, but the extension is still somewhat new, - * and relatively few SM3 shaders actually depend on it. For the moment - * just use it to enable SM3 (20110423). */ - if ((gl_info->supported[NV_VERTEX_PROGRAM3] && gl_info->supported[NV_FRAGMENT_PROGRAM2]) - || gl_info->limits.arb_ps_instructions > 512 - || gl_info->supported[ARB_SHADER_TEXTURE_LOD] - || gl_info->supported[EXT_GPU_SHADER4]) + /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 + * texldd and texldl instructions. */ + if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] || gl_info->supported[EXT_GPU_SHADER4]) { caps->VertexShaderVersion = WINED3DVS_VERSION(3,0); caps->PixelShaderVersion = WINED3DPS_VERSION(3,0);

1 0

Henri Verbeet : d3d9/tests: Add some tests for IDirect3DDevice9:: UpdateSurface().
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 11bf170ce0795869f238473614a0b13206073d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bf170ce0795869f23847361… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 00:40:29 2011 +0200 d3d9/tests: Add some tests for IDirect3DDevice9::UpdateSurface(). --- dlls/d3d9/tests/visual.c | 188 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 188 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3773ad7..98a658b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12128,6 +12128,193 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(ps); } +static void update_surface_test(IDirect3DDevice9 *device) +{ + static const BYTE blocks[][8] = + { + {0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00}, /* White */ + {0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00}, /* Red */ + {0xe0, 0xff, 0xe0, 0xff, 0x00, 0x00, 0x00, 0x00}, /* Yellow */ + {0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00}, /* Green */ + {0xff, 0x07, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00}, /* Cyan */ + {0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00}, /* Blue */ + {0x1f, 0xf8, 0x1f, 0xf8, 0x00, 0x00, 0x00, 0x00}, /* Magenta */ + }; + static const struct + { + UINT x, y; + D3DCOLOR color; + } + expected_colors[] = + { + { 18, 240, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0xff)}, + { 57, 240, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff)}, + {109, 240, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0xff)}, + {184, 240, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00)}, + {290, 240, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00)}, + {440, 240, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00)}, + {584, 240, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)}, + }; + static const struct + { + float x, y, z, w; + float u, v; + } + tri[] = + { + { 0.0f, 480.0f, 0.0f, 1.0f, 0.0f, 0.0f}, + { 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f}, + {640.0f, 240.0f, 0.0f, 10.0f, 100.0f, 0.5f}, + }; + static const RECT rect_2x2 = {0, 0, 2, 2}; + static const struct + { + UINT src_level; + UINT dst_level; + const RECT *r; + HRESULT hr; + } + block_size_tests[] = + { + {1, 0, NULL, D3D_OK}, + {0, 1, NULL, D3DERR_INVALIDCALL}, + {5, 4, NULL, D3DERR_INVALIDCALL}, + {4, 5, NULL, D3DERR_INVALIDCALL}, + {4, 5, &rect_2x2, D3DERR_INVALIDCALL}, + {5, 5, &rect_2x2, D3D_OK}, + }; + + IDirect3DSurface9 *src_surface, *dst_surface; + IDirect3DTexture9 *src_tex, *dst_tex; + IDirect3D9 *d3d; + UINT count, i; + HRESULT hr; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); + + hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT1); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("DXT1 not supported, skipping test.\n"); + return; + } + + IDirect3D9_Release(d3d); + + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, 0, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &src_tex, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, 0, D3DFMT_DXT1, D3DPOOL_DEFAULT, &dst_tex, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + count = IDirect3DTexture9_GetLevelCount(src_tex); + ok(count == 7, "Got level count %u, expected 7.\n", count); + + for (i = 0; i < count; ++i) + { + UINT row_count, block_count, x, y; + D3DSURFACE_DESC desc; + BYTE *row, *block; + D3DLOCKED_RECT r; + + hr = IDirect3DTexture9_GetLevelDesc(src_tex, i, &desc); + ok(SUCCEEDED(hr), "Failed to get level desc, hr %#x.\n", hr); + + hr = IDirect3DTexture9_LockRect(src_tex, i, &r, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); + + row_count = ((desc.Height + 3) & ~3) / 4; + block_count = ((desc.Width + 3) & ~3) / 4; + row = r.pBits; + + for (y = 0; y < row_count; ++y) + { + block = row; + for (x = 0; x < block_count; ++x) + { + memcpy(block, blocks[i], sizeof(blocks[i])); + block += sizeof(blocks[i]); + } + row += r.Pitch; + } + + hr = IDirect3DTexture9_UnlockRect(src_tex, i); + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); + } + + for (i = 0; i < sizeof(block_size_tests) / sizeof(*block_size_tests); ++i) + { + hr = IDirect3DTexture9_GetSurfaceLevel(src_tex, block_size_tests[i].src_level, &src_surface); + ok(SUCCEEDED(hr), "Failed to get texture surface, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(dst_tex, block_size_tests[i].dst_level, &dst_surface); + ok(SUCCEEDED(hr), "Failed to get texture surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_UpdateSurface(device, src_surface, block_size_tests[i].r, dst_surface, NULL); + ok(hr == block_size_tests[i].hr, "Update surface returned %#x for test %u, expected %#x.\n", + hr, i, block_size_tests[i].hr); + + IDirect3DSurface9_Release(dst_surface); + IDirect3DSurface9_Release(src_surface); + } + + for (i = 0; i < count; ++i) + { + hr = IDirect3DTexture9_GetSurfaceLevel(src_tex, i, &src_surface); + ok(SUCCEEDED(hr), "Failed to get texture surface, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(dst_tex, i, &dst_surface); + ok(SUCCEEDED(hr), "Failed to get texture surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_UpdateSurface(device, src_surface, NULL, dst_surface, NULL); + ok(SUCCEEDED(hr), "Failed to update surface at level %u, hr %#x.\n", i, hr); + + IDirect3DSurface9_Release(dst_surface); + IDirect3DSurface9_Release(src_surface); + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "SetSamplerState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)dst_tex); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 1, tri, sizeof(*tri)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + { + D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + ok(color_match(color, expected_colors[i].color, 0), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); + IDirect3DTexture9_Release(dst_tex); + IDirect3DTexture9_Release(src_tex); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -12301,6 +12488,7 @@ START_TEST(visual) depth_bounds_test(device_ptr); srgbwrite_format_test(device_ptr); clip_planes_test(device_ptr); + update_surface_test(device_ptr); cleanup: if(device_ptr) {

1 0

Henri Verbeet : wined3d: Fix source rectangle validation in wined3d_device_update_surface().
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 6f710d18fc1c3e6b077f8db6c64ed2bc84807ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f710d18fc1c3e6b077f8db6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 00:40:28 2011 +0200 wined3d: Fix source rectangle validation in wined3d_device_update_surface(). --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ba5db37..ed52831 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4786,8 +4786,8 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, r.bottom = src_surface->resource.height; src_rect = &r; } - else if (src_rect->left < 0 || src_rect->left >= r.right - || src_rect->top < 0 || src_rect->top >= r.bottom) + else if (src_rect->left < 0 || src_rect->left >= src_rect->right + || src_rect->top < 0 || src_rect->top >= src_rect->bottom) { WARN("Invalid source rectangle.\n"); return WINED3DERR_INVALIDCALL;

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: e3991b9706251b507232127822c9ee2c82082830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3991b9706251b50723212782… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jun 15 21:17:29 2011 +0200 po: Update French translation. --- po/fr.po | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index df9850d..caa316b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-06-14 19:58+0100\n" +"PO-Revision-Date: 2011-06-15 21:15+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -189,7 +189,7 @@ msgstr "Disques locaux" #: comdlg32.rc:43 msgid "File not found" -msgstr "Fichier non trouvé" +msgstr "Fichier introuvable" #: comdlg32.rc:44 msgid "Please verify that the correct file name was given" @@ -6404,9 +6404,8 @@ msgid "E&xit" msgstr "&Quitter" #: shell32.rc:115 -#, fuzzy msgid "&About Control Panel" -msgstr "À &propos du panneau de configuration..." +msgstr "À &propos du panneau de configuration" #: shell32.rc:123 shell32.rc:127 winefile.rc:113 msgid "Size"

1 0

Frédéric Delanoy : shell32: Update French translation.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 2118b66193543c9c0c86ff0410ad0ef06451f624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2118b66193543c9c0c86ff041… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jun 15 21:17:28 2011 +0200 shell32: Update French translation. --- dlls/shell32/shell32_Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index bb23c6e..3eeb6bb 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -4,7 +4,7 @@ * * Copyright 1998 Juergen Schmied * Copyright 2006-2009 Jonathan Ernst - * Copyright 2010 Frédéric Delanoy + * Copyright 2010-2011 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -79,7 +79,7 @@ CAPTION "À propos de %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 70, 12, WS_TABSTOP - PUSHBUTTON "&Licence de Wine...", IDC_ABOUT_LICENSE, 153, 113, 70, 12, WS_TABSTOP + PUSHBUTTON "&Licence de Wine", IDC_ABOUT_LICENSE, 153, 113, 70, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 137, 10

1 0

Frédéric Delanoy : cmdlgtst: Update French translation.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 6b45fd8aa37bd4ac467b837fd24e82af06df84e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b45fd8aa37bd4ac467b837fd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jun 15 21:17:27 2011 +0200 cmdlgtst: Update French translation. --- programs/cmdlgtst/Fr.rc | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/cmdlgtst/Fr.rc b/programs/cmdlgtst/Fr.rc index b6da8eb..6d3e8a8 100644 --- a/programs/cmdlgtst/Fr.rc +++ b/programs/cmdlgtst/Fr.rc @@ -37,30 +37,30 @@ CmdlgtstMenu MENU POPUP "&Commdlg" { - MENUITEM "&Ouvrir", CM_U_OPEN - MENUITEM "&Enregistrer", CM_U_SAVE + MENUITEM "&Ouvrir...", CM_U_OPEN + MENUITEM "&Enregistrer sous...", CM_U_SAVE MENUITEM SEPARATOR - MENUITEM "&Couleur", CM_U_COLOR - MENUITEM "&Police", CM_U_FONT + MENUITEM "&Couleur...", CM_U_COLOR + MENUITEM "&Police...", CM_U_FONT MENUITEM SEPARATOR - MENUITEM "&Rechercher", CM_U_FIND - MENUITEM "Remp&lacer", CM_U_REPLACE + MENUITEM "&Rechercher...", CM_U_FIND + MENUITEM "Remp&lacer...", CM_U_REPLACE MENUITEM SEPARATOR - MENUITEM "&Imprimer", CM_U_PRINT - MENUITEM "Mise en pa&ge", CM_U_PAGESETUP + MENUITEM "&Imprimer...", CM_U_PRINT + MENUITEM "Mise en pa&ge...", CM_U_PAGESETUP } POPUP "&Indicateurs" { - MENUITEM "&Fichier", CM_F_FILE + MENUITEM "&Fichier...", CM_F_FILE MENUITEM SEPARATOR - MENUITEM "&Couleur", CM_F_COLOR - MENUITEM "&Police", CM_F_FONT + MENUITEM "&Couleur...", CM_F_COLOR + MENUITEM "&Police...", CM_F_FONT MENUITEM SEPARATOR - MENUITEM "Rechercher/&Remplacer", CM_F_FINDREPLACE + MENUITEM "Rechercher/&Remplacer...", CM_F_FINDREPLACE MENUITEM SEPARATOR - MENUITEM "&Imprimer", CM_F_PRINT - MENUITEM "Mise en pa&ge", CM_F_PAGESETUP + MENUITEM "&Imprimer...", CM_F_PRINT + MENUITEM "Mise en pa&ge...", CM_F_PAGESETUP } POPUP "&Aide"

1 0

André Hentschel : imm32: Use the same code for ImmIsUIMessageW as in the ascii function.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: d08fa61a568c618278132cd6abb6a093a5c7799a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08fa61a568c618278132cd6a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 15 20:55:06 2011 +0200 imm32: Use the same code for ImmIsUIMessageW as in the ascii function. --- dlls/imm32/imm.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index cc68305..00a7c6a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1923,7 +1923,15 @@ BOOL WINAPI ImmIsUIMessageW( (msg == WM_MSIME_RECONVERT) || (msg == WM_MSIME_QUERYPOSITION) || (msg == WM_MSIME_DOCUMENTFEED)) + { + if (!IMM_GetThreadData()->hwndDefault) + ImmGetDefaultIMEWnd(NULL); + + if (hWndIME == NULL) + PostMessageW(IMM_GetThreadData()->hwndDefault, msg, wParam, lParam); + rc = TRUE; + } return rc; }

1 0

André Hentschel : kernel32: Set dwProcessorType on ARM .
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 4f1aae76af0254cf5965722431cee4ff2a61afdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1aae76af0254cf596572243… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 15 20:53:35 2011 +0200 kernel32: Set dwProcessorType on ARM. --- dlls/kernel32/cpu.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 560c060..996d776 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -157,6 +157,13 @@ VOID WINAPI GetSystemInfo( case PROCESSOR_ARCHITECTURE_AMD64: si->dwProcessorType = PROCESSOR_AMD_X8664; break; + case PROCESSOR_ARCHITECTURE_ARM: + switch (sci.Level) + { + case 4: si->dwProcessorType = PROCESSOR_ARM_7TDMI; break; + default: si->dwProcessorType = PROCESSOR_ARM920; + } + break; default: FIXME("Unknown processor architecture %x\n", sci.Architecture); si->dwProcessorType = 0;

1 0

André Hentschel : ntdll: Parse ARM CPU level.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 3eb91fbc3c3c501f2a3ff094d4da7fa75c1294fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb91fbc3c3c501f2a3ff094d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 15 20:52:33 2011 +0200 ntdll: Parse ARM CPU level. --- dlls/ntdll/nt.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 316e9f6..f9302c1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -990,11 +990,12 @@ void fill_cpu_info(void) continue; } - /* 2.1 method */ - if (!strcasecmp(line, "cpu family")) + /* 2.1 and ARM method */ + if (!strcasecmp(line, "cpu family") || !strcasecmp(line, "CPU architecture")) { if (isdigit(value[0])) { + value[1] = '\0'; /* Make sure we only get one character */ cached_sci.Level = atoi(value); } continue;

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011