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

Stefan Dösinger : d3d9: Accept nvidia hardware vp garbage.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b245c37ce64489c23e7f4d2cb6b483eaac1bbbaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b245c37ce64489c23e7f4d2cb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 5 15:16:54 2008 +0200 d3d9: Accept nvidia hardware vp garbage. Apparently nvidia cards do not like 3.0 vshader + fixed function fragment processing, so accept their result. This has no implementation implications for Wine because we need the code to support the 3.0+ffp combination to handle 3.0+1.x and 3.0+2.0 shader combinations too --- dlls/d3d9/tests/visual.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a38e2d7..7b35c60 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5625,9 +5625,10 @@ static void pshader_version_varying_test(IDirect3DDevice9 *device) { (color & 0x000000ff) == 0x00000000, "ps_2_0 returned color 0x%08x, expected 0x00203300\n", color); color = getPixelColor(device, 480, 160); - ok((color & 0x00ff0000) >= 0x00190000 && (color & 0x00ff0000) <= 0x00210000 && + ok( color == 0x00ffffff /* Nvidia driver garbage with HW vp */ || ( + (color & 0x00ff0000) >= 0x00190000 && (color & 0x00ff0000) <= 0x00210000 && (color & 0x0000ff00) >= 0x00003200 && (color & 0x0000ff00) <= 0x00003400 && - (color & 0x000000ff) == 0x00000000, + (color & 0x000000ff) == 0x00000000), "fixed function fragment processing returned color 0x%08x, expected 0x00203300\n", color); /* cleanup */

1 0

Stefan Dösinger : d3d9: Fix a few ok conditions in the visual tests.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 5b7ad3ad61cfbe7fd2c879444e85c173891197db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7ad3ad61cfbe7fd2c879444… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 5 16:03:56 2008 +0200 d3d9: Fix a few ok conditions in the visual tests. --- dlls/d3d9/tests/visual.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7b35c60..f7f2e3c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5421,18 +5421,18 @@ static void vshader_version_varying_test(IDirect3DDevice9 *device) { color = getPixelColor(device, 160, 120); ok((color & 0x00ff0000) >= 0x00190000 && (color & 0x00ff0000) <= 0x00210000 && (color & 0x0000ff00) >= 0x00003300 && (color & 0x0000ff00) <= 0x00003500 && - (color & 0x000000ff) >= 0x00000066 && (color & 0x000000ff) <= 0x00210068, + (color & 0x000000ff) >= 0x00000066 && (color & 0x000000ff) <= 0x00000068, "vs_3_0 returned color 0x%08x, expected 0x00203366\n", color); color = getPixelColor(device, 160, 360); ok((color & 0x00ff0000) >= 0x003c0000 && (color & 0x00ff0000) <= 0x004e0000 && (color & 0x0000ff00) >= 0x00000000 && (color & 0x0000ff00) <= 0x00000000 && - (color & 0x000000ff) >= 0x00000066 && (color & 0x000000ff) <= 0x00210068, - "vs_1_1 returned color 0x%08x, expected 0x00808080\n", color); + (color & 0x000000ff) >= 0x00000066 && (color & 0x000000ff) <= 0x00000068, + "vs_1_1 returned color 0x%08x, expected 0x004c0066\n", color); color = getPixelColor(device, 480, 360); ok((color & 0x00ff0000) >= 0x003c0000 && (color & 0x00ff0000) <= 0x004e0000 && (color & 0x0000ff00) >= 0x00000000 && (color & 0x0000ff00) <= 0x00000000 && - (color & 0x000000ff) >= 0x00000066 && (color & 0x000000ff) <= 0x00210068, - "vs_2_0 returned color 0x%08x, expected 0x00000000\n", color); + (color & 0x000000ff) >= 0x00000066 && (color & 0x000000ff) <= 0x00000068, + "vs_2_0 returned color 0x%08x, expected 0x004c0066\n", color); /* cleanup */ hr = IDirect3DDevice9_SetPixelShader(device, NULL); @@ -7321,7 +7321,7 @@ static void test_vshader_float16(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexDeclaration failed hr=%s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader failed hr=%s\n", DXGetErrorString9(hr)); - IDirect3DDevice9_SetVertexShader(device, shader); + hr = IDirect3DDevice9_SetVertexShader(device, shader); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetVertexShader failed hr=%s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_BeginScene(device);

1 0

Stefan Dösinger : d3d9: Run the visual test with hardware vertex processing.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: c65020646c5abcf8252dad6bb2711d88e263664b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65020646c5abcf8252dad6bb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 5 23:21:22 2008 +0200 d3d9: Run the visual test with hardware vertex processing. --- dlls/d3d9/tests/visual.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f7f2e3c..b33f7d5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -162,10 +162,13 @@ static IDirect3DDevice9 *init_d3d9(void) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); if(FAILED(hr)) { present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + if(FAILED(hr)) { + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + } } ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D_CreateDevice returned: %s\n", DXGetErrorString9(hr));

1 0

Stefan Dösinger : d3d9: Read from a slightly different spot in a test.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 3ec49a32f25b8d6334e507401bfb6beb8eb85cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec49a32f25b8d6334e507401… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 5 14:52:34 2008 +0200 d3d9: Read from a slightly different spot in a test. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bc9f88b..a38e2d7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6116,7 +6116,7 @@ void test_vshader_input(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); - color = getPixelColor(device, 480, 360); + color = getPixelColor(device, 480, 350); /* vs_1_1 may fail, accept the clear color * * NOTE: This test fails on the reference rasterizer. In the refrast, the 4 vertices have different colors,

1 0

Stefan Dösinger : d3d9: Remove some test trace lines.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b094c95d859b164806432bdaecb9f52841a7bdeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b094c95d859b164806432bdae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 5 17:07:36 2008 +0200 d3d9: Remove some test trace lines. --- dlls/d3d9/tests/visual.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d4e840a..bc9f88b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8533,14 +8533,12 @@ static void pixelshader_blending_test(IDirect3DDevice9 *device) if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING, D3DRTYPE_TEXTURE, fmt) == D3D_OK) { /* Compare the color of the center quad with our expectation */ color = getPixelColor(device, 320, 240); - trace("[Blending] %s: expected=%x, result=%x\n", test_formats[fmt_index].fmtName, test_formats[fmt_index].resultColorBlending, color); ok(color == test_formats[fmt_index].resultColorBlending, "Offscreen failed for %s: Got color %#08x, expected %#08x.\n", test_formats[fmt_index].fmtName, color, test_formats[fmt_index].resultColorBlending); } else { /* No pixel shader blending is supported so expected garbage.The type of 'garbage' depends on the driver version and OS. * E.g. on G16R16 ati reports (on old r9600 drivers) 0x00ffffff and on modern ones 0x002010ff which is also what Nvidia * reports. On Vista Nvidia seems to report 0x00ffffff on Geforce7 cards. */ color = getPixelColor(device, 320, 240); - trace("[No blending] %s: expected %x or 0x00ffffff, result=%x\n", test_formats[fmt_index].fmtName, test_formats[fmt_index].resultColorNoBlending, color); ok((color == 0x00ffffff) || (color == test_formats[fmt_index].resultColorNoBlending), "Offscreen failed for %s: expected no color blending but received it anyway.\n", test_formats[fmt_index].fmtName); }

1 0

Stefan Dösinger : d3d9: Enforce ColorFill restrictions .
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: cd7d2dc136e078e3e465ed9a223578faa7be5241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7d2dc136e078e3e465ed9a2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 4 19:47:38 2008 +0200 d3d9: Enforce ColorFill restrictions. --- dlls/d3d9/device.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5f9ef00..d69149d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -624,9 +624,28 @@ static HRESULT WINAPI IDirect3DDevice9Impl_StretchRect(LPDIRECT3DDEVICE9EX ifa static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(LPDIRECT3DDEVICE9EX iface, IDirect3DSurface9* pSurface, CONST RECT* pRect, D3DCOLOR color) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *surface = (IDirect3DSurface9Impl *)pSurface; + WINED3DPOOL pool; + WINED3DRESOURCETYPE restype; + DWORD usage; + WINED3DSURFACE_DESC desc; HRESULT hr; TRACE("(%p) Relay\n" , This); + memset(&desc, 0, sizeof(desc)); + desc.Usage = &usage; + desc.Pool = &pool; + desc.Type = &restype; + IWineD3DSurface_GetDesc(surface->wineD3DSurface, &desc); + + /* This method is only allowed with surfaces that are render targets, or offscreen plain surfaces + * in D3DPOOL_DEFAULT + */ + if(!(usage & WINED3DUSAGE_RENDERTARGET) && (pool != D3DPOOL_DEFAULT || restype != D3DRTYPE_SURFACE)) { + WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n"); + return D3DERR_INVALIDCALL; + } + + /* Colorfill can only be used on rendertarget surfaces, or offscreen plain surfaces in D3DPOOL_DEFAULT */ /* Note: D3DRECT is compatible with WINED3DRECT */ EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_ColorFill(This->WineD3DDevice, surface->wineD3DSurface, (CONST WINED3DRECT*)pRect, color);

1 0

Alexandre Julliard : winex11: Set the _NET_WM_STATE atom directly for unmapped windows.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: fd97acbadffdc8af6d2682cb761a92ff2ab2f355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd97acbadffdc8af6d2682cb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 7 11:43:46 2008 +0200 winex11: Set the _NET_WM_STATE atom directly for unmapped windows. --- dlls/winex11.drv/winpos.c | 69 ++++++++++++++++++++++++++++++--------------- 1 files changed, 46 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index c63c868..0ef4601 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -177,10 +177,8 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data }; DWORD i, style, ex_style, new_state = 0; - XEvent xev; if (!data->managed) return; - if (!data->mapped) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); if (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && @@ -202,31 +200,56 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); - xev.xclient.type = ClientMessage; - xev.xclient.window = data->whole_window; - xev.xclient.message_type = x11drv_atom(_NET_WM_STATE); - xev.xclient.serial = 0; - xev.xclient.display = display; - xev.xclient.send_event = True; - xev.xclient.format = 32; - xev.xclient.data.l[3] = 1; - - for (i = 0; i < NB_NET_WM_STATES; i++) + if (!data->mapped) /* set the _NET_WM_STATE atom directly */ { - if (!((data->net_wm_state ^ new_state) & (1 << i))) continue; /* unchanged */ - - TRACE( "setting wm state %u for window %p/%lx to %u prev %u\n", - i, data->hwnd, data->whole_window, - (new_state & (1 << i)) != 0, (data->net_wm_state & (1 << i)) != 0 ); + Atom atoms[NB_NET_WM_STATES+1]; + DWORD count; - xev.xclient.data.l[0] = (new_state & (1 << i)) ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; - xev.xclient.data.l[1] = X11DRV_Atoms[state_atoms[i] - FIRST_XATOM]; - xev.xclient.data.l[2] = ((state_atoms[i] == XATOM__NET_WM_STATE_MAXIMIZED_VERT) ? - x11drv_atom(_NET_WM_STATE_MAXIMIZED_HORZ) : 0); + for (i = count = 0; i < NB_NET_WM_STATES; i++) + { + if (!(new_state & (1 << i))) continue; + TRACE( "setting wm state %u for unmapped window %p/%lx\n", + i, data->hwnd, data->whole_window ); + atoms[count++] = X11DRV_Atoms[state_atoms[i] - FIRST_XATOM]; + if (state_atoms[i] == XATOM__NET_WM_STATE_MAXIMIZED_VERT) + atoms[count++] = x11drv_atom(_NET_WM_STATE_MAXIMIZED_HORZ); + } wine_tsx11_lock(); - XSendEvent( display, root_window, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev ); + XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_STATE), XA_ATOM, + 32, PropModeReplace, (unsigned char *)atoms, count ); wine_tsx11_unlock(); } + else /* ask the window manager to do it for us */ + { + XEvent xev; + + xev.xclient.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom(_NET_WM_STATE); + xev.xclient.serial = 0; + xev.xclient.display = display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + xev.xclient.data.l[3] = 1; + + for (i = 0; i < NB_NET_WM_STATES; i++) + { + if (!((data->net_wm_state ^ new_state) & (1 << i))) continue; /* unchanged */ + + TRACE( "setting wm state %u for window %p/%lx to %u prev %u\n", + i, data->hwnd, data->whole_window, + (new_state & (1 << i)) != 0, (data->net_wm_state & (1 << i)) != 0 ); + + xev.xclient.data.l[0] = (new_state & (1 << i)) ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; + xev.xclient.data.l[1] = X11DRV_Atoms[state_atoms[i] - FIRST_XATOM]; + xev.xclient.data.l[2] = ((state_atoms[i] == XATOM__NET_WM_STATE_MAXIMIZED_VERT) ? + x11drv_atom(_NET_WM_STATE_MAXIMIZED_HORZ) : 0); + wine_tsx11_lock(); + XSendEvent( display, root_window, False, + SubstructureRedirectMask | SubstructureNotifyMask, &xev ); + wine_tsx11_unlock(); + } + } data->net_wm_state = new_state; } @@ -419,6 +442,7 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, { TRACE( "mapping win %p/%lx\n", hwnd, data->whole_window ); wait_for_withdrawn_state( display, data, TRUE ); + update_net_wm_states( display, data ); X11DRV_sync_window_style( display, data ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); @@ -426,7 +450,6 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, wine_tsx11_unlock(); data->mapped = TRUE; data->iconic = (new_style & WS_MINIMIZE) != 0; - update_net_wm_states( display, data ); } else if ((swp_flags & SWP_STATECHANGED) && (!data->iconic != !(new_style & WS_MINIMIZE))) {

1 0

Alexandre Julliard : winex11: Get rid of the SetWindowPos hack to unmap systray windows.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2108734f9767bfdab07a47e552486974223e6999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2108734f9767bfdab07a47e55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 7 11:42:31 2008 +0200 winex11: Get rid of the SetWindowPos hack to unmap systray windows. --- dlls/winex11.drv/window.c | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6e4f468..62f215c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -730,31 +730,21 @@ void X11DRV_make_systray_window( HWND hwnd ) { XEvent ev; unsigned long info[2]; - - /* Put the window offscreen so it isn't mapped. The window _cannot_ be - * mapped if we intend to dock with an XEMBED tray. If the window is - * mapped when we dock, it may become visible as a child of the root - * window after it docks, which isn't the proper behavior. - * - * For more information on this problem, see - * http://standards.freedesktop.org/xembed-spec/latest/ar01s04.html */ - - SetWindowPos( data->hwnd, NULL, virtual_screen_rect.right + 1, virtual_screen_rect.bottom + 1, - 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE ); + + /* the window _cannot_ be mapped if we intend to dock with an XEMBED tray */ + if (data->mapped) FIXME( "trying to dock mapped window %p\n", data->hwnd ); /* set XEMBED protocol data on the window */ info[0] = 0; /* protocol version */ info[1] = 1; /* mapped = true */ - + wine_tsx11_lock(); XChangeProperty( display, data->whole_window, x11drv_atom(_XEMBED_INFO), x11drv_atom(_XEMBED_INFO), 32, PropModeReplace, (unsigned char*)info, 2 ); - wine_tsx11_unlock(); - + /* send the docking request message */ - ZeroMemory( &ev, sizeof(ev) ); ev.xclient.type = ClientMessage; ev.xclient.window = systray_window; ev.xclient.message_type = x11drv_atom( _NET_SYSTEM_TRAY_OPCODE ); @@ -764,11 +754,10 @@ void X11DRV_make_systray_window( HWND hwnd ) ev.xclient.data.l[2] = data->whole_window; ev.xclient.data.l[3] = 0; ev.xclient.data.l[4] = 0; - - wine_tsx11_lock(); XSendEvent( display, systray_window, False, NoEventMask, &ev ); wine_tsx11_unlock(); + data->mapped = TRUE; } else {

1 0

Alexandre Julliard : winex11: Fix handling of property sizes for 64-bit platforms.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 3bfa90eedafc9bd2faf9bc421caa172547e8ddd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bfa90eedafc9bd2faf9bc421… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 7 11:41:54 2008 +0200 winex11: Fix handling of property sizes for 64-bit platforms. --- dlls/winex11.drv/clipboard.c | 6 +++--- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/winpos.c | 2 +- dlls/winex11.drv/x11drv.h | 7 +++++++ dlls/winex11.drv/xdnd.c | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 2996857..2404a71 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1902,8 +1902,8 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(LPCLIPBOARDINFO lpcbinfo) * The TARGETS property should have returned us a list of atoms * corresponding to each selection target format supported. */ - if (atype == XA_ATOM || atype == x11drv_atom(TARGETS)) - X11DRV_CLIPBOARD_InsertSelectionProperties(display, targetList, (cSelectionTargets * aformat / (8 * sizeof(Atom)))); + if (aformat == 32 && (atype == XA_ATOM || atype == x11drv_atom(TARGETS))) + X11DRV_CLIPBOARD_InsertSelectionProperties(display, targetList, cSelectionTargets); /* Free the list of targets */ wine_tsx11_lock(); @@ -2027,7 +2027,7 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Window w, Atom prop, return FALSE; } - count = nitems * (aformat / 8); + count = get_property_size( aformat, nitems ); if (!val) *data = HeapAlloc( GetProcessHeap(), 0, pos * sizeof(int) + count + 1 ); else *data = HeapReAlloc( GetProcessHeap(), 0, val, pos * sizeof(int) + count + 1 ); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 8fd9b20..377e8f4 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -677,7 +677,7 @@ int get_window_wm_state( Display *display, struct x11drv_win_data *data ) sizeof(*state)/sizeof(CARD32), False, x11drv_atom(WM_STATE), &type, &format, &count, &remaining, (unsigned char **)&state )) { - if (type == x11drv_atom(WM_STATE) && format && count >= sizeof(*state)/(format/8)) + if (type == x11drv_atom(WM_STATE) && get_property_size( format, count ) >= sizeof(*state)) ret = state->state; XFree( state ); } diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index e75b594..af623ac 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1394,7 +1394,7 @@ static unsigned char *get_icm_profile( unsigned long *size ) &type, &format, &count, &remaining, &profile ); if (format && count) { - *size = count * (format / 8); + *size = get_property_size( format, count ); if ((ret = HeapAlloc( GetProcessHeap(), 0, *size ))) memcpy( ret, profile, *size ); XFree( profile ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e035041..6e4f468 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -866,7 +866,7 @@ static char *get_process_name(void) */ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data ) { - int i; + long i; Atom protocols[3]; Atom dndVersion = 4; XClassHint *class_hints; diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 25f7413..c63c868 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -618,7 +618,7 @@ static BOOL is_netwm_supported( Display *display, Atom atom ) if (!XGetWindowProperty( display, DefaultRootWindow(display), x11drv_atom(_NET_SUPPORTED), 0, ~0UL, False, XA_ATOM, &type, &format, &count, &remaining, (unsigned char **)&net_supported )) - net_supported_count = count * (format / 8) / sizeof(Atom); + net_supported_count = get_property_size( format, count ) / sizeof(Atom); else net_supported_count = 0; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ab5ff76..b47bdfa 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -520,6 +520,13 @@ static inline struct x11drv_thread_data *x11drv_thread_data(void) static inline Display *thread_display(void) { return x11drv_thread_data()->display; } +static inline size_t get_property_size( int format, unsigned long count ) +{ + /* format==32 means long, which can be 64 bits... */ + if (format == 32) return count * sizeof(long); + return count * (format / 8); +} + extern Visual *visual; extern Window root_window; extern unsigned int screen_width; diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 73674f5..1422578 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -286,7 +286,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, AnyPropertyType, &acttype, &actfmt, &icount, &bytesret, &data); wine_tsx11_unlock(); - entries += X11DRV_XDND_MapFormat(types[i], data, icount * (actfmt / 8)); + entries += X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); wine_tsx11_lock(); XFree(data); wine_tsx11_unlock();

1 0

Apostolos Alexiadis : comdlg32: Greek resources update.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 6d80f099f731d9caf3d2ad5924f9f323bef1fd9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d80f099f731d9caf3d2ad592… Author: Apostolos Alexiadis <djapal(a)gmail.com> Date: Sat Apr 5 13:05:32 2008 +0300 comdlg32: Greek resources update. --- dlls/comdlg32/cdlg_El.rc | 52 +++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/comdlg32/cdlg_El.rc b/dlls/comdlg32/cdlg_El.rc index fa7843f..ef3aba5 100644 --- a/dlls/comdlg32/cdlg_El.rc +++ b/dlls/comdlg32/cdlg_El.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��" +CAPTION "��" FONT 8, "MS Shell Dlg" { LTEXT "File &��:", 1090, 6, 6, 76, 9 @@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Dri&ves:", 1091, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "��", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "��", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "��", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "&�� ", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -60,7 +60,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Dri&ves:", 1091, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "�� ", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "��", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "&�� ", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -78,7 +78,7 @@ FONT 8, "MS Shell Dlg" RADIOBUTTON "�&��", rad2, 16, 60, 60, 12 RADIOBUTTON "&��", rad3, 16, 75, 60, 12 DEFPUSHBUTTON "��", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "��", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&��:", 1090, 60, 80, 30, 9 LTEXT "&��:", 1091, 120, 80, 30, 9 @@ -100,7 +100,7 @@ FONT 8, "MS Shell Dlg" RADIOBUTTON "Specific &Printer", rad2, 16, 50, 80, 12 COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "Orientation", grp2, 6, 85, 100, 50, BS_GROUPBOX RADIOBUTTON "Po&rtrait", rad3, 50, 100, 40, 12 @@ -130,7 +130,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "��",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&��" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "��",grp1,6,72,84,34,WS_GROUP @@ -152,8 +152,8 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "��" FONT 8, "MS Shell Dlg" { - LTEXT "&�� :", 1088, 4, 4, 140, 10 - LTEXT "&Custom ��:", 1089, 4, 106, 140, 10 + LTEXT "&�� :", 1088, 4, 4, 140, 10 + LTEXT "&�� :", 1089, 4, 106, 150, 10 LTEXT "�� | Sol&id", 1090, 150, 151, 48, 10 LTEXT "&��:", 726 /*1094*/,249,126,24,10 EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP @@ -165,7 +165,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Sat:" ,724 /*1092*/,202,140,22,10 EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:" ,725 /*1093*/,202,154,22,10 + LTEXT "&��:" ,725 /*1093*/,202,154,22,10 EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 @@ -175,8 +175,8 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "OK", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Help", pshHelp,100,166, 44, 14 - PUSHBUTTON "&�� Custom ��", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&�� Custom �� >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&�� ", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&�� >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } @@ -186,7 +186,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "��" FONT 8, "MS Shell Dlg" { - LTEXT "Fi&nd What:", -1, 4, 8, 42, 8 + LTEXT "��&�� :", -1, 4, 8, 42, 8 EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "�� &�� ", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "�� &��", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" CONTROL "&��", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 DEFPUSHBUTTON "&�� ", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -205,7 +205,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "��" FONT 8, "MS Shell Dlg" { - LTEXT "Fi&nd What:", -1, 4, 9, 48, 8 + LTEXT "��&�� :", -1, 4, 9, 48, 8 EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "��&�� :", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP @@ -215,7 +215,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&�� ", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&��", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "�� &��", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "��", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } @@ -227,7 +227,7 @@ CAPTION " FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "��", IDCANCEL, 232,164, 48,14, WS_GROUP PUSHBUTTON "&��", pshHelp, 50, 161, 48,14, WS_GROUP GROUPBOX "��", grp4, 8, 4, 272,84, WS_GROUP @@ -267,7 +267,7 @@ CAPTION " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "��",IDCANCEL,232,156,48,14 + PUSHBUTTON "��",IDCANCEL,232,156,48,14 /* PUSHBUTTON "��...", psh5, 284,156,48,14 */ GROUPBOX "��", grp4, 8, 4, 272,84, WS_GROUP @@ -320,13 +320,13 @@ BEGIN LTEXT "&��:", stc18, 159, 192, 23, 8 EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "��", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "��&��...", psh3, 184, 220, 48, 14 END NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "��" +CAPTION "��" FONT 8, "MS Shell Dlg" { LTEXT "Look &in:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY @@ -341,10 +341,10 @@ FONT 8, "MS Shell Dlg" LTEXT "�� &��:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "�� &��-��-��",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + CONTROL "�� &��-��-��",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 - DEFPUSHBUTTON "&��", IDOK,222,110,50,14 - PUSHBUTTON "��", IDCANCEL,222,128,50,14 + DEFPUSHBUTTON "&��", IDOK,222,110,50,14 + PUSHBUTTON "��", IDCANCEL,222,128,50,14 PUSHBUTTON "&��", pshHelp,222,145,50,14 } @@ -403,7 +403,7 @@ supported by your printer.\nPlease enter a value between 1 and %d." PD32_CANT_FIND_PRINTER "�� ." PD32_OUT_OF_MEMORY "Out of memory." PD32_GENERIC_ERROR "�� ." - PD32_DRIVER_UNKNOWN "�� ." + PD32_DRIVER_UNKNOWN "�� ." PD32_NO_DEVICES "Before you can perform printer-related tasks \ such as page setup or printing a document, you need to install a printer. \ Please install one and retry." @@ -467,7 +467,7 @@ STRINGTABLE DISCARDABLE /* Color names */ IDS_COLOR_BLUE "��" IDS_COLOR_FUCHSIA "Fuchsia" IDS_COLOR_AQUA "Aqua" - IDS_COLOR_WHITE "��" + IDS_COLOR_WHITE "��" } STRINGTABLE DISCARDABLE @@ -477,5 +477,5 @@ STRINGTABLE DISCARDABLE IDS_SAVE_IN "�� &��:" IDS_SAVE "��" IDS_SAVE_AS "�� " - IDS_OPEN_FILE "�� " + IDS_OPEN_FILE "�� " }

1 0