April 2008 - wine-commits

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: 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: 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: 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

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

07 Apr '08

Module: wine Branch: master Commit: d7247a8a0570beb7a9a5fc4095f77ce9dfd35bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7247a8a0570beb7a9a5fc409… Author: Apostolos Alexiadis <djapal(a)gmail.com> Date: Sat Apr 5 13:04:19 2008 +0300 comctl32: Greek resources update. --- dlls/comctl32/comctl_El.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comctl_El.rc b/dlls/comctl32/comctl_El.rc index 2e15156..a505620 100644 --- a/dlls/comctl32/comctl_El.rc +++ b/dlls/comctl32/comctl_El.rc @@ -24,7 +24,7 @@ CAPTION " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "��", IDCANCEL,58,122,50,14 + PUSHBUTTON "��", IDCANCEL,58,122,50,14 PUSHBUTTON "&��", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "��", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 @@ -36,10 +36,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "��" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "< &��", IDC_BACK_BUTTON,66,138,55,14 + PUSHBUTTON "< &��", IDC_BACK_BUTTON,63,138,55,14 DEFPUSHBUTTON "&�� >", IDC_NEXT_BUTTON,121,138,55,14 DEFPUSHBUTTON "��", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "��", IDCANCEL,178,138,50,14 + PUSHBUTTON "��", IDCANCEL,178,138,50,14 PUSHBUTTON "��", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 @@ -53,7 +53,7 @@ CAPTION " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&��", IDCANCEL,308,6,44,14 - PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "�&��", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "&��", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "�� &��", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "�� &��", IDC_MOVEDN_BTN,308,91,44,14

1 0

Apostolos Alexiadis : oleaut32: Added Greek translation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 825e5ffb3f72407d1e91e363cc33d52f2bd25511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825e5ffb3f72407d1e91e363c… Author: Apostolos Alexiadis <djapal(a)gmail.com> Date: Sat Apr 5 13:06:34 2008 +0300 oleaut32: Added Greek translation. --- dlls/oleaut32/oleaut32.rc | 1 + dlls/oleaut32/oleaut32_El.rc | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc index 52e5d8d..44a3641 100644 --- a/dlls/oleaut32/oleaut32.rc +++ b/dlls/oleaut32/oleaut32.rc @@ -27,6 +27,7 @@ #include "oleaut32_Bg.rc" #include "oleaut32_De.rc" #include "oleaut32_Dk.rc" +#include "oleaut32_El.rc" #include "oleaut32_En.rc" #include "oleaut32_Eo.rc" #include "oleaut32_Es.rc" diff --git a/dlls/oleaut32/oleaut32_El.rc b/dlls/oleaut32/oleaut32_El.rc new file mode 100644 index 0000000..145c1a1 --- /dev/null +++ b/dlls/oleaut32/oleaut32_El.rc @@ -0,0 +1,31 @@ +/* + * Greek resources for oleaut32 + * + * Copyright 200 Apostolos Alexiadis + * + * 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 + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "��" + IDS_FALSE "��" + IDS_YES "��" + IDS_NO "��" + IDS_ON "��" + IDS_OFF "��" +}

1 0

Maarten Lankhorst : quartz: Handle flushing and end of stream notifications for input pins.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 01c6e64da67ffde47cd846d37d3f254f7cc56cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c6e64da67ffde47cd846d37… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 16:27:29 2008 -0700 quartz: Handle flushing and end of stream notifications for input pins. --- dlls/quartz/dsoundrender.c | 96 +++++++++++++++++++++++++++---------------- dlls/quartz/nullrenderer.c | 3 + dlls/quartz/pin.c | 48 ++++++++++++++++----- dlls/quartz/pin.h | 1 + dlls/quartz/transform.c | 6 +++ dlls/quartz/videorenderer.c | 6 +++ 6 files changed, 112 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01c6e64da67ffde47cd84…

1 0

Maarten Lankhorst : quartz: Reset EcCompleteCount before starting filters.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: ee792916e0b33de1f65499d01ff5f48416fd271d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee792916e0b33de1f65499d01… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 15:54:56 2008 -0700 quartz: Reset EcCompleteCount before starting filters. This sends EC_COMPLETE notifications to the application after a graph has finished running for the second time. --- dlls/quartz/filtergraph.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7c00552..1c0acc7 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1570,6 +1570,9 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { if (This->state == State_Running) return S_OK; EnterCriticalSection(&This->cs); + if (This->state == State_Stopped) + This->EcCompleteCount = 0; + if (This->refClock) { IReferenceClock_GetTime(This->refClock, &This->start_time); @@ -1590,6 +1593,9 @@ static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { if (This->state == State_Paused) return S_OK; EnterCriticalSection(&This->cs); + if (This->state == State_Stopped) + This->EcCompleteCount = 0; + if (This->state == State_Running && This->refClock) { LONGLONG time = This->start_time;

1 0

Maarten Lankhorst : quartz: Fix past mistake to release lock during seeking and changing state.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 3d3dcc4e07d9046a71a49309003690859b73422e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3dcc4e07d9046a71a493090… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 15:54:04 2008 -0700 quartz: Fix past mistake to release lock during seeking and changing state. --- dlls/quartz/filtergraph.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 417ec3f..7c00552 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1472,9 +1472,8 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF CoTaskMemFree(ppPins); } TRACE("Doing stuff with filter %p\n", PinInfo.pFilter); - LeaveCriticalSection(&pGraph->cs); + FoundFilter(PinInfo.pFilter); - EnterCriticalSection(&pGraph->cs); } if (PinInfo.pFilter) IBaseFilter_Release(PinInfo.pFilter); @@ -1778,9 +1777,9 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, IBaseFilter_QueryInterface(pfilter, &IID_IMediaSeeking, (void**)&seek); if (!seek) continue; - LeaveCriticalSection(&This->cs); + hr = FoundSeek(This, seek, arg); - EnterCriticalSection(&This->cs); + IMediaSeeking_Release(seek); if (hr_return != E_NOTIMPL) allnotimpl = FALSE;

1 0

Maarten Lankhorst : quartz: Fix some memory leaks in the file source.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 45bd38ece3ce8dda36ae1c3e8d5cac942b6013ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=45bd38ece3ce8dda36ae1c3e8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 14:32:09 2008 -0700 quartz: Fix some memory leaks in the file source. --- dlls/quartz/filesource.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 288c564..fd977f9 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -432,6 +432,8 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); This->lpVtbl = NULL; + CoTaskMemFree(This->pszFileName); + FreeMediaType(This->pmt); CoTaskMemFree(This); return 0; } @@ -639,8 +641,13 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi /* store file name & media type */ if (SUCCEEDED(hr)) { + CoTaskMemFree(This->pszFileName); + if (This->pmt) + FreeMediaType(This->pmt); + This->pszFileName = CoTaskMemAlloc((strlenW(pszFileName) + 1) * sizeof(WCHAR)); strcpyW(This->pszFileName, pszFileName); + This->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); if (!pmt) { @@ -674,7 +681,9 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi } CoTaskMemFree(This->pszFileName); + FreeMediaType(This->pmt); This->pszFileName = NULL; + This->pmt = NULL; CloseHandle(hFile); }

1 0

Maarten Lankhorst : quartz: Make FileAsyncReader_WaitForNext return an empty sample in flushing state.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: d56c50c85b96fbb13593c460572673e48c75b26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56c50c85b96fbb13593c4605… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 14:30:21 2008 -0700 quartz: Make FileAsyncReader_WaitForNext return an empty sample in flushing state. --- dlls/quartz/filesource.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 8be522c..288c564 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1093,16 +1093,13 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw *ppSample = NULL; *pdwUser = 0; - /* we return immediately if flushing */ - if (This->bFlushing) - hr = VFW_E_WRONG_STATE; - - if (SUCCEEDED(hr)) + if (!This->bFlushing) { /* wait for the read to finish or timeout */ if (WaitForSingleObject(This->hEvent, dwTimeout) == WAIT_TIMEOUT) hr = VFW_E_TIMEOUT; } + if (SUCCEEDED(hr)) { EnterCriticalSection(&This->csList); @@ -1116,7 +1113,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw LeaveCriticalSection(&This->csList); } - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr) && !This->bFlushing) { /* get any errors */ if (!GetOverlappedResult(This->hFile, &pDataRq->ovl, &dwBytes, FALSE)) @@ -1132,7 +1129,14 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw /* no need to close event handle since we will close it when the pin is destroyed */ CoTaskMemFree(pDataRq); - + + /* Return the sample if flushing so it can be destroyed */ + if (This->bFlushing && SUCCEEDED(hr)) + { + hr = VFW_E_WRONG_STATE; + IMediaSample_SetActualDataLength(pDataRq->pSample, 0); + } + TRACE("-- %x\n", hr); return hr; }

1 0

Maarten Lankhorst : quartz: Get rid of code duplication and add a flush method.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: fab66ee7a04e8b6072888c2c53502dafa0d7ad26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab66ee7a04e8b6072888c2c5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 14:29:21 2008 -0700 quartz: Get rid of code duplication and add a flush method. --- dlls/quartz/dsoundrender.c | 34 +---------- dlls/quartz/filesource.c | 20 ++----- dlls/quartz/nullrenderer.c | 37 +---------- dlls/quartz/parser.c | 77 +++--------------------- dlls/quartz/pin.c | 141 ++++++++++++++++++++++--------------------- dlls/quartz/pin.h | 23 ++++--- dlls/quartz/transform.c | 65 +------------------- dlls/quartz/videorenderer.c | 32 +---------- 8 files changed, 105 insertions(+), 324 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fab66ee7a04e8b6072888…

1 0

Maarten Lankhorst : quartz: Add more state transitions to the filtergraph.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 7f7c1d07527e4e9e2236fe6c7c9a5e0b12062403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f7c1d07527e4e9e2236fe6c7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 4 14:10:13 2008 -0700 quartz: Add more state transitions to the filtergraph. --- dlls/quartz/tests/filtergraph.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e1a6ef2..d72b7b3 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -58,17 +58,46 @@ static void rungraph(void) hr = IMediaControl_Run(pmc); ok(hr==S_FALSE, "Cannot run the graph returned: %x\n", hr); - Sleep(100); + Sleep(10); /* Crash fun */ + trace("run -> stop\n"); hr = IMediaControl_Stop(pmc); ok(hr==S_OK || hr == S_FALSE, "Cannot stop the graph returned: %x\n", hr); - hr = IMediaControl_Run(pmc); - ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + Sleep(10); + trace("stop -> pause\n"); hr = IMediaControl_Pause(pmc); + ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + Sleep(10); + trace("pause -> run\n"); + hr = IMediaControl_Run(pmc); ok(hr==S_OK || hr == S_FALSE, "Cannot pause the graph returned: %x\n", hr); + + Sleep(10); + trace("run -> pause\n"); + hr = IMediaControl_Pause(pmc); + ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + Sleep(10); + trace("pause -> stop\n"); + hr = IMediaControl_Stop(pmc); + ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + Sleep(10); + trace("pause -> run\n"); + hr = IMediaControl_Run(pmc); + ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + trace("run -> stop\n"); + hr = IMediaControl_Stop(pmc); + ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + + trace("stop -> run\n"); hr = IMediaControl_Run(pmc); ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaEvent, (LPVOID*)&pme); ok(hr==S_OK, "Cannot get IMediaEvent interface returned: %x\n", hr);

1 0

Maarten Lankhorst : dsound: Hold lock in GetStatus.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 98933362f379e8a108703d9d5631f86e1c788fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98933362f379e8a108703d9d5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 2 15:01:27 2008 -0700 dsound: Hold lock in GetStatus. --- dlls/dsound/buffer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index bb08f4a..108636a 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -465,11 +465,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus( } *status = 0; + RtlAcquireResourceShared(&This->lock, TRUE); if ((This->state == STATE_STARTING) || (This->state == STATE_PLAYING)) { *status |= DSBSTATUS_PLAYING; if (This->playflags & DSBPLAY_LOOPING) *status |= DSBSTATUS_LOOPING; } + RtlReleaseResource(&This->lock); TRACE("status=%x\n", *status); return DS_OK;

1 0

Vitaliy Margolen : msacm32: Add Russian translation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 3f9209eb2a6c76e519b3a96d16286fd73593abfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9209eb2a6c76e519b3a96d1… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:44:09 2008 -0600 msacm32: Add Russian translation. --- dlls/msacm32/msacm.rc | 1 + dlls/msacm32/msacm_Ru.rc | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/msacm.rc b/dlls/msacm32/msacm.rc index b00feb0..cbaf0a6 100644 --- a/dlls/msacm32/msacm.rc +++ b/dlls/msacm32/msacm.rc @@ -36,5 +36,6 @@ #include "msacm_No.rc" #include "msacm_Pl.rc" #include "msacm_Pt.rc" +#include "msacm_Ru.rc" #include "msacm_Sv.rc" #include "msacm_Tr.rc" diff --git a/dlls/msacm32/msacm_Ru.rc b/dlls/msacm32/msacm_Ru.rc new file mode 100644 index 0000000..d634139 --- /dev/null +++ b/dlls/msacm32/msacm_Ru.rc @@ -0,0 +1,56 @@ +/* + * Russian resource file for MS ACM + * + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&��:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&�� ...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&��", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&��:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&��:", -1, 5, 59, 44, 8, NOT WS_GROUP + +#if 0 + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | + CBS_OWNERDRAWFIXED | CBS_HASSTRINGS +#else + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "��", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&��", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END

1 0

Vitaliy Margolen : sane.ds: Add Russian translation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 76a030685608d5364d2dddbef5e491403e223408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a030685608d5364d2dddbef… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:39:45 2008 -0600 sane.ds: Add Russian translation. --- dlls/sane.ds/rsrc.rc | 1 + dlls/sane.ds/sane_Ru.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc index ec0d7ac..cde9b9b 100644 --- a/dlls/sane.ds/rsrc.rc +++ b/dlls/sane.ds/rsrc.rc @@ -34,4 +34,5 @@ #include "sane_Nl.rc" #include "sane_No.rc" #include "sane_Pl.rc" +#include "sane_Ru.rc" #include "sane_Sv.rc" diff --git a/dlls/sane.ds/sane_Ru.rc b/dlls/sane.ds/sane_Ru.rc new file mode 100644 index 0000000..32fabef --- /dev/null +++ b/dlls/sane.ds/sane_Ru.rc @@ -0,0 +1,40 @@ +/* + * Russian resources for Twain + * + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "��" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "��.... �� ",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "��" + 2 "��" + 3 "��" + 4 "�� " + 5 "%" + 6 "�� " +}

1 0

Vitaliy Margolen : msvidc32: Add Russian translation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e00a93fd5de7fa9c0d62e5cba9c06638b961e4d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00a93fd5de7fa9c0d62e5cba… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:39:24 2008 -0600 msvidc32: Add Russian translation. --- dlls/msvidc32/msvidc32_Ru.rc | 25 +++++++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvidc32_Ru.rc b/dlls/msvidc32/msvidc32_Ru.rc new file mode 100644 index 0000000..2c84bff --- /dev/null +++ b/dlls/msvidc32/msvidc32_Ru.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "�� Wine Video 1" +} diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc index 34f3980..bb8fdfe 100644 --- a/dlls/msvidc32/rsrc.rc +++ b/dlls/msvidc32/rsrc.rc @@ -28,5 +28,6 @@ #include "msvidc32_No.rc" #include "msvidc32_Pl.rc" #include "msvidc32_Ro.rc" +#include "msvidc32_Ru.rc" #include "msvidc32_Sv.rc" #include "msvidc32_Tr.rc"

1 0

Vitaliy Margolen : msvfw32: Add Russian translation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 24ce6dc61d9985429c47b5e5e7192cd1b11a30a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ce6dc61d9985429c47b5e5e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:39:08 2008 -0600 msvfw32: Add Russian translation. --- dlls/msvfw32/msvfw32_Ru.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvfw32/rsrc.rc | 1 + 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Ru.rc b/dlls/msvfw32/msvfw32_Ru.rc new file mode 100644 index 0000000..96c8a81 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Ru.rc @@ -0,0 +1,51 @@ +/* + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "��",IDCANCEL,129,18,49,14 + + LTEXT "&�� :",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "&��...",882,129,36,49,14 + PUSHBUTTON "&��...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "&�� :",886,9,34,80,8 + + CONTROL "��&�� ",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "��",889,103,62,26,10 + + CONTROL "&�� ",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "��/��",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "�� (�� )" +} diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc index 442ee4c..ba00f7d 100644 --- a/dlls/msvfw32/rsrc.rc +++ b/dlls/msvfw32/rsrc.rc @@ -29,5 +29,6 @@ #include "msvfw32_Nl.rc" #include "msvfw32_No.rc" #include "msvfw32_Pl.rc" +#include "msvfw32_Ru.rc" #include "msvfw32_Sv.rc" #include "msvfw32_Tr.rc"

1 0

Vitaliy Margolen : mpr: Add Russian translation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 7d3a5af43ea0d66a0596a4fac22cf88ae50d2745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3a5af43ea0d66a0596a4fac… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:38:36 2008 -0600 mpr: Add Russian translation. --- dlls/mpr/mpr.rc | 1 + dlls/mpr/mpr_Ru.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc index 1b1af54..7419740 100644 --- a/dlls/mpr/mpr.rc +++ b/dlls/mpr/mpr.rc @@ -39,5 +39,6 @@ #include "mpr_No.rc" #include "mpr_Pl.rc" #include "mpr_Pt.rc" +#include "mpr_Ru.rc" #include "mpr_Sv.rc" #include "mpr_Tr.rc" diff --git a/dlls/mpr/mpr_Ru.rc b/dlls/mpr/mpr_Ru.rc new file mode 100644 index 0000000..d093c06 --- /dev/null +++ b/dlls/mpr/mpr_Ru.rc @@ -0,0 +1,46 @@ +/* + * MPR dll Russian resources + * + * Copyright (C) 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "�� " +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� :", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "��", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "��", -1, 40, 66, 50, 10 + LTEXT "��", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&�� (��!)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +}

1 0

Vitaliy Margolen : localui: Add Russian translation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: a4d9ad0fe2d48165200f31872f2ccd9c35780189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d9ad0fe2d48165200f31872… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:38:19 2008 -0600 localui: Add Russian translation. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_Ru.rc | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index fc2ad73..7c67807 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -45,4 +45,5 @@ #include "ui_Nl.rc" #include "ui_No.rc" #include "ui_Pl.rc" +#include "ui_Ru.rc" #include "ui_Sv.rc" diff --git a/dlls/localui/ui_Ru.rc b/dlls/localui/ui_Ru.rc new file mode 100644 index 0000000..96e78f1 --- /dev/null +++ b/dlls/localui/ui_Ru.rc @@ -0,0 +1,54 @@ +/* + * Russian resources for localui + * + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "�� &�� :", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "��", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "��-�� (��)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&�� :", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "��", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "�� " + IDS_INVALIDNAME "�� '%s'" + IDS_PORTEXISTS "�� '%s' �� " + IDS_NOTHINGTOCONFIG "�� " +}

1 0

Vitaliy Margolen : iccvid: Add Russian translation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2e4e2ac3c3a75774460f163b63a27e9d2f75a653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4e2ac3c3a75774460f163b6… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 10:38:02 2008 -0600 iccvid: Add Russian translation. --- dlls/iccvid/iccvid_Ru.rc | 25 +++++++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid_Ru.rc b/dlls/iccvid/iccvid_Ru.rc new file mode 100644 index 0000000..c78ee72 --- /dev/null +++ b/dlls/iccvid/iccvid_Ru.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "�� -�� Cinepak" + IDS_DESCRIPTION "�� -�� Cinepak" +} diff --git a/dlls/iccvid/rsrc.rc b/dlls/iccvid/rsrc.rc index baa9fb3..b3a92ea 100644 --- a/dlls/iccvid/rsrc.rc +++ b/dlls/iccvid/rsrc.rc @@ -28,5 +28,6 @@ #include "iccvid_No.rc" #include "iccvid_Pl.rc" #include "iccvid_Ro.rc" +#include "iccvid_Ru.rc" #include "iccvid_Sv.rc" #include "iccvid_Tr.rc"

1 0

Eric Pouech : dbghelp: Prevent debug overflow of internal buffer while tracing.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: ce7656d218cd9dcd9772992b29e965b92c2a0609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce7656d218cd9dcd9772992b2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Apr 5 09:35:28 2008 +0200 dbghelp: Prevent debug overflow of internal buffer while tracing. --- dlls/dbghelp/msc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a2454d0..a2d0c23 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1575,7 +1575,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root while (*ptr1) { ptr2 = ptr1 + strlen(ptr1) + 1; - TRACE("\t%s => %s\n", ptr1, ptr2); + TRACE("\t%s => %s\n", ptr1, debugstr_a(ptr2)); ptr1 = ptr2 + strlen(ptr2) + 1; } }

1 0

Eric Pouech : dbghelp: Be stricter when looping in symbol tables.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f46d717818d11cd80127ca64646db57311af72cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46d717818d11cd80127ca646… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Apr 5 09:34:07 2008 +0200 dbghelp: Be stricter when looping in symbol tables. --- dlls/dbghelp/msc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 25589fc..a2454d0 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1322,6 +1322,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root const union codeview_symbol* sym = (const union codeview_symbol*)(root + i); length = sym->generic.len + 2; if (i + length > size) break; + if (!sym->generic.id || length < 4) break; if (length & 3) FIXME("unpadded len %u\n", length); switch (sym->generic.id)

1 0

James Hawkins : msi: Don' t execute the view again when modifying a WHERE query.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 4d9c17da02397898f195858d9e2d55927154bd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9c17da02397898f195858d9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 6 14:31:19 2008 -0500 msi: Don't execute the view again when modifying a WHERE query. --- dlls/msi/tests/db.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/where.c | 10 ++-- 2 files changed, 107 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 663388e..cd9abad 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5887,6 +5887,107 @@ static void test_viewmodify_refresh(void) DeleteFileA(msifile); } +static void test_where_viewmodify(void) +{ + MSIHANDLE hdb, hview, hrec; + const char *query; + UINT r; + + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `Table` ( `A` INT, `B` INT PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` ( `A`, `B` ) VALUES ( 1, 2 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` ( `A`, `B` ) VALUES ( 3, 4 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` ( `A`, `B` ) VALUES ( 5, 6 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* `B` = 3 doesn't match, but the view shouldn't be executed */ + query = "SELECT * FROM `Table` WHERE `B` = 3"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + hrec = MsiCreateRecord(2); + MsiRecordSetInteger(hrec, 1, 7); + MsiRecordSetInteger(hrec, 2, 8); + + r = MsiViewModify(hview, MSIMODIFY_INSERT_TEMPORARY, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `Table` WHERE `A` = 7"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 7, "Expected 7, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 8, "Expected 8, got %d\n", r); + + MsiRecordSetInteger(hrec, 2, 9); + + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `Table` WHERE `A` = 7"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 7, "Expected 7, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 9, "Expected 9, got %d\n", r); + + query = "UPDATE `Table` SET `B` = 10 WHERE `A` = 7"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewModify(hview, MSIMODIFY_REFRESH, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 7, "Expected 7, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 10, "Expected 10, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); +} + START_TEST(db) { test_msidatabase(); @@ -5923,4 +6024,5 @@ START_TEST(db) test_noquotes(); test_forcecodepage(); test_viewmodify_refresh(); + test_where_viewmodify(); } diff --git a/dlls/msi/where.c b/dlls/msi/where.c index aa5d5f3..8883496 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -86,6 +86,9 @@ static UINT find_entry_in_hash(MSIHASHENTRY **table, UINT row, UINT *val) { MSIHASHENTRY *entry; + if (!table) + return ERROR_SUCCESS; + if (!(entry = table[row % MSI_HASH_TABLE_SIZE])) { WARN("Row not found in hash table!\n"); @@ -503,15 +506,12 @@ static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - UINT r; TRACE("%p %d %p\n", wv, eModifyMode, rec); - r = WHERE_execute(view, NULL); - if (r != ERROR_SUCCESS) - return r; - find_entry_in_hash(wv->reorder, row - 1, &row); + row++; + return wv->table->ops->modify( wv->table, eModifyMode, rec, row ); }

1 0

James Hawkins : msi: Open the install properties key based on the install context.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: bcba82dc0c7b965ceaa15e82bc67658d129ef09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcba82dc0c7b965ceaa15e82b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 5 06:02:04 2008 -0500 msi: Open the install properties key based on the install context. --- dlls/msi/action.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ff93124..43ada4c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3350,6 +3350,10 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) rc = MSIREG_OpenLocalClassesProductKey(package->ProductCode, &hukey, TRUE); if (rc != ERROR_SUCCESS) goto end; + + rc = MSIREG_OpenLocalSystemInstallProps(package->ProductCode, &props, TRUE); + if (rc != ERROR_SUCCESS) + goto end; } else { @@ -3360,6 +3364,10 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) rc = MSIREG_OpenUserProductsKey(package->ProductCode,&hukey,TRUE); if (rc != ERROR_SUCCESS) goto end; + + rc = MSIREG_OpenCurrentUserInstallProps(package->ProductCode, &props, TRUE); + if (rc != ERROR_SUCCESS) + goto end; } rc = RegCreateKeyW(hukey, szSourceList, &source); @@ -3372,10 +3380,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto end; - rc = MSIREG_OpenCurrentUserInstallProps(package->ProductCode, &props, TRUE); - if (rc != ERROR_SUCCESS) - goto end; - buffer = msi_dup_property( package, INSTALLPROPERTY_PRODUCTNAMEW ); msi_reg_set_val_str( hukey, INSTALLPROPERTY_PRODUCTNAMEW, buffer ); msi_free(buffer); @@ -3995,9 +3999,18 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) return rc; - rc = MSIREG_OpenCurrentUserInstallProps(package->ProductCode, &props, TRUE); - if (rc != ERROR_SUCCESS) - return rc; + if (package->Context == MSIINSTALLCONTEXT_MACHINE) + { + rc = MSIREG_OpenLocalSystemInstallProps(package->ProductCode, &props, TRUE); + if (rc != ERROR_SUCCESS) + return rc; + } + else + { + rc = MSIREG_OpenCurrentUserInstallProps(package->ProductCode, &props, TRUE); + if (rc != ERROR_SUCCESS) + return rc; + } /* dump all the info i can grab */ /* FIXME: Flesh out more information */ @@ -4069,7 +4082,7 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) msi_free(upgrade_code); } - + RegCloseKey(hkey); rc = MSIREG_OpenUserDataProductKey(package->ProductCode, &hudkey, TRUE);

1 0

James Hawkins : msi: Test and reimplement MsiQueryProductState.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e21a26e47b2f1fb2fbd617a2a9a59f9df5b01792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21a26e47b2f1fb2fbd617a2a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 5 05:41:54 2008 -0500 msi: Test and reimplement MsiQueryProductState. --- dlls/msi/action.c | 8 ++-- dlls/msi/msi.c | 86 +++++++++++++++++++++----------------- dlls/msi/msipriv.h | 3 +- dlls/msi/registry.c | 35 ++++++++++++---- dlls/msi/tests/install.c | 5 ++- dlls/msi/tests/msi.c | 102 +++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 185 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e21a26e47b2f1fb2fbd61…

1 0

James Hawkins : msi: Don' t reorder the table when matching rows as the results are already ordered.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 85866317c58307cbe9a7ae6eb19c655963e52af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85866317c58307cbe9a7ae6eb… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 5 02:17:57 2008 -0500 msi: Don't reorder the table when matching rows as the results are already ordered. --- dlls/msi/table.c | 3 --- dlls/msi/tests/db.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 572cad6..c3739e5 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1796,9 +1796,6 @@ static UINT TABLE_find_matching_rows( struct tagMSIVIEW *view, UINT col, *row = entry->row; - if (tv->order) - *row = tv->order->reorder[*row]; - return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 9be1691..663388e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4775,8 +4775,9 @@ static void test_defaultdatabase(void) static void test_order(void) { MSIHANDLE hdb, hview, hrec; + CHAR buffer[MAX_PATH]; LPCSTR query; - UINT r; + UINT r, sz; int val; hdb = create_db(); @@ -4985,6 +4986,47 @@ static void test_order(void) MsiViewClose(hview); MsiCloseHandle(hview); + + query = "CREATE TABLE `Buffet` ( `One` CHAR(72), `Two` SHORT PRIMARY KEY `One`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Buffet` ( `One`, `Two` ) VALUES ( 'uno', 2)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Buffet` ( `One`, `Two` ) VALUES ( 'dos', 3)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Buffet` ( `One`, `Two` ) VALUES ( 'tres', 1)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `Buffet` WHERE `One` = 'dos' ORDER BY `Two`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "dos"), "Expected \"dos\", got \"%s\"\n", buffer); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 3, "Expected 3, got %d\n", r); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(hview); + MsiCloseHandle(hview); MsiCloseHandle(hdb); }

1 0

James Hawkins : msi: Set the install context based on the ALLUSERS property .
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 82517d6d676d575277a7bbbc3a39832365a37409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82517d6d676d575277a7bbbc3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 5 00:10:02 2008 -0500 msi: Set the install context based on the ALLUSERS property. --- dlls/msi/action.c | 31 ++++++++++++++++++++----------- dlls/msi/files.c | 8 ++++---- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e7edabe..2029c11 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3345,13 +3345,22 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) /* ok there is a lot more done here but i need to figure out what */ - rc = MSIREG_OpenProductsKey(package->ProductCode,&hkey,TRUE); - if (rc != ERROR_SUCCESS) - goto end; + if (package->Context == MSIINSTALLCONTEXT_MACHINE) + { + rc = MSIREG_OpenLocalClassesProductKey(package->ProductCode, &hukey, TRUE); + if (rc != ERROR_SUCCESS) + goto end; + } + else + { + rc = MSIREG_OpenProductsKey(package->ProductCode,&hkey,TRUE); + if (rc != ERROR_SUCCESS) + goto end; - rc = MSIREG_OpenUserProductsKey(package->ProductCode,&hukey,TRUE); - if (rc != ERROR_SUCCESS) - goto end; + rc = MSIREG_OpenUserProductsKey(package->ProductCode,&hukey,TRUE); + if (rc != ERROR_SUCCESS) + goto end; + } rc = RegCreateKeyW(hukey, szSourceList, &source); if (rc != ERROR_SUCCESS) @@ -3400,19 +3409,19 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) buffer = strrchrW( package->PackagePath, '\\') + 1; rc = MsiSourceListSetInfoW( package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, buffer ); if (rc != ERROR_SUCCESS) goto end; rc = MsiSourceListSetInfoW( package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATHW, szEmpty ); if (rc != ERROR_SUCCESS) goto end; rc = MsiSourceListSetInfoW( package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPTW, szEmpty ); if (rc != ERROR_SUCCESS) goto end; @@ -4221,13 +4230,13 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) DWORD size = 0; rc = MsiSourceListGetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPTW,NULL,&size); if (rc == ERROR_MORE_DATA) { prompt = msi_alloc(size * sizeof(WCHAR)); MsiSourceListGetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPTW,prompt,&size); } else diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e0f7889..1aae66d 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -581,11 +581,11 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf } if (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE) - msi_package_add_media_disk(package, MSIINSTALLCONTEXT_USERUNMANAGED, + msi_package_add_media_disk(package, package->Context, MSICODE_PRODUCT, mi->disk_id, mi->volume_label, mi->disk_prompt); - msi_package_add_info(package, MSIINSTALLCONTEXT_USERUNMANAGED, + msi_package_add_info(package, package->Context, options, INSTALLPROPERTY_LASTUSEDSOURCEW, source); msi_free(source_dir); @@ -603,7 +603,7 @@ static UINT find_published_source(MSIPACKAGE *package, struct media_info *mi) UINT r; r = MsiSourceListGetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, source, &size); if (r != ERROR_SUCCESS) return r; @@ -612,7 +612,7 @@ static UINT find_published_source(MSIPACKAGE *package, struct media_info *mi) volumesz = MAX_PATH; promptsz = MAX_PATH; while (MsiSourceListEnumMediaDisksW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, + package->Context, MSICODE_PRODUCT, index++, &id, volume, &volumesz, prompt, &promptsz) == ERROR_SUCCESS) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 975ebb6..43fa923 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -307,6 +307,7 @@ typedef struct tagMSIPACKAGE float center_y; UINT WordCount; + UINT Context; struct list subscriptions; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index fad0520..a587a63 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -416,7 +416,6 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; static const WCHAR szIntFormat[] = {'%','d',0}; static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; - static const WCHAR szAllUsers[] = { 'A','L','L','U','S','E','R','S',0 }; static const WCHAR szUserInfo[] = { 'S','O','F','T','W','A','R','E','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -542,7 +541,6 @@ static VOID set_installer_properties(MSIPACKAGE *package) /* in a wine environment the user is always admin and privileged */ MSI_SetPropertyW(package,szAdminUser,szOne); MSI_SetPropertyW(package,szPriv,szOne); - MSI_SetPropertyW(package, szAllUsers, szOne); /* set the os things */ OSVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); @@ -762,6 +760,30 @@ static UINT msi_load_admin_properties(MSIPACKAGE *package) return r; } +static UINT msi_set_context(MSIPACKAGE *package) +{ + WCHAR val[10]; + DWORD sz = 10; + DWORD num; + UINT r; + + static const WCHAR szOne[] = {'1',0}; + static const WCHAR szAllUsers[] = {'A','L','L','U','S','E','R','S',0}; + + package->Context = MSIINSTALLCONTEXT_USERUNMANAGED; + + r = MSI_GetPropertyW(package, szAllUsers, val, &sz); + if (r == ERROR_SUCCESS) + { + num = atolW(val); + if (num == 1 || num == 2) + package->Context = MSIINSTALLCONTEXT_MACHINE; + } + + MSI_SetPropertyW(package, szAllUsers, szOne); + return ERROR_SUCCESS; +} + MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) { static const WCHAR szLevel[] = { 'U','I','L','e','v','e','l',0 }; @@ -801,6 +823,8 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) if (package->WordCount & MSIWORDCOUNT_ADMINISTRATIVE) msi_load_admin_properties( package ); + + msi_set_context( package ); } return package;

1 0

James Hawkins : msi: Reset the feature states if iInstallLevel is 0 or below.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 30c1b88828464e1220c7eb4b884aedce6913607f URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c1b88828464e1220c7eb4b8… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 4 22:48:20 2008 -0500 msi: Reset the feature states if iInstallLevel is 0 or below. --- dlls/msi/install.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 999840d..6415459 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1169,15 +1169,16 @@ UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ) TRACE("%p %i\n", package, iInstallLevel); - if (iInstallLevel<1 || iInstallLevel>32767) + if (iInstallLevel > 32767) return ERROR_INVALID_PARAMETER; + if (iInstallLevel < 1) + return MSI_SetFeatureStates( package ); + sprintfW( level, fmt, iInstallLevel ); r = MSI_SetPropertyW( package, szInstallLevel, level ); if ( r == ERROR_SUCCESS ) - { r = MSI_SetFeatureStates( package ); - } return r; }

1 0

Dan Hipschman : qedit/tests: Add a partial test for IMediaDet_get_StreamMediaType.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 742120ba94b2b9d58a9a0d5bd3eaa2b84434d21e URL: http://source.winehq.org/git/wine.git/?a=commit;h=742120ba94b2b9d58a9a0d5bd… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 16:01:27 2008 -0700 qedit/tests: Add a partial test for IMediaDet_get_StreamMediaType. --- dlls/qedit/tests/mediadet.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 0ec9458..0870fd0 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -22,6 +22,8 @@ #define COBJMACROS +#include "ole2.h" +#include "uuids.h" #include "wine/test.h" #include "qedit.h" @@ -84,6 +86,7 @@ static void test_mediadet(void) BSTR filename = NULL; long nstrms = 0; long strm; + AM_MEDIA_TYPE mt; hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM); @@ -114,6 +117,12 @@ static void test_mediadet(void) todo_wine ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); todo_wine ok(strm == 0, "IMediaDet_get_CurrentStream\n"); + ZeroMemory(&mt, sizeof mt); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + todo_wine ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); + todo_wine ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Video), + "IMediaDet_get_StreamMediaType\n"); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);

1 0

Dan Hipschman : qedit/tests: Add a test for IMediaDet_(put|get) _CurrentStream.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b37ee801668d67cbdac6b072d08bdf4c17f3698d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37ee801668d67cbdac6b072d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 16:01:06 2008 -0700 qedit/tests: Add a test for IMediaDet_(put|get)_CurrentStream. --- dlls/qedit/tests/mediadet.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 26d27b1..0ec9458 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -83,6 +83,7 @@ static void test_mediadet(void) IMediaDet *pM = NULL; BSTR filename = NULL; long nstrms = 0; + long strm; hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM); @@ -105,6 +106,14 @@ static void test_mediadet(void) "IMediaDet_get_Filename\n"); SysFreeString(filename); + hr = IMediaDet_put_CurrentStream(pM, 0); + todo_wine ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + todo_wine ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); + todo_wine ok(strm == 0, "IMediaDet_get_CurrentStream\n"); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);

1 0

Dan Hipschman : qedit/tests: Add a test for IMediaDet_get_Filename.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 07f9c44b36450e98ece1427843b3894a998febf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f9c44b36450e98ece142784… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 16:00:41 2008 -0700 qedit/tests: Add a test for IMediaDet_get_Filename. --- dlls/qedit/tests/mediadet.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index de4bd23..26d27b1 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -98,6 +98,13 @@ static void test_mediadet(void) todo_wine ok(hr == S_OK, "IMediaDet_get_OutputStreams\n"); todo_wine ok(nstrms == 1, "IMediaDet_get_OutputStreams\n"); + filename = NULL; + hr = IMediaDet_get_Filename(pM, &filename); + todo_wine ok(hr == S_OK, "IMediaDet_get_Filename\n"); + todo_wine ok(lstrcmpW(filename, test_avi_filename) == 0, + "IMediaDet_get_Filename\n"); + SysFreeString(filename); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);

1 0

Dan Hipschman : qedit/tests: Add a test for IMediaDet_get_OutputStreams.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b0b47ac5f58f37bf06e76ab51173fd7617891774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b47ac5f58f37bf06e76ab51… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 16:00:05 2008 -0700 qedit/tests: Add a test for IMediaDet_get_OutputStreams. --- dlls/qedit/tests/mediadet.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index b9ea9c0..de4bd23 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -82,6 +82,7 @@ static void test_mediadet(void) HRESULT hr; IMediaDet *pM = NULL; BSTR filename = NULL; + long nstrms = 0; hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM); @@ -93,6 +94,10 @@ static void test_mediadet(void) todo_wine ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); SysFreeString(filename); + hr = IMediaDet_get_OutputStreams(pM, &nstrms); + todo_wine ok(hr == S_OK, "IMediaDet_get_OutputStreams\n"); + todo_wine ok(nstrms == 1, "IMediaDet_get_OutputStreams\n"); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);

1 0

Dan Hipschman : qedit/tests: Add test framework and test for IMediaDet_put_Filename.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 999bc5bcb292a796454d081abf0ca1d868a00090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=999bc5bcb292a796454d081ab… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 15:59:08 2008 -0700 qedit/tests: Add test framework and test for IMediaDet_put_Filename. --- dlls/qedit/tests/Makefile.in | 4 ++- dlls/qedit/tests/mediadet.c | 66 ++++++++++++++++++++++++++++++++++++++++++ dlls/qedit/tests/qedit.rc | 22 ++++++++++++++ dlls/qedit/tests/test.avi | Bin 0 -> 5676 bytes 4 files changed, 91 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in index 5236975..94c5e60 100644 --- a/dlls/qedit/tests/Makefile.in +++ b/dlls/qedit/tests/Makefile.in @@ -3,12 +3,14 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = qedit.dll -IMPORTS = ole32 kernel32 +IMPORTS = oleaut32 ole32 kernel32 EXTRALIBS = -lstrmiids -luuid CTESTS = \ mediadet.c +RC_SRCS = qedit.rc + @MAKE_TEST_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index b550c8e..b9ea9c0 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -25,22 +25,88 @@ #include "wine/test.h" #include "qedit.h" +static WCHAR test_avi_filename[MAX_PATH]; + +static BOOL init_tests(void) +{ + static WCHAR temp_path[MAX_PATH]; + static WCHAR prefix[] = {'D','E','S',0}; + static WCHAR avi[] = {'a','v','i',0}; + HRSRC res; + HGLOBAL data; + char *mem; + DWORD size, written; + HANDLE fh; + + res = FindResourceW(NULL, (LPWSTR) 1, (LPWSTR) 256); + if (!res) + return FALSE; + + data = LoadResource(NULL, res); + if (!data) + return FALSE; + + mem = LockResource(data); + if (!mem) + return FALSE; + + size = SizeofResource(NULL, res); + if (size == 0) + return FALSE; + + if (!GetTempPathW(sizeof temp_path, temp_path)) + return FALSE; + + /* We might end up relying on the extension here, so .TMP is no good. */ + if (!GetTempFileNameW(temp_path, prefix, 0, test_avi_filename)) + return FALSE; + + DeleteFileW(test_avi_filename); + lstrcpyW(test_avi_filename + lstrlenW(test_avi_filename) - 3, avi); + + fh = CreateFileW(test_avi_filename, GENERIC_WRITE, 0, NULL, + CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if (fh == INVALID_HANDLE_VALUE) + return FALSE; + + if (!WriteFile(fh, mem, size, &written, NULL) || written != size) + return FALSE; + + CloseHandle(fh); + + return TRUE; +} + static void test_mediadet(void) { HRESULT hr; IMediaDet *pM = NULL; + BSTR filename = NULL; hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM); ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); ok(pM != NULL, "pM is NULL\n"); + filename = SysAllocString(test_avi_filename); + hr = IMediaDet_put_Filename(pM, filename); + todo_wine ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); + SysFreeString(filename); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); + + DeleteFileW(test_avi_filename); } START_TEST(mediadet) { + if (!init_tests()) + { + skip("Couldn't initialize tests!\n"); + return; + } + CoInitialize(NULL); test_mediadet(); CoUninitialize(); diff --git a/dlls/qedit/tests/qedit.rc b/dlls/qedit/tests/qedit.rc new file mode 100644 index 0000000..b138624 --- /dev/null +++ b/dlls/qedit/tests/qedit.rc @@ -0,0 +1,22 @@ +/* + * Resource file for qedit tests. + * + * Copyright 2008 Google (Dan Hipschman) + * + * 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 + */ + +/* @makedep: test.avi */ +1 256 test.avi diff --git a/dlls/qedit/tests/test.avi b/dlls/qedit/tests/test.avi new file mode 100644 index 0000000..8756c64 Binary files /dev/null and b/dlls/qedit/tests/test.avi differ

1 0

Dan Hipschman : qedit/tests: Don't forget CoUninitialize.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 8b432b3655637aaf4541906def9ff301b9801731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b432b3655637aaf4541906de… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 15:58:17 2008 -0700 qedit/tests: Don't forget CoUninitialize. --- dlls/qedit/tests/mediadet.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 5d5178d..b550c8e 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -43,4 +43,5 @@ START_TEST(mediadet) { CoInitialize(NULL); test_mediadet(); + CoUninitialize(); }

1 0

Michael Moss : wine.inf: Move winebrowser.exe to the system directory.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 4a8d26a9cf6da9fe0a05a26411fe81fa0bfae707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8d26a9cf6da9fe0a05a2641… Author: Michael Moss <mmoss(a)google.com> Date: Fri Apr 4 14:08:41 2008 -0700 wine.inf: Move winebrowser.exe to the system directory. --- tools/wine.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 4d7f7b7..f3cda7b 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2212,7 +2212,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,notepad.exe 10,,regedit.exe 10,,twain_32.dll -10,,winebrowser.exe 10,,winhelp.exe 10,command,start.exe 11,,actxprxy.dll @@ -2272,6 +2271,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,urlmon.dll 11,,user32.dll 11,,version.dll +11,,winebrowser.exe 11,,wininet.dll 11,,winmm.dll 11,,winspool.drv

1 0

Andrew Talbot : wintrust: Avoid assigning to struct members from other structs.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e68cc16a11f92c59f8cb02781612ce98c844e590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68cc16a11f92c59f8cb02781… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Apr 4 17:56:34 2008 +0100 wintrust: Avoid assigning to struct members from other structs. --- dlls/wintrust/register.c | 184 ++++++++++++++++++++++++++-------------------- 1 files changed, 103 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e68cc16a11f92c59f8cb0…

1 0

Andrew Talbot : port: Remove superfluous semicolon.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 8ba539844b275472f46556b092c70a5332870478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba539844b275472f46556b09… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Apr 4 17:56:29 2008 +0100 port: Remove superfluous semicolon. --- libs/port/interlocked.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index c2d85b6..12b326f 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -49,7 +49,7 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr, "lock; cmpxchg8b (%esi)\n\t" "pop %esi\n\t" "pop %ebx\n\t" - "ret"); + "ret") __ASM_GLOBAL_FUNC(interlocked_xchg, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%edx\n\t"

1 0

Paul Vriens : rsaenh/tests: Fix a test on W2K and above.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 66c022c28cb3cc758f53d31467f70020bb6ca126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66c022c28cb3cc758f53d3146… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Apr 4 17:39:37 2008 +0200 rsaenh/tests: Fix a test on W2K and above. --- dlls/rsaenh/tests/rsaenh.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4fef6e9..0119f28 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winerror.h" #include "wincrypt.h" +#include "winreg.h" static HCRYPTPROV hProv; static const char szContainer[] = "winetest"; @@ -55,6 +56,33 @@ static const cryptdata cTestData[4] = { 12,12,16} }; +/* + * 1. Take the MD5 Hash of the container name (with an extra null byte) + * 2. Turn the hash into a 4 DWORD hex value + * 3. Append a '_' + * 4. Add the MachineGuid + * + */ +static void uniquecontainer(char *unique) +{ + /* MD5 hash of "winetest\0" in 4 DWORD hex */ + static const char szContainer_md5[] = "9d20fd8d05ed2b8455d125d0bf6d6a70"; + static const char szCryptography[] = "Software\\Microsoft\\Cryptography"; + static const char szMachineGuid[] = "MachineGuid"; + HKEY hkey; + char guid[MAX_PATH]; + DWORD size = MAX_PATH; + + /* Get the MachineGUID */ + RegOpenKeyA(HKEY_LOCAL_MACHINE, szCryptography, &hkey); + RegQueryValueExA(hkey, szMachineGuid, NULL, NULL, (LPBYTE)guid, &size); + RegCloseKey(hkey); + + lstrcpy(unique, szContainer_md5); + lstrcat(unique, "_"); + lstrcat(unique, guid); +} + static void printBytes(const char *heading, const BYTE *pb, size_t cb) { size_t i; @@ -1849,11 +1877,21 @@ static void test_null_provider(void) SetLastError(0xdeadbeef); result = CryptGetProvParam(prov, PP_UNIQUE_CONTAINER, (LPBYTE)szName, &dataLen, 0); if (!result && GetLastError() == NTE_BAD_TYPE) + { skip("PP_UNIQUE_CONTAINER is not supported (win9x or NT)\n"); + } else - ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, - "failed getting PP_UNIQUE_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", - (result)? "TRUE":"FALSE",GetLastError(),dataLen); + { + char container[MAX_PATH]; + + ok(result, "failed getting PP_UNIQUE_CONTAINER : 0x%08X\n", GetLastError()); + uniquecontainer(container); + todo_wine + { + ok(dataLen == strlen(container)+1, "Expected a param length of 70, got %d\n", dataLen); + ok(!strcmp(container, szName), "Wrong container name : %s\n", szName); + } + } result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result && GetLastError() == NTE_NO_KEY, "Expected NTE_NO_KEY, got %08x\n", GetLastError());

1 0

Alexandre Julliard : user32: Fix a few ShowWindow todo tests.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: d0e1dd84b22b1906a44f682394b5d1b90ba5ded8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e1dd84b22b1906a44f68239… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 18:22:40 2008 +0200 user32: Fix a few ShowWindow todo tests. --- dlls/user32/tests/msg.c | 8 ++++---- dlls/user32/winpos.c | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6f37f48..a866987 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9443,7 +9443,7 @@ static void test_ShowWindow(void) /* 16 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 17 */ { SW_SHOW, FALSE, WS_VISIBLE, WmShow, FALSE }, /* 18 */ { SW_SHOW, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, -/* 19 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, TRUE }, +/* 19 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, FALSE }, /* 20 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 21 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 22 */ { SW_SHOWMINNOACTIVE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinNoActivate, TRUE }, @@ -9464,11 +9464,11 @@ static void test_ShowWindow(void) /* 37 */ { SW_RESTORE, FALSE, WS_VISIBLE, WmRestore_2, FALSE }, /* 38 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 39 */ { SW_SHOWNOACTIVATE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, -/* 40 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_2, TRUE }, +/* 40 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_2, FALSE }, /* 41 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 42 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_2, TRUE }, /* 43 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmMinMax_2, FALSE }, -/* 44 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, TRUE }, +/* 44 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, FALSE }, /* 45 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 46 */ { SW_RESTORE, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmRestore_3, FALSE }, /* 47 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmRestore_4, FALSE }, @@ -9478,7 +9478,7 @@ static void test_ShowWindow(void) /* 51 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 52 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 53 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, -/* 54 */ { SW_MINIMIZE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_3, TRUE }, +/* 54 */ { SW_MINIMIZE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_3, FALSE }, /* 55 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 56 */ { SW_SHOWNOACTIVATE, FALSE, WS_VISIBLE, WmShowNoActivate_2, FALSE }, /* 57 */ { SW_SHOW, TRUE, WS_VISIBLE, WmEmptySeq, FALSE } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 04377b9..5d346ee 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -983,11 +983,9 @@ static BOOL show_window( HWND hwnd, INT cmd ) break; case SW_SHOWMINNOACTIVE: - swp |= SWP_NOACTIVATE | SWP_NOZORDER; - /* fall through */ case SW_MINIMIZE: case SW_FORCEMINIMIZE: /* FIXME: Does not work if thread is hung. */ - if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; + swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* fall through */ case SW_SHOWMINIMIZED: swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;

1 0

Alexandre Julliard : winex11: Ignore ConfigureNotify events when a window is iconified.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f6662c7bbec5eb010f5d4cd4844758fdaba4fa0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6662c7bbec5eb010f5d4cd48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 18:22:23 2008 +0200 winex11: Ignore ConfigureNotify events when a window is iconified. --- dlls/winex11.drv/winpos.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 1779b45..25f7413 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -549,7 +549,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if (!hwnd) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->mapped) return; + if (!data->mapped || data->iconic) return; /* Get geometry */ @@ -586,7 +586,6 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) hwnd, rect.left, rect.top, x, y ); if ((rect.right - rect.left == cx && rect.bottom - rect.top == cy) || - IsIconic(hwnd) || (IsRectEmpty( &rect ) && event->width == 1 && event->height == 1)) { if (flags & SWP_NOMOVE) return; /* if nothing changed, don't do anything */

1 0

softpub exported functions prototypes
by andre furtado 04 Apr '08

04 Apr '08

add softpub exported functions prototypes... HRESULT WINAPI GenericChainCertificateTrust(IN OUT PCRYPT_PROVIDER_DATA pProvData)HRESULT WINAPI GenericChainFinalProv(IN OUT PCRYPT_PROVIDER_DATA pProvData)HRESULT WINAPI HTTPSCertificateTrust(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubDefCertInit(CRYPT_PROVIDER_DATA *pProvData)BOOL WINAPI SoftpubFreeDefUsageCallData(const char *pszUsageOID, CRYPT_PROVIDER_DEFUSAGE *psDefUsage)BOOL WINAPI SoftpubLoadDefUsageCallData(const char *pszUsageOID, CRYPT_PROVIDER_DEFUSAGE *psDefUsage)BOOL CALLBACK AddPersonalTrustDBPages(LPVOID lpv, LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) HRESULT WINAPI DriverCleanupPolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI DriverFinalPolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI DriverInitializePolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI HTTPSFinalProv(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI OfficeCleanupPolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI OfficeInitializePolicy(CRYPT_PROVIDER_DATA *pProvData)BOOL WINAPI OpenPersonalTrustDBDialog(HWND hWnd)HRESULT WINAPI OfficeInitializePolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *pProvData)BOOL WINAPI SoftpubCheckCert(CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSignerChain, DWORD idxCounterSigner)HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubDumpStructure(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubInitialize(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *pProvData)HRESULT SoftpubLoadSignature(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI FindCertsByIssuer(OUT PCERT_CHAIN pCertChains, IN OUT DWORD *pcbCertChains, OUT DWORD *pcCertChains, IN BYTE* pbEncodedIssuerName, IN DWORD cbEncodedIssuerName, IN LPCWSTR pwszPurpose, IN DWORD dwKeySpec) André Renato Furtado talk2cod(a)hotmail.com _________________________________________________________________ Confira vídeos com notícias do NY Times, gols direto do Lance, videocassetadas e muito mais no MSN Video! http://video.msn.com/?mkt=pt-br

1 0

xenroll exported functions
by andre furtado 04 Apr '08

04 Apr '08

add documentation for exported functions of the xenroll library...IEnroll * WINAPI PIEnrollGetNoCOM(void)*/ returns a pointer to an IEnroll interface. */IEnroll2 * WINAPI PIEnroll2GetNoCOM(void)*/ returns a pointer to an IEnroll2 interface. */IEnroll4 * WINAPI PIEnroll4GetNoCOM(void)*/ returns a pointer to an IEnroll4 interface. */ André Renato Furtado talk2cod(a)hotmail.com _________________________________________________________________ Instale a Barra de Ferramentas com Desktop Search e ganhe EMOTICONS para o Messenger! É GRÁTIS! http://www.msn.com.br/emoticonpack

1 0

xenroll exported functions
by andre furtado 04 Apr '08

04 Apr '08

add documentation for exported functions of the xenroll library...IEnroll * WINAPI PIEnrollGetNoCOM(void)*/ returns a pointer to an IEnroll interface. */IEnroll2 * WINAPI PIEnroll2GetNoCOM(void)*/ returns a pointer to an IEnroll2 interface. */IEnroll4 * WINAPI PIEnroll4GetNoCOM(void)*/ returns a pointer to an IEnroll4 interface. */ André Renato Furtado talk2cod(a)hotmail.com _________________________________________________________________ Conheça o Windows Live Spaces, a rede de relacionamentos do Messenger! http://www.amigosdomessenger.com.br/

1 0

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 April 2008