March 2008 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMCDATASection_get_nodeValue.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: c43b0706a308683c032fa83fa0b00603b5072e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43b0706a308683c032fa83fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 1 22:51:00 2008 +1100 msxml3: Implement IXMLDOMCDATASection_get_nodeValue. --- dlls/msxml3/node.c | 1 + dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 676209e..eff70a5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -251,6 +251,7 @@ static HRESULT WINAPI xmlnode_get_nodeValue( switch ( This->node->type ) { + case XML_CDATA_SECTION_NODE: case XML_COMMENT_NODE: case XML_PI_NODE: case XML_ATTRIBUTE_NODE: diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 18f5c32..0b9ab20 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2323,6 +2323,7 @@ static void test_xmlTypes(void) if(hr == S_OK) { IXMLDOMNode *pNextChild = (IXMLDOMNode *)0x1; + VARIANT var; hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pCDataSec, NULL); ok(hr == S_OK, "ret %08x\n", hr ); @@ -2388,6 +2389,12 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(len == 21, "expected 21 got %ld\n", len); + /* test length property */ + hr = IXMLDOMCDATASection_get_nodeValue(pComment, &var); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); + VariantClear(&var); + IXMLDOMCDATASection_Release(pCDataSec); }

1 0

Alistair Leslie-Hughes : msxml3: Implmented IXMLDOMCDATASection_get_data.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 56da338e5c00e5717a6d62bd523aad4cf94a284e URL: http://source.winehq.org/git/wine.git/?a=commit;h=56da338e5c00e5717a6d62bd5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 1 22:54:33 2008 +1100 msxml3: Implmented IXMLDOMCDATASection_get_data. --- dlls/msxml3/cdata.c | 16 ++++++++++++++-- dlls/msxml3/tests/domdoc.c | 8 +++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index ce25bd8..21c8433 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -475,8 +475,20 @@ static HRESULT WINAPI domcdata_get_data( IXMLDOMCDATASection *iface, BSTR *p) { - FIXME("\n"); - return E_NOTIMPL; + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + HRESULT hr = E_FAIL; + VARIANT vRet; + + if(!p) + return E_INVALIDARG; + + hr = IXMLDOMNode_get_nodeValue( This->element, &vRet ); + if(hr == S_OK) + { + *p = V_BSTR(&vRet); + } + + return hr; } static HRESULT WINAPI domcdata_put_data( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0b9ab20..5f601d6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2389,12 +2389,18 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(len == 21, "expected 21 got %ld\n", len); - /* test length property */ + /* test get nodeValue */ hr = IXMLDOMCDATASection_get_nodeValue(pComment, &var); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); VariantClear(&var); + /* test get data */ + hr = IXMLDOMCDATASection_get_data(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); + SysFreeString(str); + IXMLDOMCDATASection_Release(pCDataSec); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMProcessingInstruction_get_nodeName.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 6dee6819b20c1bc1e3de60d8c283ee2e6a2b4182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dee6819b20c1bc1e3de60d8c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 1 23:20:20 2008 +1100 msxml3: Implement IXMLDOMProcessingInstruction_get_nodeName. --- dlls/msxml3/node.c | 3 ++- dlls/msxml3/tests/domdoc.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index eff70a5..72eb9c3 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -200,7 +200,8 @@ static HRESULT WINAPI xmlnode_get_nodeName( break; case XML_ATTRIBUTE_NODE: case XML_ELEMENT_NODE: - str = This->node->name; + case XML_PI_NODE: + str = This->node->name; break; default: FIXME("nodeName not mapped correctly (%d)\n", This->node->type); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5f601d6..1426341 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -745,6 +745,12 @@ static void test_domdoc( void ) r = IXMLDOMProcessingInstruction_put_data(nodePI, _bstr_("version=\"1.0\" encoding=\"UTF-8\"")); ok(r == E_FAIL, "ret %08x\n", r ); + /* test get nodeName */ + r = IXMLDOMProcessingInstruction_get_nodeName(nodePI, &str); + ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n"); + ok(r == S_OK, "ret %08x\n", r ); + SysFreeString(str); + IXMLDOMProcessingInstruction_Release(nodePI); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMText_appendData.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: f9c5856c8c7f8710c1fc13a925b7fb8c225e98ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c5856c8c7f8710c1fc13a92… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 1 22:32:58 2008 +1100 msxml3: Implement IXMLDOMText_appendData. --- dlls/msxml3/tests/domdoc.c | 15 +++++++++++++++ dlls/msxml3/text.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bf4046b..18f5c32 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -638,6 +638,21 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("\\") ), "incorrect substringData string\n"); SysFreeString(str); + /* test appendData */ + r = IXMLDOMText_appendData(nodetext, NULL); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_appendData(nodetext, _bstr_("")); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_appendData(nodetext, _bstr_("Append")); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_get_text(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string\n"); + SysFreeString(str); + IXMLDOMText_Release( nodetext ); } SysFreeString( str ); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 4821e63..b446052 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -584,8 +584,32 @@ static HRESULT WINAPI domtext_appendData( IXMLDOMText *iface, BSTR p) { - FIXME("\n"); - return E_NOTIMPL; + domtext *This = impl_from_IXMLDOMText( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( (IXMLDOMNode*)This->element ); + xmlChar *pContent; + HRESULT hr = S_FALSE; + + TRACE("%p\n", iface); + + /* Nothing to do if NULL or an Empty string passed in. */ + if(p == NULL || SysStringLen(p) == 0) + return S_OK; + + pContent = xmlChar_from_wchar( (WCHAR*)p ); + if(pContent) + { + if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) + hr = S_OK; + else + { + hr = E_FAIL; + xmlFree(pContent); + } + } + else + hr = E_FAIL; + + return hr; } static HRESULT WINAPI domtext_insertData(

1 0

Alexandre Julliard : ntdll: Only grab the loader lock once we actually call external functions.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 254c17f841748993d24e4b988cd7c03c78725714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=254c17f841748993d24e4b988… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 1 13:30:34 2008 +0100 ntdll: Only grab the loader lock once we actually call external functions. --- dlls/ntdll/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8ce5a62..11447eb 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2340,8 +2340,6 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, status = server_init_process_done(); if (status != STATUS_SUCCESS) goto error; - RtlEnterCriticalSection( &loader_section ); - actctx_init(); load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; @@ -2350,6 +2348,8 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, pthread_functions.sigprocmask( SIG_UNBLOCK, &server_block_set, NULL ); + RtlEnterCriticalSection( &loader_section ); + if ((status = process_attach( wm, (LPVOID)1 )) != STATUS_SUCCESS) { if (last_failed_modref)

1 0

Alexandre Julliard : winex11: Set the appropriate _NET_WM_STATE properties for maximized windows.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 9238ccca487620a96ddbfb9d203fb50b460601e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9238ccca487620a96ddbfb9d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 1 13:30:58 2008 +0100 winex11: Set the appropriate _NET_WM_STATE properties for maximized windows. --- dlls/winex11.drv/winpos.c | 13 +++++++++---- dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 4e96482..1f5d843 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -186,11 +186,12 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data { XATOM__NET_WM_STATE_FULLSCREEN, XATOM__NET_WM_STATE_ABOVE, + XATOM__NET_WM_STATE_MAXIMIZED_VERT, XATOM__NET_WM_STATE_SKIP_PAGER, XATOM__NET_WM_STATE_SKIP_TASKBAR }; - DWORD i, ex_style, new_state = 0; + DWORD i, style, ex_style, new_state = 0; XEvent xev; if (!data->managed) return; @@ -200,6 +201,9 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height) new_state |= (1 << NET_WM_STATE_FULLSCREEN); + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + if (style & WS_MAXIMIZE) new_state |= (1 << NET_WM_STATE_MAXIMIZED); + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) new_state |= (1 << NET_WM_STATE_ABOVE); @@ -213,7 +217,6 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data xev.xclient.display = display; xev.xclient.send_event = True; xev.xclient.format = 32; - xev.xclient.data.l[2] = 0; xev.xclient.data.l[3] = 1; for (i = 0; i < NB_NET_WM_STATES; i++) @@ -226,6 +229,8 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data xev.xclient.data.l[0] = (new_state & (1 << i)) ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; xev.xclient.data.l[1] = X11DRV_Atoms[state_atoms[i] - FIRST_XATOM]; + xev.xclient.data.l[2] = ((state_atoms[i] == XATOM__NET_WM_STATE_MAXIMIZED_VERT) ? + x11drv_atom(_NET_WM_STATE_MAXIMIZED_HORZ) : 0); wine_tsx11_lock(); XSendEvent( display, root_window, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev ); wine_tsx11_unlock(); @@ -395,8 +400,8 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, data->net_wm_state = 0; } - /* don't change position if we are about to minimize a managed window */ - if (!(data->managed && (swp_flags & SWP_STATECHANGED) && (new_style & WS_MINIMIZE))) + /* don't change position if we are about to minimize or maximize a managed window */ + if (!(data->managed && (swp_flags & SWP_STATECHANGED) && (new_style & (WS_MINIMIZE|WS_MAXIMIZE)))) X11DRV_sync_window_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); if ((new_style & WS_VISIBLE) && diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 526408c..7b61d95 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -575,6 +575,8 @@ enum x11drv_atoms XATOM__NET_WM_STATE, XATOM__NET_WM_STATE_ABOVE, XATOM__NET_WM_STATE_FULLSCREEN, + XATOM__NET_WM_STATE_MAXIMIZED_HORZ, + XATOM__NET_WM_STATE_MAXIMIZED_VERT, XATOM__NET_WM_STATE_SKIP_PAGER, XATOM__NET_WM_STATE_SKIP_TASKBAR, XATOM__NET_WM_WINDOW_TYPE, @@ -647,6 +649,7 @@ enum x11drv_net_wm_state { NET_WM_STATE_FULLSCREEN, NET_WM_STATE_ABOVE, + NET_WM_STATE_MAXIMIZED, NET_WM_STATE_SKIP_PAGER, NET_WM_STATE_SKIP_TASKBAR, NB_NET_WM_STATES diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 8982716..50d4546 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -139,6 +139,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_WM_STATE", "_NET_WM_STATE_ABOVE", "_NET_WM_STATE_FULLSCREEN", + "_NET_WM_STATE_MAXIMIZED_HORZ", + "_NET_WM_STATE_MAXIMIZED_VERT", "_NET_WM_STATE_SKIP_PAGER", "_NET_WM_STATE_SKIP_TASKBAR", "_NET_WM_WINDOW_TYPE",

1 0

Chris Morgan : testData::update() was calling a method of but didn' t exist, fixes bug 11807
by Chris Morgan 01 Mar '08

01 Mar '08

Module: appdb Branch: master Commit: 728df32ac945012c56e963b91cb0ce515c2c4f92 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=728df32ac945012c56e963b9… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Sat Mar 1 16:52:56 2008 -0500 testData::update() was calling a method of but didn't exist, fixes bug 11807 --- include/testData.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/testData.php b/include/testData.php index 2d5db25..6556896 100644 --- a/include/testData.php +++ b/include/testData.php @@ -192,6 +192,7 @@ class testData{ if($this->sState == 'accepted') { + $oOldVersion = new version($oOldTest->iVersionId); $oOldVersion->updateRatingInfo(); $oNewVersion->updateRatingInfo(); }

1 0

Alexander Nicolaysen Sørnes : Emphasize that the Search box searches the AppDB
by Chris Morgan 01 Mar '08

01 Mar '08

Module: appdb Branch: master Commit: 96283597a052280f3234d95affc5775ad7ccd218 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=96283597a052280f3234d95a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Feb 28 00:53:36 2008 +0100 Emphasize that the Search box searches the AppDB --- include/sidebar.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/sidebar.php b/include/sidebar.php index a754a44..5250666 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -35,7 +35,7 @@ function global_sidebar_menu() $g->add("Email your suggestions for improving the AppDB", "mailto:appdb(a)winehq.org"); $g->done(); - $g = new htmlmenu("Search"); + $g = new htmlmenu('Search the AppDB'); $g->addmisc(app_search_box(!empty($aClean['sSearchQuery']) ? $aClean['sSearchQuery'] : '')); $g->done();

1 0

Alexander Nicolaysen Sørnes : Add accessible link to front page
by Chris Morgan 01 Mar '08

01 Mar '08

Module: appdb Branch: master Commit: 9af5a29e51cc95bc11a3e96f63b2c6ee21e6165c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9af5a29e51cc95bc11a3e96f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Feb 27 14:16:43 2008 +0100 Add accessible link to front page --- include/sidebar.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/sidebar.php b/include/sidebar.php index 5250666..d12e1b9 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -19,6 +19,7 @@ function global_sidebar_menu() $g->done(); $g = new htmlmenu("AppDB"); + $g->add('Home', BASE.'index.php'); $g->add("Screenshots", BASE."objectManager.php?sClass=screenshot&sTitle=View+Screenshots"); $g->add("Browse Apps", BASE."appbrowse.php"); $g->add("Browse Newest Apps", BASE."objectManager.php?sClass=application&".

1 0

Maarten Lankhorst : kernel32: Fix GetVolumeInformation for fat32 partitions .
by Alexandre Julliard 01 Mar '08

01 Mar '08

Module: wine Branch: master Commit: 1032ba6dc3aca18365152ecd10b428deda5c3e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1032ba6dc3aca18365152ecd1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Feb 29 15:12:09 2008 -0800 kernel32: Fix GetVolumeInformation for fat32 partitions. --- dlls/kernel32/volume.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index df9180f..74397a9 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -339,7 +339,7 @@ static enum fs_type VOLUME_ReadFATSuperblock( HANDLE handle, BYTE *buff ) sectors_per_cluster = buff[0x0d]; /* check if the parameters are reasonable and will not cause * arithmetic errors in the calculation */ - reasonable = num_boot_sectors < 16 && + reasonable = num_boot_sectors < total_sectors && num_fats < 16 && bytes_per_sector >= 512 && bytes_per_sector % 512 == 0 && sectors_per_cluster > 1; @@ -516,6 +516,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, { static const WCHAR audiocdW[] = {'A','u','d','i','o',' ','C','D',0}; static const WCHAR fatW[] = {'F','A','T',0}; + static const WCHAR fat32W[] = {'F','A','T','3','2',0}; static const WCHAR ntfsW[] = {'N','T','F','S',0}; static const WCHAR cdfsW[] = {'C','D','F','S',0}; @@ -611,8 +612,9 @@ fill_fs_info: /* now fill in the information that depends on the file system ty if (flags) *flags = FILE_READ_ONLY_VOLUME; break; case FS_FAT1216: - case FS_FAT32: if (fsname) lstrcpynW( fsname, fatW, fsname_len ); + case FS_FAT32: + if (type == FS_FAT32 && fsname) lstrcpynW( fsname, fat32W, fsname_len ); if (filename_len) *filename_len = 255; if (flags) *flags = FILE_CASE_PRESERVED_NAMES; /* FIXME */ break;

1 0