March 2006 - Wine-commits - list.winehq.org

Robert Reif : wineesd: Use pipe sync for events.
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: 2d15c8fb75bcc124f0c0f3d6b92f12de5290e1e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d15c8fb75bcc124f0c0f3d… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Mar 14 07:28:53 2006 -0500 wineesd: Use pipe sync for events. Ues pipe sync code from OSS/ALSA rather than windows events. --- dlls/winmm/wineesd/audio.c | 55 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/wineesd/audio.c b/dlls/winmm/wineesd/audio.c index 70ddf17..6bb035b 100644 --- a/dlls/winmm/wineesd/audio.c +++ b/dlls/winmm/wineesd/audio.c @@ -44,6 +44,13 @@ # include <unistd.h> #endif #include <fcntl.h> +#ifdef HAVE_POLL_H +#include <poll.h> +#endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -65,6 +72,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); #include <esd.h> +/* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */ +#define USE_PIPE_SYNC + /* define if you want to use esd_monitor_stream instead of * esd_record_stream for waveIn stream */ @@ -105,6 +115,21 @@ enum win_wm_message { WINE_WM_UPDATE, WINE_WM_BREAKLOOP, WINE_WM_CLOSING, WINE_WM_STARTING, WINE_WM_STOPPING }; +#ifdef USE_PIPE_SYNC +#define SIGNAL_OMR(mr) do { int x = 0; write((mr)->msg_pipe[1], &x, sizeof(x)); } while (0) +#define CLEAR_OMR(mr) do { int x = 0; read((mr)->msg_pipe[0], &x, sizeof(x)); } while (0) +#define RESET_OMR(mr) do { } while (0) +#define WAIT_OMR(mr, sleep) \ + do { struct pollfd pfd; pfd.fd = (mr)->msg_pipe[0]; \ + pfd.events = POLLIN; poll(&pfd, 1, sleep); } while (0) +#else +#define SIGNAL_OMR(mr) do { SetEvent((mr)->msg_event); } while (0) +#define CLEAR_OMR(mr) do { } while (0) +#define RESET_OMR(mr) do { ResetEvent((mr)->msg_event); } while (0) +#define WAIT_OMR(mr, sleep) \ + do { WaitForSingleObject((mr)->msg_event, sleep); } while (0) +#endif + typedef struct { enum win_wm_message msg; /* message identifier */ DWORD param; /* parameter for this message */ @@ -121,7 +146,11 @@ typedef struct { int ring_buffer_size; int msg_tosave; int msg_toget; - HANDLE msg_event; +#ifdef USE_PIPE_SYNC + int msg_pipe[2]; +#else + HANDLE msg_event; +#endif CRITICAL_SECTION msg_crst; } ESD_MSG_RING; @@ -508,7 +537,15 @@ static int ESD_InitRingMessage(ESD_MSG_R { mr->msg_toget = 0; mr->msg_tosave = 0; +#ifdef USE_PIPE_SYNC + if (pipe(mr->msg_pipe) < 0) { + mr->msg_pipe[0] = -1; + mr->msg_pipe[1] = -1; + ERR("could not create pipe, error=%s\n", strerror(errno)); + } +#else mr->msg_event = CreateEventW(NULL, FALSE, FALSE, NULL); +#endif mr->ring_buffer_size = ESD_RING_BUFFER_INCREMENT; mr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,mr->ring_buffer_size * sizeof(RING_MSG)); InitializeCriticalSection(&mr->msg_crst); @@ -522,7 +559,12 @@ static int ESD_InitRingMessage(ESD_MSG_R */ static int ESD_DestroyRingMessage(ESD_MSG_RING* mr) { +#ifdef USE_PIPE_SYNC + close(mr->msg_pipe[0]); + close(mr->msg_pipe[1]); +#else CloseHandle(mr->msg_event); +#endif HeapFree(GetProcessHeap(),0,mr->messages); mr->messages=NULL; DeleteCriticalSection(&mr->msg_crst); @@ -587,8 +629,8 @@ static int ESD_AddRingMessage(ESD_MSG_RI LeaveCriticalSection(&mr->msg_crst); - SetEvent(mr->msg_event); /* signal a new message */ - + /* signal a new message */ + SIGNAL_OMR(mr); if (wait) { /* wait for playback/record thread to have processed the message */ @@ -620,6 +662,7 @@ static int ESD_RetrieveRingMessage(ESD_M *param = mr->messages[mr->msg_toget].param; *hEvent = mr->messages[mr->msg_toget].hEvent; mr->msg_toget = (mr->msg_toget + 1) % mr->ring_buffer_size; + CLEAR_OMR(mr); LeaveCriticalSection(&mr->msg_crst); return 1; } @@ -943,7 +986,7 @@ static void wodPlayer_Reset(WINE_WAVEOUT wodNotifyClient(wwo, WOM_DONE, param, 0); } - ResetEvent(wwo->msgRing.msg_event); + RESET_OMR(&wwo->msgRing); LeaveCriticalSection(&wwo->msgRing.msg_crst); } else { if (wwo->lpLoopPtr) { @@ -1108,7 +1151,7 @@ static DWORD CALLBACK wodPlayer(LPVOID p */ dwSleepTime = min(dwNextFeedTime, dwNextNotifyTime); TRACE("waiting %lums (%lu,%lu)\n", dwSleepTime, dwNextFeedTime, dwNextNotifyTime); - WaitForSingleObject(wwo->msgRing.msg_event, dwSleepTime); + WAIT_OMR(&wwo->msgRing, dwSleepTime); wodPlayer_ProcessMessages(wwo); if (wwo->state == WINE_WS_PLAYING) { dwNextFeedTime = wodPlayer_FeedDSP(wwo); @@ -1696,7 +1739,7 @@ static DWORD CALLBACK widRecorder(LPVOID } /* wait for dwSleepTime or an event in thread's queue */ - WaitForSingleObject(wwi->msgRing.msg_event, dwSleepTime); + WAIT_OMR(&wwi->msgRing, dwSleepTime); while (ESD_RetrieveRingMessage(&wwi->msgRing, &msg, &param, &ev)) {

1 0

Robert Shearman : ntdll: Move the call to MODULE_DllThreadAttach from the kernel32
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: ea6f3a4cc0ba4a8e0a30df259052c8bb3e25ba5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea6f3a4cc0ba4a8e0a30df2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 14 14:35:21 2006 +0000 ntdll: Move the call to MODULE_DllThreadAttach from the kernel32 thread creation function to the NTDLL one. --- dlls/kernel/thread.c | 2 -- dlls/ntdll/ntdll.spec | 5 ----- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index 41a8ccf..2d83707 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -54,7 +54,6 @@ struct new_thread_info void *arg; }; -extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ); /* FIXME */ /*********************************************************************** * THREAD_Start @@ -74,7 +73,6 @@ static void CALLBACK THREAD_Start( void __TRY { - MODULE_DllThreadAttach( NULL ); ExitThread( func( arg ) ); } __EXCEPT(UnhandledExceptionFilter) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7ccbbfd..b2001ae 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1390,8 +1390,3 @@ @ cdecl wine_nt_to_unix_file_name(ptr ptr long long) @ cdecl wine_unix_to_nt_file_name(ptr ptr) @ cdecl __wine_init_windows_dir(wstr wstr) - -################################################################ -# Wine dll separation hacks, these will go away, don't use them -# -@ cdecl MODULE_DllThreadAttach(ptr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c32a246..35cbd5b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -60,6 +60,7 @@ extern void DECLSPEC_NORETURN server_exi extern void DECLSPEC_NORETURN server_abort_thread( int status ); /* module handling */ +extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ); extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ); extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 5bfdcee..6e3d019 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -39,6 +39,7 @@ #include "wine/pthread.h" #include "wine/debug.h" #include "ntdll_misc.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(thread); @@ -273,6 +274,26 @@ HANDLE thread_init(void) return exe_file; } +typedef ULONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); +static PUNHANDLED_EXCEPTION_FILTER get_unhandled_exception_filter(void) +{ + static PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter; + static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + UNICODE_STRING module_name; + ANSI_STRING func_name; + HMODULE kernel32_handle; + + if (unhandled_exception_filter) return unhandled_exception_filter; + + RtlInitUnicodeString(&module_name, kernel32W); + RtlInitAnsiString( &func_name, "UnhandledExceptionFilter" ); + + if (LdrGetDllHandle( 0, 0, &module_name, &kernel32_handle ) == STATUS_SUCCESS) + LdrGetProcedureAddress( kernel32_handle, &func_name, 0, + (void **)&unhandled_exception_filter ); + + return unhandled_exception_filter; +} /*********************************************************************** * start_thread @@ -316,6 +337,23 @@ static void start_thread( struct wine_pt InsertHeadList( &tls_links, &teb->TlsLinks ); RtlReleasePebLock(); + /* NOTE: Windows does not have an exception handler around the call to + * the thread attach. We do for ease of debugging */ + if (get_unhandled_exception_filter()) + { + __TRY + { + MODULE_DllThreadAttach( NULL ); + } + __EXCEPT(get_unhandled_exception_filter()) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + } + else + MODULE_DllThreadAttach( NULL ); + func( arg ); }

1 0

Jan Zerebecki : wine.inf: Increase the DirectX version to that of the latest 9.0c .
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: f2c8a537d78b7890bbd58014c76223173baf031a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2c8a537d78b7890bbd5801… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Mon Mar 13 14:06:40 2006 +0100 wine.inf: Increase the DirectX version to that of the latest 9.0c . --- tools/wine.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 014fb00..580c3bb 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -176,7 +176,7 @@ HKCU,%Metrics%,"BorderWidth",2,"1" HKCU,%Metrics%,"Shell Icon Size",2,"32" [DirectX] -HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0903" +HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" HKLM,Software\Microsoft\DirectMusic,GMFilePath,,"%12%\gm.dls" HKLM,Software\Microsoft\DirectMusic\Defaults,DefaultOutputPort,,"{58C2B4D0-46E7-11D1-89AC-00A0C9054129}" HKLM,Software\Microsoft\DirectMusic\SoftwareSynths\{58C2B4D0-46E7-11D1-89AC-00A0C9054129},Description,,"Microsoft Software Synthesizer"

1 0

lostwages/ news/2006031301.xml wwn/wn20060313_ ...
by WineHQ 14 Mar '06

14 Mar '06

ChangeSet ID: 23542 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/13 22:27:45 Added files: news : 2006031301.xml wwn : wn20060313_308.xml Log message: WWN #308 Patch: http://cvs.winehq.org/patch.py?id=23542 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006031301.xml Added 1.1 +0 -0 lostwages/wwn/wn20060313_308.xml

1 0

Alexandre Julliard : ddraw: Don't crash in d3d test if OpenGL is missing.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: db0aabca25189e78cff2e633e6f874cc895ffd12 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db0aabca25189e78cff2e63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 13 14:19:58 2006 +0100 ddraw: Don't crash in d3d test if OpenGL is missing. --- dlls/ddraw/tests/d3d.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 00d84d6..bdfc4dc 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -58,6 +58,7 @@ static BOOL CreateDirect3D(void) ok(rc==DD_OK, "SetCooperativeLevel returned: %lx\n", rc); rc = IDirectDraw7_QueryInterface(lpDD, &IID_IDirect3D7, (void**) &lpD3D); + if (rc == E_NOINTERFACE) return FALSE; ok(rc==DD_OK, "QueryInterface returned: %lx\n", rc); memset(&ddsd, 0, sizeof(ddsd));

1 0

Juan Lang : crypt32: Abstract contexts.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 0811851b942fcfd929c9bb54126c2a43f3057d9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0811851b942fcfd929c9bb5… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Mar 10 15:22:41 2006 -0800 crypt32: Abstract contexts. - create a base cert context, and make functions unaware whether they're dealing with the base or derived type - simplify stores as a result --- dlls/crypt32/store.c | 453 ++++++++++++++++++++++---------------------------- 1 files changed, 198 insertions(+), 255 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0811851b942fcfd929c…

1 0

Roderick Colenbrander : wined3d: Vertexdeclaration fix.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: d4836e1ce1a8c831d76eef2ee8c712539983c763 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4836e1ce1a8c831d76eef2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 12 16:27:31 2006 +0100 wined3d: Vertexdeclaration fix. In the old d3d8 code SetVertexShader stored the so called vertex declaration in the stateblock. In case of WineD3D this isn't done which breaks the drawPrimitive code. This patch stores the vertex declaration again in the stateblock which fixes Age Of Mythology. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7ce1d59..eab7fbf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4046,6 +4046,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer IWineD3DVertexShader_Release(oldShader); } + if (pShader != NULL && ((IWineD3DVertexShaderImpl *)pShader)->vertexDeclaration != NULL) { + TRACE("(%p) : setting vertexDeclaration(%p)\n", This, ((IWineD3DVertexShaderImpl *)pShader)->vertexDeclaration); + IWineD3DDevice_SetVertexDeclaration(iface, ((IWineD3DVertexShaderImpl *)pShader)->vertexDeclaration); + } + TRACE("(%p) : setting pShader(%p)\n", This, pShader); /** * TODO: merge HAL shaders context switching from prototype

1 0

Mike McCormack : shell32: Fix some gcc 4. 1 warnings caused by casts in macros.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 6f9dd397d23ea461a9509d63de09a979d21cd659 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f9dd397d23ea461a9509d6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:43:37 2006 +0900 shell32: Fix some gcc 4.1 warnings caused by casts in macros. --- dlls/shell32/shlview.c | 57 +++++++++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 2cce8eb..7364f42 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -342,12 +342,17 @@ static BOOL ShellView_CreateList (IShell This->ListViewSortInfo.nLastHeaderID = -1; if (This->FolderSettings.fFlags & FWF_DESKTOP) { - if (0) /* FIXME: look into registry vale HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow and activate drop shadows */ - ListView_SetTextBkColor(This->hWndList, CLR_NONE); + /* + * FIXME: look at the registry value + * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow + * and activate drop shadows if necessary + */ + if (0) + SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, CLR_NONE); else - ListView_SetTextBkColor(This->hWndList, GetSysColor(COLOR_DESKTOP)); + SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, GetSysColor(COLOR_DESKTOP)); - ListView_SetTextColor(This->hWndList, RGB(255,255,255)); + SendMessageW(This->hWndList, LVM_SETTEXTCOLOR, 0, RGB(255,255,255)); } /* UpdateShellSettings(); */ @@ -368,7 +373,7 @@ static BOOL ShellView_InitList(IShellVie TRACE("%p\n",This); - ListView_DeleteAllItems(This->hWndList); + SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); lvColumn.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT; lvColumn.pszText = szTemp; @@ -382,7 +387,7 @@ static BOOL ShellView_InitList(IShellVie lvColumn.fmt = sd.fmt; lvColumn.cx = sd.cxChar*8; /* chars->pixel */ StrRetToStrNA( szTemp, 50, &sd.str, NULL); - ListView_InsertColumnA(This->hWndList, i, &lvColumn); + SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, i, (LPARAM) &lvColumn); } } else @@ -390,8 +395,8 @@ static BOOL ShellView_InitList(IShellVie FIXME("no SF2\n"); } - ListView_SetImageList(This->hWndList, ShellSmallIconList, LVSIL_SMALL); - ListView_SetImageList(This->hWndList, ShellBigIconList, LVSIL_NORMAL); + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ShellSmallIconList); + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)ShellBigIconList); return TRUE; } @@ -524,7 +529,9 @@ static int LV_FindItemByPidl( LVITEMA lvItem; ZeroMemory(&lvItem, sizeof(LVITEMA)); lvItem.mask = LVIF_PARAM; - for(lvItem.iItem = 0; ListView_GetItemA(This->hWndList, &lvItem); lvItem.iItem++) + for(lvItem.iItem = 0; + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); + lvItem.iItem++) { LPITEMIDLIST currentpidl = (LPITEMIDLIST) lvItem.lParam; HRESULT hr = IShellFolder_CompareIDs(This->pSFParent, 0, pidl, currentpidl); @@ -583,14 +590,14 @@ static BOOLEAN LV_RenameItem(IShellViewI ZeroMemory(&lvItem, sizeof(lvItem)); /* create the listview item*/ lvItem.mask = LVIF_PARAM; /* only the pidl */ lvItem.iItem = nItem; - ListView_GetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); SHFree((LPITEMIDLIST)lvItem.lParam); lvItem.mask = LVIF_PARAM; lvItem.iItem = nItem; lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidlNew)); /* set the item's data */ - ListView_SetItemA(This->hWndList, &lvItem); - ListView_Update(This->hWndList, nItem); + SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); + SendMessageA(This->hWndList, LVM_UPDATE, nItem, 0); return TRUE; /* FIXME: better handling */ } return FALSE; @@ -1227,7 +1234,7 @@ static LRESULT ShellView_OnCommand(IShel This->ListViewSortInfo.nHeaderID = (LPARAM) (dwCmdID - 0x30); This->ListViewSortInfo.bIsAscending = TRUE; This->ListViewSortInfo.nLastHeaderID = This->ListViewSortInfo.nHeaderID; - ListView_SortItems(This->hWndList, ShellView_ListViewCompareItems, (LPARAM) (&(This->ListViewSortInfo))); + SendMessageA(This->hWndList, LVM_SORTITEMS, (WPARAM) &This->ListViewSortInfo, (LPARAM)ShellView_ListViewCompareItems); break; default: @@ -1323,7 +1330,7 @@ static LRESULT ShellView_OnNotify(IShell } This->ListViewSortInfo.nLastHeaderID = This->ListViewSortInfo.nHeaderID; - ListView_SortItems(lpnmlv->hdr.hwndFrom, ShellView_ListViewCompareItems, (LPARAM) (&(This->ListViewSortInfo))); + SendMessageA(lpnmlv->hdr.hwndFrom, LVM_SORTITEMS, (WPARAM) &This->ListViewSortInfo, (LPARAM)ShellView_ListViewCompareItems); break; case LVN_GETDISPINFOA: @@ -1423,7 +1430,7 @@ static LRESULT ShellView_OnNotify(IShell ZeroMemory(&lvItem, sizeof(LVITEMA)); lvItem.iItem = lpdi->item.iItem; lvItem.mask = LVIF_PARAM; - ListView_GetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); pidl = (LPITEMIDLIST)lpdi->item.lParam; if (!MultiByteToWideChar( CP_ACP, 0, lpdi->item.pszText, -1, wszNewName, MAX_PATH )) @@ -1434,7 +1441,7 @@ static LRESULT ShellView_OnNotify(IShell { lvItem.mask = LVIF_PARAM; lvItem.lParam = (LPARAM)pidl; - ListView_SetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); return TRUE; } } @@ -1466,8 +1473,8 @@ static LRESULT ShellView_OnNotify(IShell i = ListView_GetNextItem(This->hWndList, -1, LVNI_SELECTED); - ListView_EnsureVisible(This->hWndList, i, 0); - ListView_EditLabelA(This->hWndList, i); + SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); + SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); } } #if 0 @@ -1504,7 +1511,7 @@ static LRESULT ShellView_OnNotify(IShell item_index, LVNI_SELECTED); item.iItem = item_index; item.mask |= LVIF_PARAM; - ListView_GetItemA(This->hWndList, &item); + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &item); /* get item pidl */ pItems[i] = (LPITEMIDLIST)item.lParam; @@ -1817,7 +1824,7 @@ static HRESULT WINAPI IShellView_fnRefre TRACE("(%p)\n",This); - ListView_DeleteAllItems(This->hWndList); + SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); ShellView_FillList(This); return S_OK; @@ -1968,13 +1975,13 @@ static HRESULT WINAPI IShellView_fnSelec LVITEMA lvItem; if(uFlags & SVSI_ENSUREVISIBLE) - ListView_EnsureVisible(This->hWndList, i, 0); + SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); ZeroMemory(&lvItem, sizeof(LVITEMA)); lvItem.mask = LVIF_STATE; lvItem.iItem = 0; - while(ListView_GetItemA(This->hWndList, &lvItem)) + while(SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem)) { if (lvItem.iItem == i) { @@ -1991,13 +1998,13 @@ static HRESULT WINAPI IShellView_fnSelec if (uFlags & SVSI_DESELECTOTHERS) lvItem.state &= ~LVIS_SELECTED; } - ListView_SetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); lvItem.iItem++; } if(uFlags & SVSI_EDIT) - ListView_EditLabelA(This->hWndList, i); + SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); } return S_OK; @@ -2255,7 +2262,7 @@ static HRESULT drag_notify_subitem(IShel ZeroMemory(&lvItem, sizeof(lvItem)); lvItem.mask = LVIF_PARAM; lvItem.iItem = lResult; - ListView_GetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); /* ... and bind pCurDropTarget to the IDropTarget interface of an UIObject of this object */ hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWndList, 1,

1 0

Robert Shearman : ntdll: Very crude implementation of RtlQueueWorkItem.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: a18bdf13f7156ff96407a545170d74522171819f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a18bdf13f7156ff96407a54… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Mar 13 11:28:28 2006 +0000 ntdll: Very crude implementation of RtlQueueWorkItem. --- dlls/ntdll/Makefile.in | 1 dlls/ntdll/ntdll.spec | 2 - dlls/ntdll/threadpool.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 2 + 4 files changed, 111 insertions(+), 1 deletions(-) create mode 100644 dlls/ntdll/threadpool.c diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 73f2ef8..fa99da4 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -47,6 +47,7 @@ C_SRCS = \ tape.c \ version.c \ thread.c \ + threadpool.c \ time.c \ virtual.c \ wcstring.c diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8117197..7ccbbfd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -781,7 +781,7 @@ @ stub RtlQueryTagHeap @ stdcall RtlQueryTimeZoneInformation(ptr) @ stub RtlQueueApcWow64Thread -@ stub RtlQueueWorkItem +@ stdcall RtlQueueWorkItem(ptr ptr long) @ stdcall -register RtlRaiseException(ptr) @ stdcall RtlRaiseStatus(long) @ stdcall RtlRandom(ptr) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c new file mode 100644 index 0000000..10bda48 --- /dev/null +++ b/dlls/ntdll/threadpool.c @@ -0,0 +1,107 @@ +/* + * Thread pooling + * + * Copyright (c) 2006 Robert Shearman + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" + +#include "wine/debug.h" +#include "ntdll_misc.h" + +WINE_DEFAULT_DEBUG_CHANNEL(threadpool); + +struct work_item +{ + PRTL_WORK_ITEM_ROUTINE function; + PVOID context; +}; + +static void WINAPI worker_thread_proc(void * param) +{ + struct work_item *work_item_ptr = (struct work_item *)param; + struct work_item work_item; + + /* free the work item memory sooner to reduce memory usage */ + work_item = *work_item_ptr; + RtlFreeHeap(GetProcessHeap(), 0, work_item_ptr); + + TRACE("executing %p(%p)\n", work_item.function, work_item.context); + + /* do the work */ + work_item.function(work_item.context); + + RtlExitUserThread(0); + + /* never reached */ +} + +/*********************************************************************** + * RtlQueueWorkItem (NTDLL.@) + * + * Queues a work item into a thread in the thread pool. + * + * PARAMS + * Function [I] Work function to execute. + * Context [I] Context to pass to the work function when it is executed. + * Flags [I] Flags. See notes. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + * + * NOTES + * Flags can be one or more of the following: + *|WT_EXECUTEDEFAULT - Executes the work item in a non-I/O worker thread. + *|WT_EXECUTEINIOTHREAD - Executes the work item in an I/O worker thread. + *|WT_EXECUTEINPERSISTENTTHREAD - Executes the work item in a thread that is persistent. + *|WT_EXECUTELONGFUNCTION - Hints that the execution can take a long time. + *|WT_TRANSFER_IMPERSONATION - Executes the function with the current access token. + */ +NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, ULONG Flags) +{ + HANDLE thread; + NTSTATUS status; + struct work_item *work_item = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(struct work_item)); + + if (!work_item) + return STATUS_NO_MEMORY; + + work_item->function = Function; + work_item->context = Context; + + if (Flags != WT_EXECUTEDEFAULT) + FIXME("Flags 0x%lx not supported\n", Flags); + + /* FIXME: very crude implementation that doesn't support pooling at all */ + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, + NULL, 0, 0, + worker_thread_proc, work_item, &thread, NULL ); + if (status != STATUS_SUCCESS) + { + RtlFreeHeap(GetProcessHeap(), 0, work_item); + return status; + } + NtClose( thread ); + + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index 6666294..e3548d4 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1429,6 +1429,7 @@ typedef struct _RTL_HANDLE_TABLE typedef void (CALLBACK *PNTAPCFUNC)(ULONG_PTR,ULONG_PTR,ULONG_PTR); /* FIXME: not the right name */ typedef void (CALLBACK *PRTL_THREAD_START_ROUTINE)(LPVOID); /* FIXME: not the right name */ +typedef DWORD (CALLBACK *PRTL_WORK_ITEM_ROUTINE)(LPVOID); /* FIXME: not the right name */ /* DbgPrintEx default levels */ @@ -2129,6 +2130,7 @@ NTSTATUS WINAPI RtlQueryInformationAcl( NTSTATUS WINAPI RtlQueryProcessDebugInformation(ULONG,ULONG,PDEBUG_BUFFER); NTSTATUS WINAPI RtlQueryRegistryValues(ULONG, PCWSTR, PRTL_QUERY_REGISTRY_TABLE, PVOID, PVOID); NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION*); +NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE,PVOID,ULONG); void WINAPI RtlRaiseException(PEXCEPTION_RECORD); void WINAPI RtlRaiseStatus(NTSTATUS); ULONG WINAPI RtlRandom(PULONG);

1 0

Christoph Frick : dinput/joystick_linuxinput: Add POV detection and reporting.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 034a030d374674b14a95a606f5348eb22db2e456 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=034a030d374674b14a95a60… Author: Christoph Frick <rid(a)zefix.tv> Date: Fri Mar 10 09:58:14 2006 +0100 dinput/joystick_linuxinput: Add POV detection and reporting. Mapping of ABS_HAT[0-3][XY] to the four POV used by dinput. --- dlls/dinput/joystick_linuxinput.c | 75 +++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 5530c16..7de164d 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -67,6 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); /* Wine joystick driver object instances */ #define WINE_JOYSTICK_AXIS_BASE 0 +#define WINE_JOYSTICK_POV_BASE 6 #define WINE_JOYSTICK_BUTTON_BASE 8 typedef struct EffectListItem EffectListItem; @@ -148,8 +149,9 @@ static GUID DInput_Wine_Joystick_GUID = static void fake_current_js_state(JoystickImpl *ji); static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph); +static DWORD map_pov(int event_value, int is_x); -#define test_bit(arr,bit) (((BYTE*)arr)[bit>>3]&(1<<(bit&7))) +#define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) static int joydev_have(BOOL require_ff) { @@ -618,6 +620,8 @@ map_axis(JoystickImpl* This, int axis, i */ static void fake_current_js_state(JoystickImpl *ji) { + int i; + /* center the axes */ ji->js.lX = map_axis(ji, ABS_X, ji->axes[ABS_X ][AXE_ABS]); ji->js.lY = map_axis(ji, ABS_Y, ji->axes[ABS_Y ][AXE_ABS]); ji->js.lZ = map_axis(ji, ABS_Z, ji->axes[ABS_Z ][AXE_ABS]); @@ -626,6 +630,35 @@ static void fake_current_js_state(Joysti ji->js.lRz = map_axis(ji, ABS_RZ, ji->axes[ABS_RZ][AXE_ABS]); ji->js.rglSlider[0] = map_axis(ji, ABS_THROTTLE, ji->axes[ABS_THROTTLE][AXE_ABS]); ji->js.rglSlider[1] = map_axis(ji, ABS_RUDDER, ji->axes[ABS_RUDDER ][AXE_ABS]); + /* POV center is -1 */ + for (i=0; i<4; i++) { + ji->js.rgdwPOV[i] = -1; + } +} + +/* + * Maps an event value to a DX "clock" position: + * 0 + * 27000 -1 9000 + * 18000 + */ +static DWORD map_pov(int event_value, int is_x) +{ + DWORD ret = -1; + if (is_x) { + if (event_value<0) { + ret = 27000; + } else if (event_value>0) { + ret = 9000; + } + } else { + if (event_value<0) { + ret = 0; + } else if (event_value>0) { + ret = 18000; + } + } + return ret; } static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph) @@ -717,6 +750,26 @@ static void joy_polldev(JoystickImpl *Th This->js.rglSlider[1] = map_axis(This,ABS_RUDDER,ie.value); GEN_EVENT(DIJOFS_SLIDER(1),This->js.rglSlider[1],ie.time.tv_usec,(This->dinput->evsequence)++); break; + case ABS_HAT0X: + case ABS_HAT0Y: + This->js.rgdwPOV[0] = map_pov(ie.value,ie.code==ABS_HAT0X); + GEN_EVENT(DIJOFS_POV(0),This->js.rgdwPOV[0],ie.time.tv_usec,(This->dinput->evsequence)++); + break; + case ABS_HAT1X: + case ABS_HAT1Y: + This->js.rgdwPOV[1] = map_pov(ie.value,ie.code==ABS_HAT1X); + GEN_EVENT(DIJOFS_POV(1),This->js.rgdwPOV[1],ie.time.tv_usec,(This->dinput->evsequence)++); + break; + case ABS_HAT2X: + case ABS_HAT2Y: + This->js.rgdwPOV[2] = map_pov(ie.value,ie.code==ABS_HAT2X); + GEN_EVENT(DIJOFS_POV(2),This->js.rgdwPOV[2],ie.time.tv_usec,(This->dinput->evsequence)++); + break; + case ABS_HAT3X: + case ABS_HAT3Y: + This->js.rgdwPOV[3] = map_pov(ie.value,ie.code==ABS_HAT3X); + GEN_EVENT(DIJOFS_POV(3),This->js.rgdwPOV[3],ie.time.tv_usec,(This->dinput->evsequence)++); + break; default: FIXME("unhandled joystick axe event (code %d, value %d)\n",ie.code,ie.value); break; @@ -1078,6 +1131,26 @@ static HRESULT WINAPI JoystickAImpl_Enum } if ((dwFlags == DIDFT_ALL) || + (dwFlags & DIDFT_POV)) { + int i; + ddoi.guidType = GUID_POV; + for (i=0; i<4; i++) { + if (test_bit(This->absbits,ABS_HAT0X+(i<<1)) && test_bit(This->absbits,ABS_HAT0Y+(i<<1))) { + ddoi.dwOfs = DIJOFS_POV(i); + ddoi.dwType = DIDFT_MAKEINSTANCE(i << WINE_JOYSTICK_POV_BASE) | DIDFT_POV; + sprintf(ddoi.tszName, "%d-POV", i); + _dump_OBJECTINSTANCEA(&ddoi); + if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { + /* return to unaquired state if that's where we were */ + if (xfd == -1) + IDirectInputDevice8_Unacquire(iface); + return DI_OK; + } + } + } + } + + if ((dwFlags == DIDFT_ALL) || (dwFlags & DIDFT_BUTTON)) { int i, btncount=0;

1 0