mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 5b62f89baa82daecd430897de0bb5cab32c5fc5e
This commit is contained in:
Alistair Leslie-Hughes
parent
086d99f83e
commit
bc4e00ae02
@ -1,128 +0,0 @@
|
||||
From 50ba23f4d3f7e40bf02cb8f3cdcc4d729f6d68d4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Mon, 27 Feb 2017 20:42:27 +0100
|
||||
Subject: crypt32: Add MS root CA 2010.
|
||||
|
||||
---
|
||||
dlls/crypt32/rootstore.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 98 insertions(+)
|
||||
|
||||
diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c
|
||||
index 73d954f7404..d6c0dfbc819 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 rootcertauthority2010[] = {
|
||||
+0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x28,
|
||||
+0xcc,0x3a,0x25,0xbf,0xba,0x44,0xac,0x44,0x9a,0x9b,0x58,0x6b,0x43,0x39,0xaa,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,0x30,0x30,0x1e,0x17,0x0d,0x31,0x30,0x30,
|
||||
+0x36,0x32,0x33,0x32,0x31,0x35,0x37,0x32,0x34,0x5a,0x17,0x0d,0x33,0x35,0x30,0x36,
|
||||
+0x32,0x33,0x32,0x32,0x30,0x34,0x30,0x31,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,0x30,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,0xb9,0x08,0x9e,0x28,0xe4,0xe4,0xec,0x06,0x4e,0x50,0x68,
|
||||
+0xb3,0x41,0xc5,0x7b,0xeb,0xae,0xb6,0x8e,0xaf,0x81,0xba,0x22,0x44,0x1f,0x65,0x34,
|
||||
+0x69,0x4c,0xbe,0x70,0x40,0x17,0xf2,0x16,0x7b,0xe2,0x79,0xfd,0x86,0xed,0x0d,0x39,
|
||||
+0xf4,0x1b,0xa8,0xad,0x92,0x90,0x1e,0xcb,0x3d,0x76,0x8f,0x5a,0xd9,0xb5,0x91,0x10,
|
||||
+0x2e,0x3c,0x05,0x8d,0x8a,0x6d,0x24,0x54,0xe7,0x1f,0xed,0x56,0xad,0x83,0xb4,0x50,
|
||||
+0x9c,0x15,0xa5,0x17,0x74,0x88,0x59,0x20,0xfc,0x08,0xc5,0x84,0x76,0xd3,0x68,0xd4,
|
||||
+0x6f,0x28,0x78,0xce,0x5c,0xb8,0xf3,0x50,0x90,0x44,0xff,0xe3,0x63,0x5f,0xbe,0xa1,
|
||||
+0x9a,0x2c,0x96,0x15,0x04,0xd6,0x07,0xfe,0x1e,0x84,0x21,0xe0,0x42,0x31,0x11,0xc4,
|
||||
+0x28,0x36,0x94,0xcf,0x50,0xa4,0x62,0x9e,0xc9,0xd6,0xab,0x71,0x00,0xb2,0x5b,0x0c,
|
||||
+0xe6,0x96,0xd4,0x0a,0x24,0x96,0xf5,0xff,0xc6,0xd5,0xb7,0x1b,0xd7,0xcb,0xb7,0x21,
|
||||
+0x62,0xaf,0x12,0xdc,0xa1,0x5d,0x37,0xe3,0x1a,0xfb,0x1a,0x46,0x98,0xc0,0x9b,0xc0,
|
||||
+0xe7,0x63,0x1f,0x2a,0x08,0x93,0x02,0x7e,0x1e,0x6a,0x8e,0xf2,0x9f,0x18,0x89,0xe4,
|
||||
+0x22,0x85,0xa2,0xb1,0x84,0x57,0x40,0xff,0xf5,0x0e,0xd8,0x6f,0x9c,0xed,0xe2,0x45,
|
||||
+0x31,0x01,0xcd,0x17,0xe9,0x7f,0xb0,0x81,0x45,0xe3,0xaa,0x21,0x40,0x26,0xa1,0x72,
|
||||
+0xaa,0xa7,0x4f,0x3c,0x01,0x05,0x7e,0xee,0x83,0x58,0xb1,0x5e,0x06,0x63,0x99,0x62,
|
||||
+0x91,0x78,0x82,0xb7,0x0d,0x93,0x0c,0x24,0x6a,0xb4,0x1b,0xdb,0x27,0xec,0x5f,0x95,
|
||||
+0x04,0x3f,0x93,0x4a,0x30,0xf5,0x97,0x18,0xb3,0xa7,0xf9,0x19,0xa7,0x93,0x33,0x1d,
|
||||
+0x01,0xc8,0xdb,0x22,0x52,0x5c,0xd7,0x25,0xc9,0x46,0xf9,0xa2,0xfb,0x87,0x59,0x43,
|
||||
+0xbe,0x9b,0x62,0xb1,0x8d,0x2d,0x86,0x44,0x1a,0x46,0xac,0x78,0x61,0x7e,0x30,0x09,
|
||||
+0xfa,0xae,0x89,0xc4,0x41,0x2a,0x22,0x66,0x03,0x91,0x39,0x45,0x9c,0xc7,0x8b,0x0c,
|
||||
+0xa8,0xca,0x0d,0x2f,0xfb,0x52,0xea,0x0c,0xf7,0x63,0x33,0x23,0x9d,0xfe,0xb0,0x1f,
|
||||
+0xad,0x67,0xd6,0xa7,0x50,0x03,0xc6,0x04,0x70,0x63,0xb5,0x2c,0xb1,0x86,0x5a,0x43,
|
||||
+0xb7,0xfb,0xae,0xf9,0x6e,0x29,0x6e,0x21,0x21,0x41,0x26,0x06,0x8c,0xc9,0xc3,0xee,
|
||||
+0xb0,0xc2,0x85,0x93,0xa1,0xb9,0x85,0xd9,0xe6,0x32,0x6c,0x4b,0x4c,0x3f,0xd6,0x5d,
|
||||
+0xa3,0xe5,0xb5,0x9d,0x77,0xc3,0x9c,0xc0,0x55,0xb7,0x74,0x00,0xe3,0xb8,0x38,0xab,
|
||||
+0x83,0x97,0x50,0xe1,0x9a,0x42,0x24,0x1d,0xc6,0xc0,0xa3,0x30,0xd1,0x1a,0x5a,0xc8,
|
||||
+0x52,0x34,0xf7,0x73,0xf1,0xc7,0x18,0x1f,0x33,0xad,0x7a,0xec,0xcb,0x41,0x60,0xf3,
|
||||
+0x23,0x94,0x20,0xc2,0x48,0x45,0xac,0x5c,0x51,0xc6,0x2e,0x80,0xc2,0xe2,0x77,0x15,
|
||||
+0xbd,0x85,0x87,0xed,0x36,0x9d,0x96,0x91,0xee,0x00,0xb5,0xa3,0x70,0xec,0x9f,0xe3,
|
||||
+0x8d,0x80,0x68,0x83,0x76,0xba,0xaf,0x5d,0x70,0x52,0x22,0x16,0xe2,0x66,0xfb,0xba,
|
||||
+0xb3,0xc5,0xc2,0xf7,0x3e,0x2f,0x77,0xa6,0xca,0xde,0xc1,0xa6,0xc6,0x48,0x4c,0xc3,
|
||||
+0x37,0x51,0x23,0xd3,0x27,0xd7,0xb8,0x4e,0x70,0x96,0xf0,0xa1,0x44,0x76,0xaf,0x78,
|
||||
+0xcf,0x9a,0xe1,0x66,0x13,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,0xd5,0xf6,0x56,0xcb,0x8f,0xe8,0xa2,0x5c,0x62,
|
||||
+0x68,0xd1,0x3d,0x94,0x90,0x5b,0xd7,0xce,0x9a,0x18,0xc4,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,0xac,0xa5,0x96,0x8c,0xbf,0xbb,0xae,0xa6,0xf6,0xd7,0x71,0x87,0x43,0x31,0x56,
|
||||
+0x88,0xfd,0x1c,0x32,0x71,0x5b,0x35,0xb7,0xd4,0xf0,0x91,0xf2,0xaf,0x37,0xe2,0x14,
|
||||
+0xf1,0xf3,0x02,0x26,0x05,0x3e,0x16,0x14,0x7f,0x14,0xba,0xb8,0x4f,0xfb,0x89,0xb2,
|
||||
+0xb2,0xe7,0xd4,0x09,0xcc,0x6d,0xb9,0x5b,0x3b,0x64,0x65,0x70,0x66,0xb7,0xf2,0xb1,
|
||||
+0x5a,0xdf,0x1a,0x02,0xf3,0xf5,0x51,0xb8,0x67,0x6d,0x79,0xf3,0xbf,0x56,0x7b,0xe4,
|
||||
+0x84,0xb9,0x2b,0x1e,0x9b,0x40,0x9c,0x26,0x34,0xf9,0x47,0x18,0x98,0x69,0xd8,0x1c,
|
||||
+0xd7,0xb6,0xd1,0xbf,0x8f,0x61,0xc2,0x67,0xc4,0xb5,0xef,0x60,0x43,0x8e,0x10,0x1b,
|
||||
+0x36,0x49,0xe4,0x20,0xca,0xad,0xa7,0xc1,0xb1,0x27,0x65,0x09,0xf8,0xcd,0xf5,0x5b,
|
||||
+0x2a,0xd0,0x84,0x33,0xf3,0xef,0x1f,0xf2,0xf5,0x9c,0x0b,0x58,0x93,0x37,0xa0,0x75,
|
||||
+0xa0,0xde,0x72,0xde,0x6c,0x75,0x2a,0x66,0x22,0xf5,0x8c,0x06,0x30,0x56,0x9f,0x40,
|
||||
+0xb9,0x30,0xaa,0x40,0x77,0x15,0x82,0xd7,0x8b,0xec,0xc0,0xd3,0xb2,0xbd,0x83,0xc5,
|
||||
+0x77,0x0c,0x1e,0xae,0xaf,0x19,0x53,0xa0,0x4d,0x79,0x71,0x9f,0x0f,0xaf,0x30,0xce,
|
||||
+0x67,0xf9,0xd6,0x2c,0xcc,0x22,0x41,0x7a,0x07,0xf2,0x97,0x42,0x18,0xce,0x59,0x79,
|
||||
+0x10,0x55,0xde,0x6f,0x10,0xe4,0xb8,0xda,0x83,0x66,0x40,0x16,0x09,0x68,0x23,0x5b,
|
||||
+0x97,0x2e,0x26,0x9a,0x02,0xbb,0x57,0x8c,0xc5,0xb8,0xba,0x69,0x62,0x32,0x80,0x89,
|
||||
+0x9e,0xa1,0xfd,0xc0,0x92,0x7c,0x7b,0x2b,0x33,0x19,0x84,0x2a,0x63,0xc5,0x00,0x68,
|
||||
+0x62,0xfa,0x9f,0x47,0x8d,0x99,0x7a,0x45,0x3a,0xa7,0xe9,0xed,0xee,0x69,0x42,0xb5,
|
||||
+0xf3,0x81,0x9b,0x47,0x56,0x10,0x7b,0xfc,0x70,0x36,0x84,0x18,0x73,0xea,0xef,0xf9,
|
||||
+0x97,0x4d,0x9e,0x33,0x23,0xdd,0x26,0x0b,0xba,0x2a,0xb7,0x3f,0x44,0xdc,0x83,0x27,
|
||||
+0xff,0xbd,0x61,0x59,0x2b,0x11,0xb7,0xca,0x4f,0xdb,0xc5,0x8b,0x0c,0x1c,0x31,0xae,
|
||||
+0x32,0xf8,0xf8,0xb9,0x42,0xf7,0x7f,0xdc,0x61,0x9a,0x76,0xb1,0x5a,0x04,0xe1,0x11,
|
||||
+0x3d,0x66,0x45,0xb7,0x18,0x71,0xbe,0xc9,0x24,0x85,0xd6,0xf3,0xd4,0xba,0x41,0x34,
|
||||
+0x5d,0x12,0x2d,0x25,0xb9,0x8d,0xa6,0x13,0x48,0x6d,0x4b,0xb0,0x07,0x7d,0x99,0x93,
|
||||
+0x09,0x61,0x81,0x74,0x57,0x26,0x8a,0xab,0x69,0xe3,0xe4,0xd9,0xc7,0x88,0xcc,0x24,
|
||||
+0xd8,0xec,0x52,0x24,0x5c,0x1e,0xbc,0x91,0x14,0xe2,0x96,0xde,0xeb,0x0a,0xda,0x9e,
|
||||
+0xdd,0x5f,0xb3,0x5b,0xdb,0xd4,0x82,0xec,0xc6,0x20,0x50,0x87,0x25,0x40,0x3a,0xfb,
|
||||
+0xc7,0xee,0xcd,0xfe,0x33,0xe5,0x6e,0xc3,0x84,0x09,0x55,0x03,0x25,0x39,0xc0,0xe9,
|
||||
+0x35,0x5d,0x65,0x31,0xa8,0xf6,0xbf,0xa0,0x09,0xcd,0x29,0xc7,0xb3,0x36,0x32,0x2e,
|
||||
+0xdc,0x95,0xf3,0x83,0xc1,0x5a,0xcf,0x8b,0x8d,0xf6,0xea,0xb3,0x21,0xf8,0xa4,0xed,
|
||||
+0x1e,0x31,0x0e,0xb6,0x4c,0x11,0xab,0x60,0x0b,0xa4,0x12,0x23,0x22,0x17,0xa3,0x36,
|
||||
+0x64,0x82,0x91,0x04,0x12,0xe0,0xab,0x6f,0x1e,0xcb,0x50,0x05,0x61,0xb4,0x40,0xff,
|
||||
+0x59,0x86,0x71,0xd1,0xd5,0x33,0x69,0x7c,0xa9,0x73,0x8a,0x38,0xd7,0x64,0x0c,0xf1,
|
||||
+0x69 };
|
||||
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,
|
||||
@@ -771,6 +868,7 @@ static const struct CONST_BLOB {
|
||||
{ authenticode, sizeof(authenticode) },
|
||||
{ rootauthority, sizeof(rootauthority) },
|
||||
{ rootcertauthority, sizeof(rootcertauthority) },
|
||||
+ { rootcertauthority2010, sizeof(rootcertauthority2010) },
|
||||
{ rootcertauthority2011, sizeof(rootcertauthority2011) },
|
||||
};
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: Add MS root certificates 2010/2011
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "237d5636271a1a78b02a0eb7feaab7dfb9dfed57"
|
||||
echo "5b62f89baa82daecd430897de0bb5cab32c5fc5e"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -100,7 +100,6 @@ patch_enable_all ()
|
||||
enable_comdlg32_lpstrFileTitle="$1"
|
||||
enable_configure_Absolute_RPATH="$1"
|
||||
enable_crypt32_CMS_Certificates="$1"
|
||||
enable_crypt32_MS_Root_Certs="$1"
|
||||
enable_cryptext_CryptExtOpenCER="$1"
|
||||
enable_d2d1_ID2D1Factory1="$1"
|
||||
enable_d3d11_Deferred_Context="$1"
|
||||
@ -424,9 +423,6 @@ patch_enable ()
|
||||
crypt32-CMS_Certificates)
|
||||
enable_crypt32_CMS_Certificates="$2"
|
||||
;;
|
||||
crypt32-MS_Root_Certs)
|
||||
enable_crypt32_MS_Root_Certs="$2"
|
||||
;;
|
||||
cryptext-CryptExtOpenCER)
|
||||
enable_cryptext_CryptExtOpenCER="$2"
|
||||
;;
|
||||
@ -2345,18 +2341,6 @@ if test "$enable_crypt32_CMS_Certificates" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset crypt32-MS_Root_Certs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/crypt32/rootstore.c
|
||||
# |
|
||||
if test "$enable_crypt32_MS_Root_Certs" -eq 1; then
|
||||
patch_apply crypt32-MS_Root_Certs/0001-crypt32-Add-MS-root-CA-2010-2011.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Michael Müller", "crypt32: Add MS root CA 2010.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset cryptext-CryptExtOpenCER
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From a1a88335443f560d72375a6662eae7247f275490 Mon Sep 17 00:00:00 2001
|
||||
From ec35ee04398716c495d8effb2241665afcf604d4 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Date: Thu, 7 Jun 2018 11:51:01 +0200
|
||||
Subject: [PATCH] uianimation: Add stub dll
|
||||
@ -9,35 +9,31 @@ Split into multiple changes.
|
||||
|
||||
Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
---
|
||||
dlls/uianimation/Makefile.in | 5 +-
|
||||
dlls/uianimation/main.c | 897 ++++++++++++++++++++++-
|
||||
dlls/uianimation/uianimation_typelib.idl | 23 +
|
||||
3 files changed, 914 insertions(+), 11 deletions(-)
|
||||
create mode 100644 dlls/uianimation/uianimation_typelib.idl
|
||||
dlls/uianimation/Makefile.in | 3 +-
|
||||
dlls/uianimation/main.c | 603 ++++++++++++++++++++++++++++++++++-
|
||||
2 files changed, 588 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in
|
||||
index 9abb0d6b599..886898070c9 100644
|
||||
index d492faabde8..886898070c9 100644
|
||||
--- a/dlls/uianimation/Makefile.in
|
||||
+++ b/dlls/uianimation/Makefile.in
|
||||
@@ -1,4 +1,5 @@
|
||||
@@ -1,5 +1,5 @@
|
||||
MODULE = uianimation.dll
|
||||
-IMPORTS = uuid
|
||||
+IMPORTS = uuid ole32
|
||||
|
||||
EXTRADLLFLAGS = -mno-cygwin
|
||||
|
||||
@@ -6,4 +7,6 @@ C_SRCS = \
|
||||
main.c
|
||||
|
||||
@@ -9,3 +9,4 @@ C_SRCS = \
|
||||
IDL_SRCS = \
|
||||
- uianimation_reg.idl
|
||||
+ uianimation_reg.idl \
|
||||
+ uianimation_typelib.idl
|
||||
uianimation_reg.idl \
|
||||
uianimation_typelib.idl
|
||||
+
|
||||
diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c
|
||||
index ea35a30f51d..c20cfde47df 100644
|
||||
index c9ce692ebc8..cc5d9b36d68 100644
|
||||
--- a/dlls/uianimation/main.c
|
||||
+++ b/dlls/uianimation/main.c
|
||||
@@ -20,19 +20,906 @@
|
||||
@@ -21,6 +21,8 @@
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
@ -46,318 +42,43 @@ index ea35a30f51d..c20cfde47df 100644
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "objbase.h"
|
||||
#include "rpcproxy.h"
|
||||
+#include "oaidl.h"
|
||||
+#include "ocidl.h"
|
||||
|
||||
+#include "initguid.h"
|
||||
#include "uianimation.h"
|
||||
|
||||
+#include "wine/heap.h"
|
||||
+
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(uianimation);
|
||||
@@ -38,22 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(uianimation);
|
||||
|
||||
static HINSTANCE hinstance;
|
||||
|
||||
+struct class_factory
|
||||
+{
|
||||
+ IClassFactory IClassFactory_iface;
|
||||
+ HRESULT (*create_instance)(IUnknown *, REFIID, void **);
|
||||
+};
|
||||
+
|
||||
+static inline struct class_factory *impl_from_IClassFactory( IClassFactory *iface )
|
||||
+{
|
||||
+ return CONTAINING_RECORD( iface, struct class_factory, IClassFactory_iface );
|
||||
+}
|
||||
+
|
||||
-BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
|
||||
-{
|
||||
- TRACE("(%p %d %p)\n", dll, reason, reserved);
|
||||
-
|
||||
- switch (reason)
|
||||
- {
|
||||
- case DLL_WINE_PREATTACH:
|
||||
- return FALSE; /* prefer native version */
|
||||
- case DLL_PROCESS_ATTACH:
|
||||
- hinstance = dll;
|
||||
- DisableThreadLibraryCalls( dll );
|
||||
- break;
|
||||
- }
|
||||
- return TRUE;
|
||||
-}
|
||||
-
|
||||
struct class_factory
|
||||
{
|
||||
IClassFactory IClassFactory_iface;
|
||||
@@ -65,7 +51,8 @@ static inline struct class_factory *impl_from_IClassFactory( IClassFactory *ifac
|
||||
return CONTAINING_RECORD( iface, struct class_factory, IClassFactory_iface );
|
||||
}
|
||||
|
||||
-static HRESULT WINAPI class_factory_QueryInterface( IClassFactory *iface, REFIID iid, void **obj )
|
||||
+static HRESULT WINAPI class_factory_QueryInterface( IClassFactory *iface,
|
||||
+ REFIID iid, void **obj )
|
||||
+{
|
||||
+ if (IsEqualIID( iid, &IID_IUnknown ) ||
|
||||
+ IsEqualIID( iid, &IID_IClassFactory ))
|
||||
+ {
|
||||
+ IClassFactory_AddRef( iface );
|
||||
+ *obj = iface;
|
||||
+ return S_OK;
|
||||
+ }
|
||||
+
|
||||
+ FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
|
||||
+ *obj = NULL;
|
||||
+ return E_NOINTERFACE;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI class_factory_AddRef( IClassFactory *iface )
|
||||
+{
|
||||
+ return 2;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI class_factory_Release( IClassFactory *iface )
|
||||
+{
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI class_factory_CreateInstance( IClassFactory *iface,
|
||||
+ IUnknown *outer, REFIID iid,
|
||||
+ void **obj )
|
||||
+{
|
||||
+ struct class_factory *This = impl_from_IClassFactory( iface );
|
||||
+
|
||||
+ TRACE( "%p %s %p\n", outer, debugstr_guid( iid ), obj );
|
||||
+
|
||||
+ *obj = NULL;
|
||||
+ return This->create_instance( outer, iid, obj );
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI class_factory_LockServer( IClassFactory *iface,
|
||||
+ BOOL lock )
|
||||
+{
|
||||
+ FIXME( "%d: stub!\n", lock );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static const struct IClassFactoryVtbl class_factory_vtbl =
|
||||
+{
|
||||
+ class_factory_QueryInterface,
|
||||
+ class_factory_AddRef,
|
||||
+ class_factory_Release,
|
||||
+ class_factory_CreateInstance,
|
||||
+ class_factory_LockServer
|
||||
+};
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * IUIAnimationManager
|
||||
+ */
|
||||
+struct manager
|
||||
+{
|
||||
+ IUIAnimationManager IUIAnimationManager_iface;
|
||||
+ LONG ref;
|
||||
+};
|
||||
+
|
||||
+struct manager *impl_from_IUIAnimationManager( IUIAnimationManager *iface )
|
||||
+{
|
||||
+ return CONTAINING_RECORD( iface, struct manager, IUIAnimationManager_iface );
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_QueryInterface( IUIAnimationManager *iface, REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+
|
||||
+ TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj );
|
||||
+
|
||||
+ if (IsEqualIID( iid, &IID_IUnknown ) ||
|
||||
+ IsEqualIID( iid, &IID_IUIAnimationManager ))
|
||||
+ {
|
||||
+ IUIAnimationManager_AddRef( iface );
|
||||
+ *obj = iface;
|
||||
+ return S_OK;
|
||||
+ }
|
||||
+
|
||||
+ FIXME( "interface %s not implemented\n", debugstr_guid( iid ) );
|
||||
+ *obj = NULL;
|
||||
+ return E_NOINTERFACE;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI manager_AddRef( IUIAnimationManager *iface )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ ULONG ref = InterlockedIncrement( &This->ref );
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI manager_Release( IUIAnimationManager *iface )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ ULONG ref = InterlockedDecrement(&This->ref);
|
||||
+
|
||||
+ TRACE( "(%p) ref = %u\n", This, ref );
|
||||
+
|
||||
+ if (!ref)
|
||||
+ {
|
||||
+ heap_free( This );
|
||||
+ }
|
||||
+
|
||||
+ return ref;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_CreateAnimationVariable( IUIAnimationManager *iface, DOUBLE initial_value, IUIAnimationVariable **variable )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_ScheduleTransition( IUIAnimationManager *iface, IUIAnimationVariable *variable, IUIAnimationTransition *transition, UI_ANIMATION_SECONDS current_time )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_CreateStoryboard( IUIAnimationManager *iface, IUIAnimationStoryboard **storyboard )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_FinishAllStoryboards( IUIAnimationManager *iface, UI_ANIMATION_SECONDS max_time )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_AbandonAllStoryboards( IUIAnimationManager *iface )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_Update( IUIAnimationManager *iface, UI_ANIMATION_SECONDS cur_time, UI_ANIMATION_UPDATE_RESULT *update_result )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ *update_result=UI_ANIMATION_UPDATE_VARIABLES_CHANGED;
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_GetVariableFromTag( IUIAnimationManager *iface, IUnknown *object, UINT32 id, IUIAnimationVariable **variable )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_GetStoryboardFromTag( IUIAnimationManager *iface, IUnknown *object, UINT32 id, IUIAnimationStoryboard **storyboard )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_GetStatus( IUIAnimationManager *iface, UI_ANIMATION_MANAGER_STATUS *status )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_SetAnimationMode( IUIAnimationManager *iface, UI_ANIMATION_MODE mode )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_Pause( IUIAnimationManager *iface )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_Resume( IUIAnimationManager *iface )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_SetManagerEventHandler( IUIAnimationManager *iface, IUIAnimationManagerEventHandler *handler )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_SetCancelPriorityComparison( IUIAnimationManager *iface, IUIAnimationPriorityComparison *comparison )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_SetTrimPriorityComparison( IUIAnimationManager *iface, IUIAnimationPriorityComparison *comparison )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_SetCompressPriorityComparison( IUIAnimationManager *iface, IUIAnimationPriorityComparison *comparison)
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_SetConcludePriorityComparison( IUIAnimationManager *iface, IUIAnimationPriorityComparison *comparison )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_SetDefaultLongestAcceptableDelay( IUIAnimationManager *iface, UI_ANIMATION_SECONDS delay )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI manager_Shutdown( IUIAnimationManager *iface )
|
||||
+{
|
||||
+ struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
+ FIXME( "stub (%p)->( )\n", This );
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+const struct IUIAnimationManagerVtbl manager_vtbl =
|
||||
+{
|
||||
+ manager_QueryInterface,
|
||||
+ manager_AddRef,
|
||||
+ manager_Release,
|
||||
+ manager_CreateAnimationVariable,
|
||||
+ manager_ScheduleTransition,
|
||||
+ manager_CreateStoryboard,
|
||||
+ manager_FinishAllStoryboards,
|
||||
+ manager_AbandonAllStoryboards,
|
||||
+ manager_Update,
|
||||
+ manager_GetVariableFromTag,
|
||||
+ manager_GetStoryboardFromTag,
|
||||
+ manager_GetStatus,
|
||||
+ manager_SetAnimationMode,
|
||||
+ manager_Pause,
|
||||
+ manager_Resume,
|
||||
+ manager_SetManagerEventHandler,
|
||||
+ manager_SetCancelPriorityComparison,
|
||||
+ manager_SetTrimPriorityComparison,
|
||||
+ manager_SetCompressPriorityComparison,
|
||||
+ manager_SetConcludePriorityComparison,
|
||||
+ manager_SetDefaultLongestAcceptableDelay,
|
||||
+ manager_Shutdown
|
||||
+};
|
||||
+
|
||||
+HRESULT manager_create( IUnknown *outer, REFIID iid, void **obj )
|
||||
+{
|
||||
+ struct manager *This = heap_alloc( sizeof(*This) );
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ if (!This) return E_OUTOFMEMORY;
|
||||
+ This->IUIAnimationManager_iface.lpVtbl = &manager_vtbl;
|
||||
+ This->ref = 1;
|
||||
+
|
||||
+ hr = IUIAnimationManager_QueryInterface( &This->IUIAnimationManager_iface, iid, obj );
|
||||
+
|
||||
+ IUIAnimationManager_Release( &This->IUIAnimationManager_iface );
|
||||
+ return hr;
|
||||
+}
|
||||
+
|
||||
{
|
||||
if (IsEqualIID( iid, &IID_IUnknown ) ||
|
||||
IsEqualIID( iid, &IID_IClassFactory ))
|
||||
@@ -118,6 +105,577 @@ static const struct IClassFactoryVtbl class_factory_vtbl =
|
||||
class_factory_LockServer
|
||||
};
|
||||
|
||||
+/***********************************************************************
|
||||
+ * IUIAnimationTimer
|
||||
+ */
|
||||
@ -913,83 +634,50 @@ index ea35a30f51d..c20cfde47df 100644
|
||||
+ return hr;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static struct class_factory manager_cf = { { &class_factory_vtbl }, manager_create };
|
||||
+static struct class_factory timer_cf = { { &class_factory_vtbl }, timer_create };
|
||||
+static struct class_factory tr_factory_cf = { { &class_factory_vtbl }, tr_factory_create };
|
||||
+static struct class_factory tr_library_cf = { { &class_factory_vtbl }, tr_library_create };
|
||||
+
|
||||
+/******************************************************************
|
||||
+ * DllGetClassObject
|
||||
+ */
|
||||
+HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj )
|
||||
+BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
|
||||
+{
|
||||
+ IClassFactory *cf = NULL;
|
||||
+ TRACE("(%p %d %p)\n", dll, reason, reserved);
|
||||
+
|
||||
+ TRACE( "(%s %s %p)\n", debugstr_guid( clsid ), debugstr_guid( iid ), obj );
|
||||
+ switch (reason)
|
||||
+ {
|
||||
+ case DLL_WINE_PREATTACH:
|
||||
+ return FALSE; /* prefer native version */
|
||||
+ case DLL_PROCESS_ATTACH:
|
||||
+ hinstance = dll;
|
||||
+ DisableThreadLibraryCalls( dll );
|
||||
+ break;
|
||||
+ }
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
+ if (IsEqualCLSID( clsid, &CLSID_UIAnimationManager ))
|
||||
+ cf = &manager_cf.IClassFactory_iface;
|
||||
/***********************************************************************
|
||||
* IUIAnimationManager
|
||||
*/
|
||||
@@ -352,6 +910,9 @@ static HRESULT manager_create( IUnknown *outer, REFIID iid, void **obj )
|
||||
}
|
||||
|
||||
static struct class_factory manager_cf = { { &class_factory_vtbl }, manager_create };
|
||||
+static struct class_factory timer_cf = { { &class_factory_vtbl }, timer_create };
|
||||
+static struct class_factory tr_factory_cf = { { &class_factory_vtbl }, tr_factory_create };
|
||||
+static struct class_factory tr_library_cf = { { &class_factory_vtbl }, tr_library_create };
|
||||
|
||||
/******************************************************************
|
||||
* DllGetClassObject
|
||||
@@ -364,6 +925,14 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj )
|
||||
|
||||
if (IsEqualCLSID( clsid, &CLSID_UIAnimationManager ))
|
||||
cf = &manager_cf.IClassFactory_iface;
|
||||
+ else if (IsEqualCLSID( clsid, &CLSID_UIAnimationTimer ))
|
||||
+ cf = &timer_cf.IClassFactory_iface;
|
||||
+ else if (IsEqualCLSID( clsid, &CLSID_UIAnimationTransitionFactory ))
|
||||
+ cf = &tr_factory_cf.IClassFactory_iface;
|
||||
+ else if (IsEqualCLSID( clsid, &CLSID_UIAnimationTransitionLibrary ))
|
||||
+ cf = &tr_library_cf.IClassFactory_iface;
|
||||
+ if (!cf) return CLASS_E_CLASSNOTAVAILABLE;
|
||||
+
|
||||
+ return IClassFactory_QueryInterface( cf, iid, obj );
|
||||
+}
|
||||
+
|
||||
BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
|
||||
{
|
||||
TRACE("(%p %d %p)\n", dll, reason, reserved);
|
||||
@@ -49,16 +936,6 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
-/******************************************************************
|
||||
- * DllGetClassObject
|
||||
- */
|
||||
-HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj )
|
||||
-{
|
||||
- FIXME( "(%s %s %p)\n", debugstr_guid( clsid ), debugstr_guid( iid ), obj );
|
||||
-
|
||||
- return CLASS_E_CLASSNOTAVAILABLE;
|
||||
-}
|
||||
-
|
||||
/******************************************************************
|
||||
* DllCanUnloadNow
|
||||
*/
|
||||
diff --git a/dlls/uianimation/uianimation_typelib.idl b/dlls/uianimation/uianimation_typelib.idl
|
||||
new file mode 100644
|
||||
index 00000000000..4c0bc7fd462
|
||||
--- /dev/null
|
||||
+++ b/dlls/uianimation/uianimation_typelib.idl
|
||||
@@ -0,0 +1,23 @@
|
||||
+/*
|
||||
+ * UiAnimation typelib.
|
||||
+ *
|
||||
+ * Copyright (C) 2018 Louis Lenders
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
+ */
|
||||
+
|
||||
+#pragma makedep typelib
|
||||
+
|
||||
+#include "uianimation.idl"
|
||||
if (!cf)
|
||||
return CLASS_E_CLASSNOTAVAILABLE;
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
From e0d49da97e6b83da2de26dacc7932dd0094c6c2a Mon Sep 17 00:00:00 2001
|
||||
From 4ef814d720b7b3ad1073a549e58a2c6d10e49905 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Date: Mon, 17 Dec 2018 15:40:25 +1100
|
||||
Subject: [PATCH] uianimation: Implement IUIAnimationManager
|
||||
CreateStoryboard
|
||||
Subject: [PATCH] uianimation: Implement IUIAnimationManager CreateStoryboard
|
||||
|
||||
---
|
||||
dlls/uianimation/main.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
dlls/uianimation/main.c | 223 +++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 221 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c
|
||||
index 6101827..7a6c68c 100644
|
||||
index cc5d9b36d68..c245f30b3e4 100644
|
||||
--- a/dlls/uianimation/main.c
|
||||
+++ b/dlls/uianimation/main.c
|
||||
@@ -106,6 +106,225 @@ static const struct IClassFactoryVtbl class_factory_vtbl =
|
||||
};
|
||||
@@ -676,6 +676,225 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
+/***********************************************************************
|
||||
+ * IUIAnimationStoryboard
|
||||
+ */
|
||||
+struct animation_storyboard
|
||||
@ -234,15 +234,14 @@ index 6101827..7a6c68c 100644
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+/***********************************************************************
|
||||
/***********************************************************************
|
||||
* IUIAnimationManager
|
||||
*/
|
||||
struct manager
|
||||
@@ -179,8 +398,8 @@ static HRESULT WINAPI manager_ScheduleTransition( IUIAnimationManager *iface, IU
|
||||
@@ -750,8 +969,8 @@ static HRESULT WINAPI manager_ScheduleTransition( IUIAnimationManager *iface, IU
|
||||
static HRESULT WINAPI manager_CreateStoryboard( IUIAnimationManager *iface, IUIAnimationStoryboard **storyboard )
|
||||
{
|
||||
struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
- FIXME( "stub (%p)->( )\n", This );
|
||||
- FIXME( "stub (%p)->(%p)\n", This, storyboard );
|
||||
- return E_NOTIMPL;
|
||||
+ TRACE( "(%p)->(%p)\n", This, storyboard );
|
||||
+ return animation_storyboard_create(storyboard);
|
||||
@ -250,5 +249,5 @@ index 6101827..7a6c68c 100644
|
||||
|
||||
static HRESULT WINAPI manager_FinishAllStoryboards( IUIAnimationManager *iface, UI_ANIMATION_SECONDS max_time )
|
||||
--
|
||||
1.9.1
|
||||
2.17.1
|
||||
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
From 364510214da84841cbf9b8cb4546ab7c84824115 Mon Sep 17 00:00:00 2001
|
||||
From 61ad3dcf4ffee22d1d8b000c82c3779280303766 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Date: Mon, 17 Dec 2018 15:44:49 +1100
|
||||
Subject: [PATCH] uianimation: Implement IUIAnimationManager
|
||||
CreateAnimationVariable
|
||||
|
||||
---
|
||||
dlls/uianimation/main.c | 195 +++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
dlls/uianimation/main.c | 195 +++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 193 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c
|
||||
index 7a6c68c..3dc9e30 100644
|
||||
index c245f30b3e4..a49b2fe43df 100644
|
||||
--- a/dlls/uianimation/main.c
|
||||
+++ b/dlls/uianimation/main.c
|
||||
@@ -325,6 +325,197 @@ static HRESULT animation_storyboard_create( IUIAnimationStoryboard **obj )
|
||||
@@ -895,6 +895,197 @@ static HRESULT animation_storyboard_create( IUIAnimationStoryboard **obj )
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
+/***********************************************************************
|
||||
+ * IUIAnimationVariable
|
||||
+ */
|
||||
+struct animation_var
|
||||
@ -206,21 +207,20 @@ index 7a6c68c..3dc9e30 100644
|
||||
+ return S_OK;
|
||||
+}
|
||||
+
|
||||
+/***********************************************************************
|
||||
/***********************************************************************
|
||||
* IUIAnimationManager
|
||||
*/
|
||||
struct manager
|
||||
@@ -384,8 +575,8 @@ static ULONG WINAPI manager_Release( IUIAnimationManager *iface )
|
||||
@@ -955,8 +1146,8 @@ static ULONG WINAPI manager_Release( IUIAnimationManager *iface )
|
||||
static HRESULT WINAPI manager_CreateAnimationVariable( IUIAnimationManager *iface, DOUBLE initial_value, IUIAnimationVariable **variable )
|
||||
{
|
||||
struct manager *This = impl_from_IUIAnimationManager( iface );
|
||||
- FIXME( "stub (%p)->( )\n", This );
|
||||
- FIXME( "stub (%p)->(%f, %p)\n", This, initial_value, variable );
|
||||
- return E_NOTIMPL;
|
||||
+ TRACE( "(%p)->(%p)\n", This, variable );
|
||||
+ TRACE( "(%p)->(%f, %p)\n", This, initial_value, variable );
|
||||
+ return animation_var_create(initial_value, variable);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI manager_ScheduleTransition( IUIAnimationManager *iface, IUIAnimationVariable *variable, IUIAnimationTransition *transition, UI_ANIMATION_SECONDS current_time )
|
||||
--
|
||||
1.9.1
|
||||
2.17.1
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user