March 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 0.9.57
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: website Branch: master Commit: ae20d6466ea920d15da0cdf3ed61e31af20317b0 URL: http://source.winehq.org/git/website.git/?a=commit;h=ae20d6466ea920d15da0cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 7 15:35:27 2008 +0100 Wine release 0.9.57 --- news/2008030701.xml | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/news/2008030701.xml b/news/2008030701.xml new file mode 100644 index 0000000..1825e23 --- /dev/null +++ b/news/2008030701.xml @@ -0,0 +1,25 @@ +<news> +<date>March 7, 2008</date> +<title>Wine 0.9.57 Released</title> +<body> +<p>Wine 0.9.57 was released today, with the following main changes:</p> + +<ul> +<li>Support for multiple OpenGL pixel formats.</li> +<li>Improved support for color profiles.</li> +<li>Many window management fixes.</li> +<li>Better fullscreen support.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.57.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.57">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Tag wine-0.9.57 : Alexandre Julliard : Release 0.9.57
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: refs/tags/wine-0.9.57 Tag: cd5362dd7dc3eca98011d28894c628f03a473390 URL: http://source.winehq.org/git/wine.git/?a=tag;h=cd5362dd7dc3eca98011d28894c6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 7 15:24:24 2008 +0100 Release 0.9.57

1 0

Alexandre Julliard : Release 0.9.57.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: a32e36aee5684abca33001eea3a0768ab603c373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32e36aee5684abca33001eea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 7 15:24:24 2008 +0100 Release 0.9.57. --- ANNOUNCE | 1170 ++++++++++++++++++--------------- ChangeLog | 2154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2801 insertions(+), 543 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a32e36aee5684abca3300…

1 0

Alexandre Julliard : mscms: Fix a couple of compiler warnings when lcms is missing.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: 533380817b0d6f97faf8cdf844228508baa133c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533380817b0d6f97faf8cdf84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 7 12:26:36 2008 +0100 mscms: Fix a couple of compiler warnings when lcms is missing. --- dlls/mscms/profile.c | 8 ++++++-- dlls/mscms/stub.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 76a8168..2fd3e13 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -127,9 +127,13 @@ static BOOL set_profile_device_key( PCWSTR file, const BYTE *value, DWORD size ) SetLastError( ERROR_INVALID_PROFILE ); return FALSE; } - + if (!GetColorProfileHeader( handle, &header )) + { + CloseColorProfile( handle ); + SetLastError( ERROR_INVALID_PROFILE ); + return FALSE; + } RegCreateKeyExW( HKEY_LOCAL_MACHINE, icmW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &icm_key, NULL ); - GetColorProfileHeader( handle, &header ); MSCMS_basename( file, basenameW ); sprintfW( classW, fmtW, (header.phClass >> 24) & 0xff, (header.phClass >> 16) & 0xff, diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c index f142201..d7e6877 100644 --- a/dlls/mscms/stub.c +++ b/dlls/mscms/stub.c @@ -151,7 +151,7 @@ BOOL WINAPI RegisterCMMW( PCWSTR machine, DWORD id, PCWSTR dll ) BOOL WINAPI SelectCMM( DWORD id ) { - FIXME( "( %s ) stub\n", MSCMS_dbgstr_tag(id) ); + FIXME( "(%x) stub\n", id ); return TRUE; }

1 0

Louis Lenders : shdocvw: Return something more useful for WebBrowser_get_ReadyState.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: 81ae4182f532c813781c87053f6b820db2bd131b URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ae4182f532c813781c87053… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Mar 6 08:58:33 2008 +0000 shdocvw: Return something more useful for WebBrowser_get_ReadyState. --- dlls/shdocvw/webbrowser.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 95586f0..1262c3c 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -738,7 +738,9 @@ static HRESULT WINAPI WebBrowser_get_ReadyState(IWebBrowser2 *iface, READYSTATE { WebBrowser *This = WEBBROWSER_THIS(iface); FIXME("(%p)->(%p)\n", This, lpReadyState); - return E_NOTIMPL; + + *lpReadyState = READYSTATE_COMPLETE; + return S_OK; } static HRESULT WINAPI WebBrowser_get_Offline(IWebBrowser2 *iface, VARIANT_BOOL *pbOffline)

1 0

Nathan Beckmann : oleaut32: Replace bitmap integer constants with symbolic constants.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: 7f50e42bbc0e330628d05485e315dfbbe0aa3ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f50e42bbc0e330628d05485e… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Thu Mar 6 00:16:55 2008 -0800 oleaut32: Replace bitmap integer constants with symbolic constants. --- dlls/oleaut32/olepicture.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 27c2ac9..6a2adc9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1742,6 +1742,17 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, } /************************************************************************ + * BITMAP FORMAT FLAGS - + * Flags that differentiate between different types of bitmaps. + */ + +#define BITMAP_FORMAT_BMP 0x4d42 /* "BM" */ +#define BITMAP_FORMAT_JPEG 0xd8ff +#define BITMAP_FORMAT_GIF 0x4947 +#define BITMAP_FORMAT_PNG 0x5089 +#define BITMAP_FORMAT_APM 0xcdd7 + +/************************************************************************ * OLEPictureImpl_IPersistStream_Load (IUnknown) * * Loads the binary data from the IStream. Starts at current position. @@ -1887,19 +1898,19 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { This->loadtime_format = magic; switch (magic) { - case 0x4947: /* GIF */ + case BITMAP_FORMAT_GIF: /* GIF */ hr = OLEPictureImpl_LoadGif(This, xbuf, xread); break; - case 0xd8ff: /* JPEG */ + case BITMAP_FORMAT_JPEG: /* JPEG */ hr = OLEPictureImpl_LoadJpeg(This, xbuf, xread); break; - case 0x4d42: /* Bitmap */ + case BITMAP_FORMAT_BMP: /* Bitmap */ hr = OLEPictureImpl_LoadDIB(This, xbuf, xread); break; - case 0x5089: /* PNG */ + case BITMAP_FORMAT_PNG: /* PNG */ hr = OLEPictureImpl_LoadPNG(This, xbuf, xread); break; - case 0xcdd7: /* APM */ + case BITMAP_FORMAT_APM: /* APM */ hr = OLEPictureImpl_LoadAPM(This, xbuf, xread); break; case 0x0000: { /* ICON , first word is dwReserved */ @@ -1975,7 +1986,7 @@ static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLengt /* Fill the BITMAPFILEHEADER */ pFileHeader = (BITMAPFILEHEADER *)(*ppBuffer); - pFileHeader->bfType = 0x4d42; + pFileHeader->bfType = BITMAP_FORMAT_BMP; pFileHeader->bfSize = *pLength; pFileHeader->bfOffBits = sizeof(BITMAPFILEHEADER) + @@ -2187,17 +2198,17 @@ static HRESULT WINAPI OLEPictureImpl_Save( break; case PICTYPE_BITMAP: if (This->bIsDirty) { - switch (This->keepOrigFormat ? This->loadtime_format : 0x4d42) { - case 0x4d42: + switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) { + case BITMAP_FORMAT_BMP: iSerializeResult = serializeBMP(This->desc.u.bmp.hbitmap, &pIconData, &iDataSize); break; - case 0xd8ff: + case BITMAP_FORMAT_JPEG: FIXME("(%p,%p,%d), PICTYPE_BITMAP (format JPEG) not implemented!\n",This,pStm,fClearDirty); break; - case 0x4947: + case BITMAP_FORMAT_GIF: FIXME("(%p,%p,%d), PICTYPE_BITMAP (format GIF) not implemented!\n",This,pStm,fClearDirty); break; - case 0x5089: + case BITMAP_FORMAT_PNG: FIXME("(%p,%p,%d), PICTYPE_BITMAP (format PNG) not implemented!\n",This,pStm,fClearDirty); break; default:

1 0

Nathan Beckmann : gdiplus: Implement GdipGetImageEncoders.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: 366854a7cc0b06fd8ac0d9754dee7f20335cdeba URL: http://source.winehq.org/git/wine.git/?a=commit;h=366854a7cc0b06fd8ac0d9754… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Thu Mar 6 01:17:00 2008 -0800 gdiplus: Implement GdipGetImageEncoders. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/image.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 50 ++++++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 13 +++++++++ include/gdiplusflat.h | 2 + include/gdiplusimaging.h | 35 +++++++++++++++++++++++++ 6 files changed, 162 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6e28a0e..e306fb8 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -284,8 +284,8 @@ @ stub GdipGetImageDecoders @ stub GdipGetImageDecodersSize @ stdcall GdipGetImageDimension(ptr ptr ptr) -@ stub GdipGetImageEncoders -@ stub GdipGetImageEncodersSize +@ stdcall GdipGetImageEncoders(long long ptr) +@ stdcall GdipGetImageEncodersSize(ptr ptr) @ stub GdipGetImageFlags @ stdcall GdipGetImageGraphicsContext(ptr ptr) @ stdcall GdipGetImageHeight(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a5b6ef8..7009197 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -836,3 +836,63 @@ GpStatus WINGDIPAPI GdipSetImagePalette(GpImage *image, return NotImplemented; } + +/************************************************************************* + * Encoders - + * Structures that represent which formats we support for encoding. + */ + +typedef enum { + BMP, + NUM_ENCODERS_SUPPORTED +} ImageFormat; + +/* ImageCodecInfo creation routines taken from libgdiplus */ +static const WCHAR bmp_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'B', 'M', 'P', 0}; /* Built-in BMP */ +static const WCHAR bmp_extension[] = {'*','.','B', 'M', 'P',';', '*','.', 'D','I', 'B',';', '*','.', 'R', 'L', 'E',0}; /* *.BMP;*.DIB;*.RLE */ +static const WCHAR bmp_mimetype[] = {'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p', 0}; /* image/bmp */ +static const WCHAR bmp_format[] = {'B', 'M', 'P', 0}; /* BMP */ +static const BYTE bmp_sig_pattern[] = { 0x42, 0x4D }; +static const BYTE bmp_sig_mask[] = { 0xFF, 0xFF }; + +static const ImageCodecInfo codecs[NUM_ENCODERS_SUPPORTED] = + { + { /* BMP */ + /* Clsid */ { 0x557cf400, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } }, + /* FormatID */ { 0xb96b3cabU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} }, + /* CodecName */ bmp_codecname, + /* DllName */ NULL, + /* FormatDescription */ bmp_format, + /* FilenameExtension */ bmp_extension, + /* MimeType */ bmp_mimetype, + /* Flags */ ImageCodecFlagsEncoder | ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Version */ 1, + /* SigCount */ 1, + /* SigSize */ 2, + /* SigPattern */ bmp_sig_pattern, + /* SigMask */ bmp_sig_mask, + }, + }; + +GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size) +{ + if (!numEncoders || !size) + return InvalidParameter; + + *numEncoders = NUM_ENCODERS_SUPPORTED; + *size = sizeof (codecs); + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodecInfo *encoders) +{ + if (!encoders || + (numEncoders != NUM_ENCODERS_SUPPORTED) || + (size != sizeof (codecs))) + return GenericError; + + memcpy(encoders, codecs, sizeof (codecs)); + + return Ok; +} diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 5ff164d..895ff35 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -122,6 +122,55 @@ static void test_LoadingImages(void) expect(InvalidParameter, stat); } +static void test_encoders(void) +{ + GpStatus stat; + UINT n; + UINT s; + ImageCodecInfo *codecs; + int i; + int bmp_found; + + static const WCHAR bmp_format[] = {'B', 'M', 'P', 0}; + + stat = GdipGetImageEncodersSize(&n, &s); + expect(stat, Ok); + + codecs = GdipAlloc(s); + if (!codecs) + return; + + stat = GdipGetImageEncoders(n, s, NULL); + expect(GenericError, stat); + + stat = GdipGetImageEncoders(0, s, codecs); + expect(GenericError, stat); + + stat = GdipGetImageEncoders(n, s-1, codecs); + expect(GenericError, stat); + + stat = GdipGetImageEncoders(n, s+1, codecs); + expect(GenericError, stat); + + stat = GdipGetImageEncoders(n, s, codecs); + expect(stat, Ok); + + bmp_found = FALSE; + for (i = 0; i < n; i++) + { + if (CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, + codecs[i].FormatDescription, -1, + bmp_format, -1) == CSTR_EQUAL) { + bmp_found = TRUE; + break; + } + } + if (!bmp_found) + ok(FALSE, "No BMP codec found.\n"); + + GdipFree(codecs); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -137,6 +186,7 @@ START_TEST(image) test_Scan0(); test_GetImageDimension(); test_LoadingImages(); + test_encoders(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 7c97005..c579ebe 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -257,6 +257,18 @@ enum HotkeyPrefix HotkeyPrefixHide = 2 }; +enum ImageCodecFlags +{ + ImageCodecFlagsEncoder = 1, + ImageCodecFlagsDecoder = 2, + ImageCodecFlagsSupportBitmap = 4, + ImageCodecFlagsSupportVector = 8, + ImageCodecFlagsSeekableEncode = 16, + ImageCodecFlagsBlockingDecode = 32, + ImageCodecFlagsBuiltin = 65536, + ImageCodecFlagsSystem = 131072, + ImageCodecFlagsUser = 262144 +}; #ifndef __cplusplus @@ -286,6 +298,7 @@ typedef enum StringTrimming StringTrimming; typedef enum StringFormatFlags StringFormatFlags; typedef enum HotkeyPrefix HotkeyPrefix; typedef enum PenAlignment GpPenAlignment; +typedef enum ImageCodecFlags ImageCodecFlags; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b787ab3..ae09118 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -258,6 +258,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream*,GpBitmap**); GpStatus WINGDIPAPI GdipDisposeImage(GpImage*); GpStatus WINGDIPAPI GdipFindFirstImageItem(GpImage*,ImageItemData*); GpStatus WINGDIPAPI GdipFindNextImageItem(GpImage*,ImageItemData*); +GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size); +GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodecInfo *encoders); GpStatus WINGDIPAPI GdipGetImageItemData(GpImage*,ImageItemData*); GpStatus WINGDIPAPI GdipGetImageBounds(GpImage*,GpRectF*,GpUnit*); GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage*,GpGraphics**); diff --git a/include/gdiplusimaging.h b/include/gdiplusimaging.h index c78e1b1..00ed3d1 100644 --- a/include/gdiplusimaging.h +++ b/include/gdiplusimaging.h @@ -43,6 +43,24 @@ public: EncoderParameter Parameter[1]; }; +class ImageCodecInfo +{ +public: + CLSID Clsid; + GUID FormatID; + const WCHAR* CodecName; + const WCHAR* DllName; + const WCHAR* FormatDescription; + const WCHAR* FilenameExtension; + const WCHAR* MimeType; + DWORD Flags; + DWORD Version; + DWORD SigCount; + DWORD SigSize; + const BYTE* SigPattern; + const BYTE* SigMask; +}; + class BitmapData { public: @@ -84,6 +102,23 @@ typedef struct EncoderParameters EncoderParameter Parameter[1]; } EncoderParameters; +typedef struct ImageCodecInfo +{ + CLSID Clsid; + GUID FormatID; + const WCHAR* CodecName; + const WCHAR* DllName; + const WCHAR* FormatDescription; + const WCHAR* FilenameExtension; + const WCHAR* MimeType; + DWORD Flags; + DWORD Version; + DWORD SigCount; + DWORD SigSize; + const BYTE* SigPattern; + const BYTE* SigMask; +} ImageCodecInfo; + typedef struct BitmapData { UINT Width;

1 0

Dan Hipschman : qmgr: Only have one BackgroundCopyManager per system.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: 275f00f54d29682729d2286e2ddf8a5f0c74d6e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275f00f54d29682729d2286e2… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Mar 6 19:04:35 2008 -0800 qmgr: Only have one BackgroundCopyManager per system. --- dlls/qmgr/enum_jobs.c | 4 ++ dlls/qmgr/qmgr.c | 57 +++++-------------------- dlls/qmgr/qmgr.h | 2 +- dlls/qmgr/tests/qmgr.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 120 insertions(+), 49 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index e35730a..85aca47 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -181,6 +181,8 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, /* Create array of jobs */ This->indexJobs = 0; + + EnterCriticalSection(&qmgr->cs); This->numJobs = list_count(&qmgr->jobs); if (0 < This->numJobs) @@ -189,6 +191,7 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, This->numJobs * sizeof *This->jobs); if (!This->jobs) { + LeaveCriticalSection(&qmgr->cs); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } @@ -203,6 +206,7 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, IBackgroundCopyJob_AddRef(iJob); This->jobs[i++] = iJob; } + LeaveCriticalSection(&qmgr->cs); *ppObj = &This->lpVtbl; return S_OK; diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index fdfd30c..c6fbc42 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -1,7 +1,7 @@ /* * Queue Manager (BITS) core functions * - * Copyright 2007 Google (Roy Shea) + * Copyright 2007, 2008 Google (Roy Shea, Dan Hipschman) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,29 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -/* Destructor for instances of background copy manager */ -static void BackgroundCopyManagerDestructor(BackgroundCopyManagerImpl *This) -{ - BackgroundCopyJobImpl *job; - TRACE("%p\n", This); - - LIST_FOR_EACH_ENTRY(job, &This->jobs, BackgroundCopyJobImpl, entryFromQmgr) - job->lpVtbl->Release((IBackgroundCopyJob *) job); - - HeapFree(GetProcessHeap(), 0, This); -} - /* Add a reference to the iface pointer */ static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef( IBackgroundCopyManager* iface) { - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *)iface; - ULONG ref; - - TRACE("\n"); - - ref = InterlockedIncrement(&This->ref); - return ref; + return 2; } /* Attempt to provide a new interface to interact with iface */ @@ -74,17 +56,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_QueryInterface( static ULONG WINAPI BITS_IBackgroundCopyManager_Release( IBackgroundCopyManager* iface) { - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *)iface; - ULONG ref; - - TRACE("\n"); - - ref = InterlockedDecrement(&This->ref); - if (ref == 0) - { - BackgroundCopyManagerDestructor(This); - } - return ref; + return 1; } /*** IBackgroundCopyManager interface methods ***/ @@ -109,7 +81,9 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( /* Add a reference to the job to job list */ IBackgroundCopyJob_AddRef(*ppJob); job = (BackgroundCopyJobImpl *) *ppJob; + EnterCriticalSection(&This->cs); list_add_head(&This->jobs, &job->entryFromQmgr); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -153,23 +127,16 @@ static const IBackgroundCopyManagerVtbl BITS_IBackgroundCopyManager_Vtbl = BITS_IBackgroundCopyManager_GetErrorDescription }; +static BackgroundCopyManagerImpl globalMgr = { + &BITS_IBackgroundCopyManager_Vtbl, + { NULL, -1, 0, 0, 0, 0 }, + LIST_INIT(globalMgr.jobs) +}; + /* Constructor for instances of background copy manager */ HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) { - BackgroundCopyManagerImpl *This; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) - { - return E_OUTOFMEMORY; - } - - This->lpVtbl = &BITS_IBackgroundCopyManager_Vtbl; - This->ref = 1; - list_init(&This->jobs); - - *ppObj = &This->lpVtbl; + *ppObj = (IBackgroundCopyManager *) &globalMgr; return S_OK; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index f40b1a5..166ee40 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -78,7 +78,7 @@ typedef struct typedef struct { const IBackgroundCopyManagerVtbl *lpVtbl; - LONG ref; + CRITICAL_SECTION cs; struct list jobs; } BackgroundCopyManagerImpl; diff --git a/dlls/qmgr/tests/qmgr.c b/dlls/qmgr/tests/qmgr.c index 07af527..8c95586 100644 --- a/dlls/qmgr/tests/qmgr.c +++ b/dlls/qmgr/tests/qmgr.c @@ -26,6 +26,8 @@ #include "initguid.h" #include "bits.h" +static WCHAR progname[MAX_PATH]; + static void test_CreateInstance(void) { @@ -130,11 +132,109 @@ static void test_EnumJobs(void) IBackgroundCopyManager_Release(manager); } +static void run_child(WCHAR *secret) +{ + static const WCHAR format[] = {'%','s',' ','q','m','g','r',' ','%','s', 0}; + WCHAR cmdline[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOW startup; + + memset(&startup, 0, sizeof startup); + startup.cb = sizeof startup; + + wsprintfW(cmdline, format, progname, secret); + ok(CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + winetest_wait_child_process(info.hProcess); + ok(CloseHandle(info.hProcess), "CloseHandle\n"); + ok(CloseHandle(info.hThread), "CloseHandle\n"); +} + +static void do_child(const char *secretA) +{ + WCHAR secretW[MAX_PATH]; + IBackgroundCopyManager *manager = NULL; + GUID id; + IBackgroundCopyJob *job; + HRESULT hres; + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, + CLSCTX_LOCAL_SERVER, &IID_IBackgroundCopyManager, + (void **) &manager); + if(hres != S_OK) + { + skip("Unable to create bits instance required for test.\n"); + return; + } + + MultiByteToWideChar(CP_ACP, 0, secretA, -1, secretW, MAX_PATH); + hres = IBackgroundCopyManager_CreateJob(manager, secretW, + BG_JOB_TYPE_DOWNLOAD, &id, &job); + ok(hres == S_OK, "CreateJob in child process\n"); + IBackgroundCopyJob_Release(job); + IBackgroundCopyManager_Release(manager); +} + +static void test_globalness(void) +{ + static const WCHAR format[] = {'t','e','s','t','_','%','u', 0}; + WCHAR secretName[MAX_PATH]; + IEnumBackgroundCopyJobs* enumJobs; + IBackgroundCopyManager *manager = NULL; + HRESULT hres; + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, + CLSCTX_LOCAL_SERVER, &IID_IBackgroundCopyManager, + (void **) &manager); + if(hres != S_OK) + { + skip("Unable to create bits instance required for test.\n"); + return; + } + + wsprintfW(secretName, format, GetTickCount()); + run_child(secretName); + + hres = IBackgroundCopyManager_EnumJobs(manager, 0, &enumJobs); + ok(hres == S_OK, "EnumJobs failed: %08x\n", hres); + if(hres != S_OK) + skip("Unable to create job enumerator.\n"); + else + { + ULONG i, n; + IBackgroundCopyJob *job; + BOOL found = FALSE; + + hres = IEnumBackgroundCopyJobs_GetCount(enumJobs, &n); + for (i = 0; i < n && !found; ++i) + { + LPWSTR name; + IEnumBackgroundCopyJobs_Next(enumJobs, 1, &job, NULL); + IBackgroundCopyJob_GetDisplayName(job, &name); + if (lstrcmpW(name, secretName) == 0) + found = TRUE; + CoTaskMemFree(name); + IBackgroundCopyJob_Release(job); + } + hres = IEnumBackgroundCopyJobs_Release(enumJobs); + ok(found, "Adding a job in another process failed\n"); + } + + IBackgroundCopyManager_Release(manager); +} + START_TEST(qmgr) { + char **argv; + int argc = winetest_get_mainargs(&argv); + MultiByteToWideChar(CP_ACP, 0, argv[0], -1, progname, MAX_PATH); + CoInitialize(NULL); - test_CreateInstance(); - test_CreateJob(); - test_EnumJobs(); + if (argc == 3) + do_child(argv[2]); + else + { + test_CreateInstance(); + test_CreateJob(); + test_EnumJobs(); + test_globalness(); + } CoUninitialize(); }

1 0

Jason Green : d3d9: Fix a few ok() comparisons to not always return true in the visual tests.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: d0b8fd0a13f30bad1f6d8cb6f69bb564fb8bfa2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b8fd0a13f30bad1f6d8cb6f… Author: Jason Green <jave27(a)gmail.com> Date: Thu Mar 6 10:59:47 2008 -0500 d3d9: Fix a few ok() comparisons to not always return true in the visual tests. --- dlls/d3d9/tests/visual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a415525..67ec739 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1077,11 +1077,11 @@ static void offscreen_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Clear failed, hr = %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture, NULL); - ok(hr == D3D_OK || D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %s\n", DXGetErrorString9(hr)); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %s\n", DXGetErrorString9(hr)); if(!offscreenTexture) { trace("Failed to create an X8R8G8B8 offscreen texture, trying R5G6B5\n"); hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &offscreenTexture, NULL); - ok(hr == D3D_OK || D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %s\n", DXGetErrorString9(hr)); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %s\n", DXGetErrorString9(hr)); if(!offscreenTexture) { skip("Cannot create an offscreen render target\n"); goto out; @@ -5547,7 +5547,7 @@ static void alpha_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture, NULL); - ok(hr == D3D_OK || D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr); hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(hr == D3D_OK, "Can't get back buffer, hr = %s\n", DXGetErrorString9(hr));

1 0

Alistair Leslie-Hughes : netapi32: Correct test for NetUserChangePassword.
by Alexandre Julliard March 7, 2008

March 7, 2008

Module: wine Branch: master Commit: 4b89de772a996193fd8fd9df24832c7b02166cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b89de772a996193fd8fd9df2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 7 20:42:51 2008 +1100 netapi32: Correct test for NetUserChangePassword. --- dlls/netapi32/tests/access.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 202c259..7d5f55a 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -296,7 +296,7 @@ static void run_userhandling_tests(void) ret = pNetUserChangePassword(NULL, sNonexistentUser, sTestUserOldPass, sTestUserNewPass); - ok(ret == NERR_UserNotFound, + ok(ret == NERR_UserNotFound || ret == ERROR_INVALID_PASSWORD, "Changing password for nonexistent user returned 0x%08x.\n", ret); ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass,

1 0