wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Andrey Gusev : quartz: Add missing parameter name.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: adda5aa6358bde67f6286d35ed3549c00b124e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adda5aa6358bde67f6286d35e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Oct 7 16:55:42 2017 +0300 quartz: Add missing parameter name. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 5 ++++- dlls/quartz/pin.h | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index a2651fd..355d87d 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -218,7 +218,10 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinI return S_OK; } -HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) +HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, + SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, + CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, + LPCRITICAL_SECTION pCritSec, IPin ** ppPin) { PullPin * pPinImpl; diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index 428fa6f..2f29c92 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -102,7 +102,10 @@ typedef struct PullPin #define Req_Pause 3 /*** Constructors ***/ -HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, STOPPROCESSPROC, REQUESTPROC pCustomRequest, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, + SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, + CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, + LPCRITICAL_SECTION pCritSec, IPin ** ppPin); /**************************/ /*** Pin Implementation ***/

1 0

Michael Müller : crypt32: Add MS root CA 2011.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 4647a730ecf972bddcdce316c5bdded0f6a97e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4647a730ecf972bddcdce316c… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Oct 9 09:50:43 2017 +0200 crypt32: Add MS root CA 2011. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/rootstore.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 8e1dc2a..73d954f 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -666,6 +666,103 @@ static const BYTE rootcertauthority[] = { 0x7e,0x6c,0x9e,0xdb,0x73,0x13,0x64,0x62,0x69,0xa5,0x2f,0x7d,0xca,0x96,0x6d,0x9f, 0xf8,0x04,0x4d,0x30,0x92,0x3d,0x6e,0x21,0x14,0x21,0xc9,0x3d,0xe0,0xc3,0xfd,0x8a, 0x6b,0x9d,0x4a,0xfd,0xd1,0xa1,0x9d,0x99,0x43,0x77,0x3f,0xb0,0xda }; +static const BYTE rootcertauthority2011[] = { +0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x3f, +0x8b,0xc8,0xb5,0xfc,0x9f,0xb2,0x96,0x43,0xb5,0x69,0xd6,0x6c,0x42,0xe1,0x44,0x30, +0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x30,0x81, +0x88,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13, +0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67, +0x74,0x6f,0x6e,0x31,0x10,0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65, +0x64,0x6d,0x6f,0x6e,0x64,0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15, +0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72, +0x61,0x74,0x69,0x6f,0x6e,0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29, +0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43, +0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f, +0x72,0x69,0x74,0x79,0x20,0x32,0x30,0x31,0x31,0x30,0x1e,0x17,0x0d,0x31,0x31,0x30, +0x33,0x32,0x32,0x32,0x32,0x30,0x35,0x32,0x38,0x5a,0x17,0x0d,0x33,0x36,0x30,0x33, +0x32,0x32,0x32,0x32,0x31,0x33,0x30,0x34,0x5a,0x30,0x81,0x88,0x31,0x0b,0x30,0x09, +0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55, +0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67,0x74,0x6f,0x6e,0x31,0x10, +0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65,0x64,0x6d,0x6f,0x6e,0x64, +0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15,0x4d,0x69,0x63,0x72,0x6f, +0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e, +0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29,0x4d,0x69,0x63,0x72,0x6f, +0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43,0x65,0x72,0x74,0x69,0x66, +0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f,0x72,0x69,0x74,0x79,0x20, +0x32,0x30,0x31,0x31,0x30,0x82,0x02,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x02,0x0f,0x00,0x30,0x82,0x02,0x0a, +0x02,0x82,0x02,0x01,0x00,0xb2,0x80,0x41,0xaa,0x35,0x38,0x4d,0x13,0x72,0x32,0x68, +0x22,0x4d,0xb8,0xb2,0xf1,0xff,0xd5,0x52,0xbc,0x6c,0xc7,0xf5,0xd2,0x4a,0x8c,0x36, +0xee,0xd1,0xc2,0x5c,0x7e,0x8c,0x8a,0xae,0xaf,0x13,0x28,0x6f,0xc0,0x73,0xe3,0x3a, +0xce,0xd0,0x25,0xa8,0x5a,0x3a,0x6d,0xef,0xa8,0xb8,0x59,0xab,0x13,0x23,0x68,0xcd, +0x0c,0x29,0x87,0xd1,0x6f,0x80,0x5c,0x8f,0x44,0x7f,0x5d,0x90,0x01,0x52,0x58,0xac, +0x51,0xc5,0x5f,0x2a,0x87,0xdc,0xdc,0xd8,0x0a,0x1d,0xc1,0x03,0xb9,0x7b,0xb0,0x56, +0xe8,0xa3,0xde,0x64,0x61,0xc2,0x9e,0xf8,0xf3,0x7c,0xb9,0xec,0x0d,0xb5,0x54,0xfe, +0x4c,0xb6,0x65,0x4f,0x88,0xf0,0x9c,0x48,0x99,0x0c,0x42,0x0b,0x09,0x7c,0x31,0x59, +0x17,0x79,0x06,0x78,0x28,0x8d,0x89,0x3a,0x4c,0x03,0x25,0xbe,0x71,0x6a,0x5c,0x0b, +0xe7,0x84,0x60,0xa4,0x99,0x22,0xe3,0xd2,0xaf,0x84,0xa4,0xa7,0xfb,0xd1,0x98,0xed, +0x0c,0xa9,0xde,0x94,0x89,0xe1,0x0e,0xa0,0xdc,0xc0,0xce,0x99,0x3d,0xea,0x08,0x52, +0xbb,0x56,0x79,0xe4,0x1f,0x84,0xba,0x1e,0xb8,0xb4,0xc4,0x49,0x5c,0x4f,0x31,0x4b, +0x87,0xdd,0xdd,0x05,0x67,0x26,0x99,0x80,0xe0,0x71,0x11,0xa3,0xb8,0xa5,0x41,0xe2, +0xa4,0x53,0xb9,0xf7,0x32,0x29,0x83,0x0c,0x13,0xbf,0x36,0x5e,0x04,0xb3,0x4b,0x43, +0x47,0x2f,0x6b,0xe2,0x91,0x1e,0xd3,0x98,0x4f,0xdd,0x42,0x07,0xc8,0xe8,0x1d,0x12, +0xfc,0x99,0xa9,0x6b,0x3e,0x92,0x7e,0xc8,0xd6,0x69,0x3a,0xfc,0x64,0xbd,0xb6,0x09, +0x9d,0xca,0xfd,0x0c,0x0b,0xa2,0x9b,0x77,0x60,0x4b,0x03,0x94,0xa4,0x30,0x69,0x12, +0xd6,0x42,0x2d,0xc1,0x41,0x4c,0xca,0xdc,0xaa,0xfd,0x8f,0x5b,0x83,0x46,0x9a,0xd9, +0xfc,0xb1,0xd1,0xe3,0xb3,0xc9,0x7f,0x48,0x7a,0xcd,0x24,0xf0,0x41,0x8f,0x5c,0x74, +0xd0,0xac,0xb0,0x10,0x20,0x06,0x49,0xb7,0xc7,0x2d,0x21,0xc8,0x57,0xe3,0xd0,0x86, +0xf3,0x03,0x68,0xfb,0xd0,0xce,0x71,0xc1,0x89,0x99,0x4a,0x64,0x01,0x6c,0xfd,0xec, +0x30,0x91,0xcf,0x41,0x3c,0x92,0xc7,0xe5,0xba,0x86,0x1d,0x61,0x84,0xc7,0x5f,0x83, +0x39,0x62,0xae,0xb4,0x92,0x2f,0x47,0xf3,0x0b,0xf8,0x55,0xeb,0xa0,0x1f,0x59,0xd0, +0xbb,0x74,0x9b,0x1e,0xd0,0x76,0xe6,0xf2,0xe9,0x06,0xd7,0x10,0xe8,0xfa,0x64,0xde, +0x69,0xc6,0x35,0x96,0x88,0x02,0xf0,0x46,0xb8,0x3f,0x27,0x99,0x6f,0xcb,0x71,0x89, +0x29,0x35,0xf7,0x48,0x16,0x02,0x35,0x8f,0xd5,0x79,0x7c,0x4d,0x02,0xcf,0x5f,0xeb, +0x8a,0x83,0x4f,0x45,0x71,0x88,0xf9,0xa9,0x0d,0x4e,0x72,0xe9,0xc2,0x9c,0x07,0xcf, +0x49,0x1b,0x4e,0x04,0x0e,0x63,0x51,0x8c,0x5e,0xd8,0x00,0xc1,0x55,0x2c,0xb6,0xc6, +0xe0,0xc2,0x65,0x4e,0xc9,0x34,0x39,0xf5,0x9c,0xb3,0xc4,0x7e,0xe8,0x61,0x6e,0x13, +0x5f,0x15,0xc4,0x5f,0xd9,0x7e,0xed,0x1d,0xce,0xee,0x44,0xec,0xcb,0x2e,0x86,0xb1, +0xec,0x38,0xf6,0x70,0xed,0xab,0x5c,0x13,0xc1,0xd9,0x0f,0x0d,0xc7,0x80,0xb2,0x55, +0xed,0x34,0xf7,0xac,0x9b,0xe4,0xc3,0xda,0xe7,0x47,0x3c,0xa6,0xb5,0x8f,0x31,0xdf, +0xc5,0x4b,0xaf,0xeb,0xf1,0x02,0x03,0x01,0x00,0x01,0xa3,0x51,0x30,0x4f,0x30,0x0b, +0x06,0x03,0x55,0x1d,0x0f,0x04,0x04,0x03,0x02,0x01,0x86,0x30,0x0f,0x06,0x03,0x55, +0x1d,0x13,0x01,0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x1d,0x06,0x03, +0x55,0x1d,0x0e,0x04,0x16,0x04,0x14,0x72,0x2d,0x3a,0x02,0x31,0x90,0x43,0xb9,0x14, +0x05,0x4e,0xe1,0xea,0xa7,0xc7,0x31,0xd1,0x23,0x89,0x34,0x30,0x10,0x06,0x09,0x2b, +0x06,0x01,0x04,0x01,0x82,0x37,0x15,0x01,0x04,0x03,0x02,0x01,0x00,0x30,0x0d,0x06, +0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x03,0x82,0x02,0x01, +0x00,0x7f,0x72,0xcf,0x0f,0xb7,0xc5,0x15,0xdb,0x9b,0xc0,0x49,0xca,0x26,0x5b,0xfe, +0x9e,0x13,0xe6,0xd3,0xf0,0xd2,0xdb,0x97,0x5f,0xf2,0x4b,0x3f,0x4d,0xb3,0xae,0x19, +0xae,0xed,0xd7,0x97,0xa0,0xac,0xef,0xa9,0x3a,0xa3,0xc2,0x41,0xb0,0xe5,0xb8,0x91, +0x9e,0x13,0x81,0x24,0x03,0xe6,0x09,0xfd,0x3f,0x57,0x40,0x39,0x21,0x24,0x56,0xd1, +0x10,0x2f,0x4b,0x40,0xa9,0x36,0x86,0x4b,0xb4,0x53,0x57,0x9a,0xfb,0xf1,0x7e,0x89, +0x8f,0x11,0xfe,0x18,0x6c,0x51,0xaa,0xe8,0xed,0x09,0x95,0xb5,0xe5,0x71,0xc9,0xa1, +0xe9,0x87,0x75,0xa6,0x15,0x7f,0xc9,0x7e,0x37,0x54,0x5e,0x74,0x93,0xc5,0xc3,0x67, +0xcc,0x0d,0x4f,0x6b,0xa8,0x17,0x0c,0x6d,0x08,0x92,0x7e,0x8b,0xdd,0x81,0xaa,0x2d, +0x70,0x21,0xc3,0x3d,0x06,0x14,0xbb,0xbf,0x24,0x5e,0xa7,0x84,0xd7,0x3f,0x0f,0x21, +0x22,0xbd,0x4b,0x00,0x06,0xdb,0x97,0x1c,0xd8,0x5e,0xd4,0xc5,0x0b,0x5c,0x87,0x6e, +0x50,0xa4,0xe8,0xc3,0x38,0xa4,0xfb,0xcb,0x2c,0xc5,0x92,0x66,0x9b,0x85,0x5e,0xcb, +0x7a,0x6c,0x93,0x7c,0x80,0x29,0x58,0x5b,0x57,0xb5,0x40,0x69,0xba,0x08,0x79,0xa6, +0x64,0x62,0x15,0x9d,0x87,0x96,0x45,0xb5,0x66,0x23,0x20,0x03,0x8b,0x1c,0x73,0xa0, +0xd3,0xa2,0x79,0x33,0xe0,0x50,0x59,0x86,0xdb,0x2f,0xe5,0x02,0x25,0xea,0x73,0x2a, +0x9f,0x00,0x14,0xc8,0x36,0xc7,0x92,0x3b,0xe9,0x4e,0x00,0xec,0xd8,0x56,0x09,0xb9, +0x33,0x49,0x12,0xd2,0x54,0x0b,0x01,0xab,0xac,0x47,0xb6,0x91,0x29,0x7d,0x4c,0xb4, +0x75,0x80,0x52,0x01,0xe8,0xca,0x82,0xf6,0x9f,0xcc,0xac,0x9c,0x8f,0x17,0xea,0x2f, +0x26,0xb0,0xab,0x72,0xac,0x0b,0xfe,0x9e,0x51,0x1e,0xc7,0x43,0x55,0x67,0x4f,0x51, +0xb3,0x57,0xd6,0xb6,0xec,0xee,0x52,0xb7,0x3a,0xe9,0x4e,0xe1,0xd7,0x81,0x88,0xbc, +0x4f,0x8e,0x75,0xbb,0x4b,0xa8,0xf0,0x35,0xaa,0x26,0xd4,0x67,0x67,0x49,0xb2,0x70, +0x4c,0x3b,0x93,0xdc,0x1d,0xdf,0x78,0x90,0x86,0x72,0xb2,0x38,0xa4,0xd1,0xdc,0x92, +0x4d,0xc9,0x58,0xeb,0x2b,0x12,0x5c,0xd4,0x3b,0xae,0x8c,0x6b,0xb0,0x83,0xe5,0x01, +0x3f,0xf8,0x09,0x32,0xf6,0x93,0x35,0x34,0x22,0xaf,0xdd,0x37,0x0d,0x77,0x09,0x80, +0x2b,0xcd,0x48,0x00,0xf1,0x8c,0x99,0x19,0x47,0x05,0x01,0xe9,0xd1,0xbf,0xd1,0x4e, +0xd0,0xe6,0x28,0x43,0x37,0x99,0xa4,0x0a,0x4a,0x08,0xd9,0x9a,0x71,0x73,0xd2,0xaa, +0xcd,0x31,0x13,0x63,0x76,0xa1,0x37,0x6f,0x92,0x38,0x1e,0x7d,0x12,0x3c,0x66,0x32, +0xe7,0xcb,0x6d,0xe1,0xfc,0x52,0x89,0xdd,0xca,0xd6,0x66,0x05,0x9a,0x96,0x61,0xbe, +0xa2,0x28,0xc7,0x1c,0xa3,0xa7,0x36,0x50,0x3c,0x3a,0xa4,0xdf,0x4a,0x6e,0xe6,0x87, +0x3b,0xce,0xeb,0xf0,0xe0,0x81,0x37,0x9d,0x13,0x3c,0x52,0x8e,0xbd,0xb9,0x1d,0x34, +0xc6,0x1d,0xd5,0x0a,0x6a,0x3d,0x98,0x29,0x70,0x8c,0x89,0x2a,0xd1,0xab,0x82,0x10, +0x48,0x1f,0xdc,0xf4,0xef,0xa5,0xc5,0xbb,0x55,0x1a,0x38,0x63,0x84,0x4e,0xb7,0x6c, +0xad,0x95,0x54,0xec,0x65,0x22,0x10,0x49,0x17,0xb8,0xc0,0x1e,0xc7,0x0f,0xac,0x54, +0x47 }; static const struct CONST_BLOB { const BYTE *pb; @@ -674,6 +771,7 @@ static const struct CONST_BLOB { { authenticode, sizeof(authenticode) }, { rootauthority, sizeof(rootauthority) }, { rootcertauthority, sizeof(rootcertauthority) }, + { rootcertauthority2011, sizeof(rootcertauthority2011) }, }; static void add_ms_root_certs(HCERTSTORE to)

1 0

Nikolay Sivov : dwrite: Recognize CFF2 table as CFF variant.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: c4d9176196529a5207d7e6cea5d3135ac347c2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d9176196529a5207d7e6cea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 9 10:47:05 2017 +0300 dwrite: Recognize CFF2 table as CFF variant. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 4 +++- dlls/dwrite/tests/font.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 431fac9..e3bf483 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') #define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') #define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') +#define MS_CFF2_TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F','2') #define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') #define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') #define MS_SBIX_TAG DWRITE_MAKE_OPENTYPE_TAG('s','b','i','x') @@ -2217,7 +2218,8 @@ UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface) if (opentype_has_font_table(fontface, MS_GLYF_TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE; - if (opentype_has_font_table(fontface, MS_CFF__TAG)) + if (opentype_has_font_table(fontface, MS_CFF__TAG) || + opentype_has_font_table(fontface, MS_CFF2_TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_CFF; if (opentype_has_font_table(fontface, MS_COLR_TAG)) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e22d682..4adb022 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -44,6 +44,7 @@ #define MS_KERN_TAG DWRITE_MAKE_OPENTYPE_TAG('k','e','r','n') #define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') #define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') +#define MS_CFF2_TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F','2') #define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') #define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') #define MS_SBIX_TAG DWRITE_MAKE_OPENTYPE_TAG('s','b','i','x') @@ -8048,7 +8049,8 @@ static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface) if (face_has_table(fontface, MS_GLYF_TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE; - if (face_has_table(fontface, MS_CFF__TAG)) + if (face_has_table(fontface, MS_CFF__TAG) || + face_has_table(fontface, MS_CFF2_TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_CFF; if (face_has_table(fontface, MS_COLR_TAG))

1 0

Nikolay Sivov : dwrite: Recognize CBLC/CBDT image formats.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: d8e42057e03fdc84737f6f9f0fe58235b4739aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8e42057e03fdc84737f6f9f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 9 10:47:04 2017 +0300 dwrite: Recognize CBLC/CBDT image formats. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 125 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 71b90f9..431fac9 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') #define MS_SBIX_TAG DWRITE_MAKE_OPENTYPE_TAG('s','b','i','x') #define MS_MAXP_TAG DWRITE_MAKE_OPENTYPE_TAG('m','a','x','p') +#define MS_CBLC_TAG DWRITE_MAKE_OPENTYPE_TAG('C','B','L','C') /* 'sbix' formats */ #define MS_PNG__TAG DWRITE_MAKE_OPENTYPE_TAG('p','n','g',' ') @@ -262,6 +263,30 @@ typedef struct { WORD numGlyphs; } maxp; +typedef struct { + WORD majorVersion; + WORD minorVersion; + DWORD numSizes; +} CBLCHeader; + +typedef struct { + BYTE res[12]; +} sbitLineMetrics; + +typedef struct { + DWORD indexSubTableArrayOffset; + DWORD indexTablesSize; + DWORD numberofIndexSubTables; + DWORD colorRef; + sbitLineMetrics hori; + sbitLineMetrics vert; + WORD startGlyphIndex; + WORD endGlyphIndex; + BYTE ppemX; + BYTE ppemY; + BYTE bitDepth; + BYTE flags; +} CBLCBitmapSizeTable; #include "poppack.h" enum OS2_FSSELECTION { @@ -2151,6 +2176,40 @@ static DWORD opentype_get_sbix_formats(IDWriteFontFace4 *fontface) return ret; } +static UINT32 opentype_get_cblc_formats(IDWriteFontFace4 *fontface) +{ + CBLCBitmapSizeTable *sizes; + UINT32 num_sizes, size, s; + BOOL exists = FALSE; + CBLCHeader *header; + UINT32 ret = 0; + void *context; + HRESULT hr; + + if (FAILED(hr = IDWriteFontFace4_TryGetFontTable(fontface, MS_CBLC_TAG, (const void **)&header, &size, + &context, &exists))) + return 0; + + if (!exists) + return 0; + + num_sizes = GET_BE_DWORD(header->numSizes); + sizes = (CBLCBitmapSizeTable *)(header + 1); + + for (s = 0; s < num_sizes; s++) { + BYTE bpp = sizes->bitDepth; + + if (bpp == 1 || bpp == 2 || bpp == 4 || bpp == 8) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG; + else if (bpp == 32) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8; + } + + IDWriteFontFace4_ReleaseFontTable(fontface, context); + + return ret; +} + UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface) { UINT32 ret = DWRITE_GLYPH_IMAGE_FORMATS_NONE; @@ -2170,7 +2229,9 @@ UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface) if (opentype_has_font_table(fontface, MS_SBIX_TAG)) ret |= opentype_get_sbix_formats(fontface); - /* TODO: handle embedded bitmaps tables */ + if (opentype_has_font_table(fontface, MS_CBLC_TAG)) + ret |= opentype_get_cblc_formats(fontface); + return ret; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c579d94..e22d682 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -48,6 +48,7 @@ #define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') #define MS_SBIX_TAG DWRITE_MAKE_OPENTYPE_TAG('s','b','i','x') #define MS_MAXP_TAG DWRITE_MAKE_OPENTYPE_TAG('m','a','x','p') +#define MS_CBLC_TAG DWRITE_MAKE_OPENTYPE_TAG('C','B','L','C') /* 'sbix' formats */ #define MS_PNG__TAG DWRITE_MAKE_OPENTYPE_TAG('p','n','g',' ') @@ -337,6 +338,31 @@ typedef struct { } sbix_glyph_data; typedef struct { + WORD majorVersion; + WORD minorVersion; + DWORD numSizes; +} CBLCHeader; + +typedef struct { + BYTE res[12]; +} sbitLineMetrics; + +typedef struct { + DWORD indexSubTableArrayOffset; + DWORD indexTablesSize; + DWORD numberofIndexSubTables; + DWORD colorRef; + sbitLineMetrics hori; + sbitLineMetrics vert; + WORD startGlyphIndex; + WORD endGlyphIndex; + BYTE ppemX; + BYTE ppemY; + BYTE bitDepth; + BYTE flags; +} CBLCBitmapSizeTable; + +typedef struct { DWORD version; WORD numGlyphs; } maxp; @@ -7981,6 +8007,40 @@ static DWORD get_sbix_formats(IDWriteFontFace4 *fontface) return ret; } +static DWORD get_cblc_formats(IDWriteFontFace4 *fontface) +{ + CBLCBitmapSizeTable *sizes; + UINT32 num_sizes, size, s; + BOOL exists = FALSE; + CBLCHeader *header; + DWORD ret = 0; + void *context; + HRESULT hr; + + hr = IDWriteFontFace4_TryGetFontTable(fontface, MS_CBLC_TAG, (const void **)&header, &size, &context, &exists); + ok(hr == S_OK, "TryGetFontTable() failed, %#x\n", hr); + ok(exists, "Expected CBLC table\n"); + + if (!exists) + return 0; + + num_sizes = GET_BE_DWORD(header->numSizes); + sizes = (CBLCBitmapSizeTable *)(header + 1); + + for (s = 0; s < num_sizes; s++) { + BYTE bpp = sizes->bitDepth; + + if (bpp == 1 || bpp == 2 || bpp == 4 || bpp == 8) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG; + else if (bpp == 32) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8; + } + + IDWriteFontFace4_ReleaseFontTable(fontface, context); + + return ret; +} + static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface) { DWORD ret = DWRITE_GLYPH_IMAGE_FORMATS_NONE; @@ -8000,7 +8060,9 @@ static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface) if (face_has_table(fontface, MS_SBIX_TAG)) ret |= get_sbix_formats(fontface); - /* TODO: handle embedded bitmaps tables */ + if (face_has_table(fontface, MS_CBLC_TAG)) + ret |= get_cblc_formats(fontface); + return ret; }

1 0

Nikolay Sivov : dwrite: Read whole table directory with a single call when looking for table entry.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: c6a1fdcc0d2642da96507a70f9c1eab7ce4e5744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a1fdcc0d2642da96507a70f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 9 10:47:03 2017 +0300 dwrite: Read whole table directory with a single call when looking for table entry. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 53 ++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index bb6f274..71b90f9 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -74,7 +74,7 @@ typedef struct { } TTC_SFNT_V1; typedef struct { - CHAR tag[4]; + DWORD tag; DWORD checkSum; DWORD offset; DWORD length; @@ -1041,13 +1041,12 @@ HRESULT opentype_analyze_font(IDWriteFontFileStream *stream, UINT32* font_count, HRESULT opentype_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag, const void **table_data, void **table_context, UINT32 *table_size, BOOL *found) { - HRESULT hr; - TTC_SFNT_V1 *font_header = NULL; - void *sfnt_context; + void *table_directory_context, *sfnt_context; TT_TableRecord *table_record = NULL; - void *table_record_context; - int table_count, table_offset = 0; - int i; + TTC_SFNT_V1 *font_header = NULL; + UINT32 table_offset = 0; + UINT16 table_count; + HRESULT hr; if (found) *found = FALSE; if (table_size) *table_size = 0; @@ -1077,27 +1076,31 @@ HRESULT opentype_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag table_count = GET_BE_WORD(font_header->numTables); table_offset += sizeof(*font_header); - for (i = 0; i < table_count; i++) - { - hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&table_record, table_offset, sizeof(*table_record), &table_record_context); - if (FAILED(hr)) - break; - if (DWRITE_MAKE_OPENTYPE_TAG(table_record->tag[0], table_record->tag[1], table_record->tag[2], table_record->tag[3]) == tag) - break; - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, table_record_context); - table_offset += sizeof(*table_record); - } IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, sfnt_context); - if (SUCCEEDED(hr) && i < table_count) - { - int offset = GET_BE_DWORD(table_record->offset); - int length = GET_BE_DWORD(table_record->length); - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, table_record_context); - if (found) *found = TRUE; - if (table_size) *table_size = length; - hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, table_data, offset, length, table_context); + hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_record, table_offset, + table_count * sizeof(*table_record), &table_directory_context); + if (hr == S_OK) { + UINT16 i; + + for (i = 0; i < table_count; i++) { + if (table_record->tag == tag) { + UINT32 offset = GET_BE_DWORD(table_record->offset); + UINT32 length = GET_BE_DWORD(table_record->length); + + if (found) + *found = TRUE; + if (table_size) + *table_size = length; + hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, table_data, offset, + length, table_context); + break; + } + table_record++; + } + + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, table_directory_context); } return hr;

1 0

Nikolay Sivov : dwrite: Implement AnalyzeContainerType().
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 9bf92459d3137e403b2a88906db1df352fb93867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf92459d3137e403b2a88906… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 9 10:47:02 2017 +0300 dwrite: Implement AnalyzeContainerType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/main.c | 4 +- dlls/dwrite/opentype.c | 24 ++++ dlls/dwrite/tests/font.c | 259 ++++++++++++++++++++++++++++--------------- 4 files changed, 198 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bf92459d3137e403b2a8…

1 0

Gijs Vermeulen : msvcrt: Introduce vfprint & vfwprintf helper functions.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 344a41a6caa295d75fd7d2e83a879c828933660d URL: http://source.winehq.org/git/wine.git/?a=commit;h=344a41a6caa295d75fd7d2e83… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Oct 7 01:24:14 2017 +0200 msvcrt: Introduce vfprint & vfwprintf helper functions. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 158 +++++++++++++---------------------------------------- 1 file changed, 37 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=344a41a6caa295d75fd7d…

1 0

Alexandre Julliard : ntdll: Don' t try to unmap system views on the server side.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 49d3cac9ce7cf6bed7f56b789618f870f5eef1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d3cac9ce7cf6bed7f56b789… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 9 10:44:50 2017 +0200 ntdll: Don't try to unmap system views on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1b835bc..d28b138 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3074,13 +3074,18 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) server_enter_uninterrupted_section( &csVirtual, &sigset ); if ((view = VIRTUAL_FindView( addr, 0 )) && !is_view_valloc( view )) { - SERVER_START_REQ( unmap_view ) + if (!(view->protect & VPROT_SYSTEM)) { - req->base = wine_server_client_ptr( view->base ); - status = wine_server_call( req ); + SERVER_START_REQ( unmap_view ) + { + req->base = wine_server_client_ptr( view->base ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + if (!status) delete_view( view ); + else FIXME( "failed to unmap %p %x\n", view->base, status ); } - SERVER_END_REQ; - if (!status) delete_view( view ); + else delete_view( view ); } server_leave_uninterrupted_section( &csVirtual, &sigset ); return status;

1 0

Alexandre Julliard : ntdll: Ignore the preload start address if it is zero.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 0374d86c571724b7100308047653d8b300072afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0374d86c571724b7100308047… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 9 10:44:29 2017 +0200 ntdll: Ignore the preload start address if it is zero. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7bb4eb4..1b835bc 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1597,7 +1597,8 @@ void virtual_init(void) preload_reserve_start = (void *)start; preload_reserve_end = (void *)end; /* some apps start inside the DOS area */ - address_space_start = min( address_space_start, preload_reserve_start ); + if (preload_reserve_start) + address_space_start = min( address_space_start, preload_reserve_start ); } }

1 0

Nikolay Sivov : dwrite: Implement IDWriteInMemoryFontFileLoader.
by Alexandre Julliard 06 Oct '17

06 Oct '17

Module: wine Branch: master Commit: fb8226f639093a3fef41f7273fa0089246d1dfa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb8226f639093a3fef41f7273… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 6 12:45:20 2017 +0300 dwrite: Implement IDWriteInMemoryFontFileLoader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 317 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/font.c | 116 ++++++++++++++-- 4 files changed, 421 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb8226f639093a3fef41f…

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
48
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 October 2017