wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Dmitry Timoshkov : windowscodecs: Fix some typos in the tEXt metadata test.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 9cc82dd644735a95b4aa8f9eaebac377f9fdc29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc82dd644735a95b4aa8f9ea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 25 19:13:24 2012 +0900 windowscodecs: Fix some typos in the tEXt metadata test. --- dlls/windowscodecs/tests/metadata.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 4cfc53c..09e26ca 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -205,8 +205,8 @@ static void test_metadata_tEXt(void) ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); ok(id.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); ok(!strcmp(U(id).pszVal, "winetest"), "unexpected id: %s\n", U(id).pszVal); - ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); - ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(id).pszVal); + ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", value.vt); + ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(value).pszVal); PropVariantClear(&schema); PropVariantClear(&id); @@ -240,7 +240,7 @@ static void test_metadata_tEXt(void) hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value); ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); - ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(id).pszVal); + ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(value).pszVal); PropVariantClear(&value); strcpy(U(id).pszVal, "test"); @@ -265,8 +265,8 @@ static void test_metadata_tEXt(void) hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, &value); ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr); - ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); - ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(id).pszVal); + ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", value.vt); + ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(value).pszVal); PropVariantClear(&value); hr = IWICMetadataReader_GetValueByIndex(reader, 1, NULL, NULL, NULL);

1 0

Michael Stefaniuc : mshtml/tests: Remove stray ok() calls.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 630560ea8fb13c78f490fb269b80a5d36f5c15f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630560ea8fb13c78f490fb269… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 25 11:36:16 2012 +0200 mshtml/tests: Remove stray ok() calls. --- dlls/mshtml/tests/style.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 7b6d69d..262c4d1 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -662,7 +662,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationUnderline(style, VARIANT_TRUE); ok(hres == S_OK, "put_textDecorationUnderline failed: %08x\n", hres); - ok(b == VARIANT_FALSE, "textDecorationUnderline = %x\n", b); hres = IHTMLStyle_get_textDecorationUnderline(style, &b); ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); @@ -678,7 +677,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_TRUE); ok(hres == S_OK, "put_textDecorationLineThrough failed: %08x\n", hres); - ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); @@ -694,7 +692,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_TRUE); ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres); - ok(b == VARIANT_FALSE, "textDecorationNone = %x\n", b); hres = IHTMLStyle_get_textDecorationNone(style, &b); ok(hres == S_OK, "get_textDecorationNone failed: %08x\n", hres); @@ -710,7 +707,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationOverline(style, VARIANT_TRUE); ok(hres == S_OK, "put_textDecorationOverline failed: %08x\n", hres); - ok(b == VARIANT_FALSE, "textDecorationOverline = %x\n", b); hres = IHTMLStyle_get_textDecorationOverline(style, &b); ok(hres == S_OK, "get_textDecorationOverline failed: %08x\n", hres); @@ -726,7 +722,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationBlink(style, VARIANT_TRUE); ok(hres == S_OK, "put_textDecorationBlink failed: %08x\n", hres); - ok(b == VARIANT_FALSE, "textDecorationBlink = %x\n", b); hres = IHTMLStyle_get_textDecorationBlink(style, &b); ok(hres == S_OK, "get_textDecorationBlink failed: %08x\n", hres);

1 0

Michael Stefaniuc : riched20/tests: Check the correct return value.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 8660d5e77f667d0590ced84ece6d554a95859427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8660d5e77f667d0590ced84ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 25 11:35:10 2012 +0200 riched20/tests: Check the correct return value. --- dlls/riched20/tests/editor.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index f6db413..1ca221d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2440,10 +2440,9 @@ static void test_EM_SCROLL(void) y_before, y_after); y_before = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); - SendMessage(hwndRichEdit, EM_SCROLL, - SB_LINEDOWN, 0); /* line down beyond bot */ + r = SendMessage(hwndRichEdit, EM_SCROLL, SB_LINEDOWN, 0); /* line down beyond bot */ y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); - + ok(r == 0x00010000, "EM_SCROLL line down returned indicating movement (0x%08x)\n", r); ok(y_before == y_after,

1 0

Michael Stefaniuc : urlmon/tests: Fix typo in an ok() message.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 8d73c163451f42e8249f3641ad5fe72d726a55f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d73c163451f42e8249f3641a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 25 11:33:30 2012 +0200 urlmon/tests: Fix typo in an ok() message. --- dlls/urlmon/tests/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 40c8a76..bc6d1be 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -11105,7 +11105,7 @@ static void test_IPersistStream(void) break; } } - ok(props == 0, "%d) No all properties were processed %d. Next property type: %d\n", + ok(props == 0, "%d) Not all properties were processed %d. Next property type: %d\n", i, props, dw_data[0]); IPersistStream_Release(persist_stream);

1 0

Oleksij Rempel : krnl386: Set 11-bit for fixed drive.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 3a8eae3191a71b8783e1215701d667beb1738850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8eae3191a71b8783e121570… Author: Oleksij Rempel <bug-track(a)fisher-privat.net> Date: Fri May 25 10:58:50 2012 +0200 krnl386: Set 11-bit for fixed drive. --- dlls/krnl386.exe16/int21.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 14dbdfe..f25194b 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -2495,6 +2495,10 @@ static void INT21_Ioctl_Block( CONTEXT *context ) /* CDROM should be set to remote. If it set the app will * call int2f to check if it cdrom or remote drive. */ SET_DX( context, (1<<12) ); + else if (drivetype == DRIVE_FIXED) + /* This should define if drive support 0x0d, 0x0f and 0x08 + * requests. The local fixed drive should do. */ + SET_DX( context, (1<<11) ); else SET_DX( context, 0 ); /* FIXME: use driver attr here */ break;

1 0

Oleksij Rempel : krnl386: Set remote bit for cdrom.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 75555c3011484b980f4e2b8dc6d237abbba4a0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=75555c3011484b980f4e2b8dc… Author: Oleksij Rempel <bug-track(a)fisher-privat.net> Date: Fri May 25 10:58:49 2012 +0200 krnl386: Set remote bit for cdrom. --- dlls/krnl386.exe16/int21.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index a1bb8ce..14dbdfe 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -2491,6 +2491,10 @@ static void INT21_Ioctl_Block( CONTEXT *context ) if (drivetype == DRIVE_REMOTE) SET_DX( context, (1<<9) | (1<<12) ); /* remote + no direct IO */ + else if (drivetype == DRIVE_CDROM) + /* CDROM should be set to remote. If it set the app will + * call int2f to check if it cdrom or remote drive. */ + SET_DX( context, (1<<12) ); else SET_DX( context, 0 ); /* FIXME: use driver attr here */ break;

1 0

Christian Costa : d3drm: Add support for D3DRMLOAD_FROMFILE in IDirect3DRMMeshBuilder3_Load.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: a33037abd1830ac9fae258ceae2d5af93112285e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33037abd1830ac9fae258cea… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 25 08:04:54 2012 +0200 d3drm: Add support for D3DRMLOAD_FROMFILE in IDirect3DRMMeshBuilder3_Load. --- dlls/d3drm/meshbuilder.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4d4da0f..97f85c9 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1309,6 +1309,11 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* { load_options = DXFILELOAD_FROMMEMORY; } + else if (loadflags == D3DRMLOAD_FROMFILE) + { + load_options = DXFILELOAD_FROMFILE; + TRACE("Loading from file %s\n", debugstr_a(filename)); + } else { FIXME("Load options %d not supported yet\n", loadflags);

1 0

Christian Costa : dmusic: Cleanup DMUSIC_CreateDirectMusicImpl.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 0b0985f3910e269f220f9f94d12552bebd73c4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0985f3910e269f220f9f94d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 25 08:04:31 2012 +0200 dmusic: Cleanup DMUSIC_CreateDirectMusicImpl. --- dlls/dmusic/dmusic.c | 48 +++++++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 9c93ba8..3e0f9aa 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -369,23 +369,37 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = { IDirectMusic8Impl_SetExternalMasterClock }; -/* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IDirectMusic8Impl *dmusic; +/* For ClassFactory */ +HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) +{ + IDirectMusic8Impl *dmusic; + HRESULT ret; - TRACE("(%p,%p,%p)\n",lpcGUID, ppobj, pUnkOuter); + TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); - dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl)); - if (NULL == dmusic) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; - dmusic->ref = 0; /* will be inited with QueryInterface */ - dmusic->pMasterClock = NULL; - dmusic->ppPorts = NULL; - dmusic->nrofports = 0; - DMUSIC_CreateReferenceClockImpl (&IID_IReferenceClock, (LPVOID*)&dmusic->pMasterClock, NULL); - - return IDirectMusic8Impl_QueryInterface ((LPDIRECTMUSIC8)dmusic, lpcGUID, ppobj); + *ret_iface = NULL; + + dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl)); + if (!dmusic) + return E_OUTOFMEMORY; + + dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; + dmusic->ref = 0; /* Will be inited by QueryInterface */ + dmusic->pMasterClock = NULL; + dmusic->ppPorts = NULL; + dmusic->nrofports = 0; + ret = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&dmusic->pMasterClock, NULL); + if (FAILED(ret)) { + HeapFree(GetProcessHeap(), 0, dmusic); + return ret; + } + + ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); + if (FAILED(ret)) { + IReferenceClock_Release(&dmusic->pMasterClock->IReferenceClock_iface); + HeapFree(GetProcessHeap(), 0, dmusic); + return ret; + } + + return S_OK; }

1 0

Dmitry Timoshkov : gdiplus: Avoid needless gotos.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: a33d34b83eba88d4ec10acdcc19db89e85d3c47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33d34b83eba88d4ec10acdcc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 13:49:02 2012 +0900 gdiplus: Avoid needless gotos. --- dlls/gdiplus/region.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index fdc5dc3..2da3857 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -151,15 +151,15 @@ static inline GpStatus clone_element(const region_element* element, { case RegionDataRect: (*element2)->elementdata.rect = element->elementdata.rect; - break; + return Ok; case RegionDataEmptyRect: case RegionDataInfiniteRect: - break; + return Ok; case RegionDataPath: (*element2)->elementdata.pathdata.pathheader = element->elementdata.pathdata.pathheader; stat = GdipClonePath(element->elementdata.pathdata.path, &(*element2)->elementdata.pathdata.path); - if (stat != Ok) goto clone_out; + if (stat == Ok) return Ok; break; default: (*element2)->elementdata.combine.left = NULL; @@ -167,16 +167,15 @@ static inline GpStatus clone_element(const region_element* element, stat = clone_element(element->elementdata.combine.left, &(*element2)->elementdata.combine.left); - if (stat != Ok) goto clone_out; - stat = clone_element(element->elementdata.combine.right, - &(*element2)->elementdata.combine.right); - if (stat != Ok) goto clone_out; + if (stat == Ok) + { + stat = clone_element(element->elementdata.combine.right, + &(*element2)->elementdata.combine.right); + if (stat == Ok) return Ok; + } break; } - return Ok; - -clone_out: delete_element(*element2); *element2 = NULL; return stat;

1 0

Dmitry Timoshkov : gdiplus: Return correct status code if GdipAlloc fails.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 4060716dc4ca5d0468afb46a5f35083b7fe9669c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4060716dc4ca5d0468afb46a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 13:48:30 2012 +0900 gdiplus: Return correct status code if GdipAlloc fails. --- dlls/gdiplus/region.c | 52 ++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index e77a79b..fdc5dc3 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -254,20 +254,20 @@ GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *region, GpPath *path, Combin } left = GdipAlloc(sizeof(region_element)); - if (!left) - goto out; - *left = region->node; - - stat = clone_element(&path_region->node, &right); - if (stat != Ok) - goto out; - - fuse_region(region, left, right, mode); - - GdipDeleteRegion(path_region); - return Ok; + if (left) + { + *left = region->node; + stat = clone_element(&path_region->node, &right); + if (stat == Ok) + { + fuse_region(region, left, right, mode); + GdipDeleteRegion(path_region); + return Ok; + } + } + else + stat = OutOfMemory; -out: GdipFree(left); GdipDeleteRegion(path_region); return stat; @@ -301,20 +301,20 @@ GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, } left = GdipAlloc(sizeof(region_element)); - if (!left) - goto out; - memcpy(left, &region->node, sizeof(region_element)); - - stat = clone_element(&rect_region->node, &right); - if (stat != Ok) - goto out; - - fuse_region(region, left, right, mode); - - GdipDeleteRegion(rect_region); - return Ok; + if (left) + { + memcpy(left, &region->node, sizeof(region_element)); + stat = clone_element(&rect_region->node, &right); + if (stat == Ok) + { + fuse_region(region, left, right, mode); + GdipDeleteRegion(rect_region); + return Ok; + } + } + else + stat = OutOfMemory; -out: GdipFree(left); GdipDeleteRegion(rect_region); return stat;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
74
Older →

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 2012