June 2007 - Wine-Commits - list.winehq.org

Misha Koshelev : msi: automation: SummaryInfo::Property, remove all specific instances to PIDs.
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: b489ed448581e23117d1be40e14b51b778594a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b489ed448581e23117d1be40e… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jun 4 09:25:59 2007 -0500 msi: automation: SummaryInfo::Property, remove all specific instances to PIDs. --- dlls/msi/automation.c | 74 ++++++++++++++++++++++-------------------------- 1 files changed, 34 insertions(+), 40 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 52474d4..09f35b2 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -754,72 +754,66 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( { UINT type; INT value; - INT pid; + DWORD size = 0; + FILETIME ft, ftlocal; + SYSTEMTIME st; + DATE date; + LPWSTR str; static WCHAR szEmpty[] = {0}; hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; - pid = V_I4(&varg0); + ret = MsiSummaryInfoGetPropertyW(This->msiHandle, V_I4(&varg0), &type, &value, + &ft, szEmpty, &size); + if (ret != ERROR_SUCCESS && + ret != ERROR_MORE_DATA) + { + ERR("MsiSummaryInfoGetProperty returned %d\n", ret); + return DISP_E_EXCEPTION; + } - if (pid == PID_CODEPAGE || (pid >= PID_PAGECOUNT && pid <= PID_CHARCOUNT) || pid == PID_SECURITY) + switch (type) { - if ((ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, &value, - NULL, NULL, NULL)) != ERROR_SUCCESS) - ERR("MsiSummaryInfoGetProperty returned %d\n", ret); - else if (type == VT_I2) - { + case VT_EMPTY: + break; + + case VT_I2: V_VT(pVarResult) = VT_I2; V_I2(pVarResult) = value; - } - else if (type == VT_I4) - { + break; + + case VT_I4: V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = value; - } - } - else if ((pid >= PID_TITLE && pid <= PID_REVNUMBER) || pid == PID_APPNAME) - { - LPWSTR str; - DWORD size = 0; + break; - if ((ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, NULL, - NULL, szEmpty, &size)) == ERROR_MORE_DATA) - { + case VT_LPSTR: if (!(str = msi_alloc(++size * sizeof(WCHAR)))) ERR("Out of memory\n"); - else if ((ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, NULL, - NULL, str, &size)) == ERROR_SUCCESS) + else if ((ret = MsiSummaryInfoGetPropertyW(This->msiHandle, V_I4(&varg0), &type, NULL, + NULL, str, &size)) != ERROR_SUCCESS) + ERR("MsiSummaryInfoGetProperty returned %d\n", ret); + else { V_VT(pVarResult) = VT_BSTR; V_BSTR(pVarResult) = SysAllocString(str); } msi_free(str); - } - if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) - ERR("MsiSummaryInfoGetProperty returned %d\n", ret); - } - else if (pid >= PID_EDITTIME && pid <= PID_LASTSAVE_DTM) - { - FILETIME ft, ftlocal; - SYSTEMTIME st; - DATE date; - - if ((ret = MsiSummaryInfoGetPropertyW(This->msiHandle, pid, &type, &value, - &ft, NULL, NULL)) != ERROR_SUCCESS) - ERR("MsiSummaryInfoGetProperty returned %d\n", ret); - else if (type == VT_FILETIME) - { + break; + + case VT_FILETIME: FileTimeToLocalFileTime(&ft, &ftlocal); FileTimeToSystemTime(&ftlocal, &st); SystemTimeToVariantTime(&st, &date); V_VT(pVarResult) = VT_DATE; V_DATE(pVarResult) = date; - } + break; + + default: + ERR("Unhandled variant type %d\n", type); } - else if (pid != PID_DICTIONARY && pid != PID_THUMBNAIL) - return DISP_E_EXCEPTION; } else return DISP_E_MEMBERNOTFOUND; break;

1 0

H. Verbeet : wined3d: Rename IWineD3DDeviceImpl_SetBasevertexIndex to IWineD3DDeviceImpl_SetBaseVertexIndex .
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: 7de83c18bdc55be64da96bd8a59e7b513edb5f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de83c18bdc55be64da96bd8a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 4 18:12:36 2007 +0200 wined3d: Rename IWineD3DDeviceImpl_SetBasevertexIndex to IWineD3DDeviceImpl_SetBaseVertexIndex. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index daff352..9a532a2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2802,7 +2802,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetIndices(IWineD3DDevice *iface, IWine } /* Method to offer d3d9 a simple way to set the base vertex index without messing with the index buffer */ -static HRESULT WINAPI IWineD3DDeviceImpl_SetBasevertexIndex(IWineD3DDevice *iface, UINT BaseIndex) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetBaseVertexIndex(IWineD3DDevice *iface, UINT BaseIndex) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p)->(%d)\n", This, BaseIndex); @@ -6374,7 +6374,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_GetGammaRamp, IWineD3DDeviceImpl_SetIndices, IWineD3DDeviceImpl_GetIndices, - IWineD3DDeviceImpl_SetBasevertexIndex, + IWineD3DDeviceImpl_SetBaseVertexIndex, IWineD3DDeviceImpl_SetLight, IWineD3DDeviceImpl_GetLight, IWineD3DDeviceImpl_SetLightEnable,

1 0

Misha Koshelev : msi/tests: suminfo: Add tests for MsiSummaryInfoGetProperty for unknown property values.
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: b9ea25721bd0b5166a944673067f8f2c8a122917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9ea25721bd0b5166a9446730… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jun 4 09:25:37 2007 -0500 msi/tests: suminfo: Add tests for MsiSummaryInfoGetProperty for unknown property values. --- dlls/msi/tests/suminfo.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index 3bcc125..fbd5081 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -99,6 +99,16 @@ static void test_suminfo(void) r = MsiSummaryInfoGetProperty(hsuminfo, 0, NULL, NULL, NULL, 0, NULL); ok(r == ERROR_SUCCESS, "getpropcount failed\n"); + /* Page faults in wine */ + if (0) + { + r = MsiSummaryInfoGetProperty(hsuminfo, -1, NULL, NULL, NULL, 0, NULL); + ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n"); + + r = MsiSummaryInfoGetProperty(hsuminfo, PID_SECURITY+1, NULL, NULL, NULL, 0, NULL); + ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n"); + } + type = -1; r = MsiSummaryInfoGetProperty(hsuminfo, 0, &type, NULL, NULL, 0, NULL); ok(r == ERROR_SUCCESS, "getpropcount failed\n");

1 0

Misha Koshelev : msi: suminfo: Return ERROR_UNKNOWN_PROPERTY as native.
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: 8b2d0d3e34b49cfe64bf1b72847234cb7a448979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2d0d3e34b49cfe64bf1b728… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Jun 4 09:25:47 2007 -0500 msi: suminfo: Return ERROR_UNKNOWN_PROPERTY as native. --- dlls/msi/suminfo.c | 12 ++++++------ dlls/msi/tests/suminfo.c | 14 +++++--------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index f7f5787..c9344c8 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -529,16 +529,16 @@ static UINT get_prop( MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, TRACE("%ld %d %p %p %p %p %p\n", handle, uiProperty, puiDataType, piValue, pftValue, str, pcchValueBuf); - si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ); - if( !si ) - return ERROR_INVALID_HANDLE; - if ( uiProperty >= MSI_MAX_PROPS ) { - *puiDataType = VT_EMPTY; - return ret; + if (puiDataType) *puiDataType = VT_EMPTY; + return ERROR_UNKNOWN_PROPERTY; } + si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ); + if( !si ) + return ERROR_INVALID_HANDLE; + prop = &si->property[uiProperty]; if( puiDataType ) diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index fbd5081..a254b56 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -99,15 +99,11 @@ static void test_suminfo(void) r = MsiSummaryInfoGetProperty(hsuminfo, 0, NULL, NULL, NULL, 0, NULL); ok(r == ERROR_SUCCESS, "getpropcount failed\n"); - /* Page faults in wine */ - if (0) - { - r = MsiSummaryInfoGetProperty(hsuminfo, -1, NULL, NULL, NULL, 0, NULL); - ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n"); - - r = MsiSummaryInfoGetProperty(hsuminfo, PID_SECURITY+1, NULL, NULL, NULL, 0, NULL); - ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n"); - } + r = MsiSummaryInfoGetProperty(hsuminfo, -1, NULL, NULL, NULL, 0, NULL); + ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n"); + + r = MsiSummaryInfoGetProperty(hsuminfo, PID_SECURITY+1, NULL, NULL, NULL, 0, NULL); + ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n"); type = -1; r = MsiSummaryInfoGetProperty(hsuminfo, 0, &type, NULL, NULL, 0, NULL);

1 0

H. Verbeet : wined3d: TRACE the Color parameter in IWineD3DDeviceImpl_Clear .
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: c4a0a2b918da8f049f25842b901cd8e21cc8d9f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a0a2b918da8f049f25842b9… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 4 18:12:31 2007 +0200 wined3d: TRACE the Color parameter in IWineD3DDeviceImpl_Clear. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3ecf65c..daff352 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4346,8 +4346,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun unsigned int i; CONST WINED3DRECT* curRect; - TRACE("(%p) Count (%d), pRects (%p), Flags (%x), Z (%f), Stencil (%d)\n", This, - Count, pRects, Flags, Z, Stencil); + TRACE("(%p) Count (%d), pRects (%p), Flags (%x), Color (0x%08x), Z (%f), Stencil (%d)\n", This, + Count, pRects, Flags, Color, Z, Stencil); if(Flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) && This->stencilBufferTarget == NULL) { WARN("Clearing depth and/or stencil without a depth stencil buffer attached, returning WINED3DERR_INVALIDCALL\n");

1 0

Huw Davies : mshtml: Don't release the factory if we failed to get it.
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: 1667af3a204b7b73cbfcb98db9dc06424289d820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1667af3a204b7b73cbfcb98db… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 4 16:32:40 2007 +0100 mshtml: Don't release the factory if we failed to get it. --- dlls/mshtml/nsio.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 601a300..75add6f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2189,7 +2189,6 @@ void init_nsio(nsIComponentManager *component_manager, nsIComponentRegistrar *re &IID_nsIFactory, (void**)&old_factory); if(NS_FAILED(nsres)) { ERR("Could not get factory: %08x\n", nsres); - nsIFactory_Release(old_factory); return; }

1 0

Detlef Riekenberg : winspool: Implement AddPortEx.
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: 0c71799d02eb9ab4d23d228e239e2f60bf6c194f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c71799d02eb9ab4d23d228e2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 4 00:23:55 2007 +0200 winspool: Implement AddPortEx. --- dlls/winspool.drv/info.c | 129 ++++++++++++++++++++++++++++++++++++++++----- include/winspool.h | 6 +-- 2 files changed, 116 insertions(+), 19 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e19c82c..162f6c3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6091,11 +6091,75 @@ BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) * See AddPortExW. * */ -BOOL WINAPI AddPortExA(HANDLE hMonitor, LPSTR pName, DWORD Level, LPBYTE lpBuffer, LPSTR lpMonitorName) +BOOL WINAPI AddPortExA(LPSTR pName, DWORD level, LPBYTE pBuffer, LPSTR pMonitorName) { - FIXME("(%p, %s, %d, %p, %s), stub!\n",hMonitor, debugstr_a(pName), Level, - lpBuffer, debugstr_a(lpMonitorName)); - return FALSE; + PORT_INFO_2W pi2W; + PORT_INFO_2A * pi2A; + LPWSTR nameW = NULL; + LPWSTR monitorW = NULL; + DWORD len; + BOOL res; + + pi2A = (PORT_INFO_2A *) pBuffer; + + TRACE("(%s, %d, %p, %s): %s\n", debugstr_a(pName), level, pBuffer, + debugstr_a(pMonitorName), debugstr_a(pi2A ? pi2A->pPortName : NULL)); + + if ((level < 1) || (level > 2)) { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + if (!pi2A) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (pName) { + len = MultiByteToWideChar(CP_ACP, 0, pName, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pName, -1, nameW, len); + } + + if (pMonitorName) { + len = MultiByteToWideChar(CP_ACP, 0, pMonitorName, -1, NULL, 0); + monitorW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pMonitorName, -1, monitorW, len); + } + + ZeroMemory(&pi2W, sizeof(PORT_INFO_2W)); + + if (pi2A->pPortName) { + len = MultiByteToWideChar(CP_ACP, 0, pi2A->pPortName, -1, NULL, 0); + pi2W.pPortName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pi2A->pPortName, -1, pi2W.pPortName, len); + } + + if (level > 1) { + if (pi2A->pMonitorName) { + len = MultiByteToWideChar(CP_ACP, 0, pi2A->pMonitorName, -1, NULL, 0); + pi2W.pMonitorName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pi2A->pMonitorName, -1, pi2W.pMonitorName, len); + } + + if (pi2A->pDescription) { + len = MultiByteToWideChar(CP_ACP, 0, pi2A->pDescription, -1, NULL, 0); + pi2W.pDescription = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pi2A->pDescription, -1, pi2W.pDescription, len); + } + pi2W.fPortType = pi2A->fPortType; + pi2W.Reserved = pi2A->Reserved; + } + + res = AddPortExW(nameW, level, (LPBYTE) &pi2W, monitorW); + + HeapFree(GetProcessHeap(), 0, nameW); + HeapFree(GetProcessHeap(), 0, monitorW); + HeapFree(GetProcessHeap(), 0, pi2W.pPortName); + HeapFree(GetProcessHeap(), 0, pi2W.pMonitorName); + HeapFree(GetProcessHeap(), 0, pi2W.pDescription); + return res; + } /****************************************************************************** @@ -6104,25 +6168,60 @@ BOOL WINAPI AddPortExA(HANDLE hMonitor, LPSTR pName, DWORD Level, LPBYTE lpBuffe * Add a Port for a specific Monitor, without presenting a user interface * * PARAMS - * hMonitor [I] Handle from InitializePrintMonitor2() * pName [I] Servername or NULL (local Computer) - * Level [I] Structure-Level (1 or 2) for lpBuffer - * lpBuffer [I] PTR to: PORT_INFO_1 or PORT_INFO_2 - * lpMonitorName [I] Name of the Monitor that manage the Port or NULL + * level [I] Structure-Level (1 or 2) for pBuffer + * pBuffer [I] PTR to: PORT_INFO_1 or PORT_INFO_2 + * pMonitorName [I] Name of the Monitor that manage the Port * * RETURNS * Success: TRUE * Failure: FALSE * - * BUGS - * only a Stub - * */ -BOOL WINAPI AddPortExW(HANDLE hMonitor, LPWSTR pName, DWORD Level, LPBYTE lpBuffer, LPWSTR lpMonitorName) +BOOL WINAPI AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR pMonitorName) { - FIXME("(%p, %s, %d, %p, %s), stub!\n", hMonitor, debugstr_w(pName), Level, - lpBuffer, debugstr_w(lpMonitorName)); - return FALSE; + PORT_INFO_2W * pi2; + monitor_t * pm; + DWORD res = FALSE; + + pi2 = (PORT_INFO_2W *) pBuffer; + + TRACE("(%s, %d, %p, %s): %s %s %s\n", debugstr_w(pName), level, pBuffer, + debugstr_w(pMonitorName), debugstr_w(pi2 ? pi2->pPortName : NULL), + debugstr_w(((level > 1) && pi2) ? pi2->pMonitorName : NULL), + debugstr_w(((level > 1) && pi2) ? pi2->pDescription : NULL)); + + + if ((level < 1) || (level > 2)) { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + if (!pi2) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* we need a valid Monitorname */ + if (!pMonitorName) { + SetLastError(RPC_X_NULL_REF_POINTER); + return FALSE; + } + if (!pMonitorName[0]) { + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; + } + + /* load the Monitor */ + pm = monitor_load(pMonitorName, NULL); + if (!pm) return FALSE; + + if (pm->monitor && pm->monitor->pfnAddPortEx) { + res = pm->monitor->pfnAddPortEx(pName, level, pBuffer, pMonitorName); + TRACE("got %u with %u\n", res, GetLastError()); + } + monitor_unload(pm); + return res; } /****************************************************************************** diff --git a/include/winspool.h b/include/winspool.h index 47fc113..7ae2dc8 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1349,10 +1349,8 @@ BOOL WINAPI AddPortA(LPSTR pName, HWND hWnd, LPSTR pMonitorName); BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName); #define AddPort WINELIB_NAME_AW(AddPort) -BOOL WINAPI AddPortExA(HANDLE hMonitor, LPSTR pName, DWORD Level, - LPBYTE lpBuffer, LPSTR lpMonitorName); -BOOL WINAPI AddPortExW(HANDLE hMonitor, LPWSTR pName, DWORD Level, - LPBYTE lpBuffer, LPWSTR lpMonitorName); +BOOL WINAPI AddPortExA(LPSTR, DWORD, LPBYTE, LPSTR); +BOOL WINAPI AddPortExW(LPWSTR, DWORD, LPBYTE, LPWSTR); #define AddPortEx WINELIB_NAME_AW(AddPortEx) BOOL WINAPI ConfigurePortA(LPSTR pName, HWND hWnd, LPSTR pPortName);

1 0

Alexandre Julliard : ntdll: Get rid of the num_async_io counter in the TEB.
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: 7c6bc78b9023afd13d1158725c0f0c98670ab9d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6bc78b9023afd13d1158725… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 4 18:17:16 2007 +0200 ntdll: Get rid of the num_async_io counter in the TEB. --- dlls/ntdll/file.c | 2 -- dlls/ntdll/sync.c | 13 ++++--------- dlls/ws2_32/socket.c | 18 ++---------------- include/thread.h | 7 +++---- 4 files changed, 9 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b48cc9d..de779f2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -645,7 +645,6 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, SERVER_END_REQ; if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); - else NtCurrentTeb()->num_async_io++; goto done; } else /* synchronous read, wait for the fd to become ready */ @@ -878,7 +877,6 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, SERVER_END_REQ; if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); - else NtCurrentTeb()->num_async_io++; goto done; } else /* synchronous write, wait for the fd to become ready */ diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index ca0605e..134113f 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -671,8 +671,6 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) result->async_io.status = call->async_io.func( call->async_io.user, call->async_io.sb, call->async_io.status ); - if (result->async_io.status != STATUS_PENDING) - NtCurrentTeb()->num_async_io--; break; case APC_VIRTUAL_ALLOC: result->type = call->type; @@ -973,13 +971,10 @@ NTSTATUS WINAPI NtYieldExecution(void) */ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeout ) { - /* if alertable or async I/O in progress, we need to query the server */ - if (alertable || NtCurrentTeb()->num_async_io) - { - UINT flags = SELECT_INTERRUPTIBLE; - if (alertable) flags |= SELECT_ALERTABLE; - return NTDLL_wait_for_multiple_objects( 0, NULL, flags, timeout, 0 ); - } + /* if alertable, we need to query the server */ + if (alertable) + return NTDLL_wait_for_multiple_objects( 0, NULL, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, + timeout, 0 ); if (!timeout || timeout->QuadPart == TIMEOUT_INFINITE) /* sleep forever */ { diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2b7efdc..542b7ae 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -135,7 +135,6 @@ #include "wsipx.h" #include "winnt.h" #include "iphlpapi.h" -#include "thread.h" #include "wine/server.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -1328,11 +1327,6 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) HeapFree( GetProcessHeap(), 0, wsa ); return NtStatusToWSAError( status ); } - else - NtCurrentTeb()->num_async_io++; - - /* Try immediate completion */ - Sleep(0); return 0; } @@ -2681,11 +2675,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } SERVER_END_REQ; - if (err == STATUS_PENDING) - NtCurrentTeb()->num_async_io++; - else - HeapFree( GetProcessHeap(), 0, wsa ); - + if (err != STATUS_PENDING) HeapFree( GetProcessHeap(), 0, wsa ); WSASetLastError( NtStatusToWSAError( err )); return SOCKET_ERROR; } @@ -4206,11 +4196,7 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } SERVER_END_REQ; - if (err == STATUS_PENDING) - NtCurrentTeb()->num_async_io++; - else - HeapFree( GetProcessHeap(), 0, wsa ); - + if (err != STATUS_PENDING) HeapFree( GetProcessHeap(), 0, wsa ); WSASetLastError( NtStatusToWSAError( err )); return SOCKET_ERROR; } diff --git a/include/thread.h b/include/thread.h index 68d7ae2..f3dfc0b 100644 --- a/include/thread.h +++ b/include/thread.h @@ -53,11 +53,10 @@ typedef struct _TEB PVOID SystemReserved2[10]; /* 1d4 */ /* The following are Wine-specific fields (NT: GdiTebBatch) */ - DWORD num_async_io; /* 1fc number of pending async I/O in the server */ - ULONG_PTR dpmi_vif; /* 200 protected mode virtual interrupt flag */ - DWORD vm86_pending; /* 204 data for vm86 mode */ + DWORD dpmi_vif; /* 1fc protected mode virtual interrupt flag */ + ULONG_PTR vm86_pending; /* 200 data for vm86 mode */ /* here is plenty space for wine specific fields (don't forget to change pad6!!) */ - DWORD pad6[309]; /* 208 */ + DWORD pad6[310]; /* 204 */ ULONG gdiRgn; /* 6dc */ ULONG gdiPen; /* 6e0 */

1 0

Alexandre Julliard : kernel32: Rewrite GetOverlappedResult for the new async I/O behavior.
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: 35ef5df76cf9d282f3df36eec24b3876039650a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ef5df76cf9d282f3df36eec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 4 23:03:15 2007 +0200 kernel32: Rewrite GetOverlappedResult for the new async I/O behavior. --- dlls/kernel32/file.c | 67 ++++++++++---------------------------------- dlls/kernel32/tests/file.c | 2 - 2 files changed, 15 insertions(+), 54 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index be8ca63..a3d6942 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -539,17 +539,11 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, * * If successful (and relevant) lpTransferred will hold the number of * bytes transferred during the async operation. - * - * BUGS - * - * Currently only works for WaitCommEvent, ReadFile, WriteFile - * with communications ports. - * */ BOOL WINAPI GetOverlappedResult(HANDLE hFile, LPOVERLAPPED lpOverlapped, LPDWORD lpTransferred, BOOL bWait) { - DWORD r = WAIT_OBJECT_0; + NTSTATUS status; TRACE( "(%p %p %p %x)\n", hFile, lpOverlapped, lpTransferred, bWait ); @@ -558,57 +552,26 @@ BOOL WINAPI GetOverlappedResult(HANDLE hFile, LPOVERLAPPED lpOverlapped, ERR("lpOverlapped was null\n"); return FALSE; } - if ( bWait ) + + status = lpOverlapped->Internal; + if (status == STATUS_PENDING) { - if ( lpOverlapped->hEvent ) + if (!bWait) { - do - { - TRACE( "waiting on %p\n", lpOverlapped ); - r = WaitForSingleObjectEx( lpOverlapped->hEvent, INFINITE, TRUE ); - TRACE( "wait on %p returned %d\n", lpOverlapped, r ); - } while ( r == WAIT_IO_COMPLETION ); + SetLastError( ERROR_IO_INCOMPLETE ); + return FALSE; } - else - { - /* busy loop */ - while ( ((volatile OVERLAPPED*)lpOverlapped)->Internal == STATUS_PENDING ) - Sleep( 10 ); - } - } - else if ( lpOverlapped->Internal == STATUS_PENDING ) - { - /* Wait in order to give APCs a chance to run. */ - /* This is cheating, so we must set the event again in case of success - - it may be a non-manual reset event. */ - do - { - TRACE( "waiting on %p\n", lpOverlapped ); - r = WaitForSingleObjectEx( lpOverlapped->hEvent, 0, TRUE ); - TRACE( "wait on %p returned %d\n", lpOverlapped, r ); - } while ( r == WAIT_IO_COMPLETION ); - if ( r == WAIT_OBJECT_0 && lpOverlapped->hEvent ) - NtSetEvent( lpOverlapped->hEvent, NULL ); - } - if ( r == WAIT_FAILED ) - { - WARN("wait operation failed\n"); - return FALSE; + + if (WaitForSingleObject( lpOverlapped->hEvent ? lpOverlapped->hEvent : hFile, + INFINITE ) == WAIT_FAILED) + return FALSE; + status = lpOverlapped->Internal; } + if (lpTransferred) *lpTransferred = lpOverlapped->InternalHigh; - switch ( lpOverlapped->Internal ) - { - case STATUS_SUCCESS: - return TRUE; - case STATUS_PENDING: - SetLastError( ERROR_IO_INCOMPLETE ); - if ( bWait ) ERR("PENDING status after waiting!\n"); - return FALSE; - default: - SetLastError( RtlNtStatusToDosError( lpOverlapped->Internal ) ); - return FALSE; - } + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } /*********************************************************************** diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 89cf0a2..e9f97f5 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1768,9 +1768,7 @@ static void test_overlapped(void) ov.Internal = STATUS_PENDING; ov.InternalHigh = 0xabcd; r = GetOverlappedResult(0, &ov, &result, 0); - todo_wine { ok( GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError() ); - } ok( r == FALSE, "should return false\n"); ok( result == 0, "wrong result %u\n", result );

1 0

Ralf Beck : winealsa.drv: Mark every sysex buffer being added.
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: 60cde9333727f3e6fa5b3ccda86a34415c60e91f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cde9333727f3e6fa5b3ccda… Author: Ralf Beck <musical_snake(a)gmx.de> Date: Mon Jun 4 01:34:15 2007 +0300 winealsa.drv: Mark every sysex buffer being added. --- dlls/winealsa.drv/midi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 84f1940..eecb406 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -574,6 +574,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; EnterCriticalSection(&crit_sect); + lpMidiHdr->dwFlags |= MHDR_INQUEUE; if (MidiInDev[wDevID].lpQueueHdr == 0) { MidiInDev[wDevID].lpQueueHdr = lpMidiHdr; } else {

1 0