wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Austin English : sfc: Add SfcGetNextProtectedFile stub.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: c715127536a78166e58b165c390a57b704899d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c715127536a78166e58b165c3… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 27 00:12:04 2015 -0500 sfc: Add SfcGetNextProtectedFile stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc/sfc.spec | 2 +- dlls/sfc_os/sfc_os.c | 9 +++++++++ dlls/sfc_os/sfc_os.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec index 04307d2..bdd66db 100644 --- a/dlls/sfc/sfc.spec +++ b/dlls/sfc/sfc.spec @@ -7,7 +7,7 @@ 7 stub @ 8 stub @ 9 stub @ -@ stub SfcGetNextProtectedFile +@ stdcall SfcGetNextProtectedFile(long ptr) sfc_os.SfcGetNextProtectedFile @ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected @ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected @ stub SfcWLEventLogoff diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index 5805342..9df38f8 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -49,6 +49,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } /****************************************************************** + * SfcGetNextProtectedFile [sfc_os.@] + */ +BOOL WINAPI SfcGetNextProtectedFile(HANDLE handle, PROTECTED_FILE_DATA *data) +{ + FIXME("%p %p\n", handle, data); + return FALSE; +} + +/****************************************************************** * SfcIsFileProtected [sfc_os.@] * * Check, if the given File is protected by the System diff --git a/dlls/sfc_os/sfc_os.spec b/dlls/sfc_os/sfc_os.spec index 1edcb83..6b216e0 100644 --- a/dlls/sfc_os/sfc_os.spec +++ b/dlls/sfc_os/sfc_os.spec @@ -1,3 +1,3 @@ -@ stub SfcGetNextProtectedFile +@ stdcall SfcGetNextProtectedFile(long ptr) @ stdcall SfcIsFileProtected(ptr wstr) @ stdcall SfcIsKeyProtected(long wstr long)

1 0

Austin English : kernel32: Add SetConsoleKeyShortcuts stub.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 7c92862071bd7b5687ee0b01e9a2c56d0f87d2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c92862071bd7b5687ee0b01e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 2 11:29:47 2015 -0600 kernel32: Add SetConsoleKeyShortcuts stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d4c4a05..363e763 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3239,6 +3239,15 @@ DWORD WINAPI GetNumberOfConsoleFonts(void) return 1; } + +BOOL WINAPI SetConsoleKeyShortcuts(BOOL set, BYTE keys, VOID *a, DWORD b) +{ + FIXME(": (%u %u %p %u) stub!\n", set, keys, a, b); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FONT_INFO fontinfo) { BOOL ret; diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 89292c9..958c6a7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1350,7 +1350,7 @@ @ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr) -@ stub SetConsoleKeyShortcuts +@ stdcall SetConsoleKeyShortcuts(long long ptr long) @ stub SetConsoleLocalEUDC @ stub SetConsoleMaximumWindowSize @ stub SetConsoleMenuClose

1 0

Bruno Jesus : iccvid: Use a separate argument for inverted decompressing.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: ddb47a13a0cffa63bceb424366b8e40dba3f33e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb47a13a0cffa63bceb42436… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 3 21:16:35 2015 +0800 iccvid: Use a separate argument for inverted decompressing. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iccvid/iccvid.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index e6e4419..1ef2db6 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -403,9 +403,10 @@ typedef void (*fn_cvid_v4)(unsigned char *frm, unsigned char *limit, * out_height - the height of the output frame * bit_per_pixel - the number of bits per pixel allocated to the output * frame (only 24 or 32 bpp are supported) + * inverted - if true the output frame is written top-down */ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, - unsigned char *output, unsigned int out_width, unsigned int out_height, int bit_per_pixel) + unsigned char *output, unsigned int out_width, unsigned int out_height, int bit_per_pixel, BOOL inverted) { cvid_codebook *v4_codebook, *v1_codebook, *codebook = NULL; unsigned long x, y, y_bottom, cnum, strip_id, chunk_id, @@ -424,13 +425,10 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, unsigned short height; unsigned short strips; } frame; - BOOL inverted; y = 0; y_bottom = 0; in_buffer = buf; - inverted = (int) out_height < 0; - if (inverted) out_height = -out_height; frame.flags = get_byte(); frame.length = get_byte() << 16; @@ -893,6 +891,7 @@ static LRESULT ICCVID_DecompressBegin( ICCVID_Info *info, LPBITMAPINFO in, LPBIT static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD size ) { LONG width, height; + BOOL inverted; TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); @@ -906,10 +905,10 @@ static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD si width = icd->lpbiInput->biWidth; height = icd->lpbiInput->biHeight; - if (-icd->lpbiOutput->biHeight == height) height = -height; + inverted = -icd->lpbiOutput->biHeight == height; decode_cinepak(info->cvinfo, icd->lpInput, icd->lpbiInput->biSizeImage, - icd->lpOutput, width, height, info->bits_per_pixel); + icd->lpOutput, width, height, info->bits_per_pixel, inverted); return ICERR_OK; } @@ -917,6 +916,7 @@ static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD si static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWORD size ) { LONG width, height; + BOOL inverted; TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); @@ -932,10 +932,10 @@ static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWOR width = icd->lpbiSrc->biWidth; height = icd->lpbiSrc->biHeight; - if (-icd->lpbiDst->biHeight == height) height = -height; + inverted = -icd->lpbiDst->biHeight == height; decode_cinepak(info->cvinfo, icd->lpSrc, icd->lpbiSrc->biSizeImage, - icd->lpDst, width, height, info->bits_per_pixel); + icd->lpDst, width, height, info->bits_per_pixel, inverted); return ICERR_OK; }

1 0

Huw Davies : maintainers: Add a few entries.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 1193a1ba7f92b318d8fd9dc45864827bc12605b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1193a1ba7f92b318d8fd9dc45… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 3 13:47:58 2015 +0000 maintainers: Add a few entries. Reorder 'THE REST' alphabetically by first name. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index a5d3a39..41e2ffe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -96,6 +96,10 @@ DotNet Runtime M: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/mscoree/ +GDI +M: Huw Davies <huw(a)codeweavers.com> +F: dlls/gdi32/ + GDIPlus M: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/gdiplus/ @@ -140,6 +144,23 @@ Netstat M: André Hentschel <nerv(a)dawncrow.de> F: programs/netstat/ +OLE Embedding +M: Huw Davies <huw(a)codeweavers.com> +F: dlls/ole32/clipboard.c +F: dlls/ole32/datacache.c +F: dlls/ole32/defaulthandler.c +F: dlls/ole32/ole2.c +F: dlls/ole32/ole2impl.c +F: dlls/ole32/oleobj.c + +OLE RPC +M: Huw Davies <huw(a)codeweavers.com> +F: dlls/ole32/compobj.c +F: dlls/ole32/marshal.c +F: dlls/ole32/rpc.c +F: dlls/ole32/stubmanager.c +F: dlls/ole32/usrmarshal.c + OLE Storage M: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/ole32/filelockbytes.c @@ -151,12 +172,28 @@ F: dlls/ole32/tests/storage32.c OLE Typelibs P: Andrew Eikum <aeikum(a)codeweavers.com> +P: Huw Davies <huw(a)codeweavers.com> F: dlls/oleaut32/typelib.c OpenMP M: Sebastian Lackner <sebastian(a)fds-team.de> F: dlls/vcomp*/ +Printing +M: Huw Davies <huw(a)codeweavers.com> +F: dlls/localspl/ +F: dlls/wineps.drv/ +F: dlls/winspool.drv/ + +Richedit +M: Huw Davies <huw(a)codeweavers.com> +F: dlls/riched20 + +RPC Runtime +P: Huw Davies <huw(a)codeweavers.com> +F: dlls/rpcrt4 +F: tools/widl + Threadpool M: Sebastian Lackner <sebastian(a)fds-team.de> F: dlls/ntdll/threadpool.c @@ -198,8 +235,9 @@ F: dlls/msxml*/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> -P: Sebastian Lackner <sebastian(a)fds-team.de> P: Alex Henrie <alexhenrie24(a)gmail.com> +P: Huw Davies <huw(a)codeweavers.com> +P: Sebastian Lackner <sebastian(a)fds-team.de> P: Vincent Povirk <vincent(a)codeweavers.com> F: * F: */

1 0

Alistair Leslie-Hughes : oledb32: Support VT_NULL on all conversions.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 0edd515b9585f76ff430274a8fcdf1222c118a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edd515b9585f76ff430274a8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 28 14:54:07 2015 +1100 oledb32: Support VT_NULL on all conversions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 79 +++++++++---------- dlls/oledb32/tests/convert.c | 177 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 208 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0edd515b9585f76ff4302…

1 0

Dmitry Timoshkov : ole32: Relax media type check when loading CF_METAFILEPICT format from OLE storage.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 39d2ce5956ce4557d953425a8b1def288532652f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d2ce5956ce4557d953425a8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 2 17:01:23 2015 +0800 ole32: Relax media type check when loading CF_METAFILEPICT format from OLE storage. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 12 ++++++------ dlls/ole32/tests/ole2.c | 6 ------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 9284410..e93e867 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -282,10 +282,10 @@ static DataCacheEntry *DataCache_GetEntryForFormatEtc(DataCache *This, const FOR /* checks that the clipformat and tymed are valid and returns an error if they * aren't and CACHE_S_NOTSUPPORTED if they are valid, but can't be rendered by * DataCache_Draw */ -static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed) +static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed, BOOL load) { if (!cfFormat || !tymed || - (cfFormat == CF_METAFILEPICT && tymed == TYMED_MFPICT) || + (cfFormat == CF_METAFILEPICT && (tymed == TYMED_MFPICT || load)) || (cfFormat == CF_BITMAP && tymed == TYMED_GDI) || (cfFormat == CF_DIB && tymed == TYMED_HGLOBAL) || (cfFormat == CF_ENHMETAFILE && tymed == TYMED_ENHMF)) @@ -299,11 +299,11 @@ static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed } } -static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc, DataCacheEntry **cache_entry) +static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc, DataCacheEntry **cache_entry, BOOL load) { HRESULT hr; - hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); + hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed, load); if (FAILED(hr)) return hr; if (hr == CACHE_S_FORMATETC_NOTSUPPORTED) @@ -1259,7 +1259,7 @@ static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, IStream * cache_entry = DataCache_GetEntryForFormatEtc( This, fmt ); if (!cache_entry) - hr = DataCache_CreateEntry( This, fmt, &cache_entry ); + hr = DataCache_CreateEntry( This, fmt, &cache_entry, TRUE ); if (SUCCEEDED( hr )) { DataCacheEntry_DiscardData( cache_entry ); @@ -2007,7 +2007,7 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } - hr = DataCache_CreateEntry(This, pformatetc, &cache_entry); + hr = DataCache_CreateEntry(This, pformatetc, &cache_entry, FALSE); if (SUCCEEDED(hr)) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index ed6157f..08253a1 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1215,13 +1215,7 @@ static void test_OleLoad(IStorage *pStorage) hr = OleDraw(obj, DVASPECT_CONTENT, hdc, &rc); DeleteDC(hdc); if (fmt == CF_METAFILEPICT) - { - if (tymed == TYMED_HGLOBAL || tymed == TYMED_MFPICT) ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); - else -todo_wine - ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); - } else if (fmt == CF_ENHMETAFILE) todo_wine ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed);

1 0

Dmitry Timoshkov : ole32/tests: Add some tests for loading and drawing various OLE formats.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: b8800c237b31741f2d88490414cd7783c3ced47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8800c237b31741f2d8849041… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 2 17:01:06 2015 +0800 ole32/tests: Add some tests for loading and drawing various OLE formats. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 39680af..ed6157f 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "objbase.h" #include "shlguid.h" @@ -115,6 +116,32 @@ static HRESULT g_QIFailsWith; static UINT cf_test_1, cf_test_2, cf_test_3; +/**************************************************************************** + * PresentationDataHeader + * + * This structure represents the header of the \002OlePresXXX stream in + * the OLE object storage. + */ +typedef struct PresentationDataHeader +{ + /* clipformat: + * - standard clipformat: + * DWORD length = 0xffffffff; + * DWORD cfFormat; + * - or custom clipformat: + * DWORD length; + * CHAR format_name[length]; (null-terminated) + */ + DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ + DVASPECT dvAspect; + DWORD lindex; + DWORD tymed; + DWORD unknown7; /* 0 */ + DWORD dwObjectExtentX; + DWORD dwObjectExtentY; + DWORD dwSize; +} PresentationDataHeader; + #define CHECK_EXPECTED_METHOD(method_name) \ do { \ trace("%s\n", method_name); \ @@ -1042,6 +1069,7 @@ static void test_OleLoad(IStorage *pStorage) { HRESULT hr; IOleObject *pObject; + DWORD fmt; static const struct expected_method methods_oleload[] = { @@ -1099,6 +1127,111 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + + for (fmt = CF_TEXT; fmt < CF_MAX; fmt++) + { + static const WCHAR olrepres[] = { 2,'O','l','e','P','r','e','s','0','0','0',0 }; + IStorage *stg; + IStream *stream; + IUnknown *obj; + DWORD data, i, tymed, data_size; + PresentationDataHeader header; + HDC hdc; + HGDIOBJ hobj; + RECT rc; + char buf[256]; + + for (i = 0; i < 7; i++) + { + hr = StgCreateDocfile(NULL, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, 0, &stg); + ok(hr == S_OK, "StgCreateDocfile error %#x\n", hr); + + hr = IStorage_SetClass(stg, &CLSID_WineTest); + ok(hr == S_OK, "SetClass error %#x\n", hr); + + hr = IStorage_CreateStream(stg, olrepres, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, &stream); + ok(hr == S_OK, "CreateStream error %#x\n", hr); + + data = ~0; + hr = IStream_Write(stream, &data, sizeof(data), NULL); + ok(hr == S_OK, "Write error %#x\n", hr); + + data = fmt; + hr = IStream_Write(stream, &data, sizeof(data), NULL); + ok(hr == S_OK, "Write error %#x\n", hr); + + switch (fmt) + { + case CF_BITMAP: + /* FIXME: figure out stream format */ + hobj = CreateBitmap(1, 1, 1, 1, NULL); + data_size = GetBitmapBits(hobj, sizeof(buf), buf); + DeleteObject(hobj); + break; + + case CF_METAFILEPICT: + case CF_ENHMETAFILE: + hdc = CreateMetaFileA(NULL); + hobj = CloseMetaFile(hdc); + data_size = GetMetaFileBitsEx(hobj, sizeof(buf), buf); + DeleteMetaFile(hobj); + break; + + default: + data_size = sizeof(buf); + memset(buf, 'A', sizeof(buf)); + break; + } + + tymed = 1 << i; + + header.unknown3 = 4; + header.dvAspect = DVASPECT_CONTENT; + header.lindex = -1; + header.tymed = tymed; + header.unknown7 = 0; + header.dwObjectExtentX = 1; + header.dwObjectExtentY = 1; + header.dwSize = data_size; + hr = IStream_Write(stream, &header, sizeof(header), NULL); + ok(hr == S_OK, "Write error %#x\n", hr); + + hr = IStream_Write(stream, buf, data_size, NULL); + ok(hr == S_OK, "Write error %#x\n", hr); + + IStream_Release(stream); + + hr = OleLoad(stg, &IID_IUnknown, NULL, (void **)&obj); + /* FIXME: figure out stream format */ + if (fmt == CF_BITMAP && hr != S_OK) + { + IStorage_Release(stg); + continue; + } + ok(hr == S_OK, "OleLoad error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + + hdc = CreateCompatibleDC(0); + SetRect(&rc, 0, 0, 100, 100); + hr = OleDraw(obj, DVASPECT_CONTENT, hdc, &rc); + DeleteDC(hdc); + if (fmt == CF_METAFILEPICT) + { + if (tymed == TYMED_HGLOBAL || tymed == TYMED_MFPICT) + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + else +todo_wine + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + } + else if (fmt == CF_ENHMETAFILE) +todo_wine + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + else + ok(hr == OLE_E_BLANK || hr == OLE_E_NOTRUNNING || hr == E_FAIL, "OleDraw should fail: %#x, cfFormat = %u, tymed = %u\n", hr, fmt, header.tymed); + + IUnknown_Release(obj); + IStorage_Release(stg); + } + } } static BOOL STDMETHODCALLTYPE draw_continue(ULONG_PTR param)

1 0

Alistair Leslie-Hughes : d3dx9: Don' t always fail if an ID3DXAnimationController pointer is passed to D3DXLoadMeshHierarchyFromXInMemory.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 418a7c6c7316f3803c38b1e2b6bdfe4a5347b7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=418a7c6c7316f3803c38b1e2b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 30 00:52:30 2015 +0100 d3dx9: Don't always fail if an ID3DXAnimationController pointer is passed to D3DXLoadMeshHierarchyFromXInMemory. D3DXLoadMeshHierarchyFromXInMemory will only return an AnimationController when the xfile has an AnimationSet. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 14 +++-- dlls/d3dx9_36/tests/mesh.c | 145 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 152 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6294036..c597e8e 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3912,11 +3912,9 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *memory, DWORD memo if (!memory || !memory_size || !device || !frame_hierarchy || !alloc_hier) return D3DERR_INVALIDCALL; - if (load_user_data || anim_controller) { - if (load_user_data) - FIXME("Loading user data not implemented\n"); - if (anim_controller) - FIXME("Animation controller creation not implemented\n"); + if (load_user_data) + { + FIXME("Loading user data not implemented.\n"); return E_NOTIMPL; } @@ -3986,6 +3984,12 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *memory, DWORD memo hr = D3D_OK; } + if (anim_controller) + { + *anim_controller = NULL; + FIXME("Animation controller creation not implemented.\n"); + } + cleanup: if (FAILED(hr) && first_frame) D3DXFrameDestroy(first_frame, alloc_hier); if (filedata) filedata->lpVtbl->Release(filedata); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 3b1fafa..588654d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2205,6 +2205,127 @@ static void D3DXLoadMeshTest(void) (char *)"texture.jpg", /* pTextureFilename */ }, }; + static const char box_anim_xfile[] = + "xof 0303txt 0032" + "Mesh CubeMesh {" + "8;" /* DWORD nVertices; */ + /* array Vector vertices[nVertices]; */ + "0.0; 0.0; 0.0;," + "0.0; 0.0; 1.0;," + "0.0; 1.0; 0.0;," + "0.0; 1.0; 1.0;," + "1.0; 0.0; 0.0;," + "1.0; 0.0; 1.0;," + "1.0; 1.0; 0.0;," + "1.0; 1.0; 1.0;;" + "6;" /* DWORD nFaces; */ + /* array MeshFace faces[nFaces]; */ + "4; 0, 1, 3, 2;," /* left side */ + "4; 2, 3, 7, 6;," /* top side */ + "4; 6, 7, 5, 4;," /* right side */ + "4; 1, 0, 4, 5;," /* bottom side */ + "4; 1, 5, 7, 3;," /* back side */ + "4; 0, 2, 6, 4;;" /* front side */ + "MeshNormals {" + "6;" /* DWORD nNormals; */ + /* array Vector normals[nNormals]; */ + "-1.0; 0.0; 0.0;," + "0.0; 1.0; 0.0;," + "1.0; 0.0; 0.0;," + "0.0; -1.0; 0.0;," + "0.0; 0.0; 1.0;," + "0.0; 0.0; -1.0;;" + "6;" /* DWORD nFaceNormals; */ + /* array MeshFace faceNormals[nFaceNormals]; */ + "4; 0, 0, 0, 0;," + "4; 1, 1, 1, 1;," + "4; 2, 2, 2, 2;," + "4; 3, 3, 3, 3;," + "4; 4, 4, 4, 4;," + "4; 5, 5, 5, 5;;" + "}" + "MeshMaterialList materials {" + "2;" /* DWORD nMaterials; */ + "6;" /* DWORD nFaceIndexes; */ + /* array DWORD faceIndexes[nFaceIndexes]; */ + "0, 0, 0, 1, 1, 1;;" + "Material {" + /* ColorRGBA faceColor; */ + "0.0; 0.0; 1.0; 1.0;;" + /* FLOAT power; */ + "0.5;" + /* ColorRGB specularColor; */ + "1.0; 1.0; 1.0;;" + /* ColorRGB emissiveColor; */ + "0.0; 0.0; 0.0;;" + "}" + "Material {" + /* ColorRGBA faceColor; */ + "1.0; 1.0; 1.0; 1.0;;" + /* FLOAT power; */ + "1.0;" + /* ColorRGB specularColor; */ + "1.0; 1.0; 1.0;;" + /* ColorRGB emissiveColor; */ + "0.0; 0.0; 0.0;;" + "TextureFilename { \"texture.jpg\"; }" + "}" + "}" + "MeshVertexColors {" + "8;" /* DWORD nVertexColors; */ + /* array IndexedColor vertexColors[nVertexColors]; */ + "0; 0.0; 0.0; 0.0; 0.0;;" + "1; 0.0; 0.0; 1.0; 0.1;;" + "2; 0.0; 1.0; 0.0; 0.2;;" + "3; 0.0; 1.0; 1.0; 0.3;;" + "4; 1.0; 0.0; 0.0; 0.4;;" + "5; 1.0; 0.0; 1.0; 0.5;;" + "6; 1.0; 1.0; 0.0; 0.6;;" + "7; 1.0; 1.0; 1.0; 0.7;;" + "}" + "MeshTextureCoords {" + "8;" /* DWORD nTextureCoords; */ + /* array Coords2d textureCoords[nTextureCoords]; */ + "0.0; 1.0;," + "1.0; 1.0;," + "0.0; 0.0;," + "1.0; 0.0;," + "1.0; 1.0;," + "0.0; 1.0;," + "1.0; 0.0;," + "0.0; 0.0;;" + "}" + "}" + "Frame CubeFrame {" + "FrameTransformMatrix {" + /* Matrix4x4 frameMatrix; */ + "1.0, 0.0, 0.0, 0.0," + "0.0, 1.0, 0.0, 0.0," + "0.0, 0.0, 1.0, 0.0," + "0.0, 0.0, 0.0, 1.0;;" + "}" + "{CubeMesh}" + "}" + "AnimationSet AnimationSet0 {" + "Animation Animation0 {" + "{CubeFrame}" + "AnimationKey {" + "2;" /* DWORD keyType; */ + "9;" /* DWORD nKeys; */ + /* array TimedFloatKeys keys[nKeys]; */ + "10; 3; -100.0, 0.0, 0.0;;," + "20; 3; -75.0, 0.0, 0.0;;," + "30; 3; -50.0, 0.0, 0.0;;," + "40; 3; -25.5, 0.0, 0.0;;," + "50; 3; 0.0, 0.0, 0.0;;," + "60; 3; 25.5, 0.0, 0.0;;," + "70; 3; 50.0, 0.0, 0.0;;," + "80; 3; 75.5, 0.0, 0.0;;," + "90; 3; 100.0, 0.0, 0.0;;;" + "}" + "}" + "}"; + const DWORD box_fvf = D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX1; /*________________________*/ static const D3DXMATERIAL default_materials[] = { @@ -2225,6 +2346,7 @@ static void D3DXLoadMeshTest(void) D3DXFRAME *frame_hier = NULL; D3DXMATRIX transform; struct test_context *test_context; + ID3DXAnimationController *controller; if (!(test_context = new_test_context())) { @@ -2281,12 +2403,31 @@ static void D3DXLoadMeshTest(void) frame_hier = NULL; } + controller = (ID3DXAnimationController *)0xdeadbeef; + hr = D3DXLoadMeshHierarchyFromXInMemory(box_anim_xfile, sizeof(box_anim_xfile) - 1, + D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, &controller); + todo_wine ok(hr == D3D_OK, "Expected D3D_OK, got %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(controller != NULL, "Animation Controller NULL.\n"); + + hr = D3DXFrameDestroy(frame_hier, &alloc_hier); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x.\n", hr); + if (controller) + controller->lpVtbl->Release(controller); + + frame_hier = NULL; + } + + controller = (ID3DXAnimationController *)0xdeadbeef; hr = D3DXLoadMeshHierarchyFromXInMemory(box_xfile, sizeof(box_xfile) - 1, - D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, NULL); + D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, &controller); ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); - if (SUCCEEDED(hr)) { + if (SUCCEEDED(hr)) + { D3DXMESHCONTAINER *container = frame_hier->pMeshContainer; + ok(!controller, "Animation Controller returned.\n"); ok(frame_hier->Name == NULL, "Expected NULL, got '%s'\n", frame_hier->Name); D3DXMatrixIdentity(&transform); check_matrix(&frame_hier->TransformationMatrix, &transform);

1 0

Huw Davies : gdi32: Take into account the mask's offset.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 3d58c354ae1be7567e1571af96d0c92864e31a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d58c354ae1be7567e1571af9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 3 11:07:44 2015 +0000 gdi32: Take into account the mask's offset. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index d427070..d2b3de2 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -800,6 +800,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, /* combine both using the mask as a pattern brush */ SelectObject(hDC2, hbrMask); + SetBrushOrgEx(hDC2, -xMask, -yMask, NULL); BitBlt(hDC2, 0, 0, nWidth, nHeight, hDC1, 0, 0, 0xac0744 ); /* (D & P) | (S & ~P) */ SelectObject(hDC2, hbrTmp);

1 0

Dmitry Timoshkov : msi: Make sure to reset the 'in_quotes' state in all cases.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 2ee784e62416c9443bc6d227281556b4655ced00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee784e62416c9443bc6d2272… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 18:09:00 2015 +0800 msi: Make sure to reset the 'in_quotes' state in all cases. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 7 +++---- dlls/msi/tests/install.c | 9 ++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index df73652..136bfbb 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -255,8 +255,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) len++; break; default: - if (!count) in_quotes = FALSE; - else in_quotes = TRUE; + if (count) in_quotes = TRUE; len++; break; } @@ -277,8 +276,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) break; default: state = state_token; - if (!count) in_quotes = FALSE; - else in_quotes = TRUE; + if (count) in_quotes = TRUE; len++; break; } @@ -287,6 +285,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) default: break; } if (!ignore) *out++ = *p; + if (!count) in_quotes = FALSE; } done: diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6b86cd2..9cd579b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4716,11 +4716,14 @@ static void test_propcase(void) ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); - r = MsiInstallProductA(msifile, "BLAHBLAH=\"Copyright \"\"My Company\"\" 2015\" MyProp=42"); + r = MsiInstallProductA(msifile, "Prop1=\"Copyright \"\"My Company\"\" 2015\" MyProp=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + r = MsiInstallProductA(msifile, "Prop1=\"\"\"install.exe\"\" /Install\" MyProp=\"42\""); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); -todo_wine ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); -todo_wine ok(delete_pf("msitest", FALSE), "Directory not created\n"); error:

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
63
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 November 2015