January 2013 - Wine-commits

Ken Thomases : winemac: Implement layered windows: SetLayeredWindowAttributes() and UpdateLayeredWindow().
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: c0d43fb51f2466660bf027b766c501c7ce1c9874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d43fb51f2466660bf027b76… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 14 20:24:02 2013 -0600 winemac: Implement layered windows: SetLayeredWindowAttributes() and UpdateLayeredWindow(). --- dlls/winemac.drv/cocoa_window.h | 5 + dlls/winemac.drv/cocoa_window.m | 90 ++++++++++++++- dlls/winemac.drv/macdrv.h | 6 +- dlls/winemac.drv/macdrv_cocoa.h | 5 + dlls/winemac.drv/surface.c | 17 +++- dlls/winemac.drv/window.c | 232 ++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/winemac.drv.spec | 2 + 7 files changed, 350 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0d43fb51f2466660bf02…

1 0

Damjan Jovanovic : strmbase: Store and use the chosen IMemAllocator instead of getting it from the input pin .
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 7f767bb1957fc5ebdf0f145226d01f4fe3f7d80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f767bb1957fc5ebdf0f14522… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 15 08:43:33 2013 +0200 strmbase: Store and use the chosen IMemAllocator instead of getting it from the input pin. --- dlls/strmbase/pin.c | 52 ++++++++++------------------------------------- include/wine/strmbase.h | 1 + 2 files changed, 12 insertions(+), 41 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 936ae0c..750752e 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -402,6 +402,9 @@ ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface) if (!refCount) { FreeMediaType(&This->pin.mtCurrent); + if (This->pAllocator) + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; CoTaskMemFree(This); return 0; } @@ -584,18 +587,10 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa hr = VFW_E_NOT_CONNECTED; else { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_GetBuffer(pAlloc, ppSample, tStart, tStop, dwFlags); + hr = IMemAllocator_GetBuffer(This->pAllocator, ppSample, tStart, tStop, dwFlags); if (SUCCEEDED(hr)) hr = IMediaSample_SetTime(*ppSample, tStart, tStop); - - if (pAlloc) - IMemAllocator_Release(pAlloc); } return hr; @@ -653,17 +648,7 @@ HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This) if (!This->pin.pConnectedTo || !This->pMemInputPin) hr = VFW_E_NOT_CONNECTED; else - { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Commit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); - } + hr = IMemAllocator_Commit(This->pAllocator); } LeaveCriticalSection(This->pin.pCritSec); @@ -683,17 +668,7 @@ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This) if (!This->pin.pConnectedTo || !This->pMemInputPin) hr = VFW_E_NOT_CONNECTED; else - { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Decommit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); - } + hr = IMemAllocator_Decommit(This->pAllocator); } LeaveCriticalSection(This->pin.pCritSec); @@ -714,15 +689,7 @@ HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin *This) hr = VFW_E_NOT_CONNECTED; else { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Decommit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); + hr = IMemAllocator_Decommit(This->pAllocator); if (SUCCEEDED(hr)) hr = IPin_Disconnect(This->pin.pConnectedTo); @@ -795,7 +762,9 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei if (SUCCEEDED(hr)) { hr = This->pFuncsTable->pfnDecideAllocator(This, This->pMemInputPin, &pMemAlloc); - if (pMemAlloc) + if (SUCCEEDED(hr)) + This->pAllocator = pMemAlloc; + else if (pMemAlloc) IMemAllocator_Release(pMemAlloc); } @@ -839,6 +808,7 @@ static HRESULT OutputPin_Init(const IPinVtbl *OutputPin_Vtbl, const PIN_INFO * p /* Output pin attributes */ pPinImpl->pMemInputPin = NULL; + pPinImpl->pAllocator = NULL; pPinImpl->pFuncsTable = pBaseOutputFuncsTable; return S_OK; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index da6475d..cbb7d23 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -61,6 +61,7 @@ typedef struct BaseOutputPin /* inheritance C style! */ BasePin pin; IMemInputPin * pMemInputPin; + IMemAllocator * pAllocator; const struct BaseOutputPinFuncTable* pFuncsTable; } BaseOutputPin;

1 0

Damjan Jovanovic : qcap: Use the BaseOutputPin's IMemAllocator.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 632d82f4ac0f51a1c2773667d5dccc800bd27dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632d82f4ac0f51a1c2773667d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 15 08:46:28 2013 +0200 qcap: Use the BaseOutputPin's IMemAllocator. --- dlls/qcap/v4l.c | 34 +++++----------------------------- 1 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 2562c48..41cc752 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -684,7 +684,6 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state) *state = State_Running; if (!capBox->iscommitted++) { - IMemAllocator * pAlloc = NULL; ALLOCATOR_PROPERTIES ap, actual; BaseOutputPin *out; @@ -698,16 +697,11 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state) ap.cbPrefix = 0; out = (BaseOutputPin *)capBox->pOut; - hr = IMemInputPin_GetAllocator(out->pMemInputPin, &pAlloc); - if (SUCCEEDED(hr)) - hr = IMemAllocator_SetProperties(pAlloc, &ap, &actual); + hr = IMemAllocator_SetProperties(out->pAllocator, &ap, &actual); if (SUCCEEDED(hr)) - hr = IMemAllocator_Commit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); + hr = IMemAllocator_Commit(out->pAllocator); TRACE("Committing allocator: %x\n", hr); } @@ -765,32 +759,14 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) capBox->thread = 0; if (capBox->iscommitted) { - IMemInputPin *pMem = NULL; - IMemAllocator * pAlloc = NULL; - IPin *pConnect = NULL; + BaseOutputPin *out; HRESULT hr; capBox->iscommitted = 0; - hr = IPin_ConnectedTo(capBox->pOut, &pConnect); - - if (SUCCEEDED(hr)) - hr = IPin_QueryInterface(pConnect, &IID_IMemInputPin, (void **) &pMem); - - if (SUCCEEDED(hr)) - hr = IMemInputPin_GetAllocator(pMem, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Decommit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); - - if (pMem) - IMemInputPin_Release(pMem); + out = (BaseOutputPin*)capBox->pOut; - if (pConnect) - IPin_Release(pConnect); + hr = IMemAllocator_Decommit(out->pAllocator); if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) WARN("Decommitting allocator: %x\n", hr);

1 0

Alexandre Julliard : gdi32: Store the full flags in the face object, and add a flag for fonts added through AddFontResource.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: f90696e813ce636fec5285424bbd152c740ea72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90696e813ce636fec5285424… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 14 15:28:42 2013 +0100 gdi32: Store the full flags in the face object, and add a flag for fonts added through AddFontResource. --- dlls/gdi32/freetype.c | 59 +++++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f90696e813ce636fec528…

1 0

Alexandre Julliard : gdi32: Store the vertical flag together with the other font flags.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 0f40a031e7e25e35ff6ce3b067a5e6eb18655102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f40a031e7e25e35ff6ce3b06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 14:13:09 2013 +0100 gdi32: Store the vertical flag together with the other font flags. --- dlls/gdi32/freetype.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c90f3c2..22080b1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -270,7 +270,6 @@ typedef struct tagFace { DWORD ntmFlags; FT_Fixed font_version; BOOL scalable; - BOOL vertical; Bitmap_Size size; /* set if face is a bitmap */ DWORD flags; /* ADDFONT flags */ struct tagFamily *family; @@ -282,6 +281,7 @@ typedef struct tagFace { #define ADDFONT_ALLOW_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 #define ADDFONT_ADD_RESOURCE 0x08 /* added through AddFontResource */ +#define ADDFONT_VERTICAL_FONT 0x10 #define ADDFONT_AA_FLAGS(flags) ((flags) << 16) typedef struct tagFamily { @@ -493,7 +493,6 @@ static const WCHAR english_name_value[] = {'E','n','g','l','i','s','h',' ','N',' static const WCHAR face_index_value[] = {'I','n','d','e','x',0}; static const WCHAR face_ntmflags_value[] = {'N','t','m','f','l','a','g','s',0}; static const WCHAR face_version_value[] = {'V','e','r','s','i','o','n',0}; -static const WCHAR face_vertical_value[] = {'V','e','r','t','i','c','a','l',0}; static const WCHAR face_height_value[] = {'H','e','i','g','h','t',0}; static const WCHAR face_width_value[] = {'W','i','d','t','h',0}; static const WCHAR face_size_value[] = {'S','i','z','e',0}; @@ -1394,7 +1393,6 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu reg_load_dword(hkey_face, face_index_value, (DWORD*)&face->face_index); reg_load_dword(hkey_face, face_ntmflags_value, &face->ntmFlags); reg_load_dword(hkey_face, face_version_value, (DWORD*)&face->font_version); - reg_load_dword(hkey_face, face_vertical_value, (DWORD*)&face->vertical); reg_load_dword(hkey_face, face_flags_value, (DWORD*)&face->flags); needed = sizeof(face->fs); @@ -1551,7 +1549,6 @@ static void add_face_to_cache(Face *face) reg_save_dword(hkey_face, face_index_value, face->face_index); reg_save_dword(hkey_face, face_ntmflags_value, face->ntmFlags); reg_save_dword(hkey_face, face_version_value, face->font_version); - if (face->vertical) reg_save_dword(hkey_face, face_vertical_value, face->vertical); if (face->flags) reg_save_dword(hkey_face, face_flags_value, face->flags); RegSetValueExW(hkey_face, face_font_sig_value, 0, REG_BINARY, (BYTE*)&face->fs, sizeof(face->fs)); @@ -1741,7 +1738,7 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, void *font_data_ptr, DWORD font_data_size, - DWORD flags, BOOL vertical ) + DWORD flags ) { Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; @@ -1758,7 +1755,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); if (!face->FullName) face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); - if (vertical) + if (flags & ADDFONT_VERTICAL_FONT) face->FullName = prepend_at( face->FullName ); if (file) @@ -1799,7 +1796,6 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, } if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - face->vertical = vertical; face->flags = flags; face->family = NULL; face->cached_enum_data = NULL; @@ -1813,13 +1809,13 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, } static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, - FT_Long face_index, DWORD flags, BOOL vertical ) + FT_Long face_index, DWORD flags ) { Face *face; Family *family; - face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags, vertical ); - family = get_family( ft_face, vertical ); + face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags ); + family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (insert_face_in_family_list( face, family )) { if (flags & ADDFONT_ADD_TO_CACHE) @@ -1949,12 +1945,13 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ return 0; } - AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, FALSE); + AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags); ++ret; if (FT_HAS_VERTICAL(ft_face)) { - AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, TRUE); + AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, + flags | ADDFONT_VERTICAL_FONT); ++ret; } @@ -3007,7 +3004,7 @@ static BOOL get_fontdir( const char *unix_name, struct fontdir *fd ) DWORD type; if (!ft_face) return FALSE; - face = create_face( ft_face, 0, unix_name, NULL, 0, 0, FALSE ); + face = create_face( ft_face, 0, unix_name, NULL, 0, 0 ); get_family_names( ft_face, &name, &english_name, FALSE ); pFT_Done_Face( ft_face ); @@ -4783,7 +4780,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) font_link = find_font_link(family->FamilyName); face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { - if(face->vertical == want_vertical && + if(!(face->flags & ADDFONT_VERTICAL_FONT) == !want_vertical && (csi.fs.fsCsb[0] & face->fs.fsCsb[0] || (font_link != NULL && csi.fs.fsCsb[0] & font_link->fs.fsCsb[0]))) { if(face->scalable) @@ -4803,7 +4800,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { - if(face->scalable && face->vertical == want_vertical) { + if(face->scalable && !(face->flags & ADDFONT_VERTICAL_FONT) == !want_vertical) { csi.fs.fsCsb[0] = 0; WARN("just using first face for now\n"); goto found; @@ -4948,7 +4945,7 @@ found_face: ret->strikeout = lf.lfStrikeOut ? 0xff : 0; create_child_font_list(ret); - if (face->vertical) /* We need to try to load the GSUB table */ + if (face->flags & ADDFONT_VERTICAL_FONT) /* We need to try to load the GSUB table */ { int length = get_font_data(ret, GSUB_TAG , 0, NULL, 0); if (length != GDI_ERROR)

1 0

Dmitry Timoshkov : windowscodecs: Implement CreateBitmapFromHICON.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 4ba27f79309b440b3a6d39807a79065b96679352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba27f79309b440b3a6d39807… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 14 12:45:24 2013 +0800 windowscodecs: Implement CreateBitmapFromHICON. --- dlls/windowscodecs/Makefile.in | 2 +- dlls/windowscodecs/imgfactory.c | 138 ++++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/bitmap.c | 4 - 3 files changed, 136 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index d031daa..ffe0925 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,6 +1,6 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs -IMPORTS = uuid ole32 oleaut32 shlwapi advapi32 rpcrt4 +IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 EXTRAINCL = @PNGINCL@ EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL EXTRALIBS = @APPLICATIONSERVICESLIB@ diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 1d05ef5..8762c81 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -597,10 +597,142 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFact } static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactory *iface, - HICON hIcon, IWICBitmap **ppIBitmap) + HICON hicon, IWICBitmap **bitmap) { - FIXME("(%p,%p,%p): stub\n", iface, hIcon, ppIBitmap); - return E_NOTIMPL; + IWICBitmapLock *lock; + ICONINFO info; + BITMAP bm; + int width, height, x, y; + UINT stride, size; + BYTE *buffer; + DWORD *bits; + BITMAPINFO bi; + HDC hdc; + BOOL has_alpha; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, hicon, bitmap); + + if (!bitmap) return E_INVALIDARG; + + if (!GetIconInfo(hicon, &info)) + return HRESULT_FROM_WIN32(GetLastError()); + + GetObjectW(info.hbmColor ? info.hbmColor : info.hbmMask, sizeof(bm), &bm); + + width = bm.bmWidth; + height = info.hbmColor ? abs(bm.bmHeight) : abs(bm.bmHeight) / 2; + stride = width * 4; + size = stride * height; + + hr = BitmapImpl_Create(width, height, stride, size, NULL, + &GUID_WICPixelFormat32bppBGRA, WICBitmapCacheOnLoad, bitmap); + if (hr != S_OK) goto failed; + + hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock); + if (hr != S_OK) + { + IWICBitmap_Release(*bitmap); + goto failed; + } + IWICBitmapLock_GetDataPointer(lock, &size, &buffer); + + hdc = CreateCompatibleDC(0); + + memset(&bi, 0, sizeof(bi)); + bi.bmiHeader.biSize = sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth = width; + bi.bmiHeader.biHeight = -height; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + bi.bmiHeader.biCompression = BI_RGB; + + has_alpha = FALSE; + + if (info.hbmColor) + { + GetDIBits(hdc, info.hbmColor, 0, height, buffer, &bi, DIB_RGB_COLORS); + + if (bm.bmBitsPixel == 32) + { + /* If any pixel has a non-zero alpha, ignore hbmMask */ + bits = (DWORD *)buffer; + for (x = 0; x < width && !has_alpha; x++, bits++) + { + for (y = 0; y < height; y++) + { + if (*bits & 0xff000000) + { + has_alpha = TRUE; + break; + } + } + } + } + } + else + GetDIBits(hdc, info.hbmMask, 0, height, buffer, &bi, DIB_RGB_COLORS); + + if (!has_alpha) + { + DWORD *rgba; + + if (info.hbmMask) + { + BYTE *mask; + + mask = HeapAlloc(GetProcessHeap(), 0, size); + if (!mask) + { + IWICBitmapLock_Release(lock); + IWICBitmap_Release(*bitmap); + DeleteDC(hdc); + hr = E_OUTOFMEMORY; + goto failed; + } + + /* read alpha data from the mask */ + GetDIBits(hdc, info.hbmMask, info.hbmColor ? 0 : height, height, mask, &bi, DIB_RGB_COLORS); + + for (y = 0; y < height; y++) + { + rgba = (DWORD *)(buffer + y * stride); + bits = (DWORD *)(mask + y * stride); + + for (x = 0; x < width; x++, rgba++, bits++) + { + if (!info.hbmColor) *rgba = ~*rgba; + + if (*bits) + *rgba = 0; + else + *rgba |= 0xff000000; + } + } + + HeapFree(GetProcessHeap(), 0, mask); + } + else + { + /* set constant alpha of 255 */ + for (y = 0; y < height; y++) + { + rgba = (DWORD *)(buffer + y * stride); + for (x = 0; x < width; x++, rgba++) + *rgba |= 0xff000000; + } + } + + } + + IWICBitmapLock_Release(lock); + DeleteDC(hdc); + +failed: + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + + return hr; } static HRESULT WINAPI ComponentFactory_CreateComponentEnumerator(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 40b8ce6..fb7183b 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -529,19 +529,15 @@ static void test_CreateBitmapFromHICON(void) DeleteObject(info.hbmMask); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, NULL); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, &bitmap); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_CURSOR_HANDLE), "expected ERROR_INVALID_CURSOR_HANDLE, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, NULL); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, &bitmap); -todo_wine ok(hr == S_OK, "CreateBitmapFromHICON error %#x\n", hr); DestroyIcon(icon); if (hr != S_OK) return;

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_GetName.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: f8d908938a4d282ee3cc48fa58e2c55b0e610bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d908938a4d282ee3cc48fa5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 14 10:20:54 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_GetName. --- dlls/d3dx9_36/xfile.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 8fa20ff..63d85b6 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -137,9 +137,24 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetEnum(ID3DXFileData *iface, ID3DXFileE static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name, SIZE_T *size) { - FIXME("(%p)->(%p, %p): stub\n", iface, name, size); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + DWORD dxfile_size; + HRESULT ret; - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", iface, name, size); + + if (!name || !size) + return E_POINTER; + + dxfile_size = *size; + + ret = IDirectXFileData_GetName(This->dxfile_data, name, &dxfile_size); + if (ret != DXFILE_OK) + return error_dxfile_to_d3dxfile(ret); + + *size = dxfile_size; + + return S_OK; }

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_GetId.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: fc8dfe60ea517d63f8ea01584b26bda1fe36f0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8dfe60ea517d63f8ea01584… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 14 10:21:03 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_GetId. --- dlls/d3dx9_36/xfile.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 63d85b6..234e071 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -160,9 +160,19 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name static HRESULT WINAPI ID3DXFileDataImpl_GetId(ID3DXFileData *iface, GUID *guid) { - FIXME("(%p)->(%p): stub\n", iface, guid); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + HRESULT ret; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, guid); + + if (!guid) + return E_POINTER; + + ret = IDirectXFileData_GetId(This->dxfile_data, guid); + if (ret != DXFILE_OK) + return error_dxfile_to_d3dxfile(ret); + + return S_OK; }

1 0

Piotr Caban : msvcrt: Be less strict while parsing file open mode in fopen function.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 5515170d136dfd639b16b409434c5a182174315d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5515170d136dfd639b16b4094… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 14 10:24:18 2013 +0100 msvcrt: Be less strict while parsing file open mode in fopen function. --- dlls/msvcrt/file.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 60af1a7..f0d0f7d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1263,6 +1263,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st TRACE("%s\n", debugstr_w(mode)); + while(*mode == ' ') mode++; + switch(*mode++) { case 'R': case 'r': @@ -1301,6 +1303,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st break; case '+': case ' ': + case 'a': + case 'w': break; default: MSVCRT_INVALID_PMT(0, MSVCRT_EINVAL);

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::GetClassName.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 5a12f6c088d06ae66b4e282cfa29e4faf6aa1397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a12f6c088d06ae66b4e282cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 14 10:51:24 2013 +0100 wmiutils: Implement IWbemPath::GetClassName. --- dlls/wmiutils/path.c | 15 ++++++-- dlls/wmiutils/tests/path.c | 87 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 80 insertions(+), 22 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index c146671..5075bfc 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -547,11 +547,18 @@ static HRESULT WINAPI path_SetClassName( static HRESULT WINAPI path_GetClassName( IWbemPath *iface, - ULONG *puBufferLength, - LPWSTR pszName) + ULONG *len, + LPWSTR name) { - FIXME("%p,%p, %p\n", iface, puBufferLength, pszName); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, %p, %p\n", iface, len, name); + + if (!len || (*len && !name)) return WBEM_E_INVALID_PARAMETER; + if (!path->class) return WBEM_E_INVALID_OBJECT_PATH; + if (*len > path->len_class) strcpyW( name, path->class ); + *len = path->len_class + 1; + return S_OK; } static HRESULT WINAPI path_GetKeyList( diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 6824d25..affd408 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -61,6 +61,20 @@ static const WCHAR path17[] = {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=','"','C',':','"',0}; +static IWbemPath *create_path(void) +{ + HRESULT hr; + IWbemPath *path; + + hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemPath, (void **)&path ); + if (hr != S_OK) + { + win_skip( "can't create WbemDefPath instance, skipping tests\n" ); + return NULL; + } + return path; +} + static void test_IWbemPath_SetText(void) { static const struct @@ -102,13 +116,7 @@ static void test_IWbemPath_SetText(void) HRESULT hr; UINT i; - CoInitialize( NULL ); - hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemPath, (void **)&path ); - if (hr != S_OK) - { - win_skip( "can't create WbemDefPath instance, skipping tests\n" ); - return; - } + if (!(path = create_path())) return; hr = IWbemPath_SetText( path, 0, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); @@ -135,25 +143,17 @@ static void test_IWbemPath_SetText(void) ok( len == lstrlenW( test[i].path ) + 1, "%u unexpected length %u\n", i, len ); } } - IWbemPath_Release( path ); - CoUninitialize(); } static void test_IWbemPath_GetText(void) { - IWbemPath *path; WCHAR buf[128]; ULONG len, count; + IWbemPath *path; HRESULT hr; - CoInitialize( NULL ); - hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemPath, (void **)&path ); - if (hr != S_OK) - { - win_skip( "can't create WbemDefPath instance, skipping tests\n" ); - return; - } + if (!(path = create_path())) return; hr = IWbemPath_GetText( path, 0, NULL, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); @@ -274,11 +274,62 @@ static void test_IWbemPath_GetText(void) todo_wine ok( len == lstrlenW( path17 ) + 1, "unexpected length %u\n", len ); IWbemPath_Release( path ); - CoUninitialize(); +} + +static void test_IWbemPath_GetClassName(void) +{ + static const WCHAR classW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; + IWbemPath *path; + HRESULT hr; + WCHAR buf[32]; + ULONG len; + + if (!(path = create_path())) return; + + hr = IWbemPath_GetClassName( path, NULL, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, buf ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( classW ) + 1, "unexpected length %u\n", len ); + + IWbemPath_Release( path ); } START_TEST (path) { + CoInitialize( NULL ); + test_IWbemPath_SetText(); test_IWbemPath_GetText(); + test_IWbemPath_GetClassName(); + + CoUninitialize(); }

1 0