wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Jerome Leclanche : winemenubuilder: Make sure extension-based mimetypes are always lowercase.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: b7bbd2adae6123119e317f8dd49f7ae1905f2895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bbd2adae6123119e317f8dd… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Sun Feb 20 18:05:44 2011 +0000 winemenubuilder: Make sure extension-based mimetypes are always lowercase. (cherry picked from commit 44527f57b2c4722b3317b2a03ba6b1d2ac7fc538) --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ce28e3b..c22e7b0 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2250,7 +2250,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package WCHAR *progIdW = NULL; char *progIdA = NULL; - extensionA = wchars_to_utf8_chars(extensionW); + extensionA = wchars_to_utf8_chars(strlwrW(extensionW)); if (extensionA == NULL) { WINE_ERR("out of memory\n");

1 0

Maarten Lankhorst : mshtml: Make sure system xpcom dll gets loaded.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 41827e733435212efe981149e2af02538a8d314a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41827e733435212efe981149e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 23 00:20:33 2011 +0100 mshtml: Make sure system xpcom dll gets loaded. (cherry picked from commit e9a4dee1eb610e567ac4df00368b41282326f03f) --- dlls/mshtml/nsembed.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 56c5d94..2e45931 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -162,13 +162,17 @@ static void set_environment(LPCWSTR gre_path) static BOOL load_xpcom(const PRUnichar *gre_path) { - static const WCHAR strXPCOM[] = {'x','p','c','o','m','.','d','l','l',0}; + static const WCHAR strXPCOM[] = {'\\','x','p','c','o','m','.','d','l','l',0}; + WCHAR file_name[MAX_PATH]; + + strcpyW(file_name, gre_path); + strcatW(file_name, strXPCOM); - TRACE("(%s)\n", debugstr_w(gre_path)); + TRACE("(%s)\n", debugstr_w(file_name)); set_environment(gre_path); - hXPCOM = LoadLibraryW(strXPCOM); + hXPCOM = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!hXPCOM) { WARN("Could not load XPCOM: %d\n", GetLastError()); return FALSE;

1 0

Huw Davies : oleaut32: Fix the typelib marshaler when the vtbl has holes.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 6d51d3106ba45733e10ea8af52e6912609a4c68b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d51d3106ba45733e10ea8af5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 24 10:09:36 2011 +0000 oleaut32: Fix the typelib marshaler when the vtbl has holes. (cherry picked from commit ac5e9812fdb6929e0fc3c9f3805223dd6062da62) --- dlls/oleaut32/tmarshal.c | 91 +++++++++++++++++++++++++++++++++------------- 1 files changed, 65 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 76b64f1..ce5778b 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -322,48 +322,85 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { } /* - * Determine the number of functions including all inherited functions. + * Determine the number of functions including all inherited functions + * and well as the size of the vtbl. * Note for non-dual dispinterfaces we simply return the size of IDispatch. */ -static HRESULT num_of_funcs(ITypeInfo *tinfo, unsigned int *num) +static HRESULT num_of_funcs(ITypeInfo *tinfo, unsigned int *num, + unsigned int *vtbl_size) { - HRESULT hres; + HRESULT hr; TYPEATTR *attr; ITypeInfo *tinfo2; + UINT inherited_funcs = 0, i; *num = 0; - hres = ITypeInfo_GetTypeAttr(tinfo, &attr); - if (hres) { - ERR("GetTypeAttr failed with %x\n",hres); - return hres; + if(vtbl_size) *vtbl_size = 0; + + hr = ITypeInfo_GetTypeAttr(tinfo, &attr); + if (hr) + { + ERR("GetTypeAttr failed with %x\n", hr); + return hr; } - if(attr->typekind == TKIND_DISPATCH && (attr->wTypeFlags & TYPEFLAG_FDUAL)) + if(attr->typekind == TKIND_DISPATCH) { - HREFTYPE href; - hres = ITypeInfo_GetRefTypeOfImplType(tinfo, -1, &href); - if(FAILED(hres)) + if(attr->wTypeFlags & TYPEFLAG_FDUAL) { - ERR("Unable to get interface href from dual dispinterface\n"); - goto end; + HREFTYPE href; + + ITypeInfo_ReleaseTypeAttr(tinfo, attr); + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, -1, &href); + if(FAILED(hr)) + { + ERR("Unable to get interface href from dual dispinterface\n"); + return hr; + } + hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); + if(FAILED(hr)) + { + ERR("Unable to get interface from dual dispinterface\n"); + return hr; + } + hr = num_of_funcs(tinfo2, num, vtbl_size); + ITypeInfo_Release(tinfo2); + return hr; } - hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); - if(FAILED(hres)) + else /* non-dual dispinterface */ { - ERR("Unable to get interface from dual dispinterface\n"); - goto end; + /* These will be the size of IDispatchVtbl */ + *num = attr->cbSizeVft / sizeof(void *); + if(vtbl_size) *vtbl_size = attr->cbSizeVft; + ITypeInfo_ReleaseTypeAttr(tinfo, attr); + return hr; } - hres = num_of_funcs(tinfo2, num); - ITypeInfo_Release(tinfo2); } - else + + for (i = 0; i < attr->cImplTypes; i++) { - *num = attr->cbSizeVft / 4; + HREFTYPE href; + ITypeInfo *pSubTypeInfo; + UINT sub_funcs; + + hr = ITypeInfo_GetRefTypeOfImplType(tinfo, i, &href); + if (FAILED(hr)) goto end; + hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &pSubTypeInfo); + if (FAILED(hr)) goto end; + + hr = num_of_funcs(pSubTypeInfo, &sub_funcs, NULL); + ITypeInfo_Release(pSubTypeInfo); + + if(FAILED(hr)) goto end; + inherited_funcs += sub_funcs; } + *num = inherited_funcs + attr->cFuncs; + if(vtbl_size) *vtbl_size = attr->cbSizeVft; + end: ITypeInfo_ReleaseTypeAttr(tinfo, attr); - return hres; + return hr; } #ifdef __i386__ @@ -1687,7 +1724,7 @@ static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num) xasm->lret = 0xc2; xasm->bytestopop = (nrofargs+2)*4; /* pop args, This, iMethod */ xasm->nop = 0x90; - proxy->lpvtbl[num] = xasm; + proxy->lpvtbl[fdesc->oVft / sizeof(void *)] = xasm; #else FIXME("not implemented on non i386\n"); return E_FAIL; @@ -1702,7 +1739,7 @@ PSFacBuf_CreateProxy( { HRESULT hres; ITypeInfo *tinfo; - unsigned int i, nroffuncs; + unsigned int i, nroffuncs, vtbl_size; TMProxyImpl *proxy; TYPEATTR *typeattr; BOOL defer_to_dispatch = FALSE; @@ -1714,7 +1751,9 @@ PSFacBuf_CreateProxy( return hres; } - hres = num_of_funcs(tinfo, &nroffuncs); + hres = num_of_funcs(tinfo, &nroffuncs, &vtbl_size); + TRACE("Got %d funcs, vtbl size %d\n", nroffuncs, vtbl_size); + if (FAILED(hres)) { ERR("Cannot get number of functions for typeinfo %s\n",debugstr_guid(riid)); ITypeInfo_Release(tinfo); @@ -1745,7 +1784,7 @@ PSFacBuf_CreateProxy( InitializeCriticalSection(&proxy->crit); proxy->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TMProxyImpl.crit"); - proxy->lpvtbl = HeapAlloc(GetProcessHeap(),0,sizeof(LPBYTE)*nroffuncs); + proxy->lpvtbl = HeapAlloc(GetProcessHeap(), 0, vtbl_size); /* if we derive from IDispatch then defer to its proxy for its methods */ hres = ITypeInfo_GetTypeAttr(tinfo, &typeattr);

1 0

Huw Davies : oleaut32: Mask off the lsb from the vtbl offset. This is set when the user specifies an offset in ICreateTypeInfo.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 8217a8aef76db84f84cef64afbd97bb04d37b523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8217a8aef76db84f84cef64af… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 24 09:42:58 2011 +0000 oleaut32: Mask off the lsb from the vtbl offset. This is set when the user specifies an offset in ICreateTypeInfo. (cherry picked from commit 060c8daf7facf6947e2b52e06a7d2ce771ba77b3) --- dlls/oleaut32/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7a56e93..07099b4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1945,7 +1945,7 @@ MSFT_DoFuncs(TLBContext* pcx, (*pptfd)->funcdesc.callconv = (pFuncRec->FKCCIC) >> 8 & 0xF; (*pptfd)->funcdesc.cParams = pFuncRec->nrargs ; (*pptfd)->funcdesc.cParamsOpt = pFuncRec->nroargs ; - (*pptfd)->funcdesc.oVft = pFuncRec->VtableOffset; + (*pptfd)->funcdesc.oVft = pFuncRec->VtableOffset & ~1; (*pptfd)->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; MSFT_GetTdesc(pcx, @@ -3514,7 +3514,7 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, (*ppFuncDesc)->funcdesc.callconv = pFunc->nacc & 0x7; (*ppFuncDesc)->funcdesc.cParams = pFunc->nacc >> 3; (*ppFuncDesc)->funcdesc.cParamsOpt = (pFunc->retnextopt & 0x7e) >> 1; - (*ppFuncDesc)->funcdesc.oVft = pFunc->vtblpos; + (*ppFuncDesc)->funcdesc.oVft = pFunc->vtblpos & ~1; if(pFunc->magic & SLTG_FUNCTION_FLAGS_PRESENT) (*ppFuncDesc)->funcdesc.wFuncFlags = pFunc->funcflags;

1 0

Peter Schellenbach : oleaut32: Fixed short time & medium time named formats .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: e60c9f2d7b44d4ffc5ce7857d2a4a02ca28758d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e60c9f2d7b44d4ffc5ce7857d… Author: Peter Schellenbach <pjs(a)asent.com> Date: Mon Feb 21 12:15:22 2011 -0800 oleaut32: Fixed short time & medium time named formats. (cherry picked from commit 4f3b78797db0be5a1a5637513e36b7efe59ad213) --- dlls/oleaut32/tests/varformat.c | 25 +++++++++++++++++++++++++ dlls/oleaut32/varformat.c | 10 +++++++++- 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 2d4ef62..b994ee1 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -215,6 +215,14 @@ static const FMTDATERES VarFormat_date_results[] = { 2.725, "hh:nn:ss A/P", "05:24:00 P" } }; +/* The following tests require that the time separator is a colon (:) */ +static const FMTDATERES VarFormat_namedtime_results[] = +{ + { 2.525, "short time", "12:36" }, + { 2.525, "medium time", "12:36 PM" }, + { 2.525, "long time", "12:36:00 PM" } +}; + #define VNUMFMT(vt,v) \ for (i = 0; i < sizeof(VarFormat_results)/sizeof(FMTRES); i++) \ { \ @@ -299,6 +307,23 @@ static void test_VarFormat(void) VarFormat_date_results[i].res); } + /* Named time formats */ + GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STIME, buff, sizeof(buff)/sizeof(char)); + if (buff[0] != ':' || buff[1]) + { + skip("Skipping namedtime tests as time separator is '%s'\n", buff); + } + else + { + for (i = 0; i < sizeof(VarFormat_namedtime_results)/sizeof(FMTDATERES); i++) + { + fd = 0; + VARFMT(VT_DATE,V_DATE,VarFormat_namedtime_results[i].val, + VarFormat_namedtime_results[i].fmt,S_OK, + VarFormat_namedtime_results[i].res); + } + } + /* Strings */ bstrin = SysAllocString(szTesting); VARFMT(VT_BSTR,V_BSTR,bstrin,"",S_OK,"testing"); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index f297641..250ffef 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -263,7 +263,7 @@ typedef struct tagFMT_DATE_HEADER #define FMT_DATE_HOUR_0 0x1F /* Hours with leading 0 */ #define FMT_DATE_HOUR_12 0x20 /* Hours with no leading 0, 12 hour clock */ #define FMT_DATE_HOUR_12_0 0x21 /* Hours with leading 0, 12 hour clock */ -#define FMT_DATE_TIME_UNK2 0x23 +#define FMT_DATE_TIME_UNK2 0x23 /* same as FMT_DATE_HOUR_0, for "short time" format */ /* FIXME: probably missing some here */ #define FMT_DATE_AMPM_SYS1 0x2E /* AM/PM as defined by system settings */ #define FMT_DATE_AMPM_UPPER 0x2F /* Upper-case AM or PM */ @@ -1660,6 +1660,13 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, pToken += 2; break; + case FMT_GEN_INLINE: + pToken += 2; + TRACE("copy %s\n", debugstr_a((LPCSTR)pToken)); + while (*pToken) + *pBuff++ = *pToken++; + break; + case FMT_DATE_TIME_SEP: TRACE("time separator\n"); localeValue = LOCALE_STIME; @@ -1836,6 +1843,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, break; case FMT_DATE_HOUR_0: + case FMT_DATE_TIME_UNK2: szPrintFmt = szPercentZeroTwo_d; dwVal = udate.st.wHour; break;

1 0

Alistair Leslie-Hughes : oleaut32: Implement ITypeInfo_GetNames Stub/Proxy.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 768073c448a8751ea31decd13a319043d67b762f URL: http://source.winehq.org/git/wine.git/?a=commit;h=768073c448a8751ea31decd13… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 18 12:04:56 2011 +1100 oleaut32: Implement ITypeInfo_GetNames Stub/Proxy. (cherry picked from commit f6b16ea774908ee195788f8a8c449259a6fe668e) --- dlls/oleaut32/usrmarshal.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 402794c..c4db81b 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1591,8 +1591,9 @@ HRESULT CALLBACK ITypeInfo_GetNames_Proxy( UINT cMaxNames, UINT* pcNames) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + + return ITypeInfo_RemoteGetNames_Proxy(This, memid, rgBstrNames, cMaxNames, pcNames); } HRESULT __RPC_STUB ITypeInfo_GetNames_Stub( @@ -1602,8 +1603,9 @@ HRESULT __RPC_STUB ITypeInfo_GetNames_Stub( UINT cMaxNames, UINT* pcNames) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + + return ITypeInfo_GetNames(This, memid, rgBstrNames, cMaxNames, pcNames); } HRESULT CALLBACK ITypeInfo_GetIDsOfNames_Proxy(

1 0

Alexandre Julliard : wine.inf: Put some fake dlls in the right place for WoW64.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: f92dbfc23938921889c601d50f8cbea94f8d9f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92dbfc23938921889c601d50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 21 18:05:28 2011 +0100 wine.inf: Put some fake dlls in the right place for WoW64. (cherry picked from commit 7a70499fb874edc3ad95cf9b8144c70063d4b0e3) --- tools/wine.inf.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index be59061..0417632 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2559,7 +2559,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [FakeDllsWow64] ; create some directories first 11,mui, -11,wbem, +11,gecko\plugin,npmshtml.dll +11,wbem,mofcomp.exe 11,,iexplore.exe,- 11,,winetest.exe,- 12,,mountmgr.sys,-

1 0

Charles Davis : ntdll: Implement CDROM_GetInterfaceInfo() on Mac OS.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 2df932da3d54cf63458b33249cfe4f6361666528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df932da3d54cf63458b33249… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue Mar 1 12:59:44 2011 -0700 ntdll: Implement CDROM_GetInterfaceInfo() on Mac OS. (cherry picked from commit f082eac97c3ec71de58eea85bb4de5a12b19f13f) --- dlls/ntdll/cdrom.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 554aa46..ebb7ac3 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -103,7 +103,16 @@ typedef struct uint64_t senseLen; } dk_scsi_command_t; +typedef struct +{ + uint64_t bus; + uint64_t port; + uint64_t target; + uint64_t lun; +} dk_scsi_identify_t; + #define DKIOCSCSICOMMAND _IOWR('d', 253, dk_scsi_command_t) +#define DKIOCSCSIIDENTIFY _IOR('d', 254, dk_scsi_identify_t) #endif @@ -630,6 +639,17 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi } } return 0; +#elif defined(__APPLE__) + dk_scsi_identify_t addr; + if (ioctl(fd, DKIOCSCSIIDENTIFY, &addr) != -1) + { + *port = addr.bus; + *iface = addr.port; + *device = addr.target; + *lun = addr.lun; + return 1; + } + return 0; #else FIXME("not implemented on this O/S\n"); return 0;

1 0

Alexandre Julliard : ntdll: Don' t print an error when architecture is set to win64 and the app is 64-bit.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: e73320cec91875c2229ca9350fb0228f62dcfc19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73320cec91875c2229ca9350… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 14:10:16 2011 +0100 ntdll: Don't print an error when architecture is set to win64 and the app is 64-bit. (cherry picked from commit 29f57999960c989c13c1dffdaf925e1e070e72bf) --- dlls/ntdll/server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 79e1f8e..00341ab 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1119,7 +1119,7 @@ size_t server_init_thread( void *entry_point ) if (!strcmp( arch, "win32" ) && (is_win64 || is_wow64)) fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n", wine_get_config_dir() ); - if (!strcmp( arch, "win64" ) && !is_wow64) + if (!strcmp( arch, "win64" ) && !is_win64 && !is_wow64) fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n", wine_get_config_dir() ); }

1 0

Charles Davis : ntdll: Fix IOCTL_CDROM_RAW_READ on Mac OS.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: b37c63e08ee5b1983df7f770baeda013c0c1cf06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37c63e08ee5b1983df7f770b… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Feb 18 10:36:24 2011 -0700 ntdll: Fix IOCTL_CDROM_RAW_READ on Mac OS. (cherry picked from commit 03c29bf7f5e2d72b327c67643a1830c6146871df) --- dlls/ntdll/cdrom.c | 153 +++++++-------------------------------------------- 1 files changed, 21 insertions(+), 132 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 59f85a0..554aa46 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1437,6 +1437,9 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW { int ret = STATUS_NOT_SUPPORTED; int io = -1; +#ifdef __APPLE__ + dk_cd_read_t cdrd; +#endif TRACE("RAW_READ_INFO: DiskOffset=%i,%i SectorCount=%i TrackMode=%i\n buffer=%p len=%i sz=%p\n", raw->DiskOffset.u.HighPart, raw->DiskOffset.u.LowPart, raw->SectorCount, raw->TrackMode, buffer, len, sz); @@ -1506,154 +1509,40 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW return STATUS_INVALID_PARAMETER; } #elif defined(__APPLE__) + /* Mac OS lets us read multiple parts of the sector at a time. + * We can read all the sectors in at once, unlike Linux. + */ + memset(&cdrd, 0, sizeof(cdrd)); + cdrd.offset = (raw->DiskOffset.QuadPart >> 11) * kCDSectorSizeWhole; + cdrd.buffer = buffer; + cdrd.bufferLength = raw->SectorCount * kCDSectorSizeWhole; 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); - } - } - + cdrd.sectorType = kCDSectorTypeMode2; + cdrd.sectorArea = kCDSectorAreaSync | kCDSectorAreaHeader | kCDSectorAreaUser; 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); - } - } - + cdrd.sectorType = kCDSectorTypeMode2Form2; + cdrd.sectorArea = kCDSectorAreaSync | kCDSectorAreaHeader | kCDSectorAreaSubHeader | kCDSectorAreaUser; 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); + cdrd.sectorArea = kCDSectorAreaUser; break; - } default: FIXME("NIY: %d\n", raw->TrackMode); return STATUS_INVALID_PARAMETER; } + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = cdrd.bufferLength; + return CDROM_GetStatusCode(io); + } #else switch (raw->TrackMode) {

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011