November 2008 - Wine-commits

Jacek Caban : jscript: Set script object instead of ctx lcid in SetScriptSite.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 849c36ba8ee871d162c860c86efc0c5d207ecfb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849c36ba8ee871d162c860c86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 21 19:33:03 2008 +0100 jscript: Set script object instead of ctx lcid in SetScriptSite. --- dlls/jscript/jscript.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index fb13d08..c2fb987 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -240,7 +240,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, hres = IActiveScriptSite_GetLCID(This->site, &lcid); if(hres == S_OK) - This->ctx->lcid = lcid; + This->lcid = lcid; return This->ctx ? set_ctx_site(This) : S_OK; }

1 0

Reece Dunn : winealsa: Calculate the delay correctly as snd_pcm_delay is not reliable in this context .
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: ef0069cbf5dd7c65089aa9565a5c42f1ab8e7de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0069cbf5dd7c65089aa9565… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Fri Nov 21 21:14:32 2008 +0000 winealsa: Calculate the delay correctly as snd_pcm_delay is not reliable in this context. --- dlls/winealsa.drv/waveout.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6cb2da8..90c23b3 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -98,19 +98,29 @@ static DWORD wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD dwParam1, DWORD static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, snd_pcm_status_t* ps) { snd_pcm_sframes_t delay = 0; + snd_pcm_sframes_t avail = 0; + snd_pcm_uframes_t buf_size = 0; snd_pcm_state_t state; + int err; state = snd_pcm_state(wwo->pcm); - snd_pcm_delay(wwo->pcm, &delay); + avail = snd_pcm_avail_update(wwo->pcm); + err = snd_pcm_hw_params_get_buffer_size(wwo->hw_params, &buf_size); + delay = buf_size - avail; + + if (state != SND_PCM_STATE_RUNNING && state != SND_PCM_STATE_PREPARED) + { + WARN("Unexpected state (%d) while updating Total Played, resetting\n", state); + delay=0; + } /* A delay < 0 indicates an underrun; for our purposes that's 0. */ if (delay < 0) { - WARN("Unexpected state (%d) or delay (%ld) while updating Total Played, resetting\n", state, delay); + WARN("Unexpected delay (%ld) while updating Total Played, resetting\n", delay); delay=0; } - if (state == SND_PCM_STATE_XRUN) - snd_pcm_start(wwo->pcm); + InterlockedExchange((LONG*)&wwo->dwPlayedTotal, wwo->dwWrittenTotal - snd_pcm_frames_to_bytes(wwo->pcm, delay)); return TRUE; }

1 0

Juan Lang : rsaenh: Fix some test failures on older versions of Windows.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 7f246421d1adfb63cb712a488680ee8831a2d9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f246421d1adfb63cb712a488… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 21 08:54:34 2008 -0800 rsaenh: Fix some test failures on older versions of Windows. --- dlls/rsaenh/tests/rsaenh.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index c1ab31d..1f05ed1 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -167,6 +167,11 @@ static int init_aes_environment(void) * This provider is available on Windows XP, Windows 2003 and Vista. */ result = CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT); + if (!result && GetLastError() == NTE_PROV_TYPE_NOT_DEF) + { + win_skip("RSA_ASE provider not supported\n"); + return 0; + } ok(!result && GetLastError()==NTE_BAD_FLAGS, "%d, %08x\n", result, GetLastError()); if (!CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, 0)) @@ -826,9 +831,8 @@ static void test_rc2(void) ok(result, "setting salt failed for size %d: %08x\n", i, GetLastError()); } salt.cbData = 25; - SetLastError(0xdeadbeef); result = CryptSetKeyParam(hKey, KP_SALT_EX, (BYTE *)&salt, 0); - ok(!result && GetLastError() == NTE_BAD_DATA, "%08x\n", GetLastError()); + ok(!result, "%08x\n", GetLastError()); result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); @@ -866,7 +870,7 @@ static void test_rc2(void) CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); + ok(dwKeyLen == 56 || broken(dwKeyLen == 40), "%d (%08x)\n", dwKeyLen, GetLastError()); dwKeyLen = 128; result = CryptSetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (LPBYTE)&dwKeyLen, 0); @@ -978,9 +982,8 @@ static void test_rc4(void) ok(result, "setting salt failed for size %d: %08x\n", i, GetLastError()); } salt.cbData = 25; - SetLastError(0xdeadbeef); result = CryptSetKeyParam(hKey, KP_SALT_EX, (BYTE *)&salt, 0); - ok(!result && GetLastError() == NTE_BAD_DATA, "%08x\n", GetLastError()); + ok(!result, "%08x\n", GetLastError()); result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); @@ -1072,7 +1075,8 @@ static void test_mac(void) { if (!derive_key(CALG_RC4, &hKey, 56)) return; result = CryptCreateHash(hProv, CALG_MAC, hKey, 0, &hHash); - ok(!result && GetLastError() == NTE_BAD_KEY, "%08x\n", GetLastError()); + ok(!result && (GetLastError() == NTE_BAD_KEY || GetLastError() == NTE_FAIL), + "%08x\n", GetLastError()); result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); @@ -1421,8 +1425,11 @@ static void test_verify_signature(void) { /* check that we get a bad signature error when the signature is too short*/ result = CryptVerifySignature(hHash, abSignatureMD2, 64, hPubSignKey, NULL, 0); - ok(!result && NTE_BAD_SIGNATURE == GetLastError(), - "Expected NTE_BAD_SIGNATURE error, got %08x\n", GetLastError()); + ok(!result && + (NTE_BAD_SIGNATURE == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError()), + "Expected NTE_BAD_SIGNATURE or ERROR_INVALID_PARAMETER, got %08x\n", + GetLastError()); if (result) return; result = CryptVerifySignature(hHash, abSignatureMD2, 128, hPubSignKey, NULL, 0); @@ -1623,6 +1630,11 @@ static void test_schannel_provider(void) }; result = CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET); + if (!result) + { + win_skip("no PROV_RSA_SCHANNEL support\n"); + return; + } ok (result, "%08x\n", GetLastError()); if (result) CryptReleaseContext(hProv, 0);

1 0

Francois Gouget : d3d9: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 1c87e4664f0bbd51ac4a3bd1af4437a5ee69677c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c87e4664f0bbd51ac4a3bd1a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 14:08:58 2008 +0100 d3d9: Remove WINAPI on static functions where not needed. --- dlls/d3d9/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index beedf92..679eaab 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -478,7 +478,7 @@ static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9EX iface, } -static HRESULT WINAPI IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface9 **ppSurface,D3DRESOURCETYPE Type, UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality,HANDLE* pSharedHandle ) { +static HRESULT IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface9 **ppSurface,D3DRESOURCETYPE Type, UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality,HANDLE* pSharedHandle ) { HRESULT hrc; IDirect3DSurface9Impl *object; IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 9c5e97aa7147bb16fc9963ca3fca253493ec5fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c5e97aa7147bb16fc9963ca3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 23 20:53:43 2008 +0100 Assorted spelling fixes. --- dlls/comdlg32/filedlg16.c | 2 +- dlls/comdlg32/filedlg31.c | 2 +- dlls/dbghelp/symbol.c | 2 +- dlls/ntdll/rtlstr.c | 20 ++++++++++---------- dlls/ntdll/wcstring.c | 26 +++++++++++++------------- dlls/shlwapi/ordinal.c | 2 +- dlls/winmm/mci.c | 2 +- dlls/winspool.drv/info.c | 2 +- include/xinput.h | 2 +- programs/winedbg/winedbg.man.in | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c5e97aa7147bb16fc996…

1 0

Francois Gouget : d3d9: Remove IDirect3DDevice9Impl_GetFrontBuffer() as it is unused.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 001288ecaedae812dbb213e4e91cebf4c1218dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=001288ecaedae812dbb213e4e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 14:08:26 2008 +0100 d3d9: Remove IDirect3DDevice9Impl_GetFrontBuffer() as it is unused. --- dlls/d3d9/device.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 697c202..beedf92 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -577,14 +577,6 @@ static HRESULT WINAPI IDirect3DDevice9Impl_UpdateTexture(LPDIRECT3DDEVICE9EX i return hr; } -/* This isn't in MSDN! -static HRESULT WINAPI IDirect3DDevice9Impl_GetFrontBuffer(LPDIRECT3DDEVICE9EX iface, IDirect3DSurface9* pDestSurface) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - FIXME("(%p) : stub\n", This); - return D3D_OK; -} -*/ - static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTargetData(LPDIRECT3DDEVICE9EX iface, IDirect3DSurface9* pRenderTarget, IDirect3DSurface9* pDestSurface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *renderTarget = (IDirect3DSurface9Impl *)pRenderTarget;

1 0

Hans Leidekker : gdiplus: Add stub implementations of GdipCreateHalftonePalette and GdipImageForceValidation .
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 6122c77b9d22f4f618612cc9f9dccafb3fc9e93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6122c77b9d22f4f618612cc9f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 24 10:23:03 2008 +0100 gdiplus: Add stub implementations of GdipCreateHalftonePalette and GdipImageForceValidation. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 7 +++++++ dlls/gdiplus/image.c | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b3c1c5c..87e9cc3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -95,7 +95,7 @@ @ stdcall GdipCreateFromHWNDICM(long ptr) @ stdcall GdipCreateHBITMAPFromBitmap(ptr ptr long) @ stub GdipCreateHICONFromBitmap -@ stub GdipCreateHalftonePalette +@ stdcall GdipCreateHalftonePalette() @ stub GdipCreateHatchBrush @ stdcall GdipCreateImageAttributes(ptr) @ stdcall GdipCreateLineBrush(ptr ptr long long long ptr) @@ -405,7 +405,7 @@ @ stdcall GdipGetWorldTransform(ptr ptr) @ stdcall GdipGraphicsClear(ptr long) @ stub GdipGraphicsSetAbort -@ stub GdipImageForceValidation +@ stdcall GdipImageForceValidation(ptr) @ stdcall GdipImageGetFrameCount(ptr ptr ptr) @ stdcall GdipImageGetFrameDimensionsCount(ptr ptr) @ stdcall GdipImageGetFrameDimensionsList(ptr ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index fbc62b9..da2ea6f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3287,3 +3287,10 @@ GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics *graphics, GpCoordinateSpace return NotImplemented; } + +HPALETTE WINGDIPAPI GdipCreateHalftonePalette(void) +{ + FIXME("\n"); + + return NULL; +} diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1627995..277c86c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1529,3 +1529,10 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR* fileName, HDC h return NotImplemented; } + +GpStatus WINGDIPAPI GdipImageForceValidation(GpImage *image) +{ + FIXME("%p\n", image); + + return Ok; +}

1 0

Hans Leidekker : gdiplus: Improve GdipGetImageRawFormat stub.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 8b15fa4b2a964394d79d439c4fdc87c5f543bb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b15fa4b2a964394d79d439c4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 24 10:23:16 2008 +0100 gdiplus: Improve GdipGetImageRawFormat stub. --- dlls/gdiplus/image.c | 14 ++++++++++++-- include/gdiplusimaging.h | 12 ++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 277c86c..e44315a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -28,6 +28,7 @@ #include "olectl.h" #include "ole2.h" +#include "initguid.h" #include "gdiplus.h" #include "gdiplus_private.h" #include "wine/debug.h" @@ -785,9 +786,18 @@ GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage *image, GUID *format) return InvalidParameter; if(!(calls++)) - FIXME("not implemented\n"); + FIXME("stub\n"); - return NotImplemented; + /* FIXME: should be detected from embedded picture or stored separately */ + switch (image->type) + { + case ImageTypeBitmap: *format = ImageFormatBMP; break; + case ImageTypeMetafile: *format = ImageFormatEMF; break; + default: + WARN("unknown type %u\n", image->type); + *format = ImageFormatUndefined; + } + return Ok; } GpStatus WINGDIPAPI GdipGetImageType(GpImage *image, ImageType *type) diff --git a/include/gdiplusimaging.h b/include/gdiplusimaging.h index 791d9cd..e8dda73 100644 --- a/include/gdiplusimaging.h +++ b/include/gdiplusimaging.h @@ -19,6 +19,18 @@ #ifndef _GDIPLUSIMAGING_H #define _GDIPLUSIMAGING_H +DEFINE_GUID(ImageFormatUndefined, 0xb96b3ca9, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); +DEFINE_GUID(ImageFormatMemoryBMP, 0xb96b3caa, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); +DEFINE_GUID(ImageFormatBMP, 0xb96b3cab, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); +DEFINE_GUID(ImageFormatEMF, 0xb96b3cac, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); +DEFINE_GUID(ImageFormatWMF, 0xb96b3cad, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); +DEFINE_GUID(ImageFormatJPEG, 0xb96b3cae, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); +DEFINE_GUID(ImageFormatPNG, 0xb96b3caf, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); +DEFINE_GUID(ImageFormatGIF, 0xb96b3cb0, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); +DEFINE_GUID(ImageFormatTIFF, 0xb96b3cb1, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); +DEFINE_GUID(ImageFormatEXIF, 0xb96b3cb2, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); +DEFINE_GUID(ImageFormatIcon, 0xb96b3cb5, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e); + enum ImageLockMode { ImageLockModeRead = 1,

1 0

Hans Leidekker : gdiplus: Return success from the GdipSaveGraphics and GdipRestoreGraphics stubs.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: df93d19d3d1706a7a023eecbf51caea548189ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df93d19d3d1706a7a023eecbf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 24 10:22:39 2008 +0100 gdiplus: Return success from the GdipSaveGraphics and GdipRestoreGraphics stubs. --- dlls/gdiplus/graphics.c | 5 +++-- dlls/gdiplus/tests/graphics.c | 9 +++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index aba2aca..7c1ff9b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2788,7 +2788,7 @@ GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState stat if(!(calls++)) FIXME("graphics state not implemented\n"); - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, @@ -2815,7 +2815,8 @@ GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) if(!(calls++)) FIXME("graphics state not implemented\n"); - return NotImplemented; + *state = 0xdeadbeef; + return Ok; } GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 9d06fd9..5db3ca9 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -130,12 +130,10 @@ static void test_save_restore(void) GdipCreateFromHDC(hdc, &graphics1); GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); stat = GdipSaveGraphics(graphics1, &state_a); - todo_wine - expect(Ok, stat); + expect(Ok, stat); GdipSetInterpolationMode(graphics1, InterpolationModeBicubic); stat = GdipRestoreGraphics(graphics1, state_a); - todo_wine - expect(Ok, stat); + expect(Ok, stat); GdipGetInterpolationMode(graphics1, &mode); todo_wine expect(InterpolationModeBilinear, mode); @@ -151,8 +149,7 @@ static void test_save_restore(void) GdipSaveGraphics(graphics1, &state_b); GdipSetInterpolationMode(graphics1, InterpolationModeNearestNeighbor); stat = GdipRestoreGraphics(graphics1, 0xdeadbeef); - todo_wine - expect(Ok, stat); + expect(Ok, stat); GdipRestoreGraphics(graphics1, state_b); GdipGetInterpolationMode(graphics1, &mode); todo_wine

1 0

Hans Leidekker : gdiplus: Add stub implementations of GdipBeginContainer2 and GdipEndContainer.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 5ce729a4eba0a7d3b354ab0edc0276edf68b4d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce729a4eba0a7d3b354ab0ed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 24 10:22:51 2008 +0100 gdiplus: Add stub implementations of GdipBeginContainer2 and GdipEndContainer. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 21 +++++++++++++++++++++ include/gdiplusenums.h | 1 + 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c61a914..b3c1c5c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -32,7 +32,7 @@ @ stub GdipAddPathString @ stub GdipAddPathStringI @ stdcall GdipAlloc(long) -@ stub GdipBeginContainer2 +@ stdcall GdipBeginContainer2(ptr ptr) @ stub GdipBeginContainer @ stub GdipBeginContainerI @ stub GdipBitmapApplyEffect @@ -200,7 +200,7 @@ @ stdcall GdipDrawRectanglesI(ptr ptr ptr long) @ stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) @ stub GdipEmfToWmfBits -@ stub GdipEndContainer +@ stdcall GdipEndContainer(ptr ptr) @ stub GdipEnumerateMetafileDestPoint @ stub GdipEnumerateMetafileDestPointI @ stub GdipEnumerateMetafileDestPoints diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7c1ff9b..fbc62b9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2819,6 +2819,27 @@ GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) return Ok; } +GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, GraphicsContainer *state) +{ + FIXME("(%p, %p)\n", graphics, state); + + if(!graphics || !state) + return InvalidParameter; + + *state = 0xdeadbeef; + return Ok; +} + +GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) +{ + FIXME("(%p, 0x%x)\n", graphics, state); + + if(!graphics || !state) + return InvalidParameter; + + return Ok; +} + GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx, REAL sy, GpMatrixOrder order) { diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 0299f41..3138b8c 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -20,6 +20,7 @@ #define _GDIPLUSENUMS_H typedef UINT GraphicsState; +typedef UINT GraphicsContainer; enum Unit {

1 0