December 2013 - Wine-Commits

Henri Verbeet : ddraw: Attach the first surface in the swap chain to the last one.
by Alexandre Julliard Dec. 4, 2013

Dec. 4, 2013

Module: wine Branch: master Commit: 74e3f516bc331205474835811d3984b9c53b0f35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e3f516bc331205474835811… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 4 09:49:34 2013 +0100 ddraw: Attach the first surface in the swap chain to the last one. --- dlls/ddraw/surface.c | 19 ++++++++++++------- dlls/ddraw/tests/ddraw1.c | 7 +++---- dlls/ddraw/tests/ddraw2.c | 7 +++---- dlls/ddraw/tests/ddraw4.c | 7 +++---- dlls/ddraw/tests/ddraw7.c | 7 +++---- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8d35d1e..477ef4f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -469,7 +469,8 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surf = surface->complex_array[i]; surface->complex_array[i] = NULL; - ddraw_surface_cleanup(surf); + if (!surf->is_complex_root) + ddraw_surface_cleanup(surf); } if (surface->device1) @@ -4724,19 +4725,22 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir DDSCAPS2 caps2 = { DDSCAPS_FLIP, 0, 0, 0 }; surf = This; - while(1) + for (;;) { IDirectDrawSurface7 *attach; - HRESULT hr; - hr = ddraw_surface7_GetAttachedSurface(&surf->IDirectDrawSurface7_iface, &caps2, &attach); - if(hr != DD_OK) + + if (FAILED(hr = ddraw_surface7_GetAttachedSurface(&surf->IDirectDrawSurface7_iface, &caps2, &attach))) + break; + + surf = impl_from_IDirectDrawSurface7(attach); + if (surf == This) { + ddraw_surface7_Release(attach); break; } - TRACE("Setting palette on %p\n", attach); + TRACE("Setting palette on %p.\n", attach); ddraw_surface7_SetPalette(attach, Pal); - surf = impl_from_IDirectDrawSurface7(attach); ddraw_surface7_Release(attach); } } @@ -6002,6 +6006,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ *attach = last; attach = &last->complex_array[0]; } + *attach = root; } if (surface_desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 64f8f37..c8d60fe 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3605,10 +3605,9 @@ static void test_flip(void) "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface_GetAttachedSurface(backbuffer3, &caps, &surface); - todo_wine ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); - todo_wine ok(surface == primary, "Got unexpected surface %p, expected %p.\n", surface, primary); - if (surface) - IDirectDrawSurface_Release(surface); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(surface == primary, "Got unexpected surface %p, expected %p.\n", surface, primary); + IDirectDrawSurface_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 77a1419..34559cc 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4286,10 +4286,9 @@ static void test_flip(void) "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface_GetAttachedSurface(backbuffer3, &caps, &surface); - todo_wine ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); - todo_wine ok(surface == primary, "Got unexpected surface %p, expected %p.\n", surface, primary); - if (surface) - IDirectDrawSurface_Release(surface); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(surface == primary, "Got unexpected surface %p, expected %p.\n", surface, primary); + IDirectDrawSurface_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 994bfb3..865dc0f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4890,10 +4890,9 @@ static void test_flip(void) "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface4_GetAttachedSurface(backbuffer3, &caps, &surface); - todo_wine ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); - todo_wine ok(surface == primary, "Got unexpected surface %p, expected %p.\n", surface, primary); - if (surface) - IDirectDrawSurface4_Release(surface); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(surface == primary, "Got unexpected surface %p, expected %p.\n", surface, primary); + IDirectDrawSurface4_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2ea98cb..050d303 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4777,10 +4777,9 @@ static void test_flip(void) "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface7_GetAttachedSurface(backbuffer3, &caps, &surface); - todo_wine ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); - todo_wine ok(surface == primary, "Got unexpected surface %p, expected %p.\n", surface, primary); - if (surface) - IDirectDrawSurface7_Release(surface); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(surface == primary, "Got unexpected surface %p, expected %p.\n", surface, primary); + IDirectDrawSurface7_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc);

1 0

Henri Verbeet : ddraw: Validate that surfaces are on the same swap chain in ddraw_surface7_Flip() .
by Alexandre Julliard Dec. 4, 2013

Dec. 4, 2013

Module: wine Branch: master Commit: 00eaf27dc78353c23b9068051c988e301f902208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00eaf27dc78353c23b9068051… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 4 09:49:35 2013 +0100 ddraw: Validate that surfaces are on the same swap chain in ddraw_surface7_Flip(). --- dlls/ddraw/surface.c | 73 ++++++++++++++++++++------------------------ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 37 insertions(+), 44 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 477ef4f..9d570e4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1170,62 +1170,55 @@ static HRESULT WINAPI ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *dat return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); } -/***************************************************************************** - * IDirectDrawSurface7::Flip - * - * Flips a surface with the DDSCAPS_FLIP flag. The flip is relayed to - * IWineD3DSurface::Flip. Because WineD3D doesn't handle attached surfaces, - * the flip target is passed to WineD3D, even if the app didn't specify one - * - * Params: - * DestOverride: Specifies the surface that will become the new front - * buffer. If NULL, the current back buffer is used - * Flags: some DirectDraw flags, see include/ddraw.h - * - * Returns: - * DD_OK on success - * DDERR_NOTFLIPPABLE if no flip target could be found - * DDERR_INVALIDOBJECT if the surface isn't a front buffer - * For more details, see IWineD3DSurface::Flip - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *DestOverride, DWORD Flags) +static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *src, DWORD flags) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct ddraw_surface *Override = unsafe_impl_from_IDirectDrawSurface7(DestOverride); - IDirectDrawSurface7 *Override7; + struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src); + DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, 0}; + IDirectDrawSurface7 *current; HRESULT hr; - TRACE("iface %p, dst %p, flags %#x.\n", iface, DestOverride, Flags); + TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); - if (DestOverride == iface || !(surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_OVERLAY))) + if (src == iface || !(dst_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_OVERLAY))) return DDERR_NOTFLIPPABLE; wined3d_mutex_lock(); - /* WineD3D doesn't keep track of attached surface, so find the target */ - if(!Override) + if (src_impl) { - DDSCAPS2 Caps; - - memset(&Caps, 0, sizeof(Caps)); - Caps.dwCaps |= DDSCAPS_BACKBUFFER; - hr = ddraw_surface7_GetAttachedSurface(iface, &Caps, &Override7); - if(hr != DD_OK) + for (current = iface; current != src;) + { + if (FAILED(hr = ddraw_surface7_GetAttachedSurface(current, &caps, &current))) + { + WARN("Surface %p is not on the same flip chain as surface %p.\n", src, iface); + wined3d_mutex_unlock(); + return DDERR_NOTFLIPPABLE; + } + ddraw_surface7_Release(current); + if (current == iface) + { + WARN("Surface %p is not on the same flip chain as surface %p.\n", src, iface); + wined3d_mutex_unlock(); + return DDERR_NOTFLIPPABLE; + } + } + } + else + { + if (FAILED(hr = ddraw_surface7_GetAttachedSurface(iface, &caps, &current))) { ERR("Can't find a flip target\n"); wined3d_mutex_unlock(); return DDERR_NOTFLIPPABLE; /* Unchecked */ } - Override = impl_from_IDirectDrawSurface7(Override7); - - /* For the GetAttachedSurface */ - ddraw_surface7_Release(Override7); + src_impl = impl_from_IDirectDrawSurface7(current); + ddraw_surface7_Release(current); } - hr = wined3d_surface_flip(surface->wined3d_surface, Override->wined3d_surface, Flags); - if (SUCCEEDED(hr) && surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + if (SUCCEEDED(hr = wined3d_surface_flip(dst_impl->wined3d_surface, src_impl->wined3d_surface, flags)) + && (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + hr = ddraw_surface_update_frontbuffer(dst_impl, NULL, FALSE); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c8d60fe..46e1239 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3618,7 +3618,7 @@ static void test_flip(void) hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(primary, surface, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(surface); hr = IDirectDrawSurface_Flip(primary, primary, DDFLIP_WAIT); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 34559cc..80c86ff 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4299,7 +4299,7 @@ static void test_flip(void) hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(primary, surface, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(surface); hr = IDirectDrawSurface_Flip(primary, primary, DDFLIP_WAIT); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 865dc0f..489dfe7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4903,7 +4903,7 @@ static void test_flip(void) hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(primary, surface, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface4_Release(surface); hr = IDirectDrawSurface4_Flip(primary, primary, DDFLIP_WAIT); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 050d303..8818828 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4790,7 +4790,7 @@ static void test_flip(void) hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(primary, surface, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface7_Release(surface); hr = IDirectDrawSurface7_Flip(primary, primary, DDFLIP_WAIT);

1 0

Henri Verbeet : ddraw: Reject explicitly creating a flippable front buffer.
by Alexandre Julliard Dec. 4, 2013

Dec. 4, 2013

Module: wine Branch: master Commit: a9afc9356e5469b24cdf6f8b4be912e33b52c422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9afc9356e5469b24cdf6f8b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 4 09:49:36 2013 +0100 ddraw: Reject explicitly creating a flippable front buffer. --- dlls/ddraw/ddraw.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7fca84c..ee1d19c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2921,11 +2921,10 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, return DDERR_INVALIDPARAMS; } - /* Remove front buffer flag, this causes failure in v7, and its added to normal - * primaries anyway. */ - surface_desc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; if ((surface_desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)) - == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER)) + == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER) + || (surface_desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_FRONTBUFFER)) + == ((DDSCAPS_FLIP | DDSCAPS_FRONTBUFFER))) { WARN("Application tried to create an explicit front or back buffer.\n"); wined3d_mutex_unlock();

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Dec. 4, 2013

Dec. 4, 2013

Module: wine Branch: master Commit: 3af42ea7ff3fcdb6d314c6563c9dedd9e40bfbc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3af42ea7ff3fcdb6d314c6563… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 3 23:13:12 2013 +0100 po: Update French translation. --- po/fr.po | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/po/fr.po b/po/fr.po index c347792..98ba167 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-11-05 21:13+0100\n" +"PO-Revision-Date: 2013-12-03 23:12+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -12875,10 +12875,8 @@ msgid "Select Drive Letter" msgstr "Sélectionnez la lettre du lecteur" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Configuration de Wine" +msgstr "Configuration des lecteurs" #: winecfg.rc:227 msgid "" @@ -13158,10 +13156,8 @@ msgid "Letter" msgstr "Lettre" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Nouveau dossier" +msgstr "Dossier cible" #: winecfg.rc:79 msgid ""

1 0

Michael Stefaniuc : comctl32/tests: Finally compile with -D__WINESRC__.
by Alexandre Julliard Dec. 4, 2013

Dec. 4, 2013

Module: wine Branch: master Commit: 5092ecf6fef9de7223f6e779543f6a2aad3544e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5092ecf6fef9de7223f6e7795… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 4 00:49:00 2013 +0100 comctl32/tests: Finally compile with -D__WINESRC__. --- dlls/comctl32/tests/Makefile.in | 1 - dlls/comctl32/tests/comboex.c | 2 +- dlls/comctl32/tests/header.c | 4 ++-- dlls/comctl32/tests/imagelist.c | 4 ++-- dlls/comctl32/tests/listview.c | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 55aea9c..670f52e 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = comctl32.dll IMPORTS = comctl32 ole32 user32 gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ comboex.c \ diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index b50db38..b0904d3 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -496,7 +496,7 @@ static BOOL init(void) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = ComboExTestClass; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 4ef4b5d..85437d0 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -459,7 +459,7 @@ static BOOL register_parent_wnd_class(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Header test parent class"; @@ -1661,7 +1661,7 @@ static BOOL init(void) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = "HeaderTestClass"; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index e11ee1d..caf7539 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -145,8 +145,8 @@ static HWND create_a_window(void) cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = 0; - cls.hIcon = LoadIconA (0, IDI_APPLICATION); - cls.hCursor = LoadCursorA (0, IDC_ARROW); + cls.hIcon = LoadIconA(0, (LPCSTR)IDI_APPLICATION); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject (WHITE_BRUSH); cls.lpszMenuName = 0; cls.lpszClassName = className; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3c6ceef..f5d0a01 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -524,7 +524,7 @@ static BOOL register_parent_wnd_class(BOOL Unicode) clsW.cbWndExtra = 0; clsW.hInstance = GetModuleHandleW(NULL); clsW.hIcon = 0; - clsW.hCursor = LoadCursorA(0, IDC_ARROW); + clsW.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); clsW.hbrBackground = GetStockObject(WHITE_BRUSH); clsW.lpszMenuName = NULL; clsW.lpszClassName = testparentclassW; @@ -537,7 +537,7 @@ static BOOL register_parent_wnd_class(BOOL Unicode) clsA.cbWndExtra = 0; clsA.hInstance = GetModuleHandleA(NULL); clsA.hIcon = 0; - clsA.hCursor = LoadCursorA(0, IDC_ARROW); + clsA.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); clsA.hbrBackground = GetStockObject(WHITE_BRUSH); clsA.lpszMenuName = NULL; clsA.lpszClassName = "Listview test parent class";

1 0

Nikolay Sivov : qmgr: Rearrange BSC methods in a natural way, call with proper wrapper.
by Alexandre Julliard Dec. 4, 2013

Dec. 4, 2013

Module: wine Branch: master Commit: 5edaed3ee3837e9b267039d54c65385edd8fb273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5edaed3ee3837e9b267039d54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 4 09:58:56 2013 +0400 qmgr: Rearrange BSC methods in a natural way, call with proper wrapper. --- dlls/qmgr/file.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index eeb2725..6d3cca9 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -223,6 +223,25 @@ static inline DLBindStatusCallback *impl_from_IBindStatusCallback(IBindStatusCal return CONTAINING_RECORD(iface, DLBindStatusCallback, IBindStatusCallback_iface); } +static HRESULT WINAPI DLBindStatusCallback_QueryInterface( + IBindStatusCallback *iface, + REFIID riid, + void **ppvObject) +{ + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IBindStatusCallback)) + { + *ppvObject = &This->IBindStatusCallback_iface; + IBindStatusCallback_AddRef(iface); + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + static ULONG WINAPI DLBindStatusCallback_AddRef(IBindStatusCallback *iface) { DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); @@ -243,25 +262,6 @@ static ULONG WINAPI DLBindStatusCallback_Release(IBindStatusCallback *iface) return ref; } -static HRESULT WINAPI DLBindStatusCallback_QueryInterface( - IBindStatusCallback *iface, - REFIID riid, - void **ppvObject) -{ - DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IBindStatusCallback)) - { - *ppvObject = &This->IBindStatusCallback_iface; - DLBindStatusCallback_AddRef(iface); - return S_OK; - } - - *ppvObject = NULL; - return E_NOINTERFACE; -} - static HRESULT WINAPI DLBindStatusCallback_GetBindInfo( IBindStatusCallback *iface, DWORD *grfBINDF,

1 0

Huw Davies : ntdll: Don' t reduce the size of the local buffer when we come to read another batch of entries .
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: fed9f67bc4e40cecf2fc560004b8d9cd0a4329e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed9f67bc4e40cecf2fc56000… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 3 13:06:21 2013 +0000 ntdll: Don't reduce the size of the local buffer when we come to read another batch of entries. In the wildcard case, we can't know how much to reduce it by anyway. --- dlls/ntdll/directory.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 0306f77..9e8b8fc 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1849,9 +1849,6 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff continue; } if (size < initial_size) break; /* already restarted once, give up now */ - size = min( size, length - io->Information ); - /* if size is too small don't bother to continue */ - if (size < max_dir_info_size(class) && last_info) break; restart_last_info = last_info; restart_info_pos = io->Information; restart:

1 0

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: 58d96f76654e5c63fe4ad5dc677f0890adc962f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d96f76654e5c63fe4ad5dc6… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Dec 3 20:44:02 2013 +0200 po: Update Lithuanian translation. --- po/lt.po | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index d0082a2..c38f62f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-11-06 08:20+0300\n" +"PO-Revision-Date: 2013-12-03 20:42+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -12738,10 +12738,8 @@ msgid "Select Drive Letter" msgstr "Parinkite disko raidę" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "„Wine“ konfigūravimas" +msgstr "Diskų konfigūravimas" #: winecfg.rc:227 msgid "" @@ -13020,10 +13018,8 @@ msgid "Letter" msgstr "Raidė" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Naujas aplankas" +msgstr "Paskirties aplankas" #: winecfg.rc:79 msgid ""

1 0

Stefan Dösinger : ddraw/tests: Test SetSurfaceDesc and Lock interaction.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: 42470bae678508490d2b2c62f59d58ede72c9797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42470bae678508490d2b2c62f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 3 13:44:37 2013 +0100 ddraw/tests: Test SetSurfaceDesc and Lock interaction. --- dlls/ddraw/tests/ddraw2.c | 14 ++++++++++++++ dlls/ddraw/tests/ddraw4.c | 14 ++++++++++++++ dlls/ddraw/tests/ddraw7.c | 15 +++++++++++++++ 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 209a473..417e0be 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4467,7 +4467,21 @@ static void test_set_surface_desc(void) /* Redundantly setting the same lpSurface is not an error. */ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == NULL, "lpSurface is %p, expected NULL.\n", ddsd.lpSurface); + + hr = IDirectDrawSurface3_Lock(surface3, NULL, &ddsd, 0, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == data, "lpSurface is %p, expected %p.\n", data, data); + hr = IDirectDrawSurface3_Unlock(surface3, NULL); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e7beb3f..b1b01bb 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5068,7 +5068,21 @@ static void test_set_surface_desc(void) /* Redundantly setting the same lpSurface is not an error. */ hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == NULL, "lpSurface is %p, expected NULL.\n", ddsd.lpSurface); + + hr = IDirectDrawSurface4_Lock(surface, NULL, &ddsd, 0, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == data, "lpSurface is %p, expected %p.\n", data, data); + hr = IDirectDrawSurface4_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 76ff437..fe1d35f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4956,6 +4956,21 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == NULL, "lpSurface is %p, expected NULL.\n", ddsd.lpSurface); + + hr = IDirectDrawSurface7_Lock(surface, NULL, &ddsd, 0, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == data, "lpSurface is %p, expected %p.\n", data, data); + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr);

1 0