wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Hans Leidekker : msi: More Wow64 fixes.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 88b4bbfc6acc6977a9f1d6b332fdd5edc61a0adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b4bbfc6acc6977a9f1d6b33… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 09:52:16 2011 +0200 msi: More Wow64 fixes. --- dlls/msi/msi.c | 6 +++--- dlls/msi/registry.c | 24 ++++++++++++++---------- dlls/msi/tests/action.c | 8 ++++---- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 44a4e21..def9e72 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1571,11 +1571,11 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, r = ERROR_UNKNOWN_PATCH; - res = RegOpenKeyExW(udprod, szPatches, 0, KEY_READ, &patches); + res = RegOpenKeyExW(udprod, szPatches, 0, KEY_WOW64_64KEY|KEY_READ, &patches); if (res != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW(patches, squished_patch, 0, KEY_READ, &patch); + res = RegOpenKeyExW(patches, squished_patch, 0, KEY_WOW64_64KEY|KEY_READ, &patch); if (res != ERROR_SUCCESS) goto done; @@ -1585,7 +1585,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, &prod, FALSE) != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW(prod, szPatches, 0, KEY_ALL_ACCESS, &prodpatches); + res = RegOpenKeyExW(prod, szPatches, 0, KEY_WOW64_64KEY|KEY_ALL_ACCESS, &prodpatches); if (res != ERROR_SUCCESS) goto done; diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 5db5a4b..353cb6d 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -150,9 +150,11 @@ static const WCHAR szInstaller_LocalClassesFeat[] = { 'I','n','s','t','a','l','l','e','r','\\','F','e','a','t','u','r','e','s','\\',0}; static const WCHAR szInstaller_ClassesUpgradeCode[] = { + 'S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s','\\', 'I','n','s','t','a','l','l','e','r','\\','U','p','g','r','a','d','e','C','o','d','e','s','\\',0}; static const WCHAR szInstaller_ClassesUpgradeCodes[] = { + 'S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s','\\', 'I','n','s','t','a','l','l','e','r','\\','U','p','g','r','a','d','e','C','o','d','e','s',0}; static const WCHAR szInstaller_Features[] = { @@ -991,8 +993,8 @@ UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY *key, BOOL cr strcpyW(keypath, szInstaller_ClassesUpgradeCode); strcatW(keypath, squished_pc); - if (create) return RegCreateKeyExW(HKEY_CLASSES_ROOT, keypath, 0, NULL, 0, access, NULL, key, NULL); - return RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, access, key); + if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); + return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); } UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) @@ -1005,7 +1007,7 @@ UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) if (!squash_guid(szUpgradeCode, squished_pc)) return ERROR_FUNCTION_FAILED; TRACE("%s squished %s\n", debugstr_w(szUpgradeCode), debugstr_w(squished_pc)); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szInstaller_ClassesUpgradeCodes, 0, access, &hkey)) return ERROR_SUCCESS; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szInstaller_ClassesUpgradeCodes, 0, access, &hkey)) return ERROR_SUCCESS; r = RegDeleteTreeW(hkey, squished_pc); RegCloseKey(hkey); return r; @@ -1143,6 +1145,7 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) UINT r; WCHAR szKeyName[SQUISH_GUID_SIZE]; HKEY key; + REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; DWORD machine_count, managed_count, unmanaged_count; WCHAR keypath[MAX_PATH]; LPWSTR usersid = NULL; @@ -1158,7 +1161,7 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) return ERROR_INVALID_PARAMETER; key = 0; - r = RegCreateKeyW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesProducts, &key); + r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesProducts, 0, NULL, 0, access, NULL, &key, NULL); if( r != ERROR_SUCCESS ) goto failed; r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &machine_count, NULL, NULL, @@ -1188,7 +1191,7 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) sprintfW(keypath, szInstaller_LocalManaged_fmt, usersid); LocalFree(usersid); - r = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, &key); + r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &key, NULL); if( r != ERROR_SUCCESS ) goto failed; r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &managed_count, NULL, NULL, @@ -1301,21 +1304,22 @@ UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid) UINT WINAPI MsiEnumComponentsW(DWORD index, LPWSTR lpguid) { - HKEY hkeyComponents = 0; - DWORD r; + HKEY hkey; + REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; WCHAR szKeyName[SQUISH_GUID_SIZE]; + DWORD r; TRACE("%d %p\n", index, lpguid); - r = RegCreateKeyW(HKEY_LOCAL_MACHINE, szInstaller_Components, &hkeyComponents); + r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szInstaller_Components, 0, NULL, 0, access, NULL, &hkey, NULL); if( r != ERROR_SUCCESS ) return ERROR_NO_MORE_ITEMS; - r = RegEnumKeyW(hkeyComponents, index, szKeyName, SQUISH_GUID_SIZE); + r = RegEnumKeyW(hkey, index, szKeyName, SQUISH_GUID_SIZE); if( r == ERROR_SUCCESS ) unsquash_guid(szKeyName, lpguid); - RegCloseKey(hkeyComponents); + RegCloseKey(hkey); return r; } diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 2643e39..1d06509 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2781,8 +2781,8 @@ static void test_publish_product(void) static const CHAR badprod[] = "Software\\Microsoft\\Windows\\CurrentVersion" "\\Installer\\Products" "\\84A88FD7F6998CE40A22FB59F6B9C2BB"; - static const CHAR machprod[] = "Installer\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; - static const CHAR machup[] = "Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2"; + static const CHAR machprod[] = "Software\\Classes\\Installer\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; + static const CHAR machup[] = "Software\\Classes\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2"; if (is_process_limited()) { @@ -2936,7 +2936,7 @@ currentuser: RegCloseKey(hkey); machprod: - res = RegOpenKeyExA(HKEY_CLASSES_ROOT, machprod, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, machprod, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); @@ -2982,7 +2982,7 @@ machprod: ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); RegCloseKey(hkey); - res = RegOpenKeyExA(HKEY_CLASSES_ROOT, machup, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, machup, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL);

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_Initialize.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 2cad663198357b4fb0bda3f2f2bb8cde0c4dcc64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cad663198357b4fb0bda3f2f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 29 16:30:59 2011 -0500 windowscodecs: Implement TiffFrameEncode_Initialize. --- dlls/windowscodecs/tiffformat.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 98e2376..65a65a5 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1136,6 +1136,8 @@ typedef struct TiffFrameEncode { IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; LONG ref; TiffEncoder *parent; + /* fields below are protected by parent->lock */ + BOOL initialized; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1195,8 +1197,22 @@ static ULONG WINAPI TiffFrameEncode_Release(IWICBitmapFrameEncode *iface) static HRESULT WINAPI TiffFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { - FIXME("(%p,%p): stub\n", iface, pIEncoderOptions); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%p)\n", iface, pIEncoderOptions); + + EnterCriticalSection(&This->parent->lock); + + if (This->initialized) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->initialized = TRUE; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_SetSize(IWICBitmapFrameEncode *iface, @@ -1443,6 +1459,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->IWICBitmapFrameEncode_iface.lpVtbl = &TiffFrameEncode_Vtbl; result->ref = 1; result->parent = This; + result->initialized = FALSE; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Vincent Povirk : windowscodecs: Implement TiffEncoder_CreateNewFrame.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: c876357c11ea63a56d15ff001963fa0d11eb6123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c876357c11ea63a56d15ff001… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 29 16:24:19 2011 -0500 windowscodecs: Implement TiffEncoder_CreateNewFrame. --- dlls/windowscodecs/tiffformat.c | 214 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 211 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index b1d472d..98e2376 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -64,6 +64,7 @@ MAKE_FUNCPTR(TIFFReadDirectory); MAKE_FUNCPTR(TIFFReadEncodedStrip); MAKE_FUNCPTR(TIFFReadEncodedTile); MAKE_FUNCPTR(TIFFSetDirectory); +MAKE_FUNCPTR(TIFFWriteDirectory); #undef MAKE_FUNCPTR static void *load_libtiff(void) @@ -92,6 +93,7 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFReadEncodedStrip); LOAD_FUNCPTR(TIFFReadEncodedTile); LOAD_FUNCPTR(TIFFSetDirectory); + LOAD_FUNCPTR(TIFFWriteDirectory); #undef LOAD_FUNCPTR } @@ -1118,9 +1120,11 @@ typedef struct TiffEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; LONG ref; IStream *stream; - CRITICAL_SECTION lock; /* Must be held when tiff is used or initiailzed is set */ + CRITICAL_SECTION lock; /* Must be held when tiff is used or fields below are set */ TIFF *tiff; BOOL initialized; + ULONG num_frames; + ULONG num_frames_committed; } TiffEncoder; static inline TiffEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) @@ -1128,6 +1132,159 @@ static inline TiffEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) return CONTAINING_RECORD(iface, TiffEncoder, IWICBitmapEncoder_iface); } +typedef struct TiffFrameEncode { + IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; + LONG ref; + TiffEncoder *parent; +} TiffFrameEncode; + +static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) +{ + return CONTAINING_RECORD(iface, TiffFrameEncode, IWICBitmapFrameEncode_iface); +} + +static HRESULT WINAPI TiffFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, + void **ppv) +{ + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) + { + *ppv = &This->IWICBitmapFrameEncode_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TiffFrameEncode_AddRef(IWICBitmapFrameEncode *iface) +{ + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI TiffFrameEncode_Release(IWICBitmapFrameEncode *iface) +{ + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + IWICBitmapEncoder_Release(&This->parent->IWICBitmapEncoder_iface); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI TiffFrameEncode_Initialize(IWICBitmapFrameEncode *iface, + IPropertyBag2 *pIEncoderOptions) +{ + FIXME("(%p,%p): stub\n", iface, pIEncoderOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_SetSize(IWICBitmapFrameEncode *iface, + UINT uiWidth, UINT uiHeight) +{ + FIXME("(%p,%u,%u): stub\n", iface, uiWidth, uiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, + double dpiX, double dpiY) +{ + FIXME("(%p,%0.2f,%0.2f): stub\n", iface, dpiX, dpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI TiffFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, + UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) +{ + FIXME("(%p,%u,%u,%u,%p): stub\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIBitmapSource, WICRect *prc) +{ + FIXME("(%p,%p,%p): stub\n", iface, pIBitmapSource, prc); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_Commit(IWICBitmapFrameEncode *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameEncode_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p, %p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapFrameEncodeVtbl TiffFrameEncode_Vtbl = { + TiffFrameEncode_QueryInterface, + TiffFrameEncode_AddRef, + TiffFrameEncode_Release, + TiffFrameEncode_Initialize, + TiffFrameEncode_SetSize, + TiffFrameEncode_SetResolution, + TiffFrameEncode_SetPixelFormat, + TiffFrameEncode_SetColorContexts, + TiffFrameEncode_SetPalette, + TiffFrameEncode_SetThumbnail, + TiffFrameEncode_WritePixels, + TiffFrameEncode_WriteSource, + TiffFrameEncode_Commit, + TiffFrameEncode_GetMetadataQueryWriter +}; + static HRESULT WINAPI TiffEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { @@ -1257,8 +1414,57 @@ static HRESULT WINAPI TiffEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitma static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { - FIXME("(%p,%p,%p): stub\n", iface, ppIFrameEncode, ppIEncoderOptions); - return E_NOTIMPL; + TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); + TiffFrameEncode *result; + + HRESULT hr=S_OK; + + TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); + + EnterCriticalSection(&This->lock); + + if (This->num_frames != This->num_frames_committed) + { + FIXME("New frame created before previous frame was committed\n"); + hr = E_FAIL; + } + + if (SUCCEEDED(hr)) + { + hr = CreatePropertyBag2(ppIEncoderOptions); + } + + if (SUCCEEDED(hr)) + { + result = HeapAlloc(GetProcessHeap(), 0, sizeof(*result)); + + if (result) + { + result->IWICBitmapFrameEncode_iface.lpVtbl = &TiffFrameEncode_Vtbl; + result->ref = 1; + result->parent = This; + + IWICBitmapEncoder_AddRef(iface); + *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface; + + if (This->num_frames != 0) + pTIFFWriteDirectory(This->tiff); + + This->num_frames++; + } + else + hr = E_OUTOFMEMORY; + + if (FAILED(hr)) + { + IPropertyBag2_Release(*ppIEncoderOptions); + *ppIEncoderOptions = NULL; + } + } + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI TiffEncoder_Commit(IWICBitmapEncoder *iface) @@ -1317,6 +1523,8 @@ HRESULT TiffEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TiffEncoder.lock"); This->tiff = NULL; This->initialized = FALSE; + This->num_frames = 0; + This->num_frames_committed = 0; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Implement TiffEncoder_Initialize.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 39fc092b7ce73612afea605b3b5a83b974a7f36c URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fc092b7ce73612afea605b3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 29 15:04:26 2011 -0500 windowscodecs: Implement TiffEncoder_Initialize. --- dlls/windowscodecs/tiffformat.c | 45 +++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a5d9843..b1d472d 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1117,6 +1117,10 @@ HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) typedef struct TiffEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; LONG ref; + IStream *stream; + CRITICAL_SECTION lock; /* Must be held when tiff is used or initiailzed is set */ + TIFF *tiff; + BOOL initialized; } TiffEncoder; static inline TiffEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) @@ -1166,6 +1170,10 @@ static ULONG WINAPI TiffEncoder_Release(IWICBitmapEncoder *iface) if (ref == 0) { + if (This->tiff) pTIFFClose(This->tiff); + if (This->stream) IStream_Release(This->stream); + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This); } @@ -1175,8 +1183,36 @@ static ULONG WINAPI TiffEncoder_Release(IWICBitmapEncoder *iface) static HRESULT WINAPI TiffEncoder_Initialize(IWICBitmapEncoder *iface, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) { - FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOption); - return E_NOTIMPL; + TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); + TIFF *tiff; + HRESULT hr=S_OK; + + TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); + + EnterCriticalSection(&This->lock); + + if (This->initialized) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto exit; + } + + tiff = tiff_open_stream(pIStream, "w"); + + if (!tiff) + { + hr = E_FAIL; + goto exit; + } + + This->tiff = tiff; + This->stream = pIStream; + IStream_AddRef(pIStream); + This->initialized = TRUE; + +exit: + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI TiffEncoder_GetContainerFormat(IWICBitmapEncoder *iface, @@ -1276,6 +1312,11 @@ HRESULT TiffEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->IWICBitmapEncoder_iface.lpVtbl = &TiffEncoder_Vtbl; This->ref = 1; + This->stream = NULL; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TiffEncoder.lock"); + This->tiff = NULL; + This->initialized = FALSE; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Add stub TIFF encoder.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: fb356a3e66fb18dbb7990361ac3ab97a353d0c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb356a3e66fb18dbb7990361a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 29 14:56:30 2011 -0500 windowscodecs: Add stub TIFF encoder. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/regsvr.c | 27 ++++- dlls/windowscodecs/tiffformat.c | 175 +++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 5 files changed, 209 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 473a6a9..105d40a 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -53,6 +53,7 @@ static classinfo wic_classes[] = { {&CLSID_WICIcoDecoder, IcoDecoder_CreateInstance}, {&CLSID_WICJpegDecoder, JpegDecoder_CreateInstance}, {&CLSID_WICTiffDecoder, TiffDecoder_CreateInstance}, + {&CLSID_WICTiffEncoder, TiffEncoder_CreateInstance}, {&CLSID_WICIcnsEncoder, IcnsEncoder_CreateInstance}, {&CLSID_WICDefaultFormatConverter, FormatConverter_CreateInstance}, {&CLSID_WineTgaDecoder, TgaDecoder_CreateInstance}, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index e6a1970..d25c977 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -761,12 +761,13 @@ static struct decoder_pattern const png_patterns[] = { static const BYTE tiff_magic_le[] = {0x49,0x49,42,0}; static const BYTE tiff_magic_be[] = {0x4d,0x4d,0,42}; -static GUID const * const tiff_formats[] = { +static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, + &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, @@ -870,7 +871,7 @@ static struct regsvr_decoder const decoder_list[] = { &GUID_VendorMicrosoft, "image/tiff", ".tif;.tiff", - tiff_formats, + tiff_decode_formats, tiff_patterns }, { &CLSID_WineTgaDecoder, @@ -908,6 +909,19 @@ static GUID const * const png_encode_formats[] = { NULL }; +static GUID const * const tiff_encode_formats[] = { + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat4bppGray, + &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat24bppBGR, + &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat32bppPBGRA, + &GUID_WICPixelFormat48bppRGB, + &GUID_WICPixelFormat64bppRGBA, + &GUID_WICPixelFormat64bppPRGBA, + NULL +}; + static GUID const * const icns_encode_formats[] = { &GUID_WICPixelFormat32bppBGRA, NULL @@ -932,6 +946,15 @@ static struct regsvr_encoder const encoder_list[] = { ".png", png_encode_formats }, + { &CLSID_WICTiffEncoder, + "The Wine Project", + "TIFF Encoder", + "1.0.0.0", + &GUID_VendorMicrosoft, + "image/tiff", + ".tif;.tiff", + tiff_encode_formats + }, { &CLSID_WICIcnsEncoder, "The Wine Project", "ICNS Encoder", diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 1e82285..a5d9843 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1114,6 +1114,175 @@ HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } +typedef struct TiffEncoder { + IWICBitmapEncoder IWICBitmapEncoder_iface; + LONG ref; +} TiffEncoder; + +static inline TiffEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) +{ + return CONTAINING_RECORD(iface, TiffEncoder, IWICBitmapEncoder_iface); +} + +static HRESULT WINAPI TiffEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, + void **ppv) +{ + TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapEncoder, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TiffEncoder_AddRef(IWICBitmapEncoder *iface) +{ + TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI TiffEncoder_Release(IWICBitmapEncoder *iface) +{ + TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI TiffEncoder_Initialize(IWICBitmapEncoder *iface, + IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) +{ + FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOption); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffEncoder_GetContainerFormat(IWICBitmapEncoder *iface, + GUID *pguidContainerFormat) +{ + FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, + IWICBitmapEncoderInfo **ppIEncoderInfo) +{ + FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffEncoder_SetColorContexts(IWICBitmapEncoder *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) +{ + TRACE("(%p,%p)\n", iface, pIPalette); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI TiffEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail) +{ + TRACE("(%p,%p)\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI TiffEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmapSource *pIPreview) +{ + TRACE("(%p,%p)\n", iface, pIPreview); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, + IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) +{ + FIXME("(%p,%p,%p): stub\n", iface, ppIFrameEncode, ppIEncoderOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffEncoder_Commit(IWICBitmapEncoder *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapEncoderVtbl TiffEncoder_Vtbl = { + TiffEncoder_QueryInterface, + TiffEncoder_AddRef, + TiffEncoder_Release, + TiffEncoder_Initialize, + TiffEncoder_GetContainerFormat, + TiffEncoder_GetEncoderInfo, + TiffEncoder_SetColorContexts, + TiffEncoder_SetPalette, + TiffEncoder_SetThumbnail, + TiffEncoder_SetPreview, + TiffEncoder_CreateNewFrame, + TiffEncoder_Commit, + TiffEncoder_GetMetadataQueryWriter +}; + +HRESULT TiffEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + TiffEncoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + if (!load_libtiff()) + { + ERR("Failed writing TIFF because unable to load %s\n",SONAME_LIBTIFF); + return E_FAIL; + } + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(TiffEncoder)); + if (!This) return E_OUTOFMEMORY; + + This->IWICBitmapEncoder_iface.lpVtbl = &TiffEncoder_Vtbl; + This->ref = 1; + + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); + IUnknown_Release((IUnknown*)This); + + return ret; +} + #else /* !SONAME_LIBTIFF */ HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) @@ -1122,4 +1291,10 @@ HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return E_FAIL; } +HRESULT TiffEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + ERR("Trying to save TIFF picture, but Wine was compiled without TIFF support.\n"); + return E_FAIL; +} + #endif diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index fc2d17c..1614753 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -38,6 +38,7 @@ extern HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void* extern HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); +extern HRESULT TiffEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 853592c..7558f56 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -82,6 +82,13 @@ coclass WICJpegDecoder { interface IWICBitmapDecoder; } coclass WICTiffDecoder { interface IWICBitmapDecoder; } [ + helpstring("WIC TIFF Encoder"), + threading(both), + uuid(0131be10-2001-4c5f-a9b0-cc88fab64ce8) +] +coclass WICTiffEncoder { interface IWICBitmapEncoder; } + +[ helpstring("WIC ICNS Encoder"), threading(both), uuid(312fb6f1-b767-409d-8a6d-0fc154d4f05c)

1 0

Vincent Povirk : windowscodecs: Implement TiffDecoder_GetResolution.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 562267a7fb20ded7c87fe48f8a700790543c4cbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=562267a7fb20ded7c87fe48f8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 16:42:44 2011 -0500 windowscodecs: Implement TiffDecoder_GetResolution. --- dlls/windowscodecs/tiffformat.c | 50 +++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index b1dd152..1e82285 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -219,6 +219,8 @@ typedef struct { UINT tile_size; int tiled; UINT tiles_across; + UINT resolution_unit; + float xres, yres; } tiff_decode_info; typedef struct { @@ -458,6 +460,25 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } + decode_info->resolution_unit = 0; + pTIFFGetField(tiff, TIFFTAG_RESOLUTIONUNIT, &decode_info->resolution_unit); + if (decode_info->resolution_unit != 0) + { + ret = pTIFFGetField(tiff, TIFFTAG_XRESOLUTION, &decode_info->xres); + if (!ret) + { + WARN("missing X resolution\n"); + decode_info->resolution_unit = 0; + } + + ret = pTIFFGetField(tiff, TIFFTAG_YRESOLUTION, &decode_info->yres); + if (!ret) + { + WARN("missing Y resolution\n"); + decode_info->resolution_unit = 0; + } + } + return S_OK; } @@ -769,8 +790,33 @@ static HRESULT WINAPI TiffFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *ifac static HRESULT WINAPI TiffFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p)\n", iface, pDpiX, pDpiY); - return E_NOTIMPL; + TiffFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); + + switch (This->decode_info.resolution_unit) + { + default: + FIXME("unknown resolution unit %i\n", This->decode_info.resolution_unit); + /* fall through */ + case 0: /* Not set */ + *pDpiX = *pDpiY = 96.0; + break; + case 1: /* Relative measurements */ + *pDpiX = 96.0; + *pDpiY = 96.0 * This->decode_info.yres / This->decode_info.xres; + break; + case 2: /* Inch */ + *pDpiX = This->decode_info.xres; + *pDpiY = This->decode_info.yres; + break; + case 3: /* Centimeter */ + *pDpiX = This->decode_info.xres / 2.54; + *pDpiY = This->decode_info.yres / 2.54; + break; + } + + TRACE("(%p) <-- %f,%f unit=%i\n", iface, *pDpiX, *pDpiY, This->decode_info.resolution_unit); + + return S_OK; } static HRESULT WINAPI TiffFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface,

1 0

Piotr Caban : msvcrt: Added wctob implementation.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: f989011be243ab670462fb7a4e1e5a09a8ea3c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f989011be243ab670462fb7a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 5 23:47:22 2011 +0200 msvcrt: Added wctob implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/wcs.c | 17 ++++++++++++++++- 6 files changed, 59 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 88655cf..cf5b3e1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1659,7 +1659,7 @@ @ cdecl wcstombs_s(ptr ptr long wstr long) msvcrt.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul @ stub wcsxfrm -@ stub wctob +@ cdecl wctob(long) msvcrt.wctob @ cdecl wctomb(ptr long) msvcrt.wctomb @ stub wctomb_s @ stub wmemcpy_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8dc251b..e2aec87 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1513,7 +1513,7 @@ @ cdecl wcstombs_s(ptr ptr long wstr long) msvcrt.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul @ stub wcsxfrm -@ stub wctob +@ cdecl wctob(long) msvcrt.wctob @ cdecl wctomb(ptr long) msvcrt.wctomb @ stub wctomb_s @ varargs wprintf(wstr) msvcrt.wprintf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 94810e5..36c7bdb 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1497,7 +1497,7 @@ @ cdecl wcstombs_s(ptr ptr long wstr long) msvcrt.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul @ stub wcsxfrm -@ stub wctob +@ cdecl wctob(long) msvcrt.wctob @ cdecl wctomb(ptr long) msvcrt.wctomb @ stub wctomb_s @ varargs wprintf(wstr) msvcrt.wprintf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ef88e71..9777e32 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1468,7 +1468,7 @@ @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) ntdll.wcstoul @ stub wcsxfrm #(ptr wstr long) MSVCRT_wcsxfrm -# stub wctob +@ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb # stub wctomb_s @ varargs wprintf(wstr) MSVCRT_wprintf diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6aba883..8b0494b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -78,6 +78,7 @@ static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_in static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); +static int (__cdecl *p_wctob)(wint_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -1913,6 +1914,40 @@ static void test__ultoa_s(void) buffer); } +static void test_wctob(void) +{ + int ret; + + if(!p_wctob || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping wctob tests\n"); + return; + } + + ret = p_wctob(0x8141); + ok(ret == EOF, "ret = %x\n", ret); + + ret = p_wctob(0x81); + ok(ret == EOF, "ret = %x\n", ret); + + ret = p_wctob(0xe0); + ok(ret == 0x61, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_wctob(0x81); + /* wctob should not be affected by _setmbcp */ + todo_wine ok(ret == EOF, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_wctob(0x8141); + ok(ret == EOF, "ret = %x\n", ret); + + ret = p_wctob(0x81); + ok(ret == (int)(char)0x81, "ret = %x\n", ret); + + ret = p_wctob(0xe0); + ok(ret == (int)(char)0xe0, "ret = %x\n", ret); +} + START_TEST(string) { char mem[100]; @@ -1947,6 +1982,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1989,4 +2025,7 @@ START_TEST(string) test__wcslwr_s(); test__mbsupr_s(); test__mbslwr_s(); + + /* This test is changing locale */ + test_wctob(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index fc77656..65b2eae 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1501,11 +1501,26 @@ MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t } /********************************************************************* + * wctob (MSVCRT.@) + */ +INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) +{ + MSVCRT__locale_t locale = get_locale(); + char out; + BOOL error; + + if(WideCharToMultiByte( locale->locinfo->lc_codepage, 0, &wchar, 1, &out, 1, NULL, &error ) && !error) + return (INT)out; + return MSVCRT_EOF; +} + +/********************************************************************* * wctomb (MSVCRT.@) */ INT CDECL MSVCRT_wctomb( char *dst, MSVCRT_wchar_t ch ) { - return WideCharToMultiByte( CP_ACP, 0, &ch, 1, dst, 6, NULL, NULL ); + MSVCRT__locale_t locale = get_locale(); + return WideCharToMultiByte( locale->locinfo->lc_codepage, 0, &ch, 1, dst, 6, NULL, NULL ); } /*********************************************************************

1 0

Henri Verbeet : wined3d: Remove COM from the rendertarget view implementation.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 2ab5b833d7006e001e8f101326df530ba7723952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab5b833d7006e001e8f10132… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 19:01:32 2011 +0200 wined3d: Remove COM from the rendertarget view implementation. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 3 +- dlls/d3d10core/view.c | 8 ++-- dlls/wined3d/device.c | 14 ++----- dlls/wined3d/view.c | 74 +++++++----------------------------- dlls/wined3d/wined3d.spec | 5 ++ dlls/wined3d/wined3d_private.h | 2 - include/wine/wined3d.idl | 22 ++++------- 8 files changed, 38 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ab5b833d7006e001e8f1…

1 0

Henri Verbeet : wined3d: Add depth fills to the blitter interface.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 519a3a9162b8485fdce22bb340abfcf92d86a779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519a3a9162b8485fdce22bb34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 19:01:31 2011 +0200 wined3d: Add depth fills to the blitter interface. --- dlls/wined3d/arb_program_shader.c | 11 +++- dlls/wined3d/surface.c | 121 ++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 90 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1848287..77f04d6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7253,11 +7253,20 @@ static HRESULT arbfp_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurface return WINED3DERR_INVALIDCALL; } +/* Do not call while under the GL lock. */ +static HRESULT arbfp_blit_depth_fill(IWineD3DDeviceImpl *device, + IWineD3DSurfaceImpl *surface, const RECT *rect, float depth) +{ + FIXME("Depth filling not implemented by arbfp_blit.\n"); + return WINED3DERR_INVALIDCALL; +} + const struct blit_shader arbfp_blit = { arbfp_blit_alloc, arbfp_blit_free, arbfp_blit_set, arbfp_blit_unset, arbfp_blit_supported, - arbfp_blit_color_fill + arbfp_blit_color_fill, + arbfp_blit_depth_fill, }; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 58cd197..3086e26 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3897,10 +3897,19 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, /* Do not call while under the GL lock. */ static HRESULT wined3d_surface_depth_fill(IWineD3DSurfaceImpl *surface, const RECT *rect, float depth) { - const RECT draw_rect = {0, 0, surface->resource.width, surface->resource.height}; + const struct wined3d_resource *resource = &surface->resource; + IWineD3DDeviceImpl *device = resource->device; + const struct blit_shader *blitter; + + blitter = wined3d_select_blitter(&device->adapter->gl_info, WINED3D_BLIT_OP_DEPTH_FILL, + NULL, 0, 0, NULL, rect, resource->usage, resource->pool, resource->format); + if (!blitter) + { + FIXME("No blitter is capable of performing the requested depth fill operation.\n"); + return WINED3DERR_INVALIDCALL; + } - return device_clear_render_targets(surface->resource.device, 0, NULL, surface, - !!rect, rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); + return blitter->depth_fill(device, surface, rect, depth); } /* Do not call while under the GL lock. */ @@ -3929,13 +3938,16 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT if (flags & WINEDDBLT_DEPTHFILL) { float depth; + RECT rect; TRACE("Depth fill.\n"); + surface_get_rect(This, DestRect, &rect); + if (!surface_convert_depth_to_float(This, DDBltFx->u5.dwFillDepth, &depth)) return WINED3DERR_INVALIDCALL; - if (SUCCEEDED(wined3d_surface_depth_fill(This, DestRect, depth))) + if (SUCCEEDED(wined3d_surface_depth_fill(This, &rect, depth))) return WINED3D_OK; } else @@ -4862,51 +4874,54 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined { enum complex_fixup src_fixup; - if (blit_op == WINED3D_BLIT_OP_COLOR_FILL) + switch (blit_op) { - if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) - { - TRACE("Color fill not supported\n"); - return FALSE; - } + case WINED3D_BLIT_OP_COLOR_BLIT: + src_fixup = get_complex_fixup(src_format->color_fixup); + if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) + { + TRACE("Checking support for fixup:\n"); + dump_color_fixup_desc(src_format->color_fixup); + } - return TRUE; - } + if (!is_identity_fixup(dst_format->color_fixup)) + { + TRACE("Destination fixups are not supported\n"); + return FALSE; + } - src_fixup = get_complex_fixup(src_format->color_fixup); - if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) - { - TRACE("Checking support for fixup:\n"); - dump_color_fixup_desc(src_format->color_fixup); - } + if (src_fixup == COMPLEX_FIXUP_P8 && gl_info->supported[EXT_PALETTED_TEXTURE]) + { + TRACE("P8 fixup supported\n"); + return TRUE; + } - if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT) - { - TRACE("Unsupported blit_op=%d\n", blit_op); - return FALSE; - } + /* We only support identity conversions. */ + if (is_identity_fixup(src_format->color_fixup)) + { + TRACE("[OK]\n"); + return TRUE; + } - if (!is_identity_fixup(dst_format->color_fixup)) - { - TRACE("Destination fixups are not supported\n"); - return FALSE; - } + TRACE("[FAILED]\n"); + return FALSE; - if (src_fixup == COMPLEX_FIXUP_P8 && gl_info->supported[EXT_PALETTED_TEXTURE]) - { - TRACE("P8 fixup supported\n"); - return TRUE; - } + case WINED3D_BLIT_OP_COLOR_FILL: + if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) + { + TRACE("Color fill not supported\n"); + return FALSE; + } - /* We only support identity conversions. */ - if (is_identity_fixup(src_format->color_fixup)) - { - TRACE("[OK]\n"); - return TRUE; - } + return TRUE; - TRACE("[FAILED]\n"); - return FALSE; + case WINED3D_BLIT_OP_DEPTH_FILL: + return TRUE; + + default: + TRACE("Unsupported blit_op=%d\n", blit_op); + return FALSE; + } } /* Do not call while under the GL lock. */ @@ -4919,13 +4934,24 @@ static HRESULT ffp_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurfaceIm 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); } +/* Do not call while under the GL lock. */ +static HRESULT ffp_blit_depth_fill(IWineD3DDeviceImpl *device, + IWineD3DSurfaceImpl *surface, const RECT *rect, float depth) +{ + const RECT draw_rect = {0, 0, surface->resource.width, surface->resource.height}; + + return device_clear_render_targets(device, 0, NULL, surface, + 1, rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); +} + const struct blit_shader ffp_blit = { ffp_blit_alloc, ffp_blit_free, ffp_blit_set, ffp_blit_unset, ffp_blit_supported, - ffp_blit_color_fill + ffp_blit_color_fill, + ffp_blit_depth_fill, }; static HRESULT cpu_blit_alloc(IWineD3DDeviceImpl *device) @@ -4974,13 +5000,22 @@ static HRESULT cpu_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurfaceIm NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); } +/* Do not call while under the GL lock. */ +static HRESULT cpu_blit_depth_fill(IWineD3DDeviceImpl *device, + IWineD3DSurfaceImpl *surface, const RECT *rect, float depth) +{ + FIXME("Depth filling not implemented by cpu_blit.\n"); + return WINED3DERR_INVALIDCALL; +} + const struct blit_shader cpu_blit = { cpu_blit_alloc, cpu_blit_free, cpu_blit_set, cpu_blit_unset, cpu_blit_supported, - cpu_blit_color_fill + cpu_blit_color_fill, + cpu_blit_depth_fill, }; static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eb015eb..190e877 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1170,6 +1170,7 @@ enum wined3d_blit_op { WINED3D_BLIT_OP_COLOR_BLIT, WINED3D_BLIT_OP_COLOR_FILL, + WINED3D_BLIT_OP_DEPTH_FILL, }; /* Shaders for color conversions in blits. Do not do blit operations while @@ -1185,6 +1186,7 @@ struct blit_shader const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, const struct wined3d_format *dst_format); HRESULT (*color_fill)(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect, const WINED3DCOLORVALUE *color); + HRESULT (*depth_fill)(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *surface, const RECT *rect, float depth); }; extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Allow depth and stencil clears on surfaces other than the current depth / stencil buffer.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 99bfd817141ca32f9c50e539aa4d0dcbfded24b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99bfd817141ca32f9c50e539a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 19:01:30 2011 +0200 wined3d: Allow depth and stencil clears on surfaces other than the current depth / stencil buffer. --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/device.c | 32 ++++++++++++++++++++++---------- dlls/wined3d/surface.c | 18 ++++++------------ dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8ffb30c..5b5ae5a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2,7 +2,7 @@ * Context and render target management in wined3d * * Copyright 2007-2008 Stefan Dösinger for CodeWeavers - * Copyright 2009-2010 Henri Verbeet for CodeWeavers + * Copyright 2009-2011 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1915,7 +1915,7 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur /* Context activation is done by the caller. */ static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_count, IWineD3DSurfaceImpl **rts) { - if (!surface_is_offscreen(rts[0])) + if (rt_count && !surface_is_offscreen(rts[0])) { ENTER_GL(); glDrawBuffer(surface_get_gl_buffer(rts[0])); @@ -1951,7 +1951,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_ } else { - glDrawBuffer(rts[0]->resource.device->offscreenBuffer); + glDrawBuffer(rt_count ? rts[0]->resource.device->offscreenBuffer : GL_NONE); checkGLcall("glDrawBuffer()"); } LEAVE_GL(); @@ -2086,7 +2086,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm ENTER_GL(); - if (surface_is_offscreen(rts[0])) + if (!rt_count || surface_is_offscreen(rts[0])) { for (i = 0; i < rt_count; ++i) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2d50caa..5e9f04e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -652,15 +652,15 @@ static void prepare_ds_clear(IWineD3DSurfaceImpl *ds, struct wined3d_context *co /* Do not call while under the GL lock. */ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, IWineD3DSurfaceImpl **rts, - UINT rect_count, const RECT *rects, const RECT *draw_rect, DWORD flags, - const WINED3DCOLORVALUE *color, float depth, DWORD stencil) + IWineD3DSurfaceImpl *depth_stencil, UINT rect_count, const RECT *rects, const RECT *draw_rect, + DWORD flags, const WINED3DCOLORVALUE *color, float depth, DWORD stencil) { const RECT *clear_rect = (rect_count > 0 && rects) ? (const RECT *)rects : NULL; - IWineD3DSurfaceImpl *depth_stencil = device->depth_stencil; - IWineD3DSurfaceImpl *target = rts[0]; + IWineD3DSurfaceImpl *target = rt_count ? rts[0] : NULL; UINT drawable_width, drawable_height; struct wined3d_context *context; GLbitfield clear_mask = 0; + BOOL render_offscreen; unsigned int i; /* When we're clearing parts of the drawable, make sure that the target surface is well up to date in the @@ -694,7 +694,17 @@ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, I return WINED3D_OK; } - target->get_drawable_size(context, &drawable_width, &drawable_height); + if (target) + { + render_offscreen = context->render_offscreen; + target->get_drawable_size(context, &drawable_width, &drawable_height); + } + else + { + render_offscreen = FALSE; + drawable_width = depth_stencil->pow2Width; + drawable_height = depth_stencil->pow2Height; + } ENTER_GL(); @@ -715,7 +725,7 @@ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, I if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; + DWORD location = render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; if (location == SFLAG_DS_ONSCREEN && depth_stencil != device->onscreen_depth_stencil) { @@ -752,7 +762,7 @@ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, I if (!clear_rect) { - if (context->render_offscreen) + if (render_offscreen) { glScissor(draw_rect->left, draw_rect->top, draw_rect->right - draw_rect->left, draw_rect->bottom - draw_rect->top); @@ -789,7 +799,7 @@ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, I continue; } - if (context->render_offscreen) + if (render_offscreen) { glScissor(current_rect.left, current_rect.top, current_rect.right - current_rect.left, current_rect.bottom - current_rect.top); @@ -808,7 +818,8 @@ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, I LEAVE_GL(); - if (wined3d_settings.strict_draw_ordering || (target->container.type == WINED3D_CONTAINER_SWAPCHAIN + if (wined3d_settings.strict_draw_ordering || (flags & WINED3DCLEAR_TARGET + && target->container.type == WINED3D_CONTAINER_SWAPCHAIN && target->container.u.swapchain->front_buffer == target)) wglFlush(); /* Flush to ensure ordering across contexts. */ @@ -4816,7 +4827,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD rect device_get_draw_rect(device, &draw_rect); return device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, - device->render_targets, rect_count, rects, &draw_rect, flags, &c, depth, stencil); + device->render_targets, device->depth_stencil, rect_count, rects, + &draw_rect, flags, &c, depth, stencil); } /***** diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e62f1f3..58cd197 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1112,7 +1112,7 @@ void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, IWineD3DS unsigned int src_width, src_height; unsigned int width, height; - if (rt->resource.format->id != WINED3DFMT_NULL) + if (rt && rt->resource.format->id != WINED3DFMT_NULL) { width = rt->pow2Width; height = rt->pow2Height; @@ -3897,16 +3897,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, /* Do not call while under the GL lock. */ static HRESULT wined3d_surface_depth_fill(IWineD3DSurfaceImpl *surface, const RECT *rect, float depth) { - IWineD3DDeviceImpl *device = surface->resource.device; - - if (surface != device->depth_stencil) - { - FIXME("Depth fill is only implemented for the current depth / stencil buffer.\n"); - return WINED3DERR_INVALIDCALL; - } + const RECT draw_rect = {0, 0, surface->resource.width, surface->resource.height}; - return IWineD3DDevice_Clear((IWineD3DDevice *)device, !!rect, rect, - WINED3DCLEAR_ZBUFFER, 0x00000000, depth, 0); + return device_clear_render_targets(surface->resource.device, 0, NULL, surface, + !!rect, rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); } /* Do not call while under the GL lock. */ @@ -4921,8 +4915,8 @@ static HRESULT ffp_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurfaceIm { const RECT draw_rect = {0, 0, dst_surface->resource.width, dst_surface->resource.height}; - return device_clear_render_targets(device, 1 /* rt_count */, &dst_surface, 1 /* rect_count */, - dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f /* depth */, 0 /* stencil */); + return device_clear_render_targets(device, 1, &dst_surface, NULL, + 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); } const struct blit_shader ffp_blit = { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15a18dd..eb015eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1769,8 +1769,8 @@ struct IWineD3DDeviceImpl }; HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, IWineD3DSurfaceImpl **rts, - UINT rect_count, const RECT *rects, const RECT *draw_rect, DWORD flags, - const WINED3DCOLORVALUE *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; + IWineD3DSurfaceImpl *depth_stencil, UINT rect_count, const RECT *rects, const RECT *draw_rect, + DWORD flags, const WINED3DCOLORVALUE *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_get_draw_rect(IWineD3DDeviceImpl *device, RECT *rect) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
77
78
79
80
81
82
83
...
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