February 2008 - Wine-Commits

Rob Shearman : mshtml: Don't use typeof as it's not portable.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 26ad119d3a2620ff8ce6dadc9f8d4c09804e9aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ad119d3a2620ff8ce6dadc9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 26 11:13:07 2008 +0000 mshtml: Don't use typeof as it's not portable. --- dlls/mshtml/install.c | 4 ++-- dlls/mshtml/main.c | 4 ++-- dlls/mshtml/nsembed.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 1f5777d..fd36290 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -133,7 +133,7 @@ static BOOL install_cab(LPCWSTR file_name) { HMODULE advpack; char install_dir[MAX_PATH]; - typeof(ExtractFilesA) *pExtractFilesA; + HRESULT (WINAPI *pExtractFilesA)(LPCSTR,LPCSTR,DWORD,LPCSTR,LPVOID,DWORD); LPSTR file_name_a; DWORD res, len; HRESULT hres; @@ -158,7 +158,7 @@ static BOOL install_cab(LPCWSTR file_name) } advpack = LoadLibraryW(wszAdvpack); - pExtractFilesA = (typeof(ExtractFilesA)*)GetProcAddress(advpack, "ExtractFiles"); + pExtractFilesA = (void *)GetProcAddress(advpack, "ExtractFiles"); len = WideCharToMultiByte(CP_ACP, 0, file_name, -1, NULL, 0, NULL, NULL); file_name_a = heap_alloc(len); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 74fba4c..1c81c36 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -369,7 +369,7 @@ static HRESULT register_server(BOOL do_register) { HRESULT hres; HMODULE hAdvpack; - typeof(RegInstallA) *pRegInstall; + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); STRTABLEA strtable; STRENTRYA pse[35]; static CLSID const *clsids[35]; @@ -427,7 +427,7 @@ static HRESULT register_server(BOOL do_register) strtable.pse = pse; hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstall"); + pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 5563c6f..08d13af 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -166,7 +166,7 @@ static BOOL load_xpcom(const PRUnichar *gre_path) } #define NS_DLSYM(func) \ - func = (typeof(func))GetProcAddress(hXPCOM, #func); \ + func = (void *)GetProcAddress(hXPCOM, #func); \ if(!func) \ ERR("Could not GetProcAddress(" #func ") failed\n")

1 0

Rob Shearman : shdocvw: Don't use typeof as it's not portable.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 5ef04604f0c857683bf0b63dee85cf8d43efe061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef04604f0c857683bf0b63de… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 26 11:13:14 2008 +0000 shdocvw: Don't use typeof as it's not portable. --- dlls/shdocvw/factory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index c8bb511..3a4ba9f 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -175,14 +175,14 @@ HRESULT register_class_object(BOOL do_reg) static HRESULT reg_install(LPCSTR section, STRTABLEA *strtable) { - typeof(RegInstallA) *pRegInstall; + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); HMODULE hadvpack; HRESULT hres; static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; hadvpack = LoadLibraryW(advpackW); - pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hadvpack, "RegInstall"); + pRegInstall = (void *)GetProcAddress(hadvpack, "RegInstall"); hres = pRegInstall(shdocvw_hinstance, section, strtable);

1 0

Rob Shearman : msimtf: Don't use typeof as it's not portable.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: e658b79965d93a447b3b3e27752123070db9339d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e658b79965d93a447b3b3e277… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 26 11:13:04 2008 +0000 msimtf: Don't use typeof as it's not portable. --- dlls/msimtf/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index 89034e7..da675aa 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -164,7 +164,7 @@ static HRESULT register_server(BOOL doregister) { HRESULT hres; HMODULE hAdvpack; - typeof(RegInstallA) *pRegInstall; + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); STRTABLEA strtable; STRENTRYA pse[1]; static CLSID const *clsids[34]; @@ -186,7 +186,7 @@ static HRESULT register_server(BOOL doregister) strtable.pse = pse; hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstall"); + pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); hres = pRegInstall(msimtf_instance, doregister ? "RegisterDll" : "UnregisterDll", &strtable);

1 0

Rob Shearman : itss: Don't use typeof as it's not portable.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: da1d3fb455cb1c272cbfe43689c59ec5c60918b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1d3fb455cb1c272cbfe4368… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 26 11:13:00 2008 +0000 itss: Don't use typeof as it's not portable. --- dlls/itss/itss.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 711d116..3bab9e1 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -392,7 +392,7 @@ static HRESULT register_server(BOOL do_register) { HRESULT hres; HMODULE hAdvpack; - typeof(RegInstallA) *pRegInstall; + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); STRTABLEA strtable; STRENTRYA pse[4]; static CLSID const *clsids[4]; @@ -417,7 +417,7 @@ static HRESULT register_server(BOOL do_register) } hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstall"); + pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable);

1 0

Rob Shearman : dsound: Don't use typeof as it's not portable.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: fc1b62bd7ddf19364e1d2e44d8528a11967999d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1b62bd7ddf19364e1d2e44d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 26 11:12:54 2008 +0000 dsound: Don't use typeof as it's not portable. --- dlls/dsound/regsvr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/regsvr.c b/dlls/dsound/regsvr.c index 1609910..514cfc9 100644 --- a/dlls/dsound/regsvr.c +++ b/dlls/dsound/regsvr.c @@ -34,8 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); -static typeof(RegDeleteTreeW) * pRegDeleteTreeW; -static typeof(RegDeleteTreeA) * pRegDeleteTreeA; +static LSTATUS (WINAPI *pRegDeleteTreeW)(HKEY,LPCWSTR); +static LSTATUS (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); /* * Near the bottom of this file are the exported DllRegisterServer and @@ -516,8 +516,8 @@ HRESULT WINAPI DllUnregisterServer(void) HMODULE advapi32 = GetModuleHandleA("advapi32"); if (!advapi32) return E_FAIL; - pRegDeleteTreeA = (typeof(RegDeleteTreeA)*) GetProcAddress(advapi32, "RegDeleteTreeA"); - pRegDeleteTreeW = (typeof(RegDeleteTreeW)*) GetProcAddress(advapi32, "RegDeleteTreeW"); + pRegDeleteTreeA = (void *) GetProcAddress(advapi32, "RegDeleteTreeA"); + pRegDeleteTreeW = (void *) GetProcAddress(advapi32, "RegDeleteTreeW"); if (!pRegDeleteTreeA || !pRegDeleteTreeW) return E_FAIL; TRACE("\n");

1 0

Rob Shearman : ddraw: Don't use typeof as it's not portable.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: f2b77031c31580531a356342c3c008c0bb4bc3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b77031c31580531a356342c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 26 11:12:50 2008 +0000 ddraw: Don't use typeof as it's not portable. --- dlls/ddraw/regsvr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/regsvr.c b/dlls/ddraw/regsvr.c index eea2985..d851454 100644 --- a/dlls/ddraw/regsvr.c +++ b/dlls/ddraw/regsvr.c @@ -34,8 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -static typeof(RegDeleteTreeW) * pRegDeleteTreeW; -static typeof(RegDeleteTreeA) * pRegDeleteTreeA; +static LSTATUS (WINAPI *pRegDeleteTreeW)(HKEY,LPCWSTR); +static LSTATUS (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); /* * Near the bottom of this file are the exported DllRegisterServer and @@ -433,8 +433,8 @@ HRESULT WINAPI DllUnregisterServer(void) HMODULE advapi32 = GetModuleHandleA("advapi32"); if (!advapi32) return E_FAIL; - pRegDeleteTreeA = (typeof(RegDeleteTreeA)*) GetProcAddress(advapi32, "RegDeleteTreeA"); - pRegDeleteTreeW = (typeof(RegDeleteTreeW)*) GetProcAddress(advapi32, "RegDeleteTreeW"); + pRegDeleteTreeA = (void *) GetProcAddress(advapi32, "RegDeleteTreeA"); + pRegDeleteTreeW = (void *) GetProcAddress(advapi32, "RegDeleteTreeW"); if (!pRegDeleteTreeA || !pRegDeleteTreeW) return E_FAIL; TRACE("\n");

1 0

Paul Vriens : msi/tests: Skip tests that contain functions that are not available.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 6b37543adc206dc5824067482c8f9582c4921c92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b37543adc206dc5824067482… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Feb 26 14:23:29 2008 +0100 msi/tests: Skip tests that contain functions that are not available. --- dlls/msi/tests/install.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1f2be2c..704d531 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2022,6 +2022,12 @@ static void test_publish(void) static const CHAR subkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"; + if (!pMsiQueryComponentStateA) + { + skip("MsiQueryComponentStateA is not available\n"); + return; + } + get_date_str(date); GetTempPath(MAX_PATH, temp); @@ -2904,6 +2910,12 @@ static void test_publishsourcelist(void) CHAR path[MAX_PATH]; CHAR prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; + if (!pMsiSourceListEnumSourcesA || !pMsiSourceListGetInfoA) + { + skip("MsiSourceListEnumSourcesA and/or MsiSourceListGetInfoA are not available\n"); + return; + } + CreateDirectoryA("msitest", NULL); create_file("msitest\\maximus", 500);

1 0

Paul Vriens : msi/tests: Skip tests for functions that are not available.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: ecf8c5af3672aeb2613113b5982f545f4fe28e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf8c5af3672aeb2613113b59… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Feb 26 13:52:41 2008 +0100 msi/tests: Skip tests for functions that are not available. --- dlls/msi/tests/source.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index f4f1f6d..ab8e8c7 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -972,6 +972,12 @@ static void test_MsiSourceListEnumSources(void) HKEY url, net, source; DWORD size; + if (!pMsiSourceListEnumSourcesA) + { + skip("MsiSourceListEnumSourcesA is not available\n"); + return; + } + create_test_guid(prodcode, prod_squashed); get_user_sid(&usersid); @@ -1564,6 +1570,12 @@ static void test_MsiSourceListSetInfo(void) LONG res; UINT r; + if (!pMsiSourceListSetInfoA) + { + skip("MsiSourceListSetInfoA is not available\n"); + return; + } + create_test_guid(prodcode, prod_squashed); get_user_sid(&usersid); @@ -1964,6 +1976,12 @@ static void test_MsiSourceListAddMediaDisk(void) LONG res; UINT r; + if (!pMsiSourceListAddMediaDiskA) + { + skip("MsiSourceListAddMediaDiskA is not available\n"); + return; + } + create_test_guid(prodcode, prod_squashed); get_user_sid(&usersid);

1 0

Paul Vriens : msi/tests: Make sure tests will run on Win9x and NT.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: e7937f3cd53cbd7b5bb7fb761808ef2bf63a5506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7937f3cd53cbd7b5bb7fb761… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Feb 26 13:37:18 2008 +0100 msi/tests: Make sure tests will run on Win9x and NT. --- dlls/msi/tests/source.c | 294 ++++++++++++++++++++++++----------------------- 1 files changed, 152 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7937f3cd53cbd7b5bb7f…

1 0

Paul Vriens : gdi32/tests: Skip a test as it crashes on Vista.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 7911424f9d146e1dc7726eb27316714a18c5dc4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7911424f9d146e1dc7726eb27… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Feb 26 17:16:56 2008 +0100 gdi32/tests: Skip a test as it crashes on Vista. --- dlls/gdi32/tests/icm.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 5cd4bcf..9d89828 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -91,9 +91,13 @@ static void test_GetICMProfileW( HDC dc ) ret = GetICMProfileW( dc, NULL, NULL ); ok( !ret, "GetICMProfileW succeeded\n" ); - size = MAX_PATH; - ret = GetICMProfileW( dc, &size, NULL ); - ok( ret, "GetICMProfileW failed %d\n", GetLastError() ); + if (0) + { + /* Vista crashes */ + size = MAX_PATH; + ret = GetICMProfileW( dc, &size, NULL ); + ok( ret, "GetICMProfileW failed %d\n", GetLastError() ); + } ret = GetICMProfileW( dc, NULL, filename ); ok( !ret, "GetICMProfileW succeeded\n" );

1 0