April 2008 - Wine-commits - list.winehq.org

Rob Shearman : rpcss: When registering a moniker that is already registered in the ROT another ROT entry should still be created and a distinct cookie returned .
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: b9f8a81d8c8ebf35d597b3cc0b35813d0473da7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f8a81d8c8ebf35d597b3cc0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 28 19:42:35 2008 +0100 rpcss: When registering a moniker that is already registered in the ROT another ROT entry should still be created and a distinct cookie returned. --- dlls/ole32/tests/moniker.c | 1 - programs/rpcss/irotp.c | 20 +++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index aa737c0..b15cce4 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -690,7 +690,6 @@ static void test_ROT_multiple_entries(void) 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); diff --git a/programs/rpcss/irotp.c b/programs/rpcss/irotp.c index 21ede32..6f32205 100644 --- a/programs/rpcss/irotp.c +++ b/programs/rpcss/irotp.c @@ -137,24 +137,14 @@ HRESULT IrotRegister( } } - if (hr == S_OK) - { - list_add_tail(&RunningObjectTable, &rot_entry->entry); - /* gives a registration identifier to the registered object*/ - *cookie = rot_entry->cookie = InterlockedIncrement(&last_cookie); - *ctxt_handle = rot_entry; - } - else - { - rot_entry_release(rot_entry); - *cookie = existing_rot_entry->cookie; - InterlockedIncrement(&existing_rot_entry->refs); - *ctxt_handle = existing_rot_entry; - } - + list_add_tail(&RunningObjectTable, &rot_entry->entry); LeaveCriticalSection(&csRunningObjectTable); + /* gives a registration identifier to the registered object*/ + *cookie = rot_entry->cookie = InterlockedIncrement(&last_cookie); + *ctxt_handle = rot_entry; + return hr; }

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

Hwang YunSong(황윤성) : 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

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

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

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

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

Hwang YunSong(황윤성) : 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

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: For Debian Etch (4.0): sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list -Then, you can install Wine by <a href="apt://wine">clicking this link</a>. +Then update APT's package information by running 'sudo apt-get update'. + +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.

1 0