December 2007 - Wine-commits

Kirill K. Smirnov : winhelp: There are files without Phrases or Phrases40 compression, add support for them.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: 7f2c72498a12f7811c7320e34ea3ba6c1e373fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2c72498a12f7811c7320e34… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Tue Dec 4 03:22:05 2007 +0300 winhelp: There are files without Phrases or Phrases40 compression, add support for them. --- programs/winhelp/hlpfile.c | 56 +++++++++++++++++++++++-------------------- programs/winhelp/hlpfile.h | 3 +- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 7eeec1b..f9013e6 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -412,11 +412,13 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigned off { HLPFILE_PAGE* page; BYTE* title; - UINT titlesize; + UINT titlesize, blocksize, datalen; char* ptr; HLPFILE_MACRO*macro; - title = buf + GET_UINT(buf, 0x10); + blocksize = GET_UINT(buf, 0); + datalen = GET_UINT(buf, 0x10); + title = buf + datalen; if (title > end) {WINE_WARN("page2\n"); return FALSE;}; titlesize = GET_UINT(buf, 4); @@ -424,23 +426,22 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigned off if (!page) return FALSE; page->lpszTitle = (char*)page + sizeof(HLPFILE_PAGE); - if (hlpfile->hasPhrases) + if (titlesize > blocksize - datalen) { - HLPFILE_Uncompress2(title, end, (BYTE*)page->lpszTitle, (BYTE*)page->lpszTitle + titlesize); - } - else - { - if (GET_UINT(buf, 0x4) > GET_UINT(buf, 0) - GET_UINT(buf, 0x10)) - { - /* need to decompress */ - HLPFILE_Uncompress3(page->lpszTitle, page->lpszTitle + titlesize, - title, end); - } + /* need to decompress */ + if (hlpfile->hasPhrases) + HLPFILE_Uncompress2(title, end, (BYTE*)page->lpszTitle, (BYTE*)page->lpszTitle + titlesize); + else if (hlpfile->hasPhrases40) + HLPFILE_Uncompress3(page->lpszTitle, page->lpszTitle + titlesize, title, end); else { + WINE_FIXME("Text size is too long, splitting\n"); + titlesize = blocksize - datalen; memcpy(page->lpszTitle, title, titlesize); } } + else + memcpy(page->lpszTitle, title, titlesize); page->lpszTitle[titlesize] = '\0'; @@ -888,7 +889,7 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne UINT textsize; BYTE *format, *format_end; char *text, *text_base, *text_end; - long size; + long size, blocksize, datalen; unsigned short bits; unsigned nc, ncol = 1; @@ -900,25 +901,28 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne if (buf + 0x19 > end) {WINE_WARN("header too small\n"); return FALSE;}; + blocksize = GET_UINT(buf, 0); size = GET_UINT(buf, 0x4); + datalen = GET_UINT(buf, 0x10); text = text_base = HeapAlloc(GetProcessHeap(), 0, size); if (!text) return FALSE; - if (hlpfile->hasPhrases) + if (size > blocksize - datalen) { - HLPFILE_Uncompress2(buf + GET_UINT(buf, 0x10), end, (BYTE*)text, (BYTE*)text + size); - } - else - { - if (GET_UINT(buf, 0x4) > GET_UINT(buf, 0) - GET_UINT(buf, 0x10)) - { - /* block is compressed */ - HLPFILE_Uncompress3(text, text + size, buf + GET_UINT(buf, 0x10), end); - } + /* need to decompress */ + if (hlpfile->hasPhrases) + HLPFILE_Uncompress2(buf + datalen, end, (BYTE*)text, (BYTE*)text + size); + else if (hlpfile->hasPhrases40) + HLPFILE_Uncompress3(text, text + size, buf + datalen, end); else { - text = (char*)buf + GET_UINT(buf, 0x10); + WINE_FIXME("Text size is too long, splitting\n"); + size = blocksize - datalen; + memcpy(text, buf + datalen, size); } } + else + memcpy(text, buf + datalen, size); + text_end = text + size; format = buf + 0x15; @@ -1694,7 +1698,7 @@ static BOOL HLPFILE_Uncompress_Phrases40(HLPFILE* hlpfile) else HLPFILE_UncompressLZ77(buf_phs + 9, end_phs, (BYTE*)phrases.buffer); - hlpfile->hasPhrases = FALSE; + hlpfile->hasPhrases40 = TRUE; return TRUE; } diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 69cd604..c7e643e 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -137,7 +137,8 @@ typedef struct tagHlpFileFile unsigned short tbsize; /* topic block size */ unsigned short dsize; /* decompress size */ unsigned short compressed; - unsigned hasPhrases; /* Phrases or PhrIndex/PhrImage */ + unsigned hasPhrases; /* file has |Phrases */ + unsigned hasPhrases40; /* file has |PhrIndex/|PhrImage */ unsigned numBmps; HBITMAP* bmps;

1 0

Dmitry Timoshkov : server: Make fd_poll_event static.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: f2213dd23f93d6e3534b7ca3481f0ccf21f4487a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2213dd23f93d6e3534b7ca34… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 3 17:47:31 2007 +0800 server: Make fd_poll_event static. --- server/fd.c | 11 +++++------ server/file.h | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/server/fd.c b/server/fd.c index 4bfb3e1..74c09ce 100644 --- a/server/fd.c +++ b/server/fd.c @@ -428,6 +428,11 @@ static struct fd **freelist; /* list of free entries in the array static int get_next_timeout(void); +static inline void fd_poll_event( struct fd *fd, int event ) +{ + fd->fd_ops->poll_event( fd, event ); +} + #ifdef USE_EPOLL static int epoll_fd = -1; @@ -1689,12 +1694,6 @@ int fd_close_handle( struct object *obj, struct process *process, obj_handle_t h return (!current || current->process == process); } -/* callback for event happening in the main poll() loop */ -void fd_poll_event( struct fd *fd, int event ) -{ - return fd->fd_ops->poll_event( fd, event ); -} - /* check if events are pending and if yes return which one(s) */ int check_fd_events( struct fd *fd, int events ) { diff --git a/server/file.h b/server/file.h index 1c659be..e444007 100644 --- a/server/file.h +++ b/server/file.h @@ -65,7 +65,6 @@ extern int get_unix_fd( struct fd *fd ); extern int is_same_file_fd( struct fd *fd1, struct fd *fd2 ); extern int is_fd_removable( struct fd *fd ); extern int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); -extern void fd_poll_event( struct fd *fd, int event ); extern int check_fd_events( struct fd *fd, int events ); extern void set_fd_events( struct fd *fd, int events ); extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, int shared, int wait );

1 0

Dmitry Timoshkov : user32: Make sure the desktop window is created before mode enumeration.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: 718e71300c2a0422f5174094887944a24753b0a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718e71300c2a0422f51740948… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 3 17:48:19 2007 +0800 user32: Make sure the desktop window is created before mode enumeration. --- dlls/user32/sysparams.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index dba5dd6..2bf8127 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3092,5 +3092,8 @@ BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum, BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, LPDEVMODEW lpDevMode, DWORD dwFlags) { + /* make sure the desktop window is created before mode enumeration */ + GetDesktopWindow(); + return USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags); }

1 0

Dmitry Timoshkov : explorer: Store current display mode in the registry on startup.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: e5488648056dba83d420aff88f27c67b51852211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5488648056dba83d420aff88… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 3 22:14:35 2007 +0800 explorer: Store current display mode in the registry on startup. --- programs/explorer/desktop.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4b1d041..e67f680 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -38,7 +38,7 @@ static BOOL using_root; /* window procedure for the desktop window */ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp ) { - WINE_TRACE( "got msg %x wp %lx lp %lx\n", message, wp, lp ); + WINE_TRACE( "got msg %04x wp %lx lp %lx\n", message, wp, lp ); switch(message) { @@ -123,6 +123,7 @@ static void initialize_display_settings( HWND desktop ) GUID guid; LPWSTR guid_str; ATOM guid_atom; + DEVMODEW dmW; UuidCreate( &guid ); UuidToStringW( &guid, &guid_str ); @@ -132,6 +133,16 @@ static void initialize_display_settings( HWND desktop ) SetPropW( desktop, display_device_guid_propW, ULongToHandle(guid_atom) ); RpcStringFreeW( &guid_str ); + + /* Store current display mode in the registry */ + if (EnumDisplaySettingsExW( NULL, ENUM_CURRENT_SETTINGS, &dmW, 0 )) + { + WINE_TRACE( "Current display mode %ux%u %u bpp %u Hz\n", dmW.dmPelsWidth, + dmW.dmPelsHeight, dmW.dmBitsPerPel, dmW.dmDisplayFrequency ); + ChangeDisplaySettingsExW( NULL, &dmW, 0, + CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, + NULL ); + } } /* main desktop management function */

1 0

Rob Shearman : rpcrt4: Set the destination pointer in PointerUnmarshall before calling the referenced type 's unmarshalling routine.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: 2a9fae756564fff3ec13922d360031ff2ce8a4e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a9fae756564fff3ec13922d3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 4 13:22:56 2007 +0000 rpcrt4: Set the destination pointer in PointerUnmarshall before calling the referenced type's unmarshalling routine. When a pointer that is dereferenced is encountered then this can result in a stale pointer (i.e. the one that is marshalled into the buffer for the embedded pointer unmarshalling case) being used instead of the one that was intended. --- dlls/rpcrt4/ndr_marshall.c | 17 +++++------------ dlls/rpcrt4/tests/server.c | 1 - 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 84a1990..781143a 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1020,8 +1020,8 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, * unmarshalling routine for the benefit of the deref code below */ if (!fMustAlloc) { if (pSrcPointer) { - TRACE("pSrcPointer = %p\n", pSrcPointer); - base_ptr_val = pSrcPointer; + TRACE("setting *pPointer to %p\n", pSrcPointer); + *pPointer = base_ptr_val = pSrcPointer; } else fMustAlloc = TRUE; } @@ -1030,11 +1030,9 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, /* the memory in a stub is never initialised, so we have to work out here * whether we have to initialise it so we can use the optimisation of * setting the pointer to the buffer, if possible, or set fMustAlloc to - * TRUE. As there is no space used in the buffer for pointers when using - * reference pointers we must allocate memory in this case */ - if (type == RPC_FC_RP || attr & RPC_FC_P_DEREF) { + * TRUE. */ + if (attr & RPC_FC_P_DEREF) { fMustAlloc = TRUE; - base_ptr_val = NULL; } else { base_ptr_val = NULL; *current_ptr = NULL; @@ -1044,6 +1042,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (attr & RPC_FC_P_DEREF) { if (fMustAlloc) { base_ptr_val = NdrAllocate(pStubMsg, sizeof(void *)); + *pPointer = base_ptr_val; current_ptr = (unsigned char **)base_ptr_val; } else current_ptr = *(unsigned char***)current_ptr; @@ -1057,12 +1056,6 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (type == RPC_FC_FP) NdrFullPointerInsertRefId(pStubMsg->FullPtrXlatTables, pointer_id, base_ptr_val); - - /* this must be done after the call to the unmarshaller, since when we are - * unmarshalling reference pointers on the server side *pPointer will be - * pointing to valid data */ - if ((!fMustAlloc || attr & RPC_FC_P_DEREF) && base_ptr_val) - *pPointer = base_ptr_val; } TRACE("pointer=%p\n", *pPointer); diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 538f5a4..433657b 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -877,7 +877,6 @@ pointer_tests(void) name.name = buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, name.size); get_name(&name); ok(name.name == buffer, "[in,out] pointer should have stayed as %p but instead changed to %p\n", name.name, buffer); - todo_wine ok(!strcmp(name.name, "Jeremy Wh"), "name didn't unmarshall properly, expected \"Jeremy Wh\", but got \"%s\"\n", name.name); HeapFree(GetProcessHeap(), 0, name.name);

1 0

Rob Shearman : rpcrt4: Add tests for a pointer to a conformant strings.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: c866b06806c081e751919eb7c7ce6d0d02f5b522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c866b06806c081e751919eb7c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Dec 4 13:23:09 2007 +0000 rpcrt4: Add tests for a pointer to a conformant strings. --- dlls/rpcrt4/tests/ndr_marshall.c | 108 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index c935d08..25448e9 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1107,6 +1107,113 @@ todo_wine { HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); } +static void test_conformant_string(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + void *ptr; + unsigned char *mem, *mem_orig; + char memsrc[] = "This is a test string"; + + static const unsigned char fmtstr_conf_str[] = + { + 0x11, 0x8, /* FC_RP [simple_pointer] */ + 0x22, /* FC_C_CSTRING */ + 0x5c, /* FC_PAD */ + }; + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = fmtstr_conf_str; + + NdrClientInitializeNew( + &RpcMessage, + &StubMsg, + &StubDesc, + 0); + + StubMsg.BufferLength = 0; + NdrPointerBufferSize( &StubMsg, + (unsigned char *)memsrc, + fmtstr_conf_str ); + ok(StubMsg.BufferLength >= sizeof(memsrc) + 12, "length %d\n", StubMsg.BufferLength); + + /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + ptr = NdrPointerMarshall( &StubMsg, (unsigned char *)memsrc, fmtstr_conf_str ); + ok(ptr == NULL, "ret %p\n", ptr); + ok(StubMsg.Buffer - StubMsg.BufferStart == sizeof(memsrc) + 12, "Buffer %p Start %p len %d\n", + StubMsg.Buffer, StubMsg.BufferStart, 12 + sizeof(memsrc)); + ok(!memcmp(StubMsg.BufferStart + 12, memsrc, sizeof(memsrc)), "incorrectly marshaled\n"); + + StubMsg.Buffer = StubMsg.BufferStart; + StubMsg.MemorySize = 0; + mem = NULL; + + /* Client */ + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc)); + NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); + ok(mem == mem_orig, "mem not alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 1); +todo_wine { + ok(mem == mem_orig, "mem not alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); +} + + my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); + ok(my_free_called == 1, "free called %d\n", my_free_called); + + /* Server */ + my_alloc_called = 0; + StubMsg.IsClient = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); +todo_wine { + ok(mem == StubMsg.BufferStart + 12, "mem not pointing at buffer\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); +} + my_alloc_called = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 1); +todo_wine { + ok(mem == StubMsg.BufferStart + 12, "mem not pointing at buffer\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); +} + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); +todo_wine { + ok(mem == StubMsg.BufferStart + 12, "mem not pointing at buffer\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); +} + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 1); +todo_wine { + ok(mem == StubMsg.BufferStart + 12, "mem not pointing at buffer\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); +} + + HeapFree(GetProcessHeap(), 0, mem_orig); + HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); +} + START_TEST( ndr_marshall ) { test_ndr_simple_type(); @@ -1116,4 +1223,5 @@ START_TEST( ndr_marshall ) test_client_init(); test_ndr_allocate(); test_conformant_array(); + test_conformant_string(); }

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian resource.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: c1b35491066d3487bf130c4bc3494c1fb662aca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b35491066d3487bf130c4bc… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Dec 4 15:06:48 2007 +0100 winecfg: Update Norwegian resource. --- programs/winecfg/No.rc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index b7751bf..d6e7cf7 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -163,8 +163,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Valg av driver ",IDC_STATIC,8,4,244,195 LTEXT "Velg en lyddriver ved � krysse av i boksen ved siden av den du vil bruke. Deaktiver lyd ved � ikke velge noen. Det anbefales ikke � velge flere drivere. Driverens oppsett kan endres ved � h�yreklikke p� den.",IDC_STATIC,15,20,227,30 - CONTROL "Enheter",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 - PUSHBUTTON "Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 + CONTROL "Enheter",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 + PUSHBUTTON "&Test",IDC_AUDIO_TEST,170,50,59,14 + PUSHBUTTON "Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

1 0

Jacek Caban : mshtml: Initialize HTMLElement in the beginning of constructors.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: a9e77575b36bbae8116b805826f864d6384ea949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e77575b36bbae8116b80582… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 4 13:37:00 2007 +0100 mshtml: Initialize HTMLElement in the beginning of constructors. --- dlls/mshtml/htmlanchor.c | 2 ++ dlls/mshtml/htmlbody.c | 4 ++-- dlls/mshtml/htmlelem.c | 13 +++++++++---- dlls/mshtml/htmlinput.c | 2 ++ dlls/mshtml/htmloption.c | 3 +++ dlls/mshtml/htmlselect.c | 2 ++ dlls/mshtml/htmltable.c | 2 ++ dlls/mshtml/htmltextarea.c | 2 ++ dlls/mshtml/htmltextcont.c | 2 ++ dlls/mshtml/mshtml_private.h | 1 + 10 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 1fe43d0..61ab6cd 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -486,6 +486,8 @@ HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement *nselem) { HTMLAnchorElement *ret = mshtml_alloc(sizeof(HTMLAnchorElement)); + HTMLElement_Init(&ret->element); + ret->lpHTMLAnchorElementVtbl = &HTMLAnchorElementVtbl; ret->element.node.vtbl = &HTMLAnchorElementImplVtbl; diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index b1b6c4c..4f8e093 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -501,11 +501,11 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) TRACE("(%p)->(%p)\n", ret, nselem); + HTMLTextContainer_Init(&ret->textcont); + ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl; ret->textcont.element.node.vtbl = &HTMLBodyElementImplVtbl; - HTMLTextContainer_Init(&ret->textcont); - ConnectionPointContainer_Init(&ret->cp_container, (IUnknown*)HTMLBODY(ret)); ConnectionPoint_Init(&ret->cp_propnotif, &ret->cp_container, &IID_IPropertyNotifySink); ConnectionPoint_Init(&ret->cp_txtcontevents, &ret->cp_container, &DIID_HTMLTextContainerEvents); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cbe9bfd..bf0ba33 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1280,6 +1280,14 @@ static const NodeImplVtbl HTMLElementImplVtbl = { HTMLElement_destructor }; +void HTMLElement_Init(HTMLElement *This) +{ + This->node.vtbl = &HTMLElementImplVtbl; + This->lpHTMLElementVtbl = &HTMLElementVtbl; + + HTMLElement2_Init(This); +} + HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) { nsIDOMHTMLElement *nselem; @@ -1322,16 +1330,13 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) if(!ret) { ret = mshtml_alloc(sizeof(HTMLElement)); - ret->node.vtbl = &HTMLElementImplVtbl; + HTMLElement_Init(ret); } nsAString_Finish(&class_name_str); - ret->lpHTMLElementVtbl = &HTMLElementVtbl; ret->nselem = nselem; - HTMLElement2_Init(ret); - return ret; } diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 5fc5dd3..7f6c8c6 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1062,6 +1062,8 @@ HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement *nselem) HTMLInputElement *ret = mshtml_alloc(sizeof(HTMLInputElement)); nsresult nsres; + HTMLElement_Init(&ret->element); + ret->lpHTMLInputElementVtbl = &HTMLInputElementVtbl; ret->element.node.vtbl = &HTMLInputElementImplVtbl; diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index f800fed..579725e 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -340,6 +340,8 @@ HTMLElement *HTMLOptionElement_Create(nsIDOMHTMLElement *nselem) HTMLOptionElement *ret = mshtml_alloc(sizeof(HTMLOptionElement)); nsresult nsres; + HTMLElement_Init(&ret->element); + ret->lpHTMLOptionElementVtbl = &HTMLOptionElementVtbl; ret->element.node.vtbl = &HTMLOptionElementImplVtbl; @@ -511,6 +513,7 @@ HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLDocument *doc) HTMLOptionElementFactory *ret; ret = mshtml_alloc(sizeof(HTMLOptionElementFactory)); + ret->lpHTMLOptionElementFactoryVtbl = &HTMLOptionElementFactoryVtbl; ret->ref = 1; ret->doc = doc; diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index d1ae86d..6395bc3 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -429,6 +429,8 @@ HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement *nselem) HTMLSelectElement *ret = mshtml_alloc(sizeof(HTMLSelectElement)); nsresult nsres; + HTMLElement_Init(&ret->element); + ret->lpHTMLSelectElementVtbl = &HTMLSelectElementVtbl; ret->element.node.vtbl = &HTMLSelectElementImplVtbl; diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 373ffac..d0b0a28 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -550,6 +550,8 @@ HTMLElement *HTMLTable_Create(nsIDOMHTMLElement *nselem) { HTMLTable *ret = mshtml_alloc(sizeof(HTMLTable)); + HTMLElement_Init(&ret->element); + ret->element.node.vtbl = &HTMLTableImplVtbl; ret->lpHTMLTableVtbl = &HTMLTableVtbl; diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index c5d8287..fbb7df8 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -409,6 +409,8 @@ HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement *nselem) HTMLTextAreaElement *ret = mshtml_alloc(sizeof(HTMLTextAreaElement)); nsresult nsres; + HTMLElement_Init(&ret->element); + ret->lpHTMLTextAreaElementVtbl = &HTMLTextAreaElementVtbl; ret->element.node.vtbl = &HTMLTextAreaElementImplVtbl; diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index 07c0081..8076646 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -213,5 +213,7 @@ static const IHTMLTextContainerVtbl HTMLTextContainerVtbl = { void HTMLTextContainer_Init(HTMLTextContainer *This) { + HTMLElement_Init(&This->element); + This->lpHTMLTextContainerVtbl = &HTMLTextContainerVtbl; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b284d86..198486f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -445,6 +445,7 @@ HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLTable_Create(nsIDOMHTMLElement*); HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement*); +void HTMLElement_Init(HTMLElement*); void HTMLElement2_Init(HTMLElement*); void HTMLTextContainer_Init(HTMLTextContainer*);

1 0

Jacek Caban : mshtml: Added IConnectionPointContainer iface to all HTMLElement objects.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: 2bcd1f0e9eca56fe462a99784c2ac8c6df73499a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcd1f0e9eca56fe462a99784… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 4 13:37:21 2007 +0100 mshtml: Added IConnectionPointContainer iface to all HTMLElement objects. --- dlls/mshtml/htmlbody.c | 11 +++-------- dlls/mshtml/htmlelem.c | 7 +++++++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 4f8e093..5077638 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -40,7 +40,6 @@ typedef struct { const IHTMLBodyElementVtbl *lpHTMLBodyElementVtbl; - ConnectionPointContainer cp_container; ConnectionPoint cp_propnotif; ConnectionPoint cp_txtcontevents; @@ -464,9 +463,6 @@ static HRESULT HTMLBodyElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLTextContainer, riid)) { TRACE("(%p)->(IID_IHTMLTextContainer %p)\n", &This->textcont, ppv); *ppv = HTMLTEXTCONT(&This->textcont); - }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { - TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); - *ppv = CONPTCONT(&This->cp_container); } if(*ppv) { @@ -481,7 +477,6 @@ static void HTMLBodyElement_destructor(HTMLDOMNode *iface) { HTMLBodyElement *This = HTMLBODY_NODE_THIS(iface); - ConnectionPointContainer_Destroy(&This->cp_container); nsIDOMHTMLBodyElement_Release(This->nsbody); HTMLElement_destructor(&This->textcont.element.node); @@ -506,9 +501,9 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl; ret->textcont.element.node.vtbl = &HTMLBodyElementImplVtbl; - ConnectionPointContainer_Init(&ret->cp_container, (IUnknown*)HTMLBODY(ret)); - ConnectionPoint_Init(&ret->cp_propnotif, &ret->cp_container, &IID_IPropertyNotifySink); - ConnectionPoint_Init(&ret->cp_txtcontevents, &ret->cp_container, &DIID_HTMLTextContainerEvents); + ConnectionPoint_Init(&ret->cp_propnotif, &ret->textcont.element.cp_container, &IID_IPropertyNotifySink); + ConnectionPoint_Init(&ret->cp_txtcontevents, &ret->textcont.element.cp_container, + &DIID_HTMLTextContainerEvents); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLBodyElement, (void**)&ret->nsbody); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index bf0ba33..e160175 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1255,6 +1255,9 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLElement2, riid)) { TRACE("(%p)->(IID_IHTMLElement2 %p)\n", This, ppv); *ppv = HTMLELEM2(This); + }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { + TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); + *ppv = CONPTCONT(&This->cp_container); } if(*ppv) { @@ -1269,6 +1272,8 @@ void HTMLElement_destructor(HTMLDOMNode *iface) { HTMLElement *This = HTMLELEM_NODE_THIS(iface); + ConnectionPointContainer_Destroy(&This->cp_container); + if(This->nselem) nsIDOMHTMLElement_Release(This->nselem); @@ -1285,6 +1290,8 @@ void HTMLElement_Init(HTMLElement *This) This->node.vtbl = &HTMLElementImplVtbl; This->lpHTMLElementVtbl = &HTMLElementVtbl; + ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)HTMLELEM(This)); + HTMLElement2_Init(This); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 198486f..b2bba95 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -285,6 +285,7 @@ struct HTMLDOMNode { typedef struct { HTMLDOMNode node; + ConnectionPointContainer cp_container; const IHTMLElementVtbl *lpHTMLElementVtbl; const IHTMLElement2Vtbl *lpHTMLElement2Vtbl;

1 0

Jacek Caban : mshtml: Move HTMLTextContainerEvents connection point to HTMLTextContainer object.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: cd68aacbbc3e307b5d5c9ed99fb69bf0daf9c4cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd68aacbbc3e307b5d5c9ed99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 4 13:38:31 2007 +0100 mshtml: Move HTMLTextContainerEvents connection point to HTMLTextContainer object. --- dlls/mshtml/htmlbody.c | 3 --- dlls/mshtml/htmltextcont.c | 2 ++ dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 5077638..e3fb732 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -41,7 +41,6 @@ typedef struct { const IHTMLBodyElementVtbl *lpHTMLBodyElementVtbl; ConnectionPoint cp_propnotif; - ConnectionPoint cp_txtcontevents; nsIDOMHTMLBodyElement *nsbody; } HTMLBodyElement; @@ -502,8 +501,6 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) ret->textcont.element.node.vtbl = &HTMLBodyElementImplVtbl; ConnectionPoint_Init(&ret->cp_propnotif, &ret->textcont.element.cp_container, &IID_IPropertyNotifySink); - ConnectionPoint_Init(&ret->cp_txtcontevents, &ret->textcont.element.cp_container, - &DIID_HTMLTextContainerEvents); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLBodyElement, (void**)&ret->nsbody); diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index 8076646..f6f7c8b 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -216,4 +216,6 @@ void HTMLTextContainer_Init(HTMLTextContainer *This) HTMLElement_Init(&This->element); This->lpHTMLTextContainerVtbl = &HTMLTextContainerVtbl; + + ConnectionPoint_Init(&This->cp, &This->element.cp_container, &DIID_HTMLTextContainerEvents); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b2bba95..8d45752 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -297,6 +297,8 @@ typedef struct { HTMLElement element; const IHTMLTextContainerVtbl *lpHTMLTextContainerVtbl; + + ConnectionPoint cp; } HTMLTextContainer; #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl)

1 0