January 2010 - Wine-Commits

Detlef Riekenberg : user32: Move a comment about HLOCAL16 to user.exe.
by Alexandre Julliard Jan. 5, 2010

Jan. 5, 2010

Module: wine Branch: master Commit: 2f529c39fda88a9c5803bd5ff3bf9c63ad0247ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f529c39fda88a9c5803bd5ff… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jan 5 15:58:01 2010 +0100 user32: Move a comment about HLOCAL16 to user.exe. --- dlls/user.exe16/message.c | 11 +++++++++++ dlls/user32/edit.c | 14 +------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 011e5c4..1ff58a7 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2094,6 +2094,17 @@ static LRESULT combo_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, return wow_handlers32.combo_proc( hwnd, msg, wParam, lParam, FALSE ); } +/********************************************************************* + * edit_lock_buffer (internal) + * + * A 16 bit application might send an EM_GETHANDLE message and expect a HLOCAL16 + * (16 bit SEG:OFF handler). From that moment on we have to keep using this + * 16 bit memory handler, because it is supposed to be valid at all times after + * EM_GETHANDLE. + * We create a HLOCAL16 buffer in edit_get_handle and copy the text from the + * HLOCAL buffer, when needed + * + */ #define GWW_HANDLE16 sizeof(void*) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index d7ab5b4..20a853e 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1088,19 +1088,7 @@ static inline void text_buffer_changed(EDITSTATE *es) } /********************************************************************* - * - * EDIT_LockBuffer - * - * This acts as a LocalLock16(), but it locks only once. This way - * you can call it whenever you like, without unlocking. - * - * Initially the edit control allocates a HLOCAL32 buffer - * (32 bit linear memory handler). However, 16 bit application - * might send an EM_GETHANDLE message and expect a HLOCAL16 (16 bit SEG:OFF - * handler). From that moment on we have to keep using this 16 bit memory - * handler, because it is supposed to be valid at all times after EM_GETHANDLE. - * What we do is create a HLOCAL16 buffer, copy the text, and do pointer - * conversion. + * EDIT_LockBuffer * */ static void EDIT_LockBuffer(EDITSTATE *es)

1 0

Hans Leidekker : wininet: Fix a memory leak.
by Alexandre Julliard Jan. 5, 2010

Jan. 5, 2010

Module: wine Branch: master Commit: e5180c101bf760e4ab6e5775767572bfe34df5fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5180c101bf760e4ab6e57757… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 5 14:47:37 2010 +0100 wininet: Fix a memory leak. Found by Valgrind. --- dlls/wininet/http.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 70f5f6a..5b1bb22 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3592,6 +3592,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, lpwhr->lpHttpSession->lpszPassword, Host->lpszValue)) { + HeapFree(GetProcessHeap(), 0, requestString); loop_next = TRUE; break; }

1 0

Paul Vriens : kernel32: Add a stubbed GetConsoleProcessList().
by Alexandre Julliard Jan. 5, 2010

Jan. 5, 2010

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

Alexandre Julliard : winedos: Merge all of winedos back into krnl386.
by Alexandre Julliard Jan. 5, 2010

Jan. 5, 2010

Module: wine Branch: master Commit: 26a42f845284bdf642b863597dcb1a90d17b3e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a42f845284bdf642b863597… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 5 14:26:05 2010 +0100 winedos: Merge all of winedos back into krnl386. --- configure | 10 - configure.ac | 2 - dlls/ifsmgr.vxd/Makefile.in | 2 +- dlls/ifsmgr.vxd/ifsmgr.c | 24 +- dlls/krnl386.exe16/Makefile.in | 25 + dlls/{winedos => krnl386.exe16}/dma.c | 0 dlls/{winedos => krnl386.exe16}/dosaspi.c | 0 dlls/{winedos => krnl386.exe16}/dosconf.c | 0 dlls/{winedos/devices.c => krnl386.exe16/dosdev.c} | 0 dlls/{winedos/module.c => krnl386.exe16/dosexe.c} | 18 +- dlls/{winedos => krnl386.exe16}/dosexe.h | 19 +- dlls/krnl386.exe16/dosmem.c | 501 ++++++++++++++++-- dlls/{winedos => krnl386.exe16}/dosvm.c | 23 +- dlls/{winedos => krnl386.exe16}/fpu.c | 0 dlls/krnl386.exe16/global.c | 18 - dlls/krnl386.exe16/instr.c | 33 +- dlls/{winedos => krnl386.exe16}/int09.c | 0 dlls/{winedos => krnl386.exe16}/int10.c | 2 +- dlls/{winedos => krnl386.exe16}/int13.c | 0 dlls/{winedos => krnl386.exe16}/int15.c | 0 dlls/{winedos => krnl386.exe16}/int16.c | 0 dlls/{winedos => krnl386.exe16}/int21.c | 1 + dlls/{winedos => krnl386.exe16}/int25.c | 0 dlls/{winedos => krnl386.exe16}/int26.c | 0 dlls/{winedos => krnl386.exe16}/int2f.c | 52 -- dlls/{winedos => krnl386.exe16}/int31.c | 13 +- dlls/{winedos => krnl386.exe16}/int33.c | 0 dlls/{winedos => krnl386.exe16}/int67.c | 0 dlls/{winedos => krnl386.exe16}/interrupts.c | 19 +- dlls/{winedos => krnl386.exe16}/ioports.c | 9 +- dlls/krnl386.exe16/kernel16_private.h | 59 +-- dlls/krnl386.exe16/krnl386.exe16.spec | 4 + dlls/krnl386.exe16/ne_module.c | 1 + dlls/krnl386.exe16/relay.c | 176 ++++++- dlls/{winedos => krnl386.exe16}/soundblaster.c | 0 dlls/{winedos => krnl386.exe16}/timer.c | 0 dlls/{winedos => krnl386.exe16}/vga.c | 0 dlls/{winedos => krnl386.exe16}/vga.h | 0 dlls/krnl386.exe16/vxd.c | 1 + dlls/vwin32.vxd/Makefile.in | 2 +- dlls/vwin32.vxd/vwin32.c | 35 +-- dlls/winedos/Makefile.in | 39 -- dlls/winedos/dosmem.c | 551 -------------------- dlls/winedos/relay.c | 204 -------- dlls/winedos/winedos.spec | 13 - dlls/winedos/wprocs.spec | 19 - programs/winevdm/winevdm.c | 14 +- 47 files changed, 736 insertions(+), 1153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26a42f845284bdf642b86…

1 0

Alexandre Julliard : kernel: Stop exporting some 16-bit functions that are no longer used outside of kernel .
by Alexandre Julliard Jan. 5, 2010

Jan. 5, 2010

Module: wine Branch: master Commit: 5d8861b0844a2e569f23a853054c9c91706b3e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d8861b0844a2e569f23a8530… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 5 16:28:43 2010 +0100 kernel: Stop exporting some 16-bit functions that are no longer used outside of kernel. --- dlls/krnl386.exe16/krnl386.exe16.spec | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index 13e7091..f3dbbea 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -696,9 +696,7 @@ ################################################################ # 16-bit symbols not available from kernel32 but used by other 16-bit dlls # -@ stdcall -arch=win32 AllocCStoDSAlias16(long) @ stdcall -arch=win32 AllocSelectorArray16(long) -@ stdcall -arch=win32 ConvertDialog32To16(ptr long ptr) @ stdcall -arch=win32 FarGetOwner16(long) @ stdcall -arch=win32 FarSetOwner16(long long) @ stdcall -arch=win32 FindResource16(long str str) @@ -710,10 +708,6 @@ @ stdcall -arch=win32 GetExePtr(long) @ stdcall -arch=win32 GetExpWinVer16(long) @ stdcall -arch=win32 GetModuleHandle16(str) -@ stdcall -arch=win32 GetSelectorLimit16(long) -@ stdcall -arch=win32 GlobalDOSAlloc16(long) -@ stdcall -arch=win32 GlobalDOSFree16(long) -@ stdcall -arch=win32 GlobalFlags16(long) @ stdcall -arch=win32 GlobalReAlloc16(long long long) @ stdcall -arch=win32 InitTask16(ptr) @ stdcall -arch=win32 IsBadReadPtr16(long long) @@ -731,7 +725,6 @@ @ stdcall -arch=win32 LocalCountFree16() @ stdcall -arch=win32 LocalHeapSize16() @ stdcall -arch=win32 LockResource16(long) -@ stdcall -arch=win32 SelectorAccessRights16(long long long) @ stdcall -arch=win32 SetSelectorBase(long long) @ stdcall -arch=win32 SetSelectorLimit16(long long) @ stdcall -arch=win32 SizeofResource16(long long)

1 0

Paul Vriens : mshtml/tests: Fix a test failure on NT4.
by Alexandre Julliard Jan. 5, 2010

Jan. 5, 2010

Module: wine Branch: master Commit: 157b1f69027275e2b0f191463d093e65ba3cec93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157b1f69027275e2b0f191463… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 5 11:12:39 2010 +0100 mshtml/tests: Fix a test failure on NT4. --- dlls/mshtml/tests/dom.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8744129..5c7380e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2130,7 +2130,8 @@ static void _test_elem_filters(unsigned line, IUnknown *unk) IHTMLFiltersCollection *filters; hres = IHTMLElement_get_filters(elem, &filters); - ok_(__FILE__,line) (hres == S_OK, "get_filters failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK || broken(hres == REGDB_E_CLASSNOTREG) /* NT4 */, + "get_filters failed: %08x\n", hres); if(hres == S_OK) { LONG len; @@ -2141,7 +2142,8 @@ static void _test_elem_filters(unsigned line, IUnknown *unk) ok_(__FILE__,line) (len == 0, "expect 0 got %d\n", len); hres = IHTMLFiltersCollection_QueryInterface(filters, &IID_IDispatchEx, (void**)&dispex); - ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IDispatchEx interface: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK || broken(hres == E_NOINTERFACE), + "Could not get IDispatchEx interface: %08x\n", hres); if(SUCCEEDED(hres)) { test_disp((IUnknown*)filters, &IID_IHTMLFiltersCollection, "[object]"); IDispatchEx_Release(dispex);

1 0

Maarten Lankhorst : mmdevapi: Add test showing collection doesn' t keep ref on parent.
by Alexandre Julliard Jan. 5, 2010

Jan. 5, 2010

Module: wine Branch: master Commit: f10d56088e546c76a8aec2abe4b742c80bf779f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f10d56088e546c76a8aec2abe… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 14 18:16:40 2009 +0100 mmdevapi: Add test showing collection doesn't keep ref on parent. --- dlls/mmdevapi/tests/mmdevenum.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index cff72a0..9e8e55c 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -41,6 +41,11 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) UINT numdev; IMMDevice *dev; + /* collection doesn't keep a ref on parent */ + IUnknown_AddRef(mme); + ref = IUnknown_Release(mme); + ok(ref == 2, "Reference count on parent is %u\n", ref); + ref = IUnknown_AddRef(col); IUnknown_Release(col); ok(ref == 2, "Invalid reference count %u on collection\n", ref);

1 0

James Hawkins : user32: Don't try to free a handle with a value of 1, which is the dde handle value for asynchronous operations.
by Alexandre Julliard Jan. 5, 2010

Jan. 5, 2010

Module: wine Branch: master Commit: 289047c7351e6fb3fa15e23824fcb65238b4854a URL: http://source.winehq.org/git/wine.git/?a=commit;h=289047c7351e6fb3fa15e2382… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jan 4 17:47:02 2010 -0800 user32: Don't try to free a handle with a value of 1, which is the dde handle value for asynchronous operations. --- dlls/user32/dde_misc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index ae1df40..ac4657e 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -1468,6 +1468,11 @@ BOOL WINAPI DdeUnaccessData(HDDEDATA hData) BOOL WINAPI DdeFreeDataHandle(HDDEDATA hData) { TRACE("(%p)\n", hData); + + /* 1 is the handle value returned by an asynchronous operation. */ + if (hData == (HDDEDATA)1) + return TRUE; + return GlobalFree(hData) == 0; }

1 0

Henri Verbeet : avifil32: Properly check the required buffer size in AVIFILE_ReadBlock().
by Alexandre Julliard Jan. 5, 2010

Jan. 5, 2010

Module: wine Branch: master Commit: 4c36e12be6fdc1afc6431df3f930715f587ef757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c36e12be6fdc1afc6431df3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 4 21:33:12 2010 +0100 avifil32: Properly check the required buffer size in AVIFILE_ReadBlock(). --- 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 49e141f..2486611 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -2027,7 +2027,7 @@ static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos, size += 2 * sizeof(DWORD); /* check that buffer is big enough -- don't trust dwSuggestedBufferSize */ - if (This->lpBuffer == NULL || size < This->cbBuffer) { + if (This->lpBuffer == NULL || This->cbBuffer < size) { DWORD maxSize = max(size, This->sInfo.dwSuggestedBufferSize); if (This->lpBuffer == NULL)

1 0

Henri Verbeet : avifil32: Just assign maxSize to This-> cbBuffer in AVIFILE_ReadBlock().
by Alexandre Julliard Jan. 5, 2010

Jan. 5, 2010

Module: wine Branch: master Commit: 1fb72a37eb350993a4335cfc790be75f5bce1b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb72a37eb350993a4335cfc7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 4 21:33:13 2010 +0100 avifil32: Just assign maxSize to This->cbBuffer in AVIFILE_ReadBlock(). --- 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 2486611..2d39659 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -2036,7 +2036,7 @@ static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos, This->lpBuffer = HeapReAlloc(GetProcessHeap(), 0, This->lpBuffer, maxSize); if (This->lpBuffer == NULL) return AVIERR_MEMORY; - This->cbBuffer = max(size, This->sInfo.dwSuggestedBufferSize); + This->cbBuffer = maxSize; } /* now read the complete chunk into our buffer */

1 0