wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Dmitry Timoshkov : kernel32: Fix access flags to page protection mapping in MapViewOfFileEx.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 1d01a7ba1edccb7206ad3539882dd0a896a32297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d01a7ba1edccb7206ad35398… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 17 13:43:36 2012 +0800 kernel32: Fix access flags to page protection mapping in MapViewOfFileEx. --- dlls/kernel32/tests/virtual.c | 34 +++------------------------------- dlls/kernel32/virtual.c | 14 ++++++++++---- dlls/ntdll/virtual.c | 2 +- 3 files changed, 14 insertions(+), 36 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 6a135c8..eb213a6 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -419,6 +419,7 @@ static void test_MapViewOfFile(void) ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, FILE_MAP_READ, FALSE, 0 ); ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( map2, FILE_MAP_WRITE, 0, 0, 4096 ); if (!ptr) { @@ -426,6 +427,7 @@ static void test_MapViewOfFile(void) CloseHandle( map2 ); ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, 0, FALSE, 0 ); ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( map2, 0, 0, 0, 4096 ); ok( !ptr, "MapViewOfFile succeeded\n" ); ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); @@ -1933,7 +1935,7 @@ static DWORD map_prot_to_access(DWORD prot) static BOOL is_compatible_access(DWORD map_prot, DWORD view_prot) { DWORD access = map_prot_to_access(map_prot); - if (!access) return FALSE; + if (!view_prot) view_prot = SECTION_MAP_READ; return (view_prot & access) == view_prot; } @@ -2112,17 +2114,10 @@ static void test_mapping(void) SetLastError(0xdeadbeef); base = MapViewOfFile(hmap, view[j].access, 0, 0, 0); - /* FIXME: completely remove the condition below once Wine is fixed */ - if (!nt_base != !base) - todo_wine /* Vista+ supports FILE_MAP_EXECUTE properly, earlier versions don't */ ok(!nt_base == !base || broken((view[j].access & FILE_MAP_EXECUTE) && !nt_base != !base), "%d: (%04x/%04x) NT %p kernel %p\n", j, page_prot[i], view[j].access, nt_base, base); - else - ok(!nt_base == !base || - broken((view[j].access & FILE_MAP_EXECUTE) && !nt_base != !base), - "%d: (%04x/%04x) NT %p kernel %p\n", j, page_prot[i], view[j].access, nt_base, base); if (!is_compatible_access(page_prot[i], view[j].access)) { @@ -2145,15 +2140,6 @@ static void test_mapping(void) ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); ok(info.BaseAddress == base, "%d: (%04x) got %p, expected %p\n", j, view[j].access, info.BaseAddress, base); ok(info.RegionSize == si.dwPageSize, "%d: (%04x) got %#lx != expected %#x\n", j, view[j].access, info.RegionSize, si.dwPageSize); - /* FIXME: completely remove the condition below once Wine is fixed */ - if (info.Protect != view[j].prot) - todo_wine - ok(info.Protect == view[j].prot || - broken(view[j].prot == PAGE_EXECUTE_READ && info.Protect == PAGE_READONLY) || /* win2k */ - broken(view[j].prot == PAGE_EXECUTE_READWRITE && info.Protect == PAGE_READWRITE) || /* win2k */ - broken(view[j].prot == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ - "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, info.Protect, view[j].prot); - else ok(info.Protect == view[j].prot || broken(view[j].prot == PAGE_EXECUTE_READ && info.Protect == PAGE_READONLY) || /* win2k */ broken(view[j].prot == PAGE_EXECUTE_READWRITE && info.Protect == PAGE_READWRITE) || /* win2k */ @@ -2167,23 +2153,9 @@ static void test_mapping(void) if (nt_base && base) { ok(nt_info.RegionSize == info.RegionSize, "%d: (%04x) got %#lx != expected %#lx\n", j, view[j].access, nt_info.RegionSize, info.RegionSize); - /* FIXME: completely remove the condition below once Wine is fixed */ - if (nt_info.Protect != info.Protect) - todo_wine - ok(nt_info.Protect == info.Protect /* Vista+ */ || - broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ - "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.Protect, info.Protect); - else ok(nt_info.Protect == info.Protect /* Vista+ */ || broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.Protect, info.Protect); - /* FIXME: completely remove the condition below once Wine is fixed */ - if (nt_info.AllocationProtect != info.AllocationProtect) - todo_wine - ok(nt_info.AllocationProtect == info.AllocationProtect /* Vista+ */ || - broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ - "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.AllocationProtect, info.AllocationProtect); - else ok(nt_info.AllocationProtect == info.AllocationProtect /* Vista+ */ || broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.AllocationProtect, info.AllocationProtect); diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 949ceb5..bddd638 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -533,15 +533,21 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, NTSTATUS status; LARGE_INTEGER offset; ULONG protect; + BOOL exec; offset.u.LowPart = offset_low; offset.u.HighPart = offset_high; - if (access & FILE_MAP_WRITE) protect = PAGE_READWRITE; - else if (access & FILE_MAP_COPY) protect = PAGE_WRITECOPY; - else protect = PAGE_READONLY; + exec = access & FILE_MAP_EXECUTE; + access &= ~FILE_MAP_EXECUTE; - if (access & FILE_MAP_EXECUTE) protect <<= 4; + if (access == FILE_MAP_COPY) + protect = exec ? PAGE_EXECUTE_WRITECOPY : PAGE_WRITECOPY; + else if (access & FILE_MAP_WRITE) + protect = exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; + else if (access & FILE_MAP_READ) + protect = exec ? PAGE_EXECUTE_READ : PAGE_READONLY; + else protect = PAGE_NOACCESS; if ((status = NtMapViewOfSection( handle, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, protect )) < 0) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 6ee3444..344a81a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2494,7 +2494,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p switch(protect) { case PAGE_NOACCESS: - access = 0; + access = SECTION_MAP_READ; break; case PAGE_READWRITE: case PAGE_EXECUTE_READWRITE:

1 0

Michael Stefaniuc : dsound: Support IKsPropertySet in the primary buffer too.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 3ec0b056d58109bd732f887d05adcceec87be376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec0b056d58109bd732f887d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 17 01:54:53 2012 +0100 dsound: Support IKsPropertySet in the primary buffer too. --- dlls/dsound/buffer.c | 8 ++++++-- dlls/dsound/primary.c | 7 +++++-- dlls/dsound/tests/ds3d.c | 31 +++++++++++++------------------ 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index a1546aa..690d104 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1159,8 +1159,12 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref && !InterlockedDecrement(&This->numIfaces)) - secondarybuffer_destroy(This); + if (!ref && !InterlockedDecrement(&This->numIfaces)) { + if (is_primary_buffer(This)) + primarybuffer_destroy(This); + else + secondarybuffer_destroy(This); + } return ref; } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 9363a31..5c74353 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -1165,8 +1165,9 @@ static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer *iface } if ( IsEqualGUID( &IID_IKsPropertySet, riid ) ) { - FIXME("app requested IKsPropertySet on primary buffer\n"); - return E_NOINTERFACE; + *ppobj = &This->IKsPropertySet_iface; + IKsPropertySet_AddRef(&This->IKsPropertySet_iface); + return S_OK; } FIXME( "Unknown IID %s\n", debugstr_guid( riid ) ); @@ -1220,10 +1221,12 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * dsb->ref = 0; dsb->ref3D = 0; + dsb->refiks = 0; dsb->numIfaces = 0; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = (IDirectSoundBuffer8Vtbl *)&dspbvt; dsb->IDirectSound3DListener_iface.lpVtbl = &ds3dlvt; + dsb->IKsPropertySet_iface.lpVtbl = &iksbvt; dsb->dsbd = *dsbd; /* IDirectSound3DListener */ diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 3e56c8a..0fbbfe8 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1213,15 +1213,13 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) !(dscaps.dwFlags & DSCAPS_EMULDRIVER),1.0,0, listener,0,0,FALSE,0); - todo_wine { - temp_buffer = NULL; - rc=IDirectSound3DListener_QueryInterface(listener, - &IID_IKsPropertySet,(LPVOID *)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08x\n", rc); - if(temp_buffer) - IKsPropertySet_Release(temp_buffer); - } + temp_buffer = NULL; + rc = IDirectSound3DListener_QueryInterface(listener, &IID_IKsPropertySet, + (void **)&temp_buffer); + ok(rc==DS_OK && temp_buffer!=NULL, + "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08x\n", rc); + if(temp_buffer) + IKsPropertySet_Release(temp_buffer); } /* Testing the reference counting */ @@ -1230,15 +1228,12 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "references, should have 0\n",ref); } - todo_wine { - temp_buffer = NULL; - rc=IDirectSoundBuffer_QueryInterface(primary, - &IID_IKsPropertySet,(LPVOID *)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); - if(temp_buffer) - IKsPropertySet_Release(temp_buffer); - } + temp_buffer = NULL; + rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IKsPropertySet, (void **)&temp_buffer); + ok(rc==DS_OK && temp_buffer!=NULL, + "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); + if(temp_buffer) + IKsPropertySet_Release(temp_buffer); /* Testing the reference counting */ ref=IDirectSoundBuffer_Release(primary);

1 0

Michael Stefaniuc : dsound: Merge IKsPropertySet into the secondary buffer object.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 48ca5924b4d4931402533dc66649534a9865372e URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ca5924b4d4931402533dc66… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 17 01:53:10 2012 +0100 dsound: Merge IKsPropertySet into the secondary buffer object. --- dlls/dsound/buffer.c | 104 +++++++++++++---------------------------- dlls/dsound/dsound_private.h | 25 +--------- 2 files changed, 36 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48ca5924b4d4931402533…

1 0

Michael Stefaniuc : dsound: Drop "Buffer" from the IKsPropertySet method names.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: fd04e770f19b621f853dbdb061390f1c78c82812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd04e770f19b621f853dbdb06… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 17 01:50:14 2012 +0100 dsound: Drop "Buffer" from the IKsPropertySet method names. --- dlls/dsound/buffer.c | 56 +++++++++++++++++-------------------------------- 1 files changed, 20 insertions(+), 36 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 1ea2d0d..b0515bf 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1130,14 +1130,12 @@ HRESULT IDirectSoundBufferImpl_Duplicate( } /******************************************************************************* - * IKsBufferPropertySet + * IKsPropertySet */ /* IUnknown methods */ -static HRESULT WINAPI IKsBufferPropertySetImpl_QueryInterface( - LPKSPROPERTYSET iface, - REFIID riid, - LPVOID *ppobj ) +static HRESULT WINAPI IKsPropertySetImpl_QueryInterface(IKsPropertySet *iface, REFIID riid, + void **ppobj) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); @@ -1145,7 +1143,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QueryInterface( return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER8)This->dsb, riid, ppobj); } -static ULONG WINAPI IKsBufferPropertySetImpl_AddRef(LPKSPROPERTYSET iface) +static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; ULONG ref = InterlockedIncrement(&(This->ref)); @@ -1153,7 +1151,7 @@ static ULONG WINAPI IKsBufferPropertySetImpl_AddRef(LPKSPROPERTYSET iface) return ref; } -static ULONG WINAPI IKsBufferPropertySetImpl_Release(LPKSPROPERTYSET iface) +static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; ULONG ref = InterlockedDecrement(&(This->ref)); @@ -1168,15 +1166,9 @@ static ULONG WINAPI IKsBufferPropertySetImpl_Release(LPKSPROPERTYSET iface) return ref; } -static HRESULT WINAPI IKsBufferPropertySetImpl_Get( - LPKSPROPERTYSET iface, - REFGUID guidPropSet, - ULONG dwPropID, - LPVOID pInstanceData, - ULONG cbInstanceData, - LPVOID pPropData, - ULONG cbPropData, - PULONG pcbReturned ) +static HRESULT WINAPI IKsPropertySetImpl_Get(IKsPropertySet *iface, REFGUID guidPropSet, + ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData, + ULONG cbPropData, ULONG *pcbReturned) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; @@ -1186,14 +1178,9 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Get( return E_PROP_ID_UNSUPPORTED; } -static HRESULT WINAPI IKsBufferPropertySetImpl_Set( - LPKSPROPERTYSET iface, - REFGUID guidPropSet, - ULONG dwPropID, - LPVOID pInstanceData, - ULONG cbInstanceData, - LPVOID pPropData, - ULONG cbPropData ) +static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guidPropSet, + ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData, + ULONG cbPropData) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; @@ -1202,11 +1189,8 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Set( return E_PROP_ID_UNSUPPORTED; } -static HRESULT WINAPI IKsBufferPropertySetImpl_QuerySupport( - LPKSPROPERTYSET iface, - REFGUID guidPropSet, - ULONG dwPropID, - PULONG pTypeSupport ) +static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REFGUID guidPropSet, + ULONG dwPropID, ULONG *pTypeSupport) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; @@ -1216,12 +1200,12 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QuerySupport( } static const IKsPropertySetVtbl iksbvt = { - IKsBufferPropertySetImpl_QueryInterface, - IKsBufferPropertySetImpl_AddRef, - IKsBufferPropertySetImpl_Release, - IKsBufferPropertySetImpl_Get, - IKsBufferPropertySetImpl_Set, - IKsBufferPropertySetImpl_QuerySupport + IKsPropertySetImpl_QueryInterface, + IKsPropertySetImpl_AddRef, + IKsPropertySetImpl_Release, + IKsPropertySetImpl_Get, + IKsPropertySetImpl_Set, + IKsPropertySetImpl_QuerySupport }; HRESULT IKsBufferPropertySetImpl_Create( @@ -1255,7 +1239,7 @@ HRESULT IKsBufferPropertySetImpl_Destroy( { TRACE("(%p)\n",piks); - while (IKsBufferPropertySetImpl_Release((LPKSPROPERTYSET)piks) > 0); + while (IKsPropertySetImpl_Release((LPKSPROPERTYSET)piks) > 0); return S_OK; }

1 0

Austin English : wined3d: Recognize Nvidia 540M.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: fe30990e8d6d5daf7afa2315c175f9719ea29b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe30990e8d6d5daf7afa2315c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 16 14:54:48 2012 -0600 wined3d: Recognize Nvidia 540M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fd628e7..56cfa35 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1121,6 +1121,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT540M, "NVIDIA GeForce GT 540M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560TI, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1524,6 +1525,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 560", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ + {"GT 540M", CARD_NVIDIA_GEFORCE_GT540M}, /* Geforce 500 - midend mobile */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ {"GTX 465", CARD_NVIDIA_GEFORCE_GTX465}, /* Geforce 400 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f91e3f6..8e5edc5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1408,6 +1408,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, + CARD_NVIDIA_GEFORCE_GT540M = 0x0df4, CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8, CARD_NVIDIA_GEFORCE_GTX560TI = 0x1200,

1 0

Gerald Pfeifer : libwine: Always build preloading code.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 11e811411c272f7ea302ee5fba0a06d45afa222b URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e811411c272f7ea302ee5fb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 15 18:16:23 2012 +0100 libwine: Always build preloading code. --- libs/wine/config.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index fdd4700..d614825 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -456,7 +456,6 @@ const char *wine_get_build_id(void) /* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */ static void preloader_exec( char **argv, int use_preloader ) { -#ifdef linux if (use_preloader) { static const char preloader[] = "wine-preloader"; @@ -483,7 +482,6 @@ static void preloader_exec( char **argv, int use_preloader ) free( new_argv ); free( full_name ); } -#endif execv( argv[0], argv ); } @@ -494,7 +492,12 @@ void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) int use_preloader; if (!name) name = argv0_name; /* no name means default loader */ + +#ifdef linux use_preloader = !strendswith( name, "wineserver" ); +#else + use_preloader = 0; +#endif if ((ptr = strrchr( name, '/' ))) {

1 0

Andrew Eikum : dsound: Lock the source buffer during duplication.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 9cf7f95483cfa10b01a4cbd2dc97bee2b0c82235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf7f95483cfa10b01a4cbd2d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 16 14:02:45 2012 -0600 dsound: Lock the source buffer during duplication. --- dlls/dsound/buffer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index bc9b955..1ea2d0d 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1083,9 +1083,15 @@ HRESULT IDirectSoundBufferImpl_Duplicate( *ppdsb = NULL; return DSERR_OUTOFMEMORY; } + + RtlAcquireResourceShared(&pdsb->lock, TRUE); + CopyMemory(dsb, pdsb, sizeof(*dsb)); dsb->pwfx = DSOUND_CopyFormat(pdsb->pwfx); + + RtlReleaseResource(&pdsb->lock); + if (dsb->pwfx == NULL) { HeapFree(GetProcessHeap(),0,dsb); *ppdsb = NULL;

1 0

Aric Stewart : wineqtdecoder: Lock the Transform filter csReceive around the decommpression callback.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: ab735065288c808eb904133fdc51680b6296c1c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab735065288c808eb904133fd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 14:14:29 2012 -0600 wineqtdecoder: Lock the Transform filter csReceive around the decommpression callback. --- dlls/wineqtdecoder/qtvdecoder.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index ceab21e..79e06a5 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -179,7 +179,7 @@ static void trackingCallback( return; } - EnterCriticalSection(&This->tf.filter.csFilter); + EnterCriticalSection(&This->tf.csReceive); hr = BaseOutputPinImpl_GetDeliveryBuffer((BaseOutputPin*)This->tf.ppPins[1], &pOutSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); @@ -230,12 +230,12 @@ static void trackingCallback( IMediaSample_SetTime(pOutSample, &tStart, &tStop); } - LeaveCriticalSection(&This->tf.filter.csFilter); hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)This->tf.ppPins[1], pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr); error: + LeaveCriticalSection(&This->tf.csReceive); if (pOutSample) IMediaSample_Release(pOutSample); @@ -278,7 +278,6 @@ static HRESULT WINAPI QTVDecoder_Receive(TransformFilter *tf, IMediaSample *pSam OSStatus err = noErr; LONGLONG tStart, tStop; - EnterCriticalSection(&This->tf.filter.csFilter); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { @@ -316,7 +315,6 @@ static HRESULT WINAPI QTVDecoder_Receive(TransformFilter *tf, IMediaSample *pSam hr = This->decodeHR; error: - LeaveCriticalSection(&This->tf.filter.csFilter); return hr; }

1 0

Aric Stewart : strmbase: In the TransformFilter add a critical section that protects the streaming state .
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: b32b1a924eb00b568ebb758fcf5afa12f80d984a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32b1a924eb00b568ebb758fc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 14:14:23 2012 -0600 strmbase: In the TransformFilter add a critical section that protects the streaming state. --- dlls/strmbase/transform.c | 25 +++++++++++++++---------- include/wine/strmbase.h | 1 + 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index ccdef39..b44becf 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -68,25 +68,25 @@ static HRESULT WINAPI TransformFilter_Input_Receive(BaseInputPin *This, IMediaSa TRACE("%p\n", This); pTransform = (TransformFilter*)This->pin.pinInfo.pFilter; - EnterCriticalSection(&pTransform->filter.csFilter); + EnterCriticalSection(&pTransform->csReceive); if (pTransform->filter.state == State_Stopped) { - LeaveCriticalSection(&pTransform->filter.csFilter); + LeaveCriticalSection(&pTransform->csReceive); return VFW_E_WRONG_STATE; } if (This->end_of_stream || This->flushing) { - LeaveCriticalSection(&pTransform->filter.csFilter); + LeaveCriticalSection(&pTransform->csReceive); return S_FALSE; } - LeaveCriticalSection(&pTransform->filter.csFilter); if (pTransform->pFuncsTable->pfnReceive) hr = pTransform->pFuncsTable->pfnReceive(pTransform, pInSample); else hr = S_FALSE; + LeaveCriticalSection(&pTransform->csReceive); return hr; } @@ -176,6 +176,9 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p BaseFilter_Init(&pTransformFilter->filter, pVtbl, pClsid, (DWORD_PTR)(__FILE__ ": TransformFilter.csFilter"), &tfBaseFuncTable); + InitializeCriticalSection(&pTransformFilter->csReceive); + pTransformFilter->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": TransformFilter.csReceive"); + /* pTransformFilter is already allocated */ pTransformFilter->pFuncsTable = pFuncsTable; ZeroMemory(&pTransformFilter->pmt, sizeof(pTransformFilter->pmt)); @@ -286,6 +289,8 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) CoTaskMemFree(This->ppPins); TRACE("Destroying transform filter\n"); + This->csReceive.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csReceive); FreeMediaType(&This->pmt); CoTaskMemFree(This); @@ -304,13 +309,13 @@ HRESULT WINAPI TransformFilterImpl_Stop(IBaseFilter * iface) TRACE("(%p/%p)\n", This, iface); - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->csReceive); { This->filter.state = State_Stopped; if (This->pFuncsTable->pfnStopStreaming) hr = This->pFuncsTable->pfnStopStreaming(This); } - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->csReceive); return hr; } @@ -322,7 +327,7 @@ HRESULT WINAPI TransformFilterImpl_Pause(IBaseFilter * iface) TRACE("(%p/%p)->()\n", This, iface); - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->csReceive); { if (This->filter.state == State_Stopped) hr = IBaseFilter_Run(iface, -1); @@ -332,7 +337,7 @@ HRESULT WINAPI TransformFilterImpl_Pause(IBaseFilter * iface) if (SUCCEEDED(hr)) This->filter.state = State_Paused; } - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->csReceive); return hr; } @@ -344,7 +349,7 @@ HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStar TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->csReceive); { if (This->filter.state == State_Stopped) { @@ -361,7 +366,7 @@ HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStar This->filter.state = State_Running; } } - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->csReceive); return hr; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3d06bf8..6370530 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -232,6 +232,7 @@ typedef struct TransformFilter IPin **ppPins; ULONG npins; AM_MEDIA_TYPE pmt; + CRITICAL_SECTION csReceive; const struct TransformFilterFuncTable * pFuncsTable; QualityControlImpl qcimpl;

1 0

Aric Stewart : wineqtdecoder: Do not invert height.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 9aa3c74503b924e5b251901add6e34e2035cbdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa3c74503b924e5b251901ad… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 14:14:07 2012 -0600 wineqtdecoder: Do not invert height. --- dlls/wineqtdecoder/qtsplitter.c | 5 +++-- dlls/wineqtdecoder/qtutils.c | 5 +++-- dlls/wineqtdecoder/qtvdecoder.c | 2 -- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 17f173c..362f535 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -767,12 +767,13 @@ static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) pvi = (VIDEOINFOHEADER *)amt.pbFormat; pvi->bmiHeader.biSize = sizeof (BITMAPINFOHEADER); pvi->bmiHeader.biWidth = outputWidth; - pvi->bmiHeader.biHeight = -outputHeight; + pvi->bmiHeader.biHeight = outputHeight; pvi->bmiHeader.biPlanes = 1; pvi->bmiHeader.biBitCount = 24; pvi->bmiHeader.biCompression = BI_RGB; + pvi->bmiHeader.biSizeImage = outputWidth * outputHeight * outputDepth; - filter->outputSize = outputWidth * outputHeight * outputDepth; + filter->outputSize = pvi->bmiHeader.biSizeImage; amt.lSampleSize = 0; pixelBufferOptions = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); diff --git a/dlls/wineqtdecoder/qtutils.c b/dlls/wineqtdecoder/qtutils.c index a1e8f05..19ba90c 100644 --- a/dlls/wineqtdecoder/qtutils.c +++ b/dlls/wineqtdecoder/qtutils.c @@ -126,7 +126,6 @@ typedef struct { HRESULT AccessPixelBufferPixels( CVPixelBufferRef pixelBuffer, LPBYTE pbDstStream) { LPBYTE pPixels = NULL; - LPBYTE out = NULL; size_t bytesPerRow = 0, height = 0, width = 0; OSType actualType; int i; @@ -143,9 +142,11 @@ HRESULT AccessPixelBufferPixels( CVPixelBufferRef pixelBuffer, LPBYTE pbDstStrea height = CVPixelBufferGetHeight(pixelBuffer); width = CVPixelBufferGetWidth(pixelBuffer); - for (out = pbDstStream, i = 0; i < height; i++) + for (i = 1; i <= height; i++) { int j; + LPBYTE out = pbDstStream + ((height - i) * width * 3); + for (j = 0; j < width; j++) { *((DWORD*)out) = (((ARGBPixelPtr)pPixels)[j].r) << 16 diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 3690087..ceab21e 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -442,8 +442,6 @@ static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION bmi->biCompression = BI_RGB; bmi->biBitCount = 24; outpmt->subtype = MEDIASUBTYPE_RGB24; - if (bmi->biHeight > 0) - bmi->biHeight = -bmi->biHeight; return S_OK; }

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012