February 2012 - Wine-commits

Andrew Eikum : hlink: Don' t query the IHlinkSite if the IMoniker is a system moniker.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: d1f6a5a376515654636c1aa51cedb4f2ec6de318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f6a5a376515654636c1aa51… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 3 13:17:49 2012 -0600 hlink: Don't query the IHlinkSite if the IMoniker is a system moniker. --- dlls/hlink/link.c | 13 ++++++ dlls/hlink/tests/hlink.c | 108 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 89 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1f6a5a376515654636c1…

1 0

Aric Stewart : quartz: Do not report a position unless the filter graph is running or has been paused .
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 10b2a21c3b1fffa8d69bcd667d221be21cf7ab4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b2a21c3b1fffa8d69bcd667… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 3 14:24:06 2012 -0600 quartz: Do not report a position unless the filter graph is running or has been paused. --- dlls/quartz/filtergraph.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 911e68c..683877f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2457,12 +2457,14 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG hr = all_renderers_seek(This, FoundCurrentPosition, (DWORD_PTR)pCurrent); if (hr == E_NOTIMPL) { LONGLONG time = 0; - if (This->refClock) + if (This->state == State_Running && This->refClock && This->start_time >= 0) { IReferenceClock_GetTime(This->refClock, &time); if (time) time -= This->start_time; } + if (This->pause_time > 0) + time += This->pause_time; *pCurrent = time; hr = S_OK; }

1 0

Hans Leidekker : mscms/tests: Pass profiles names as parameters instead of using global variables.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 2cbb384440a4e4df9b5c9aa282fd18ca38815152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cbb384440a4e4df9b5c9aa28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 3 10:48:17 2012 +0100 mscms/tests: Pass profiles names as parameters instead of using global variables. --- dlls/mscms/tests/profile.c | 97 +++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 54 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index d4293ff..b5bf5aa 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -131,12 +131,6 @@ static const unsigned char rgbheader[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xf6, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x2d, 0xd3, 0x00, 0x00, 0x20, 0x20, 0x50, 0x48 }; -static LPSTR standardprofile; -static LPWSTR standardprofileW; - -static LPSTR testprofile; -static LPWSTR testprofileW; - #define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') static void MSCMS_basenameA( LPCSTR path, LPSTR name ) @@ -227,7 +221,7 @@ static void test_GetColorDirectoryW(void) ok( ret && size > 0, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); } -static void test_GetColorProfileElement(void) +static void test_GetColorProfileElement( char *standardprofile ) { if (standardprofile) { @@ -277,7 +271,7 @@ static void test_GetColorProfileElement(void) } } -static void test_GetColorProfileElementTag(void) +static void test_GetColorProfileElementTag( char *standardprofile ) { if (standardprofile) { @@ -318,7 +312,7 @@ static void test_GetColorProfileElementTag(void) } } -static void test_GetColorProfileFromHandle(void) +static void test_GetColorProfileFromHandle( char *testprofile ) { if (testprofile) { @@ -376,7 +370,7 @@ static void test_GetColorProfileFromHandle(void) } } -static void test_GetColorProfileHeader(void) +static void test_GetColorProfileHeader( char *testprofile ) { if (testprofile) { @@ -417,7 +411,7 @@ static void test_GetColorProfileHeader(void) } } -static void test_GetCountColorProfileElements(void) +static void test_GetCountColorProfileElements( char *standardprofile ) { if (standardprofile) { @@ -453,7 +447,7 @@ static void test_GetCountColorProfileElements(void) } } -static void test_GetStandardColorSpaceProfileA(void) +static void test_GetStandardColorSpaceProfileA( char *standardprofile ) { BOOL ret; DWORD size; @@ -538,7 +532,7 @@ static void test_GetStandardColorSpaceProfileA(void) ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); } -static void test_GetStandardColorSpaceProfileW(void) +static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) { BOOL ret; DWORD size; @@ -644,7 +638,7 @@ static void test_GetStandardColorSpaceProfileW(void) ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); } -static void test_EnumColorProfilesA(void) +static void test_EnumColorProfilesA( char *standardprofile ) { BOOL ret; DWORD total, size, number; @@ -698,7 +692,7 @@ static void test_EnumColorProfilesA(void) HeapFree( GetProcessHeap(), 0, buffer ); } -static void test_EnumColorProfilesW(void) +static void test_EnumColorProfilesW( WCHAR *standardprofileW ) { BOOL ret; DWORD total, size, number; @@ -751,7 +745,7 @@ static void test_EnumColorProfilesW(void) HeapFree( GetProcessHeap(), 0, buffer ); } -static void test_InstallColorProfileA(void) +static void test_InstallColorProfileA( char *standardprofile, char *testprofile ) { BOOL ret; @@ -808,7 +802,7 @@ static void test_InstallColorProfileA(void) } } -static void test_InstallColorProfileW(void) +static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofileW ) { BOOL ret; @@ -865,7 +859,7 @@ static void test_InstallColorProfileW(void) } } -static void test_IsColorProfileTagPresent(void) +static void test_IsColorProfileTagPresent( char *standardprofile ) { if (standardprofile) { @@ -905,7 +899,7 @@ static void test_IsColorProfileTagPresent(void) } } -static void test_OpenColorProfileA(void) +static void test_OpenColorProfileA( char *standardprofile ) { PROFILE profile; HPROFILE handle; @@ -965,7 +959,7 @@ static void test_OpenColorProfileA(void) } } -static void test_OpenColorProfileW(void) +static void test_OpenColorProfileW( WCHAR *standardprofileW ) { PROFILE profile; HPROFILE handle; @@ -1015,7 +1009,7 @@ static void test_OpenColorProfileW(void) } } -static void test_SetColorProfileElement(void) +static void test_SetColorProfileElement( char *testprofile ) { if (testprofile) { @@ -1077,7 +1071,7 @@ static void test_SetColorProfileElement(void) } } -static void test_SetColorProfileHeader(void) +static void test_SetColorProfileHeader( char *testprofile ) { if (testprofile) { @@ -1148,7 +1142,7 @@ static void test_SetColorProfileHeader(void) } } -static void test_UninstallColorProfileA(void) +static void test_UninstallColorProfileA( char *testprofile ) { BOOL ret; @@ -1196,7 +1190,7 @@ static void test_UninstallColorProfileA(void) } } -static void test_UninstallColorProfileW(void) +static void test_UninstallColorProfileW( WCHAR *testprofileW ) { BOOL ret; @@ -1248,7 +1242,7 @@ static void test_UninstallColorProfileW(void) } } -static void test_AssociateColorProfileWithDeviceA(void) +static void test_AssociateColorProfileWithDeviceA( char *testprofile ) { BOOL ret; char profile[MAX_PATH], basename[MAX_PATH]; @@ -1331,10 +1325,10 @@ START_TEST(profile) { UINT len; HANDLE handle; - char path[MAX_PATH], file[MAX_PATH]; - char profilefile1[MAX_PATH], profilefile2[MAX_PATH]; - WCHAR profilefile1W[MAX_PATH], profilefile2W[MAX_PATH]; - WCHAR fileW[MAX_PATH]; + char path[MAX_PATH], file[MAX_PATH], profilefile1[MAX_PATH], profilefile2[MAX_PATH]; + WCHAR profilefile1W[MAX_PATH], profilefile2W[MAX_PATH], fileW[MAX_PATH]; + char *standardprofile = NULL, *testprofile = NULL; + WCHAR *standardprofileW = NULL, *testprofileW = NULL; UINT ret; hmscms = LoadLibraryA( "mscms.dll" ); @@ -1395,10 +1389,8 @@ START_TEST(profile) if (CopyFileA( standardprofile, file, FALSE )) { testprofile = (LPSTR)&file; - len = MultiByteToWideChar( CP_ACP, 0, testprofile, -1, NULL, 0 ); MultiByteToWideChar( CP_ACP, 0, testprofile, -1, fileW, len ); - testprofileW = (LPWSTR)&fileW; } } @@ -1407,40 +1399,37 @@ START_TEST(profile) test_GetColorDirectoryA(); test_GetColorDirectoryW(); - test_GetColorProfileElement(); - test_GetColorProfileElementTag(); + test_GetColorProfileElement( standardprofile ); + test_GetColorProfileElementTag( standardprofile ); - test_GetColorProfileFromHandle(); - test_GetColorProfileHeader(); + test_GetColorProfileFromHandle( testprofile ); + test_GetColorProfileHeader( testprofile ); - test_GetCountColorProfileElements(); + test_GetCountColorProfileElements( standardprofile ); - test_GetStandardColorSpaceProfileA(); - test_GetStandardColorSpaceProfileW(); + test_GetStandardColorSpaceProfileA( standardprofile ); + test_GetStandardColorSpaceProfileW( standardprofileW ); - test_EnumColorProfilesA(); - test_EnumColorProfilesW(); + test_EnumColorProfilesA( standardprofile ); + test_EnumColorProfilesW( standardprofileW ); - test_InstallColorProfileA(); - test_InstallColorProfileW(); + test_InstallColorProfileA( standardprofile, testprofile ); + test_InstallColorProfileW( standardprofileW, testprofileW ); - test_IsColorProfileTagPresent(); + test_IsColorProfileTagPresent( standardprofile ); - test_OpenColorProfileA(); - test_OpenColorProfileW(); + test_OpenColorProfileA( standardprofile ); + test_OpenColorProfileW( standardprofileW ); - test_SetColorProfileElement(); - test_SetColorProfileHeader(); + test_SetColorProfileElement( testprofile ); + test_SetColorProfileHeader( testprofile ); - test_UninstallColorProfileA(); - test_UninstallColorProfileW(); + test_UninstallColorProfileA( testprofile ); + test_UninstallColorProfileW( testprofileW ); - test_AssociateColorProfileWithDeviceA(); + test_AssociateColorProfileWithDeviceA( testprofile ); - /* Clean up */ - if (testprofile) - DeleteFileA( testprofile ); - + if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); FreeLibrary( hmscms ); }

1 0

Hans Leidekker : msi: Follow the parent state for preselected features unless the parent is an advertised feature .
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: bca0fd6a5522933c1dcc5dd87c495091ab16eb7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca0fd6a5522933c1dcc5dd87… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 3 10:48:33 2012 +0100 msi: Follow the parent state for preselected features unless the parent is an advertised feature. --- dlls/msi/action.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 663a917..87fc906 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1793,6 +1793,9 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } else if (fl->feature->Attributes & msidbFeatureAttributesFollowParent) { + TRACE("feature %s (level %d request %d) follows parent %s (level %d request %d)\n", + debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, + debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); fl->feature->Action = feature->Action; fl->feature->ActionRequest = feature->ActionRequest; } @@ -1819,6 +1822,23 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + FeatureList *fl; + + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) + { + if (fl->feature->Attributes & msidbFeatureAttributesFollowParent && + (!(feature->Attributes & msidbFeatureAttributesFavorAdvertise))) + { + TRACE("feature %s (level %d request %d) follows parent %s (level %d request %d)\n", + debugstr_w(fl->feature->Feature), fl->feature->Level, fl->feature->ActionRequest, + debugstr_w(feature->Feature), feature->Level, feature->ActionRequest); + fl->feature->Action = feature->Action; + fl->feature->ActionRequest = feature->ActionRequest; + } + } + } } /* now we want to set component state based based on feature state */ @@ -1826,7 +1846,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { ComponentList *cl; - TRACE("Examining Feature %s (Level %d Installed %d Request %d Action %d)\n", + TRACE("examining feature %s (level %d installed %d request %d action %d)\n", debugstr_w(feature->Feature), feature->Level, feature->Installed, feature->ActionRequest, feature->Action); @@ -1941,7 +1961,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) component->ActionRequest = INSTALLSTATE_UNKNOWN; } - TRACE("Result: Component %s (Installed %d Request %d Action %d)\n", + TRACE("component %s (installed %d request %d action %d)\n", debugstr_w(component->Component), component->Installed, component->ActionRequest, component->Action); }

1 0

Hans Leidekker : msi: Avoid a null pointer dereference in MsiGetFileVersionW (clang).
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: bb0b4673669ebf93337bf34eb89251fdc8f25608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb0b4673669ebf93337bf34eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 3 10:49:00 2012 +0100 msi: Avoid a null pointer dereference in MsiGetFileVersionW (clang). --- dlls/msi/msi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index cc83e39..f34bfc9 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3201,18 +3201,18 @@ UINT WINAPI MsiGetFileVersionW( LPCWSTR path, LPWSTR verbuf, LPDWORD verlen, return ERROR_INVALID_PARAMETER; ret = get_file_version( path, verbuf, verlen, langbuf, langlen ); - if (ret == ERROR_RESOURCE_DATA_NOT_FOUND) + if (ret == ERROR_RESOURCE_DATA_NOT_FOUND && verlen) { int len; WCHAR *version = msi_font_version_from_file( path ); if (!version) return ERROR_FILE_INVALID; len = strlenW( version ); - if (*verlen > len) + if (len >= *verlen) ret = ERROR_MORE_DATA; + else if (verbuf) { strcpyW( verbuf, version ); ret = ERROR_SUCCESS; } - else ret = ERROR_MORE_DATA; *verlen = len; msi_free( version ); }

1 0

Henri Verbeet : ddraw/tests: Use correct COM macros in a couple of places.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 98bd3ef8038611f886e9dbf08ae4622ce88d19cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=98bd3ef8038611f886e9dbf08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 2 19:26:37 2012 +0100 ddraw/tests: Use correct COM macros in a couple of places. --- dlls/ddraw/tests/ddraw1.c | 14 +++++++------- dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 3bdce43..c4820b1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -784,15 +784,15 @@ static void test_surface_interface_mismatch(void) cleanup: if (viewport) { - IDirect3DDevice2_DeleteViewport(device, viewport); - IDirect3DViewport2_Release(viewport); + IDirect3DDevice_DeleteViewport(device, viewport); + IDirect3DViewport_Release(viewport); } - if (background) IDirect3DMaterial2_Release(background); + if (background) IDirect3DMaterial_Release(background); if (surface3) IDirectDrawSurface3_Release(surface3); - if (surface) IDirectDrawSurface7_Release(surface); - if (device) IDirect3DDevice2_Release(device); - if (d3d) IDirect3D7_Release(d3d); - if (ddraw) IDirectDraw7_Release(ddraw); + if (surface) IDirectDrawSurface_Release(surface); + if (device) IDirect3DDevice_Release(device); + if (d3d) IDirect3D_Release(d3d); + if (ddraw) IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3bd6e95..73ae501 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -814,10 +814,10 @@ cleanup: } if (background) IDirect3DMaterial2_Release(background); if (surface3) IDirectDrawSurface3_Release(surface3); - if (surface) IDirectDrawSurface7_Release(surface); + if (surface) IDirectDrawSurface_Release(surface); if (device) IDirect3DDevice2_Release(device); - if (d3d) IDirect3D7_Release(d3d); - if (ddraw) IDirectDraw7_Release(ddraw); + if (d3d) IDirect3D2_Release(d3d); + if (ddraw) IDirectDraw2_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d727bee..07509b9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -976,8 +976,8 @@ static void test_surface_interface_mismatch(void) cleanup: if (viewport) { - IDirect3DDevice2_DeleteViewport(device, viewport); - IDirect3DViewport2_Release(viewport); + IDirect3DDevice3_DeleteViewport(device, viewport); + IDirect3DViewport3_Release(viewport); } if (surface3) IDirectDrawSurface3_Release(surface3); if (surface) IDirectDrawSurface4_Release(surface);

1 0

Henri Verbeet : ddraw/tests: Move some helper functions up with the rest of the helper functions.
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 7fda67d74a3ce1a328bdfb84a3c648d89ac8f314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fda67d74a3ce1a328bdfb84a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 2 19:26:38 2012 +0100 ddraw/tests: Move some helper functions up with the rest of the helper functions. --- dlls/ddraw/tests/ddraw2.c | 28 ++++++++++++++-------------- dlls/ddraw/tests/ddraw4.c | 28 ++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 28 ++++++++++++++-------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 73ae501..10c065a 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -95,6 +95,20 @@ static void destroy_window_thread(struct create_window_thread_param *p) CloseHandle(p->thread); } +static IDirectDrawSurface *get_depth_stencil(IDirect3DDevice2 *device) +{ + IDirectDrawSurface *rt, *ret; + DDSCAPS caps = {DDSCAPS_ZBUFFER}; + HRESULT hr; + + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface_Release(rt); + return ret; +} + static D3DCOLOR get_surface_color(IDirectDrawSurface *surface, UINT x, UINT y) { RECT rect = {x, y, x + 1, y + 1}; @@ -841,20 +855,6 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } -static IDirectDrawSurface *get_depth_stencil(IDirect3DDevice2 *device) -{ - IDirectDrawSurface *rt, *ret; - DDSCAPS caps = {DDSCAPS_ZBUFFER}; - HRESULT hr; - - hr = IDirect3DDevice2_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - hr = IDirectDrawSurface_GetAttachedSurface(rt, &caps, &ret); - ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); - IDirectDrawSurface_Release(rt); - return ret; -} - static void test_depth_blit(void) { static D3DLVERTEX quad1[] = diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 07509b9..8d80da6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -130,6 +130,20 @@ static void destroy_window_thread(struct create_window_thread_param *p) CloseHandle(p->thread); } +static IDirectDrawSurface4 *get_depth_stencil(IDirect3DDevice3 *device) +{ + IDirectDrawSurface4 *rt, *ret; + DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; + HRESULT hr; + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface4_Release(rt); + return ret; +} + static D3DCOLOR get_surface_color(IDirectDrawSurface4 *surface, UINT x, UINT y) { RECT rect = {x, y, x + 1, y + 1}; @@ -1007,20 +1021,6 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } -static IDirectDrawSurface4 *get_depth_stencil(IDirect3DDevice3 *device) -{ - IDirectDrawSurface4 *rt, *ret; - DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; - HRESULT hr; - - hr = IDirect3DDevice3_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); - hr = IDirectDrawSurface4_GetAttachedSurface(rt, &caps, &ret); - ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); - IDirectDrawSurface4_Release(rt); - return ret; -} - static void test_depth_blit(void) { static struct diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ecafcec..e542a27 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -139,6 +139,20 @@ static void destroy_window_thread(struct create_window_thread_param *p) CloseHandle(p->thread); } +static IDirectDrawSurface7 *get_depth_stencil(IDirect3DDevice7 *device) +{ + IDirectDrawSurface7 *rt, *ret; + DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; + HRESULT hr; + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface7_Release(rt); + return ret; +} + static D3DCOLOR get_surface_color(IDirectDrawSurface7 *surface, UINT x, UINT y) { RECT rect = {x, y, x + 1, y + 1}; @@ -946,20 +960,6 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } -static IDirectDrawSurface7 *get_depth_stencil(IDirect3DDevice7 *device) -{ - IDirectDrawSurface7 *rt, *ret; - DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; - HRESULT hr; - - hr = IDirect3DDevice7_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); - hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &ret); - ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); - IDirectDrawSurface7_Release(rt); - return ret; -} - static void test_depth_blit(void) { IDirect3DDevice7 *device;

1 0

Hans Leidekker : dnsapi: Remove a dead assignment (clang).
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 06cd0e2a498dd1008550aea2f9a19cd8f69ea617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06cd0e2a498dd1008550aea2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 3 10:47:42 2012 +0100 dnsapi: Remove a dead assignment (clang). --- dlls/dnsapi/query.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 8de33e6..72490c5 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -159,8 +159,7 @@ static char *dns_dname_from_msg( ns_msg msg, const unsigned char *pos ) char *str, dname[NS_MAXDNAME] = "."; /* returns *compressed* length, ignore it */ - len = dns_ns_name_uncompress( ns_msg_base( msg ), ns_msg_end( msg ), - pos, dname, sizeof(dname) ); + dns_ns_name_uncompress( ns_msg_base(msg), ns_msg_end(msg), pos, dname, sizeof(dname) ); len = strlen( dname ); str = heap_alloc( len + 1 );

1 0

Hans Leidekker : mscms: Use the return values of GetStandardColorSpaceProfileW and GetColorDirectoryW (clang).
by Alexandre Julliard 06 Feb '12

06 Feb '12

Module: wine Branch: master Commit: 0cf1bdf96e1049bd9fda3bdaeaaf486a7505c201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf1bdf96e1049bd9fda3bdae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 3 10:48:03 2012 +0100 mscms: Use the return values of GetStandardColorSpaceProfileW and GetColorDirectoryW (clang). --- dlls/mscms/profile.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index c4eae9d..54e4afd 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -253,13 +253,12 @@ BOOL WINAPI GetColorDirectoryA( PCSTR machine, PSTR buffer, PDWORD size ) { ret = GetColorDirectoryW( NULL, NULL, &sizeW ); *size = sizeW / sizeof(WCHAR); - return FALSE; + return ret; } sizeW = *size * sizeof(WCHAR); bufferW = HeapAlloc( GetProcessHeap(), 0, sizeW ); - if (bufferW) { if ((ret = GetColorDirectoryW( NULL, bufferW, &sizeW ))) @@ -594,11 +593,10 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile { ret = GetStandardColorSpaceProfileW( NULL, id, NULL, &sizeW ); *size = sizeW / sizeof(WCHAR); - return FALSE; + return ret; } profileW = HeapAlloc( GetProcessHeap(), 0, sizeW ); - if (profileW) { if ((ret = GetStandardColorSpaceProfileW( NULL, id, profileW, &sizeW )))

1 0

Frédéric Delanoy : French translation for release 1.4-rc2
by Jeremy Newman 06 Feb '12

06 Feb '12

Module: website Branch: master Commit: e76eab26dab85e0b8488b11cd9d881b3e7363ef4 URL: http://source.winehq.org/git/website.git/?a=commit;h=e76eab26dab85e0b8488b1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 3 00:03:29 2012 +0100 French translation for release 1.4-rc2 --- news/fr/2012020201.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/fr/2012020201.xml b/news/fr/2012020201.xml new file mode 100644 index 0000000..d685ac9 --- /dev/null +++ b/news/fr/2012020201.xml @@ -0,0 +1,15 @@ +<news> +<date>2 février 2012</date> +<title>Sortie de Wine 1.4-rc2</title> +<body> + La version de développement 1.4-rc2 de Wine est disponible. + <a href="{$root}/announce/1.4-rc2">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bogues uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc2.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0