February 2007 - Wine-commits

Mike McCormack : msi: Register the typelib.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: 94edfde1d97071b9c4ed3f5ba3e0b043565a2db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94edfde1d97071b9c4ed3f5ba… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Feb 8 17:20:55 2007 +0900 msi: Register the typelib. --- dlls/msi/msi_main.c | 45 +++++++++++++++++++++++++++++++++++++++++---- dlls/msi/msipriv.h | 3 +++ dlls/msi/regsvr.c | 15 +++++++++++++++ 3 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 2d82091..a3dac7f 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winreg.h" #include "shlwapi.h" +#include "oleauto.h" #include "msipriv.h" #include "wine/debug.h" @@ -43,6 +44,8 @@ INSTALLUI_HANDLERW gUIHandlerW = NULL; DWORD gUIFilter = 0; LPVOID gUIContext = NULL; WCHAR gszLogFile[MAX_PATH]; +WCHAR msi_path[MAX_PATH]; +ITypeLib *msi_typelib = NULL; HINSTANCE msi_hInstance; /* @@ -71,6 +74,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, msi_dialog_register_class(); break; case DLL_PROCESS_DETACH: + if (msi_typelib) ITypeLib_Release( msi_typelib ); msi_dialog_unregister_class(); msi_free_handle_table(); break; @@ -78,10 +82,38 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, return TRUE; } -typedef struct tagIClassFactoryImpl { - const IClassFactoryVtbl *lpVtbl; - HRESULT (*create_object)( IUnknown*, LPVOID* ); -} IClassFactoryImpl; +static CRITICAL_SECTION MSI_typelib_cs; +static CRITICAL_SECTION_DEBUG MSI_typelib_cs_debug = +{ + 0, 0, &MSI_typelib_cs, + { &MSI_typelib_cs_debug.ProcessLocksList, + &MSI_typelib_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": MSI_typelib_cs") } +}; +static CRITICAL_SECTION MSI_typelib_cs = { &MSI_typelib_cs_debug, -1, 0, 0, 0, 0 }; + +ITypeLib *get_msi_typelib( LPWSTR *path ) +{ + EnterCriticalSection( &MSI_typelib_cs ); + + if (!msi_typelib) + { + TRACE("loading typelib\n"); + + if (GetModuleFileNameW( msi_hInstance, msi_path, MAX_PATH )) + LoadTypeLib( msi_path, &msi_typelib ); + } + + LeaveCriticalSection( &MSI_typelib_cs ); + + if (path) + *path = msi_path; + + if (msi_typelib) + ITypeLib_AddRef( msi_typelib ); + + return msi_typelib; +} static HRESULT create_msiserver( IUnknown *pOuter, LPVOID *ppObj ) { @@ -89,6 +121,11 @@ static HRESULT create_msiserver( IUnknow return E_FAIL; } +typedef struct tagIClassFactoryImpl { + const IClassFactoryVtbl *lpVtbl; + HRESULT (*create_object)( IUnknown*, LPVOID* ); +} IClassFactoryImpl; + static HRESULT WINAPI MsiCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid,LPVOID *ppobj) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a89da66..b01bb27 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -525,6 +525,9 @@ typedef struct { UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz ); +/* msi server interface */ +extern ITypeLib *get_msi_typelib( LPWSTR *path ); + /* handle functions */ extern void *msihandle2msiinfo(MSIHANDLE handle, UINT type); extern MSIHANDLE alloc_msihandle( MSIOBJECTHDR * ); diff --git a/dlls/msi/regsvr.c b/dlls/msi/regsvr.c index dca44e2..6aa73d1 100644 --- a/dlls/msi/regsvr.c +++ b/dlls/msi/regsvr.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "config.h" #include <stdarg.h> @@ -31,6 +33,7 @@ #include "ole2.h" #include "olectl.h" +#include "oleauto.h" #include "wine/debug.h" @@ -650,6 +653,8 @@ static HRESULT register_msiexec(void) */ HRESULT WINAPI DllRegisterServer(void) { + LPWSTR path = NULL; + ITypeLib *tl; HRESULT hr; TRACE("\n"); @@ -659,6 +664,16 @@ HRESULT WINAPI DllRegisterServer(void) hr = register_interfaces(interface_list); if (SUCCEEDED(hr)) hr = register_msiexec(); + + tl = get_msi_typelib( &path ); + if (tl) + { + hr = RegisterTypeLib( tl, path, NULL ); + ITypeLib_Release( tl ); + } + else + hr = E_FAIL; + return hr; }

1 0

Kevin Koltzau : ntdll: Fix compile errors for Win64.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: 05c0df15e28f3268495d244f994f08bb21e1e095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c0df15e28f3268495d244f9… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 7 22:59:14 2007 -0500 ntdll: Fix compile errors for Win64. --- dlls/ntdll/rtl.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 827cb74..828b4a4 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -930,8 +930,8 @@ PVOID WINAPI RtlDecodePointer( PVOID ptr VOID WINAPI RtlInitializeSListHead(volatile PSLIST_HEADER ListHeader) { TRACE("(%p)\n", ListHeader); -#if _WIN64 - assert(0); +#ifdef _WIN64 + FIXME("stub\n"); #else ListHeader->Alignment = 0; #endif @@ -940,8 +940,9 @@ VOID WINAPI RtlInitializeSListHead(volat USHORT WINAPI RtlQueryDepthSList(volatile PSLIST_HEADER ListHeader) { TRACE("(%p)\n", ListHeader); -#if _WIN64 - assert(0); +#ifdef _WIN64 + FIXME("stub\n"); + return NULL; #else return ListHeader->Depth; #endif @@ -950,8 +951,9 @@ USHORT WINAPI RtlQueryDepthSList(volatil PSLIST_ENTRY WINAPI RtlFirstEntrySList(volatile PSLIST_HEADER ListHeader) { TRACE("(%p)\n", ListHeader); -#if _WIN64 - assert(0); +#ifdef _WIN64 + FIXME("stub\n"); + return NULL; #else return ListHeader->Next.Next; #endif @@ -961,8 +963,9 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushS { SLIST_HEADER oldHeader, newHeader; TRACE("(%p)\n", ListHeader); -#if _WIN64 - assert(0); +#ifdef _WIN64 + FIXME("stub\n"); + return NULL; #else if (ListHeader->Depth == 0) return NULL; @@ -983,8 +986,9 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushEn { SLIST_HEADER oldHeader, newHeader; TRACE("(%p, %p)\n", ListHeader, ListEntry); -#if _WIN64 - assert(0); +#ifdef _WIN64 + FIXME("stub\n"); + return NULL; #else newHeader.Next.Next = ListEntry; do @@ -1005,8 +1009,9 @@ PSLIST_ENTRY WINAPI RtlInterlockedPopEnt SLIST_HEADER oldHeader, newHeader; PSLIST_ENTRY entry; TRACE("(%p)\n", ListHeader); -#if _WIN64 - assert(0); +#ifdef _WIN64 + FIXME("stub\n"); + return NULL; #else do { @@ -1042,8 +1047,9 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushLi { SLIST_HEADER oldHeader, newHeader; TRACE("(%p, %p, %p, %d)\n", ListHeader, FirstEntry, LastEntry, Count); -#if _WIN64 - assert(0); +#ifdef _WIN64 + FIXME("stub\n"); + return NULL; #else newHeader.Next.Next = FirstEntry; do

1 0

Vitaliy Margolen : server: Fix typo. Should be group not owner.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: aa28ed016296bc35c424ffb24cbd2be775b9289d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa28ed016296bc35c424ffb24… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Feb 7 21:11:18 2007 -0700 server: Fix typo. Should be group not owner. --- server/token.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/token.c b/server/token.c index 04d3808..2c00daa 100644 --- a/server/token.c +++ b/server/token.c @@ -316,7 +316,7 @@ static int sd_is_valid( const struct sec if (group) { size_t needed_size = FIELD_OFFSET(SID, SubAuthority[group->SubAuthorityCount]); - if ((sd->owner_len < sizeof(SID)) || (needed_size > sd->owner_len)) + if ((sd->group_len < sizeof(SID)) || (needed_size > sd->group_len)) return FALSE; } offset += sd->group_len;

1 0

Kevin Koltzau : winnt.h: Correct declaration of SLIST_HEADER and SLIST_ENTRY for Win64.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: 5f8659b186a464e0277ca6091c23b10faa03f00d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8659b186a464e0277ca6091… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 7 22:58:52 2007 -0500 winnt.h: Correct declaration of SLIST_HEADER and SLIST_ENTRY for Win64. --- include/winnt.h | 31 +++++++++++++++++++++++++------ 1 files changed, 25 insertions(+), 6 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 1aeb72a..6d3022b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -595,14 +595,33 @@ typedef struct _SINGLE_LIST_ENTRY { #ifdef _WIN64 -typedef struct _SLIST_ENTRY *PSLIST_ENTRY; -typedef struct _SLIST_ENTRY { +typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY *PSLIST_ENTRY; +typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY { PSLIST_ENTRY Next; -}; +} SLIST_ENTRY; -typedef struct _SLIST_HEADER { - ULONGLONG Alignment; - ULONGLONG Region; +typedef union DECLSPEC_ALIGN(16) _SLIST_HEADER { + struct { + ULONGLONG Alignment; + ULONGLONG Region; + }; + struct { + ULONGLONG Depth:16; + ULONGLONG Sequence:9; + ULONGLONG NextEntry:39; + ULONGLONG HeaderType:1; + ULONGLONG Init:1; + ULONGLONG Reserved:59; + ULONGLONG Region:3; + } Header8; + struct { + ULONGLONG Depth:16; + ULONGLONG Sequence:48; + ULONGLONG HeaderType:1; + ULONGLONG Init:1; + ULONGLONG Reserved:2; + ULONGLONG NextEntry:60; + } Header16; } SLIST_HEADER, *PSLIST_HEADER; #else

1 0

Andrew Talbot : winex11.drv: Remove unused items.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: a9446b9c5c9211ec7a6a446e08c7a70116439f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9446b9c5c9211ec7a6a446e0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Feb 7 20:32:15 2007 +0000 winex11.drv: Remove unused items. --- dlls/winex11.drv/clipboard.c | 1 - dlls/winex11.drv/codepage.c | 16 ---------------- 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 157c0e5..cf3aa9a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -287,7 +287,6 @@ static WINE_CLIPFORMAT ClipFormats[] = static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; static const WCHAR wszGIF[] = {'G','I','F',0}; static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; -static const WCHAR wszRICHHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; static const struct { LPCWSTR lpszFormat; diff --git a/dlls/winex11.drv/codepage.c b/dlls/winex11.drv/codepage.c index 7611735..fe918bc 100644 --- a/dlls/winex11.drv/codepage.c +++ b/dlls/winex11.drv/codepage.c @@ -62,13 +62,6 @@ int IsLegalDBCSChar_cp950( BYTE lead, BY ( trail >= (BYTE)0xa1 && trail <= (BYTE)0xfe ) ) ); } -static inline -int IsLegalDBCSChar_euc( BYTE lead, BYTE trail ) -{ - return ( ( lead >= (BYTE)0xa1 && lead <= (BYTE)0xfe ) && - ( trail >= (BYTE)0xa1 && trail <= (BYTE)0xfe ) ); -} - /*********************************************************************** * DBCSCharToXChar2b for cp932/euc @@ -103,15 +96,6 @@ void DBCSCharToXChar2b_cp932( XChar2b* p pch->byte2 = (unsigned char)low; } -static inline -void DBCSCharToXChar2b_euc( XChar2b* pch, BYTE lead, BYTE trail ) -{ - pch->byte1 = lead & (BYTE)0x7f; - pch->byte2 = trail & (BYTE)0x7f; -} - - - static WORD X11DRV_enum_subfont_charset_normal( UINT index ) {

1 0

Francois Gouget : clusapi: Make clusapi.h C++ compatible.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: dc600ac53e5452842f6bab423bb8ba454a61353f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc600ac53e5452842f6bab423… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 7 23:48:29 2007 +0100 clusapi: Make clusapi.h C++ compatible. --- include/clusapi.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/clusapi.h b/include/clusapi.h index 0772b59..ff4577f 100644 --- a/include/clusapi.h +++ b/include/clusapi.h @@ -19,6 +19,14 @@ #ifndef __WINE_CLUSAPI_H #define __WINE_CLUSAPI_H +#ifdef __cplusplus +extern "C" { +#endif + DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_CLUSAPI_H */

1 0

Louis Lenders : user32: Don' t crash if a WM_NCCREATE message is sent with lParam=0.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: 0679dee775fc691a0e6d3272e98027cacd73ea1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0679dee775fc691a0e6d3272e… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Feb 7 19:57:55 2007 +0000 user32: Don't crash if a WM_NCCREATE message is sent with lParam=0. --- dlls/user32/defwnd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 06c10b2..d9af35c 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -772,6 +772,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd switch(msg) { case WM_NCCREATE: + if (lParam) { CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam; /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) @@ -930,6 +931,7 @@ LRESULT WINAPI DefWindowProcW( switch(msg) { case WM_NCCREATE: + if (lParam) { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP)

1 0

Alexandre Julliard : widl: Rename parser states to uppercase to avoid conflicts.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: 6b808bafe043a0f762a686ce995ac3eb996f009c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b808bafe043a0f762a686ce9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 11:55:35 2007 +0100 widl: Rename parser states to uppercase to avoid conflicts. --- tools/widl/parser.l | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index e7caf15..0dfe301 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -31,8 +31,8 @@ hex 0x{hexd}+ uuid {hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12} %x QUOTE -%x attr -%x pp_line +%x ATTR +%x PP_LINE %{ @@ -105,8 +105,8 @@ static UUID* parse_uuid(const char*u) ************************************************************************** */ %% -<INITIAL,attr>^{ws}*\#{ws}* yy_push_state(pp_line); -<pp_line>[^\n]* { +<INITIAL,ATTR>^{ws}*\#{ws}* yy_push_state(PP_LINE); +<PP_LINE>[^\n]* { int lineno; char *cptr, *fname; yy_pop_state(); @@ -125,7 +125,7 @@ static UUID* parse_uuid(const char*u) free( input_name ); input_name = xstrdup(fname); } -<INITIAL,attr>\" yy_push_state(QUOTE); cbufidx = 0; +<INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; <QUOTE>\" { yy_pop_state(); parser_lval.str = get_buffered_cstring(); @@ -135,28 +135,28 @@ static UUID* parse_uuid(const char*u) <QUOTE>\\\" addcchar(yytext[1]); <QUOTE>\\. addcchar('\\'); addcchar(yytext[1]); <QUOTE>. addcchar(yytext[0]); -<INITIAL,attr>\[ yy_push_state(attr); return '['; -<attr>\] yy_pop_state(); return ']'; -<attr>{cident} return attr_token(yytext); -<attr>{uuid} { +<INITIAL,ATTR>\[ yy_push_state(ATTR); return '['; +<ATTR>\] yy_pop_state(); return ']'; +<ATTR>{cident} return attr_token(yytext); +<ATTR>{uuid} { parser_lval.uuid = parse_uuid(yytext); return aUUID; } -<INITIAL,attr>{hex} { +<INITIAL,ATTR>{hex} { parser_lval.num = strtoul(yytext, NULL, 0); return aHEXNUM; } -<INITIAL,attr>{int} { +<INITIAL,ATTR>{int} { parser_lval.num = strtoul(yytext, NULL, 0); return aNUM; } SAFEARRAY{ws}*/\( return tSAFEARRAY; {cident} return kw_token(yytext); -<INITIAL,attr>\n line_number++; -<INITIAL,attr>{ws} -<INITIAL,attr>\<\< return SHL; -<INITIAL,attr>\>\> return SHR; -<INITIAL,attr>. return yytext[0]; +<INITIAL,ATTR>\n line_number++; +<INITIAL,ATTR>{ws} +<INITIAL,ATTR>\<\< return SHL; +<INITIAL,ATTR>\>\> return SHR; +<INITIAL,ATTR>. return yytext[0]; <<EOF>> { if (import_stack_ptr) { pop_import();

1 0

Rob Shearman : oleaut32: Fix a one-off test failure in the tmarshal tests - TYPE_E_LIBNOTREGISTERED is an expected return value .
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 7574fede93495c30b250fc61127aa95d542b6c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7574fede93495c30b250fc611… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 7 19:20:15 2007 +0000 oleaut32: Fix a one-off test failure in the tmarshal tests - TYPE_E_LIBNOTREGISTERED is an expected return value. --- dlls/oleaut32/tests/tmarshal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 833c9dd..99bbf00 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -662,12 +662,13 @@ static IKindaEnumWidget *KindaEnumWidget ITypeLib *pTypeLib; hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); - ok_ole_success(hr, LoadRegTypeLib); if (hr == TYPE_E_LIBNOTREGISTERED) { hr = register_current_module_typelib(&pTypeLib); ok_ole_success(hr, register_current_module_typelib); } + else + ok_ole_success(hr, LoadRegTypeLib); if (SUCCEEDED(hr)) ITypeLib_Release(pTypeLib);

1 0

Paul Vriens : comctl32/tests: Fix typo (Coverity).
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: aaa1c802a4052777f6ba2c108f5b728d76ed2433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa1c802a4052777f6ba2c108… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 20:21:02 2007 +0100 comctl32/tests: Fix typo (Coverity). --- dlls/comctl32/tests/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 4cc6a4e..23497ef 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -33,7 +33,7 @@ static HWND hRebar; static void rebuild_rebar(HWND *hRebar) { - if (hRebar) + if (*hRebar) DestroyWindow(*hRebar); *hRebar = CreateWindow(REBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0,

1 0