ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advpack: Define S_ASYNCHRONOUS in advpub.h.

This commit is contained in:
James Hawkins 2006-03-26 21:40:26 -06:00 committed by Alexandre Julliard
parent 0a3646292a
commit e4b31800ab
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/advpack/tests/install.c
View File

@ -21,7 +21,6 @@
#include <stdio.h>
#include <windows.h>
#include <advpub.h>
#include <urlmon.h>
#include "wine/test.h"
/* function pointers */
@ -67,7 +66,7 @@ static void test_RunSetupCommand()
/* try a bad directory */
hexe = (HANDLE)0xdeadbeef;
hr = pRunSetupCommand(NULL, "winver.exe", "Install", "windows\\system32", "Title", &hexe, 0, NULL);
hr = pRunSetupCommand(NULL, "winve.exe", "Install", "", "Title", &hexe, 0, NULL);
todo_wine
{
ok(hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY),
@ -89,12 +88,9 @@ static void test_RunSetupCommand()
/* run winver.exe */
hexe = (HANDLE)0xdeadbeef;
hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL);
todo_wine
{
ok(hr == S_ASYNCHRONOUS, "Expected S_ASYNCHRONOUS, got %ld\n", hr);
ok(hexe != NULL, "Expected hexe to be non-NULL\n");
ok(TerminateProcess(hexe, 0), "Expected TerminateProcess to succeed\n");
}
ok(hr == S_ASYNCHRONOUS, "Expected S_ASYNCHRONOUS, got %ld\n", hr);
ok(hexe != NULL, "Expected hexe to be non-NULL\n");
ok(TerminateProcess(hexe, 0), "Expected TerminateProcess to succeed\n");
}
START_TEST(install)

4
include/advpub.h
View File

@ -25,6 +25,10 @@
extern "C" {
#endif
#ifndef S_ASYNCHRONOUS
#define S_ASYNCHRONOUS _HRESULT_TYPEDEF_(0x401E8L)
#endif
typedef struct _CabInfoA
{
LPSTR pszCab;

2
include/urlmon.idl
View File

@ -1146,7 +1146,9 @@ cpp_quote("DEFINE_GUID(CLSID_MkProtocol, 0x79EAC9E6, 0xBAF9, 0x11CE, 0x8C,0x82,
cpp_quote("#define MK_S_ASYNCHRONOUS 0x000401E8")
cpp_quote("#ifndef S_ASYNCHRONOUS")
cpp_quote("#define S_ASYNCHRONOUS MK_S_ASYNCHRONOUS")
cpp_quote("#endif")
cpp_quote("#define INET_E_ERROR_FIRST 0x800C0002")
cpp_quote("#define INET_E_INVALID_URL 0x800C0002")