January 2006 - Wine-commits

Huw Davies : msxml: Fix for selectNodes when the node has no children.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: bce90cfb85339a66873c490fe2f16757dd8dc592 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bce90cfb85339a66873c490… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 11 20:54:32 2006 +0100 msxml: Fix for selectNodes when the node has no children. --- dlls/msxml3/node.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 704e92e..b067926 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -563,6 +563,9 @@ static HRESULT WINAPI xmlnode_selectNode if (!str) return r; + if( !This->node->children ) + return S_FALSE; + *resultList = create_filtered_nodelist( This->node->children, str ); HeapFree( GetProcessHeap(), 0, str ); return S_OK; @@ -580,7 +583,7 @@ static HRESULT WINAPI xmlnode_selectSing TRACE("%p %s %p\n", This, debugstr_w(queryString), resultNode ); r = IXMLDOMNode_selectNodes(iface, queryString, &list); - if(SUCCEEDED(r)) + if(r == S_OK) { r = IXMLDOMNodeList_nextNode(list, resultNode); IXMLDOMNodeList_Release(list);

1 0

Alexandre Julliard : ntdll: Handle NtSetContextThread on the client side (as far as
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 2654be08d514b1aa279bd3957e2964c5814f551d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2654be08d514b1aa279bd39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 11 20:20:32 2006 +0100 ntdll: Handle NtSetContextThread on the client side (as far as possible) when setting the context of the current thread. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_i386.c | 41 +++++++++++++++----------- dlls/ntdll/signal_powerpc.c | 11 +++++++ dlls/ntdll/signal_sparc.c | 11 +++++++ dlls/ntdll/signal_x86_64.c | 11 +++++++ dlls/ntdll/thread.c | 62 +++++++++++++++++++++++++--------------- include/wine/server_protocol.h | 3 +- server/context_i386.c | 5 +-- server/protocol.def | 2 + server/thread.c | 1 + server/trace.c | 7 ++++- 11 files changed, 109 insertions(+), 46 deletions(-)

1 0

Aric Stewart : winefile: Highlight the file specified on the command line instead of
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 59b2838f4ea5c0a542a22bb5f622a1999db51429 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=59b2838f4ea5c0a542a22bb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 11 12:32:51 2006 +0100 winefile: Highlight the file specified on the command line instead of filtering based on it. To be integrated with explorer to allow for that functionality. --- programs/winefile/winefile.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 1f6eeee..8b250d6 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1400,6 +1400,7 @@ enum TYPE_FILTER { static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) { TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; + TCHAR dir_path[MAX_PATH]; TCHAR b1[BUFFER_LEN]; static const TCHAR sAsterics[] = {'*', '\0'}; @@ -1444,7 +1445,9 @@ static ChildWnd* alloc_child_window(LPCT root->entry.level = 0; - entry = read_tree(root, path, pidl, drv, child->sortOrder, hwnd); + lstrcpy(dir_path, drv); + lstrcat(dir_path, dir); + entry = read_tree(root, dir_path, pidl, drv, child->sortOrder, hwnd); #ifdef _SHELL_FOLDERS if (root->entry.etype == ET_SHELL) @@ -4750,6 +4753,36 @@ static void show_frame(HWND hwndParent, Globals.prescan_node = FALSE; UpdateWindow(Globals.hMainWnd); + + if (path && path[0]) + { + int index,count; + TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; + TCHAR fullname[_MAX_FNAME+_MAX_EXT+1]; + + memset(name,0,sizeof(name)); + memset(name,0,sizeof(ext)); + _tsplitpath(path, drv, dir, name, ext); + if (name[0]) + { + count = ListBox_GetCount(child->right.hwnd); + lstrcpy(fullname,name); + lstrcat(fullname,ext); + + for (index = 0; index < count; index ++) + { + Entry* entry = (Entry*) ListBox_GetItemData(child->right.hwnd, + index); + if (lstrcmp(entry->data.cFileName,fullname)==0 || + lstrcmp(entry->data.cAlternateFileName,fullname)==0) + { + ListBox_SetCurSel(child->right.hwnd, index); + SetFocus(child->right.hwnd); + break; + } + } + } + } } static void ExitInstance(void)

1 0

Martin Fuchs : shell32: Fix folder icon index when read from registry.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 7114f8c3bdaa6d7f81b6658f49b8b44be494b7cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7114f8c3bdaa6d7f81b6658… Author: Martin Fuchs <martin-fuchs(a)gmx.net> Date: Wed Jan 11 12:33:24 2006 +0100 shell32: Fix folder icon index when read from registry. Change "DWORD dwNr" into "int icon_idx" at several places. --- dlls/shell32/classes.c | 58 ++++++++++++++++++++++--------------------- dlls/shell32/folders.c | 35 +++++++++++++++----------- dlls/shell32/iconcache.c | 8 +++--- dlls/shell32/shell32_main.c | 12 ++++----- dlls/shell32/shell32_main.h | 6 ++-- 5 files changed, 62 insertions(+), 57 deletions(-)

1 0

Alex Villacís Lasso : winealsa: Ensure that copy_format() will not write past end of
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 6d88d5ad5cd79d0cc6ee3ddfd4d86f09d9e890f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d88d5ad5cd79d0cc6ee3dd… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Jan 11 12:33:05 2006 +0100 winealsa: Ensure that copy_format() will not write past end of referenced WAVEFORMATPCMEX structure. --- dlls/winmm/winealsa/audio.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index a64d70e..7beab7b 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -404,13 +404,20 @@ static BOOL supportedFormat(LPWAVEFORMAT static void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) { + unsigned int iLength; + ZeroMemory(wf2, sizeof(wf2)); if (wf1->wFormatTag == WAVE_FORMAT_PCM) - memcpy(wf2, wf1, sizeof(PCMWAVEFORMAT)); + iLength = sizeof(PCMWAVEFORMAT); else if (wf1->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - memcpy(wf2, wf1, sizeof(WAVEFORMATPCMEX)); + iLength = sizeof(WAVEFORMATPCMEX); else - memcpy(wf2, wf1, sizeof(WAVEFORMATEX) + wf1->cbSize); + iLength = sizeof(WAVEFORMATEX) + wf1->cbSize; + if (iLength > sizeof(WAVEFORMATPCMEX)) { + ERR("calculated %u bytes, capping to %u bytes\n", iLength, sizeof(WAVEFORMATPCMEX)); + iLength = sizeof(WAVEFORMATPCMEX); + } + memcpy(wf2, wf1, iLength); } /*----------------------------------------------------------------------------

1 0

James Hawkins : cabinet: Add documentation for FDITruncateCabinet.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 362aa36d0956f8bb68f49e7b85523d26b0da7834 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=362aa36d0956f8bb68f49e7… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jan 11 12:12:54 2006 +0100 cabinet: Add documentation for FDITruncateCabinet. --- dlls/cabinet/fdi.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 20d00fd..136cf27 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2819,7 +2819,21 @@ BOOL __cdecl FDIDestroy(HFDI hfdi) /*********************************************************************** * FDITruncateCabinet (CABINET.24) * - * Undocumented and unimplemented. + * Removes all folders of a cabinet file after and including the + * specified folder number. + * + * PARAMS + * hfdi [I] Handle to the FDI context. + * pszCabinetName [I] Filename of the cabinet. + * iFolderToDelete [I] Index of the first folder to delete. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. + * + * NOTES + * The PFNWRITE function supplied to FDICreate must truncate the + * file at the current position if the number of bytes to write is 0. */ BOOL __cdecl FDITruncateCabinet( HFDI hfdi,

1 0

Mike McCormack : msi: Remove the font when setting a control's text.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 891df89ee758ae60d2a17d853ae26859f4cc420e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=891df89ee758ae60d2a17d8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 11 12:12:16 2006 +0100 msi: Remove the font when setting a control's text. --- dlls/msi/dialog.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index d0bf75b..62be130 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -459,7 +459,8 @@ void msi_dialog_handle_event( msi_dialog LPCWSTR attribute, MSIRECORD *rec ) { msi_control* ctrl; - LPCWSTR text; + LPCWSTR font_text, text = NULL; + LPWSTR font; ctrl = msi_dialog_find_control( dialog, control ); if (!ctrl) @@ -469,8 +470,10 @@ void msi_dialog_handle_event( msi_dialog ERR("Attribute %s\n", debugstr_w(attribute)); return; } - text = MSI_RecordGetString( rec , 1 ); + font_text = MSI_RecordGetString( rec , 1 ); + font = msi_dialog_get_style( font_text, &text ); SetWindowTextW( ctrl->hwnd, text ); + msi_free( font ); msi_dialog_check_messages( NULL ); }

1 0

Robert Reif : dsound: Add primary buffer change tests.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 54cf8ea1acd0e4182eaedb4862ab190dbfa85e6e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54cf8ea1acd0e4182eaedb4… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Jan 11 12:12:46 2006 +0100 dsound: Add primary buffer change tests. Add tests to figure out whether Windows can change the primary buffer capabilities after setting the buffer format. Based on a patch by Alex Villacís Lasso. --- dlls/dsound/tests/ds3d.c | 25 +++++++++++++++++++++++++ dlls/dsound/tests/ds3d8.c | 25 +++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index be42f77..ea0a57c 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -362,6 +362,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDI ok(status==0,"status=0x%lx instead of 0\n",status); if (is_primary) { + DSBCAPS new_dsbcaps; /* We must call SetCooperativeLevel to be allowed to call SetFormat */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); @@ -400,6 +401,30 @@ void test_buffer(LPDIRECTSOUND dso, LPDI wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } + ZeroMemory(&new_dsbcaps, sizeof(new_dsbcaps)); + new_dsbcaps.dwSize = sizeof(new_dsbcaps); + rc=IDirectSoundBuffer_GetCaps(*dsbo,&new_dsbcaps); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %s\n", + DXGetErrorString8(rc)); + if (rc==DS_OK && winetest_debug > 1) { + trace(" new Caps: flags=0x%08lx size=%ld\n",new_dsbcaps.dwFlags, + new_dsbcaps.dwBufferBytes); + } + + /* Check for primary buffer size change */ + if (new_dsbcaps.dwBufferBytes != dsbcaps.dwBufferBytes) { + trace(" buffer size changed after SetFormat() - " + "previous size was %lu, current size is %lu\n", + dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); + } + + /* Check for primary buffer flags change */ + if (new_dsbcaps.dwFlags != dsbcaps.dwFlags) { + trace(" flags changed after SetFormat() - " + "previous flags were %08lx, current flags are %08lx\n", + dsbcaps.dwFlags, new_dsbcaps.dwFlags); + } + /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 593f59a..b01e4d0 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -254,6 +254,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP ok(status==0,"status=0x%lx instead of 0\n",status); if (is_primary) { + DSBCAPS new_dsbcaps; /* We must call SetCooperativeLevel to be allowed to call SetFormat */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); @@ -292,6 +293,30 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } + ZeroMemory(&new_dsbcaps, sizeof(new_dsbcaps)); + new_dsbcaps.dwSize = sizeof(new_dsbcaps); + rc=IDirectSoundBuffer_GetCaps(*dsbo,&new_dsbcaps); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %s\n", + DXGetErrorString8(rc)); + if (rc==DS_OK && winetest_debug > 1) { + trace(" new Caps: flags=0x%08lx size=%ld\n",new_dsbcaps.dwFlags, + new_dsbcaps.dwBufferBytes); + } + + /* Check for primary buffer size change */ + if (new_dsbcaps.dwBufferBytes != dsbcaps.dwBufferBytes) { + trace(" buffer size changed after SetFormat() - " + "previous size was %lu, current size is %lu\n", + dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); + } + + /* Check for primary buffer flags change */ + if (new_dsbcaps.dwFlags != dsbcaps.dwFlags) { + trace(" flags changed after SetFormat() - " + "previous flags were %08lx, current flags are %08lx\n", + dsbcaps.dwFlags, new_dsbcaps.dwFlags); + } + /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL);

1 0

James Hawkins : advpack: Implement ExtractFiles.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 1ca3a4afe3e3a0496407e9c6e8bacafca0e74948 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ca3a4afe3e3a0496407e9c… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jan 11 12:13:03 2006 +0100 advpack: Implement ExtractFiles. --- dlls/advpack/advpack.c | 209 +++++++++++++++++++++++++++++++++++++++++++- dlls/advpack/tests/files.c | 69 +++++---------- 2 files changed, 227 insertions(+), 51 deletions(-)

1 0

Eric Pouech : ntdll: Implemented ntdll.NtSetInformationThread(ThreadAffinityMask).
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 329ab98940515fdcd880f6897f3c0ad920fd883e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=329ab98940515fdcd880f68… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Jan 11 12:32:19 2006 +0100 ntdll: Implemented ntdll.NtSetInformationThread(ThreadAffinityMask). Reimplemented kernel32.SetThreadAffinityMask on top of it. --- dlls/kernel/thread.c | 26 +++++++++++++++++--------- dlls/ntdll/thread.c | 15 ++++++++++++++- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index c927037..09c3081 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -443,17 +443,25 @@ BOOL WINAPI SetThreadPriorityBoost( */ DWORD WINAPI SetThreadAffinityMask( HANDLE hThread, DWORD dwThreadAffinityMask ) { - DWORD ret; - SERVER_START_REQ( set_thread_info ) + NTSTATUS status; + THREAD_BASIC_INFORMATION tbi; + + status = NtQueryInformationThread( hThread, ThreadBasicInformation, + &tbi, sizeof(tbi), NULL ); + if (status) { - req->handle = hThread; - req->affinity = dwThreadAffinityMask; - req->mask = SET_THREAD_INFO_AFFINITY; - ret = !wine_server_call_err( req ); - /* FIXME: should return previous value */ + SetLastError( RtlNtStatusToDosError(status) ); + return 0; + } + status = NtSetInformationThread( hThread, ThreadAffinityMask, + &dwThreadAffinityMask, + sizeof(dwThreadAffinityMask)); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return 0; } - SERVER_END_REQ; - return ret; + return tbi.AffinityMask; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9896703..a267acd 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -982,10 +982,23 @@ NTSTATUS WINAPI NtSetInformationThread( SERVER_END_REQ; } return status; + case ThreadAffinityMask: + { + const DWORD *paff = data; + if (length != sizeof(DWORD)) return STATUS_INVALID_PARAMETER; + SERVER_START_REQ( set_thread_info ) + { + req->handle = handle; + req->affinity = *paff; + req->mask = SET_THREAD_INFO_AFFINITY; + status = wine_server_call( req ); + } + SERVER_END_REQ; + } + return status; case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: - case ThreadAffinityMask: case ThreadDescriptorTableEntry: case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable:

1 0