July 2015 - Wine-commits - list.winehq.org

Dmitry Timoshkov : windowscodecs: Add support for 8bpp grayscale TIFF with 8bpp alpha.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: d57b87c0f3d129e0d1baf8a848ad4f4ad8165219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57b87c0f3d129e0d1baf8a84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 14:46:41 2015 +0800 windowscodecs: Add support for 8bpp grayscale TIFF with 8bpp alpha. --- dlls/windowscodecs/tests/tiffformat.c | 103 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 66 ++++++++++++++++++++-- 2 files changed, 164 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index cc1951e..d07caa3 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -92,6 +92,48 @@ static const struct tiff_1bpp_data { 900, 3 }, { 0x11, 0x22, 0x33, 0 } }; + +static const struct tiff_8bpp_alpha +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[15]; + ULONG next_IFD; + struct IFD_rational res; + BYTE pixel_data[8]; +} tiff_8bpp_alpha = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_8bpp_alpha, number_of_entries), + 15, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 2 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 2 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 2, MAKELONG(8, 8) }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 1 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 2 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 2 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 8 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) }, + { 0x11c, IFD_SHORT, 1, 1 }, /* PLANARCONFIGURATION */ + { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ + { 0x152, IFD_SHORT, 1, 1 } /* EXTRASAMPLES: 1 - Associated alpha with pre-multiplied color */ + }, + 0, + { 96, 1 }, + { 0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88 } +}; #include "poppack.h" static IWICImagingFactory *factory; @@ -264,6 +306,66 @@ todo_wine IStream_Release(stream); } +static void test_tiff_8bpp_alpha(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + UINT frame_count, width, height, i; + double dpi_x, dpi_y; + IWICPalette *palette; + GUID format; + WICRect rc; + BYTE data[16]; + static const BYTE expected_data[16] = { 0x11,0x11,0x11,0x22,0x33,0x33,0x33,0x44, + 0x55,0x55,0x55,0x66,0x77,0x77,0x77,0x88 }; + + decoder = create_decoder(&tiff_8bpp_alpha, sizeof(tiff_8bpp_alpha)); + ok(decoder != 0, "Failed to load TIFF image data\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok(hr == S_OK, "GetFrameCount error %#x\n", hr); + ok(frame_count == 1, "expected 1, got %u\n", frame_count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %#x\n", hr); + ok(width == 2, "expected 2, got %u\n", width); + ok(height == 2, "expected 2, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(frame, &dpi_x, &dpi_y); + ok(hr == S_OK, "GetResolution error %#x\n", hr); + ok(dpi_x == 96.0, "expected 96.0, got %f\n", dpi_x); + ok(dpi_y == 96.0, "expected 96.0, got %f\n", dpi_y); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppPBGRA), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, + "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %#x\n", hr); + IWICPalette_Release(palette); + + rc.X = 0; + rc.Y = 0; + rc.Width = 2; + rc.Height = 2; + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rc, 8, sizeof(data), data); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + + for (i = 0; i < sizeof(data); i++) + ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); + + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + START_TEST(tiffformat) { HRESULT hr; @@ -277,6 +379,7 @@ START_TEST(tiffformat) test_tiff_palette(); test_QueryCapability(); + test_tiff_8bpp_alpha(); IWICImagingFactory_Release(factory); CoUninitialize(); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 7f987de..51e940f 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -236,7 +236,7 @@ typedef struct { const WICPixelFormatGUID *format; int bps; int samples; - int bpp; + int bpp, source_bpp; int planar; int indexed; int reverse_bgr; @@ -326,23 +326,63 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->invert_grayscale = 1; /* fall through */ case 1: /* BlackIsZero */ - if (samples != 1) + if (samples == 2) + { + ret = pTIFFGetField(tiff, TIFFTAG_EXTRASAMPLES, &extra_sample_count, &extra_samples); + if (!ret) + { + extra_sample_count = 1; + extra_sample = 0; + extra_samples = &extra_sample; + } + } + else if (samples != 1) { - FIXME("unhandled grayscale sample count %u\n", samples); + FIXME("unhandled %dbpp sample count %u\n", bps, samples); return E_FAIL; } - decode_info->bpp = bps; + decode_info->bpp = bps * samples; + decode_info->source_bpp = decode_info->bpp; switch (bps) { case 1: + if (samples != 1) + { + FIXME("unhandled 1bpp sample count %u\n", samples); + return E_FAIL; + } decode_info->format = &GUID_WICPixelFormatBlackWhite; break; case 4: + if (samples != 1) + { + FIXME("unhandled 4bpp grayscale sample count %u\n", samples); + return E_FAIL; + } decode_info->format = &GUID_WICPixelFormat4bppGray; break; case 8: - decode_info->format = &GUID_WICPixelFormat8bppGray; + if (samples == 1) + decode_info->format = &GUID_WICPixelFormat8bppGray; + else + { + decode_info->bpp = 32; + + switch(extra_samples[0]) + { + case 1: /* Associated (pre-multiplied) alpha data */ + decode_info->format = &GUID_WICPixelFormat32bppPBGRA; + break; + case 0: /* Unspecified data */ + case 2: /* Unassociated alpha data */ + decode_info->format = &GUID_WICPixelFormat32bppBGRA; + break; + default: + FIXME("unhandled extra sample type %u\n", extra_samples[0]); + return E_FAIL; + } + } break; default: FIXME("unhandled greyscale bit count %u\n", bps); @@ -943,6 +983,22 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT hr = E_FAIL; } + /* 8bpp grayscale with extra alpha */ + if (hr == S_OK && This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) + { + BYTE *src; + DWORD *dst, count = This->decode_info.tile_width * This->decode_info.tile_height; + + src = This->cached_tile + This->decode_info.tile_width * This->decode_info.tile_height * 2 - 2; + dst = (DWORD *)(This->cached_tile + This->decode_info.tile_size - 4); + + while (count--) + { + *dst-- = src[0] | (src[0] << 8) | (src[0] << 16) | (src[1] << 24); + src -= 2; + } + } + if (hr == S_OK && This->decode_info.reverse_bgr) { if (This->decode_info.bps == 8)

1 0

Hugh McMaster : wineconsole: Allow users to enable or disable Insert Mode via the user dialog.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: c3dd56c99332c4ad9dbd095935d2c17c53463154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3dd56c99332c4ad9dbd09593… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 13 23:18:37 2015 +1000 wineconsole: Allow users to enable or disable Insert Mode via the user dialog. --- po/ar.po | 44 +++++++++++++++++++--------------- po/bg.po | 42 +++++++++++++++++--------------- po/ca.po | 44 +++++++++++++++++++--------------- po/cs.po | 44 +++++++++++++++++++--------------- po/da.po | 44 +++++++++++++++++++--------------- po/de.po | 44 +++++++++++++++++++--------------- po/el.po | 42 +++++++++++++++++--------------- po/en.po | 42 +++++++++++++++++--------------- po/en_US.po | 42 +++++++++++++++++--------------- po/eo.po | 44 +++++++++++++++++++--------------- po/es.po | 44 +++++++++++++++++++--------------- po/fa.po | 42 +++++++++++++++++--------------- po/fi.po | 44 +++++++++++++++++++--------------- po/fr.po | 44 +++++++++++++++++++--------------- po/he.po | 44 +++++++++++++++++++--------------- po/hi.po | 42 +++++++++++++++++--------------- po/hr.po | 44 +++++++++++++++++++--------------- po/hu.po | 44 +++++++++++++++++++--------------- po/it.po | 44 +++++++++++++++++++--------------- po/ja.po | 44 +++++++++++++++++++--------------- po/ko.po | 44 +++++++++++++++++++--------------- po/lt.po | 44 +++++++++++++++++++--------------- po/ml.po | 42 +++++++++++++++++--------------- po/nb_NO.po | 44 +++++++++++++++++++--------------- po/nl.po | 44 +++++++++++++++++++--------------- po/or.po | 42 +++++++++++++++++--------------- po/pa.po | 42 +++++++++++++++++--------------- po/pl.po | 44 +++++++++++++++++++--------------- po/pt_BR.po | 44 +++++++++++++++++++--------------- po/pt_PT.po | 44 +++++++++++++++++++--------------- po/rm.po | 42 +++++++++++++++++--------------- po/ro.po | 44 +++++++++++++++++++--------------- po/ru.po | 44 +++++++++++++++++++--------------- po/sk.po | 44 +++++++++++++++++++--------------- po/sl.po | 44 +++++++++++++++++++--------------- po/sr_RS(a)cyrillic.po | 44 +++++++++++++++++++--------------- po/sr_RS(a)latin.po | 44 +++++++++++++++++++--------------- po/sv.po | 44 +++++++++++++++++++--------------- po/te.po | 42 +++++++++++++++++--------------- po/th.po | 42 +++++++++++++++++--------------- po/tr.po | 44 +++++++++++++++++++--------------- po/uk.po | 44 +++++++++++++++++++--------------- po/wa.po | 42 +++++++++++++++++--------------- po/wine.pot | 42 +++++++++++++++++--------------- po/zh_CN.po | 44 +++++++++++++++++++--------------- po/zh_TW.po | 44 +++++++++++++++++++--------------- programs/wineconsole/dialog.c | 5 ++++ programs/wineconsole/wineconsole.c | 30 ++++++++++++++++++++++- programs/wineconsole/wineconsole.rc | 1 + programs/wineconsole/wineconsole_res.h | 1 + 50 files changed, 1158 insertions(+), 875 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3dd56c99332c4ad9dbd0…

1 0

Dmitry Timoshkov : kernel32/tests: Add a loader test using minimal PE image that Windows7 is able to load.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 38649f2060f3435ec54bf370dc23879e53d6f07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38649f2060f3435ec54bf370d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 14:17:32 2015 +0800 kernel32/tests: Add a loader test using minimal PE image that Windows7 is able to load. --- dlls/kernel32/tests/loader.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index abd17df..b844433 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -375,6 +375,16 @@ static void test_Loader(void) 1, 0, { ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT } /* vista is more strict */ + }, + /* Minimal PE image that Windows7 is able to load: 268 bytes */ + { 0x04, + 0, 0xf0, /* optional header size just forces 0xf0 bytes to be written, + 0 or another number don't change the behaviour, what really + matters is file size regardless of values in the headers */ + 0x04 /* also serves as e_lfanew in the truncated MZ header */, 0x04, + 0x40, /* minimal image size that Windows7 accepts */ + 0, + { ERROR_SUCCESS } } }; int i;

1 0

Dmitry Timoshkov : ole32: Fix a memory leak.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 76f9d9334438d0d7c77981b9eaf48408c3e68761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76f9d9334438d0d7c77981b9e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 14:31:45 2015 +0800 ole32: Fix a memory leak. --- dlls/ole32/storage32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 4b6f630..ce72b73 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9183,7 +9183,10 @@ static HRESULT STREAM_ReadString( IStream *stm, LPWSTR *string ) count = 0; r = IStream_Read( stm, str, len, &count ); if( FAILED( r ) ) + { + CoTaskMemFree( str ); return r; + } if( count != len ) { CoTaskMemFree( str );

1 0

Huw Davies : rpcrt4: Initialize CorrDespIncrement to zero and mark the pre-Vista behaviour as broken.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 6518b7288939d1dfd3cb388035cc87d2626b1a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6518b7288939d1dfd3cb38803… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 13 13:11:35 2015 +0100 rpcrt4: Initialize CorrDespIncrement to zero and mark the pre-Vista behaviour as broken. --- dlls/rpcrt4/ndr_clientserver.c | 1 + dlls/rpcrt4/tests/ndr_marshall.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 502faa1..66fe33b 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -120,6 +120,7 @@ unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_M pStubMsg->pPointerQueueState = NULL; pStubMsg->IgnoreEmbeddedPointers = 0; pStubMsg->PointerBufferMark = NULL; + pStubMsg->CorrDespIncrement = 0; pStubMsg->uFlags = 0; pStubMsg->UniquePtrCount = 0; pStubMsg->pfnAllocate = pStubDesc->pfnAllocate; diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 411ba8b..a9c16b2 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1320,9 +1320,9 @@ todo_wine ok(stubMsg.ReuseBuffer == 0 || broken(stubMsg.ReuseBuffer == 1), /* win2k */ "stubMsg.ReuseBuffer should have been set to zero instead of %d\n", stubMsg.ReuseBuffer); - ok(stubMsg.CorrDespIncrement == 0xcc || - stubMsg.CorrDespIncrement == 0, - "CorrDespIncrement should have been unset instead of 0x%x\n", stubMsg.CorrDespIncrement); + ok(stubMsg.CorrDespIncrement == 0 || + broken(stubMsg.CorrDespIncrement == 0xcc), /* <= Win 2003 */ + "CorrDespIncrement should have been set to zero instead of 0x%x\n", stubMsg.CorrDespIncrement); ok(stubMsg.FullPtrXlatTables == 0, "stubMsg.BufferLength should have been 0 instead of %p\n", stubMsg.FullPtrXlatTables); }

1 0

Huw Davies : rpcrt4: Set CorrDespIncrement to the size of the (non-range) /robust payload.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 76dc3b64ae10f94d71510f7c3b787a33a66b6c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=76dc3b64ae10f94d71510f7c3… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 13 13:11:36 2015 +0100 rpcrt4: Set CorrDespIncrement to the size of the (non-range) /robust payload. fHasNewCorrDesc is only set on older versions of Windows that don't set CorrDespIncrement, but it can't hurt to continue to set it. --- dlls/rpcrt4/ndr_marshall.c | 6 +++++- dlls/rpcrt4/tests/ndr_marshall.c | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 0ba5b00..35c15a1 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -7206,7 +7206,11 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, */ void WINAPI NdrCorrelationInitialize(PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, ULONG CacheSize, ULONG Flags) { - FIXME("(%p, %p, %d, 0x%x): stub\n", pStubMsg, pMemory, CacheSize, Flags); + FIXME("(%p, %p, %d, 0x%x): semi-stub\n", pStubMsg, pMemory, CacheSize, Flags); + + if (pStubMsg->CorrDespIncrement == 0) + pStubMsg->CorrDespIncrement = 2; /* size of the normal (non-range) /robust payload */ + pStubMsg->fHasNewCorrDesc = TRUE; } diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index a9c16b2..d6befe5 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2468,6 +2468,27 @@ if (status == RPC_S_OK) ok(status == RPC_S_OK, "got %d\n", status); } +static void test_NdrCorrelationInitialize(void) +{ + MIDL_STUB_MESSAGE stub_msg; + BYTE buf[256]; + + memset( &stub_msg, 0, sizeof(stub_msg) ); + memset( buf, 0, sizeof(buf) ); + + NdrCorrelationInitialize( &stub_msg, buf, sizeof(buf), 0 ); + ok( stub_msg.CorrDespIncrement == 2 || + broken(stub_msg.CorrDespIncrement == 0), /* <= Win 2003 */ + "got %d\n", stub_msg.CorrDespIncrement ); + + memset( &stub_msg, 0, sizeof(stub_msg) ); + memset( buf, 0, sizeof(buf) ); + + stub_msg.CorrDespIncrement = 1; + NdrCorrelationInitialize( &stub_msg, buf, sizeof(buf), 0 ); + ok( stub_msg.CorrDespIncrement == 1, "got %d\n", stub_msg.CorrDespIncrement ); +} + START_TEST( ndr_marshall ) { determine_pointer_marshalling_style(); @@ -2489,4 +2510,5 @@ START_TEST( ndr_marshall ) test_NdrMapCommAndFaultStatus(); test_NdrGetUserMarshalInfo(); test_MesEncodeFixedBufferHandleCreate(); + test_NdrCorrelationInitialize(); }

1 0

Huw Davies : rpcrt4: Add missing calls to NdrCorrelationInitialize/Free.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: a8f46c78ffe6c87db0316b48b9e9e82c412f5519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f46c78ffe6c87db0316b48b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 13 13:11:37 2015 +0100 rpcrt4: Add missing calls to NdrCorrelationInitialize/Free. --- dlls/rpcrt4/ndr_stubless.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index c9d9930..3106d47 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1344,8 +1344,7 @@ LONG WINAPI NdrStubCall2( if (ext_flags.HasNewCorrDesc) { /* initialize extra correlation package */ - FIXME("new correlation description not implemented\n"); - stubMsg.fHasNewCorrDesc = TRUE; + NdrCorrelationInitialize(&stubMsg, NdrCorrCache, sizeof(NdrCorrCache), 0); } } else @@ -1432,7 +1431,7 @@ LONG WINAPI NdrStubCall2( if (ext_flags.HasNewCorrDesc) { /* free extra correlation package */ - /* NdrCorrelationFree(&stubMsg); */ + NdrCorrelationFree(&stubMsg); } if (Oif_flags.HasPipes)

1 0

Huw Davies : rpcrt4: Use CorrDespIncrement to skip over the correlation descriptor.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: e8d1380aa7437753785e4d9319d0ba4eb02d7a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d1380aa7437753785e4d931… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 13 13:11:38 2015 +0100 rpcrt4: Use CorrDespIncrement to skip over the correlation descriptor. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 35c15a1..5414329 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -452,7 +452,7 @@ static inline BOOL IsConformanceOrVariancePresent(PFORMAT_STRING pFormat) static inline PFORMAT_STRING SkipConformance(const PMIDL_STUB_MESSAGE pStubMsg, const PFORMAT_STRING pFormat) { - return pStubMsg->fHasNewCorrDesc ? pFormat + 6 : pFormat + 4; + return pFormat + 4 + pStubMsg->CorrDespIncrement; } static PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat)

1 0

Huw Davies : rpcrt4: Procedures containing a range within a conformance have a larger correlation descriptor.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 173ae68f0b41d5540e17f46e174b762bc1dc4e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=173ae68f0b41d5540e17f46e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 13 13:11:39 2015 +0100 rpcrt4: Procedures containing a range within a conformance have a larger correlation descriptor. --- dlls/rpcrt4/ndr_stubless.c | 6 ++++++ include/ndrtypes.h | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 3106d47..dbdf873 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -736,6 +736,8 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma { /* initialize extra correlation package */ NdrCorrelationInitialize(&stubMsg, NdrCorrCache, sizeof(NdrCorrCache), 0); + if (ext_flags.Unused & 0x2) /* has range on conformance */ + stubMsg.CorrDespIncrement = 12; } /* order of phases: @@ -1345,6 +1347,8 @@ LONG WINAPI NdrStubCall2( { /* initialize extra correlation package */ NdrCorrelationInitialize(&stubMsg, NdrCorrCache, sizeof(NdrCorrCache), 0); + if (ext_flags.Unused & 0x2) /* has range on conformance */ + stubMsg.CorrDespIncrement = 12; } } else @@ -1618,6 +1622,8 @@ LONG_PTR CDECL ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING { /* initialize extra correlation package */ NdrCorrelationInitialize(pStubMsg, async_call_data->NdrCorrCache, sizeof(async_call_data->NdrCorrCache), 0); + if (ext_flags.Unused & 0x2) /* has range on conformance */ + pStubMsg->CorrDespIncrement = 12; } /* order of phases: diff --git a/include/ndrtypes.h b/include/ndrtypes.h index 8605b73..b353ce5 100644 --- a/include/ndrtypes.h +++ b/include/ndrtypes.h @@ -83,7 +83,11 @@ typedef struct * routine @ NotifyIndex. */ unsigned char HasNotify2 : 1; /* 0x10 - should call MIDL [notify_flag] routine @ * NotifyIndex. */ - unsigned char Unused : 3; + + /* The following bits are in fact used by midl but haven't yet been + named in the SDK. */ + unsigned char Unused : 3; /* 0x20 - has complex return */ + /* 0x40 - has range on conformance */ } INTERPRETER_OPT_FLAGS2, *PINTERPRETER_OPT_FLAGS2; /* Win2000 extensions */

1 0

Hugh McMaster : wineconsole: Rearrange user dialog to make room for new controls and improve resource strings.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: f85b46912a310c300f05b4db57f30732596d6510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85b46912a310c300f05b4db5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 13 23:17:25 2015 +1000 wineconsole: Rearrange user dialog to make room for new controls and improve resource strings. --- po/ar.po | 46 ++++++++++++++++++++----------------- po/bg.po | 38 ++++++++++++++---------------- po/ca.po | 46 ++++++++++++++++++++----------------- po/cs.po | 46 ++++++++++++++++++++----------------- po/da.po | 46 ++++++++++++++++++++----------------- po/de.po | 46 ++++++++++++++++++++----------------- po/el.po | 36 +++++++++++++---------------- po/en.po | 38 ++++++++++++++---------------- po/en_US.po | 38 ++++++++++++++---------------- po/eo.po | 46 ++++++++++++++++++++----------------- po/es.po | 46 ++++++++++++++++++++----------------- po/fa.po | 35 ++++++++++++---------------- po/fi.po | 46 ++++++++++++++++++++----------------- po/fr.po | 46 ++++++++++++++++++++----------------- po/he.po | 45 +++++++++++++++++++----------------- po/hi.po | 28 ++++++++++------------ po/hr.po | 46 ++++++++++++++++++++----------------- po/hu.po | 46 ++++++++++++++++++++----------------- po/it.po | 46 ++++++++++++++++++++----------------- po/ja.po | 46 ++++++++++++++++++++----------------- po/ko.po | 46 ++++++++++++++++++++----------------- po/lt.po | 46 ++++++++++++++++++++----------------- po/ml.po | 28 ++++++++++------------ po/nb_NO.po | 46 ++++++++++++++++++++----------------- po/nl.po | 46 ++++++++++++++++++++----------------- po/or.po | 28 ++++++++++------------ po/pa.po | 28 ++++++++++------------ po/pl.po | 46 ++++++++++++++++++++----------------- po/pt_BR.po | 46 ++++++++++++++++++++----------------- po/pt_PT.po | 46 ++++++++++++++++++++----------------- po/rm.po | 34 ++++++++++++--------------- po/ro.po | 46 ++++++++++++++++++++----------------- po/ru.po | 46 ++++++++++++++++++++----------------- po/sk.po | 34 ++++++++++++--------------- po/sl.po | 46 ++++++++++++++++++++----------------- po/sr_RS(a)cyrillic.po | 41 +++++++++++++++------------------ po/sr_RS(a)latin.po | 41 +++++++++++++++------------------ po/sv.po | 40 ++++++++++++++++---------------- po/te.po | 28 ++++++++++------------ po/th.po | 36 +++++++++++++---------------- po/tr.po | 46 ++++++++++++++++++++----------------- po/uk.po | 46 ++++++++++++++++++++----------------- po/wa.po | 34 ++++++++++++--------------- po/wine.pot | 28 ++++++++++------------ po/zh_CN.po | 46 ++++++++++++++++++++----------------- po/zh_TW.po | 46 ++++++++++++++++++++----------------- programs/wineconsole/wineconsole.rc | 32 +++++++++++++------------- 47 files changed, 986 insertions(+), 946 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f85b46912a310c300f05b…

1 0