April 2008 - wine-commits

Rob Shearman : ole32: Keep track of the number of weak references to an object.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: 8580198dc8eb9b6030c2db66f84a6d22aca2277f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8580198dc8eb9b6030c2db66f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 28 19:42:51 2008 +0100 ole32: Keep track of the number of weak references to an object. This is so that an object will only be released when a weak-reference is used after the last weak reference has been released (either by CoReleaseMarshalData or CoUnmarshalInterface + Release). --- dlls/ole32/compobj.c | 6 +++--- dlls/ole32/compobj_private.h | 7 ++++--- dlls/ole32/marshal.c | 24 +++++++++++++++--------- dlls/ole32/stubmanager.c | 21 ++++++++++++++------- dlls/ole32/tests/moniker.c | 3 +-- 5 files changed, 37 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8580198dc8eb9b6030c2d…

1 0

Rob Shearman : ole32: Add a test for marshaling an object as table-weak and as normal and then unmarshaling and testing that the object is released on the final release .
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: 4cb5c3b7d65451d2e3a27cccce4f02b999289bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb5c3b7d65451d2e3a27cccc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 28 19:42:22 2008 +0100 ole32: Add a test for marshaling an object as table-weak and as normal and then unmarshaling and testing that the object is released on the final release. --- dlls/ole32/tests/marshal.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index a1b9c15..fade8b0 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1077,6 +1077,99 @@ static void test_tableweak_marshal_releasedata2(void) end_host_object(tid, thread); } +struct weak_and_normal_marshal_data +{ + IStream *pStreamWeak; + IStream *pStreamNormal; + HANDLE hReadyEvent; + HANDLE hQuitEvent; +}; + +static DWORD CALLBACK weak_and_normal_marshal_thread_proc(void *p) +{ + HRESULT hr; + struct weak_and_normal_marshal_data *data = p; + HANDLE hQuitEvent = data->hQuitEvent; + MSG msg; + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoMarshalInterface(data->pStreamWeak, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLEWEAK); + ok_ole_success(hr, "CoMarshalInterface"); + + hr = CoMarshalInterface(data->pStreamNormal, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, "CoMarshalInterface"); + + /* force the message queue to be created before signaling parent thread */ + PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + + SetEvent(data->hReadyEvent); + + while (WAIT_OBJECT_0 + 1 == MsgWaitForMultipleObjects(1, &hQuitEvent, FALSE, INFINITE, QS_ALLINPUT)) + { + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessage(&msg); + } + CloseHandle(hQuitEvent); + + CoUninitialize(); + + return 0; +} + +/* tests interaction between table-weak and normal marshalling of an object */ +static void test_tableweak_and_normal_marshal_and_unmarshal(void) +{ + HRESULT hr; + IUnknown *pProxyWeak = NULL; + IUnknown *pProxyNormal = NULL; + DWORD tid; + HANDLE thread; + struct weak_and_normal_marshal_data data; + + cLocks = 0; + + data.hReadyEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + data.hQuitEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStreamWeak); + ok_ole_success(hr, CreateStreamOnHGlobal); + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStreamNormal); + ok_ole_success(hr, CreateStreamOnHGlobal); + + thread = CreateThread(NULL, 0, weak_and_normal_marshal_thread_proc, &data, 0, &tid); + WaitForSingleObject(data.hReadyEvent, INFINITE); + CloseHandle(data.hReadyEvent); + + ok_more_than_one_lock(); + + IStream_Seek(data.pStreamWeak, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(data.pStreamWeak, &IID_IClassFactory, (void **)&pProxyWeak); + ok_ole_success(hr, CoUnmarshalInterface); + + ok_more_than_one_lock(); + + IStream_Seek(data.pStreamNormal, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(data.pStreamNormal, &IID_IClassFactory, (void **)&pProxyNormal); + ok_ole_success(hr, CoUnmarshalInterface); + + ok_more_than_one_lock(); + + IUnknown_Release(pProxyNormal); + + ok_more_than_one_lock(); + + IUnknown_Release(pProxyWeak); + + ok_no_locks(); + + IStream_Release(data.pStreamWeak); + IStream_Release(data.pStreamNormal); + + SetEvent(data.hQuitEvent); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); +} + /* tests success case of a same-thread table-strong marshal, unmarshal, unmarshal */ static void test_tablestrong_marshal_and_unmarshal_twice(void) { @@ -2925,6 +3018,7 @@ START_TEST(marshal) test_tableweak_marshal_and_unmarshal_twice(); test_tableweak_marshal_releasedata1(); test_tableweak_marshal_releasedata2(); + test_tableweak_and_normal_marshal_and_unmarshal(); test_tablestrong_marshal_and_unmarshal_twice(); test_lock_object_external(); test_disconnect_stub();

1 0

Rob Shearman : ole32: Add tests for registering a moniker more than once in the ROT and then using it .
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: 9ebebc0ecc06a0579a93c73117a5b3ab622a7195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ebebc0ecc06a0579a93c7311… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 28 19:42:11 2008 +0100 ole32: Add tests for registering a moniker more than once in the ROT and then using it. --- dlls/ole32/tests/moniker.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 3f3579a..91f7946 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -657,6 +657,7 @@ static void test_ROT(void) todo_wine { ok(hr == CO_E_WRONG_SERVER_IDENTITY, "IRunningObjectTable_Register should have returned CO_E_WRONG_SERVER_IDENTITY instead of 0x%08x\n", hr); } + if (hr == S_OK) IRunningObjectTable_Revoke(pROT, dwCookie); hr = IRunningObjectTable_Register(pROT, 0xdeadbeef, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); @@ -667,6 +668,51 @@ static void test_ROT(void) IRunningObjectTable_Release(pROT); } +static void test_ROT_multiple_entries(void) +{ + HRESULT hr; + IMoniker *pMoniker = NULL; + IRunningObjectTable *pROT = NULL; + DWORD dwCookie1, dwCookie2; + IUnknown *pObject = NULL; + static const WCHAR moniker_path[] = + {'\\', 'w','i','n','d','o','w','s','\\','s','y','s','t','e','m','\\','t','e','s','t','1','.','d','o','c',0}; + + hr = GetRunningObjectTable(0, &pROT); + ok_ole_success(hr, GetRunningObjectTable); + + hr = CreateFileMoniker(moniker_path, &pMoniker); + ok_ole_success(hr, CreateFileMoniker); + + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&Test_ClassFactory, pMoniker, &dwCookie1); + ok_ole_success(hr, IRunningObjectTable_Register); + + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&Test_ClassFactory, pMoniker, &dwCookie2); + ok(hr == MK_S_MONIKERALREADYREGISTERED, "IRunningObjectTable_Register should have returned MK_S_MONIKERALREADYREGISTERED instead of 0x%08x\n", hr); + + todo_wine + ok(dwCookie1 != dwCookie2, "cookie returned for registering duplicate object shouldn't match cookie of original object (0x%x)\n", dwCookie1); + + hr = IRunningObjectTable_GetObject(pROT, pMoniker, &pObject); + ok_ole_success(hr, IRunningObjectTable_GetObject); + IUnknown_Release(pObject); + + hr = IRunningObjectTable_Revoke(pROT, dwCookie1); + ok_ole_success(hr, IRunningObjectTable_Revoke); + + hr = IRunningObjectTable_GetObject(pROT, pMoniker, &pObject); + todo_wine + ok_ole_success(hr, IRunningObjectTable_GetObject); + if (pObject) IUnknown_Release(pObject); + + hr = IRunningObjectTable_Revoke(pROT, dwCookie2); + ok_ole_success(hr, IRunningObjectTable_Revoke); + + IMoniker_Release(pMoniker); + + IRunningObjectTable_Release(pROT); +} + static HRESULT WINAPI ParseDisplayName_QueryInterface(IParseDisplayName *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IUnknown) || @@ -1801,6 +1847,7 @@ START_TEST(moniker) CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_ROT(); + test_ROT_multiple_entries(); test_MkParseDisplayName(); test_class_moniker(); test_file_monikers();

1 0

Lei Zhang : advapi32: Replace UuidToStringW call with a sprintfW.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: 9fca0f27d02d88c6e8f1f8ef870ae59838eeb51d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fca0f27d02d88c6e8f1f8ef8… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 28 11:36:39 2008 -0700 advapi32: Replace UuidToStringW call with a sprintfW. --- dlls/advapi32/crypt.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 0fadc78..5dcb709 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -294,20 +294,31 @@ static void CRYPT_CreateMachineGuid(void) if (lib) { RPC_STATUS (RPC_ENTRY *pUuidCreate)(UUID *); - RPC_STATUS (RPC_ENTRY *pUuidToString)(UUID *, WCHAR **); - RPC_STATUS (RPC_ENTRY *pRpcStringFree)(WCHAR **); UUID uuid; - WCHAR *uuidStr; + WCHAR buf[37]; + RPC_STATUS rs; + static const WCHAR uuidFmt[] = { + '%','0','8','x','-','%','0','4','x','-', + '%','0','4','x','-','%','0','2','x', + '%','0','2','x','-','%','0','2','x', + '%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x', + '%','0','2','x',0 }; pUuidCreate = GetProcAddress(lib, "UuidCreate"); - pUuidToString = GetProcAddress(lib, "UuidToStringW"); - pRpcStringFree = GetProcAddress(lib, "RpcStringFreeW"); - pUuidCreate(&uuid); - pUuidToString(&uuid, &uuidStr); - RegSetValueExW(key, machineGuidW, 0, REG_SZ, - (const BYTE *)uuidStr, - (lstrlenW(uuidStr)+1)*sizeof(WCHAR)); - pRpcStringFree(&uuidStr); + rs = pUuidCreate(&uuid); + if (rs == S_OK) + { + sprintfW(buf, uuidFmt, + uuid.Data1, uuid.Data2, uuid.Data3, + uuid.Data4[0], uuid.Data4[1], + uuid.Data4[2], uuid.Data4[3], + uuid.Data4[4], uuid.Data4[5], + uuid.Data4[6], uuid.Data4[7] ); + RegSetValueExW(key, machineGuidW, 0, REG_SZ, + (const BYTE *)buf, + (lstrlenW(buf)+1)*sizeof(WCHAR)); + } FreeLibrary(lib); } }

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : winhelp: Updated Korean resource.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: d38cd2a54e531296e18f061068f553b23c0b9b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38cd2a54e531296e18f06106… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Apr 28 09:49:06 2008 +0900 winhelp: Updated Korean resource. --- programs/winhelp/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/Ko.rc b/programs/winhelp/Ko.rc index a2cbfdf..273acd7 100644 --- a/programs/winhelp/Ko.rc +++ b/programs/winhelp/Ko.rc @@ -80,5 +80,5 @@ STID_TOPICS, " STID_ALL_FILES, "�� (*.*)" STID_HELP_FILES_HLP, "�� (*.hlp)" STID_FILE_NOT_FOUND_s "%s�� ã�� ϴ�'. �� ã�ڽ��ϱ�?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_NO_RICHEDIT "richedit �� ã�� ϴ�.. ��" }

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : reg: Updated Korean resource.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: fa80ec5f1ecc71f8e44a63bd499d9d8128390a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa80ec5f1ecc71f8e44a63bd4… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Apr 28 09:48:31 2008 +0900 reg: Updated Korean resource. --- programs/reg/Ko.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/Ko.rc b/programs/reg/Ko.rc index 74d3225..0871ec3 100644 --- a/programs/reg/Ko.rc +++ b/programs/reg/Ko.rc @@ -23,8 +23,8 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "��ɾ� ��:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n" - STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n" + STRING_USAGE, "��ɾ� ��:\n\nREG [ ADD | DELETE | QUERY ]\nREG ��ɾ� /?\n" + STRING_ADD_USAGE, "REG ADD �� [/v �� | /ve] [/t ��] [/s �и��ȣ] [/d ��Ÿ] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE �� [/v �� | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY �� [/v ��| /ve] [/s]\n" }

1 0

Vitaliy Margolen : dinput: Fix typo.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: 97535fe243312b001ec5b86b922b272d27c7c401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97535fe243312b001ec5b86b9… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Apr 28 07:19:07 2008 -0600 dinput: Fix typo. --- dlls/dinput/joystick_linux.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3343bb2..df5d77b 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -363,8 +363,8 @@ static HRESULT setup_dinput_options(JoystickImpl * device) device->axis_map[tokens] = axis++; else { - device->axis_map[tokens ] = 8 + pov; - device->axis_map[tokens++] = 8 + pov++; + device->axis_map[tokens++] = 8 + pov; + device->axis_map[tokens ] = 8 + pov++; } } }

1 0

Alexandre Julliard : winex11: Merge the contents of clipping. c into graphics.c.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: 497714a01ff2c6404c5cb48a1a2427d2e4d59541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=497714a01ff2c6404c5cb48a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 28 23:17:10 2008 +0200 winex11: Merge the contents of clipping.c into graphics.c. --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/clipping.c | 122 ------------------------------------------ dlls/winex11.drv/graphics.c | 99 ++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 123 deletions(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 20bdd56..0bafb33 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -13,7 +13,6 @@ C_SRCS = \ bitmap.c \ brush.c \ clipboard.c \ - clipping.c \ codepage.c \ desktop.c \ dib.c \ diff --git a/dlls/winex11.drv/clipping.c b/dlls/winex11.drv/clipping.c deleted file mode 100644 index 5cf806f..0000000 --- a/dlls/winex11.drv/clipping.c +++ /dev/null @@ -1,122 +0,0 @@ -/* - * X11DRV clipping functions - * - * Copyright 1998 Huw Davies - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdio.h> - -#include "x11drv.h" - -/*********************************************************************** - * X11DRV_GetRegionData - * - * Calls GetRegionData on the given region and converts the rectangle - * array to XRectangle format. The returned buffer must be freed by - * caller using HeapFree(GetProcessHeap(),...). - * If hdc_lptodp is not 0, the rectangles are converted through LPtoDP. - */ -RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) -{ - RGNDATA *data; - DWORD size; - unsigned int i; - RECT *rect, tmp; - XRectangle *xrect; - - if (!(size = GetRegionData( hrgn, 0, NULL ))) return NULL; - if (sizeof(XRectangle) > sizeof(RECT)) - { - /* add extra size for XRectangle array */ - int count = (size - sizeof(RGNDATAHEADER)) / sizeof(RECT); - size += count * (sizeof(XRectangle) - sizeof(RECT)); - } - if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; - if (!GetRegionData( hrgn, size, data )) - { - HeapFree( GetProcessHeap(), 0, data ); - return NULL; - } - - rect = (RECT *)data->Buffer; - xrect = (XRectangle *)data->Buffer; - if (hdc_lptodp) /* map to device coordinates */ - { - LPtoDP( hdc_lptodp, (POINT *)rect, data->rdh.nCount * 2 ); - for (i = 0; i < data->rdh.nCount; i++) - { - if (rect[i].right < rect[i].left) - { - INT tmp = rect[i].right; - rect[i].right = rect[i].left; - rect[i].left = tmp; - } - if (rect[i].bottom < rect[i].top) - { - INT tmp = rect[i].bottom; - rect[i].bottom = rect[i].top; - rect[i].top = tmp; - } - } - } - - if (sizeof(XRectangle) > sizeof(RECT)) - { - int j; - /* need to start from the end */ - for (j = data->rdh.nCount-1; j >= 0; j--) - { - tmp = rect[j]; - xrect[j].x = tmp.left; - xrect[j].y = tmp.top; - xrect[j].width = tmp.right - tmp.left; - xrect[j].height = tmp.bottom - tmp.top; - } - } - else - { - for (i = 0; i < data->rdh.nCount; i++) - { - tmp = rect[i]; - xrect[i].x = tmp.left; - xrect[i].y = tmp.top; - xrect[i].width = tmp.right - tmp.left; - xrect[i].height = tmp.bottom - tmp.top; - } - } - return data; -} - - -/*********************************************************************** - * X11DRV_SetDeviceClipping - */ -void X11DRV_SetDeviceClipping( X11DRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ) -{ - RGNDATA *data; - - CombineRgn( physDev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); - if (!(data = X11DRV_GetRegionData( physDev->region, 0 ))) return; - - wine_tsx11_lock(); - XSetClipRectangles( gdi_display, physDev->gc, physDev->dc_rect.left, physDev->dc_rect.top, - (XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); - wine_tsx11_unlock(); - HeapFree( GetProcessHeap(), 0, data ); -} diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index af623ac..197ee21 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -2,6 +2,7 @@ * X11 graphics driver graphics functions * * Copyright 1993,1994 Alexandre Julliard + * Copyright 1998 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -72,6 +73,104 @@ const int X11DRV_XROPfunction[16] = /*********************************************************************** + * X11DRV_GetRegionData + * + * Calls GetRegionData on the given region and converts the rectangle + * array to XRectangle format. The returned buffer must be freed by + * caller using HeapFree(GetProcessHeap(),...). + * If hdc_lptodp is not 0, the rectangles are converted through LPtoDP. + */ +RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) +{ + RGNDATA *data; + DWORD size; + unsigned int i; + RECT *rect, tmp; + XRectangle *xrect; + + if (!(size = GetRegionData( hrgn, 0, NULL ))) return NULL; + if (sizeof(XRectangle) > sizeof(RECT)) + { + /* add extra size for XRectangle array */ + int count = (size - sizeof(RGNDATAHEADER)) / sizeof(RECT); + size += count * (sizeof(XRectangle) - sizeof(RECT)); + } + if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (!GetRegionData( hrgn, size, data )) + { + HeapFree( GetProcessHeap(), 0, data ); + return NULL; + } + + rect = (RECT *)data->Buffer; + xrect = (XRectangle *)data->Buffer; + if (hdc_lptodp) /* map to device coordinates */ + { + LPtoDP( hdc_lptodp, (POINT *)rect, data->rdh.nCount * 2 ); + for (i = 0; i < data->rdh.nCount; i++) + { + if (rect[i].right < rect[i].left) + { + INT tmp = rect[i].right; + rect[i].right = rect[i].left; + rect[i].left = tmp; + } + if (rect[i].bottom < rect[i].top) + { + INT tmp = rect[i].bottom; + rect[i].bottom = rect[i].top; + rect[i].top = tmp; + } + } + } + + if (sizeof(XRectangle) > sizeof(RECT)) + { + int j; + /* need to start from the end */ + for (j = data->rdh.nCount-1; j >= 0; j--) + { + tmp = rect[j]; + xrect[j].x = tmp.left; + xrect[j].y = tmp.top; + xrect[j].width = tmp.right - tmp.left; + xrect[j].height = tmp.bottom - tmp.top; + } + } + else + { + for (i = 0; i < data->rdh.nCount; i++) + { + tmp = rect[i]; + xrect[i].x = tmp.left; + xrect[i].y = tmp.top; + xrect[i].width = tmp.right - tmp.left; + xrect[i].height = tmp.bottom - tmp.top; + } + } + return data; +} + + +/*********************************************************************** + * X11DRV_SetDeviceClipping + */ +void X11DRV_SetDeviceClipping( X11DRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ) +{ + RGNDATA *data; + + CombineRgn( physDev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + if (!(data = X11DRV_GetRegionData( physDev->region, 0 ))) return; + + wine_tsx11_lock(); + XSetClipRectangles( gdi_display, physDev->gc, physDev->dc_rect.left, physDev->dc_rect.top, + (XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); + wine_tsx11_unlock(); + HeapFree( GetProcessHeap(), 0, data ); +} + + +/*********************************************************************** * X11DRV_SetupGCForPatBlt * * Setup the GC for a PatBlt operation using current brush.

1 0

Michael Stefaniuc : winecfg: Transform the set_advanced() driveui function to unicode.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: 618709d21d51fe3230bbdd969ce5c5c5a1bcb395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=618709d21d51fe3230bbdd969… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 27 22:34:13 2008 +0200 winecfg: Transform the set_advanced() driveui function to unicode. --- programs/winecfg/driveui.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 9d9e420..8c313c1 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -118,18 +118,18 @@ static void lv_get_item(HWND dialog, LVITEM *item) static void set_advanced(HWND dialog) { int state; - char text[256]; + WCHAR text[256]; RECT rect; if (advanced) { state = SW_NORMAL; - LoadString(GetModuleHandle(NULL), IDS_HIDE_ADVANCED, text, 256); + LoadStringW(GetModuleHandle(NULL), IDS_HIDE_ADVANCED, text, 256); } else { state = SW_HIDE; - LoadString(GetModuleHandle(NULL), IDS_SHOW_ADVANCED, text, 256); + LoadStringW(GetModuleHandle(NULL), IDS_SHOW_ADVANCED, text, 256); } ShowWindow(GetDlgItem(dialog, IDC_RADIO_AUTODETECT), state); @@ -145,7 +145,7 @@ static void set_advanced(HWND dialog) ShowWindow(GetDlgItem(dialog, IDC_STATIC_TYPE), state); /* update the button text based on the state */ - SetWindowText(GetDlgItem(dialog, IDC_BUTTON_SHOW_HIDE_ADVANCED), text); + SetWindowTextW(GetDlgItem(dialog, IDC_BUTTON_SHOW_HIDE_ADVANCED), text); /* redraw for the etched line */ get_etched_rect(dialog, &rect);

1 0

Austin English : Download-deb.template: Add note about sudo apt-get update
by Jeremy Newman 28 Apr '08

28 Apr '08

Module: website Branch: master Commit: d8808ed72c2bdfb3fb2283c7dbbc63e73209e16b URL: http://source.winehq.org/git/website.git/?a=commit;h=d8808ed72c2bdfb3fb2283… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Apr 26 16:20:53 2008 -0500 Download-deb.template: Add note about sudo apt-get update >From abe778bb0c44185e4392810f4de950ea8c818d57 Mon Sep 17 00:00:00 2001 From: Austin English <austinenglish(a)gmail.com> Date: Sat, 26 Apr 2008 16:18:57 -0500 Subject: [PATCH] Download-deb.template: Add note about apt-get update --- templates/en/download-deb.template | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/templates/en/download-deb.template b/templates/en/download-deb.template index 0e117c9..de71dfb 100644 --- a/templates/en/download-deb.template +++ b/templates/en/download-deb.template @@ -32,7 +32,9 @@ pasting the following:</p> <p><b>For Debian Etch (4.0):</b><br> <i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list</i></p> -<p>Then, you can install Wine by <a href="apt://wine">clicking this link</a>. +<p>Then update APT's package information by running '<b>sudo apt-get update</b>'. + +<p>Now you can install Wine by <a href="apt://wine">clicking this link</a>. Alternatively, you can install by going to Applications->Add/Remove and searching for Wine.</p>

1 0

James Hawkins : user32: Fix a test that fails on platforms without IME.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 17c907e6c3d5f270c042ff464df37c318abe1843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c907e6c3d5f270c042ff464… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 25 22:07:39 2008 -0500 user32: Fix a test that fails on platforms without IME. --- dlls/user32/tests/msg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 98fa424..7f54e61 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -318,13 +318,13 @@ static const struct message WmSwitchNotMaximizedChild[] = { { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, /* in the 2nd MDI child */ { WM_SETVISIBLE, hook }, /* in the 1st MDI child */ { WM_KILLFOCUS, sent|defwinproc }, /* in the 1st MDI child */ - { WM_IME_SETCONTEXT, sent|defwinproc }, /* in the 1st MDI child */ - { WM_IME_SETCONTEXT, sent }, /* in the MDI client */ + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, /* in the 1st MDI child */ + { WM_IME_SETCONTEXT, sent|optional }, /* in the MDI client */ { WM_SETFOCUS, sent, 0 }, /* in the MDI client */ { WM_SETVISIBLE, hook }, { WM_KILLFOCUS, sent }, /* in the MDI client */ - { WM_IME_SETCONTEXT, sent }, /* in the MDI client */ - { WM_IME_SETCONTEXT, sent|defwinproc }, /* in the 1st MDI child */ + { WM_IME_SETCONTEXT, sent|optional }, /* in the MDI client */ + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, /* in the 1st MDI child */ { WM_SETFOCUS, sent|defwinproc }, /* in the 2nd MDI child */ { WM_MDIACTIVATE, sent|defwinproc }, /* in the 2nd MDI child */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE}, /* in the 2nd MDI child */ @@ -3411,7 +3411,7 @@ static void test_mdi_messages(void) flush_sequence(); SendMessageA(mdi_client, WM_MDIACTIVATE, (WPARAM)mdi_child2, 0); - ok_sequence(WmSwitchNotMaximizedChild, "Not maximized child did not switch correctly", TRUE); + ok_sequence(WmSwitchNotMaximizedChild, "Not maximized child did not switch correctly", FALSE); trace("end of test for switch not maximized MDI children\n"); flush_sequence();

1 0

Jens Albretsen : ddraw: Fixed device name.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: cf38e4c9304286f57c1cab31c760e49c033a149c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf38e4c9304286f57c1cab31c… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun Apr 20 01:01:50 2008 +0200 ddraw: Fixed device name. --- dlls/ddraw/direct3d.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 0e026fd..3ccf8e4 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -310,7 +310,7 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 *iface, /* Some games (Motoracer 2 demo) have the bad idea to modify the device name string. Let's put the string in a sufficiently sized array in writable memory. */ char device_name[50]; - strcpy(device_name,"direct3d"); + strcpy(device_name,"Direct3D HEL"); TRACE("(%p)->(%p,%p)\n", This, Callback, Context); EnterCriticalSection(&ddraw_cs); @@ -359,6 +359,8 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 *iface, } } + strcpy(device_name,"Direct3D HAL"); + TRACE("(%p) Enumerating HAL Direct3D device\n", This); d1 = dref; d2 = dref;

1 0

Kai Blin : ws2_32: Handle gethostbyname call failure, add tests.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: c0a3ac5006603baa08161fb78c738c6a9520b6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a3ac5006603baa08161fb78… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Apr 28 10:37:39 2008 +0200 ws2_32: Handle gethostbyname call failure, add tests. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1fe0034..c24a049 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3244,7 +3244,7 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) #else LeaveCriticalSection( &csWSgetXXXbyYYY ); #endif - if (retval->h_addr_list[0][0] == 127 && + if (retval && retval->h_addr_list[0][0] == 127 && strcmp(name, "localhost") != 0) { /* hostname != "localhost" but has loopback address. replace by our diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8dc1f12..3c314d4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1765,6 +1765,73 @@ static void test_dns(void) ok(h != NULL, "gethostbyname(\"\") failed with %d\n", h_errno); } +/* Our winsock headers don't define gethostname because it conflicts with the + * definition in unistd.h. Define it here to get rid of the warning. */ + +int gethostname(char *name, int namelen); + +static void test_gethostbyname_hack(void) +{ + struct hostent *he; + char name[256]; + static BYTE loopback[] = {127, 0, 0, 1}; + static BYTE magic_loopback[] = {127, 12, 34, 56}; + int ret; + + ret = gethostname(name, 256); + ok(ret == 0, "gethostname() call failed: %d\n", WSAGetLastError()); + + he = gethostbyname("localhost"); + ok(he != NULL, "gethostbyname(\"localhost\") failed: %d\n", h_errno); + if(he) + { + if(he->h_length != 4) + { + skip("h_length is %d, not IPv4, skipping test.\n", he->h_length); + return; + } + + ok(memcmp(he->h_addr_list[0], loopback, he->h_length) == 0, + "gethostbyname(\"localhost\") returned %d.%d.%d.%d\n", + he->h_addr_list[0][0], he->h_addr_list[0][1], he->h_addr_list[0][2], + he->h_addr_list[0][3]); + } + + /* No reason to test further with NULL hostname */ + if(name == NULL) + return; + + if(strcmp(name, "localhost") == 0) + { + skip("hostname seems to be \"localhost\", skipping test.\n"); + return; + } + + he = NULL; + he = gethostbyname(name); + ok(he != NULL, "gethostbyname(\"%s\") failed: %d\n", name, h_errno); + if(he) + { + if(he->h_length != 4) + { + skip("h_length is %d, not IPv4, skipping test.\n", he->h_length); + return; + } + + if (he->h_addr_list[0][0] == 127) + { + ok(memcmp(he->h_addr_list[0], magic_loopback, he->h_length) == 0, + "gethostbyname(\"%s\") returned %d.%d.%d.%d not 127.12.34.56\n", + name, he->h_addr_list[0][0], he->h_addr_list[0][1], + he->h_addr_list[0][2], he->h_addr_list[0][3]); + } + } + + he = NULL; + he = gethostbyname("someweirdandbogusname"); + ok(he == NULL, "gethostbyname(\"someweirdandbogusname\") succeeded.\n"); +} + static void test_inet_addr(void) { u_long addr; @@ -1997,6 +2064,7 @@ START_TEST( sock ) test_getsockname(); test_inet_addr(); test_dns(); + test_gethostbyname_hack(); test_send(); test_write_events();

1 0

Jacek Caban : mshtml: Added IHTMLInputElement::get_disabled implementation.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 4e913b9551746f432fc2c96ef8a708dcf9ad3323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e913b9551746f432fc2c96ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 28 11:57:25 2008 +0200 mshtml: Added IHTMLInputElement::get_disabled implementation. --- dlls/mshtml/htmlinput.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e580bb6..dd0a8b5 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -223,8 +223,14 @@ static HRESULT WINAPI HTMLInputElement_put_disabled(IHTMLInputElement *iface, VA static HRESULT WINAPI HTMLInputElement_get_disabled(IHTMLInputElement *iface, VARIANT_BOOL *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool disabled = FALSE; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMHTMLInputElement_GetDisabled(This->nsinput, &disabled); + + *p = disabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLFormElement **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8c6f60f..7d607d7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -40,7 +40,8 @@ static const char range_test2_str[] = "<html><body>abc<hr />123<br /><hr />def</body></html>"; static const char elem_test_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" - "<body>text test<a href=\"http://test\" name=\"x\">link</a><input />" + "<body>text test<a href=\"http://test\" name=\"x\">link</a>" + "<input id=\"in\" />" "<select id=\"s\"><option id=\"x\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" "<table><tbody></tbody></table>" @@ -783,6 +784,17 @@ static long _get_node_type(unsigned line, IUnknown *unk) return type; } +#define test_input_get_disabled(i,b) _test_input_get_disabled(__LINE__,i,b) +static void _test_input_get_disabled(unsigned line, IHTMLInputElement *input, VARIANT_BOOL exb) +{ + VARIANT_BOOL disabled = 100; + HRESULT hres; + + hres = IHTMLInputElement_get_disabled(input, &disabled); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1429,6 +1441,7 @@ static void test_elems(IHTMLDocument2 *doc) long type; HRESULT hres; + static const WCHAR inW[] = {'i','n',0}; static const WCHAR xW[] = {'x',0}; static const WCHAR sW[] = {'s',0}; static const WCHAR scW[] = {'s','c',0}; @@ -1528,6 +1541,19 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLScriptElement_Release(script); } + elem = get_elem_by_id(doc, inW, TRUE); + if(elem) { + IHTMLInputElement *input; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLInputElement, (void**)&input); + ok(hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + + test_input_get_disabled(input, VARIANT_FALSE); + + IHTMLInputElement_Release(input); + IHTMLElement_Release(elem); + } + hres = IHTMLDocument2_get_body(doc, &elem); ok(hres == S_OK, "get_body failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added put_backgroundImage implementation.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: deeaa5d20fdf5c3fc207c044b7df8b0d0c65323b URL: http://source.winehq.org/git/wine.git/?a=commit;h=deeaa5d20fdf5c3fc207c044b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 28 11:57:06 2008 +0200 mshtml: Added put_backgroundImage implementation. --- dlls/mshtml/htmlstyle.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index cb24831..a955a56 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -44,6 +44,8 @@ typedef struct { static const WCHAR attrBackgroundColor[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; +static const WCHAR attrBackgroundImage[] = + {'b','a','c','k','g','r','o','u','n','d','-','i','m','a','g','e',0}; static const WCHAR attrBorderLeft[] = {'b','o','r','d','e','r','-','l','e','f','t',0}; static const WCHAR attrColor[] = @@ -451,8 +453,10 @@ static HRESULT WINAPI HTMLStyle_get_backgroundColor(IHTMLStyle *iface, VARIANT * static HRESULT WINAPI HTMLStyle_put_backgroundImage(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, attrBackgroundImage, v, 0); } static HRESULT WINAPI HTMLStyle_get_backgroundImage(IHTMLStyle *iface, BSTR *p)

1 0

Jacek Caban : mshtml.idl: Added DispHTMLInputElement declaration.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 32846424be02af2600fee5aaadb2b9652b40902d URL: http://source.winehq.org/git/wine.git/?a=commit;h=32846424be02af2600fee5aaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 28 11:56:53 2008 +0200 mshtml.idl: Added DispHTMLInputElement declaration. --- include/mshtmdid.h | 9 + include/mshtml.idl | 1047 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1056 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32846424be02af2600fee…

1 0

Vitaliy Margolen : dinput: Fix default axes mapping generation.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 736d03c8da58268564f851d9be2c2c077b88c80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=736d03c8da58268564f851d9b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 27 23:01:55 2008 -0600 dinput: Fix default axes mapping generation. --- dlls/dinput/joystick_linux.c | 44 +++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 46ce4ce..3343bb2 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -271,6 +271,9 @@ static HRESULT setup_dinput_options(JoystickImpl * device) { char buffer[MAX_PATH+16]; HKEY hkey, appkey; + int tokens = 0; + int axis = 0; + int pov = 0; buffer[MAX_PATH]='\0'; @@ -283,18 +286,14 @@ static HRESULT setup_dinput_options(JoystickImpl * device) TRACE("setting default deadzone to: \"%s\" %d\n", buffer, device->deadzone); } + device->axis_map = HeapAlloc(GetProcessHeap(), 0, device->axes * sizeof(int)); + if (!device->axis_map) return DIERR_OUTOFMEMORY; + if (!get_config_key( hkey, appkey, device->name, buffer, MAX_PATH )) { - int tokens = 0; - int axis = 0; - int pov = 0; const char *delim = ","; char * ptr; TRACE("\"%s\" = \"%s\"\n", device->name, buffer); - device->axis_map = HeapAlloc(GetProcessHeap(), 0, device->axes * sizeof(int)); - if (device->axis_map == 0) - return DIERR_OUTOFMEMORY; - if ((ptr = strtok(buffer, delim)) != NULL) { do { if (strcmp(ptr, "X") == 0) { @@ -355,9 +354,22 @@ static HRESULT setup_dinput_options(JoystickImpl * device) } } - device->devcaps.dwAxes = axis; - device->devcaps.dwPOVs = pov; } + else + { + for (tokens = 0; tokens < device->axes; tokens++) + { + if (tokens < 8) + device->axis_map[tokens] = axis++; + else + { + device->axis_map[tokens ] = 8 + pov; + device->axis_map[tokens++] = 8 + pov++; + } + } + } + device->devcaps.dwAxes = axis; + device->devcaps.dwPOVs = pov; if (appkey) RegCloseKey( appkey ); @@ -445,29 +457,17 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di /* setup_dinput_options may change these */ newDevice->deadzone = 0; newDevice->devcaps.dwButtons = newDevice->buttons; - newDevice->devcaps.dwAxes = newDevice->axes; - newDevice->devcaps.dwPOVs = 0; /* do any user specified configuration */ hr = setup_dinput_options(newDevice); if (hr != DI_OK) goto FAILED1; - if (newDevice->axis_map == 0) { - newDevice->axis_map = HeapAlloc(GetProcessHeap(), 0, newDevice->axes * sizeof(int)); - if (newDevice->axis_map == 0) - goto FAILED; - - for (i = 0; i < newDevice->axes; i++) - newDevice->axis_map[i] = i; - } - /* Create copy of default data format */ if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto FAILED; memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); - /* Axes include POVs */ - df->dwNumObjs = newDevice->axes + newDevice->buttons; + df->dwNumObjs = newDevice->devcaps.dwAxes + newDevice->devcaps.dwPOVs + newDevice->buttons; if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto FAILED; for (i = 0; i < newDevice->axes; i++)

1 0

Rob Shearman : ole32: Fix two comments about the running object table.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 67a7a8a8ef63c91390a9838a01980c938937376b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a7a8a8ef63c91390a9838a0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 27 23:01:16 2008 +0100 ole32: Fix two comments about the running object table. --- dlls/ole32/moniker.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 413d110..68ea4d1 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -19,11 +19,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * TODO: - * - IRunningObjectTable should work interprocess, but currently doesn't. - * Native (on Win2k at least) uses an undocumented RPC interface, IROT, to - * communicate with RPCSS which contains the table of marshalled data. */ #include <stdarg.h> @@ -974,9 +969,9 @@ HRESULT WINAPI RunningObjectTableImpl_Initialize(void) /* initialize the virtual table function */ runningObjectTableInstance->lpVtbl = &VT_RunningObjectTableImpl; - /* the initial reference is set to "1" ! because if set to "0" it will be not practis when */ - /* the ROT referred many times not in the same time (all the objects in the ROT will */ - /* be removed every time the ROT is removed ) */ + /* the initial reference is set to "1" so that it isn't destroyed after its + * first use until the process is destroyed, as the running object table is + * a process-wide cache of a global table */ runningObjectTableInstance->ref = 1; list_init(&runningObjectTableInstance->rot);

1 0

Andrew Talbot : comctl32: Dangling pointers fix.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 2db311a843e2830105c174190d1cd6b5a39a7746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db311a843e2830105c174190… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Apr 27 14:17:30 2008 +0100 comctl32: Dangling pointers fix. --- dlls/comctl32/comboex.c | 4 +++- dlls/comctl32/trackbar.c | 3 ++- dlls/comctl32/treeview.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index e79831d..cfcfed8 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1600,9 +1600,11 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) if (infoPtr->defaultFont) DeleteObject (infoPtr->defaultFont); + SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); + /* free comboex info data */ Free (infoPtr); - SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); + return 0; } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index e81d55f..a25f81e 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1452,9 +1452,10 @@ TRACKBAR_Destroy (TRACKBAR_INFO *infoPtr) if (infoPtr->hwndToolTip) DestroyWindow (infoPtr->hwndToolTip); - Free (infoPtr); SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); + Free (infoPtr); + return 0; } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 2b71a3b..fb67c24 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1019,7 +1019,6 @@ static void TREEVIEW_FreeItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) { DPA_DeletePtr(infoPtr->items, DPA_GetPtrIndex(infoPtr->items, item)); - Free(item); if (infoPtr->selectedItem == item) infoPtr->selectedItem = NULL; if (infoPtr->hotItem == item) @@ -1032,6 +1031,7 @@ TREEVIEW_FreeItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) infoPtr->dropItem = NULL; if (infoPtr->insertMarkItem == item) infoPtr->insertMarkItem = NULL; + Free(item); }

1 0

Jeff Zaroyko : wine.inf: Use lowercase for some drivers32 entries and remove trailing whitespace.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: c6d0d6d1854547e25614040aed2946d7ad0bcf26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d0d6d1854547e25614040ae… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Mon Apr 28 19:21:45 2008 +1000 wine.inf: Use lowercase for some drivers32 entries and remove trailing whitespace. --- tools/wine.inf.in | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 5a610d4..f3750b3 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2295,25 +2295,25 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Internet Explorer,iexplore.exe [SystemIni] -system.ini, mci,,"MPEGVideo=mciqtz.drv" -system.ini, mci,,"MPEGVideo2=mciqtz.drv" -system.ini, mci,,"avivideo=mciavi32.dll" -system.ini, mci,,"cdaudio=mcicda.dll" -system.ini, mci,,"sequencer=mciseq.dll" -system.ini, mci,,"vcr=mcivisca.drv" -system.ini, mci,,"; videodisc=mcipionr.drv" -system.ini, mci,,"waveaudio=mciwave.dll" - -system.ini, drivers32,,"MSACM.imaadpcm=imaadp32.acm" -system.ini, drivers32,,"MSACM.msadpcm=msadp32.acm" -system.ini, drivers32,,"MSACM.msg711=msg711.acm" -system.ini, drivers32,,"MSACM.winemp3=winemp3.acm" -system.ini, drivers32,,"vidc.MRLE=msrle32.dll" -system.ini, drivers32,,"vidc.MSVC=msvidc32.dll" -system.ini, drivers32,,"vidc.CVID=iccvid.dll" -system.ini, drivers32,,"; vidc.IV50=ir50_32.dll" -system.ini, drivers32,,"; vidc.IV31=ir32_32.dll" -system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" +system.ini, mci,,"MPEGVideo=mciqtz.drv" +system.ini, mci,,"MPEGVideo2=mciqtz.drv" +system.ini, mci,,"avivideo=mciavi32.dll" +system.ini, mci,,"cdaudio=mcicda.dll" +system.ini, mci,,"sequencer=mciseq.dll" +system.ini, mci,,"vcr=mcivisca.drv" +system.ini, mci,,"; videodisc=mcipionr.drv" +system.ini, mci,,"waveaudio=mciwave.dll" + +system.ini, drivers32,,"msacm.imaadpcm=imaadp32.acm" +system.ini, drivers32,,"msacm.msadpcm=msadp32.acm" +system.ini, drivers32,,"msacm.msg711=msg711.acm" +system.ini, drivers32,,"msacm.winemp3=winemp3.acm" +system.ini, drivers32,,"vidc.mrle=msrle32.dll" +system.ini, drivers32,,"vidc.msvc=msvidc32.dll" +system.ini, drivers32,,"vidc.cvid=iccvid.dll" +system.ini, drivers32,,"; vidc.IV50=ir50_32.dll" +system.ini, drivers32,,"; vidc.IV31=ir32_32.dll" +system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" [Timezones] ; The timezone information (TZI field) comes from the Olson timezone database

1 0

Jeff Zaroyko : msacm32.drv: Increase the reported vDriverVersion.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 120cd69ddd07b9ef45afcd2db4653d870f89ed67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120cd69ddd07b9ef45afcd2db… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sun Apr 27 17:27:39 2008 +1000 msacm32.drv: Increase the reported vDriverVersion. --- dlls/msacm32.drv/wavemap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 38bb1f1..9e58a3d 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -509,7 +509,7 @@ static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveC WAVEOUTCAPSW woc; woc.wMid = 0x00FF; woc.wPid = 0x0001; - woc.vDriverVersion = 0x0100; + woc.vDriverVersion = 0x0332; lstrcpyW(woc.szPname, name); woc.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 |

1 0

David Adam : amstream: Register CLSID_AMDirectDrawStream.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 8c21ebc6854d46c486e9e29e100a414fbdfef90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c21ebc6854d46c486e9e29e1… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun Apr 27 12:16:33 2008 +0200 amstream: Register CLSID_AMDirectDrawStream. --- dlls/amstream/main.c | 1 + dlls/amstream/regsvr.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 080fc17..7bebe90 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -74,6 +74,7 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { { &CLSID_AMMultiMediaStream, AM_create }, + { &CLSID_AMDirectDrawStream, AM_create }, }; static HRESULT WINAPI diff --git a/dlls/amstream/regsvr.c b/dlls/amstream/regsvr.c index 054de6a..478818f 100644 --- a/dlls/amstream/regsvr.c +++ b/dlls/amstream/regsvr.c @@ -447,6 +447,14 @@ static struct regsvr_coclass const coclass_list[] = { "amstream.dll", "Both" }, + + { &CLSID_AMDirectDrawStream, + "ActiveMovie MultiMedia Stream", + NULL, + "amstream.dll", + "Both" + }, + { NULL } /* list terminator */ };

1 0

David Adam : amstream: Fix the condition of existence of the IMediaStream interface.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 653c7e7dcaf7ebee2cfc8a6e356779dc8974aac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=653c7e7dcaf7ebee2cfc8a6e3… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun Apr 27 12:10:32 2008 +0200 amstream: Fix the condition of existence of the IMediaStream interface. --- dlls/amstream/mediastream.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 2cb7ce6..3d15731 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -71,7 +71,8 @@ static HRESULT WINAPI IMediaStreamImpl_QueryInterface(IMediaStream* iface, REFII TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IAMMultiMediaStream)) + IsEqualGUID(riid, &IID_IAMMultiMediaStream) || + IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) { IClassFactory_AddRef(iface); *ppvObject = This;

1 0

Alistair Leslie-Hughes : msxml3: Added IObjectWithSite support in IXMLDOMDocument2.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 340f34ddf632fab78608075781d273c6520f5999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=340f34ddf632fab7860807578… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Apr 26 22:55:05 2008 +1000 msxml3: Added IObjectWithSite support in IXMLDOMDocument2. --- dlls/msxml3/domdoc.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a05247a..7ce17bd 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -34,6 +34,7 @@ #include "urlmon.h" #include "winreg.h" #include "shlwapi.h" +#include "ocidl.h" #include "wine/debug.h" @@ -169,6 +170,7 @@ typedef struct _domdoc { const struct IXMLDOMDocument2Vtbl *lpVtbl; const struct IPersistStreamVtbl *lpvtblIPersistStream; + const struct IObjectWithSiteVtbl *lpvtblIObjectWithSite; LONG ref; VARIANT_BOOL async; VARIANT_BOOL validating; @@ -182,6 +184,9 @@ typedef struct _domdoc /* IPersistStream */ IStream *stream; + + /* IObjectWithSite*/ + IUnknown *site; } domdoc; LONG xmldoc_add_ref(xmlDocPtr doc) @@ -219,6 +224,11 @@ static inline domdoc *impl_from_IPersistStream(IPersistStream *iface) return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIPersistStream)); } +static inline domdoc *impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIObjectWithSite)); +} + /************************************************************************ * xmldoc implementation of IPersistStream. */ @@ -368,6 +378,10 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii { *ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream); } + else if (IsEqualGUID(&IID_IObjectWithSite, riid)) + { + *ppvObject = (IObjectWithSite*)&(This->lpvtblIObjectWithSite); + } else if(IsEqualGUID(&IID_IRunnableObject, riid)) { TRACE("IID_IRunnableObject not supported returning NULL\n"); @@ -405,6 +419,8 @@ static ULONG WINAPI domdoc_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { + if (This->site) + IUnknown_Release( This->site ); IUnknown_Release( This->node_unk ); if(This->schema) IXMLDOMSchemaCollection_Release( This->schema ); if (This->stream) IStream_Release(This->stream); @@ -1930,6 +1946,79 @@ static const struct IXMLDOMDocument2Vtbl domdoc_vtbl = domdoc_getProperty }; +/* xmldoc implementation of IObjectWithSite */ +static HRESULT WINAPI +xmldoc_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) +{ + domdoc *This = impl_from_IObjectWithSite(iface); + return IXMLDocument_QueryInterface( (IXMLDocument *)This, riid, ppvObject ); +} + +static ULONG WINAPI +xmldoc_ObjectWithSite_AddRef( IObjectWithSite* iface ) +{ + domdoc *This = impl_from_IObjectWithSite(iface); + return IXMLDocument_AddRef((IXMLDocument *)This); +} + +static ULONG WINAPI +xmldoc_ObjectWithSite_Release( IObjectWithSite* iface ) +{ + domdoc *This = impl_from_IObjectWithSite(iface); + return IXMLDocument_Release((IXMLDocument *)This); +} + +static HRESULT WINAPI +xmldoc_GetSite( IObjectWithSite *iface, REFIID iid, void ** ppvSite ) +{ + domdoc *This = impl_from_IObjectWithSite(iface); + + TRACE("%p %s %p\n", This, debugstr_guid( iid ), ppvSite ); + + if ( !This->site ) + return E_FAIL; + + return IUnknown_QueryInterface( This->site, iid, ppvSite ); +} + +static HRESULT WINAPI +xmldoc_SetSite( IObjectWithSite *iface, IUnknown *punk ) +{ + domdoc *This = impl_from_IObjectWithSite(iface); + + TRACE("%p %p\n", iface, punk); + + if(!punk) + { + if(This->site) + { + IUnknown_Release( This->site ); + This->site = NULL; + } + + return S_OK; + } + + if ( punk ) + IUnknown_AddRef( punk ); + + if(This->site) + IUnknown_Release( This->site ); + + This->site = punk; + + return S_OK; +} + +static const IObjectWithSiteVtbl domdocObjectSite = +{ + xmldoc_ObjectWithSite_QueryInterface, + xmldoc_ObjectWithSite_AddRef, + xmldoc_ObjectWithSite_Release, + xmldoc_SetSite, + xmldoc_GetSite, +}; + HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) { domdoc *doc; @@ -1944,6 +2033,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->lpVtbl = &domdoc_vtbl; doc->lpvtblIPersistStream = &xmldoc_IPersistStream_VTable; + doc->lpvtblIObjectWithSite = &domdocObjectSite; doc->ref = 1; doc->async = 0; doc->validating = 0; @@ -1953,6 +2043,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->error = S_OK; doc->schema = NULL; doc->stream = NULL; + doc->site = NULL; xmldoc = xmlNewDoc(NULL); if(!xmldoc)

1 0

Bryan DeGrendel : winex11: Rudimentary drawing support for display balloon tool tips in systray.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 6ed80f15297486877a9fd89863a60735ce6b390e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed80f15297486877a9fd8986… Author: Bryan DeGrendel <sirnuke(a)gmail.com> Date: Sat Apr 26 06:44:07 2008 -0400 winex11: Rudimentary drawing support for display balloon tool tips in systray. --- dlls/winex11.drv/systray.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 460fd47..a6cf182 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -55,7 +55,8 @@ struct tray_icon HWND tooltip; /* Icon tooltip */ UINT id; /* the unique id given by the app */ UINT callback_message; - WCHAR tiptext[128]; /* Tooltip text. If empty => tooltip disabled */ + WCHAR tiptext[256]; /* Tooltip text. If empty => tooltip disabled */ + WCHAR tiptitle[64]; /* Tooltip title for ballon style tooltips. If empty => tooltip is not balloon style. */ }; static struct list icon_list = LIST_INIT( icon_list ); @@ -95,12 +96,22 @@ static void create_tooltip(struct tray_icon *icon) InitCommonControlsEx(&init_tooltip); tooltips_initialized = TRUE; } - - icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, - WS_POPUP | TTS_ALWAYSTIP, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - icon->window, NULL, NULL, NULL); + if (icon->tiptitle[0] != 0) + { + icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, + WS_POPUP | TTS_ALWAYSTIP | TTS_BALLOON, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + icon->window, NULL, NULL, NULL); + } + else + { + icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, + WS_POPUP | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + icon->window, NULL, NULL, NULL); + } if (icon->tooltip) { TTTOOLINFOW ti; @@ -344,11 +355,14 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) if (nid->uFlags & NIF_TIP) { lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); + icon->tiptitle[0] = 0; if (icon->tooltip) update_tooltip_text(icon); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { - FIXME("balloon tip title %s, message %s\n", wine_dbgstr_w(nid->szInfoTitle), wine_dbgstr_w(nid->szInfo)); + lstrcpynW(icon->tiptext, nid->szInfo, sizeof(icon->tiptext)/sizeof(WCHAR)); + lstrcpynW(icon->tiptitle, nid->szInfoTitle, sizeof(icon->tiptitle)/sizeof(WCHAR)); + if (icon->tooltip) update_tooltip_text(icon); } return TRUE; }

1 0

ByeongSik Jeon : imm32: Updated implementation of the Imm{Get|Set}CompositionFont{A|W}.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 4ce9b42c80472150df22cad924e65d1ece99f6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce9b42c80472150df22cad92… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Sat Apr 26 00:19:42 2008 +0900 imm32: Updated implementation of the Imm{Get|Set}CompositionFont{A|W}. --- dlls/imm32/imm.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2a29361..2247cf4 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -774,13 +774,13 @@ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) TRACE("(%p, %p):\n", hIMC, lplf); rc = ImmGetCompositionFontW(hIMC,&lfW); - if (rc) - { - memcpy(lplf,&lfW,sizeof(LOGFONTA)); - WideCharToMultiByte(CP_ACP, 0, lfW.lfFaceName, -1, lplf->lfFaceName, + if (!rc || !lplf) + return FALSE; + + memcpy(lplf,&lfW,sizeof(LOGFONTA)); + WideCharToMultiByte(CP_ACP, 0, lfW.lfFaceName, -1, lplf->lfFaceName, LF_FACESIZE, NULL, NULL); - } - return rc; + return TRUE; } /*********************************************************************** @@ -792,7 +792,7 @@ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) TRACE("(%p, %p):\n", hIMC, lplf); - if (!data) + if (!data || !lplf) return FALSE; *lplf = data->IMC.lfFont.W; @@ -1658,12 +1658,13 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) InputContextData *data = (InputContextData*)hIMC; TRACE("(%p, %p)\n", hIMC, lplf); - if (!data) + if (!data || !lplf) return FALSE; memcpy(&data->IMC.lfFont.W,lplf,sizeof(LOGFONTA)); MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->IMC.lfFont.W.lfFaceName, LF_FACESIZE); + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); return TRUE; @@ -1677,10 +1678,11 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) InputContextData *data = (InputContextData*)hIMC; TRACE("(%p, %p)\n", hIMC, lplf); - if (!data) + if (!data || !lplf) return FALSE; data->IMC.lfFont.W = *lplf; + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); return TRUE;

1 0

ByeongSik Jeon : imm32: Implementation of the Imm{Get|Set}StatusWindowPos.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: b322bc682e814e5d9c3bee717f76812240cf93cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b322bc682e814e5d9c3bee717… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Sat Apr 26 00:19:34 2008 +0900 imm32: Implementation of the Imm{Get|Set}StatusWindowPos. --- dlls/imm32/imm.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 259bf3a..2a29361 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1384,9 +1384,16 @@ UINT WINAPI ImmGetRegisterWordStyleW( */ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - FIXME("(%p, %p): stub\n", hIMC, lpptPos); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("(%p, %p)\n", hIMC, lpptPos); + + if (!data || !lpptPos) + return FALSE; + + *lpptPos = data->IMC.ptStatusWndPos; + + return TRUE; } /*********************************************************************** @@ -1882,9 +1889,20 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) */ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - FIXME("(%p, %p): stub\n", hIMC, lpptPos); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("(%p, %p)\n", hIMC, lpptPos); + + if (!data || !lpptPos) + return FALSE; + + TRACE("\t(%i,%i)\n", lpptPos->x, lpptPos->y); + + data->IMC.ptStatusWndPos = *lpptPos; + ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETSTATUSWINDOWPOS); + ImmInternalSendIMENotify(data, IMN_SETSTATUSWINDOWPOS, 0); + + return TRUE; } /***********************************************************************

1 0

ByeongSik Jeon : imm32: Implementation of the Imm{Get|Set}CandidateWindow.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 5d49b3db8d80d8f37c97d32dbb2defa132200f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d49b3db8d80d8f37c97d32db… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Sat Apr 26 00:19:27 2008 +0900 imm32: Implementation of the Imm{Get|Set}CandidateWindow. --- dlls/imm32/imm.c | 42 +++++++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 0400939..259bf3a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -746,11 +746,21 @@ DWORD WINAPI ImmGetCandidateListW( * ImmGetCandidateWindow (IMM32.@) */ BOOL WINAPI ImmGetCandidateWindow( - HIMC hIMC, DWORD dwBufLen, LPCANDIDATEFORM lpCandidate) + HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandidate) { - FIXME("(%p, %d, %p): stub\n", hIMC, dwBufLen, lpCandidate); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("%p, %d, %p\n", hIMC, dwIndex, lpCandidate); + + if (!data || !lpCandidate) + return FALSE; + + if ( dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + return FALSE; + + *lpCandidate = data->IMC.cfCandForm[dwIndex]; + + return TRUE; } /*********************************************************************** @@ -1610,9 +1620,27 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) BOOL WINAPI ImmSetCandidateWindow( HIMC hIMC, LPCANDIDATEFORM lpCandidate) { - FIXME("(%p, %p): stub\n", hIMC, lpCandidate); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("(%p, %p)\n", hIMC, lpCandidate); + + if (!data || !lpCandidate) + return FALSE; + + TRACE("\t%x, %x, (%i,%i), (%i,%i - %i,%i)\n", + lpCandidate->dwIndex, lpCandidate->dwStyle, + lpCandidate->ptCurrentPos.x, lpCandidate->ptCurrentPos.y, + lpCandidate->rcArea.top, lpCandidate->rcArea.left, + lpCandidate->rcArea.bottom, lpCandidate->rcArea.right); + + if ( lpCandidate->dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + return FALSE; + + data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate; + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS); + ImmInternalSendIMENotify(data, IMN_SETCANDIDATEPOS, 1 << lpCandidate->dwIndex); + + return TRUE; } /***********************************************************************

1 0

ByeongSik Jeon : user32: Set the vkey value to VK_PROCESSKEY when IME process key.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 936e8473dbea0790ecb64d8af843e87840a6b331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=936e8473dbea0790ecb64d8af… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Sat Apr 26 00:19:22 2008 +0900 user32: Set the vkey value to VK_PROCESSKEY when IME process key. --- dlls/user32/message.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 7f3407e..7f1b68b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -36,6 +36,7 @@ #include "dbt.h" #include "dde.h" #include "imm.h" +#include "ddk/imm.h" #include "wine/unicode.h" #include "wine/server.h" #include "user_private.h" @@ -1747,6 +1748,11 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, return FALSE; } accept_hardware_message( hw_id, remove, 0 ); + + if ( msg->message == WM_KEYDOWN || msg->message == WM_KEYUP ) + if ( ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) + msg->wParam = VK_PROCESSKEY; + return TRUE; } @@ -2995,8 +3001,8 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) TRACE_(key)("Translating key %s (%04lx), scancode %02x\n", SPY_GetVKeyName(msg->wParam), msg->wParam, LOBYTE(HIWORD(msg->lParam))); - if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam,0)) - return TRUE; + if ( msg->wParam == VK_PROCESSKEY ) + return ImmTranslateMessage(msg->hwnd, msg->message, msg->wParam, msg->lParam); GetKeyboardState( state ); /* FIXME : should handle ToUnicode yielding 2 */

1 0

ByeongSik Jeon : imm32: Add the updated ImmTranslateMessage declaration.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 63d81263e2ce8c181a6fa202f80f2bfeced5f0b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d81263e2ce8c181a6fa202f… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Sat Apr 26 00:19:15 2008 +0900 imm32: Add the updated ImmTranslateMessage declaration. --- dlls/imm32/imm.c | 6 ++++-- include/ddk/imm.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index f89dd2a..0400939 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2233,7 +2233,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) * ImmTranslateMessage(IMM32.@) * ( Undocumented, call internally and from user32.dll ) */ -BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) +BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyData) { InputContextData *data; HIMC imc = ImmGetContext(hwnd); @@ -2244,7 +2244,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) UINT uVirtKey; static const int list_count = 10; - TRACE("%p %x %x %x\n",hwnd, msg, chr, (UINT)lKeyData); + TRACE("%p %x %x %x\n",hwnd, msg, (UINT)wParam, (UINT)lKeyData); if (imc) data = (InputContextData*)imc; @@ -2262,6 +2262,8 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) if (data->immKbd->imeInfo.fdwProperty & IME_PROP_KBD_CHAR_FIRST) { + WCHAR chr; + if (!is_himc_ime_unicode(data)) ToAscii(data->lastVK, scancode, state, &chr, 0); else diff --git a/include/ddk/imm.h b/include/ddk/imm.h index a33073d..6e4d42f 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -144,7 +144,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC); LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM); #define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage); - +BOOL WINAPI ImmTranslateMessage(HWND, UINT, WPARAM, LPARAM); HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); BOOL WINAPI ImmDestroySoftKeyboard(HWND); BOOL WINAPI ImmShowSoftKeyboard(HWND, int);

1 0

Dmitry Timoshkov : gdi32: Add SetPixel to the EMF DC functions.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: c814d17c764341dc127ab1c6307abe5cdf91ff23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c814d17c764341dc127ab1c63… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 25 22:39:59 2008 +0900 gdi32: Add SetPixel to the EMF DC functions. --- dlls/gdi32/enhmfdrv/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 2203ced..7e68847 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -130,7 +130,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = NULL, /* pSetDeviceGammaRamp */ EMFDRV_SetMapMode, /* pSetMapMode */ EMFDRV_SetMapperFlags, /* pSetMapperFlags */ - NULL, /* pSetPixel */ + EMFDRV_SetPixel, /* pSetPixel */ NULL, /* pSetPixelFormat */ EMFDRV_SetPolyFillMode, /* pSetPolyFillMode */ EMFDRV_SetROP2, /* pSetROP2 */

1 0

Guy Albertelli : listview: Correct return value from LVM_GETORIGIN including tests for this.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 7fb21244d9d9369d95c4109e7ad421a176796d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb21244d9d9369d95c4109e7… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Sat Apr 26 00:20:09 2008 -0400 listview: Correct return value from LVM_GETORIGIN including tests for this. Tests to validate return value of the LVM_GETORIGIN message and fix our implementation. --- dlls/comctl32/listview.c | 2 + dlls/comctl32/tests/listview.c | 49 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a634f98..7760ecb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9632,6 +9632,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_GETORIGIN: if (!lParam) return FALSE; + if ((infoPtr->dwStyle & LVS_TYPEMASK) == LVS_REPORT || + (infoPtr->dwStyle & LVS_TYPEMASK) == LVS_LIST) return FALSE; LISTVIEW_GetOrigin(infoPtr, (LPPOINT)lParam); return TRUE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ad82579..838691c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1076,6 +1076,54 @@ static void test_item_position(void) DestroyWindow(hwnd); } +static void test_getorigin(void) +{ + /* LVM_GETORIGIN */ + + HWND hwnd; + DWORD r; + POINT position; + + position.x = position.y = 0; + + hwnd = create_custom_listview_control(LVS_ICON); + ok(hwnd != NULL, "failed to create a listview window\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); + expect(TRUE, r); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + DestroyWindow(hwnd); + + hwnd = create_custom_listview_control(LVS_SMALLICON); + ok(hwnd != NULL, "failed to create a listview window\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); + expect(TRUE, r); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + DestroyWindow(hwnd); + + hwnd = create_custom_listview_control(LVS_LIST); + ok(hwnd != NULL, "failed to create a listview window\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); + expect(FALSE, r); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + DestroyWindow(hwnd); + + hwnd = create_custom_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); + expect(FALSE, r); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + DestroyWindow(hwnd); + +} + START_TEST(listview) { HMODULE hComctl32; @@ -1111,4 +1159,5 @@ START_TEST(listview) test_item_count(); test_item_position(); test_columns(); + test_getorigin(); }

1 0

Guy Albertelli : listview: Implement 2 pixel decoration at top of report style with grid lines.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: e85fa81f3cc8b52f01b603cb228379a0ed764cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85fa81f3cc8b52f01b603cb2… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Sat Apr 26 00:20:06 2008 -0400 listview: Implement 2 pixel decoration at top of report style with grid lines. The native control has a 2 pixel header. This implements that background pixel line and the gridline below it. --- dlls/comctl32/listview.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ad0ad0e..a634f98 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4100,6 +4100,9 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) itemheight = LISTVIEW_CalculateItemHeight(infoPtr); rcItem.left = infoPtr->rcList.left + Origin.x; rcItem.right = infoPtr->rcList.right + Origin.x; + rcItem.bottom = rcItem.top = Origin.y - 1; + MoveToEx(hdc, rcItem.left, rcItem.top, NULL); + LineTo(hdc, rcItem.right, rcItem.top); for(y=itemheight-1+Origin.y; y<=infoPtr->rcList.bottom; y+=itemheight) { rcItem.bottom = rcItem.top = y; @@ -7131,6 +7134,13 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, dwStyle); } + /* GRIDLINES adds decoration at top so changes sizes */ + if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_GRIDLINES) + { + LISTVIEW_UpdateSize(infoPtr); + } + + LISTVIEW_InvalidateList(infoPtr); return dwOldExStyle; } @@ -9368,10 +9378,12 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) hl.prc = &infoPtr->rcList; hl.pwpos = &wp; SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); - + TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy); SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, wp.flags); + TRACE(" after SWP wp=%d,%d (%dx%d)\n", wp.x, wp.y, wp.cx, wp.cy); infoPtr->rcList.top = max(wp.cy, 0); + infoPtr->rcList.top += (infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) ? 2 : 0; } TRACE(" rcList=%s\n", wine_dbgstr_rect(&infoPtr->rcList));

1 0

Guy Albertelli : listview: Implement LVS_EX_GRIDLINES functionality.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 7326f091b0f19e2043fcccc2d4d75c3e43cdae92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7326f091b0f19e2043fcccc2d… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Sat Apr 26 00:20:03 2008 -0400 listview: Implement LVS_EX_GRIDLINES functionality. Implement basic LVS_EX_GRIDLINES functionality including support for no items. --- dlls/comctl32/listview.c | 94 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ab819e6..ad0ad0e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -91,7 +91,6 @@ * Extended Styles * -- LVS_EX_BORDERSELECT * -- LVS_EX_FLATSB - * -- LVS_EX_GRIDLINES * -- LVS_EX_HEADERDRAGDROP * -- LVS_EX_INFOTIP * -- LVS_EX_LABELTIP @@ -2495,6 +2494,8 @@ static INT LISTVIEW_CalculateItemHeight(const LISTVIEW_INFO *infoPtr) else { nItemHeight = infoPtr->ntmHeight; + if (uView == LVS_REPORT && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) + nItemHeight++; if (infoPtr->himlState) nItemHeight = max(nItemHeight, infoPtr->iconStateSize.cy); if (infoPtr->himlSmall) @@ -3873,6 +3874,11 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS else rcLabel.left += LABEL_HOR_PADDING; } else if (uFormat & DT_RIGHT) rcLabel.right -= LABEL_HOR_PADDING; + + /* for GRIDLINES reduce the bottom so the text formats correctly */ + if (uView == LVS_REPORT && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) + rcLabel.bottom--; + DrawTextW(hdc, lvItem.pszText, -1, &rcLabel, uFormat); postpaint: @@ -4029,6 +4035,86 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, /*** * DESCRIPTION: + * Draws the gridlines if necessary when in report display mode. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] hdc : device context handle + * + * RETURN: + * None + */ +static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) +{ + INT rgntype; + INT y, itemheight; + HPEN hPen, hOldPen; + RECT rcClip, rcItem; + POINT Origin; + RANGE colRange; + ITERATOR j; + + TRACE("()\n"); + + /* figure out what to draw */ + rgntype = GetClipBox(hdc, &rcClip); + if (rgntype == NULLREGION) return; + + /* Get scroll info once before loop */ + LISTVIEW_GetOrigin(infoPtr, &Origin); + + /* narrow down the columns we need to paint */ + for(colRange.lower = 0; colRange.lower < DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.lower++) + { + LISTVIEW_GetHeaderRect(infoPtr, colRange.lower, &rcItem); + if (rcItem.right + Origin.x >= rcClip.left) break; + } + for(colRange.upper = DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.upper > 0; colRange.upper--) + { + LISTVIEW_GetHeaderRect(infoPtr, colRange.upper - 1, &rcItem); + if (rcItem.left + Origin.x < rcClip.right) break; + } + iterator_rangeitems(&j, colRange); + + if ((hPen = CreatePen( PS_SOLID, 1, comctl32_color.clr3dFace ))) + { + hOldPen = SelectObject ( hdc, hPen ); + + /* draw the vertical lines for the columns */ + iterator_rangeitems(&j, colRange); + while(iterator_next(&j)) + { + LISTVIEW_GetHeaderRect(infoPtr, j.nItem, &rcItem); + if (rcItem.left == 0) continue; /* skip first column */ + rcItem.left += Origin.x; + rcItem.right += Origin.x; + rcItem.top = infoPtr->rcList.top; + rcItem.bottom = infoPtr->rcList.bottom; + TRACE("vert col=%d, rcItem=%s\n", j.nItem, wine_dbgstr_rect(&rcItem)); + MoveToEx (hdc, rcItem.left, rcItem.top, NULL); + LineTo (hdc, rcItem.left, rcItem.bottom); + } + iterator_destroy(&j); + + /* draw the horizontial lines for the rows */ + itemheight = LISTVIEW_CalculateItemHeight(infoPtr); + rcItem.left = infoPtr->rcList.left + Origin.x; + rcItem.right = infoPtr->rcList.right + Origin.x; + for(y=itemheight-1+Origin.y; y<=infoPtr->rcList.bottom; y+=itemheight) + { + rcItem.bottom = rcItem.top = y; + TRACE("horz rcItem=%s\n", wine_dbgstr_rect(&rcItem)); + MoveToEx (hdc, rcItem.left, rcItem.top, NULL); + LineTo (hdc, rcItem.right, rcItem.top); + } + + SelectObject( hdc, hOldPen ); + DeleteObject( hPen ); + } +} + +/*** + * DESCRIPTION: * Draws listview items when in list display mode. * * PARAMETER(S): @@ -4175,6 +4261,12 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra iterator_destroy(&i); enddraw: + /* For LVS_EX_GRIDLINES go and draw lines */ + /* This includes the case where there were *no* items */ + if ((infoPtr->dwStyle & LVS_TYPEMASK) == LVS_REPORT && + infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) + LISTVIEW_RefreshReportGrid(infoPtr, hdc); + if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd);

1 0

Maarten Lankhorst : quartz: Fix acmwrapper time regression.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 10708b405c2303e782a688edad1a79215fca142d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10708b405c2303e782a688eda… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 15:14:54 2008 -0700 quartz: Fix acmwrapper time regression. --- dlls/quartz/acmwrapper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 65f196a..c7b1e42 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -170,7 +170,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte if (ash.cbSrcLengthUsed == cbSrcStream) { IMediaSample_SetTime(pOutSample, &tStart, &tStop); - tStart = tStop; + tStart = tMed = tStop; } else if (tStop != tStart) {

1 0

Maarten Lankhorst : quartz: Add a function that can be called when stopping processing data.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 512ee927cb56a6b3355550c2f929d34f080247ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=512ee927cb56a6b3355550c2f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:59:05 2008 -0700 quartz: Add a function that can be called when stopping processing data. --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 65 +++++++++++++++++++++++++++++++--------------- dlls/quartz/parser.h | 2 +- dlls/quartz/pin.c | 12 ++++++-- dlls/quartz/pin.h | 8 +++++- dlls/quartz/waveparser.c | 2 +- 7 files changed, 64 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=512ee927cb56a6b335555…

1 0

Maarten Lankhorst : quartz: Make dwSamplesProcessed a longlong.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: ec87de35af3ccb76383697b51aefe8041bbfdc15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec87de35af3ccb76383697b51… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:50:22 2008 -0700 quartz: Make dwSamplesProcessed a longlong. --- dlls/quartz/parser.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 6fda5e3..f30a8fd 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -52,7 +52,7 @@ typedef struct Parser_OutputPin OutputPin pin; AM_MEDIA_TYPE * pmt; - DWORD dwSamplesProcessed; + LONGLONG dwSamplesProcessed; } Parser_OutputPin; extern HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt);

1 0

Maarten Lankhorst : quartz: Optimize the file source to do its job better.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 12a0fd3d8b0acff07ec07b4d7f5ea1f79effad93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a0fd3d8b0acff07ec07b4d7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:33:15 2008 -0700 quartz: Optimize the file source to do its job better. --- dlls/quartz/filesource.c | 42 +++++++++++++++++++++++++++++++++--------- 1 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a44de7a..1ac37b0 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -769,6 +769,8 @@ typedef struct FileAsyncReader LONG samples; CRITICAL_SECTION csList; /* critical section to prevent concurrency issues */ DATAREQUEST *sample_list; + + /* Have a handle for every sample, and then one more as flushing handle */ HANDLE *handle_list; } FileAsyncReader; @@ -832,7 +834,7 @@ static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) CoTaskMemFree(This->sample_list); if (This->handle_list) { - for (x = 0; x < This->samples; ++x) + for (x = 0; x <= This->samples; ++x) CloseHandle(This->handle_list[x]); CoTaskMemFree(This->handle_list); } @@ -1009,7 +1011,7 @@ done: if (This->handle_list) { int x; - for (x = 0; x < This->samples; ++x) + for (x = 0; x <= This->samples; ++x) CloseHandle(This->handle_list[x]); CoTaskMemFree(This->handle_list); } @@ -1017,7 +1019,7 @@ done: This->samples = pProps->cBuffers; TRACE("Samples: %u\n", This->samples); This->sample_list = CoTaskMemAlloc(sizeof(This->sample_list[0]) * pProps->cBuffers); - This->handle_list = CoTaskMemAlloc(sizeof(HANDLE) * pProps->cBuffers); + This->handle_list = CoTaskMemAlloc(sizeof(HANDLE) * (pProps->cBuffers + 1)); if (This->sample_list && This->handle_list) { @@ -1027,6 +1029,7 @@ done: { This->sample_list[x].ovl.hEvent = This->handle_list[x] = CreateEventW(NULL, 0, 0, NULL); } + This->handle_list[This->samples] = CreateEventW(NULL, 1, 0, NULL); This->pin.allocProps = *pProps; } else @@ -1060,6 +1063,7 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample REFERENCE_TIME Stop; FileAsyncReader *This = impl_from_IAsyncReader(iface); LPBYTE pBuffer = NULL; + DWORD wait; TRACE("(%p, %lx)\n", pSample, dwUser); @@ -1080,17 +1084,32 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample return VFW_E_WRONG_STATE; } + wait = WaitForMultipleObjectsEx(This->samples, This->handle_list, FALSE, 0, FALSE); + if (wait < This->samples - 1) + SetEvent(This->handle_list[wait]); + else + wait = This->samples; + if (SUCCEEDED(hr)) { DWORD dwLength = (DWORD) BYTES_FROM_MEDIATIME(Stop - Start); DATAREQUEST *pDataRq; int x; - for (x = 0; x < This->samples; ++x) + /* Try to insert above the waiting sample if possible */ + for (x = wait + 1; x < This->samples; ++x) { if (!This->sample_list[x].pSample) break; } + + if (x >= This->samples) + for (x = 0; x < This->samples; ++x) + { + if (!This->sample_list[x].pSample) + break; + } + assert(x < This->samples); InterlockedIncrement(&This->queued_number); @@ -1138,20 +1157,20 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw { if (!This->queued_number) { - ERR("Called without samples in queue and not flushing!!\n"); - return E_FAIL; + /* It could be that nothing is queued right now, but that can be fixed */ + WARN("Called without samples in queue and not flushing!!\n"); } /* wait for an object to read, or time out */ - buffer = WaitForMultipleObjectsEx(This->samples, This->handle_list, FALSE, dwTimeout, TRUE); + buffer = WaitForMultipleObjectsEx(This->samples+1, This->handle_list, FALSE, dwTimeout, TRUE); - if (buffer >= MAXIMUM_WAIT_OBJECTS) + if (buffer >= This->samples) { FIXME("Returned: %u (%08x)\n", buffer, GetLastError()); hr = VFW_E_TIMEOUT; buffer = ~0; } - else + else if (buffer < This->samples) InterlockedDecrement(&This->queued_number); } @@ -1161,7 +1180,10 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw for (buffer = 0; buffer < This->samples; ++buffer) { if (This->sample_list[buffer].pSample) + { + ResetEvent(This->handle_list[buffer]); break; + } } if (buffer == This->samples) { @@ -1311,6 +1333,7 @@ static HRESULT WINAPI FileAsyncReader_BeginFlush(IAsyncReader * iface) EnterCriticalSection(&This->csList); This->bFlushing = TRUE; CancelIo(This->hFile); + SetEvent(This->handle_list[This->samples]); LeaveCriticalSection(&This->csList); return S_OK; @@ -1323,6 +1346,7 @@ static HRESULT WINAPI FileAsyncReader_EndFlush(IAsyncReader * iface) TRACE("()\n"); EnterCriticalSection(&This->csList); + ResetEvent(This->handle_list[This->samples]); This->bFlushing = FALSE; LeaveCriticalSection(&This->csList);

1 0

Maarten Lankhorst : quartz: Make the EnumPins interface dynamic.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 79349513435aa677e584bcad66865cafbac95db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79349513435aa677e584bcad6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:25:49 2008 -0700 quartz: Make the EnumPins interface dynamic. Take a reference to the ibasefilter and request it for the pins and a cookie. This seems to be the easiest way to ensure correctness. --- dlls/quartz/dsoundrender.c | 41 ++++++++++++------------- dlls/quartz/enumpins.c | 69 ++++++++++++++++++++++++++++-------------- dlls/quartz/filesource.c | 25 ++++++++++++--- dlls/quartz/nullrenderer.c | 33 ++++++++++++-------- dlls/quartz/parser.c | 27 +++++++++++++--- dlls/quartz/parser.h | 1 + dlls/quartz/quartz_private.h | 10 ++---- dlls/quartz/transform.c | 20 ++++++++++-- dlls/quartz/videorenderer.c | 52 ++++++++++++++++++++----------- 9 files changed, 182 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79349513435aa677e584b…

1 0

Maarten Lankhorst : quartz: Fix time discontinuities in the acm wrapper.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: b7e20bfdd1bc9777e56cb3fe73976e38146c1741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e20bfdd1bc9777e56cb3fe7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:15:42 2008 -0700 quartz: Fix time discontinuities in the acm wrapper. --- dlls/quartz/acmwrapper.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 11b07f1..65f196a 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -47,6 +47,9 @@ typedef struct ACMWrapperImpl HACMSTREAM has; LPWAVEFORMATEX pWfIn; LPWAVEFORMATEX pWfOut; + + LONGLONG lasttime_real; + LONGLONG lasttime_sent; } ACMWrapperImpl; static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilter, IMediaSample *pSample) @@ -75,6 +78,19 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte IMediaSample_GetTime(pSample, &tStart, &tStop); cbSrcStream = IMediaSample_GetActualDataLength(pSample); + /* Prevent discontinuities when codecs 'absorb' data but not give anything back in return */ + if (IMediaSample_IsDiscontinuity(pSample) == S_OK) + { + This->lasttime_real = tStart; + This->lasttime_sent = tStart; + } + else if (This->lasttime_real == tStart) + tStart = This->lasttime_sent; + else + WARN("Discontinuity\n"); + + tMed = tStart; + TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); @@ -132,19 +148,20 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte if (res) { - if(res != MMSYSERR_MOREDATA) - ERR("Cannot convert data header %d\n", res); - goto error; - } + if(res != MMSYSERR_MOREDATA) + ERR("Cannot convert data header %d\n", res); + goto error; + } - TRACE("used in %u/%u, used out %u/%u\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength); + TRACE("used in %u/%u, used out %u/%u\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength); - hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed); - assert(hr == S_OK); + hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed); + assert(hr == S_OK); + /* Bug in acm codecs? It apparantly uses the input, but doesn't necessarily output immediately kl*/ if (!ash.cbSrcLengthUsed) { - WARN("Sample was skipped\n"); + WARN("Sample was skipped? Outputted: %u\n", ash.cbDstLengthUsed); ash.cbSrcLength = 0; goto error; } @@ -187,8 +204,15 @@ error: if (pOutSample) IMediaSample_Release(pOutSample); pOutSample = NULL; + } + This->lasttime_real = tStop; + This->lasttime_sent = tMed; + + if (hr != S_OK) + FIXME("FATALITY: %08x\n", hr); + return hr; } @@ -252,6 +276,7 @@ static HRESULT ACMWrapper_Cleanup(TransformFilterImpl* pTransformFilter) acmStreamClose(This->has, 0); This->has = 0; + This->lasttime_real = This->lasttime_sent = -1; return S_OK; } @@ -287,6 +312,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; *ppv = (LPVOID)This; + This->lasttime_real = This->lasttime_sent = -1; return hr; }

1 0

Maarten Lankhorst : quartz: NotifyAllocator does not like a null argument.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 9e143cdb6323446506444a23caf717477270dc52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e143cdb6323446506444a23c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:14:24 2008 -0700 quartz: NotifyAllocator does not like a null argument. --- dlls/quartz/pin.c | 13 +++++++++---- dlls/quartz/tests/videorenderer.c | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 868f73e..6bbcf9a 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -759,6 +759,13 @@ HRESULT WINAPI MemInputPin_NotifyAllocator(IMemInputPin * iface, IMemAllocator * if (bReadOnly) FIXME("Read only flag not handled yet!\n"); + /* FIXME: Should we release the allocator on disconnection? */ + if (!pAllocator) + { + WARN("Null allocator\n"); + return E_POINTER; + } + if (This->pAllocator) IMemAllocator_Release(This->pAllocator); This->pAllocator = pAllocator; @@ -1187,11 +1194,9 @@ HRESULT OutputPin_DeliverDisconnect(OutputPin * This) } else /* Kill the allocator! */ { - hr = IMemInputPin_NotifyAllocator(This->pMemInputPin, NULL, 0); - if (SUCCEEDED(hr)) - hr = IPin_Disconnect(This->pin.pConnectedTo); + hr = IPin_Disconnect(This->pin.pConnectedTo); } - + IPin_Disconnect((IPin *)This); } LeaveCriticalSection(This->pin.pCritSec); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 378e019..d18620f 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -96,6 +96,7 @@ static void test_pin(IPin *pin) if (mpin) { ok(IMemInputPin_ReceiveCanBlock(mpin) == S_OK, "Receive can't block for pin!\n"); + ok(IMemInputPin_NotifyAllocator(mpin, NULL, 0) == E_POINTER, "NotifyAllocator likes a NULL pointer argument\n"); IMemInputPin_Release(mpin); } /* TODO */

1 0

Maarten Lankhorst : quartz: Add a vtable argument to Parser_Create that individual filters can override .
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 1f136a57f7a54b78741540ae34378d7624bb1f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f136a57f7a54b78741540ae3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 23 11:23:43 2008 -0700 quartz: Add a vtable argument to Parser_Create that individual filters can override. --- dlls/quartz/avisplit.c | 21 ++++++++- dlls/quartz/mpegsplit.c | 21 ++++++++- dlls/quartz/parser.c | 121 +++++++++++++++++---------------------------- dlls/quartz/parser.h | 27 +++++++++-- dlls/quartz/waveparser.c | 21 ++++++++- 5 files changed, 129 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f136a57f7a54b7874154…

1 0

Kirill K. Smirnov : winhelp: Fix possible copy/paste error.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 471d68c1d1c85c02c91ecad7c59729ff9a44553d URL: http://source.winehq.org/git/wine.git/?a=commit;h=471d68c1d1c85c02c91ecad7c… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Apr 25 19:42:34 2008 +0400 winhelp: Fix possible copy/paste error. --- programs/winhelp/hlpfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 15ca70f..e7ae75e 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -2243,7 +2243,7 @@ static BOOL HLPFILE_UncompressLZ77_Phrases(HLPFILE* hlpfile) } for (i = 0; i <= num; i++) - hlpfile->phrases_offsets[i] = GET_USHORT(buf, 0x11 + 2 * i) - 2 * num - 2; + hlpfile->phrases_offsets[i] = GET_USHORT(buf, head_size + 2 * i) - 2 * num - 2; if (hlpfile->version <= 16) memcpy(hlpfile->phrases_buffer, buf + 15 + 2*num, dec_size);

1 0

Kirill K. Smirnov : winhelp: Shift by 6 not 4 in case of old 3.0 file.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: bfaeb42b09b79eb87e87c285d53ccd4b9ef46e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfaeb42b09b79eb87e87c285d… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Apr 25 19:41:44 2008 +0400 winhelp: Shift by 6 not 4 in case of old 3.0 file. This necessary piece of code was lost. Restore it. --- programs/winhelp/hlpfile.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index ca46d3a..15ca70f 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1267,7 +1267,10 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE format += 5; } else nc++; - format += 4; + if (buf[0x14] == 0x01) + format += 6; + else + format += 4; bits = GET_USHORT(format, 0); format += 2; if (bits & 0x0001) fetch_long(&format); if (bits & 0x0002)

1 0

Kirill K. Smirnov : winhelp: We can reference any page in HLPFILE_BrowsePage(). Perform similar change in HLPFILE_DoReadHlpFile() for the symmetry.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 5744fb45cfb5631dd5dbec05a426b051ef0227a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5744fb45cfb5631dd5dbec05a… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Apr 25 19:38:30 2008 +0400 winhelp: We can reference any page in HLPFILE_BrowsePage(). Perform similar change in HLPFILE_DoReadHlpFile() for the symmetry. --- programs/winhelp/hlpfile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index f5935a1..ca46d3a 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -327,7 +327,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) offset = (ref - 0x0C) & 0x3FFF; } - if (hlpfile->version <= 16 && index != old_index && index != 0) + if (hlpfile->version <= 16 && index != old_index && old_index != -1) { /* we jumped to the next block, adjust pointers */ ref -= 12; @@ -1770,7 +1770,7 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd) offset = (ref - 0x0C) & 0x3FFF; } - if (hlpfile->version <= 16 && index != old_index && index != 0) + if (hlpfile->version <= 16 && index != old_index && old_index != -1) { /* we jumped to the next block, adjust pointers */ ref -= 12;

1 0

Rob Shearman : widl: Accept integer constant suffixes in the lexer.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 0cb73cef0be2e75cefd8878837df0ecc0599508a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb73cef0be2e75cefd887883… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 27 23:05:31 2008 +0100 widl: Accept integer constant suffixes in the lexer. --- tools/widl/parser.l | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 3bc2b62..c0fbd7d 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -25,9 +25,11 @@ nl \r?\n ws [ \f\t\r] cident [a-zA-Z_][0-9a-zA-Z_]* -int [0-9]+ +u_suffix (u|U) +l_suffix (l|L) +int [0-9]+({l_suffix}?{u_suffix}?|{u_suffix}?{l_suffix}?)? hexd [0-9a-fA-F] -hex 0(x|X){hexd}+ +hex 0(x|X){hexd}+({l_suffix}?{u_suffix}?|{u_suffix}?{l_suffix}?)? uuid {hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12} double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)*

1 0

Rob Shearman : widl: Support hex digits that use an uppercase 0X prefix.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 62a64755934591850420b5c45b222637ca8cfef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a64755934591850420b5c45… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Apr 26 09:51:47 2008 +0100 widl: Support hex digits that use an uppercase 0X prefix. --- tools/widl/parser.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 1e8460b..3bc2b62 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -27,7 +27,7 @@ ws [ \f\t\r] cident [a-zA-Z_][0-9a-zA-Z_]* int [0-9]+ hexd [0-9a-fA-F] -hex 0x{hexd}+ +hex 0(x|X){hexd}+ uuid {hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12} double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)*

1 0

Rob Shearman : widl: Add typedefs to typelibs which have the public or uuid attributes, not any other attribute.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 80be9df3a709c8da8a37de4727ba043a42ae5a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=80be9df3a709c8da8a37de472… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Apr 26 09:51:28 2008 +0100 widl: Add typedefs to typelibs which have the public or uuid attributes, not any other attribute. --- tools/widl/parser.y | 7 ++++--- tools/widl/typelib.c | 2 +- tools/widl/write_msft.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8e0ff86..45fbd82 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1676,8 +1676,7 @@ static type_t *reg_typedefs(type_t *type, declarator_list_t *decls, attr_list_t /* We must generate names for tagless enum, struct or union. Typedef-ing a tagless enum, struct or union means we want the typedef - to be included in a library whether it has other attributes or not, - hence the public attribute. */ + to be included in a library hence the public attribute. */ if ((type->kind == TKIND_ENUM || type->kind == TKIND_RECORD || type->kind == TKIND_UNION) && ! type->name && ! parse_only) { @@ -1685,6 +1684,8 @@ static type_t *reg_typedefs(type_t *type, declarator_list_t *decls, attr_list_t attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); type->name = gen_name(); } + else if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC)) + attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry ) { @@ -2650,7 +2651,7 @@ static statement_t *process_typedefs(declarator_list_t *decls) if (! parse_only && do_header) write_typedef(type); - if (in_typelib && type->attrs) + if (in_typelib && is_attr(type->attrs, ATTR_PUBLIC)) add_typelib_entry(type); type_list = &(*type_list)->next; diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index cd1c69b..7000788 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -173,7 +173,7 @@ unsigned short get_type_vt(type_t *t) if (vt) return vt; } - if (t->kind == TKIND_ALIAS && t->attrs) + if (t->kind == TKIND_ALIAS && is_attr(t->attrs, ATTR_PUBLIC)) return VT_USERDEFINED; switch (t->type) { diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index f040dbe..35c1f05 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -962,8 +962,8 @@ static int encode_type( { int typeinfo_offset; - /* typedef'd types without attributes aren't included in the typelib */ - while (type->typelib_idx < 0 && type->kind == TKIND_ALIAS && ! type->attrs) + /* typedef'd types without public attribute aren't included in the typelib */ + while (type->typelib_idx < 0 && type->kind == TKIND_ALIAS && !is_attr(type->attrs, ATTR_PUBLIC)) type = type->orig; chat("encode_type: VT_USERDEFINED - type %p name = %s type->type %d idx %d\n", type,

1 0

Dmitry Timoshkov : winecfg: Update Russian translation.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 1d70c7ada499fe3e36e00b6b2f9dadf5b724ec9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d70c7ada499fe3e36e00b6b2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 28 17:49:51 2008 +0900 winecfg: Update Russian translation. --- programs/winecfg/Ru.rc | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 25c41bd..ac5de25 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -66,17 +66,24 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " �� ",IDC_STATIC,8,4,244,180 - CONTROL "�� DirectX �� ",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,235,8 - CONTROL "�� Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,34,230,8 + CONTROL "�� DirectX �� ",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,235,8 + + CONTROL "�� &�� ",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 + + CONTROL "�� Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 + + LTEXT "�� , �� , �� , � �� .\n\n�� , �� . �� , �� , �� , � �� .", + IDC_STATIC,19,51,225,80 CONTROL "�� ",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,152,230,10 - LTEXT "�� , �� '�� ' �� . �� , �� , �� .", - IDC_STATIC,15,117,228,36 - LTEXT "�� :",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED - EDITTEXT IDC_DESKTOP_WIDTH,64,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + BS_AUTOCHECKBOX | WS_TABSTOP,15,128,230,10 + LTEXT "�� Windows �� , �� , �� .", + IDC_STATIC,19,138,225,28 + + LTEXT "�� :",IDC_DESKTOP_SIZE,15,168,84,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,149,168,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,104,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,157,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED GROUPBOX " Direct3D ",IDC_STATIC,8,189,244,45

1 0

Rob Shearman : rpcrt4: Use safe_copy_from_buffer instead of direct memory copy in NdrBaseTypeUnmarshall .
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 8e08b1dd7f2b0ff6f72c5bcdf3e2f67a8c1cf448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e08b1dd7f2b0ff6f72c5bcdf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 28 10:21:33 2008 +0100 rpcrt4: Use safe_copy_from_buffer instead of direct memory copy in NdrBaseTypeUnmarshall. This makes the code check that the buffer is big enough to read from before copying the data from it. The safe_buffer_increment call is still needed for the case where we point the memory to the buffer, so move the call there. --- dlls/rpcrt4/ndr_marshall.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 25e6853..bdc5098 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6051,15 +6051,15 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall( { \ *ppMemory = pStubMsg->Buffer; \ TRACE("*ppMemory: %p\n", *ppMemory); \ + safe_buffer_increment(pStubMsg, sizeof(type)); \ } \ else \ { \ if (fMustAlloc) \ *ppMemory = NdrAllocate(pStubMsg, sizeof(type)); \ TRACE("*ppMemory: %p\n", *ppMemory); \ - **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ - } \ - safe_buffer_increment(pStubMsg, sizeof(type)); + safe_copy_from_buffer(pStubMsg, *ppMemory, sizeof(type)); \ + } switch(*pFormat) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008