January 2009 - Wine-Commits

Stefan Dösinger : ddraw: Add a test for IDirectDrawSurface::GetDC.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 616ea5322647756b9eabb8e1913044b088c9eafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=616ea5322647756b9eabb8e19… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 16 00:01:11 2008 +0100 ddraw: Add a test for IDirectDrawSurface::GetDC. --- dlls/d3d9/surface.c | 5 ++- dlls/ddraw/tests/dsurface.c | 96 +++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 4 +- dlls/wined3d/surface_gdi.c | 4 +- 4 files changed, 104 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index bdede77..394d527 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -263,7 +263,10 @@ static HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, EnterCriticalSection(&d3d9_cs); hr = IWineD3DSurface_ReleaseDC(This->wineD3DSurface, hdc); LeaveCriticalSection(&d3d9_cs); - return hr; + switch(hr) { + case WINEDDERR_NODC: return WINED3DERR_INVALIDCALL; + default: return hr; + } } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 1ad07ec..91669ff 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2764,6 +2764,101 @@ static BOOL can_create_primary_surface(void) return TRUE; } +static void dctest_surf(IDirectDrawSurface *surf, int ddsdver) { + HRESULT hr; + HDC dc, dc2 = (HDC) 0x1234; + DDSURFACEDESC ddsd; + DDSURFACEDESC2 ddsd2; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + memset(&ddsd2, 0, sizeof(ddsd2)); + ddsd2.dwSize = sizeof(ddsd2); + + hr = IDirectDrawSurface_GetDC(surf, &dc); + ok(hr == DD_OK, "IDirectDrawSurface_GetDC failed: 0x%08x\n", hr); + + hr = IDirectDrawSurface_GetDC(surf, &dc2); + ok(hr == DDERR_DCALREADYCREATED, "IDirectDrawSurface_GetDC failed: 0x%08x\n", hr); + ok(dc2 == (HDC) 0x1234, "The failed GetDC call changed the dc: %p\n", dc2); + + hr = IDirectDrawSurface_Lock(surf, NULL, ddsdver == 1 ? &ddsd : ((DDSURFACEDESC *) &ddsd2), 0, NULL); + ok(hr == DDERR_SURFACEBUSY, "IDirectDrawSurface_Lock returned 0x%08x, expected DDERR_ALREADYLOCKED\n", hr); + + hr = IDirectDrawSurface_ReleaseDC(surf, dc); + ok(hr == DD_OK, "IDirectDrawSurface_ReleaseDC failed: 0x%08x\n", hr); + hr = IDirectDrawSurface_ReleaseDC(surf, dc); + ok(hr == DDERR_NODC, "IDirectDrawSurface_ReleaseDC returned 0x%08x, expected DDERR_NODC\n", hr); +} + +static void GetDCTest(void) +{ + DDSURFACEDESC ddsd; + DDSURFACEDESC2 ddsd2; + IDirectDrawSurface *surf; + IDirectDrawSurface2 *surf2; + IDirectDrawSurface4 *surf4; + IDirectDrawSurface7 *surf7; + HRESULT hr; + IDirectDraw2 *dd2; + IDirectDraw4 *dd4; + IDirectDraw7 *dd7; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + memset(&ddsd2, 0, sizeof(ddsd2)); + ddsd2.dwSize = sizeof(ddsd2); + ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd2.dwWidth = 64; + ddsd2.dwHeight = 64; + ddsd2.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surf, NULL); + ok(hr == DD_OK, "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); + dctest_surf(surf, 1); + IDirectDrawSurface_Release(surf); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2); + ok(hr == DD_OK, "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw2_CreateSurface(dd2, &ddsd, &surf, NULL); + ok(hr == DD_OK, "IDirectDraw2_CreateSurface failed: 0x%08x\n", hr); + dctest_surf(surf, 1); + + hr = IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface2, (void **) &surf2); + ok(hr == DD_OK, "IDirectDrawSurface_QueryInterface failed: 0x%08x\n", hr); + dctest_surf((IDirectDrawSurface *) surf2, 1); + + IDirectDrawSurface2_Release(surf2); + IDirectDrawSurface_Release(surf); + IDirectDraw2_Release(dd2); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4); + ok(hr == DD_OK, "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + surf = NULL; + hr = IDirectDraw4_CreateSurface(dd4, &ddsd2, &surf4, NULL); + ok(hr == DD_OK, "IDirectDraw4_CreateSurface failed: 0x%08x\n", hr); + dctest_surf((IDirectDrawSurface *) surf4, 2); + + IDirectDrawSurface4_Release(surf4); + IDirectDraw4_Release(dd4); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(hr == DD_OK, "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + surf = NULL; + hr = IDirectDraw7_CreateSurface(dd7, &ddsd2, &surf7, NULL); + ok(hr == DD_OK, "IDirectDraw7_CreateSurface failed: 0x%08x\n", hr); + dctest_surf((IDirectDrawSurface *) surf7, 2); + + IDirectDrawSurface7_Release(surf7); + IDirectDraw7_Release(dd7); +} + START_TEST(dsurface) { HRESULT ret; @@ -2806,5 +2901,6 @@ START_TEST(dsurface) StructSizeTest(); PaletteTest(); SurfaceCapsTest(); + GetDCTest(); ReleaseDirectDraw(); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3aca76c..2837740 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1527,11 +1527,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC TRACE("(%p)->(%p)\n",This,hDC); if (!(This->Flags & SFLAG_DCINUSE)) - return WINED3DERR_INVALIDCALL; + return WINEDDERR_NODC; if (This->hDC !=hDC) { WARN("Application tries to release an invalid DC(%p), surface dc is %p\n", hDC, This->hDC); - return WINED3DERR_INVALIDCALL; + return WINEDDERR_NODC; } if((This->Flags & SFLAG_PBO) && This->resource.allocatedMemory) { diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index d062458..07a13b5 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -442,11 +442,11 @@ static HRESULT WINAPI IWineGDISurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC TRACE("(%p)->(%p)\n",This,hDC); if (!(This->Flags & SFLAG_DCINUSE)) - return WINED3DERR_INVALIDCALL; + return WINEDDERR_NODC; if (This->hDC !=hDC) { WARN("Application tries to release an invalid DC(%p), surface dc is %p\n", hDC, This->hDC); - return WINED3DERR_INVALIDCALL; + return WINEDDERR_NODC; } /* we locked first, so unlock now */

1 0

Alexandre Julliard : ntdll/tests: Skip large integer tests that crash on 64-bit Vista.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 3cbf55cc1e2063ad4a353444e9ffb9e5dd70a7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cbf55cc1e2063ad4a353444e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 14:52:58 2009 +0100 ntdll/tests: Skip large integer tests that crash on 64-bit Vista. --- dlls/ntdll/tests/large_int.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index bec8ad9..69de5b7 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -286,6 +286,14 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t STRING ansi_str; NTSTATUS result; +#ifdef _WIN64 + if (largeint2str->value >> 32 == 0xffffffff) /* this crashes on 64-bit Vista */ + { + skip( "Value ffffffff%08x broken on 64-bit windows\n", (DWORD)largeint2str->value ); + return; + } +#endif + for (pos = 0; pos < LARGE_STRI_BUFFER_LENGTH; pos++) { expected_str_Buffer[pos] = largeint2str->Buffer[pos]; } /* for */ @@ -367,6 +375,14 @@ static void one_RtlLargeIntegerToChar_test(int test_num, const largeint2str_t *l char dest_str[LARGE_STRI_BUFFER_LENGTH + 1]; ULONGLONG value; +#ifdef _WIN64 + if (largeint2str->value >> 32 == 0xffffffff) /* this crashes on 64-bit Vista */ + { + skip( "Value ffffffff%08x broken on 64-bit windows\n", (DWORD)largeint2str->value ); + return; + } +#endif + memset(dest_str, '-', LARGE_STRI_BUFFER_LENGTH); dest_str[LARGE_STRI_BUFFER_LENGTH] = '\0'; value = largeint2str->value;

1 0

Alexandre Julliard : ntdll: Fix the various structures returned by NtQuerySystemInformation for 64-bit .
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 6a548b1e9d25d3e2e7062d7ef9d7fafa86efc1f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a548b1e9d25d3e2e7062d7ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 14:54:11 2009 +0100 ntdll: Fix the various structures returned by NtQuerySystemInformation for 64-bit. --- dlls/dbghelp/minidump.c | 16 +++---- dlls/kernel32/toolhelp.c | 14 +++--- dlls/ntdll/nt.c | 23 +++++----- dlls/ntdll/process.c | 11 +++-- dlls/ntdll/tests/info.c | 58 +++++++++++++------------- dlls/psapi/psapi_main.c | 6 +- include/winternl.h | 105 +++++++++++++++++++++++----------------------- 7 files changed, 118 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a548b1e9d25d3e2e7062…

1 0

Ge van Geldorp : ole32/tests: Add declarations which are not present in SDK headers.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: f5df4075227d04582bdf184e2d1f6f753f30cf4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5df4075227d04582bdf184e2… Author: Ge van Geldorp <ge(a)gse.nl> Date: Fri Jan 2 21:10:38 2009 +0100 ole32/tests: Add declarations which are not present in SDK headers. --- dlls/ole32/tests/usrmarshal.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 087d5cb..d29c34f 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -34,6 +34,17 @@ unsigned char * __RPC_USER HMETAFILE_UserMarshal(ULONG *, unsigned char *, HMETA unsigned char * __RPC_USER HMETAFILE_UserUnmarshal(ULONG *, unsigned char *, HMETAFILE *); void __RPC_USER HMETAFILE_UserFree(ULONG *, HMETAFILE *); +ULONG __RPC_USER HENHMETAFILE_UserSize(ULONG *, ULONG, HENHMETAFILE *); +unsigned char * __RPC_USER HENHMETAFILE_UserMarshal (ULONG *, unsigned char *, HENHMETAFILE *); +unsigned char * __RPC_USER HENHMETAFILE_UserUnmarshal(ULONG *, unsigned char *, HENHMETAFILE *); +void __RPC_USER HENHMETAFILE_UserFree(ULONG *, HENHMETAFILE *); + +ULONG __RPC_USER HMETAFILEPICT_UserSize(ULONG *, ULONG, HMETAFILEPICT *); +unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal (ULONG *, unsigned char *, HMETAFILEPICT *); +unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *, unsigned char *, HMETAFILEPICT *); +void __RPC_USER HMETAFILEPICT_UserFree(ULONG *, HMETAFILEPICT *); + + static const char cf_marshaled[] = { 0x9, 0x0, 0x0, 0x0,

1 0

Ge van Geldorp : ole32/tests: Work around broken Windows urlmon.dll.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 69c5fca81ae54f340a71d2f2188c4d7e8dabccd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c5fca81ae54f340a71d2f21… Author: Ge van Geldorp <ge(a)gse.nl> Date: Fri Jan 2 21:14:45 2009 +0100 ole32/tests: Work around broken Windows urlmon.dll. --- dlls/ole32/tests/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 714fca8..35f0021 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -931,7 +931,7 @@ static void test_CoFreeUnusedLibraries(void) ok(!is_module_loaded("urlmon.dll"), "urlmon.dll shouldn't be loaded\n"); - hr = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + hr = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void **)&pUnk); if (hr == REGDB_E_CLASSNOTREG) { trace("IE not installed so can't run CoFreeUnusedLibraries test\n");

1 0

Austin English : kernel32: Add heap support for OpenBSD.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: d760ec84107a37a8f6e6c22f5ff3c1e7f406565e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d760ec84107a37a8f6e6c22f5… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jan 2 19:50:04 2009 -0600 kernel32: Add heap support for OpenBSD. --- dlls/kernel32/heap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 3120058..41987a5 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1133,7 +1133,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) SYSTEM_INFO si; #ifdef linux FILE *f; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) unsigned long val; int mib[2]; size_t size_sys; @@ -1205,7 +1205,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) } fclose( f ); } -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) mib[0] = CTL_HW; mib[1] = HW_PHYSMEM; size_sys = sizeof(val);

1 0

Austin English : ntdll: Add file support for OpenBSD.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 87af7e110f7280f14ef77020bade9e8933bf07de URL: http://source.winehq.org/git/wine.git/?a=commit;h=87af7e110f7280f14ef77020b… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jan 2 19:54:45 2009 -0600 ntdll: Add file support for OpenBSD. --- dlls/ntdll/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1d31582..bea4e0f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2012,7 +2012,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC } -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) /* helper for FILE_GetDeviceInfo to hide some platform differences in fstatfs */ static inline void get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename, unsigned int flags ) @@ -2133,7 +2133,7 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; break; } -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__APPLE__) struct statfs stfs; if (fstatfs( fd, &stfs ) < 0)

1 0

Vincent Povirk : start.exe: Don't use the NO_UI flag when invoked with / unix.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: e05951a39dd220e7225765a18f4b28017f5076e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05951a39dd220e7225765a18… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 2 18:25:13 2009 -0600 start.exe: Don't use the NO_UI flag when invoked with /unix. --- programs/start/start.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index d98f215..ed7df03 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -281,6 +281,7 @@ int wmain (int argc, WCHAR *argv[]) sei.lpFile = dos_filename; sei.lpDirectory = parent_directory = get_parent_dir(dos_filename); + sei.fMask &= ~SEE_MASK_FLAG_NO_UI; if (GetBinaryTypeW(sei.lpFile, &binary_type)) { WCHAR *commandline;

1 0

Austin English : mpr: Fix a compiler warning on PowerPC.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 9abde541b5b8bae1b240a3bfe6d6d133fcea59c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abde541b5b8bae1b240a3bfe… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jan 2 22:15:09 2009 -0600 mpr: Fix a compiler warning on PowerPC. --- dlls/mpr/pwcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c index 8e3c191..0ed65b6 100644 --- a/dlls/mpr/pwcache.c +++ b/dlls/mpr/pwcache.c @@ -39,7 +39,7 @@ static inline BYTE hex( BYTE x ) return x + 'A' - 10; } -static inline CHAR ctox( CHAR x ) +static inline signed char ctox( CHAR x ) { if( ( x >= '0' ) && ( x <= '9' ) ) return x - '0'; @@ -282,7 +282,7 @@ UINT WINAPI WNetEnumCachedPasswords( /* decode the value */ for(j=5; j<val_sz; j+=2 ) { - CHAR hi = ctox( val[j] ), lo = ctox( val[j+1] ); + signed char hi = ctox( val[j] ), lo = ctox( val[j+1] ); if( ( hi < 0 ) || ( lo < 0 ) ) break; val[(j-5)/2] = (hi<<4) | lo;

1 0

Rob Shearman : widl: Add aliased types to the typelib for statements in the library block if the typedef itself doesn 't need to be added.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: d2c4ff23057c38547434d893272afd3e4e8a2b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c4ff23057c38547434d8932… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 2 23:47:45 2009 +0000 widl: Add aliased types to the typelib for statements in the library block if the typedef itself doesn't need to be added. Otherwise, the order of types in the typelib will be wrong or types will be missing. --- tools/widl/write_msft.c | 50 +++++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 19 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 01e98a6..fd237dc 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2191,6 +2191,30 @@ static void add_module_typeinfo(msft_typelib_t *typelib, type_t *module) msft_typeinfo->typeinfo->size = idx; } +static void add_type_typeinfo(msft_typelib_t *typelib, type_t *type) +{ + switch (type->kind) { + case TKIND_INTERFACE: + case TKIND_DISPATCH: + add_interface_typeinfo(typelib, type); + break; + case TKIND_RECORD: + add_structure_typeinfo(typelib, type); + break; + case TKIND_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TKIND_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + case TKIND_PRIMITIVE: + break; + default: + error("add_entry: unhandled type %d for %s\n", type->kind, type->name); + break; + } +} + static void add_entry(msft_typelib_t *typelib, const statement_t *stmt) { switch(stmt->type) { @@ -2206,9 +2230,14 @@ static void add_entry(msft_typelib_t *typelib, const statement_t *stmt) case STMT_TYPEDEF: { const type_list_t *type_entry = stmt->u.type_list; - for (; type_entry; type_entry = type_entry->next) + for (; type_entry; type_entry = type_entry->next) { + /* if the type is public then add the typedef, otherwise attempt + * to add the aliased type */ if (is_attr(type_entry->type->attrs, ATTR_PUBLIC)) add_typedef_typeinfo(typelib, type_entry->type); + else + add_type_typeinfo(typelib, type_entry->type->orig); + } break; } case STMT_MODULE: @@ -2218,24 +2247,7 @@ static void add_entry(msft_typelib_t *typelib, const statement_t *stmt) case STMT_TYPEREF: { type_t *type = stmt->u.type; - switch (type->kind) { - case TKIND_INTERFACE: - case TKIND_DISPATCH: - add_interface_typeinfo(typelib, type); - break; - case TKIND_RECORD: - add_structure_typeinfo(typelib, type); - break; - case TKIND_ENUM: - add_enum_typeinfo(typelib, type); - break; - case TKIND_COCLASS: - add_coclass_typeinfo(typelib, type); - break; - default: - error("add_entry: unhandled type %d\n", type->kind); - break; - } + add_type_typeinfo(typelib, type); break; } }

1 0