wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Damjan Jovanovic : wine.desktop: Add Serbian translation.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: f5a5371733b1bbbee96bef985c6c14d9a2e388ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a5371733b1bbbee96bef985… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 3 04:32:53 2010 +0200 wine.desktop: Add Serbian translation. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index db4254d..e369af9 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -15,6 +15,7 @@ Name[it]=Wine Carica Programmi Windows Name[da]=Wine, Programstarter til Windows-programmer Name[nb]=Wine Programlaster for Windowsapplikasjoner Name[nn]=Wine Programlaster for Windowsapplikasjoner +Name[sr]=Wine - дизач Windows програма Exec=wine start /unix %f MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk; NoDisplay=true

1 0

Austin English : msvcrt/tests: Add more tests for setlocale().
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 3c09ca128d73e17078b90b8f4314eb5b813b3f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c09ca128d73e17078b90b8f4… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 2 16:40:24 2010 -0500 msvcrt/tests: Add more tests for setlocale(). --- dlls/msvcrt/tests/locale.c | 483 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 483 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c09ca128d73e17078b90…

1 0

Rico Schüller : ddraw: Change return to break in PixelFormat_WineD3DtoDD().
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: cef28bb3a2c2f0b3bd921f42a60eb92a67ab19f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef28bb3a2c2f0b3bd921f42a… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun May 2 19:35:25 2010 +0200 ddraw: Change return to break in PixelFormat_WineD3DtoDD(). --- dlls/ddraw/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 7641f51..ed8b480 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -182,7 +182,7 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->u3.dwGBitMask = 0x00F0; DDPixelFormat->u4.dwBBitMask = 0x000F; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; - return; + break; /* How are Z buffer bit depth and Stencil buffer bit depth related? */ @@ -236,8 +236,8 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->u3.dwZBitMask = 0x00FFFFFFFF; DDPixelFormat->u4.dwStencilBitMask = 0x00000000; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; - break; + case WINED3DFMT_S1_UINT_D15_UNORM: DDPixelFormat->dwFlags = DDPF_ZBUFFER | DDPF_STENCILBUFFER; DDPixelFormat->dwFourCC = 0;

1 0

Austin English : msvcrt/tests: fix a couple typos.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: b581fc5b0b7c8239fda3649ef49dbdc7624ef041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b581fc5b0b7c8239fda3649ef… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 2 05:40:23 2010 -0500 msvcrt/tests: fix a couple typos. --- dlls/msvcrt/tests/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 4c4b7a9..a6847b4 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -77,7 +77,7 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "German"); todo_wine ok(!strcmp(ret, "German_Germany.1252"), "ret = %s\n", ret); - /* This test shows that _country_synonims table is incorrect */ + /* This test shows that _country_synonyms table is incorrect */ /* It translates "America" to "US" */ ret = setlocale(LC_ALL, "America"); ok(ret == NULL, "ret = %s\n", ret); @@ -108,7 +108,7 @@ static void test_crtGetStringTypeW(void) } if(!pmemcpy_s) { - win_skip("To old version of msvcrt.dll\n"); + win_skip("Too old version of msvcrt.dll\n"); return; }

1 0

Nikolay Sivov : ole32/ole2: If no effect action selected use ::DragLeave() instead of ::Drop().
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: f3ab3d971a793f7fa16d7ae3853a878d3c5546b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ab3d971a793f7fa16d7ae38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 2 12:56:47 2010 +0400 ole32/ole2: If no effect action selected use ::DragLeave() instead of ::Drop(). --- dlls/ole32/ole2.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index b20be1d..2e4da53 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2196,7 +2196,7 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) * If we end-up over a target, drop the object in the target or * inform the target that the operation was cancelled. */ - if (trackerInfo->curDragTarget!=0) + if (trackerInfo->curDragTarget) { switch (trackerInfo->returnValue) { @@ -2205,14 +2205,16 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) * the drop target that we just dropped the object in it. */ case DRAGDROP_S_DROP: - { - IDropTarget_Drop(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); - break; - } + if (*trackerInfo->pdwEffect != DROPEFFECT_NONE) + IDropTarget_Drop(trackerInfo->curDragTarget, + trackerInfo->dataObject, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, + trackerInfo->pdwEffect); + else + IDropTarget_DragLeave(trackerInfo->curDragTarget); + break; + /* * If the source told us that we should cancel, fool the drop * target by telling it that the mouse left it's window.

1 0

Nikolay Sivov : ole32/ole2: After IDropTarget::DragEnter() failure target doesn't count as valid.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 9c44ed8a6bc713d89f88ab20130b807db20639a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c44ed8a6bc713d89f88ab201… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 2 12:49:37 2010 +0400 ole32/ole2: After IDropTarget::DragEnter() failure target doesn't count as valid. --- dlls/ole32/ole2.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index e21f0ac..b20be1d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2081,13 +2081,21 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) /* * If there is, notify it that we just dragged-in */ - if (trackerInfo->curDragTarget!=0) + if (trackerInfo->curDragTarget) { - IDropTarget_DragEnter(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); + hr = IDropTarget_DragEnter(trackerInfo->curDragTarget, + trackerInfo->dataObject, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, + trackerInfo->pdwEffect); + + /* failed DragEnter() means invalid target */ + if (hr != S_OK) + { + trackerInfo->curDragTargetHWND = 0; + trackerInfo->curTargetHWND = 0; + trackerInfo->curDragTarget = 0; + } } } else

1 0

Nikolay Sivov : ole32/tests: Additional test for RevokeDragDrop with destroyed window.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 071d16d62444f5695f511a46023e03394f7bdd40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=071d16d62444f5695f511a460… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 2 03:01:36 2010 +0400 ole32/tests: Additional test for RevokeDragDrop with destroyed window. --- dlls/ole32/tests/dragdrop.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index ce60978..e098354 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -335,6 +335,23 @@ static void test_Register_Revoke(void) ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); DestroyWindow(hwnd); + + /* try to revoke with already destroyed window */ + OleInitialize(NULL); + + hwnd = CreateWindowA("WineOleTestClass", "Test", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, + NULL, NULL, NULL); + + hr = RegisterDragDrop(hwnd, &DropTarget); + ok(hr == S_OK, "got 0x%08x\n", hr); + + DestroyWindow(hwnd); + + hr = RevokeDragDrop(hwnd); + ok(hr == DRAGDROP_E_INVALIDHWND, "got 0x%08x\n", hr); + + OleUninitialize(); } static void test_DoDragDrop(void)

1 0

Nikolay Sivov : ole32/ole2: Fix simple parameter handling for DoDragDrop().
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 5426320d82201a16fa0a9fe1d30ff8279368575b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5426320d82201a16fa0a9fe1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 1 21:37:46 2010 +0400 ole32/ole2: Fix simple parameter handling for DoDragDrop(). --- dlls/ole32/ole2.c | 7 +- dlls/ole32/tests/dragdrop.c | 213 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 216 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 45f2220..e21f0ac 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -490,13 +490,14 @@ HRESULT WINAPI DoDragDrop ( HWND hwndTrackWindow; MSG msg; - TRACE("(DataObject %p, DropSource %p)\n", pDataObject, pDropSource); + TRACE("(%p, %p, %d, %p)\n", pDataObject, pDropSource, dwOKEffect, pdwEffect); + + if (!pDataObject || !pDropSource || !pdwEffect) + return E_INVALIDARG; /* * Setup the drag n drop tracking window. */ - if (!IsValidInterface((LPUNKNOWN)pDropSource)) - return E_INVALIDARG; trackerInfo.dataObject = pDataObject; trackerInfo.dropSource = pDropSource; diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index ce08bc3..ce60978 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -105,6 +105,170 @@ static const IDropTargetVtbl DropTarget_VTbl = static IDropTarget DropTarget = { &DropTarget_VTbl }; +/** stub IDropSource **/ +static HRESULT WINAPI DropSource_QueryInterface(IDropSource *iface, REFIID riid, void **ppObj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDropSource)) + { + *ppObj = iface; + IDropSource_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI DropSource_AddRef(IDropSource *iface) +{ + return 2; +} + +static ULONG WINAPI DropSource_Release(IDropSource *iface) +{ + return 1; +} + +static HRESULT WINAPI DropSource_QueryContinueDrag( + IDropSource *iface, + BOOL fEscapePressed, + DWORD grfKeyState) +{ + /* always drop */ + return DRAGDROP_S_DROP; +} + +static HRESULT WINAPI DropSource_GiveFeedback( + IDropSource *iface, + DWORD dwEffect) +{ + return DRAGDROP_S_USEDEFAULTCURSORS; +} + +static const IDropSourceVtbl dropsource_vtbl = { + DropSource_QueryInterface, + DropSource_AddRef, + DropSource_Release, + DropSource_QueryContinueDrag, + DropSource_GiveFeedback +}; + +static IDropSource DropSource = { &dropsource_vtbl }; + +/** IDataObject stub **/ +static HRESULT WINAPI DataObject_QueryInterface( + IDataObject *iface, + REFIID riid, + void **pObj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDataObject)) + { + *pObj = iface; + IDataObject_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI DataObject_AddRef(IDataObject *iface) +{ + return 2; +} + +static ULONG WINAPI DataObject_Release(IDataObject *iface) +{ + return 1; +} + +static HRESULT WINAPI DataObject_GetData( + IDataObject *iface, + FORMATETC *pformatetcIn, + STGMEDIUM *pmedium) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_GetDataHere( + IDataObject *iface, + FORMATETC *pformatetc, + STGMEDIUM *pmedium) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_QueryGetData( + IDataObject *iface, + FORMATETC *pformatetc) +{ + return S_OK; +} + +static HRESULT WINAPI DataObject_GetCanonicalFormatEtc( + IDataObject *iface, + FORMATETC *pformatectIn, + FORMATETC *pformatetcOut) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_SetData( + IDataObject *iface, + FORMATETC *pformatetc, + STGMEDIUM *pmedium, + BOOL fRelease) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumFormatEtc( + IDataObject *iface, + DWORD dwDirection, + IEnumFORMATETC **ppenumFormatEtc) +{ + return S_OK; +} + +static HRESULT WINAPI DataObject_DAdvise( + IDataObject *iface, + FORMATETC *pformatetc, + DWORD advf, + IAdviseSink *pAdvSink, + DWORD *pdwConnection) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_DUnadvise( + IDataObject *iface, + DWORD dwConnection) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumDAdvise( + IDataObject *iface, + IEnumSTATDATA **ppenumAdvise) +{ + return E_NOTIMPL; +} + +static const IDataObjectVtbl dataobject_vtbl = { + DataObject_QueryInterface, + DataObject_AddRef, + DataObject_Release, + DataObject_GetData, + DataObject_GetDataHere, + DataObject_QueryGetData, + DataObject_GetCanonicalFormatEtc, + DataObject_SetData, + DataObject_EnumFormatEtc, + DataObject_DAdvise, + DataObject_DUnadvise, + DataObject_EnumDAdvise +}; + +static IDataObject DataObject = { &dataobject_vtbl }; + static ATOM register_dummy_class(void) { WNDCLASS wc = @@ -129,7 +293,7 @@ static void test_Register_Revoke(void) HRESULT hr; HWND hwnd; - hwnd = CreateWindow(MAKEINTATOM(register_dummy_class()), "Test", 0, + hwnd = CreateWindowA("WineOleTestClass", "Test", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL); @@ -173,7 +337,54 @@ static void test_Register_Revoke(void) DestroyWindow(hwnd); } +static void test_DoDragDrop(void) +{ + DWORD effect; + HRESULT hr; + HWND hwnd; + + hwnd = CreateWindowA("WineOleTestClass", "Test", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, + NULL, NULL, NULL); + ok(IsWindow(hwnd), "failed to create window\n"); + + hr = OleInitialize(NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = RegisterDragDrop(hwnd, &DropTarget); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* incomplete arguments set */ + hr = DoDragDrop(NULL, NULL, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(NULL, &DropSource, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(&DataObject, NULL, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(NULL, NULL, 0, &effect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(&DataObject, &DropSource, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(NULL, &DropSource, 0, &effect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = DoDragDrop(&DataObject, NULL, 0, &effect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + OleUninitialize(); + + DestroyWindow(hwnd); +} + START_TEST(dragdrop) { + register_dummy_class(); + test_Register_Revoke(); + test_DoDragDrop(); }

1 0

Nikolay Sivov : ole32/tests: Move tests to a separate function.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: a37dfe3584394c1afa2e66daa45aa26b273e84da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37dfe3584394c1afa2e66daa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 1 13:37:42 2010 +0400 ole32/tests: Move tests to a separate function. --- dlls/ole32/tests/dragdrop.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index b28a831..ce08bc3 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -124,7 +124,7 @@ static ATOM register_dummy_class(void) return RegisterClass(&wc); } -START_TEST(dragdrop) +static void test_Register_Revoke(void) { HRESULT hr; HWND hwnd; @@ -172,3 +172,8 @@ START_TEST(dragdrop) DestroyWindow(hwnd); } + +START_TEST(dragdrop) +{ + test_Register_Revoke(); +}

1 0

Vincent Pelletier : ddraw: Fix discrepancy in alpha mask for WINED3DFMT_B2G3R3A8_UNORM.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 40cd9a7ff0b0d9af6e118df1a3cd8fea34979cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cd9a7ff0b0d9af6e118df1a… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sun May 2 08:26:21 2010 +0200 ddraw: Fix discrepancy in alpha mask for WINED3DFMT_B2G3R3A8_UNORM. --- dlls/ddraw/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index f9fd00f..7641f51 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -171,7 +171,7 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->u2.dwRBitMask = 0x00E0; DDPixelFormat->u3.dwGBitMask = 0x001C; DDPixelFormat->u4.dwBBitMask = 0x0003; - DDPixelFormat->u5.dwRGBAlphaBitMask = 0xF000; + DDPixelFormat->u5.dwRGBAlphaBitMask = 0xFF00; break; case WINED3DFMT_B4G4R4X4_UNORM:

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010