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

advpack: Factor out advpack error handling into ADV_HRESULT.

This commit is contained in:
James Hawkins 2006-04-04 13:15:51 -05:00 committed by Alexandre Julliard
parent 5a5b35cec7
commit 148a481266
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/advpack/install.c
View File

@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack);
#define SPAPI_MASK 0xFFFFL #define SPAPI_MASK 0xFFFFL
#define HRESULT_FROM_SPAPI(x) ((x & SPAPI_MASK) | SPAPI_PREFIX) #define HRESULT_FROM_SPAPI(x) ((x & SPAPI_MASK) | SPAPI_PREFIX)
#define ADV_HRESULT(x) ((x & SPAPI_ERROR) ? HRESULT_FROM_SPAPI(x) : HRESULT_FROM_WIN32(x))
/* this structure very closely resembles parameters of RunSetupCommand() */ /* this structure very closely resembles parameters of RunSetupCommand() */
typedef struct typedef struct
{ {
@ -366,7 +368,6 @@ HRESULT WINAPI RunSetupCommandW(HWND hWnd, LPCWSTR szCmdName,
DWORD dwFlags, LPVOID pvReserved ) DWORD dwFlags, LPVOID pvReserved )
{ {
HINF hinf; HINF hinf;
DWORD err;
TRACE("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p)\n", TRACE("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p)\n",
hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection),
@ -384,13 +385,7 @@ HRESULT WINAPI RunSetupCommandW(HWND hWnd, LPCWSTR szCmdName,
hinf = SetupOpenInfFileW(szCmdName, NULL, INF_STYLE_WIN4, NULL); hinf = SetupOpenInfFileW(szCmdName, NULL, INF_STYLE_WIN4, NULL);
if (hinf == INVALID_HANDLE_VALUE) if (hinf == INVALID_HANDLE_VALUE)
{ return ADV_HRESULT(GetLastError());
err = GetLastError();
if (err & SPAPI_ERROR)
return HRESULT_FROM_SPAPI(err);
else
return HRESULT_FROM_WIN32(err);
}
SetupCloseInfFile(hinf); SetupCloseInfFile(hinf);
return E_UNEXPECTED; return E_UNEXPECTED;