[Wine-patches] wmp: Remove define of IPErsistHistory guid (fix eterbug 3575)

Konstantin Kondratyuk =?iso-8859-1?q?kondratyuk_=CE=C1_etersoft=2Eru?=
Пн Мар 2 13:32:34 MSK 2009


Исправляет конфликт в сборке с патчами из winehq:

commit d75722367be697f4345f74c8602f22715f89a90b
Author: Alistair Leslie-Hughes <leslie_alistair на hotmail.com>
Date:   Thu Feb 26 21:39:36 2009 +1100

    mshtml: Show IPersistHistory interface is supported.

commit ca7852db756f08c991b73a271408ec4807e4e3fe
Author: Alistair Leslie-Hughes <leslie_alistair на hotmail.com>
Date:   Fri Feb 27 20:09:52 2009 +1100

    uuid: Add IID_PersistHistory GUID.


-- 
Best regards,
Konstantin Kondratyuk.
----------- следующая часть -----------
From 881680a0161b755a283a8c165fd9a96612a67112 Mon Sep 17 00:00:00 2001
From: Konstantin Kondratyuk <kondratyuk на etersoft.ru>
Date: Mon, 2 Mar 2009 13:18:01 +0300
Subject: [PATCH] wmp: Remove define of IPErsistHistory guid (fix eterbug 3575)

---
 dlls/wmp/wmp_i.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/dlls/wmp/wmp_i.c b/dlls/wmp/wmp_i.c
index 5856dfe..d08d5de 100644
--- a/dlls/wmp/wmp_i.c
+++ b/dlls/wmp/wmp_i.c
@@ -10,7 +10,6 @@ extern "C" {
 #endif
 
 DEFINE_GUID(IID_IMediaPlayer, 0x22d6f311, 0xb0f6, 0x11d0, 0x94,0xab, 0x00,0x80,0xc7,0x4c,0x7e,0x95);
-DEFINE_GUID(IID_IPersistHistory, 0x91a565c1, 0xe38f, 0x11d0, 0x94,0xbf, 0x00,0xa0,0xc9,0x05,0x5c,0xbf);
 DEFINE_GUID(IID_IWMPErrorItem, 0x3614c646, 0x3b3b, 0x4de7, 0xa8,0x1e, 0x93,0x0e,0x3f,0x21,0x27,0xb3);
 DEFINE_GUID(IID_IWMPError, 0xa12dcf7d, 0x14ab, 0x4c1b, 0xa8,0xcd, 0x63,0x90,0x9f,0x06,0x02,0x5b);
 DEFINE_GUID(IID_IWMPMedia, 0x94d55e95, 0x3fac, 0x11d3, 0xb1,0x55, 0x00,0xc0,0x4f,0x79,0xfa,0xa6);
-- 
1.6.1.3.GIT



Подробная информация о списке рассылки Wine-patches