May 2012 - Wine-Commits - list.winehq.org

Alexandre Julliard : iphlpapi/tests: Avoid test failures when IPv6 is not supported.
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: 153e163b27d27e5f8ce5d40151dd989f7a650de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=153e163b27d27e5f8ce5d4015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 10:10:45 2012 +0200 iphlpapi/tests: Avoid test failures when IPv6 is not supported. --- dlls/iphlpapi/tests/iphlpapi.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 188528e..aabcf04 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -552,7 +552,8 @@ static void testGetIcmpStatisticsEx(void) } apiReturn = pGetIcmpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR, "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { INT i; @@ -610,7 +611,8 @@ static void testGetIpStatisticsEx(void) } apiReturn = pGetIpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR, "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "IP Ex stats:\n" ); @@ -678,7 +680,8 @@ static void testGetTcpStatisticsEx(void) } apiReturn = pGetTcpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR, "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "TCP stats:\n" ); @@ -728,7 +731,8 @@ static void testGetUdpStatisticsEx(void) } apiReturn = pGetUdpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR, "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "UDP stats:\n" );

1 0

Alexandre Julliard : urlmon/tests: Allow multiple COOKIE_SENT notifications , and trace received progress messages.
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: b3e5d2c1e538a4f61abe7f41e42a2c016e59f1d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e5d2c1e538a4f61abe7f41e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 11:12:34 2012 +0200 urlmon/tests: Allow multiple COOKIE_SENT notifications, and trace received progress messages. --- dlls/urlmon/tests/protocol.c | 66 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index e33a407..9c864e2 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -568,8 +568,6 @@ static void call_continue(PROTOCOLDATA *protocol_data) HRESULT hres; if(state == STATE_CONNECTING) { - if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) - CLEAR_CALLED(ReportProgress_COOKIE_SENT); if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST || tested_protocol == FTP_TEST) { if (http_is_first){ CLEAR_CALLED(ReportProgress_FINDINGRESOURCE); @@ -585,6 +583,8 @@ static void call_continue(PROTOCOLDATA *protocol_data) CHECK_CALLED(ReportProgress_REDIRECTING); state = test_async_req ? STATE_SENDINGREQUEST : STATE_STARTDOWNLOADING; } + else if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) + CLEAR_CALLED(ReportProgress_COOKIE_SENT); switch(state) { case STATE_SENDINGREQUEST: @@ -682,6 +682,63 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL return S_OK; } +static const char *status_names[] = +{ + "0", + "FINDINGRESOURCE", + "CONNECTING", + "REDIRECTING", + "BEGINDOWNLOADDATA", + "DOWNLOADINGDATA", + "ENDDOWNLOADDATA", + "BEGINDOWNLOADCOMPONENTS", + "INSTALLINGCOMPONENTS", + "ENDDOWNLOADCOMPONENTS", + "USINGCACHEDCOPY", + "SENDINGREQUEST", + "CLASSIDAVAILABLE", + "MIMETYPEAVAILABLE", + "CACHEFILENAMEAVAILABLE", + "BEGINSYNCOPERATION", + "ENDSYNCOPERATION", + "BEGINUPLOADDATA", + "UPLOADINGDATA", + "ENDUPLOADINGDATA", + "PROTOCOLCLASSID", + "ENCODING", + "VERIFIEDMIMETYPEAVAILABLE", + "CLASSINSTALLLOCATION", + "DECODING", + "LOADINGMIMEHANDLER", + "CONTENTDISPOSITIONATTACH", + "FILTERREPORTMIMETYPE", + "CLSIDCANINSTANTIATE", + "IUNKNOWNAVAILABLE", + "DIRECTBIND", + "RAWMIMETYPE", + "PROXYDETECTING", + "ACCEPTRANGES", + "COOKIE_SENT", + "COMPACT_POLICY_RECEIVED", + "COOKIE_SUPPRESSED", + "COOKIE_STATE_UNKNOWN", + "COOKIE_STATE_ACCEPT", + "COOKIE_STATE_REJECT", + "COOKIE_STATE_PROMPT", + "COOKIE_STATE_LEASH", + "COOKIE_STATE_DOWNGRADE", + "POLICY_HREF", + "P3P_HEADER", + "SESSION_COOKIE_RECEIVED", + "PERSISTENT_COOKIE_RECEIVED", + "SESSION_COOKIES_ALLOWED", + "CACHECONTROL", + "CONTENTDISPOSITIONFILENAME", + "MIMETEXTPLAINMISMATCH", + "PUBLISHERAVAILABLE", + "DISPLAYNAMEAVAILABLE" +}; + static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { @@ -689,6 +746,11 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, '0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0','}',0}; static const WCHAR text_plain[] = {'t','e','x','t','/','p','l','a','i','n',0}; + if (ulStatusCode < sizeof(status_names)/sizeof(status_names[0])) + trace( "progress: %s %s\n", status_names[ulStatusCode], wine_dbgstr_w(szStatusText) ); + else + trace( "progress: %u %s\n", ulStatusCode, wine_dbgstr_w(szStatusText) ); + switch(ulStatusCode) { case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE);

1 0

Alexandre Julliard : urlmon/tests: Fix a test failure on COOKIE_SENT status .
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: 2ded2fe7ad41dfa0346c296db90801104dd8207a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ded2fe7ad41dfa0346c296db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 10:23:19 2012 +0200 urlmon/tests: Fix a test failure on COOKIE_SENT status. --- dlls/urlmon/tests/url.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index c8c2a63..69a2716 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1475,7 +1475,8 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) size = sizeof(DWORD); hres = IWinInetHttpInfo_QueryInfo(http_info, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL, NULL); - ok(hres == expect, "hres = %x, expected %x\n", hres, expect); + ok(hres == expect || (progress == BINDSTATUS_COOKIE_SENT && hres == S_FALSE), + "hres = %x, expected %x\n", hres, expect); if(hres == S_OK) { if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) ok(status == 0, "status = %d\n", status);

1 0

Frédéric Delanoy : Add link to bug triage page in Contributing page
by Jeremy Newman May 2, 2012

May 2, 2012

Module: website Branch: master Commit: 302adb137c7542b64e2248d67d80f0e3aa3098d9 URL: http://source.winehq.org/git/website.git/?a=commit;h=302adb137c7542b64e2248… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 2 02:04:34 2012 +0200 Add link to bug triage page in Contributing page --- templates/en/contributing.template | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/templates/en/contributing.template b/templates/en/contributing.template index 40b05a6..d100afc 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -126,6 +126,7 @@ <li>Being able to analyze a log to determine which libraries to switch from built-in to native and vice versa would be a plus.</li> </ul> +<p>For more information, see our <a href="http://wiki.winehq.org/BugzillaTriage">bug triage page</a>.</p> <h2 id="devel">Development</h2>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.3
by Jeremy Newman May 2, 2012

May 2, 2012

Module: website Branch: master Commit: f4d44b0c49f88274fb1b46532d4bc6fab6aac635 URL: http://source.winehq.org/git/website.git/?a=commit;h=f4d44b0c49f88274fb1b46… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue May 1 15:45:59 2012 +0200 Polish translation for release 1.5.3 --- news/pl/2012042701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012042701.xml b/news/pl/2012042701.xml new file mode 100644 index 0000000..90fd6fc --- /dev/null +++ b/news/pl/2012042701.xml @@ -0,0 +1,17 @@ +<news> +<date>Kwiecień 27, 2012</date> +<title>Wydano Wine 1.5.3</title> +<body> +<p> Wydanie rozwojowe Wine 1.5.3 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.5.3">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa śledzenia granic graficznych.</li> + <li>Kilka poprawek do wbudowanej przeglądarki Internet Explorer.</li> + <li>Możliwość wyświetlania kodu ARM w debuggerze Wine.</li> + <li>Rozmaite ulepszenia w DirectMusic.</li> + <li>Lepsza obsługa przestrzeni nazw w MSXML.</li> + <li>Rozmaite poprawki błędów.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.3.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

André Hentschel : d3drm: Implement IDirect3DRMFrameX_AddLight.
by Alexandre Julliard May 2, 2012

May 2, 2012

Module: wine Branch: master Commit: cfa297e2539f81a22546a5a57f969588647772bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa297e2539f81a22546a5a57… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 1 22:15:49 2012 +0200 d3drm: Implement IDirect3DRMFrameX_AddLight. --- dlls/d3drm/frame.c | 50 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 7f2497d..5a9ff72 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -40,6 +40,9 @@ typedef struct { ULONG nb_visuals; ULONG visuals_capacity; IDirect3DRMVisual** visuals; + ULONG nb_lights; + ULONG lights_capacity; + IDirect3DRMLight** lights; } IDirect3DRMFrameImpl; static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) @@ -213,13 +216,13 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddChild(IDirect3DRMFrame2* iface, } static HRESULT WINAPI IDirect3DRMFrame2Impl_AddLight(IDirect3DRMFrame2* iface, - LPDIRECT3DRMLIGHT light) + LPDIRECT3DRMLIGHT light) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, light); + TRACE("(%p/%p)->(%p)\n", iface, This, light); - return E_NOTIMPL; + return IDirect3DRMFrame3_AddLight(&This->IDirect3DRMFrame3_iface, light); } static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback(IDirect3DRMFrame2* iface, @@ -1104,13 +1107,48 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddChild(IDirect3DRMFrame3* iface, } static HRESULT WINAPI IDirect3DRMFrame3Impl_AddLight(IDirect3DRMFrame3* iface, - LPDIRECT3DRMLIGHT light) + LPDIRECT3DRMLIGHT light) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); + ULONG i; + IDirect3DRMLight** lights; - FIXME("(%p/%p)->(%p): stub\n", iface, This, light); + TRACE("(%p/%p)->(%p)\n", iface, This, light); - return E_NOTIMPL; + if (!light) + return D3DRMERR_BADOBJECT; + + /* Check if already existing and return gracefully without increasing ref count */ + for (i = 0; i < This->nb_lights; i++) + if (This->lights[i] == light) + return D3DRM_OK; + + if ((This->nb_lights + 1) > This->lights_capacity) + { + ULONG new_capacity; + + if (!This->lights_capacity) + { + new_capacity = 16; + lights = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(IDirect3DRMLight*)); + } + else + { + new_capacity = This->lights_capacity * 2; + lights = HeapReAlloc(GetProcessHeap(), 0, This->lights, new_capacity * sizeof(IDirect3DRMLight*)); + } + + if (!lights) + return E_OUTOFMEMORY; + + This->lights_capacity = new_capacity; + This->lights = lights; + } + + This->lights[This->nb_lights++] = light; + IDirect3DRMLight_AddRef(light); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_AddMoveCallback(IDirect3DRMFrame3* iface,

1 0

André Hentschel : d3drm/tests: Add tests for handling lights.
by Alexandre Julliard May 2, 2012

May 2, 2012

Module: wine Branch: master Commit: 9c19ba63a84f0024e3bb0e4febc6da484b47d3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c19ba63a84f0024e3bb0e4fe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 1 22:17:11 2012 +0200 d3drm/tests: Add tests for handling lights. --- dlls/d3drm/tests/d3drm.c | 89 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index e5ab519..8864fff 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -411,6 +411,9 @@ static void test_Frame(void) LPDIRECT3DRMVISUAL pVisual1; LPDIRECT3DRMVISUAL pVisualTmp; LPDIRECT3DRMVISUALARRAY pVisualArray; + LPDIRECT3DRMLIGHT pLight1; + LPDIRECT3DRMLIGHT pLightTmp; + LPDIRECT3DRMLIGHTARRAY pLightArray; DWORD count; hr = pDirect3DRMCreate(&pD3DRM); @@ -639,13 +642,92 @@ static void test_Frame(void) todo_wine CHECK_REFCOUNT(pFrameP1, 3); IDirect3DRMMeshBuilder_Release(pMeshBuilder); + /* [Add/Delete]Light with NULL pointer */ + hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameP1, 3); + + hr = IDirect3DRMFrame_DeleteLight(pFrameP1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameP1, 3); + + /* Create Light */ + hr = IDirect3DRM_CreateLightRGB(pD3DRM, D3DRMLIGHT_SPOT, 0.1, 0.2, 0.3, &pLight1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); + + /* Add Light to first parent */ + hr = IDirect3DRMFrame_AddLight(pFrameP1, pLight1); + ok(hr == D3DRM_OK, "Cannot add light (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pLight1, 2); + + pLightArray = NULL; + hr = IDirect3DRMFrame_GetLights(pFrameP1, &pLightArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr); + if (pLightArray) + { + count = IDirect3DRMLightArray_GetSize(pLightArray); + ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMLightArray_GetElement(pLightArray, 0, &pLightTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pLightTmp == pLight1, "pLightTmp = %p\n", pLightTmp); + IDirect3DRMLight_Release(pLightTmp); + IDirect3DRMLightArray_Release(pLightArray); + } + + /* Delete Light */ + hr = IDirect3DRMFrame_DeleteLight(pFrameP1, pLight1); + ok(hr == D3DRM_OK, "Cannot delete light (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameP1, 3); + IDirect3DRMLight_Release(pLight1); + /* Cleanup */ - IDirect3DRMMeshBuilder_Release(pFrameP2); + IDirect3DRMFrame_Release(pFrameP2); CHECK_REFCOUNT(pFrameC, 2); todo_wine CHECK_REFCOUNT(pFrameP1, 3); - IDirect3DRMMeshBuilder_Release(pFrameC); - IDirect3DRMMeshBuilder_Release(pFrameP1); + IDirect3DRMFrame_Release(pFrameC); + IDirect3DRMFrame_Release(pFrameP1); + + IDirect3DRM_Release(pD3DRM); +} + +static void test_Light(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECT3DRMLIGHT pLight; + D3DRMLIGHTTYPE type; + D3DCOLOR color; + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateLightRGB(pD3DRM, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &pLight); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); + + type = IDirect3DRMLight_GetType(pLight); + todo_wine ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type); + + color = IDirect3DRMLight_GetColor(pLight); + todo_wine ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + + hr = IDirect3DRMLight_SetType(pLight, D3DRMLIGHT_POINT); + todo_wine ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr); + type = IDirect3DRMLight_GetType(pLight); + todo_wine ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type); + + hr = IDirect3DRMLight_SetColor(pLight, 0xff180587); + todo_wine ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + color = IDirect3DRMLight_GetColor(pLight); + todo_wine ok(color == 0xff180587, "wrong color (%x)\n", color); + + hr = IDirect3DRMLight_SetColorRGB(pLight, 0.5, 0.5, 0.5); + todo_wine ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + color = IDirect3DRMLight_GetColor(pLight); + todo_wine ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + + IDirect3DRMLight_Release(pLight); IDirect3DRM_Release(pD3DRM); } @@ -693,6 +775,7 @@ START_TEST(d3drm) test_MeshBuilder(); test_MeshBuilder3(); test_Frame(); + test_Light(); test_d3drm_load(); FreeLibrary(d3drm_handle);

1 0

André Hentschel : d3drm: Implement IDirect3DRMFrameX_DeleteLight.
by Alexandre Julliard May 2, 2012

May 2, 2012

Module: wine Branch: master Commit: 2944d233b8174fc27ba8e039959a95c9572cd3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2944d233b8174fc27ba8e0399… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 1 22:16:10 2012 +0200 d3drm: Implement IDirect3DRMFrameX_DeleteLight. --- dlls/d3drm/frame.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 5a9ff72..8e74264 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -501,13 +501,13 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteChild(IDirect3DRMFrame2* iface } static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteLight(IDirect3DRMFrame2* iface, - LPDIRECT3DRMLIGHT light) + LPDIRECT3DRMLIGHT light) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, light); + TRACE("(%p/%p)->(%p)\n", iface, This, light); - return E_NOTIMPL; + return IDirect3DRMFrame3_DeleteLight(&This->IDirect3DRMFrame3_iface, light); } static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteMoveCallback(IDirect3DRMFrame2* iface, @@ -1463,13 +1463,29 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteChild(IDirect3DRMFrame3* iface } static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteLight(IDirect3DRMFrame3* iface, - LPDIRECT3DRMLIGHT light) + LPDIRECT3DRMLIGHT light) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); + ULONG i; - FIXME("(%p/%p)->(%p): stub\n", iface, This, light); + TRACE("(%p/%p)->(%p)\n", iface, This, light); - return E_NOTIMPL; + if (!light) + return D3DRMERR_BADOBJECT; + + /* Check if visual exists */ + for (i = 0; i < This->nb_lights; i++) + if (This->lights[i] == light) + break; + + if (i == This->nb_lights) + return D3DRMERR_BADVALUE; + + memmove(This->lights + i, This->lights + i + 1, sizeof(IDirect3DRMLight*) * (This->nb_lights - 1 - i)); + IDirect3DRMLight_Release(light); + This->nb_lights--; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteMoveCallback(IDirect3DRMFrame3* iface,

1 0

André Hentschel : d3drm: Add IDirect3DRMLight interface.
by Alexandre Julliard May 2, 2012

May 2, 2012

Module: wine Branch: master Commit: 107b3d2c19e9b4a4d24e86e3a0a5079f587750f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107b3d2c19e9b4a4d24e86e3a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 1 22:15:39 2012 +0200 d3drm: Add IDirect3DRMLight interface. --- dlls/d3drm/Makefile.in | 1 + dlls/d3drm/d3drm.c | 61 +++++--- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/light.c | 405 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 448 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=107b3d2c19e9b4a4d24e8…

1 0

Alexandre Julliard : wing32: Use the correct constant names for CreateDIBSection.
by Alexandre Julliard May 2, 2012

May 2, 2012

Module: wine Branch: master Commit: b7bb7861076d471baf483197f2d53ae1ea3f4ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bb7861076d471baf483197f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 2 12:10:59 2012 +0200 wing32: Use the correct constant names for CreateDIBSection. --- dlls/wing.dll16/wing.c | 2 +- dlls/wing32/wing32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wing.dll16/wing.c b/dlls/wing.dll16/wing.c index fb4aa56..e1f2c07 100644 --- a/dlls/wing.dll16/wing.c +++ b/dlls/wing.dll16/wing.c @@ -178,7 +178,7 @@ HBITMAP16 WINAPI WinGCreateBitmap16(HDC16 hdc, BITMAPINFO *bmpi, SEGPTR *bits) TRACE("(%d,%p,%p): create %dx%dx%d bitmap\n", hdc, bmpi, bits, bmpi->bmiHeader.biWidth, bmpi->bmiHeader.biHeight, bmpi->bmiHeader.biPlanes); - hbitmap = CreateDIBSection( HDC_32(hdc), bmpi, BI_RGB, &bits32, 0, 0 ); + hbitmap = CreateDIBSection( HDC_32(hdc), bmpi, DIB_RGB_COLORS, &bits32, 0, 0 ); if (hbitmap) { SEGPTR segptr = alloc_segptr_bits( hbitmap, bits32 ); diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index ac74986..7ec5914 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -60,7 +60,7 @@ BOOL WINAPI WinGRecommendDIBFormat( BITMAPINFO *bmi ) */ HBITMAP WINAPI WinGCreateBitmap( HDC hdc, BITMAPINFO *bmi, void **bits ) { - return CreateDIBSection( hdc, bmi, 0, bits, 0, 0 ); + return CreateDIBSection( hdc, bmi, DIB_RGB_COLORS, bits, 0, 0 ); } /***********************************************************************

1 0