August 2008 - Wine-Commits - list.winehq.org

Juan Lang : tools/wine.inf: Register msisip.dll.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 1eb0d9278049802e5d340e0a1a1bb104f9d8ab41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb0d9278049802e5d340e0a1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 31 10:22:01 2008 -0700 tools/wine.inf: Register msisip.dll. --- dlls/crypt32/tests/sip.c | 35 ++++++++++++++++------------------- tools/wine.inf.in | 1 + 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 80a1323..7ffa2b9 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -310,7 +310,7 @@ static void test_SIPLoad(void) static GUID dummySubject = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; static GUID unknown = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */ static GUID unknown2 = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */ - /* The next SIP is available on Windows (not on a clean Wine install) */ + /* The next SIP is available on Windows and on Wine */ static GUID unknown3 = { 0x000C10F1, 0x0000, 0x0000, { 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46 }}; /* MSISIP.DLL */ SIP_DISPATCH_INFO sdi; HMODULE hCrypt; @@ -403,24 +403,21 @@ static void test_SIPLoad(void) /* As msisip.dll is not checked yet by any of the previous calls, the * function DllCanUnloadNow will be checked again in msisip.dll (it's not present) */ - todo_wine - { - ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); - - /* This is another SIP but this test proves the function addresses are the same as - * in the previous test. - */ - if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData && - funcCryptSIPVerifyIndirectData && funcCryptSIPRemoveSignedDataMsg) - ok (sdi.pfGet == funcCryptSIPGetSignedDataMsg && - sdi.pfPut == funcCryptSIPPutSignedDataMsg && - sdi.pfCreate == funcCryptSIPCreateIndirectData && - sdi.pfVerify == funcCryptSIPVerifyIndirectData && - sdi.pfRemove == funcCryptSIPRemoveSignedDataMsg, - "Expected function addresses to be from crypt32\n"); - else - trace("Couldn't load function pointers\n"); - } + ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); + + /* This is another SIP but this test proves the function addresses are the same as + * in the previous test. + */ + if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData && + funcCryptSIPVerifyIndirectData && funcCryptSIPRemoveSignedDataMsg) + ok (sdi.pfGet == funcCryptSIPGetSignedDataMsg && + sdi.pfPut == funcCryptSIPPutSignedDataMsg && + sdi.pfCreate == funcCryptSIPCreateIndirectData && + sdi.pfVerify == funcCryptSIPVerifyIndirectData && + sdi.pfRemove == funcCryptSIPRemoveSignedDataMsg, + "Expected function addresses to be from crypt32\n"); + else + trace("Couldn't load function pointers\n"); } /* Reserved parameter not 0 */ diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 0d116df..4d10778 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2213,6 +2213,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msi.dll,1 11,,msiexec.exe,1 11,,msimtf.dll,1 +11,,msisip.dll,1 11,,mstask.dll,1 11,,msxml3.dll,1 11,,objsel.dll,1

1 0

Juan Lang : msisip: Implement MsiSIPGetSignedDataMsg.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 7c97132cbf1c70fd1f8b419983df3bfa1104c9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c97132cbf1c70fd1f8b41998… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 31 15:50:18 2008 -0700 msisip: Implement MsiSIPGetSignedDataMsg. --- dlls/msisip/main.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msisip/msisip.spec | 2 +- 2 files changed, 122 insertions(+), 1 deletions(-) diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index e47c297..cea0398 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -97,6 +97,127 @@ HRESULT WINAPI DllUnregisterServer(void) } /*********************************************************************** + * MsiSIPGetSignedDataMsg (MSISIP.@) + */ +BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, + DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg, + BYTE *pbSignedDataMsg) +{ + static const WCHAR digitalSig[] = { 5,'D','i','g','i','t','a','l', + 'S','i','g','n','a','t','u','r','e',0 }; + BOOL ret = FALSE; + IStorage *stg = NULL; + HRESULT r; + IStream *stm = NULL; + BYTE hdr[2], len[sizeof(DWORD)]; + DWORD count, lenBytes, dataBytes; + + TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, + pcbSignedDataMsg, pbSignedDataMsg); + + r = StgOpenStorage(pSubjectInfo->pwsFileName, NULL, + STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); + if (FAILED(r)) + { + TRACE("couldn't open %s\n", debugstr_w(pSubjectInfo->pwsFileName)); + goto end; + } + + r = IStorage_OpenStream(stg, digitalSig, 0, + STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stm); + if (FAILED(r)) + { + TRACE("couldn't find digital signature stream\n"); + goto freestorage; + } + + r = IStream_Read(stm, hdr, sizeof(hdr), &count); + if (FAILED(r) || count != sizeof(hdr)) + goto freestream; + if (hdr[0] != 0x30) + { + WARN("unexpected data in digital sig: 0x%02x%02x\n", hdr[0], hdr[1]); + goto freestream; + } + + /* Read the asn.1 length from the stream. Only supports definite-length + * values, which DER-encoded signatures should be. + */ + if (hdr[1] == 0x80) + { + WARN("indefinite-length encoding not supported!\n"); + goto freestream; + } + else if (hdr[1] & 0x80) + { + DWORD temp; + LPBYTE ptr; + + lenBytes = hdr[1] & 0x7f; + if (lenBytes > sizeof(DWORD)) + { + WARN("asn.1 length too long (%d)\n", lenBytes); + goto freestream; + } + r = IStream_Read(stm, len, lenBytes, &count); + if (FAILED(r) || count != lenBytes) + goto freestream; + dataBytes = 0; + temp = lenBytes; + ptr = len; + while (temp--) + { + dataBytes <<= 8; + dataBytes |= *ptr++; + } + } + else + { + lenBytes = 0; + dataBytes = hdr[1]; + } + + if (!pbSignedDataMsg) + { + *pcbSignedDataMsg = 2 + lenBytes + dataBytes; + ret = TRUE; + } + else if (*pcbSignedDataMsg < 2 + lenBytes + dataBytes) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + *pcbSignedDataMsg = 2 + lenBytes + dataBytes; + } + else + { + LPBYTE ptr = pbSignedDataMsg; + + memcpy(ptr, hdr, sizeof(hdr)); + ptr += sizeof(hdr); + if (lenBytes) + { + memcpy(ptr, len, lenBytes); + ptr += lenBytes; + } + r = IStream_Read(stm, ptr, dataBytes, &count); + if (SUCCEEDED(r) && count == dataBytes) + { + *pdwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + *pcbSignedDataMsg = 2 + lenBytes + dataBytes; + ret = TRUE; + } + } + +freestream: + IStream_Release(stm); +freestorage: + IStorage_Release(stg); +end: + + TRACE("returning %d\n", ret); + return ret; +} + +/*********************************************************************** * MsiSIPIsMyTypeOfFile (MSISIP.@) */ BOOL WINAPI MsiSIPIsMyTypeOfFile(WCHAR *name, GUID *subject) diff --git a/dlls/msisip/msisip.spec b/dlls/msisip/msisip.spec index 1e1f444..cfe8292 100644 --- a/dlls/msisip/msisip.spec +++ b/dlls/msisip/msisip.spec @@ -1,5 +1,5 @@ 5 stdcall MsiSIPIsMyTypeOfFile(wstr ptr) -6 stub MsiSIPGetSignedDataMsg +6 stdcall MsiSIPGetSignedDataMsg(ptr ptr long ptr ptr) 7 stub MsiSIPPutSignedDataMsg 8 stub MsiSIPRemoveSignedDataMsg 9 stub MsiSIPCreateIndirectData

1 0

Juan Lang : msisip: Implement MsiSIPIsMyTypeOfFile.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 34b783c198d7d30dbf1491a5cef09e38db074bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b783c198d7d30dbf1491a5c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 31 08:51:02 2008 -0700 msisip: Implement MsiSIPIsMyTypeOfFile. --- dlls/msisip/Makefile.in | 2 +- dlls/msisip/main.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msisip/msisip.spec | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/msisip/Makefile.in b/dlls/msisip/Makefile.in index 51f6ee9..13bcfdd 100644 --- a/dlls/msisip/Makefile.in +++ b/dlls/msisip/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msisip.dll -IMPORTS = crypt32 kernel32 +IMPORTS = crypt32 ole32 kernel32 C_SRCS = \ main.c diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index 04ba033..e47c297 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -22,6 +22,8 @@ #include "winbase.h" #include "wincrypt.h" #include "mssip.h" +#define COBJMACROS +#include "objbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msisip); @@ -93,3 +95,35 @@ HRESULT WINAPI DllUnregisterServer(void) CryptSIPRemoveProvider(&mySubject); return S_OK; } + +/*********************************************************************** + * MsiSIPIsMyTypeOfFile (MSISIP.@) + */ +BOOL WINAPI MsiSIPIsMyTypeOfFile(WCHAR *name, GUID *subject) +{ + static const WCHAR msi[] = { '.','m','s','i',0 }; + static const WCHAR msp[] = { '.','m','s','p',0 }; + BOOL ret = FALSE; + + TRACE("(%s, %p)\n", debugstr_w(name), subject); + + if (lstrlenW(name) < lstrlenW(msi)) + return FALSE; + else if (lstrcmpiW(name + lstrlenW(name) - lstrlenW(msi), msi) && + lstrcmpiW(name + lstrlenW(name) - lstrlenW(msp), msp)) + return FALSE; + else + { + IStorage *stg = NULL; + HRESULT r = StgOpenStorage(name, NULL, + STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); + + if (SUCCEEDED(r)) + { + IStorage_Release(stg); + *subject = mySubject; + ret = TRUE; + } + } + return ret; +} diff --git a/dlls/msisip/msisip.spec b/dlls/msisip/msisip.spec index cfe1799..1e1f444 100644 --- a/dlls/msisip/msisip.spec +++ b/dlls/msisip/msisip.spec @@ -1,4 +1,4 @@ -5 stub MsiSIPIsMyTypeOfFile +5 stdcall MsiSIPIsMyTypeOfFile(wstr ptr) 6 stub MsiSIPGetSignedDataMsg 7 stub MsiSIPPutSignedDataMsg 8 stub MsiSIPRemoveSignedDataMsg

1 0

Juan Lang : msisip: Implement DllRegisterServer/DllUnregisterServer.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 8fbd2c851441162a9523f7c86ceb6acae9e7ebef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbd2c851441162a9523f7c86… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 31 08:47:02 2008 -0700 msisip: Implement DllRegisterServer/DllUnregisterServer. --- dlls/msisip/Makefile.in | 2 +- dlls/msisip/main.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msisip/msisip.spec | 4 +- 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/msisip/Makefile.in b/dlls/msisip/Makefile.in index 4106f63..51f6ee9 100644 --- a/dlls/msisip/Makefile.in +++ b/dlls/msisip/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msisip.dll -IMPORTS = kernel32 +IMPORTS = crypt32 kernel32 C_SRCS = \ main.c diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index c9dd75c..04ba033 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -20,6 +20,8 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "wincrypt.h" +#include "mssip.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msisip); @@ -43,3 +45,51 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +static GUID mySubject = { 0x000c10f1, 0x0000, 0x0000, + { 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46 }}; + +/*********************************************************************** + * DllRegisterServer (MSISIP.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + static WCHAR msisip[] = { 'M','S','I','S','I','P','.','D','L','L',0 }; + static WCHAR getSignedDataMsg[] = { 'M','s','i','S','I','P','G','e','t', + 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; + static WCHAR putSignedDataMsg[] = { 'M','s','i','S','I','P','P','u','t', + 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; + static WCHAR createIndirectData[] = { 'M','s','i','S','I','P', + 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a', + 0 }; + static WCHAR verifyIndirectData[] = { 'M','s','i','S','I','P', + 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a', + 0 }; + static WCHAR removeSignedDataMsg[] = { 'M','s','i','S','I','P','R','e','m', + 'o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g', 0 }; + static WCHAR isMyTypeOfFile[] = { 'M','s','i','S','I','P', + 'I','s','M','y','T','y','p','e','O','f','F','i','l','e',0 }; + + SIP_ADD_NEWPROVIDER prov; + + memset(&prov, 0, sizeof(prov)); + prov.cbStruct = sizeof(prov); + prov.pwszDLLFileName = msisip; + prov.pgSubject = &mySubject; + prov.pwszGetFuncName = getSignedDataMsg; + prov.pwszPutFuncName = putSignedDataMsg; + prov.pwszCreateFuncName = createIndirectData; + prov.pwszVerifyFuncName = verifyIndirectData; + prov.pwszRemoveFuncName = removeSignedDataMsg; + prov.pwszIsFunctionNameFmt2 = isMyTypeOfFile; + return CryptSIPAddProvider(&prov) ? S_OK : S_FALSE; +} + +/*********************************************************************** + * DllUnregisterServer (MSISIP.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + CryptSIPRemoveProvider(&mySubject); + return S_OK; +} diff --git a/dlls/msisip/msisip.spec b/dlls/msisip/msisip.spec index 0b682b6..cfe1799 100644 --- a/dlls/msisip/msisip.spec +++ b/dlls/msisip/msisip.spec @@ -4,5 +4,5 @@ 8 stub MsiSIPRemoveSignedDataMsg 9 stub MsiSIPCreateIndirectData 10 stub MsiSIPVerifyIndirectData -11 stub DllRegisterServer -12 stub DllUnregisterServer +11 stdcall DllRegisterServer() +12 stdcall DllUnregisterServer()

1 0

Juan Lang : msisip: Add stub dll.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 8a6c2c2b802779ddd8c7c3bcc22c22c5efdbfa12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6c2c2b802779ddd8c7c3bcc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 31 08:41:17 2008 -0700 msisip: Add stub dll. --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/msisip/Makefile.in | 13 +++++++++++++ dlls/msisip/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msisip/msisip.spec | 8 ++++++++ 7 files changed, 73 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index bb1ec01..3cd9452 100644 --- a/Makefile.in +++ b/Makefile.in @@ -347,6 +347,7 @@ ALL_MAKEFILES = \ dlls/msi/tests/Makefile \ dlls/msimg32/Makefile \ dlls/msimtf/Makefile \ + dlls/msisip/Makefile \ dlls/msisys.ocx/Makefile \ dlls/msnet32/Makefile \ dlls/msrle32/Makefile \ @@ -780,6 +781,7 @@ dlls/msi/Makefile: dlls/msi/Makefile.in dlls/Makedll.rules dlls/msi/tests/Makefile: dlls/msi/tests/Makefile.in dlls/Maketest.rules dlls/msimg32/Makefile: dlls/msimg32/Makefile.in dlls/Makedll.rules dlls/msimtf/Makefile: dlls/msimtf/Makefile.in dlls/Makedll.rules +dlls/msisip/Makefile: dlls/msisip/Makefile.in dlls/Makedll.rules dlls/msisys.ocx/Makefile: dlls/msisys.ocx/Makefile.in dlls/Makedll.rules dlls/msnet32/Makefile: dlls/msnet32/Makefile.in dlls/Makedll.rules dlls/msrle32/Makefile: dlls/msrle32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index a1b6fac..76d3fc0 100755 --- a/configure +++ b/configure @@ -22273,6 +22273,8 @@ ac_config_files="$ac_config_files dlls/msimg32/Makefile" ac_config_files="$ac_config_files dlls/msimtf/Makefile" +ac_config_files="$ac_config_files dlls/msisip/Makefile" + ac_config_files="$ac_config_files dlls/msisys.ocx/Makefile" ac_config_files="$ac_config_files dlls/msnet32/Makefile" @@ -23494,6 +23496,7 @@ do "dlls/msi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msi/tests/Makefile" ;; "dlls/msimg32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msimg32/Makefile" ;; "dlls/msimtf/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msimtf/Makefile" ;; + "dlls/msisip/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msisip/Makefile" ;; "dlls/msisys.ocx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msisys.ocx/Makefile" ;; "dlls/msnet32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msnet32/Makefile" ;; "dlls/msrle32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msrle32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 62fcd0b..4ea3a18 100644 --- a/configure.ac +++ b/configure.ac @@ -1899,6 +1899,7 @@ AC_CONFIG_FILES([dlls/msi/Makefile]) AC_CONFIG_FILES([dlls/msi/tests/Makefile]) AC_CONFIG_FILES([dlls/msimg32/Makefile]) AC_CONFIG_FILES([dlls/msimtf/Makefile]) +AC_CONFIG_FILES([dlls/msisip/Makefile]) AC_CONFIG_FILES([dlls/msisys.ocx/Makefile]) AC_CONFIG_FILES([dlls/msnet32/Makefile]) AC_CONFIG_FILES([dlls/msrle32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 681b5c6..b7428fb 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -154,6 +154,7 @@ BASEDIRS = \ msi \ msimg32 \ msimtf \ + msisip \ msisys.ocx \ msnet32 \ msrle32 \ diff --git a/dlls/msisip/Makefile.in b/dlls/msisip/Makefile.in new file mode 100644 index 0000000..4106f63 --- /dev/null +++ b/dlls/msisip/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = msisip.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c new file mode 100644 index 0000000..c9dd75c --- /dev/null +++ b/dlls/msisip/main.c @@ -0,0 +1,45 @@ +/* + * Copyright 2008 Juan Lang + * + * 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 + */ + +#include "config.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msisip); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + + return TRUE; +} diff --git a/dlls/msisip/msisip.spec b/dlls/msisip/msisip.spec new file mode 100644 index 0000000..0b682b6 --- /dev/null +++ b/dlls/msisip/msisip.spec @@ -0,0 +1,8 @@ +5 stub MsiSIPIsMyTypeOfFile +6 stub MsiSIPGetSignedDataMsg +7 stub MsiSIPPutSignedDataMsg +8 stub MsiSIPRemoveSignedDataMsg +9 stub MsiSIPCreateIndirectData +10 stub MsiSIPVerifyIndirectData +11 stub DllRegisterServer +12 stub DllUnregisterServer

1 0

Juan Lang : crypt32: Fix some test failures on Win9x.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 765413ebd8c5501880f014c6e0738ffba7816f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=765413ebd8c5501880f014c6e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 31 11:20:25 2008 -0700 crypt32: Fix some test failures on Win9x. --- dlls/crypt32/tests/chain.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 91cae47..5bae989 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1741,6 +1741,14 @@ static ChainPolicyCheck basicConstraintsPolicyCheck[] = { { 0, 0, -1, -1, NULL }, 0 }, }; +static const char *num_to_str(WORD num) +{ + static char buf[6]; + + sprintf(buf, "#%04X", num); + return buf; +} + static void checkChainPolicyStatus(LPCSTR policy, ChainPolicyCheck *check, DWORD testIndex) { @@ -1757,8 +1765,17 @@ static void checkChainPolicyStatus(LPCSTR policy, ChainPolicyCheck *check, todo_wine ok(ret, "%d: CertVerifyCertificateChainPolicy failed: %08x\n", testIndex, GetLastError()); else + { + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + skip("%d: missing policy %s, skipping test\n", testIndex, + HIWORD(policy) ? policy : num_to_str(LOWORD(policy))); + pCertFreeCertificateChain(chain); + return; + } ok(ret, "%d: CertVerifyCertificateChainPolicy failed: %08x\n", testIndex, GetLastError()); + } if (ret) { if (check->todo & TODO_ERROR)

1 0

Alexandre Julliard : winetest: Set environment variables in the Win32 environment.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: b008b053a94696942878f44d487901f344c98860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b008b053a94696942878f44d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 1 10:48:58 2008 +0200 winetest: Set environment variables in the Win32 environment. --- programs/winetest/main.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 04eaae4..045845a 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -659,25 +659,18 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, cmdLine = strtok (NULL, whitespace); } if (!submit) { - static CHAR platform_windows[] = "WINETEST_PLATFORM=windows", - platform_wine[] = "WINETEST_PLATFORM=wine", - debug_yes[] = "WINETEST_DEBUG=1", - interactive_no[] = "WINETEST_INTERACTIVE=0", - report_success_no[] = "WINETEST_REPORT_SUCCESS=0"; - CHAR *platform; - report (R_STATUS, "Starting up"); if (!running_on_visible_desktop ()) report (R_FATAL, "Tests must be run on a visible desktop"); - platform = running_under_wine () ? platform_wine : platform_windows; - - if (reset_env && (putenv (platform) || - putenv (debug_yes) || - putenv (interactive_no) || - putenv (report_success_no))) - report (R_FATAL, "Could not reset environment"); + if (reset_env) + { + SetEnvironmentVariableA( "WINETEST_PLATFORM", running_under_wine () ? "wine" : "windows" ); + SetEnvironmentVariableA( "WINETEST_DEBUG", "1" ); + SetEnvironmentVariableA( "WINETEST_INTERACTIVE", "0" ); + SetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", "0" ); + } if (!tag) { if (!interactive)

1 0

Piotr Caban : msxml3: Add IVBSAXLocator implementation.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: d439ca5e2a8696b23257352c0dfc455b1aa56dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=d439ca5e2a8696b23257352c0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 31 16:48:11 2008 +0200 msxml3: Add IVBSAXLocator implementation. --- dlls/msxml3/saxreader.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 181 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index cfee18d..a938e6b 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1130,6 +1130,186 @@ void libxmlFatalError(void *ctx, const char *msg, ...) This->ret = E_FAIL; } +/*** IVBSAXLocator interface ***/ +/*** IUnknown methods ***/ +static HRESULT WINAPI ivbsaxlocator_QueryInterface(IVBSAXLocator* iface, REFIID riid, void **ppvObject) +{ + saxlocator *This = impl_from_IVBSAXLocator( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject); + + *ppvObject = NULL; + + if ( IsEqualGUID( riid, &IID_IUnknown ) || + IsEqualGUID( riid, &IID_IDispatch) || + IsEqualGUID( riid, &IID_IVBSAXLocator )) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IVBSAXLocator_AddRef( iface ); + + return S_OK; +} + +static ULONG WINAPI ivbsaxlocator_AddRef(IVBSAXLocator* iface) +{ + saxlocator *This = impl_from_IVBSAXLocator( iface ); + TRACE("%p\n", This ); + return InterlockedIncrement( &This->ref ); +} + +static ULONG WINAPI ivbsaxlocator_Release( + IVBSAXLocator* iface) +{ + saxlocator *This = impl_from_IVBSAXLocator( iface ); + return ISAXLocator_Release((ISAXLocator*)&This->lpVBSAXLocatorVtbl); +} + +/*** IDispatch methods ***/ +static HRESULT WINAPI ivbsaxlocator_GetTypeInfoCount( IVBSAXLocator *iface, UINT* pctinfo ) +{ + saxlocator *This = impl_from_IVBSAXLocator( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; +} + +static HRESULT WINAPI ivbsaxlocator_GetTypeInfo( + IVBSAXLocator *iface, + UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) +{ + saxlocator *This = impl_from_IVBSAXLocator( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IVBSAXLocator_tid, ppTInfo); + + return hr; +} + +static HRESULT WINAPI ivbsaxlocator_GetIDsOfNames( + IVBSAXLocator *iface, + REFIID riid, + LPOLESTR* rgszNames, + UINT cNames, + LCID lcid, + DISPID* rgDispId) +{ + saxlocator *This = impl_from_IVBSAXLocator( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IVBSAXLocator_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ivbsaxlocator_Invoke( + IVBSAXLocator *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + saxlocator *This = impl_from_IVBSAXLocator( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IVBSAXLocator_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVBSAXLocatorVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +/*** IVBSAXLocator methods ***/ +static HRESULT WINAPI ivbsaxlocator_get_columnNumber( + IVBSAXLocator* iface, + int *pnColumn) +{ + saxlocator *This = impl_from_IVBSAXLocator( iface ); + return ISAXLocator_getColumnNumber( + (ISAXLocator*)&This->lpVBSAXLocatorVtbl, + pnColumn); +} + +static HRESULT WINAPI ivbsaxlocator_get_lineNumber( + IVBSAXLocator* iface, + int *pnLine) +{ + saxlocator *This = impl_from_IVBSAXLocator( iface ); + return ISAXLocator_getLineNumber( + (ISAXLocator*)&This->lpVBSAXLocatorVtbl, + pnLine); +} + +static HRESULT WINAPI ivbsaxlocator_get_publicId( + IVBSAXLocator* iface, + BSTR* publicId) +{ + saxlocator *This = impl_from_IVBSAXLocator( iface ); + return ISAXLocator_getPublicId( + (ISAXLocator*)&This->lpVBSAXLocatorVtbl, + (const WCHAR**)publicId); +} + +static HRESULT WINAPI ivbsaxlocator_get_systemId( + IVBSAXLocator* iface, + BSTR* systemId) +{ + saxlocator *This = impl_from_IVBSAXLocator( iface ); + return ISAXLocator_getSystemId( + (ISAXLocator*)&This->lpVBSAXLocatorVtbl, + (const WCHAR**)systemId); +} + +static const struct IVBSAXLocatorVtbl ivbsaxlocator_vtbl = +{ + ivbsaxlocator_QueryInterface, + ivbsaxlocator_AddRef, + ivbsaxlocator_Release, + ivbsaxlocator_GetTypeInfoCount, + ivbsaxlocator_GetTypeInfo, + ivbsaxlocator_GetIDsOfNames, + ivbsaxlocator_Invoke, + ivbsaxlocator_get_columnNumber, + ivbsaxlocator_get_lineNumber, + ivbsaxlocator_get_publicId, + ivbsaxlocator_get_systemId +}; + /*** ISAXLocator interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI isaxlocator_QueryInterface(ISAXLocator* iface, REFIID riid, void **ppvObject) @@ -1270,6 +1450,7 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B if( !locator ) return E_OUTOFMEMORY; + locator->lpVBSAXLocatorVtbl = &ivbsaxlocator_vtbl; locator->lpSAXLocatorVtbl = &isaxlocator_vtbl; locator->ref = 1; locator->vbInterface = vbInterface;

1 0

Piotr Caban : msxml3: Prepare libxml2 callbacks for IVBSAX... interfaces implementation.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: c52e0919fb6e2f6809346e82d2f6a49c7f5daeeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52e0919fb6e2f6809346e82d… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 31 16:48:03 2008 +0200 msxml3: Prepare libxml2 callbacks for IVBSAX... interfaces implementation. --- dlls/msxml3/saxreader.c | 94 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 72 insertions(+), 22 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index facd962..cfee18d 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -52,7 +52,9 @@ typedef struct _saxreader const struct ISAXXMLReaderVtbl *lpSAXXMLReaderVtbl; LONG ref; struct ISAXContentHandler *contentHandler; + struct IVBSAXContentHandler *vbcontentHandler; struct ISAXErrorHandler *errorHandler; + struct IVBSAXErrorHandler *vberrorHandler; xmlSAXHandler sax; } saxreader; @@ -69,6 +71,7 @@ typedef struct _saxlocator xmlChar *lastCur; int line; int column; + BOOL vbInterface; } saxlocator; typedef struct _saxattributes @@ -152,8 +155,15 @@ static void format_error_message_from_id(saxlocator *This, HRESULT hr) msg[0] = '\0'; } - ISAXErrorHandler_fatalError(This->saxreader->errorHandler, - (ISAXLocator*)&This->lpSAXLocatorVtbl, msg, hr); + if(This->vbInterface) + { + BSTR bstrMsg = SysAllocString(msg); + IVBSAXErrorHandler_fatalError(This->saxreader->vberrorHandler, + (IVBSAXLocator*)&This->lpVBSAXLocatorVtbl, &bstrMsg, hr); + } + else + ISAXErrorHandler_fatalError(This->saxreader->errorHandler, + (ISAXLocator*)&This->lpSAXLocatorVtbl, msg, hr); } } @@ -848,7 +858,11 @@ static void libxmlStartDocument(void *ctx) if(This->saxreader->contentHandler) { - hr = ISAXContentHandler_startDocument(This->saxreader->contentHandler); + if(This->vbInterface) + hr = IVBSAXContentHandler_startDocument(This->saxreader->vbcontentHandler); + else + hr = ISAXContentHandler_startDocument(This->saxreader->contentHandler); + if(hr != S_OK) format_error_message_from_id(This, hr); } @@ -868,7 +882,11 @@ static void libxmlEndDocument(void *ctx) if(This->saxreader->contentHandler) { - hr = ISAXContentHandler_endDocument(This->saxreader->contentHandler); + if(This->vbInterface) + hr = IVBSAXContentHandler_endDocument(This->saxreader->vbcontentHandler); + else + hr = ISAXContentHandler_endDocument(This->saxreader->contentHandler); + if(hr != S_OK) format_error_message_from_id(This, hr); } @@ -901,12 +919,18 @@ static void libxmlStartElementNS( hr = SAXAttributes_create(&attr, nb_attributes, attributes); if(hr == S_OK) { - hr = ISAXContentHandler_startElement( - This->saxreader->contentHandler, - NamespaceUri, SysStringLen(NamespaceUri), - LocalName, SysStringLen(LocalName), - QName, SysStringLen(QName), - (ISAXAttributes*)&attr->lpSAXAttributesVtbl); + if(This->vbInterface) + hr = IVBSAXContentHandler_startElement( + This->saxreader->vbcontentHandler, + &NamespaceUri, &LocalName, &QName, + (IVBSAXAttributes*)&attr->lpVBSAXAttributesVtbl); + else + hr = ISAXContentHandler_startElement( + This->saxreader->contentHandler, + NamespaceUri, SysStringLen(NamespaceUri), + LocalName, SysStringLen(LocalName), + QName, SysStringLen(QName), + (ISAXAttributes*)&attr->lpSAXAttributesVtbl); ISAXAttributes_Release((ISAXAttributes*)&attr->lpSAXAttributesVtbl); } @@ -941,11 +965,16 @@ static void libxmlEndElementNS( LocalName = bstr_from_xmlChar(localname); QName = bstr_from_xmlChar(localname); - hr = ISAXContentHandler_endElement( - This->saxreader->contentHandler, - NamespaceUri, SysStringLen(NamespaceUri), - LocalName, SysStringLen(LocalName), - QName, SysStringLen(QName)); + if(This->vbInterface) + hr = IVBSAXContentHandler_endElement( + This->saxreader->vbcontentHandler, + &NamespaceUri, &LocalName, &QName); + else + hr = ISAXContentHandler_endElement( + This->saxreader->contentHandler, + NamespaceUri, SysStringLen(NamespaceUri), + LocalName, SysStringLen(LocalName), + QName, SysStringLen(QName)); SysFreeString(NamespaceUri); SysFreeString(LocalName); @@ -1011,7 +1040,14 @@ static void libxmlCharacters( } else if(*end == '\r') Chars[end-This->lastCur] = '\n'; - hr = ISAXContentHandler_characters(This->saxreader->contentHandler, Chars, end-This->lastCur+1); + if(This->vbInterface) + hr = IVBSAXContentHandler_characters( + This->saxreader->vbcontentHandler, &Chars); + else + hr = ISAXContentHandler_characters( + This->saxreader->contentHandler, + Chars, end-This->lastCur+1); + SysFreeString(Chars); if(hr != S_OK) { @@ -1040,8 +1076,14 @@ static void libxmlSetDocumentLocator( saxlocator *This = ctx; HRESULT hr; - hr = ISAXContentHandler_putDocumentLocator(This->saxreader->contentHandler, - (ISAXLocator*)&This->lpSAXLocatorVtbl); + if(This->vbInterface) + hr = IVBSAXContentHandler_putref_documentLocator( + This->saxreader->vbcontentHandler, + (IVBSAXLocator*)&This->lpVBSAXLocatorVtbl); + else + hr = ISAXContentHandler_putDocumentLocator( + This->saxreader->contentHandler, + (ISAXLocator*)&This->lpSAXLocatorVtbl); if(FAILED(hr)) format_error_message_from_id(This, hr); @@ -1072,8 +1114,15 @@ void libxmlFatalError(void *ctx, const char *msg, ...) wszError = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); MultiByteToWideChar(CP_ACP, 0, message, -1, (LPWSTR)wszError, len); - ISAXErrorHandler_fatalError(This->saxreader->errorHandler, - (ISAXLocator*)&This->lpSAXLocatorVtbl, wszError, E_FAIL); + if(This->vbInterface) + { + BSTR bstrError = SysAllocString(wszError); + IVBSAXErrorHandler_fatalError(This->saxreader->vberrorHandler, + (IVBSAXLocator*)&This->lpVBSAXLocatorVtbl, &bstrError, E_FAIL); + } + else + ISAXErrorHandler_fatalError(This->saxreader->errorHandler, + (ISAXLocator*)&This->lpSAXLocatorVtbl, wszError, E_FAIL); HeapFree(GetProcessHeap(), 0, wszError); @@ -1213,7 +1262,7 @@ static const struct ISAXLocatorVtbl isaxlocator_vtbl = isaxlocator_getSystemId }; -static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator) +static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, BOOL vbInterface) { saxlocator *locator; @@ -1223,6 +1272,7 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator) locator->lpSAXLocatorVtbl = &isaxlocator_vtbl; locator->ref = 1; + locator->vbInterface = vbInterface; locator->saxreader = reader; ISAXXMLReader_AddRef((ISAXXMLReader*)&reader->lpSAXXMLReaderVtbl); @@ -1814,7 +1864,7 @@ static HRESULT parse_buffer(saxreader *This, const char *buffer, int size) saxlocator *locator; HRESULT hr; - hr = SAXLocator_create(This, &locator); + hr = SAXLocator_create(This, &locator, FALSE); if(FAILED(hr)) return E_FAIL;

1 0

Vladimir Pankratov : taskmgr: Converted some functions to Unicode.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 992d0043822454a290139409bbe4a9cd222eed7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=992d0043822454a290139409b… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Aug 1 12:18:25 2008 +0500 taskmgr: Converted some functions to Unicode. --- programs/taskmgr/trayicon.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index e088f3f..25a5121 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -26,13 +26,13 @@ #include <stdlib.h> #include <malloc.h> #include <memory.h> -#include <tchar.h> #include <stdio.h> #include <winnt.h> - +#include <shellapi.h> + +#include "wine/unicode.h" #include "taskmgr.h" #include "perfdata.h" -#include "shellapi.h" HICON TrayIcon_GetProcessorUsageIcon(void) { @@ -140,23 +140,24 @@ done: BOOL TrayIcon_ShellAddTrayIcon(void) { - NOTIFYICONDATA nid; + NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; + WCHAR wszCPU_Usage[] = {'C','P','U',' ','U','s','a','g','e',':',' ','%','d','%','%',0}; - memset(&nid, 0, sizeof(NOTIFYICONDATA)); + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); hIcon = TrayIcon_GetProcessorUsageIcon(); - nid.cbSize = sizeof(NOTIFYICONDATA); + nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - wsprintf(nid.szTip, _T("CPU Usage: %d%%"), PerfDataGetProcessorUsage()); + wsprintfW(nid.szTip, wszCPU_Usage, PerfDataGetProcessorUsage()); - bRetVal = Shell_NotifyIcon(NIM_ADD, &nid); + bRetVal = Shell_NotifyIconW(NIM_ADD, &nid); if (hIcon) DestroyIcon(hIcon); @@ -166,41 +167,42 @@ BOOL TrayIcon_ShellAddTrayIcon(void) BOOL TrayIcon_ShellRemoveTrayIcon(void) { - NOTIFYICONDATA nid; + NOTIFYICONDATAW nid; BOOL bRetVal; - memset(&nid, 0, sizeof(NOTIFYICONDATA)); + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); - nid.cbSize = sizeof(NOTIFYICONDATA); + nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = 0; nid.uCallbackMessage = WM_ONTRAYICON; - bRetVal = Shell_NotifyIcon(NIM_DELETE, &nid); + bRetVal = Shell_NotifyIconW(NIM_DELETE, &nid); return bRetVal; } BOOL TrayIcon_ShellUpdateTrayIcon(void) { - NOTIFYICONDATA nid; + NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; + WCHAR wszCPU_Usage[] = {'C','P','U',' ','U','s','a','g','e',':',' ','%','d','%','%',0}; - memset(&nid, 0, sizeof(NOTIFYICONDATA)); + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); hIcon = TrayIcon_GetProcessorUsageIcon(); - nid.cbSize = sizeof(NOTIFYICONDATA); + nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - wsprintf(nid.szTip, _T("CPU Usage: %d%%"), PerfDataGetProcessorUsage()); + wsprintfW(nid.szTip, wszCPU_Usage, PerfDataGetProcessorUsage()); - bRetVal = Shell_NotifyIcon(NIM_MODIFY, &nid); + bRetVal = Shell_NotifyIconW(NIM_MODIFY, &nid); if (hIcon) DestroyIcon(hIcon);

1 0