February 2008 - Wine-Commits

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMNode put_nodeValue.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 75a8444a8b1408291a5aecec6311705ec469b681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a8444a8b1408291a5aecec6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 25 19:56:22 2008 +1100 msxml3: Implement IXMLDOMNode put_nodeValue. --- dlls/msxml3/node.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1b6c9d1..12a53a9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -284,8 +284,34 @@ static HRESULT WINAPI xmlnode_put_nodeValue( IXMLDOMNode *iface, VARIANT value) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + HRESULT hr = S_FALSE; + xmlChar *str = NULL; + + TRACE("%p type(%d)", This, This->node->type); + + /* Document, Document Fragment, Document Type, Element, + Entity, Entity Reference, Notation arent supported. */ + switch ( This->node->type ) + { + case XML_ATTRIBUTE_NODE: + case XML_CDATA_SECTION_NODE: + case XML_COMMENT_NODE: + case XML_PI_NODE: + case XML_TEXT_NODE: + { + str = xmlChar_from_wchar((WCHAR*)V_BSTR(&value)); + + xmlNodeSetContent(This->node, str); + hr = S_OK; + break; + } + default: + /* Do nothing for unsupported types. */ + break; + } + + return hr; } static HRESULT WINAPI xmlnode_get_nodeType(

1 0

Rob Shearman : dinput: Fix character count passed to GetKeyNameTextW in SysKeyboardWImpl_GetObjectInfo .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: fe75a8c616e25c76620856842a4911df15f286da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe75a8c616e25c76620856842… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:01:49 2008 +0000 dinput: Fix character count passed to GetKeyNameTextW in SysKeyboardWImpl_GetObjectInfo. --- dlls/dinput/keyboard.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index ef66ed9..82e50c3 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -361,7 +361,8 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface if (!GetKeyNameTextW((DIDFT_GETINSTANCE(pdidoi->dwType) & 0x80) << 17 | (DIDFT_GETINSTANCE(pdidoi->dwType) & 0x7f) << 16, - pdidoi->tszName, sizeof(pdidoi->tszName))) + pdidoi->tszName, + sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) return DIERR_OBJECTNOTFOUND; _dump_OBJECTINSTANCEW(pdidoi);

1 0

Rob Shearman : winspool.drv: Fix the character count passed into RegEnumKeyExW in get_local_monitors.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 18d891986d6aa62fd94e86699b5f9bfed232339e URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d891986d6aa62fd94e86699… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:01:29 2008 +0000 winspool.drv: Fix the character count passed into RegEnumKeyExW in get_local_monitors. len is used in RegEnumKeyExW and this takes a character count for the key argument, not a byte count. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 17cd507..80b74a5 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -808,7 +808,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW } } index++; - len = sizeof(buffer); + len = sizeof(buffer)/sizeof(buffer[0]); buffer[0] = '\0'; } RegCloseKey(hroot);

1 0

Rob Shearman : avifil32: Fix the character count passed into LoadStringW in AVIBuildFilterW and AVISaveOptionsUpdate .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: e7173dfa4e2424f7b522141a1645522ba9b7cd92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7173dfa4e2424f7b522141a1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:01:39 2008 +0000 avifil32: Fix the character count passed into LoadStringW in AVIBuildFilterW and AVISaveOptionsUpdate. --- dlls/avifil32/api.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 47947b5..b7b21b9 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1148,7 +1148,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) /* add "All files" "*.*" filter if enough space left */ size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES, - szAllFiles, sizeof(szAllFiles)) + 1; + szAllFiles, sizeof(szAllFiles)/sizeof(szAllFiles[0])) + 1; if (cbFilter > size) { int i; @@ -1336,7 +1336,8 @@ static void AVISaveOptionsUpdate(HWND hWnd) } } else { LoadStringW(AVIFILE_hModule, IDS_UNCOMPRESSED, - icinfo.szDescription, sizeof(icinfo.szDescription)); + icinfo.szDescription, + sizeof(icinfo.szDescription)/sizeof(icinfo.szDescription[0])); lstrcatW(szFormat, icinfo.szDescription); } } else if (sInfo.fccType == streamtypeAUDIO) {

1 0

Rob Shearman : shell32: Fix the character count passed to SearchPathW in SHELL_execute.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: d182559161c2d5026c7fcc39533fd5a5f54e2981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d182559161c2d5026c7fcc395… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:01:56 2008 +0000 shell32: Fix the character count passed to SearchPathW in SHELL_execute. --- dlls/shell32/shlexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 7cf0b03..f55e05c 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1698,7 +1698,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) buffer[idx] = '\0'; /*FIXME This finds directory paths if the targeted file name contains spaces. */ - if (SearchPathW(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, buffer, wszExe, sizeof(xlpFile), xlpFile, NULL)) + if (SearchPathW(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, buffer, wszExe, sizeof(xlpFile)/sizeof(xlpFile[0]), xlpFile, NULL)) { /* separate out command from parameter string */ LPCWSTR p = space + 1;

1 0

Rob Shearman : kernel32: Fix the number of characters passed to GetAtomNameW in test_local_get_atom_name .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 492be1b5e34467d21ea547ffc1c2128ceda65d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=492be1b5e34467d21ea547ffc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:02:03 2008 +0000 kernel32: Fix the number of characters passed to GetAtomNameW in test_local_get_atom_name. --- dlls/kernel32/tests/atom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index f21b2b1..2977416 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -566,7 +566,7 @@ static void test_local_get_atom_name(void) do_initW(inW, "abcdefghij", 255); atom = AddAtomW(inW); ok(atom, "couldn't add atom for %s\n", in); - len = GetAtomNameW(atom, outW, sizeof(outW)); + len = GetAtomNameW(atom, outW, sizeof(outW)/sizeof(outW[0])); ok(len == 255, "length mismatch (%u instead of 255)\n", len); for (i = 0; i < 255; i++) {

1 0

Rob Shearman : wineboot: Fix the character count passed to RegEnumKeyW in start_services.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: c2838c951274f2f5163b35aacc71482b4327b0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2838c951274f2f5163b35aac… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:36 2008 +0000 wineboot: Fix the character count passed to RegEnumKeyW in start_services. --- programs/wineboot/wineboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 54c3034..024eef3 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -562,7 +562,7 @@ static void start_services(void) return; } - while (!RegEnumKeyW( hkey, index++, name, sizeof(name) )) + while (!RegEnumKeyW( hkey, index++, name, sizeof(name)/sizeof(name[0]) )) { if (RegOpenKeyW( hkey, name, &skey )) continue; size = sizeof(start);

1 0

Rob Shearman : explorer: Clean up after CreateProcess in WinMain.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 45322bb4485664d322c112fc8008043d78ae3727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45322bb4485664d322c112fc8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:19 2008 +0000 explorer: Clean up after CreateProcess in WinMain. --- programs/explorer/explorer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 0f7c257..f261e11 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -196,6 +196,8 @@ int WINAPI WinMain(HINSTANCE hinstance, if (!rc) return 0; + CloseHandle(info.hThread); WaitForSingleObject(info.hProcess,INFINITE); + CloseHandle(info.hProcess); return 0; }

1 0

Rob Shearman : cmd: Fix loop termination check in WCMD_batch.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 271eaf5c9d88586662bf7bee1cf358545c9fbaca URL: http://source.winehq.org/git/wine.git/?a=commit;h=271eaf5c9d88586662bf7bee1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:07 2008 +0000 cmd: Fix loop termination check in WCMD_batch. --- programs/cmd/batch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index c9f6e76..12c19ed 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -58,7 +58,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN BATCH_CONTEXT *prev_context; if (startLabel == NULL) { - for(i=0; (i<((sizeof(extension_batch) * sizeof(WCHAR))/WCMD_BATCH_EXT_SIZE)) && + for(i=0; (i<sizeof(extension_batch)/(WCMD_BATCH_EXT_SIZE * sizeof(WCHAR))) && (h == INVALID_HANDLE_VALUE); i++) { strcpyW (string, file); CharLower (string);

1 0

Rob Shearman : comctl32: Fix possible use of uninitialised variable in REBAR_Paint.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: f3c40f925d39517a7068ce0c3d5231310f5f53d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c40f925d39517a7068ce0c3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 08:59:51 2008 +0000 comctl32: Fix possible use of uninitialised variable in REBAR_Paint. In the case where an hdc is passed in via the wParam, ps.fErase could be uninitialised. Fix this by rearranging the code so that ps is only used when an hdc isn't passed in. --- dlls/comctl32/rebar.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 92c1922..0784e61 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3197,24 +3197,23 @@ REBAR_NotifyFormat (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT REBAR_Paint (const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - HDC hdc; - PAINTSTRUCT ps; - RECT rc; - - GetClientRect(infoPtr->hwndSelf, &rc); - hdc = wParam==0 ? BeginPaint (infoPtr->hwndSelf, &ps) : (HDC)wParam; - - TRACE("painting (%s) client (%s)\n", - wine_dbgstr_rect(&ps.rcPaint), wine_dbgstr_rect(&rc)); + HDC hdc = (HDC)wParam; - if (ps.fErase) { - /* Erase area of paint if requested */ - REBAR_InternalEraseBkGnd (infoPtr, wParam, lParam, &ps.rcPaint); + if (hdc) { + TRACE("painting\n"); + REBAR_Refresh (infoPtr, hdc); + } else { + PAINTSTRUCT ps; + hdc = BeginPaint (infoPtr->hwndSelf, &ps); + TRACE("painting (%s)\n", wine_dbgstr_rect(&ps.rcPaint)); + if (ps.fErase) { + /* Erase area of paint if requested */ + REBAR_InternalEraseBkGnd (infoPtr, wParam, lParam, &ps.rcPaint); + } + REBAR_Refresh (infoPtr, hdc); + EndPaint (infoPtr->hwndSelf, &ps); } - REBAR_Refresh (infoPtr, hdc); - if (!wParam) - EndPaint (infoPtr->hwndSelf, &ps); return 0; }

1 0