May 2007 - Wine-commits - list.winehq.org

Misha Koshelev : msi/tests: automation: Add tests for Installer:: ProductInfo.
by Alexandre Julliard 16 May '07

16 May '07

Module: wine Branch: master Commit: 2177e492e6ca50519f7d76e36143726d496b5138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2177e492e6ca50519f7d76e36… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Tue May 15 19:30:09 2007 -0500 msi/tests: automation: Add tests for Installer::ProductInfo. --- dlls/msi/tests/automation.c | 67 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 69d7723..c9ff1f8 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -33,8 +33,10 @@ static const char *msifile = "winetest.msi"; static const WCHAR szMsifile[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; +static const WCHAR szMSITEST[] = { 'M','S','I','T','E','S','T',0 }; static const WCHAR szProductCode[] = { '{','F','1','C','3','A','F','5','0','-','8','B','5','6','-','4','A','6','9','-','A','0','0','C','-','0','0','7','7','3','F','E','4','2','F','3','0','}',0 }; static const WCHAR szUpgradeCode[] = { '{','C','E','0','6','7','E','8','D','-','2','E','1','A','-','4','3','6','7','-','B','7','3','4','-','4','E','B','2','B','D','A','D','6','5','6','5','}',0 }; +static const WCHAR szProductInfoException[] = { 'P','r','o','d','u','c','t','I','n','f','o',',','P','r','o','d','u','c','t',',','A','t','t','r','i','b','u','t','e',0 }; CHAR CURR_DIR[MAX_PATH]; EXCEPINFO excepinfo; @@ -755,6 +757,26 @@ static HRESULT Installer_ProductState(LPCWSTR szProduct, int *pInstallState) return hr; } +static HRESULT Installer_ProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, LPWSTR szString) +{ + VARIANT varresult; + VARIANTARG vararg[2]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(szProduct); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szAttribute); + + hr = invoke(pInstaller, "ProductInfo", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BSTR); + if (V_BSTR(&varresult)) lstrcpyW(szString, V_BSTR(&varresult)); + VariantClear(&varresult); + return hr; +} + static HRESULT Installer_Products(IDispatch **pStringList) { VARIANT varresult; @@ -1272,7 +1294,6 @@ static void test_Database(IDispatch *pDatabase) static void test_Session(IDispatch *pSession) { static WCHAR szProductName[] = { 'P','r','o','d','u','c','t','N','a','m','e',0 }; - static WCHAR szMSITEST[] = { 'M','S','I','T','E','S','T',0 }; static WCHAR szOne[] = { 'O','n','e',0 }; static WCHAR szOneStateFalse[] = { '!','O','n','e','>','0',0 }; static WCHAR szOneStateTrue[] = { '!','O','n','e','=','-','1',0 }; @@ -1664,6 +1685,34 @@ static void test_Installer_InstallProduct(LPCWSTR szPath) ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr); ok(iValue == INSTALLSTATE_DEFAULT, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_DEFAULT); + /* Installer::ProductInfo for our product code */ + todo_wine + { + /* NULL attribute */ + memset(szString, 0, sizeof(szString)); + hr = Installer_ProductInfo(szProductCode, NULL, szString); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok_exception(hr, szProductInfoException); + + /* Non-existent attribute */ + memset(szString, 0, sizeof(szString)); + hr = Installer_ProductInfo(szProductCode, szMsifile, szString); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok_exception(hr, szProductInfoException); + + /* Package name */ + memset(szString, 0, sizeof(szString)); + hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PACKAGENAMEW, szString); + ok(SUCCEEDED(hr), "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok_w2("StringList_Item returned %s but expected %s\n", szString, szMsifile); + + /* Product name */ + memset(szString, 0, sizeof(szString)); + hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PRODUCTNAMEW, szString); + ok(SUCCEEDED(hr), "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok_w2("StringList_Item returned %s but expected %s\n", szString, szMSITEST); + } + /* Installer::RelatedProducts for our upgrade code */ hr = Installer_RelatedProducts(szUpgradeCode, &pStringList); ok(SUCCEEDED(hr), "Installer_RelatedProducts failed, hresult 0x%08x\n", hr); @@ -1883,6 +1932,22 @@ static void test_Installer(void) ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr); ok(iValue == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_UNKNOWN); + /* Installer::ProductInfo for our product code, which should not be installed */ + todo_wine + { + /* Package name */ + memset(szPath, 0, sizeof(szPath)); + hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PACKAGENAMEW, szPath); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok_exception(hr, szProductInfoException); + + /* NULL attribute and NULL product code */ + memset(szPath, 0, sizeof(szPath)); + hr = Installer_ProductInfo(NULL, NULL, szPath); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok_exception(hr, szProductInfoException); + } + /* Installer::RelatedProducts for our upgrade code, should not find anything */ hr = Installer_RelatedProducts(szUpgradeCode, &pStringList); ok(SUCCEEDED(hr), "Installer_RelatedProducts failed, hresult 0x%08x\n", hr);

1 0

Anatoly Lyutin : user32: mdi: Fix switch with wParam in WM_SYSCOMMAND processing.
by Alexandre Julliard 16 May '07

16 May '07

Module: wine Branch: master Commit: 86aa0491d621aff4066792840d5f043cbf99fe66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86aa0491d621aff4066792840… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Mon May 14 20:42:32 2007 +0400 user32: mdi: Fix switch with wParam in WM_SYSCOMMAND processing. --- dlls/user32/mdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 976bce3..05448d2 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1498,7 +1498,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, return 0; case WM_SYSCOMMAND: - switch( wParam ) + switch (wParam & 0xfff0) { case SC_MOVE: if( ci->hwndChildMaximized == hwnd )

1 0

Dmitry Timoshkov : user32: Remove duplicated code.
by Alexandre Julliard 16 May '07

16 May '07

Module: wine Branch: master Commit: 4de936e18132ce8fb364d974d9065673fb9c4d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de936e18132ce8fb364d974d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 16 18:29:19 2007 +0900 user32: Remove duplicated code. --- dlls/user32/menu.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index b57b0dc..cf74381 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3729,9 +3729,6 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, return FALSE; } - if (flags & MF_POPUP) /* Set the MF_POPUP flag on the popup-menu */ - (MENU_GetMenu((HMENU)id))->wFlags |= MF_POPUP; - item->hCheckBit = item->hUnCheckBit = 0; return TRUE; }

1 0

Misha Koshelev : msi: automation: Condense a few loops.
by Alexandre Julliard 16 May '07

16 May '07

Module: wine Branch: master Commit: 187f856e46bd0bb675355de907e2502257b8f846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=187f856e46bd0bb675355de90… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Tue May 15 19:29:04 2007 -0500 msi: automation: Condense a few loops. --- dlls/msi/automation.c | 38 ++++++++++++++++---------------------- 1 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 1030f96..762f20c 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -575,24 +575,21 @@ static HRESULT WINAPI RecordImpl_Invoke( break; case DISPID_RECORD_STRINGDATA: - if (wFlags & DISPATCH_PROPERTYGET) { + if (wFlags & DISPATCH_PROPERTYGET) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; V_VT(pVarResult) = VT_BSTR; V_BSTR(pVarResult) = NULL; - ret = MsiRecordGetStringW(This->msiHandle, V_I4(&varg0), NULL, &dwLen); - if (ret == ERROR_SUCCESS) + if ((ret = MsiRecordGetStringW(This->msiHandle, V_I4(&varg0), NULL, &dwLen)) == ERROR_SUCCESS) { - szString = msi_alloc((++dwLen)*sizeof(WCHAR)); - if (szString) - { - if ((ret = MsiRecordGetStringW(This->msiHandle, V_I4(&varg0), szString, &dwLen)) == ERROR_SUCCESS) - V_BSTR(pVarResult) = SysAllocString(szString); - msi_free(szString); - } + if (!(szString = msi_alloc((++dwLen)*sizeof(WCHAR)))) + ERR("Out of memory\n"); + else if ((ret = MsiRecordGetStringW(This->msiHandle, V_I4(&varg0), szString, &dwLen)) == ERROR_SUCCESS) + V_BSTR(pVarResult) = SysAllocString(szString); + msi_free(szString); } if (ret != ERROR_SUCCESS) - ERR("MsiRecordGetString returned %d\n", ret); + ERR("MsiRecordGetString returned %d\n", ret); } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; @@ -886,24 +883,21 @@ static HRESULT WINAPI SessionImpl_Invoke( break; case DISPID_SESSION_PROPERTY: - if (wFlags & DISPATCH_PROPERTYGET) { + if (wFlags & DISPATCH_PROPERTYGET) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; V_VT(pVarResult) = VT_BSTR; V_BSTR(pVarResult) = NULL; - ret = MsiGetPropertyW(This->msiHandle, V_BSTR(&varg0), NULL, &dwLen); - if (ret == ERROR_SUCCESS) + if ((ret = MsiGetPropertyW(This->msiHandle, V_BSTR(&varg0), NULL, &dwLen)) == ERROR_SUCCESS) { - szString = msi_alloc((++dwLen)*sizeof(WCHAR)); - if (szString) - { - if ((ret = MsiGetPropertyW(This->msiHandle, V_BSTR(&varg0), szString, &dwLen)) == ERROR_SUCCESS) - V_BSTR(pVarResult) = SysAllocString(szString); - msi_free(szString); - } + if (!(szString = msi_alloc((++dwLen)*sizeof(WCHAR)))) + ERR("Out of memory\n"); + else if ((ret = MsiGetPropertyW(This->msiHandle, V_BSTR(&varg0), szString, &dwLen)) == ERROR_SUCCESS) + V_BSTR(pVarResult) = SysAllocString(szString); + msi_free(szString); } if (ret != ERROR_SUCCESS) - ERR("MsiGetProperty returned %d\n", ret); + ERR("MsiGetProperty returned %d\n", ret); } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr;

1 0

Misha Koshelev : msi/tests: automation: Remove unnecessary if (SUCCEEDED(hr )) statements.
by Alexandre Julliard 16 May '07

16 May '07

Module: wine Branch: master Commit: 0eaf8bc164628f516492737b23ce805749fead27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eaf8bc164628f516492737b2… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Tue May 15 19:29:12 2007 -0500 msi/tests: automation: Remove unnecessary if (SUCCEEDED(hr)) statements. --- dlls/msi/tests/automation.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 7a616a3..69d7723 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1387,8 +1387,7 @@ static void test_Session(IDispatch *pSession) /* Session::EvaluateCondition */ hr = Session_EvaluateCondition(pSession, szOneStateFalse, &myint); ok(SUCCEEDED(hr), "Session_EvaluateCondition failed, hresult 0x%08x\n", hr); - if (SUCCEEDED(hr)) - ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); + ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); hr = Session_EvaluateCondition(pSession, szOneStateTrue, &myint); ok(SUCCEEDED(hr), "Session_EvaluateCondition failed, hresult 0x%08x\n", hr); @@ -1404,8 +1403,7 @@ static void test_Session(IDispatch *pSession) /* Session::EvaluateCondition */ hr = Session_EvaluateCondition(pSession, szOneActionFalse, &myint); ok(SUCCEEDED(hr), "Session_EvaluateCondition failed, hresult 0x%08x\n", hr); - if (SUCCEEDED(hr)) - ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); + ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); hr = Session_EvaluateCondition(pSession, szOneActionTrue, &myint); ok(SUCCEEDED(hr), "Session_EvaluateCondition failed, hresult 0x%08x\n", hr); @@ -1463,8 +1461,7 @@ static void test_Installer_RegistryValue(void) /* Does our key exist? Shouldn't; check with all three possible value parameter types */ hr = Installer_RegistryValueE(HKEY_CURRENT_USER, szKey, &bRet); ok(SUCCEEDED(hr), "Installer_RegistryValueE failed, hresult 0x%08x\n", hr); - if (SUCCEEDED(hr)) - ok(!bRet, "Registry key expected to not exist, but Installer_RegistryValue claims it does\n"); + ok(!bRet, "Registry key expected to not exist, but Installer_RegistryValue claims it does\n"); memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, NULL, szString); @@ -1502,8 +1499,7 @@ static void test_Installer_RegistryValue(void) bRet = FALSE; hr = Installer_RegistryValueE(HKEY_CURRENT_USER, szKey, &bRet); ok(SUCCEEDED(hr), "Installer_RegistryValueE failed, hresult 0x%08x\n", hr); - if (SUCCEEDED(hr)) - ok(bRet, "Registry key expected to exist, but Installer_RegistryValue claims it does not\n"); + ok(bRet, "Registry key expected to exist, but Installer_RegistryValue claims it does not\n"); memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, NULL, szString); @@ -1885,8 +1881,7 @@ static void test_Installer(void) /* Installer::ProductState for our product code, which should not be installed */ hr = Installer_ProductState(szProductCode, &iValue); ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr); - if (SUCCEEDED(hr)) - ok(iValue == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_UNKNOWN); + ok(iValue == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_UNKNOWN); /* Installer::RelatedProducts for our upgrade code, should not find anything */ hr = Installer_RelatedProducts(szUpgradeCode, &pStringList);

1 0

Dan Hipschman : widl: Write some structures to the type format string on the fly.
by Alexandre Julliard 16 May '07

16 May '07

Module: wine Branch: master Commit: 52ca3ebadac7eb1132fce34e750d4d96b48e052c URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ca3ebadac7eb1132fce34e7… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue May 15 17:48:20 2007 -0700 widl: Write some structures to the type format string on the fly. --- dlls/rpcrt4/tests/server.c | 9 ++ dlls/rpcrt4/tests/server.idl | 14 ++++ tools/widl/typegen.c | 167 +++++++++++++++++++++--------------------- 3 files changed, 106 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52ca3ebadac7eb1132fce…

1 0

Andrew Riedi : wined3d: Add hardware cursor support.
by Alexandre Julliard 16 May '07

16 May '07

Module: wine Branch: master Commit: a9c2e15cf6e4ddf8c71c89d0100b7680e0fdf357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c2e15cf6e4ddf8c71c89d01… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Mon May 14 15:37:53 2007 -0700 wined3d: Add hardware cursor support. --- dlls/wined3d/device.c | 169 +++++++++++++++++++++++++++------------- dlls/wined3d/directx.c | 4 +- dlls/wined3d/wined3d_private.h | 2 + include/wine/wined3d_types.h | 3 + 4 files changed, 121 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9c2e15cf6e4ddf8c71c8…

1 0

Rolf Kalbermatter : advapi32: Add access flags to service handle data.
by Alexandre Julliard 16 May '07

16 May '07

Module: wine Branch: master Commit: fef82e74b6f41575f8e44326c1c596e08ada2190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef82e74b6f41575f8e44326c… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Mon May 14 23:31:41 2007 +0200 advapi32: Add access flags to service handle data. --- dlls/advapi32/service.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 587b9ae..e1d1065 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -110,12 +110,14 @@ struct sc_manager /* service control manager handle */ { struct sc_handle hdr; HKEY hkey; /* handle to services database in the registry */ + DWORD dwAccess; }; struct sc_service /* service handle */ { struct sc_handle hdr; HKEY hkey; /* handle to service entry in the registry (under hkey) */ + DWORD dwAccess; struct sc_manager *scm; /* pointer to SCM handle */ WCHAR name[1]; }; @@ -1055,6 +1057,7 @@ SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, if (r!=ERROR_SUCCESS) goto error; + manager->dwAccess = dwDesiredAccess; TRACE("returning %p\n", manager); return (SC_HANDLE) &manager->hdr; @@ -1233,6 +1236,7 @@ SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return NULL; strcpyW( hsvc->name, lpServiceName ); hsvc->hkey = hKey; + hsvc->dwAccess = dwDesiredAccess; /* add reference to SCM handle */ hscm->hdr.ref_count++;

1 0

Andrew Talbot : oledlg: Exclude unused header.
by Alexandre Julliard 16 May '07

16 May '07

Module: wine Branch: master Commit: ddb0a188bed322f0beffd79a89eb3baedf499ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb0a188bed322f0beffd79a8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 15 22:28:28 2007 +0100 oledlg: Exclude unused header. --- dlls/oledlg/insobjdlg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index e945a07..8ddf227 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "winreg.h" #include "winternl.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "winuser.h"

1 0

Andrew Talbot : oleaut32: Exclude unused headers.
by Alexandre Julliard 16 May '07

16 May '07

Module: wine Branch: master Commit: 048a5d6fc51dd9c1fc8df32e998618c1cda7227e URL: http://source.winehq.org/git/wine.git/?a=commit;h=048a5d6fc51dd9c1fc8df32e9… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 15 22:28:25 2007 +0100 oleaut32: Exclude unused headers. --- dlls/oleaut32/dispatch.c | 2 -- dlls/oleaut32/tmarshal.c | 1 - dlls/oleaut32/typelib16.c | 1 - dlls/oleaut32/typelib2.c | 1 - 4 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 707428f..8ab1c5e 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -34,8 +34,6 @@ #include "objbase.h" #include "oleauto.h" #include "winerror.h" -#include "winreg.h" -#include "winnls.h" /* for PRIMARYLANGID */ #include "wine/debug.h" diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 3783aca..94c6e58 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -40,7 +40,6 @@ #include "winnls.h" #include "winreg.h" #include "winuser.h" -#include "excpt.h" #include "ole2.h" #include "propidl.h" /* for LPSAFEARRAY_User* functions */ diff --git a/dlls/oleaut32/typelib16.c b/dlls/oleaut32/typelib16.c index 69b4f65..a010f7d 100644 --- a/dlls/oleaut32/typelib16.c +++ b/dlls/oleaut32/typelib16.c @@ -33,7 +33,6 @@ #include "winerror.h" #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winreg.h" #include "winuser.h" diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 5f3ead1..874d8a8 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -43,7 +43,6 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "winreg.h" #include "winuser.h" #include "wine/unicode.h"

1 0