July 2007 - Wine-Commits - list.winehq.org

Paul Vriens : advapi32/service: Be a bit more consistent.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 9b8e9516ab83a7ed12ea84eafde351d1460cea5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8e9516ab83a7ed12ea84eaf… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jul 30 11:42:15 2007 +0200 advapi32/service: Be a bit more consistent. --- dlls/advapi32/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index bab2479..458653c 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2283,7 +2283,7 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName, /* Last error will be set by GetServiceDisplayNameW and must be preserved */ GLE = GetLastError(); - if (!lpDisplayName && lpcchBuffer && !ret && (GLE == ERROR_INSUFFICIENT_BUFFER)) + if (!lpDisplayName && *lpcchBuffer && !ret && (GLE == ERROR_INSUFFICIENT_BUFFER)) { /* Request for buffersize. * @@ -2291,7 +2291,7 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName, */ size = sizeW * 2; } - else if (lpDisplayName && lpcchBuffer && !ret) + else if (lpDisplayName && *lpcchBuffer && !ret) { /* Request for displayname. *

1 0

Paul Vriens : advapi32/service: Test for too small buffer.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 641e645276ae3c6a27915c2c728739b224fc56dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=641e645276ae3c6a27915c2c7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Jul 29 22:29:11 2007 +0200 advapi32/service: Test for too small buffer. --- dlls/advapi32/tests/service.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 2291236..13eec9f 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -569,6 +569,19 @@ static void test_get_displayname(void) "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); } + /* Buffer is too small */ + SetLastError(0xdeadbeef); + tempsize = displaysize; + displaysize = (tempsize / 2); + ret = GetServiceDisplayNameA(scm_handle, servicename, displayname, &displaysize); + ok(!ret, "Expected failure\n"); + todo_wine + { + ok(displaysize == tempsize, "Expected the needed buffersize\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + } + /* Get the displayname */ SetLastError(0xdeadbeef); ret = GetServiceDisplayNameA(scm_handle, servicename, displayname, &displaysize);

1 0

Paul Vriens : advapi32/service: Fix GetServiceDisplayNameA for service with no displayname.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 9c2d8c73aac775b1b98e378879bef815bc1ee430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2d8c73aac775b1b98e37887… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Jul 29 22:42:17 2007 +0200 advapi32/service: Fix GetServiceDisplayNameA for service with no displayname. --- dlls/advapi32/service.c | 27 ++++++++++++++++++++++++++- dlls/advapi32/tests/service.c | 9 --------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f0592fb..bab2479 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2353,7 +2353,32 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, *lpcchBuffer = (size / sizeof(WCHAR)) - 1; } else if (ret == ERROR_FILE_NOT_FOUND) - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); + { + HKEY hkey; + + if (!RegOpenKeyW(hscm->hkey, lpServiceName, &hkey)) + { + INT len = lstrlenW(lpServiceName); + BOOL r = FALSE; + + if ((*lpcchBuffer <= len) || (!lpDisplayName && *lpcchBuffer)) + SetLastError(ERROR_INSUFFICIENT_BUFFER); + else if (lpDisplayName && *lpcchBuffer) + { + /* No displayname, but the service exists and the buffer + * is big enough. We should return the servicename. + */ + lstrcpyW(lpDisplayName, lpServiceName); + r = TRUE; + } + + *lpcchBuffer = len; + RegCloseKey(hkey); + return r; + } + else + SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); + } else SetLastError(ret); return FALSE; diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 13eec9f..a4eae98 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -561,13 +561,10 @@ static void test_get_displayname(void) displaysize = -1; ret = GetServiceDisplayNameA(scm_handle, servicename, NULL, &displaysize); ok(!ret, "Expected failure\n"); - todo_wine - { ok(displaysize == lstrlen(servicename) * 2, "Expected the displaysize to be twice the size of the servicename\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - } /* Buffer is too small */ SetLastError(0xdeadbeef); @@ -575,18 +572,13 @@ static void test_get_displayname(void) displaysize = (tempsize / 2); ret = GetServiceDisplayNameA(scm_handle, servicename, displayname, &displaysize); ok(!ret, "Expected failure\n"); - todo_wine - { ok(displaysize == tempsize, "Expected the needed buffersize\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - } /* Get the displayname */ SetLastError(0xdeadbeef); ret = GetServiceDisplayNameA(scm_handle, servicename, displayname, &displaysize); - todo_wine - { ok(ret, "Expected success\n"); ok(!lstrcmpi(displayname, servicename), "Expected displayname to be %s, got %s\n", servicename, displayname); @@ -594,7 +586,6 @@ static void test_get_displayname(void) GetLastError() == ERROR_IO_PENDING /* W2K */ || GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); - } /* Delete the service */ ret = DeleteService(svc_handle);

1 0

Paul Vriens : advapi32/service: Set correct error when the service doesn' t exist.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 07af2fe2b5b55e64bc1e2d225e7bb59430b0f101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07af2fe2b5b55e64bc1e2d225… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jul 27 21:47:43 2007 +0200 advapi32/service: Set correct error when the service doesn't exist. --- dlls/advapi32/service.c | 2 ++ dlls/advapi32/tests/service.c | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 0c37313..f0592fb 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2352,6 +2352,8 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, SetLastError(ERROR_INSUFFICIENT_BUFFER); *lpcchBuffer = (size / sizeof(WCHAR)) - 1; } + else if (ret == ERROR_FILE_NOT_FOUND) + SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); else SetLastError(ret); return FALSE; diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 8fc1af9..2291236 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -420,7 +420,6 @@ static void test_get_displayname(void) displaysize = -1; ret = GetServiceDisplayNameA(scm_handle, deadbeef, NULL, &displaysize); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError());

1 0

Alexandre Julliard : libwine: Fix lookup of 16-bit dll placeholders. Remove some old compatibility code.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 44639b326b618a63ee61474d9a7471f871cad0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44639b326b618a63ee61474d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 14:44:05 2007 +0200 libwine: Fix lookup of 16-bit dll placeholders. Remove some old compatibility code. --- libs/wine/loader.c | 35 +++++++++-------------------------- 1 files changed, 9 insertions(+), 26 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index c7fcece..9f69a1c 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -64,6 +64,7 @@ struct dll_path_context char *buffer; /* buffer used for storing path names */ char *name; /* start of file name part in buffer (including leading slash) */ int namelen; /* length of file name without .so extension */ + int win16; /* 16-bit dll search */ }; #define MAX_DLLS 100 @@ -170,7 +171,7 @@ static char *next_dll_path( struct dll_path_context *context ) switch(index) { case 0: /* try programs dir for .exe files */ - if (namelen > 4 && !memcmp( context->name + namelen - 4, ".exe", 4 )) + if (!context->win16 && namelen > 4 && !memcmp( context->name + namelen - 4, ".exe", 4 )) { path = prepend( path, context->name, namelen - 4 ); path = prepend( path, "/programs", sizeof("/programs") - 1 ); @@ -181,7 +182,7 @@ static char *next_dll_path( struct dll_path_context *context ) /* fall through */ case 1: /* try dlls dir with subdir prefix */ if (namelen > 4 && !memcmp( context->name + namelen - 4, ".dll", 4 )) namelen -= 4; - path = prepend( path, context->name, namelen ); + if (!context->win16) path = prepend( path, context->name, namelen ); path = prepend( path, "/dlls", sizeof("/dlls") - 1 ); path = prepend( path, build_dir, strlen(build_dir) ); return path; @@ -196,15 +197,17 @@ static char *next_dll_path( struct dll_path_context *context ) /* get a filename from the first entry in the dll path */ -static char *first_dll_path( const char *name, const char *ext, struct dll_path_context *context ) +static char *first_dll_path( const char *name, int win16, struct dll_path_context *context ) { char *p; int namelen = strlen( name ); + const char *ext = win16 ? "16" : ".so"; context->buffer = malloc( dll_path_maxlen + 2 * namelen + strlen(ext) + 3 ); context->index = build_dir ? 0 : 2; /* if no build dir skip all the build dir magic cases */ context->name = context->buffer + dll_path_maxlen + namelen + 1; context->namelen = namelen + 1; + context->win16 = win16; /* store the name at the end of the buffer, followed by extension */ p = context->name; @@ -232,7 +235,7 @@ static void *dlopen_dll( const char *name, char *error, int errorsize, void *ret = NULL; *exists = 0; - for (path = first_dll_path( name, ".so", &context ); path; path = next_dll_path( &context )) + for (path = first_dll_path( name, 0, &context ); path; path = next_dll_path( &context )) { if (!test_only && (ret = wine_dlopen( path, RTLD_NOW, error, errorsize ))) break; if ((*exists = file_exists( path ))) break; /* exists but cannot be loaded, return the error */ @@ -562,7 +565,7 @@ int wine_dll_get_owner( const char *name, char *buffer, int size, int *exists ) *exists = 0; - for (path = first_dll_path( name, "16", &context ); path; path = next_dll_path( &context )) + for (path = first_dll_path( name, 1, &context ); path; path = next_dll_path( &context )) { int fd = open( path, O_RDONLY ); if (fd != -1) @@ -577,26 +580,6 @@ int wine_dll_get_owner( const char *name, char *buffer, int size, int *exists ) } } free_dll_path( &context ); - if (ret != -1) return ret; - - /* try old method too for backwards compatibility; will be removed later on */ - for (path = first_dll_path( name, ".so", &context ); path; path = next_dll_path( &context )) - { - int res = readlink( path, buffer, size ); - if (res != -1) /* got a symlink */ - { - *exists = 1; - if (res < 4 || res >= size) break; - buffer[res] = 0; - if (strchr( buffer, '/' )) break; /* contains a path, not valid */ - if (strcmp( buffer + res - 3, ".so" )) break; /* does not end in .so, not valid */ - buffer[res - 3] = 0; /* remove .so */ - ret = 0; - break; - } - if ((*exists = file_exists( path ))) break; /* exists but not a symlink, return the error */ - } - free_dll_path( &context ); return ret; } @@ -648,7 +631,7 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) mmap_init(); debug_init(); - for (path = first_dll_path( "ntdll.dll", ".so", &context ); path; path = next_dll_path( &context )) + for (path = first_dll_path( "ntdll.dll", 0, &context ); path; path = next_dll_path( &context )) { if ((ntdll = wine_dlopen( path, RTLD_NOW, error, error_size ))) {

1 0

Alexandre Julliard : ntdll: Fix a compiler warning.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: b67b66d7b32f3d7014da190d9a449b378331f13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67b66d7b32f3d7014da190d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 14:46:09 2007 +0200 ntdll: Fix a compiler warning. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 44647da..09516f6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1679,7 +1679,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (!contains_path( libname )) { NTSTATUS status; - WCHAR *fullname; + WCHAR *fullname = NULL; if ((*pwm = find_basename_module( libname )) != NULL) goto found;

1 0

Alexandre Julliard : wined3d: Fix compiler warning.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: af4b9bb85c62c05d38fdab9042c8d8ce49b99a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4b9bb85c62c05d38fdab904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 14:14:01 2007 +0200 wined3d: Fix compiler warning. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c3e63d9..75a2d26 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3440,8 +3440,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; unsigned int pow2Width, pow2Height; const GlPixelFormatDesc *glDesc; - const StaticPixelFormatDesc *tableEntry = getFormatDescEntry(This->resource.format, &GLINFO_LOCATION, &glDesc); + getFormatDescEntry(This->resource.format, &GLINFO_LOCATION, &glDesc); /* Setup some glformat defaults */ This->glDescription.glFormat = glDesc->glFormat; This->glDescription.glFormatInternal = glDesc->glInternal;

1 0

Michael Stefaniuc : winefile: Use SendMessageW instead of SNDMSG.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: dc75f8a07a130f842550a3fc66f119810fdbced7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc75f8a07a130f842550a3fc6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jul 29 22:37:38 2007 +0200 winefile: Use SendMessageW instead of SNDMSG. --- programs/winefile/winefile.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.h b/programs/winefile/winefile.h index e059792..55d9421 100644 --- a/programs/winefile/winefile.h +++ b/programs/winefile/winefile.h @@ -104,7 +104,7 @@ enum IMAGE { #endif #define FRM_CALC_CLIENT 0xBF83 -#define Frame_CalcFrameClient(hwnd, prt) (SNDMSG(hwnd, FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt)) +#define Frame_CalcFrameClient(hwnd, prt) (SendMessageW(hwnd, FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt)) typedef struct {

1 0

Michael Stefaniuc : ntdll: Match the definition of NtQueryEvent() with its declaration.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 3fd2f084db4bbc76400269a9fc7a2b964d07ed69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd2f084db4bbc76400269a9f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jul 29 22:37:28 2007 +0200 ntdll: Match the definition of NtQueryEvent() with its declaration. --- dlls/ntdll/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 04b3cd4..004095b 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -297,7 +297,7 @@ NTSTATUS WINAPI NtPulseEvent( HANDLE handle, PULONG PulseCount ) */ NTSTATUS WINAPI NtQueryEvent ( IN HANDLE EventHandle, - IN UINT EventInformationClass, + IN EVENT_INFORMATION_CLASS EventInformationClass, OUT PVOID EventInformation, IN ULONG EventInformationLength, OUT PULONG ReturnLength)

1 0

Jacek Caban : mshtml: Added mshtml.tlb.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 021d06a45fe8802e0c5d04444ceb46e697036866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=021d06a45fe8802e0c5d04444… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 29 21:25:14 2007 +0200 mshtml: Added mshtml.tlb. --- .gitignore | 2 ++ Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/mshtml.tlb/Makefile.in | 13 +++++++++++++ dlls/mshtml.tlb/mshtml.tlb.spec | 1 + dlls/mshtml.tlb/mshtml_tlb.idl | 19 +++++++++++++++++++ dlls/mshtml.tlb/rsrc.rc | 23 +++++++++++++++++++++++ 9 files changed, 65 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index c9f97b9..369e0c1 100644 --- a/.gitignore +++ b/.gitignore @@ -329,6 +329,8 @@ dlls/mscms/tests/testlist.c dlls/mscms/version.res dlls/msdmo/libmsdmo.def dlls/msdmo/rsrc.res +dlls/mshtml.tlb/mshtml_tlb.tlb +dlls/mshtml.tlb/rsrc.res dlls/mshtml/libmshtml.def dlls/mshtml/nsiface.h dlls/mshtml/rsrc.res diff --git a/Makefile.in b/Makefile.in index 9e422ae..48cba1a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -289,6 +289,7 @@ ALL_MAKEFILES = \ dlls/msdmo/Makefile \ dlls/msftedit/Makefile \ dlls/msg711.acm/Makefile \ + dlls/mshtml.tlb/Makefile \ dlls/mshtml/Makefile \ dlls/mshtml/tests/Makefile \ dlls/msi/Makefile \ @@ -649,6 +650,7 @@ dlls/mscoree/Makefile: dlls/mscoree/Makefile.in dlls/Makedll.rules dlls/msdmo/Makefile: dlls/msdmo/Makefile.in dlls/Makedll.rules dlls/msftedit/Makefile: dlls/msftedit/Makefile.in dlls/Makedll.rules dlls/msg711.acm/Makefile: dlls/msg711.acm/Makefile.in dlls/Makedll.rules +dlls/mshtml.tlb/Makefile: dlls/mshtml.tlb/Makefile.in dlls/Makedll.rules dlls/mshtml/Makefile: dlls/mshtml/Makefile.in dlls/Makedll.rules dlls/mshtml/tests/Makefile: dlls/mshtml/tests/Makefile.in dlls/Maketest.rules dlls/msi/Makefile: dlls/msi/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index a2e9390..5d2e9a4 100755 --- a/configure +++ b/configure @@ -20468,6 +20468,8 @@ ac_config_files="$ac_config_files dlls/msftedit/Makefile" ac_config_files="$ac_config_files dlls/msg711.acm/Makefile" +ac_config_files="$ac_config_files dlls/mshtml.tlb/Makefile" + ac_config_files="$ac_config_files dlls/mshtml/Makefile" ac_config_files="$ac_config_files dlls/mshtml/tests/Makefile" @@ -21593,6 +21595,7 @@ do "dlls/msdmo/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msdmo/Makefile" ;; "dlls/msftedit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msftedit/Makefile" ;; "dlls/msg711.acm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msg711.acm/Makefile" ;; + "dlls/mshtml.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mshtml.tlb/Makefile" ;; "dlls/mshtml/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mshtml/Makefile" ;; "dlls/mshtml/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mshtml/tests/Makefile" ;; "dlls/msi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msi/Makefile" ;; diff --git a/configure.ac b/configure.ac index a03f097..ec728e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1686,6 +1686,7 @@ AC_CONFIG_FILES([dlls/mscoree/Makefile]) AC_CONFIG_FILES([dlls/msdmo/Makefile]) AC_CONFIG_FILES([dlls/msftedit/Makefile]) AC_CONFIG_FILES([dlls/msg711.acm/Makefile]) +AC_CONFIG_FILES([dlls/mshtml.tlb/Makefile]) AC_CONFIG_FILES([dlls/mshtml/Makefile]) AC_CONFIG_FILES([dlls/mshtml/tests/Makefile]) AC_CONFIG_FILES([dlls/msi/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 30fcd3e..39e3c65 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -115,6 +115,7 @@ BASEDIRS = \ msftedit \ msg711.acm \ mshtml \ + mshtml.tlb \ msi \ msimg32 \ msisys.ocx \ diff --git a/dlls/mshtml.tlb/Makefile.in b/dlls/mshtml.tlb/Makefile.in new file mode 100644 index 0000000..d141263 --- /dev/null +++ b/dlls/mshtml.tlb/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mshtml.tlb +IMPORTS = kernel32 + +RC_SRCS = rsrc.rc +IDL_TLB_SRCS = mshtml_tlb.idl + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/mshtml.tlb/mshtml.tlb.spec b/dlls/mshtml.tlb/mshtml.tlb.spec new file mode 100644 index 0000000..b427b29 --- /dev/null +++ b/dlls/mshtml.tlb/mshtml.tlb.spec @@ -0,0 +1 @@ +# no exported entry points diff --git a/dlls/mshtml.tlb/mshtml_tlb.idl b/dlls/mshtml.tlb/mshtml_tlb.idl new file mode 100644 index 0000000..371cdaf --- /dev/null +++ b/dlls/mshtml.tlb/mshtml_tlb.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "mshtml.idl" diff --git a/dlls/mshtml.tlb/rsrc.rc b/dlls/mshtml.tlb/rsrc.rc new file mode 100644 index 0000000..af530e8 --- /dev/null +++ b/dlls/mshtml.tlb/rsrc.rc @@ -0,0 +1,23 @@ +/* + * Copyright 2004 Mike McCormack for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 TYPELIB LOADONCALL DISCARDABLE mshtml_tlb.tlb

1 0