October 2009 - Wine-Commits

Hans Leidekker : msi: Allocate MSISCRIPT structure at package creation time .
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: b7a81df4522c1fba50f609af3d9dda95f8ee1364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a81df4522c1fba50f609af3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:13:54 2009 +0200 msi: Allocate MSISCRIPT structure at package creation time. --- dlls/msi/action.c | 1 - dlls/msi/package.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e08f25a..e108701 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6394,7 +6394,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, MSI_SetPropertyW(package, szAction, szInstall); - package->script = msi_alloc_zero(sizeof(MSISCRIPT)); package->script->InWhatSequence = SEQUENCE_INSTALL; if (szPackagePath) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 06e3416..9c92842 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -969,6 +969,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) MSI_SetPropertyW( package, OriginalDatabase, fullpath ); } + package->script = msi_alloc_zero( sizeof(MSISCRIPT) ); *pPackage = package; return ERROR_SUCCESS;

1 0

Alexandre Julliard : user32/tests: Use the correct lparam in the WM_DDE_ACK reply.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 9390bc921e012888d488e8314a4379bc76e2c4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9390bc921e012888d488e8314… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 19 16:21:50 2009 +0200 user32/tests: Use the correct lparam in the WM_DDE_ACK reply. --- dlls/user32/tests/dde.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 9e1da70..202bb41 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -211,7 +211,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA executed = TRUE; - lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, DDE_FACK, HIWORD(lparam)); + lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, DDE_FACK, lparam); PostMessageA(client, WM_DDE_ACK, (WPARAM)hwnd, lparam); break;

1 0

Jörg Höhle : winecoreaudio: Move ERR&WARN out of OSSpinLock sections.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: f6ac7696af8a93b0b1f645d2013090f2479419c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ac7696af8a93b0b1f645d20… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 17 15:25:51 2009 +0200 winecoreaudio: Move ERR&WARN out of OSSpinLock sections. --- dlls/winecoreaudio.drv/audio.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index e1c4a41..835d1a9 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -984,8 +984,8 @@ static DWORD wodClose(WORD wDevID, WINE_WAVEOUT_INSTANCE* wwo) OSSpinLockLock(&wwo->lock); if (wwo->lpQueuePtr) { - WARN("buffers still playing !\n"); OSSpinLockUnlock(&wwo->lock); + WARN("buffers still playing !\n"); ret = WAVERR_STILLPLAYING; } else { @@ -1953,8 +1953,8 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->format.wf.nChannels, wwi->format.wf.nSamplesPerSec, wwi->format.wBitsPerSample, &frameCount)) { - ERR("AudioUnit_CreateInputUnit failed\n"); OSSpinLockUnlock(&wwi->lock); + ERR("AudioUnit_CreateInputUnit failed\n"); return MMSYSERR_ERROR; } @@ -1963,10 +1963,10 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->format.wBitsPerSample, frameCount, TRUE); if (wwi->bufferList == NULL) { - ERR("Failed to allocate buffer list\n"); AudioUnitUninitialize(wwi->audioUnit); AudioUnit_CloseAudioUnit(wwi->audioUnit); OSSpinLockUnlock(&wwi->lock); + ERR("Failed to allocate buffer list\n"); return MMSYSERR_NOMEM; } @@ -1975,11 +1975,11 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->bufferListCopy = HeapAlloc(GetProcessHeap(), 0, AUDIOBUFFERLISTSIZE(wwi->bufferList->mNumberBuffers)); if (wwi->bufferListCopy == NULL) { - ERR("Failed to allocate buffer list copy\n"); widHelper_DestroyAudioBufferList(wwi->bufferList); AudioUnitUninitialize(wwi->audioUnit); AudioUnit_CloseAudioUnit(wwi->audioUnit); OSSpinLockUnlock(&wwi->lock); + ERR("Failed to allocate buffer list copy\n"); return MMSYSERR_NOMEM; } memcpy(wwi->bufferListCopy, wwi->bufferList, AUDIOBUFFERLISTSIZE(wwi->bufferList->mNumberBuffers));

1 0

Andrew Eikum : mshtml: Reimplement HTMLLocation::get_pathname.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: a03d0bcaa98ee9697962322984188b2bd67c42fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a03d0bcaa98ee969796232298… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 16 11:45:37 2009 -0500 mshtml: Reimplement HTMLLocation::get_pathname. --- dlls/mshtml/htmllocation.c | 27 ++++++--------------------- dlls/mshtml/tests/htmllocation.c | 8 ++++---- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 4655a63..5f09958 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -428,10 +428,7 @@ static HRESULT WINAPI HTMLLocation_put_pathname(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_pathname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - WCHAR buf[INTERNET_MAX_PATH_LENGTH]; - URL_COMPONENTSW url = {sizeof(url)}; - const WCHAR *doc_url; - DWORD size = 0; + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -439,29 +436,17 @@ static HRESULT WINAPI HTMLLocation_get_pathname(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - hres = get_url(This, &doc_url); - if(FAILED(hres)) - return hres; - - hres = CoInternetParseUrl(doc_url, PARSE_PATH_FROM_URL, 0, buf, sizeof(buf), &size, 0); - if(SUCCEEDED(hres)) { - *p = SysAllocString(buf); - if(!*p) - return E_OUTOFMEMORY; - return S_OK; - } - url.dwUrlPathLength = 1; + url.dwExtraInfoLength = 1; hres = get_url_components(This, &url); if(FAILED(hres)) return hres; - if(!url.dwUrlPathLength) { - *p = NULL; - return S_OK; - } + if(url.dwUrlPathLength && url.lpszUrlPath[0] == '/') + *p = SysAllocStringLen(url.lpszUrlPath + 1, url.dwUrlPathLength - 1); + else + *p = SysAllocStringLen(url.lpszUrlPath, url.dwUrlPathLength); - *p = SysAllocStringLen(url.lpszUrlPath, url.dwUrlPathLength); if(!*p) return E_OUTOFMEMORY; return S_OK; diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 671d460..e4d545e 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -61,7 +61,7 @@ static const struct location_test http_test = { "www.winehq.org:80", TRUE, "www.winehq.org", TRUE, "80", TRUE, - "", FALSE, + "", TRUE, "?search", FALSE, "#hash", FALSE }; @@ -75,7 +75,7 @@ static const struct location_test http_file_test = { "www.winehq.org:80", TRUE, "www.winehq.org", TRUE, "80", TRUE, - "file", FALSE, + "file", TRUE, "?search", FALSE, "#hash", FALSE }; @@ -89,7 +89,7 @@ static const struct location_test ftp_test = { "ftp.winehq.org:21", TRUE, "ftp.winehq.org", TRUE, "21", TRUE, - "", FALSE, + "", TRUE, NULL, FALSE, NULL, FALSE }; @@ -103,7 +103,7 @@ static const struct location_test ftp_file_test = { "ftp.winehq.org:21", TRUE, "ftp.winehq.org", TRUE, "21", TRUE, - "file", FALSE, + "file", TRUE, NULL, FALSE, NULL, FALSE };

1 0

Alexandre Julliard : netapi32/tests: Don' t try to get the size of a freed buffer.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 5b5054c10ed05d8a352a3d09a014650f61b0793c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5054c10ed05d8a352a3d09a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 19 16:06:07 2009 +0200 netapi32/tests: Don't try to get the size of a freed buffer. --- dlls/netapi32/tests/apibuf.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 0972e76..3400726 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -54,7 +54,6 @@ static void run_apibuf_tests(void) ok(pNetApiBufferFree(p) == NERR_Success, "Freed\n"); - ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n"); ok(pNetApiBufferSize(NULL, &dwSize) == ERROR_INVALID_PARAMETER, "Error for NULL pointer\n"); /* border reallocate cases */

1 0

Hans Leidekker : msi: Get rid of some redundant initializations.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 534f20bc49741a271df10ef5353de3f4c52ef3a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=534f20bc49741a271df10ef53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:14:20 2009 +0200 msi: Get rid of some redundant initializations. --- dlls/msi/database.c | 2 -- dlls/msi/msiquery.c | 2 -- dlls/msi/package.c | 9 --------- dlls/msi/preview.c | 1 - dlls/msi/suminfo.c | 1 - 5 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 4db7c01..8d0ee42 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -191,8 +191,6 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) db->mode = szMode; if (created) db->deletefile = strdupW( szDBPath ); - else - db->deletefile = NULL; list_init( &db->tables ); list_init( &db->transforms ); diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 5a46f9b..b973382 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -126,9 +126,7 @@ UINT MSI_DatabaseOpenViewW(MSIDATABASE *db, return ERROR_FUNCTION_FAILED; msiobj_addref( &db->hdr ); - query->row = 0; query->db = db; - query->view = NULL; list_init( &query->mem ); r = MSI_ParseSQL( db, szQuery, &query->view, &query->mem ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 9c92842..fa0cd6f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -744,15 +744,6 @@ static MSIPACKAGE *msi_alloc_package( void ) list_init( &package->RunningActions ); list_init( &package->sourcelist_info ); list_init( &package->sourcelist_media ); - - package->patch = NULL; - package->ActionFormat = NULL; - package->LastAction = NULL; - package->dialog = NULL; - package->next_dialog = NULL; - package->scheduled_action_running = FALSE; - package->commit_action_running = FALSE; - package->rollback_action_running = FALSE; } return package; diff --git a/dlls/msi/preview.c b/dlls/msi/preview.c index a2b3f32..458e4a1 100644 --- a/dlls/msi/preview.c +++ b/dlls/msi/preview.c @@ -54,7 +54,6 @@ static MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE *db ) if( preview ) { preview->package = package; - preview->dialog = 0; msiobj_addref( &package->hdr ); } msiobj_release( &package->hdr ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index ef16665..d3db44a 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -443,7 +443,6 @@ MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ) if( !si ) return si; - memset( si->property, 0, sizeof si->property ); si->update_count = uiUpdateCount; IStorage_AddRef( stg ); si->storage = stg;

1 0

Andrew Eikum : mshtml: Reimplement IHTMLLocation::get_href.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

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

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

Oct. 19, 2009

Module: wine Branch: master Commit: 323f163af41c1f07326eee015f2c48744da565e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=323f163af41c1f07326eee015… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:28:08 2009 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 1a6023f..e05c967 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3220,7 +3220,7 @@ static void GetDCFormatTest(void) ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd.dwWidth = 64; ddsd.dwHeight = 64; - ddsd.ddpfPixelFormat = testdata[i].fmt; + U4(ddsd).ddpfPixelFormat = testdata[i].fmt; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL);

1 0

Francois Gouget : comctl32: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard Oct. 19, 2009

Oct. 19, 2009

Module: wine Branch: master Commit: 32bba6222b79681ad4da606362d53550f36c3b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32bba6222b79681ad4da60636… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:35:12 2009 +0200 comctl32: Add a trailing '\n' to a Wine trace. --- dlls/comctl32/tab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 22af8d7..15534af 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -312,7 +312,7 @@ static LRESULT TAB_SetCurFocus (TAB_INFO *infoPtr, INT iItem) static inline LRESULT TAB_SetToolTips (TAB_INFO *infoPtr, HWND hwndToolTip) { - TRACE("%p %p", infoPtr, hwndToolTip); + TRACE("%p %p\n", infoPtr, hwndToolTip); infoPtr->hwndToolTip = hwndToolTip; return 0; }

1 0

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

Oct. 19, 2009

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