January 2010 - Wine-commits

Paul Vriens : mshtml/tests: Fix timeouts on Win9x/ WinMe by using more A-functions.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 051fc3458cde8e9f51a27418dbe8751119460bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=051fc3458cde8e9f51a27418d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 6 11:37:28 2010 +0100 mshtml/tests: Fix timeouts on Win9x/WinMe by using more A-functions. --- dlls/mshtml/tests/script.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 5cf1d28..fae49c8 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2221,14 +2221,14 @@ static void test_simple_script(void) static void run_js_script(const char *test_name) { WCHAR url[INTERNET_MAX_URL_LENGTH]; + char urlA[INTERNET_MAX_URL_LENGTH]; IPersistMoniker *persist; IHTMLDocument2 *doc; IMoniker *mon; - WCHAR *ptr; MSG msg; HRESULT hres; - static const WCHAR resW[] = {'r','e','s',':','/','/'}; + static const char res[] = "res://"; trace("running %s...\n", test_name); @@ -2239,12 +2239,11 @@ static void run_js_script(const char *test_name) set_client_site(doc, TRUE); do_advise(doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); - memcpy(url, resW, sizeof(resW)); - ptr = url + sizeof(resW)/sizeof(WCHAR); - GetModuleFileNameW(NULL, ptr, sizeof(url)/sizeof(WCHAR) - (ptr-url)); - ptr += lstrlenW(ptr); - *ptr++ = '/'; - MultiByteToWideChar(CP_ACP, 0, test_name, -1, ptr, sizeof(url)/sizeof(WCHAR) - (ptr-url)); + lstrcpyA(urlA, res); + GetModuleFileNameA(NULL, urlA + lstrlenA(res), sizeof(urlA) - lstrlenA(res)); + lstrcatA(urlA, "/"); + lstrcatA(urlA, test_name); + MultiByteToWideChar(CP_ACP, 0, urlA, -1, url, sizeof(url)/sizeof(WCHAR)); hres = CreateURLMoniker(NULL, url, &mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres);

1 0

Marcus Meissner : user32: Remove useless NULL check (Coverity).
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 4d96ffb52b57ffbe6fd6a1229fbd40201bed2c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d96ffb52b57ffbe6fd6a1229… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 6 16:47:00 2010 +0100 user32: Remove useless NULL check (Coverity). --- dlls/user32/mdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b5e934a..631d477 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -282,7 +282,7 @@ void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT del if (total < 0) /* we are called from CreateWindow */ { MDICLIENTINFO *ci = get_client_info(hwndClient); - total = ci ? ci->nTotalCreated : 0; + total = ci->nTotalCreated; *id = ci->idFirstChild + ci->nActiveChildren; TRACE("MDI child id %04x\n", *id); }

1 0

Marcus Meissner : user32: EM_REPLACESEL - handle OOM error.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 69bf18567f666d9568d68c5379a08451311e161c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bf18567f666d9568d68c537… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 6 16:52:46 2010 +0100 user32: EM_REPLACESEL - handle OOM error. --- dlls/user32/edit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 20a853e..5bdef8a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4525,8 +4525,8 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B { LPSTR textA = (LPSTR)lParam; INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); - if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); + if (!(textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) break; + MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); } EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, TRUE, TRUE);

1 0

Andrew Eikum : msi: Implement recursive INSTALLSTATE updates for msi treeview selector.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: d1a916a614b83ff14af82632aa49840bddcf8e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a916a614b83ff14af82632a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 5 11:42:09 2010 -0600 msi: Implement recursive INSTALLSTATE updates for msi treeview selector. --- dlls/msi/dialog.c | 55 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a22091f..5fd4bbd 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -166,6 +166,8 @@ static MSIFEATURE *msi_seltree_get_selected_feature( msi_control *control ); #define WM_MSI_DIALOG_CREATE (WM_USER+0x100) #define WM_MSI_DIALOG_DESTROY (WM_USER+0x101) +#define USER_INSTALLSTATE_ALL 0x1000 + static DWORD uiThreadId; static HWND hMsiHiddenWindow; @@ -1876,7 +1878,7 @@ msi_seltree_popup_menu( HWND hwnd, INT x, INT y ) /* FIXME: load strings from resources */ AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_LOCAL, "Install feature locally"); - AppendMenuA( hMenu, MF_GRAYED, 0x1000, "Install entire feature"); + AppendMenuA( hMenu, MF_ENABLED, USER_INSTALLSTATE_ALL, "Install entire feature"); AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_ADVERTISED, "Install on demand"); AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_ABSENT, "Don't install"); r = TrackPopupMenu( hMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD, @@ -1899,6 +1901,37 @@ msi_seltree_feature_from_item( HWND hwnd, HTREEITEM hItem ) return (MSIFEATURE*) tvi.lParam; } +static void +msi_seltree_update_feature_installstate( HWND hwnd, HTREEITEM hItem, + MSIPACKAGE *package, MSIFEATURE *feature, INSTALLSTATE state ) +{ + msi_feature_set_state( package, feature, state ); + msi_seltree_sync_item_state( hwnd, feature, hItem ); + ACTION_UpdateComponentStates( package, feature->Feature ); +} + +static void +msi_seltree_update_siblings_and_children_installstate( HWND hwnd, HTREEITEM curr, + MSIPACKAGE *package, INSTALLSTATE state) +{ + /* update all siblings */ + do + { + MSIFEATURE *feature; + HTREEITEM child; + + feature = msi_seltree_feature_from_item( hwnd, curr ); + msi_seltree_update_feature_installstate( hwnd, curr, package, feature, state ); + + /* update this sibling's children */ + child = (HTREEITEM)SendMessageW( hwnd, TVM_GETNEXTITEM, (WPARAM)TVGN_CHILD, (LPARAM)curr ); + if (child) + msi_seltree_update_siblings_and_children_installstate( hwnd, child, + package, state ); + } + while ((curr = (HTREEITEM)SendMessageW( hwnd, TVM_GETNEXTITEM, (WPARAM)TVGN_NEXT, (LPARAM)curr ))); +} + static LRESULT msi_seltree_menu( HWND hwnd, HTREEITEM hItem ) { @@ -1931,19 +1964,23 @@ msi_seltree_menu( HWND hwnd, HTREEITEM hItem ) switch (r) { - case INSTALLSTATE_LOCAL: + case USER_INSTALLSTATE_ALL: + r = INSTALLSTATE_LOCAL; + /* fall-through */ case INSTALLSTATE_ADVERTISED: case INSTALLSTATE_ABSENT: - msi_feature_set_state(package, feature, r); + { + HTREEITEM child; + child = (HTREEITEM)SendMessageW( hwnd, TVM_GETNEXTITEM, (WPARAM)TVGN_CHILD, (LPARAM)hItem ); + if (child) + msi_seltree_update_siblings_and_children_installstate( hwnd, child, package, r ); + } + /* fall-through */ + case INSTALLSTATE_LOCAL: + msi_seltree_update_feature_installstate( hwnd, hItem, package, feature, r ); break; - default: - FIXME("select feature and all children\n"); } - /* update */ - msi_seltree_sync_item_state( hwnd, feature, hItem ); - ACTION_UpdateComponentStates( package, feature->Feature ); - return 0; }

1 0

André Hentschel : winedbg: Update link.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 76c518539f3a62516770d3eafcc5b112f8ee9e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c518539f3a62516770d3eaf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 5 20:42:19 2010 +0100 winedbg: Update link. --- programs/winedbg/gdbproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index ceae777..c1dac01 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -21,7 +21,7 @@ */ /* Protocol specification can be found here: - * http://sources.redhat.com/gdb/onlinedocs/gdb_32.html + * http://sources.redhat.com/gdb/onlinedocs/gdb/Maintenance-Commands.html */ #include "config.h"

1 0

André Hentschel : dbghelp: Fix typo in url.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 2f5ba0d8c0996430e35188ab8e6e0f873d95ea63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5ba0d8c0996430e35188ab8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 5 20:42:30 2010 +0100 dbghelp: Fix typo in url. --- dlls/dbghelp/stabs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index bc5b674..837e213 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -26,7 +26,7 @@ * The "stabs" debug format * by Julia Menapace, Jim Kingdon, David Mackenzie * of Cygnus Support - * available (hopefully) from http:\\sources.redhat.com\gdb\onlinedocs + * available (hopefully) from http://sources.redhat.com/gdb/onlinedocs */ #include "config.h"

1 0

André Hentschel : msi/tests: Remove dead url.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 2e339c471e82029263fab04f19aa9b5179c5d471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e339c471e82029263fab04f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 5 20:43:09 2010 +0100 msi/tests: Remove dead url. --- dlls/msi/tests/record.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 369c855..0b80779 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -334,7 +334,6 @@ static void test_msirecord(void) ok(r == ERROR_SUCCESS, "failed to add stream to record\n"); r = MsiRecordReadStream(h, 1, buf, NULL); ok(r == ERROR_INVALID_PARAMETER, "should return error\n"); - /* http://test.winehq.org/data/200503181000/98_jmelgarejo98casa/msi:record.txt */ DeleteFile(filename); /* Windows 98 doesn't like this at all, so don't check return. */ r = MsiRecordReadStream(h, 1, NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "should return error\n");

1 0

Henri Verbeet : avifil32: Always add the format change frame to the buffer in AVIFILE_AddFrame().
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 32c3adbbaabacf8bdc84a01ed68794c5dc5f7981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c3adbbaabacf8bdc84a01ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 21:28:59 2010 +0100 avifil32: Always add the format change frame to the buffer in AVIFILE_AddFrame(). It doesn't make sense to only do this when the buffer is resized. --- dlls/avifil32/avifile.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index c4f191a..57f8294 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1362,6 +1362,8 @@ static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface, static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DWORD offset, DWORD flags) { + UINT n; + /* pre-conditions */ assert(This != NULL); @@ -1383,8 +1385,6 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW This->sInfo.dwFormatChangeCount++; if (This->idxFmtChanges == NULL || This->sInfo.dwFormatChangeCount < This->nIdxFmtChanges) { - UINT n = This->sInfo.dwFormatChangeCount; - This->nIdxFmtChanges += 16; if (This->idxFmtChanges == NULL) This->idxFmtChanges = @@ -1395,15 +1395,15 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW This->nIdxFmtChanges * sizeof(AVIINDEXENTRY)); if (This->idxFmtChanges == NULL) return AVIERR_MEMORY; + } - This->idxFmtChanges[n].ckid = This->lLastFrame; - This->idxFmtChanges[n].dwFlags = 0; - This->idxFmtChanges[n].dwChunkOffset = offset; - This->idxFmtChanges[n].dwChunkLength = size; + n = This->sInfo.dwFormatChangeCount; + This->idxFmtChanges[n].ckid = This->lLastFrame; + This->idxFmtChanges[n].dwFlags = 0; + This->idxFmtChanges[n].dwChunkOffset = offset; + This->idxFmtChanges[n].dwChunkLength = size; - return AVIERR_OK; - } - break; + return AVIERR_OK; case cktypeWAVEbytes: if (This->paf->fInfo.dwFlags & AVIFILEINFO_TRUSTCKTYPE) flags |= AVIIF_KEYFRAME;

1 0

Henri Verbeet : avifil32: Properly check the required buffer size in AVIFILE_AddFrame().
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: c2051d33d65514eed5ca5116450fe41210663dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2051d33d65514eed5ca51164… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 21:29:00 2010 +0100 avifil32: Properly check the required buffer size in AVIFILE_AddFrame(). --- dlls/avifil32/avifile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 57f8294..48c3662 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1384,7 +1384,7 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW This->sInfo.dwFlags |= AVISTREAMINFO_FORMATCHANGES; This->sInfo.dwFormatChangeCount++; - if (This->idxFmtChanges == NULL || This->sInfo.dwFormatChangeCount < This->nIdxFmtChanges) { + if (This->idxFmtChanges == NULL || This->nIdxFmtChanges < This->sInfo.dwFormatChangeCount) { This->nIdxFmtChanges += 16; if (This->idxFmtChanges == NULL) This->idxFmtChanges =

1 0

Paul Vriens : kernel32: Add a stubbed GetConsoleProcessList().
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: a95e0708245a4972ee4e28f4811dddfe16e3c206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95e0708245a4972ee4e28f48… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 5 09:32:36 2010 +0100 kernel32: Add a stubbed GetConsoleProcessList(). --- dlls/kernel32/console.c | 16 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/console.c | 67 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 42344af..4aa0b44 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2690,3 +2690,19 @@ DWORD WINAPI GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer, SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + +/****************************************************************** + * GetConsoleProcessList (KERNEL32.@) + */ +DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount) +{ + FIXME("(%p,%d): stub\n", processlist, processcount); + + if (!processlist || processcount < 1) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 720a5fd..3b772ba 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -478,7 +478,7 @@ @ stdcall GetConsoleMode(long ptr) @ stub GetConsoleNlsMode @ stdcall GetConsoleOutputCP() -# @ stub GetConsoleProcessList +@ stdcall GetConsoleProcessList(ptr long) @ stdcall GetConsoleScreenBufferInfo(long ptr) # @ stub GetConsoleSelectionInfo @ stdcall GetConsoleTitleA(ptr long) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 33eab26..ace4744 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -24,6 +24,7 @@ #include <stdio.h> static BOOL (WINAPI *pGetConsoleInputExeNameA)(DWORD, LPSTR); +static DWORD (WINAPI *pGetConsoleProcessList)(LPDWORD, DWORD); static BOOL (WINAPI *pSetConsoleInputExeNameA)(LPCSTR); /* DEFAULT_ATTRIB is used for all initial filling of the console. @@ -63,6 +64,7 @@ static void init_function_pointers(void) hKernel32 = GetModuleHandleA("kernel32.dll"); KERNEL32_GET_PROC(GetConsoleInputExeNameA); + KERNEL32_GET_PROC(GetConsoleProcessList); KERNEL32_GET_PROC(SetConsoleInputExeNameA); #undef KERNEL32_GET_PROC @@ -926,6 +928,66 @@ static void test_GetSetConsoleInputExeName(void) ok(!lstrcmpA(buffer, input_exe), "got %s expected %s\n", buffer, input_exe); } +static void test_GetConsoleProcessList(void) +{ + DWORD ret, *list = NULL; + + if (!pGetConsoleProcessList) + { + win_skip("GetConsoleProcessList is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pGetConsoleProcessList(NULL, 0); + ok(ret == 0, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleProcessList(NULL, 1); + ok(ret == 0, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); + + /* We should only have 1 process but only for these specific unit tests as + * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) would + * give us two processes for example. + */ + list = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)); + + SetLastError(0xdeadbeef); + ret = pGetConsoleProcessList(list, 0); + ok(ret == 0, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleProcessList(list, 1); + todo_wine + ok(ret == 1, "Expected 1, got %d\n", ret); + + HeapFree(GetProcessHeap(), 0, list); + + list = HeapAlloc(GetProcessHeap(), 0, ret * sizeof(DWORD)); + + SetLastError(0xdeadbeef); + ret = pGetConsoleProcessList(list, ret); + todo_wine + ok(ret == 1, "Expected 1, got %d\n", ret); + + if (ret == 1) + { + DWORD pid = GetCurrentProcessId(); + ok(list[0] == pid, "Expected %d, got %d\n", pid, list[0]); + } + + HeapFree(GetProcessHeap(), 0, list); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -971,10 +1033,9 @@ START_TEST(console) /* still to be done: access rights & access on objects */ if (!pGetConsoleInputExeNameA || !pSetConsoleInputExeNameA) - { win_skip("GetConsoleInputExeNameA and/or SetConsoleInputExeNameA is not available\n"); - return; - } else test_GetSetConsoleInputExeName(); + + test_GetConsoleProcessList(); }

1 0