October 2009 - Wine-Commits

Stefan Dösinger : d3d: Make EndScene calls hookable.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: e80144c403cf9cc06301c499e96405eaa53e4511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80144c403cf9cc06301c499e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 13 01:25:23 2009 +0200 d3d: Make EndScene calls hookable. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/device.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0ec2e07..7993fac 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1056,7 +1056,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_BeginScene(LPDIRECT3DDEVICE8 iface) { return hr; } -static HRESULT WINAPI IDirect3DDevice8Impl_EndScene(LPDIRECT3DDEVICE8 iface) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice8Impl_EndScene(LPDIRECT3DDEVICE8 iface) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7899a19..7dcff3d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1097,7 +1097,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_BeginScene(LPDIRECT3DDEVICE9EX ifac return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_EndScene(LPDIRECT3DDEVICE9EX iface) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_EndScene(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2db5aa2..1883a5d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1704,13 +1704,13 @@ IDirect3DDeviceImpl_7_EndScene(IDirect3DDevice7 *iface) else return D3DERR_SCENE_NOT_IN_SCENE; } -static HRESULT WINAPI +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_7_EndScene_FPUSetup(IDirect3DDevice7 *iface) { return IDirect3DDeviceImpl_7_EndScene(iface); } -static HRESULT WINAPI +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_7_EndScene_FPUPreserve(IDirect3DDevice7 *iface) { HRESULT hr; @@ -1723,7 +1723,7 @@ IDirect3DDeviceImpl_7_EndScene_FPUPreserve(IDirect3DDevice7 *iface) return hr; } -static HRESULT WINAPI +static HRESULT WINAPI DECLSPEC_HOTPATCH Thunk_IDirect3DDeviceImpl_3_EndScene(IDirect3DDevice3 *iface) { IDirect3DDeviceImpl *This = device_from_device3(iface); @@ -1731,7 +1731,7 @@ Thunk_IDirect3DDeviceImpl_3_EndScene(IDirect3DDevice3 *iface) return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)This); } -static HRESULT WINAPI +static HRESULT WINAPI DECLSPEC_HOTPATCH Thunk_IDirect3DDeviceImpl_2_EndScene(IDirect3DDevice2 *iface) { IDirect3DDeviceImpl *This = device_from_device2(iface); @@ -1739,7 +1739,7 @@ Thunk_IDirect3DDeviceImpl_2_EndScene(IDirect3DDevice2 *iface) return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)This); } -static HRESULT WINAPI +static HRESULT WINAPI DECLSPEC_HOTPATCH Thunk_IDirect3DDeviceImpl_1_EndScene(IDirect3DDevice *iface) { IDirect3DDeviceImpl *This = device_from_device1(iface);

1 0

Stefan Dösinger : d3d9: Make some functions hookable.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: dcacd83a82019b117cf628cb338231822961aa0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcacd83a82019b117cf628cb3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:19:25 2009 +0200 d3d9: Make some functions hookable. --- dlls/d3d9/d3d9_main.c | 4 ++-- dlls/d3d9/device.c | 10 +++++----- dlls/d3d9/directx.c | 10 +++++----- dlls/d3d9/swapchain.c | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index f59fc46..e8b4a97 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -33,7 +33,7 @@ void WINAPI DebugSetMute(void) { /* nothing to do */ } -IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { +IDirect3D9* WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT SDKVersion) { IDirect3D9Impl* object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D9Impl)); object->lpVtbl = &Direct3D9_Vtbl; @@ -53,7 +53,7 @@ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { return (IDirect3D9*) object; } -HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex **direct3d9ex) { +HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex **direct3d9ex) { IDirect3D9 *ret; IDirect3D9Impl* object; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5a37f81..7899a19 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -235,7 +235,7 @@ static ULONG WINAPI IDirect3DDevice9Impl_AddRef(LPDIRECT3DDEVICE9EX iface) { return ref; } -static ULONG WINAPI IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9EX iface) { +static ULONG WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; ULONG ref; @@ -490,7 +490,7 @@ static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data return ret; } -static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; WINED3DPRESENT_PARAMETERS localParameters; HRESULT hr; @@ -568,7 +568,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3 return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_Present(LPDIRECT3DDEVICE9EX iface, CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Present(LPDIRECT3DDEVICE9EX iface, CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* pDirtyRegion) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; @@ -1288,7 +1288,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetClipPlane(LPDIRECT3DDEVICE9EX if return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderState(LPDIRECT3DDEVICE9EX iface, D3DRENDERSTATETYPE State, DWORD Value) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_SetRenderState(LPDIRECT3DDEVICE9EX iface, D3DRENDERSTATETYPE State, DWORD Value) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); @@ -1451,7 +1451,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetSamplerState(IDirect3DDevice9Ex *i return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_SetSamplerState(LPDIRECT3DDEVICE9EX iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_SetSamplerState(LPDIRECT3DDEVICE9EX iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 301f901..b1c5459 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -394,10 +394,10 @@ ULONG WINAPI D3D9CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) { return IDirect3DSwapChain9_Release((IDirect3DSwapChain9*) swapChainParent); } -static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9EX iface, UINT Adapter, D3DDEVTYPE DeviceType, - HWND hFocusWindow, DWORD BehaviourFlags, - D3DPRESENT_PARAMETERS* pPresentationParameters, - IDirect3DDevice9** ppReturnedDeviceInterface) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(LPDIRECT3D9EX iface, UINT Adapter, D3DDEVTYPE DeviceType, + HWND hFocusWindow, DWORD BehaviourFlags, + D3DPRESENT_PARAMETERS* pPresentationParameters, + IDirect3DDevice9** ppReturnedDeviceInterface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; IDirect3DDevice9Impl *object = NULL; @@ -524,7 +524,7 @@ static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterDisplayModeEx(IDirect3D9Ex *ifa return D3DERR_DRIVERINTERNALERROR; } -static HRESULT WINAPI IDirect3D9ExImpl_CreateDeviceEx(IDirect3D9Ex *iface, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, struct IDirect3DDevice9Ex **ppReturnedDeviceInterface) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3D9Ex *iface, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, struct IDirect3DDevice9Ex **ppReturnedDeviceInterface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p)->(%d, %d, %p, 0x%08x, %p, %p, %p): Stub!\n", This, Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, pFullscreenDisplayMode, ppReturnedDeviceInterface); *ppReturnedDeviceInterface = NULL; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 461db37..5a7e4a2 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -77,7 +77,7 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) } /* IDirect3DSwapChain9 parts follow: */ -static HRESULT WINAPI IDirect3DSwapChain9Impl_Present(LPDIRECT3DSWAPCHAIN9 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion, DWORD dwFlags) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DSwapChain9Impl_Present(LPDIRECT3DSWAPCHAIN9 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion, DWORD dwFlags) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; HRESULT hr; @@ -211,7 +211,7 @@ static const IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl = /* IDirect3DDevice9 IDirect3DSwapChain9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** pSwapChain) { +HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** pSwapChain) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSwapChain9Impl* object; HRESULT hrc = D3D_OK; @@ -282,7 +282,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE return hrc; } -HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) { +HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hrc = D3D_OK; IWineD3DSwapChain *swapchain = NULL;

1 0

Stefan Dösinger : dinput: Make the creation functions hookable.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 024dcba89a834004264910b079d33177a279ccf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024dcba89a834004264910b07… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:18:32 2009 +0200 dinput: Make the creation functions hookable. --- dlls/dinput/dinput_main.c | 4 ++-- dlls/dinput8/dinput8_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 9769d74..78a5e26 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -162,7 +162,7 @@ HRESULT WINAPI DirectInputCreateEx( /****************************************************************************** * DirectInputCreateA (DINPUT.@) */ -HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) { return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7A, (LPVOID *)ppDI, punkOuter); } @@ -170,7 +170,7 @@ HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPU /****************************************************************************** * DirectInputCreateW (DINPUT.@) */ -HRESULT WINAPI DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter) { return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); } diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index c855caf..77f7f64 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -50,7 +50,7 @@ static void UnlockModule(void) /****************************************************************************** * DirectInput8Create (DINPUT8.@) */ -HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { HRESULT hr; TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter);

1 0

Stefan Dösinger : d3d8: Make Direct3DCreate8 hookable.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: f54d6c366d1e84255b5948d67ed14c063e2543bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54d6c366d1e84255b5948d67… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:13:58 2009 +0200 d3d8: Make Direct3DCreate8 hookable. --- dlls/d3d8/d3d8_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 6300371..e5f44e7 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -35,7 +35,7 @@ void WINAPI DebugSetMute(void) { /* nothing to do */ } -IDirect3D8* WINAPI Direct3DCreate8(UINT SDKVersion) { +IDirect3D8* WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT SDKVersion) { IDirect3D8Impl* object; TRACE("SDKVersion = %x\n", SDKVersion);

1 0

Charles Davis : ntdll: Implement CDROM_RawRead() on Mac OS.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 6368dbbd5939bf71b04f3c441dd3af8cd027b7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6368dbbd5939bf71b04f3c441… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue Oct 13 12:58:59 2009 -0600 ntdll: Implement CDROM_RawRead() on Mac OS. --- dlls/ntdll/cdrom.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 8e334df..c0389f9 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1449,6 +1449,155 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW FIXME("NIY: %d\n", raw->TrackMode); return STATUS_INVALID_PARAMETER; } +#elif defined(__APPLE__) + switch (raw->TrackMode) + { + case YellowMode2: + { + /* Mac OS, on the other hand, DOES read only one part of the sector + * at a time. Therefore, we have to read each part of the sector, in + * order, to get the whole raw sector in. + * This means that we have to read each sector one at a time, as on + * Linux. + */ + dk_cd_read_t cdrd; + UInt64 lba = raw->DiskOffset.QuadPart >> 11; + PBYTE bp; + int i; + + for (i = 0, bp = buffer; i < raw->SectorCount; + i++, lba++, bp += kCDSectorSizeWhole) + { + cdrd.offset = lba * kCDSectorSizeWhole; + cdrd.sectorType = kCDSectorTypeMode2; + + /* First, the sync area */ + cdrd.sectorArea = kCDSectorAreaSync; + cdrd.buffer = bp; + cdrd.bufferLength = 12; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i; + return CDROM_GetStatusCode(io); + } + + /* Then the header */ + cdrd.offset += 12; + cdrd.sectorArea = kCDSectorAreaHeader; + cdrd.buffer = (PBYTE)cdrd.buffer + 12; + cdrd.bufferLength = 4; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 12; + return CDROM_GetStatusCode(io); + } + + /* And finally the sector proper */ + cdrd.offset += 4; + cdrd.sectorArea = kCDSectorAreaUser; + cdrd.buffer = (PBYTE)cdrd.buffer + 4; + cdrd.bufferLength = kCDSectorSizeMode2; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 16; + return CDROM_GetStatusCode(io); + } + } + + break; + } + + case XAForm2: + { + /* Same here */ + dk_cd_read_t cdrd; + UInt64 lba = raw->DiskOffset.QuadPart >> 11; + PBYTE bp; + int i; + + for (i = 0, bp = buffer; i < raw->SectorCount; + i++, lba++, bp += kCDSectorSizeWhole) + { + cdrd.offset = lba * kCDSectorSizeWhole; + cdrd.sectorType = kCDSectorTypeMode2Form2; + + /* First, the sync area */ + cdrd.sectorArea = kCDSectorAreaSync; + cdrd.buffer = bp; + cdrd.bufferLength = 12; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i; + return CDROM_GetStatusCode(io); + } + + /* Then the header */ + cdrd.offset += 12; + cdrd.sectorArea = kCDSectorAreaHeader; + cdrd.buffer = (PBYTE)cdrd.buffer + 12; + cdrd.bufferLength = 4; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 12; + return CDROM_GetStatusCode(io); + } + + /* And the sub-header */ + cdrd.offset += 4; + cdrd.sectorArea = kCDSectorAreaSubHeader; + cdrd.buffer = (PBYTE)cdrd.buffer + 4; + cdrd.bufferLength = 8; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 16; + return CDROM_GetStatusCode(io); + } + + /* And finally the sector proper */ + cdrd.offset += 8; + cdrd.sectorArea = kCDSectorAreaUser; + cdrd.buffer = (PBYTE)cdrd.buffer + 8; + cdrd.bufferLength = kCDSectorSizeMode2; + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = kCDSectorSizeWhole * i + 24; + return CDROM_GetStatusCode(io); + } + } + + break; + } + + case CDDA: + { + /* With CDDA, the whole raw sector is considered user data, so there's + * no need to read one at a time. + */ + dk_cd_read_t cdrd; + + cdrd.offset = (raw->DiskOffset.QuadPart >> 11) * kCDSectorSizeCDDA; + cdrd.sectorArea = kCDSectorAreaUser; + cdrd.sectorType = kCDSectorTypeCDDA; + cdrd.buffer = buffer; + cdrd.bufferLength = len < raw->SectorCount*kCDSectorSizeCDDA ? len : + raw->SectorCount*kCDSectorSizeCDDA; + + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) return CDROM_GetStatusCode(io); + break; + } + + default: + FIXME("NIY: %d\n", raw->TrackMode); + return STATUS_INVALID_PARAMETER; + } #else switch (raw->TrackMode) {

1 0

Stefan Dösinger : kernel32: Make some functions hookable.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 282cc71aedaa8feb5207e73bd748fd422f147b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282cc71aedaa8feb5207e73bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:10:20 2009 +0200 kernel32: Make some functions hookable. --- dlls/kernel32/module.c | 10 +++++----- dlls/kernel32/process.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index fc75475..05d5add 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -919,7 +919,7 @@ done: * ignore the parameter because it would be extremely difficult to * integrate this with different types of module representations. */ -HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) { WCHAR *libnameW; @@ -932,7 +932,7 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) * * Unicode version of LoadLibraryExA. */ -HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags) { UNICODE_STRING wstr; HMODULE res; @@ -974,7 +974,7 @@ HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW, HANDLE hfile, DWORD flags) * NOTES * See LoadLibraryExA(). */ -HMODULE WINAPI LoadLibraryA(LPCSTR libname) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryA(LPCSTR libname) { return LoadLibraryExA(libname, 0, 0); } @@ -984,7 +984,7 @@ HMODULE WINAPI LoadLibraryA(LPCSTR libname) * * Unicode version of LoadLibraryA. */ -HMODULE WINAPI LoadLibraryW(LPCWSTR libnameW) +HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryW(LPCWSTR libnameW) { return LoadLibraryExW(libnameW, 0, 0); } @@ -1001,7 +1001,7 @@ HMODULE WINAPI LoadLibraryW(LPCWSTR libnameW) * Success: TRUE. The dll is removed if it is not still in use. * Failure: FALSE. Use GetLastError() to determine the cause. */ -BOOL WINAPI FreeLibrary(HINSTANCE hLibModule) +BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) { BOOL retv = FALSE; NTSTATUS nts; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index df09558..eca9e38 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1895,10 +1895,10 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, /********************************************************************** * CreateProcessA (KERNEL32.@) */ -BOOL WINAPI CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, - DWORD flags, LPVOID env, LPCSTR cur_dir, - LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, + DWORD flags, LPVOID env, LPCSTR cur_dir, + LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) { BOOL ret = FALSE; WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; @@ -1937,10 +1937,10 @@ done: /********************************************************************** * CreateProcessW (KERNEL32.@) */ -BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, - LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, - LPPROCESS_INFORMATION info ) +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, + LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, + LPPROCESS_INFORMATION info ) { BOOL retv = FALSE; HANDLE hFile = 0;

1 0

Stefan Dösinger : configure: Check for ms_hook_prologue attribute support.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: fdac5e57d3fd8ebe5044a076ff27566d6122e93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdac5e57d3fd8ebe5044a076f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:08:53 2009 +0200 configure: Check for ms_hook_prologue attribute support. --- configure | 38 ++++++++++++++++++++++++++++++++++++++ configure.ac | 15 +++++++++++++++ include/config.h.in | 3 +++ 3 files changed, 56 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 72251ba..dae14db 100755 --- a/configure +++ b/configure @@ -11702,6 +11702,44 @@ if test $ac_cv_cflags__Werror = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Werror" fi fi + + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ms_hook_prologue attribute" >&5 +$as_echo_n "checking for ms_hook_prologue attribute... " >&6; } +if test "${ac_cv_have_ms_hook_prologue+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __attribute__((__ms_hook_prologue__)) test(void) { return 0; } +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_have_ms_hook_prologue="yes" +else + ac_cv_have_ms_hook_prologue="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_ms_hook_prologue" >&5 +$as_echo "$ac_cv_have_ms_hook_prologue" >&6; } + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_have_ms_hook_prologue" = "yes" + then + +$as_echo "#define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__))" >>confdefs.h + + else + $as_echo "#define DECLSPEC_HOTPATCH /* */" >>confdefs.h + + fi fi diff --git a/configure.ac b/configure.ac index 813b198..5210c35 100644 --- a/configure.ac +++ b/configure.ac @@ -1505,6 +1505,21 @@ then then WINE_TRY_CFLAGS([-Werror]) fi + + dnl Check for ms_hook_prologue support + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + AC_CACHE_CHECK([for ms_hook_prologue attribute], ac_cv_have_ms_hook_prologue, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int __attribute__((__ms_hook_prologue__)) test(void) { return 0; }]])], + [ac_cv_have_ms_hook_prologue="yes"],[ac_cv_have_ms_hook_prologue="no"])) + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_have_ms_hook_prologue" = "yes" + then + AC_DEFINE(DECLSPEC_HOTPATCH, [__attribute__((__ms_hook_prologue__))], + [Define to a function attribute for Microsoft hotpatch assembly prefix.]) + else + AC_DEFINE(DECLSPEC_HOTPATCH, [/* */]) + fi fi dnl **** Check for underscore on external symbols **** diff --git a/include/config.h.in b/include/config.h.in index 0be8f4d..16b2e90 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,6 +2,9 @@ #define __WINE_CONFIG_H +/* Define to a function attribute for Microsoft hotpatch assembly prefix. */ +#undef DECLSPEC_HOTPATCH + /* Define to the file extension for executables. */ #undef EXEEXT

1 0

Paul Vriens : winmm/tests: Fix some test failures in Win9x and WinMe.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 55b3a9c906b01544b0bbb35c1dfa14aed0932944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b3a9c906b01544b0bbb35c1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 14 10:56:36 2009 +0200 winmm/tests: Fix some test failures in Win9x and WinMe. --- dlls/winmm/tests/wave.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8a9caf2..3e3afbd 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -791,9 +791,11 @@ static void wave_out_test_deviceOut(int device, double duration, } for (i = 0; i < headers; i++) { - ok(frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED), - "WHDR_DONE WHDR_PREPARED expected, got %s\n", - wave_header_flags(frags[i].dwFlags)); + ok(frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED) || + broken((flags & CALLBACK_TYPEMASK)==CALLBACK_EVENT && + frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED|0x1000)), /* < NT4 */ + "(%02d) WHDR_DONE WHDR_PREPARED expected, got %s\n", + i, wave_header_flags(frags[i].dwFlags)); } check_position(device, wout, length * (loops + 1), pwfx); }

1 0

Alexander Kochetkov : oleaut32/tests: Checking null terminator in return value of SysReAllocStringLen.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: b6da072551cf6eb88d1500df5127802face30a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6da072551cf6eb88d1500df5… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Wed Oct 14 11:27:10 2009 +0400 oleaut32/tests: Checking null terminator in return value of SysReAllocStringLen. --- dlls/oleaut32/tests/vartype.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b7528c4..b50a673 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5397,6 +5397,37 @@ static void test_SysReAllocStringLen(void) SysFreeString(str); } + + /* Windows always returns null terminated strings */ + str = SysAllocStringLen(szTest, 4); + ok (str != NULL, "Expected non-NULL\n"); + if (str) + { + const int CHUNK_SIZE = 64; + const int STRING_SIZE = 24; + int changed; + changed = SysReAllocStringLen(&str, NULL, CHUNK_SIZE); + ok (changed == 1, "Expected 1, got %d\n", changed); + ok (str != NULL, "Expected non-NULL\n"); + if (str) + { + BSTR oldstr = str; + + /* Filling string */ + memset (str, 0xAB, CHUNK_SIZE * sizeof (OLECHAR)); + /* Checking null terminator */ + changed = SysReAllocStringLen(&str, NULL, STRING_SIZE); + ok (changed == 1, "Expected 1, got %d\n", changed); + ok (str != NULL, "Expected non-NULL\n"); + if (str) + { + ok (str == oldstr, "Expected reuse of the old string memory\n"); + todo_wine ok (str[STRING_SIZE] == 0, + "Expected null terminator, got 0x%04X\n", str[STRING_SIZE]); + SysFreeString(str); + } + } + } } static void test_BstrCopy(void)

1 0

Stefan Dösinger : shell32: Make some functions hookable.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 29d72a53abcc95860a04b5ff733f7895fa560d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d72a53abcc95860a04b5ff7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:13:47 2009 +0200 shell32: Make some functions hookable. --- dlls/shell32/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 1a12e51..20e2888 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1875,7 +1875,7 @@ HINSTANCE WINAPI ShellExecuteA(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile, * ShellExecuteExA [SHELL32.292] * */ -BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei) +BOOL WINAPI DECLSPEC_HOTPATCH ShellExecuteExA (LPSHELLEXECUTEINFOA sei) { SHELLEXECUTEINFOW seiW; BOOL ret; @@ -1922,7 +1922,7 @@ BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei) * ShellExecuteExW [SHELL32.293] * */ -BOOL WINAPI ShellExecuteExW (LPSHELLEXECUTEINFOW sei) +BOOL WINAPI DECLSPEC_HOTPATCH ShellExecuteExW (LPSHELLEXECUTEINFOW sei) { return SHELL_execute( sei, SHELL_ExecuteW ); }

1 0