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

Vitaliy Margolen : dinput: Keep the list of all the dinput devices created for each IDIrectInput object .
by Alexandre Julliard July 9, 2007

July 9, 2007

Module: wine Branch: master Commit: 448dde9be8e1334d20b404288367e1c47edb485c URL: http://source.winehq.org/git/wine.git/?a=commit;h=448dde9be8e1334d20b404288… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Jul 6 23:36:09 2007 -0600 dinput: Keep the list of all the dinput devices created for each IDIrectInput object. --- dlls/dinput/device.c | 4 ++++ dlls/dinput/device_private.h | 2 ++ dlls/dinput/dinput_main.c | 40 +++++++++++++++++++++++++++++++--------- dlls/dinput/dinput_private.h | 12 +++++++----- 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 35bf117..618665f 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -688,6 +688,10 @@ ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) HeapFree(GetProcessHeap(), 0, This->data_format.wine_df); release_DataFormat(&This->data_format); + EnterCriticalSection( &This->dinput->crit ); + list_remove( &This->entry ); + LeaveCriticalSection( &This->dinput->crit ); + IDirectInput_Release((LPDIRECTINPUTDEVICE8A)This->dinput); This->crit.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->crit); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 6295d6c..2ac609b 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "dinput.h" +#include "wine/list.h" #include "dinput_private.h" typedef struct @@ -55,6 +56,7 @@ struct IDirectInputDevice2AImpl GUID guid; CRITICAL_SECTION crit; IDirectInputImpl *dinput; + struct list entry; /* entry into IDirectInput devices list */ HANDLE hEvent; DWORD dwCoopLevel; HWND win; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 28718fa..52be7f3 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -43,6 +43,7 @@ #include "winuser.h" #include "winerror.h" #include "dinput_private.h" +#include "device_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dinput); @@ -129,6 +130,11 @@ HRESULT WINAPI DirectInputCreateEx( This->dwVersion = dwVersion; This->evsequence = 1; *ppDI = This; + + InitializeCriticalSection(&This->crit); + This->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectInputImpl*->crit"); + + list_init( &This->devices_list ); } return res; } @@ -254,15 +260,19 @@ static ULONG WINAPI IDirectInputAImpl_AddRef(LPDIRECTINPUT7A iface) static ULONG WINAPI IDirectInputAImpl_Release(LPDIRECTINPUT7A iface) { - IDirectInputImpl *This = (IDirectInputImpl *)iface; - ULONG ref; - ref = InterlockedDecrement(&(This->ref)); - if (ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - release_hook_thread(); - } - return ref; + IDirectInputImpl *This = (IDirectInputImpl *)iface; + ULONG ref; + + ref = InterlockedDecrement( &This->ref ); + if (ref) return ref; + + release_hook_thread(); + + This->crit.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &This->crit ); + HeapFree( GetProcessHeap(), 0, This ); + + return 0; } static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, REFIID riid, LPVOID *ppobj) { @@ -355,9 +365,15 @@ static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, R /* Loop on all the devices to see if anyone matches the given GUID */ for (i = 0; i < NB_DINPUT_DEVICES; i++) { HRESULT ret; + if (!dinput_devices[i]->create_deviceA) continue; if ((ret = dinput_devices[i]->create_deviceA(This, rguid, riid, (LPDIRECTINPUTDEVICEA*) pvOut)) == DI_OK) + { + EnterCriticalSection( &This->crit ); + list_add_tail( &This->devices_list, &(*(IDirectInputDevice2AImpl**)pvOut)->entry ); + LeaveCriticalSection( &This->crit ); return DI_OK; + } if (ret == DIERR_NOINTERFACE) ret_value = DIERR_NOINTERFACE; @@ -380,9 +396,15 @@ static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx(LPDIRECTINPUT7W iface, R /* Loop on all the devices to see if anyone matches the given GUID */ for (i = 0; i < NB_DINPUT_DEVICES; i++) { HRESULT ret; + if (!dinput_devices[i]->create_deviceW) continue; if ((ret = dinput_devices[i]->create_deviceW(This, rguid, riid, (LPDIRECTINPUTDEVICEW*) pvOut)) == DI_OK) + { + EnterCriticalSection( &This->crit ); + list_add_tail( &This->devices_list, &(*(IDirectInputDevice2AImpl**)pvOut)->entry ); + LeaveCriticalSection( &This->crit ); return DI_OK; + } if (ret == DIERR_NOINTERFACE) ret_value = DIERR_NOINTERFACE; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index d3f58a3..b29f61e 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -24,18 +24,20 @@ #include "windef.h" #include "winbase.h" #include "dinput.h" +#include "wine/list.h" /* Implementation specification */ typedef struct IDirectInputImpl IDirectInputImpl; struct IDirectInputImpl { - const void *lpVtbl; - LONG ref; + const void *lpVtbl; + LONG ref; - /* Used to have an unique sequence number for all the events */ - DWORD evsequence; + CRITICAL_SECTION crit; - DWORD dwVersion; + DWORD evsequence; /* unique sequence number for events */ + DWORD dwVersion; /* direct input version number */ + struct list devices_list; /* list of all created dinput devices */ }; /* Function called by all devices that Wine supports */

1 0

Paul Vriens : advapi32: Handle to Service Control Manager is checked first.
by Alexandre Julliard July 9, 2007

July 9, 2007

Module: wine Branch: master Commit: 06d6a03d45f77097b9e1a346253feec1b22e391b URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d6a03d45f77097b9e1a3462… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jul 9 10:22:49 2007 +0200 advapi32: Handle to Service Control Manager is checked first. --- dlls/advapi32/service.c | 12 ++++++------ dlls/advapi32/tests/service.c | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 731d668..9fc351f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1228,12 +1228,6 @@ SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, TRACE("%p %s %d\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); - if (!lpServiceName) - { - SetLastError(ERROR_INVALID_ADDRESS); - return NULL; - } - hscm = sc_handle_get_handle_data( hSCManager, SC_HTYPE_MANAGER ); if (!hscm) { @@ -1241,6 +1235,12 @@ SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return FALSE; } + if (!lpServiceName) + { + SetLastError(ERROR_INVALID_ADDRESS); + return NULL; + } + r = RegOpenKeyExW( hscm->hkey, lpServiceName, 0, KEY_ALL_ACCESS, &hKey ); if (r!=ERROR_SUCCESS) { diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 341423e..b3779f9 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -93,7 +93,6 @@ static void test_open_svc(void) SetLastError(0xdeadbeef); svc_handle = OpenServiceA(NULL, NULL, 0); ok(!svc_handle, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); /* TODO: Add some tests with invalid handles. These produce errors on Windows but crash on Wine */

1 0

Misha Koshelev : urlmon/tests: Make http protocol mime type test pass on native.
by Alexandre Julliard July 9, 2007

July 9, 2007

Module: wine Branch: master Commit: 64054b005c21edcd1cd739e5578807cb97bef902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64054b005c21edcd1cd739e55… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Jul 8 16:52:10 2007 -0500 urlmon/tests: Make http protocol mime type test pass on native. --- dlls/urlmon/tests/protocol.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 5a40355..2f46b5d 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -270,7 +270,9 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, if(tested_protocol == BIND_TEST) ok(szStatusText == expect_wsz, "unexpected szStatusText\n"); else - ok(!lstrcmpW(szStatusText, text_html), "szStatusText != text/html\n"); + ok(lstrlenW(text_html) <= lstrlenW(szStatusText) && + !memcmp(szStatusText, text_html, lstrlenW(text_html)*sizeof(WCHAR)), + "szStatusText != text/html\n"); } break; case BINDSTATUS_DIRECTBIND:

1 0

H. Verbeet : wined3d: Advertise VTF support.
by Alexandre Julliard July 9, 2007

July 9, 2007

Module: wine Branch: master Commit: 8f3c1ad5ea51eeb64a3304d3c9ae77180156f5c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3c1ad5ea51eeb64a3304d3c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 8 22:57:46 2007 +0200 wined3d: Advertise VTF support. --- dlls/wined3d/directx.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8351b94..ae924c4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1550,8 +1550,24 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt * See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… * and http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… */ if (Usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; /* Enable when fully supported */ + if (!GL_LIMITS(vertex_samplers)) { + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } + + switch (CheckFormat) { + case WINED3DFMT_A32B32G32R32F: + if (!GL_SUPPORT(ARB_TEXTURE_FLOAT)) { + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + + default: + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } } if(Usage & WINED3DUSAGE_DEPTHSTENCIL) {

1 0

Maarten Lankhorst : dsound: Fix division by zero in DSOUND_Calc3DBuffer.
by Alexandre Julliard July 9, 2007

July 9, 2007

Module: wine Branch: master Commit: a6ab4c51cfcceb592ff6225ca9d40a9fc4dc9b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ab4c51cfcceb592ff6225ca… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jul 8 16:38:05 2007 +0200 dsound: Fix division by zero in DSOUND_Calc3DBuffer. --- dlls/dsound/sound3d.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index cae1c28..4a26947 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -238,6 +238,9 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) /* my test show that for my way of calc., we need only half of angles */ DWORD dwInsideConeAngle = dsb->ds3db_ds3db.dwInsideConeAngle/2; DWORD dwOutsideConeAngle = dsb->ds3db_ds3db.dwOutsideConeAngle/2; + if (dwOutsideConeAngle == dwInsideConeAngle) + ++dwOutsideConeAngle; + /* full volume */ if (flAngle < dwInsideConeAngle) flAngle = dwInsideConeAngle;

1 0

Maarten Lankhorst : dsound: Remove some more unused variables.
by Alexandre Julliard July 9, 2007

July 9, 2007

Module: wine Branch: master Commit: 2b8a1815e6e962381a0886fd850f9c38d4b26c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8a1815e6e962381a0886fd8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 6 22:57:48 2007 +0200 dsound: Remove some more unused variables. --- dlls/dsound/buffer.c | 6 +----- dlls/dsound/dsound_private.h | 6 +++--- dlls/dsound/mixer.c | 31 +++++++++++++------------------ 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 7a45679..50959e2 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -355,7 +355,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(LPDIRECTSOUNDBUFFER8 iface) else This->state = STATE_STOPPED; } - DSOUND_CheckEvent(This, 0); + DSOUND_CheckEvent(This, 0, 0); LeaveCriticalSection(&(This->lock)); /* **** */ @@ -1030,8 +1030,6 @@ HRESULT IDirectSoundBufferImpl_Create( dsb->lpVtbl = &dsbvt; dsb->iks = NULL; - dsb->remix_pos = 0; - /* size depends on version */ CopyMemory(&dsb->dsbd, dsbd, dsbd->dwSize); @@ -1135,7 +1133,6 @@ HRESULT IDirectSoundBufferImpl_Create( /* It's not necessary to initialize values to zero since */ /* we allocated this structure with HEAP_ZERO_MEMORY... */ - dsb->playpos = 0; dsb->buf_mixpos = 0; dsb->state = STATE_STOPPED; @@ -1285,7 +1282,6 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->ref = 0; dsb->state = STATE_STOPPED; - dsb->playpos = 0; dsb->buf_mixpos = 0; dsb->device = device; dsb->ds3db = NULL; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 56fbd0c..386ed96 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -162,7 +162,7 @@ struct IDirectSoundBufferImpl PWAVEFORMATEX pwfx; BufferMemory* buffer; DWORD playflags,state,leadin; - DWORD playpos,startpos,writelead,buflen; + DWORD startpos,writelead,buflen; DWORD nAvgBytesPerSec; DWORD freq; DSVOLUMEPAN volpan; @@ -170,7 +170,7 @@ struct IDirectSoundBufferImpl /* used for frequency conversion (PerfectPitch) */ ULONG freqAdjust, freqAcc; /* used for intelligent (well, sort of) prebuffering */ - DWORD primary_mixpos, buf_mixpos, last_playpos, remix_pos; + DWORD primary_mixpos, buf_mixpos, last_playpos; /* IDirectSoundNotifyImpl fields */ IDirectSoundNotifyImpl* notify; @@ -433,7 +433,7 @@ DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This, DWORD pplay, DWORD p /* mixer.c */ -void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len); +void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, DWORD playpos, int len); void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan); void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan); void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb); diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 96c7c42..7b4864e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -106,7 +106,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) * "last played" position for the buffer (i.e. dsb->playpos) and "len" bytes * beyond that position. */ -void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len) +void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, DWORD playpos, int len) { int i; DWORD offset; @@ -117,7 +117,7 @@ void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len) return; TRACE("(%p) buflen = %d, playpos = %d, len = %d\n", - dsb, dsb->buflen, dsb->playpos, len); + dsb, dsb->buflen, playpos, len); for (i = 0; i < dsb->nrofnotifies ; i++) { event = dsb->notifies + i; offset = event->dwOffset; @@ -136,14 +136,14 @@ void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len) } else return; } - if ((dsb->playpos + len) >= dsb->buflen) { - if ((offset < ((dsb->playpos + len) % dsb->buflen)) || - (offset >= dsb->playpos)) { + if ((playpos + len) >= dsb->buflen) { + if ((offset < ((playpos + len) % dsb->buflen)) || + (offset >= playpos)) { TRACE("signalled event %p (%d)\n", event->hEventNotify, i); SetEvent(event->hEventNotify); } } else { - if ((offset >= dsb->playpos) && (offset < (dsb->playpos + len))) { + if ((offset >= playpos) && (offset < (playpos + len))) { TRACE("signalled event %p (%d)\n", event->hEventNotify, i); SetEvent(event->hEventNotify); } @@ -594,15 +594,6 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD playpos, DWORD wri TRACE("writepos=%d, buf_mixpos=%d, primary_mixpos=%d, mixlen=%d\n", writepos, dsb->buf_mixpos, dsb->primary_mixpos, mixlen); TRACE("looping=%d, startpos=%d, leadin=%d, buflen=%d\n", dsb->playflags, dsb->startpos, dsb->leadin, dsb->buflen); - /* check for notification positions */ - if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY && - dsb->state != STATE_STARTING) { - DSOUND_CheckEvent(dsb, mixlen); - } - - /* save write position for non-GETCURRENTPOSITION2... */ - dsb->playpos = writepos; - /* calculate how much pre-buffering has already been done for this buffer */ primary_done = DSOUND_BufPtrDiff(dsb->device->buflen, dsb->primary_mixpos, writepos); @@ -627,6 +618,12 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD playpos, DWORD wri /* mix more data */ mixlen = DSOUND_MixInBuffer(dsb, dsb->primary_mixpos, mixlen); + /* check for notification positions */ + if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY && + dsb->state != STATE_STARTING) { + DSOUND_CheckEvent(dsb, writepos, mixlen); + } + /* increase mix position */ dsb->primary_mixpos += mixlen; dsb->primary_mixpos %= dsb->device->buflen; @@ -644,10 +641,8 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD playpos, DWORD wri TRACE("Buffer reached end. Stopped\n"); dsb->state = STATE_STOPPED; - dsb->playpos = 0; dsb->buf_mixpos = 0; dsb->leadin = FALSE; - DSOUND_CheckEvent(dsb, mixlen); } /* Report back the total prebuffered amount for this buffer */ @@ -692,7 +687,7 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD playpos, /* if buffer is stopping it is stopped now */ if (dsb->state == STATE_STOPPING) { dsb->state = STATE_STOPPED; - DSOUND_CheckEvent(dsb, 0); + DSOUND_CheckEvent(dsb, 0, 0); } else { /* if recovering, reset the mix position */

1 0

H. Verbeet : wined3d: Advertise A32B32G32R32F render target support.
by Alexandre Julliard July 9, 2007

July 9, 2007

Module: wine Branch: master Commit: f31edc3ce7b7213e26d657704ef7e7133cf71c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31edc3ce7b7213e26d657704… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 8 22:57:36 2007 +0200 wined3d: Advertise A32B32G32R32F render target support. --- dlls/wined3d/directx.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ce2ca70..8351b94 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1535,6 +1535,17 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_INVALIDCALL; } + if (Usage & WINED3DUSAGE_QUERY_FILTER) { + switch (CheckFormat) { + /* Filtering not supported */ + case WINED3DFMT_A32B32G32R32F: + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + default: + break; + } + } + /* TODO: Check support against more of the WINED3DUSAGE_QUERY_* constants * See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… * and http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… */ @@ -1589,6 +1600,13 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } TRACE_(d3d_caps)("[OK]\n"); return WINED3D_OK; + case WINED3DFMT_A32B32G32R32F: + if (!GL_SUPPORT(ARB_TEXTURE_FLOAT)) { + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; default: TRACE_(d3d_caps)("[FAILED]\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Maarten Lankhorst : dsound: Simplify IDirectSoundBufferImpl_GetCurrentPosition.
by Alexandre Julliard July 9, 2007

July 9, 2007

Module: wine Branch: master Commit: 976f56d6c0f7bb6c2248412a3b66935d87924e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=976f56d6c0f7bb6c2248412a3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jul 8 16:36:46 2007 +0200 dsound: Simplify IDirectSoundBufferImpl_GetCurrentPosition. --- dlls/dsound/buffer.c | 77 +++-------------------------------------- dlls/dsound/dsound_private.h | 6 +--- 2 files changed, 7 insertions(+), 76 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 50959e2..aa6ef50 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -409,47 +409,9 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(LPDIRECTSOUNDBUFFER8 iface) return ref; } -DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This, DWORD pplay, DWORD pwrite) +static DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This) { DWORD bplay = This->buf_mixpos; - DWORD pmix = This->primary_mixpos; - DirectSoundDevice * device = This->device; - TRACE("(%p, pplay=%u, pwrite=%u)\n", This, pplay, pwrite); - - /* the actual primary play position (pplay) is always behind last mixed (pmix), - * unless the computer is too slow or something */ - /* we need to know how far away we are from there */ - if (pmix < pplay) pmix += device->buflen; /* wraparound */ - pmix -= pplay; - - /* detect buffer underrun (sanity) */ - if (pwrite < pplay) pwrite += device->buflen; /* wraparound */ - pwrite -= pplay; - if (pmix > (ds_snd_queue_max * device->fraglen + pwrite + device->writelead)) { - ERR("detected an underrun: primary queue was %d\n",pmix); - pmix = 0; - } - - TRACE("primary back-samples=%d\n",pmix); - - /* divide the offset by its sample size */ - pmix /= device->pwfx->nBlockAlign; - - /* adjust for our frequency */ - pmix = (pmix * This->freqAdjust) >> DSOUND_FREQSHIFT; - - /* multiply by our own sample size */ - pmix *= This->pwfx->nBlockAlign; - - TRACE("this back-offset=%d\n", pmix); - - /* sanity */ - if(pmix > This->buflen) - WARN("Mixed length (%d) is longer then buffer length (%d)\n", pmix, This->buflen); - - /* subtract from our last mixed position */ - while (bplay < pmix) bplay += This->buflen; /* wraparound */ - bplay -= pmix; /* check for lead-in */ if (This->leadin && ((bplay < This->startpos) || (bplay > This->buf_mixpos))) { @@ -481,38 +443,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition( return hres; } } else { - if (playpos && (This->state != STATE_PLAYING)) { + if (playpos && (This->state != STATE_PLAYING)) /* we haven't been merged into the primary buffer (yet) */ *playpos = This->buf_mixpos; - } else if (playpos) { - DWORD pplay, pwrite; - - /* get primary lock, before messing with primary/device data */ - EnterCriticalSection(&(This->device->mixlock)); - - /* let's get this exact; first, recursively call GetPosition on the primary */ - if (DSOUND_PrimaryGetPosition(This->device, &pplay, &pwrite) != DS_OK) - WARN("DSOUND_PrimaryGetPosition failed\n"); - if ((This->dsbd.dwFlags & DSBCAPS_GETCURRENTPOSITION2) || This->device->hwbuf) { - /* calculate play position using this */ - *playpos = DSOUND_CalcPlayPosition(This, pplay, pwrite); - } else { - /* (unless the app isn't using GETCURRENTPOSITION2) */ - /* don't know exactly how this should be handled... - * the docs says that play cursor is reported as directly - * behind write cursor, hmm... */ - /* let's just do what might work for Half-Life */ - DWORD wp; - wp = (This->device->pwplay + This->device->prebuf) * This->device->fraglen; - wp %= This->device->buflen; - *playpos = DSOUND_CalcPlayPosition(This, wp, pwrite); - TRACE("Using non-GETCURRENTPOSITION2\n"); - } - - LeaveCriticalSection(&(This->device->mixlock)); - } + else if (playpos) + *playpos = DSOUND_CalcPlayPosition(This); if (writepos) - *writepos = This->buf_mixpos; + *writepos = (playpos ? *playpos : This->buf_mixpos); } if (writepos) { if (This->state != STATE_STOPPED) { @@ -521,11 +458,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition( } *writepos %= This->buflen; } - if (playpos) - This->last_playpos = *playpos; TRACE("playpos = %d, writepos = %d, buflen=%d (%p, time=%d)\n", - playpos?*playpos:0, writepos?*writepos:0, This->buflen, This, GetTickCount()); + playpos?*playpos:-1, writepos?*writepos:-1, This->buflen, This, GetTickCount()); return DS_OK; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 386ed96..fcd4133 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -170,7 +170,7 @@ struct IDirectSoundBufferImpl /* used for frequency conversion (PerfectPitch) */ ULONG freqAdjust, freqAcc; /* used for intelligent (well, sort of) prebuffering */ - DWORD primary_mixpos, buf_mixpos, last_playpos; + DWORD primary_mixpos, buf_mixpos; /* IDirectSoundNotifyImpl fields */ IDirectSoundNotifyImpl* notify; @@ -427,10 +427,6 @@ HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) HRESULT DSOUND_FullDuplexCreate(REFIID riid, LPDIRECTSOUNDFULLDUPLEX* ppDSFD); -/* buffer.c */ - -DWORD DSOUND_CalcPlayPosition(IDirectSoundBufferImpl *This, DWORD pplay, DWORD pwrite); - /* mixer.c */ void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, DWORD playpos, int len);

1 0

Alexander Nicolaysen Sørnes : wordpad: Prompt for saving file changes.
by Alexandre Julliard July 9, 2007

July 9, 2007

Module: wine Branch: master Commit: 77bf899160dc84f9655478b0cefbe92fe1546c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77bf899160dc84f9655478b0c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 8 13:51:19 2007 +0200 wordpad: Prompt for saving file changes. --- programs/wordpad/De.rc | 6 ++ programs/wordpad/En.rc | 6 ++ programs/wordpad/Fr.rc | 6 ++ programs/wordpad/Hu.rc | 6 ++ programs/wordpad/Ko.rc | 6 ++ programs/wordpad/Nl.rc | 6 ++ programs/wordpad/No.rc | 6 ++ programs/wordpad/Pl.rc | 6 ++ programs/wordpad/Ru.rc | 6 ++ programs/wordpad/Tr.rc | 6 ++ programs/wordpad/resource.h | 3 + programs/wordpad/wordpad.c | 165 +++++++++++++++++++++++++++++++------------ 12 files changed, 184 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77bf899160dc84f965547…

1 0

Hans Leidekker : dwmapi: Add a stub implementation for DwmIsCompositionEnabled.
by Alexandre Julliard July 9, 2007

July 9, 2007

Module: wine Branch: master Commit: 3252d093fc076bf312c929bd4ecfdd99c9c0e9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3252d093fc076bf312c929bd4… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jul 8 14:06:38 2007 +0200 dwmapi: Add a stub implementation for DwmIsCompositionEnabled. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 1f21b69..ebe7494 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -33,7 +33,7 @@ @ stub DwmGetGraphicsStreamTransformHint @ stub DwmGetTransportAttributes @ stub DwmGetWindowAttribute -@ stub DwmIsCompositionEnabled +@ stdcall DwmIsCompositionEnabled(ptr) @ stub DwmModifyPreviousDxFrameDuration @ stub DwmQueryThumbnailSourceSize @ stub DwmRegisterThumbnail diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 4bee74d..e4ebc3c 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -47,3 +47,14 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) } return TRUE; } + +/********************************************************************** + * DwmIsCompositionEnabled (DWMAPI.@) + */ +HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) +{ + FIXME("%p\n", enabled); + + *enabled = FALSE; + return S_OK; +}

1 0