October 2009 - Wine-commits

Matteo Bruni : d3dx9: Add D3DXAssembleShader and related declarations.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 3cd744e98bf6f7efd640a39c607488af5f9bfbeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd744e98bf6f7efd640a39c6… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Sep 15 20:09:03 2009 +0200 d3dx9: Add D3DXAssembleShader and related declarations. --- include/d3dx9shader.h | 79 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 899077e..a15cab6 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -21,6 +21,27 @@ #ifndef __D3DX9SHADER_H__ #define __D3DX9SHADER_H__ +#define D3DXSHADER_DEBUG 0x1 +#define D3DXSHADER_SKIPVALIDATION 0x2 +#define D3DXSHADER_SKIPOPTIMIZATION 0x4 +#define D3DXSHADER_PACKMATRIX_ROWMAJOR 0x8 +#define D3DXSHADER_PACKMATRIX_COLUMNMAJOR 0x10 +#define D3DXSHADER_PARTIALPRECISION 0x20 +#define D3DXSHADER_FORCE_VS_SOFTWARE_NOOPT 0x40 +#define D3DXSHADER_FORCE_PS_SOFTWARE_NOOPT 0x80 +#define D3DXSHADER_NO_PRESHADER 0x100 +#define D3DXSHADER_AVOID_FLOW_CONTROL 0x200 +#define D3DXSHADER_PREFER_FLOW_CONTROL 0x400 +#define D3DXSHADER_ENABLE_BACKWARDS_COMPATIBILITY 0x1000 +#define D3DXSHADER_IEEE_STRICTNESS 0x2000 + +#define D3DXSHADER_OPTIMIZATION_LEVEL0 0x4000 +#define D3DXSHADER_OPTIMIZATION_LEVEL1 0x0 +#define D3DXSHADER_OPTIMIZATION_LEVEL2 0xC000 +#define D3DXSHADER_OPTIMIZATION_LEVEL3 0x8000 + +#define D3DXSHADER_USE_LEGACY_D3DX9_31_DLL 0x10000 + typedef LPCSTR D3DXHANDLE; typedef enum D3DXPARAMETER_CLASS @@ -64,6 +85,26 @@ typedef struct _D3DXMACRO { LPCSTR Definition; } D3DXMACRO, *LPD3DXMACRO; +typedef enum _D3DXINCLUDE_TYPE +{ + D3DXINC_LOCAL, + D3DXINC_SYSTEM, + D3DXINC_FORCE_DWORD = 0x7fffffff, +} D3DXINCLUDE_TYPE, *LPD3DXINCLUDE_TYPE; + +#undef INTERFACE +#define INTERFACE ID3DXInclude + +DECLARE_INTERFACE(ID3DXInclude) +{ + STDMETHOD(Open)(THIS_ D3DXINCLUDE_TYPE include_type, LPCSTR filename, LPCVOID parent_data, LPCVOID *data, UINT *bytes) PURE; + STDMETHOD(Close)(THIS_ LPCVOID data) PURE; +}; + +#define ID3DXInclude_Open(p,a,b,c,d,e) (p)->lpVtbl->Open(p,a,b,c,d,e) +#define ID3DXInclude_Close(p,a) (p)->lpVtbl->Close(p,a) + +typedef struct ID3DXInclude *LPD3DXINCLUDE; #ifdef __cplusplus extern "C" { @@ -74,6 +115,44 @@ UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code); DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code); LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device); +HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, + LPCSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, + LPCWSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShader(LPCSTR data, + UINT data_len, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + #ifdef __cplusplus } #endif

1 0

Matteo Bruni : d3dx9: D3DXAssembleShader and D3DXAssembleShaderFromFile stubs.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: c31121dd35b41803b0e561a569b4df225895bd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31121dd35b41803b0e561a56… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Sep 15 20:17:14 2009 +0200 d3dx9: D3DXAssembleShader and D3DXAssembleShaderFromFile stubs. --- dlls/d3dx9_36/d3dx9_36.spec | 6 ++-- dlls/d3dx9_36/shader.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index d3fe3ac..0d39114 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -1,6 +1,6 @@ -@ stub D3DXAssembleShader -@ stub D3DXAssembleShaderFromFileA -@ stub D3DXAssembleShaderFromFileW +@ stdcall D3DXAssembleShader(ptr long ptr ptr long ptr ptr) +@ stdcall D3DXAssembleShaderFromFileA(str ptr ptr long ptr ptr) +@ stdcall D3DXAssembleShaderFromFileW(wstr ptr ptr long ptr ptr) @ stub D3DXAssembleShaderFromResourceA @ stub D3DXAssembleShaderFromResourceW @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 48499ac..97b2384 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -19,6 +19,7 @@ #include "config.h" #include "wine/port.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "windef.h" #include "wingdi.h" #include "d3dx9.h" @@ -131,3 +132,50 @@ LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device) return NULL; } + +HRESULT WINAPI D3DXAssembleShader(LPCSTR data, + UINT data_len, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + FIXME("stub\n"); + return D3DERR_INVALIDCALL; +} + +HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + LPWSTR filename_w = NULL; + DWORD len; + HRESULT ret; + + if (!filename) return D3DXERR_INVALIDDATA; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + filename_w = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filename_w) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filename_w, len); + + ret = D3DXAssembleShaderFromFileW(filename_w, defines, include, flags, shader, error_messages); + + HeapFree(GetProcessHeap(), 0, filename_w); + return ret; +} + +HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + FIXME("stub\n"); + return D3DERR_INVALIDCALL; +}

1 0

Matteo Bruni : d3dx9: D3DXAssembleShaderFromResource implementation.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: cbcf69985686f781819a285bdab9df3e02e14107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbcf69985686f781819a285bd… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Sep 15 20:23:00 2009 +0200 d3dx9: D3DXAssembleShaderFromResource implementation. --- dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- dlls/d3dx9_36/shader.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 0d39114..08bb7f5 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -1,8 +1,8 @@ @ stdcall D3DXAssembleShader(ptr long ptr ptr long ptr ptr) @ stdcall D3DXAssembleShaderFromFileA(str ptr ptr long ptr ptr) @ stdcall D3DXAssembleShaderFromFileW(wstr ptr ptr long ptr ptr) -@ stub D3DXAssembleShaderFromResourceA -@ stub D3DXAssembleShaderFromResourceW +@ stdcall D3DXAssembleShaderFromResourceA(long str ptr ptr long ptr ptr) +@ stdcall D3DXAssembleShaderFromResourceW(long wstr ptr ptr long ptr ptr) @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) @ stub D3DXCheckCubeTextureRequirements @ stub D3DXCheckTextureRequirements diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 97b2384..c05f7b7 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -23,6 +23,7 @@ #include "windef.h" #include "wingdi.h" #include "d3dx9.h" +#include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -179,3 +180,43 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, FIXME("stub\n"); return D3DERR_INVALIDCALL; } + +HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, + LPCSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + HRSRC res; + LPCSTR buffer; + DWORD len; + + if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) + return D3DXERR_INVALIDDATA; + if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + return D3DXERR_INVALIDDATA; + return D3DXAssembleShader(buffer, len, defines, include, flags, + shader, error_messages); +} + +HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, + LPCWSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + HRSRC res; + LPCSTR buffer; + DWORD len; + + if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) + return D3DXERR_INVALIDDATA; + if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + return D3DXERR_INVALIDDATA; + return D3DXAssembleShader(buffer, len, defines, include, flags, + shader, error_messages); +}

1 0

Charles Davis : ntdll: Implement DVD_StartSession() on Mac OS.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 05acaeb0f1e220149936abf0336d556e90acd00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05acaeb0f1e220149936abf03… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Oct 16 13:56:51 2009 -0600 ntdll: Implement DVD_StartSession() on Mac OS. --- dlls/ntdll/cdrom.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 94faf13..43676d0 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -81,6 +81,7 @@ # include <IOKit/IOKitLib.h> # include <IOKit/storage/IOMedia.h> # include <IOKit/storage/IOCDMediaBSDClient.h> +# include <IOKit/storage/IODVDMediaBSDClient.h> # include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h> # define SENSEBUFLEN kSenseDefaultSize #endif @@ -1939,6 +1940,20 @@ static NTSTATUS DVD_StartSession(int fd, const DVD_SESSION_ID *sid_in, PDVD_SESS return ret; #elif defined(__FreeBSD__) || defined(__NetBSD__) return STATUS_NOT_SUPPORTED; +#elif defined(__APPLE__) + NTSTATUS ret = STATUS_NOT_SUPPORTED; + dk_dvd_report_key_t dvdrk; + DVDAuthenticationGrantIDInfo agid_info; + + dvdrk.format = kDVDKeyFormatAGID_CSS; + dvdrk.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + if(sid_in) dvdrk.grantID = *(uint8_t*)sid_in; /* ? */ + dvdrk.bufferLength = sizeof(DVDAuthenticationGrantIDInfo); + dvdrk.buffer = &agid_info; + + ret = CDROM_GetStatusCode(ioctl(fd, DKIOCDVDREPORTKEY, &dvdrk)); + *sid_out = agid_info.grantID; + return ret; #else return STATUS_NOT_SUPPORTED; #endif

1 0

Charles Davis : ntdll: Implement DVD_EndSession() on Mac OS.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: df2bf3e3e5f2e8bf641189a247328c678baf001c URL: http://source.winehq.org/git/wine.git/?a=commit;h=df2bf3e3e5f2e8bf641189a24… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Oct 16 13:56:59 2009 -0600 ntdll: Implement DVD_EndSession() on Mac OS. --- dlls/ntdll/cdrom.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 43676d0..3094eda 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1977,6 +1977,14 @@ static NTSTATUS DVD_EndSession(int fd, const DVD_SESSION_ID *sid) return CDROM_GetStatusCode(ioctl(fd, DVD_AUTH, &auth_info)); #elif defined(__FreeBSD__) || defined(__NetBSD__) return STATUS_NOT_SUPPORTED; +#elif defined(__APPLE__) + dk_dvd_send_key_t dvdsk; + + dvdsk.format = kDVDKeyFormatAGID_Invalidate; + dvdsk.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + dvdsk.grantID = (uint8_t)*sid; + + return CDROM_GetStatusCode(ioctl(fd, DKIOCDVDSENDKEY, &dvdsk)); #else return STATUS_NOT_SUPPORTED; #endif

1 0

Charles Davis : ntdll: Implement DVD_SendKey() on Mac OS.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 7b0ba554ef832f98c8ccf871c059676237c3825f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0ba554ef832f98c8ccf871c… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Oct 16 13:57:06 2009 -0600 ntdll: Implement DVD_SendKey() on Mac OS. --- dlls/ntdll/cdrom.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 3094eda..fbb7828 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -77,6 +77,7 @@ #endif #ifdef HAVE_IOKIT_IOKITLIB_H +# include <libkern/OSByteOrder.h> # include <sys/disk.h> # include <IOKit/IOKitLib.h> # include <IOKit/storage/IOMedia.h> @@ -2025,6 +2026,51 @@ static NTSTATUS DVD_SendKey(int fd, const DVD_COPY_PROTECT_KEY *key) FIXME("Unknown Keytype 0x%x\n",key->KeyType); } return ret; +#elif defined(__APPLE__) + dk_dvd_send_key_t dvdsk; + union + { + DVDChallengeKeyInfo chal; + DVDKey2Info key2; + } key_desc; + + switch(key->KeyType) + { + case DvdChallengeKey: + dvdsk.format = kDVDKeyFormatChallengeKey; + dvdsk.bufferLength = sizeof(key_desc.chal); + dvdsk.buffer = &key_desc.chal; + OSWriteBigInt16(key_desc.chal.dataLength, 0, key->KeyLength); + memcpy(key_desc.chal.challengeKeyValue, key->KeyData, key->KeyLength); + break; + case DvdBusKey2: + dvdsk.format = kDVDKeyFormatKey2; + dvdsk.bufferLength = sizeof(key_desc.key2); + dvdsk.buffer = &key_desc.key2; + OSWriteBigInt16(key_desc.key2.dataLength, 0, key->KeyLength); + memcpy(key_desc.key2.key2Value, key->KeyData, key->KeyLength); + break; + case DvdInvalidateAGID: + dvdsk.format = kDVDKeyFormatAGID_Invalidate; + break; + case DvdBusKey1: + case DvdTitleKey: + case DvdAsf: + case DvdGetRpcKey: + case DvdDiskKey: + ERR("attempted to write read-only key type 0x%x\n", key->KeyType); + return STATUS_NOT_SUPPORTED; + case DvdSetRpcKey: + FIXME("DvdSetRpcKey NIY\n"); + return STATUS_NOT_SUPPORTED; + default: + FIXME("got unknown key type 0x%x\n", key->KeyType); + return STATUS_NOT_SUPPORTED; + } + dvdsk.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + dvdsk.grantID = (uint8_t)key->SessionId; + + return CDROM_GetStatusCode(ioctl(fd, DKIOCDVDSENDKEY, &dvdsk)); #else FIXME("unsupported on this platform\n"); return STATUS_NOT_SUPPORTED;

1 0

Charles Davis : ntdll: Implement DVD_ReadKey() on Mac OS.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 71f430e7400aa2f63c5b041d42e3506002946c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f430e7400aa2f63c5b041d4… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Oct 16 13:57:11 2009 -0600 ntdll: Implement DVD_ReadKey() on Mac OS. --- dlls/ntdll/cdrom.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 148 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index fbb7828..5caf8b0 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -2162,6 +2162,154 @@ static NTSTATUS DVD_ReadKey(int fd, PDVD_COPY_PROTECT_KEY key) #elif defined(__FreeBSD__) || defined(__NetBSD__) TRACE("bsd\n"); return STATUS_NOT_SUPPORTED; +#elif defined(__APPLE__) + union + { + dk_dvd_report_key_t key; + dk_dvd_read_structure_t disk_key; + } ioc; + union + { + DVDDiscKeyInfo disk_key; + DVDChallengeKeyInfo chal; + DVDKey1Info key1; + DVDTitleKeyInfo title; + DVDAuthenticationSuccessFlagInfo asf; + DVDRegionPlaybackControlInfo rpc; + } desc; + NTSTATUS ret = STATUS_NOT_SUPPORTED; + + switch(key->KeyType) + { + case DvdChallengeKey: + ioc.key.format = kDVDKeyFormatChallengeKey; + ioc.key.grantID = (uint8_t)key->SessionId; + ioc.key.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + ioc.key.bufferLength = sizeof(desc.chal); + ioc.key.buffer = &desc.chal; + OSWriteBigInt16(desc.chal.dataLength, 0, key->KeyLength); + break; + case DvdBusKey1: + ioc.key.format = kDVDKeyFormatKey1; + ioc.key.grantID = (uint8_t)key->SessionId; + ioc.key.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + ioc.key.bufferLength = sizeof(desc.key1); + ioc.key.buffer = &desc.key1; + OSWriteBigInt16(desc.key1.dataLength, 0, key->KeyLength); + break; + case DvdTitleKey: + ioc.key.format = kDVDKeyFormatTitleKey; + ioc.key.grantID = (uint8_t)key->SessionId; + ioc.key.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + ioc.key.bufferLength = sizeof(desc.title); + ioc.key.buffer = &desc.title; + ioc.key.address = (uint32_t)(key->Parameters.TitleOffset.QuadPart>>11); + OSWriteBigInt16(desc.title.dataLength, 0, key->KeyLength); + break; + case DvdAsf: + ioc.key.format = kDVDKeyFormatASF; + ioc.key.grantID = (uint8_t)key->SessionId; + ioc.key.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + ioc.key.bufferLength = sizeof(desc.asf); + ioc.key.buffer = &desc.asf; + OSWriteBigInt16(desc.asf.dataLength, 0, key->KeyLength); + break; + case DvdGetRpcKey: + ioc.key.format = kDVDKeyFormatRegionState; + ioc.key.grantID = (uint8_t)key->SessionId; + ioc.key.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + ioc.key.bufferLength = sizeof(desc.rpc); + ioc.key.buffer = &desc.rpc; + OSWriteBigInt16(desc.rpc.dataLength, 0, key->KeyLength); + break; + case DvdDiskKey: + ioc.disk_key.format = kDVDStructureFormatDiscKeyInfo; + ioc.disk_key.grantID = (uint8_t)key->SessionId; + ioc.disk_key.bufferLength = sizeof(desc.disk_key); + ioc.disk_key.buffer = &desc.disk_key; + break; + case DvdInvalidateAGID: + ioc.key.format = kDVDKeyFormatAGID_Invalidate; + ioc.key.grantID = (uint8_t)key->SessionId; + ioc.key.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + break; + case DvdBusKey2: + case DvdSetRpcKey: + ERR("attempted to read write-only key type 0x%x\n", key->KeyType); + return STATUS_NOT_SUPPORTED; + default: + FIXME("got unknown key type 0x%x\n", key->KeyType); + return STATUS_NOT_SUPPORTED; + } + + ret = CDROM_GetStatusCode(ioctl(fd, (key->KeyType == DvdDiskKey ? DKIOCDVDREADSTRUCTURE : DKIOCDVDREPORTKEY), &ioc)); + + if (ret == STATUS_SUCCESS) + { + switch(key->KeyType) + { + case DvdChallengeKey: + key->KeyLength = OSReadBigInt16(desc.chal.dataLength, 0); + memcpy(key->KeyData, desc.chal.challengeKeyValue, key->KeyLength); + break; + case DvdBusKey1: + key->KeyLength = OSReadBigInt16(desc.key1.dataLength, 0); + memcpy(key->KeyData, desc.key1.key1Value, key->KeyLength); + break; + case DvdTitleKey: + key->KeyLength = OSReadBigInt16(desc.title.dataLength, 0); + memcpy(key->KeyData, desc.title.titleKeyValue, key->KeyLength); + key->KeyFlags = 0; + if (desc.title.CPM) + { + /*key->KeyFlags |= DVD_COPYRIGHTED;*/ + if (desc.title.CP_SEC) key->KeyFlags |= DVD_SECTOR_PROTECTED; + /*else key->KeyFlags |= DVD_SECTOR_NOT_PROTECTED;*/ +#if 0 + switch (desc.title.CGMS) + { + case 0: + key->KeyFlags |= DVD_CGMS_COPY_PERMITTED; + break; + case 2: + key->KeyFlags |= DVD_CGMS_COPY_ONCE; + break; + case 3: + key->KeyFlags |= DVD_CGMS_NO_COPY; + break; + } +#endif + } /*else key->KeyFlags |= DVD_NOT_COPYRIGHTED;*/ + break; + case DvdAsf: + key->KeyLength = OSReadBigInt16(desc.title.dataLength, 0); + ((PDVD_ASF)key->KeyData)->SuccessFlag = desc.asf.successFlag; + break; + case DvdGetRpcKey: + key->KeyLength = OSReadBigInt16(desc.rpc.dataLength, 0); + ((PDVD_RPC_KEY)key->KeyData)->UserResetsAvailable = + desc.rpc.numberUserResets; + ((PDVD_RPC_KEY)key->KeyData)->ManufacturerResetsAvailable = + desc.rpc.numberVendorResets; + ((PDVD_RPC_KEY)key->KeyData)->TypeCode = + desc.rpc.typeCode; + ((PDVD_RPC_KEY)key->KeyData)->RegionMask = + desc.rpc.driveRegion; + ((PDVD_RPC_KEY)key->KeyData)->RpcScheme = + desc.rpc.rpcScheme; + case DvdDiskKey: + key->KeyLength = OSReadBigInt16(desc.disk_key.dataLength, 0); + memcpy(key->KeyData, desc.disk_key.discKeyStructures, key->KeyLength); + break; + case DvdBusKey2: + case DvdSetRpcKey: + case DvdInvalidateAGID: + default: + /* Silence warning */ + ; + } + } + return ret; #else TRACE("outside\n"); return STATUS_NOT_SUPPORTED;

1 0

Charles Davis : ntdll: Implement DVD_ReadStructure() on Mac OS.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 192a838cd0c751f1f81cc0847777fe137910ef6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=192a838cd0c751f1f81cc0847… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Oct 16 13:57:18 2009 -0600 ntdll: Implement DVD_ReadStructure() on Mac OS. --- dlls/ntdll/cdrom.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 126 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 5caf8b0..3e520ec 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -181,12 +181,14 @@ static const char *iocodex(DWORD code) #define MSF_OF_FRAME(m,fr) {int f=(fr); ((UCHAR *)&(m))[2]=f%CD_FRAMES;f/=CD_FRAMES;((UCHAR *)&(m))[1]=f%CD_SECS;((UCHAR *)&(m))[0]=f/CD_SECS;} /* The documented format of DVD_LAYER_DESCRIPTOR is wrong. Even the format in the - * DDK's header is wrong. There are four bytes at the start which always seem to - * follow the sequence "02 08 00 00". + * DDK's header is wrong. There are four bytes at the start defined by + * MMC-5. The first two are the size of the structure in big-endian order as + * defined by MMC-5. The other two are reserved. */ typedef struct { - UCHAR MagicHeader[4]; + UCHAR DataLength[2]; + UCHAR Reserved0[2]; UCHAR BookVersion : 4; UCHAR BookType : 4; UCHAR MinimumRate : 4; @@ -2329,7 +2331,7 @@ static NTSTATUS DVD_GetRegion(int dev, PDVD_REGION region) } /****************************************************************** - * DVD_GetRegion + * DVD_ReadStructure * * */ @@ -2390,10 +2392,10 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, internal_dvd_layer_descriptor *p = (internal_dvd_layer_descriptor *) layer; struct dvd_layer *l = &s.physical.layer[s.physical.layer_num]; - p->MagicHeader[0] = 2; - p->MagicHeader[1] = 8; - p->MagicHeader[2] = 0; - p->MagicHeader[3] = 0; + p->DataLength[0] = 2; + p->DataLength[1] = 8; + p->Reserved0[0] = 0; + p->Reserved0[1] = 0; p->BookVersion = l->book_version; p->BookType = l->book_type; p->MinimumRate = l->min_rate; @@ -2450,6 +2452,122 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, case DvdMaxDescriptor: /* Suppress warning */ break; } +#elif defined(__APPLE__) + NTSTATUS ret = STATUS_NOT_SUPPORTED; + dk_dvd_read_structure_t dvdrs; + union + { + DVDPhysicalFormatInfo phys; + DVDCopyrightInfo copy; + DVDDiscKeyInfo disk_key; + DVDManufacturingInfo manf; + } desc; + union + { + PDVD_LAYER_DESCRIPTOR layer; + internal_dvd_layer_descriptor *xlayer; + PDVD_COPYRIGHT_DESCRIPTOR copy; + PDVD_DISK_KEY_DESCRIPTOR disk_key; + PDVD_MANUFACTURER_DESCRIPTOR manf; + } nt_desc; + + nt_desc.layer = layer; + dvdrs.address = (uint32_t)(structure->BlockByteOffset.QuadPart>>11); + dvdrs.grantID = (uint8_t)structure->SessionId; + dvdrs.layer = structure->LayerNumber; + switch(structure->Format) + { + case DvdPhysicalDescriptor: + dvdrs.format = kDVDStructureFormatPhysicalFormatInfo; + dvdrs.bufferLength = sizeof(desc.phys); + dvdrs.buffer = &desc.phys; + break; + + case DvdCopyrightDescriptor: + dvdrs.format = kDVDStructureFormatCopyrightInfo; + dvdrs.bufferLength = sizeof(desc.copy); + dvdrs.buffer = &desc.copy; + break; + + case DvdDiskKeyDescriptor: + dvdrs.format = kDVDStructureFormatDiscKeyInfo; + dvdrs.bufferLength = sizeof(desc.disk_key); + dvdrs.buffer = &desc.disk_key; + break; + + case DvdBCADescriptor: + FIXME("DvdBCADescriptor NIY\n"); + return STATUS_NOT_SUPPORTED; + + case DvdManufacturerDescriptor: + dvdrs.format = kDVDStructureFormatManufacturingInfo; + dvdrs.bufferLength = sizeof(desc.manf); + dvdrs.buffer = &desc.manf; + break; + + case DvdMaxDescriptor: + default: + FIXME("got unknown structure type 0x%x\n", structure->Format); + return STATUS_NOT_SUPPORTED; + } + ret = CDROM_GetStatusCode(ioctl(dev, DKIOCDVDREADSTRUCTURE, &dvdrs)); + if(ret == STATUS_SUCCESS) + { + switch(structure->Format) + { + case DvdPhysicalDescriptor: + nt_desc.xlayer->DataLength[0] = 2; + nt_desc.xlayer->DataLength[1] = 8; + nt_desc.xlayer->Reserved0[0] = 0; + nt_desc.xlayer->Reserved0[1] = 0; + nt_desc.xlayer->BookVersion = desc.phys.partVersion; + nt_desc.xlayer->BookType = desc.phys.bookType; + nt_desc.xlayer->MinimumRate = desc.phys.minimumRate; + nt_desc.xlayer->DiskSize = desc.phys.discSize; + nt_desc.xlayer->LayerType = desc.phys.layerType; + nt_desc.xlayer->TrackPath = desc.phys.trackPath; + nt_desc.xlayer->NumberOfLayers = desc.phys.numberOfLayers; + nt_desc.xlayer->Reserved1 = 0; + nt_desc.xlayer->TrackDensity = desc.phys.trackDensity; + nt_desc.xlayer->LinearDensity = desc.phys.linearDensity; + nt_desc.xlayer->BCAFlag = desc.phys.bcaFlag; + nt_desc.xlayer->StartingDataSector = OSReadBigInt32(&desc.phys.zero1, 0); + nt_desc.xlayer->EndDataSector = OSReadBigInt32(&desc.phys.zero2, 0); + nt_desc.xlayer->EndLayerZeroSector = OSReadBigInt32(&desc.phys.zero3, 0); + nt_desc.xlayer->Reserved5 = 0; + nt_desc.xlayer->Reserved6 = 0; + break; + + case DvdCopyrightDescriptor: + nt_desc.copy->CopyrightProtectionType = + desc.copy.copyrightProtectionSystemType; + nt_desc.copy->RegionManagementInformation = + desc.copy.regionMask; + nt_desc.copy->Reserved = 0; + break; + + case DvdDiskKeyDescriptor: + memcpy( + nt_desc.disk_key->DiskKeyData, + desc.disk_key.discKeyStructures, + 2048); + break; + + case DvdManufacturerDescriptor: + memcpy( + nt_desc.manf->ManufacturingInformation, + desc.manf.discManufacturingInfo, + 2048); + break; + + case DvdBCADescriptor: + case DvdMaxDescriptor: + default: + /* Silence warning */ + break; + } + } + return ret; #else FIXME("\n"); #endif

1 0

Andrew Eikum : mshtml: Reimplement IHTMLLocation::get_href.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 6a456fa6d9c6b495b25873d2288d9240de05195d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a456fa6d9c6b495b25873d22… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 16 11:45:34 2009 -0500 mshtml: Reimplement IHTMLLocation::get_href. --- dlls/mshtml/htmllocation.c | 93 +++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 4 +- 2 files changed, 90 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index e21ec76..4655a63 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -165,20 +165,103 @@ static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - const WCHAR *url; - HRESULT hres; + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + WCHAR *buf = NULL, *url_path = NULL; + HRESULT hres, ret; + DWORD len = 0; + int i; TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - hres = get_url(This, &url); + url.dwSchemeLength = 1; + url.dwHostNameLength = 1; + url.dwUrlPathLength = 1; + url.dwExtraInfoLength = 1; + hres = get_url_components(This, &url); if(FAILED(hres)) return hres; - *p = SysAllocString(url); - return *p ? S_OK : E_OUTOFMEMORY; + switch(url.nScheme) { + case INTERNET_SCHEME_FILE: + { + /* prepend a slash */ + url_path = HeapAlloc(GetProcessHeap(), 0, (url.dwUrlPathLength + 1) * sizeof(WCHAR)); + if(!url_path) + return E_OUTOFMEMORY; + url_path[0] = '/'; + memcpy(url_path + 1, url.lpszUrlPath, url.dwUrlPathLength * sizeof(WCHAR)); + url.lpszUrlPath = url_path; + url.dwUrlPathLength = url.dwUrlPathLength + 1; + } + break; + + case INTERNET_SCHEME_HTTP: + case INTERNET_SCHEME_HTTPS: + case INTERNET_SCHEME_FTP: + if(!url.dwUrlPathLength) { + /* add a slash if it's blank */ + url_path = url.lpszUrlPath = HeapAlloc(GetProcessHeap(), 0, 1 * sizeof(WCHAR)); + if(!url.lpszUrlPath) + return E_OUTOFMEMORY; + url.lpszUrlPath[0] = '/'; + url.dwUrlPathLength = 1; + } + break; + + default: + break; + } + + /* replace \ with / */ + for(i = 0; i < url.dwUrlPathLength; ++i) + if(url.lpszUrlPath[i] == '\\') + url.lpszUrlPath[i] = '/'; + + if(InternetCreateUrlW(&url, ICU_ESCAPE, NULL, &len)) { + FIXME("InternetCreateUrl succeeded with NULL buffer?\n"); + ret = E_FAIL; + goto cleanup; + } + + if(GetLastError() != ERROR_INSUFFICIENT_BUFFER) { + FIXME("InternetCreateUrl failed with error: %08x\n", GetLastError()); + SetLastError(0); + ret = E_FAIL; + goto cleanup; + } + SetLastError(0); + + buf = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if(!buf) { + ret = E_OUTOFMEMORY; + goto cleanup; + } + + if(!InternetCreateUrlW(&url, ICU_ESCAPE, buf, &len)) { + FIXME("InternetCreateUrl failed with error: %08x\n", GetLastError()); + SetLastError(0); + ret = E_FAIL; + goto cleanup; + } + + *p = SysAllocStringLen(buf, len); + if(!*p) { + ret = E_OUTOFMEMORY; + goto cleanup; + } + + ret = S_OK; + +cleanup: + if(buf) + HeapFree(GetProcessHeap(), 0, buf); + if(url_path) + HeapFree(GetProcessHeap(), 0, url_path); + + return ret; } static HRESULT WINAPI HTMLLocation_put_protocol(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 8cd7e1d..671d460 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -56,7 +56,7 @@ static const WCHAR http_url[] = {'h','t','t','p',':','/','/','w','w','w','.','w' static const struct location_test http_test = { "HTTP", http_url, - "http://www.winehq.org/?search#hash", FALSE, + "http://www.winehq.org/?search#hash", TRUE, "http:", TRUE, "www.winehq.org:80", TRUE, "www.winehq.org", TRUE, @@ -112,7 +112,7 @@ static const WCHAR file_url[] = {'f','i','l','e',':','/','/','C',':','\\','w','i static const struct location_test file_test = { "FILE", file_url, - "file:///C:/windows/win.ini", FALSE, + "file:///C:/windows/win.ini", TRUE, "file:", TRUE, NULL, TRUE, NULL, TRUE,

1 0

Henri Verbeet : d3d9/tests: Remove an unused color result.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: d17cd37d3bab46ca79f46bfb1bd67cf16fdbcbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17cd37d3bab46ca79f46bfb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 19 10:12:17 2009 +0200 d3d9/tests: Remove an unused color result. --- dlls/d3d9/tests/visual.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fa2d604..22d512e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6411,7 +6411,6 @@ static void test_vshader_input(IDirect3DDevice9 *device) */ ok(color == 0x000000FF || color == 0x00808080 || color == 0x00000000, "Input test: Quad 2(different colors) returned color 0x%08x, expected 0x000000FF, 0x00808080 or 0x00000000\n", color); - color = getPixelColor(device, 160, 120); IDirect3DDevice9_SetVertexShader(device, NULL); IDirect3DDevice9_SetVertexDeclaration(device, NULL);

1 0