October 2009 - Wine-Commits

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

Oct. 19, 2009

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

Matteo Bruni : d3dx9: D3DXAssembleShader and D3DXAssembleShaderFromFile stubs.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

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: Add D3DXAssembleShader and related declarations.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

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

Francois Gouget : shell32: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 915b69e2a72dabe9fb03ce1b52558f1d2040817e URL: http://source.winehq.org/git/wine.git/?a=commit;h=915b69e2a72dabe9fb03ce1b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:28:22 2009 +0200 shell32: Fix compilation on systems that don't support nameless unions. --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 7d9e7b2..5e97f61 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1408,7 +1408,7 @@ static void hook_WaitForInputIdle(void *new_func) /* Search for the correct imported module by walking the import descriptors */ import_descriptor = (PIMAGE_IMPORT_DESCRIPTOR)(base + import_directory_rva); - while (import_descriptor->OriginalFirstThunk != 0) + while (U(*import_descriptor).OriginalFirstThunk != 0) { char *import_module_name; @@ -1423,7 +1423,7 @@ static void hook_WaitForInputIdle(void *new_func) * arrays. We need the import name table to find the imported * routine and the import address table to patch the address, so * walk them side by side */ - int_entry = (PIMAGE_THUNK_DATA)(base + import_descriptor->OriginalFirstThunk); + int_entry = (PIMAGE_THUNK_DATA)(base + U(*import_descriptor).OriginalFirstThunk); iat_entry = (PIMAGE_THUNK_DATA)(base + import_descriptor->FirstThunk); while (int_entry->u1.Ordinal != 0) {

1 0

Francois Gouget : shlwapi: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: af6c873b5489eaad656d01b09581d9788b0b5f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6c873b5489eaad656d01b09… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:29:10 2009 +0200 shlwapi: Fix compilation on systems that don't support nameless unions. --- dlls/shlwapi/regstream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index eb906a7..4dc15ad 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -221,7 +221,7 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D return STG_E_INVALIDFUNCTION; /* we cut off the high part here */ - This->dwPos = tmp.LowPart; + This->dwPos = tmp.u.LowPart; if (plibNewPosition) plibNewPosition->QuadPart = This->dwPos; @@ -240,7 +240,7 @@ static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewS TRACE("(%p, %s)\n", This, wine_dbgstr_longlong(libNewSize.QuadPart)); /* we cut off the high part here */ - newLen = libNewSize.LowPart; + newLen = libNewSize.u.LowPart; newBuf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pbBuffer, newLen); if (!newBuf) return STG_E_INSUFFICIENTMEMORY;

1 0

Matteo Bruni : d3dx9: D3DXAssembleShaderFromResource implementation.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

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_ReadStructure() on Mac OS.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

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

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

Oct. 19, 2009

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_ReadKey() on Mac OS.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

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

Henri Verbeet : wined3d: Cleanup IWineD3DDeviceImpl_UpdateTexture().
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: adf5bb5f6aa51d59aab3813b9c8f063b15def1ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf5bb5f6aa51d59aab3813b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 19 10:12:19 2009 +0200 wined3d: Cleanup IWineD3DDeviceImpl_UpdateTexture(). The root problem here is that with the original error handling a NULL dereference occurs (IWineD3DBaseTexture_GetType()) when either the source or destination texture is NULL. Rewriting the error handling changes the indentation of almost the entire function though, so this patch ends up rewriting the entire function. --- dlls/wined3d/device.c | 185 ++++++++++++++++++++++++------------------------- 1 files changed, 90 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adf5bb5f6aa51d59aab38…

1 0