February 2013 - Wine-Commits

Ken Thomases : winemac: Implement Beep().
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 3fcb69b7ca0c2f301b278949f80d3e09f904e18b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fcb69b7ca0c2f301b278949f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 04:36:49 2013 -0600 winemac: Implement Beep(). --- dlls/winemac.drv/cocoa_app.m | 12 ++++++++++++ dlls/winemac.drv/keyboard.c | 9 +++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index cd09f95..3853ec9 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -373,3 +373,15 @@ CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard_type, return result; } + +/*********************************************************************** + * macdrv_beep + * + * Play the beep sound configured by the user in System Preferences. + */ +void macdrv_beep(void) +{ + OnMainThreadAsync(^{ + NSBeep(); + }); +} diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index b41f55a..d67a20c 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -765,6 +765,15 @@ void macdrv_keyboard_changed(const macdrv_event *event) /*********************************************************************** + * Beep (MACDRV.@) + */ +void CDECL macdrv_Beep(void) +{ + macdrv_beep(); +} + + +/*********************************************************************** * ToUnicodeEx (MACDRV.@) * * The ToUnicode function translates the specified virtual-key code and keyboard diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 62bc996..242a78e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -115,6 +115,7 @@ extern int macdrv_err_on; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_beep(void) DECLSPEC_HIDDEN; /* display */ diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index a227187..f4502ea 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -4,6 +4,7 @@ # USER driver +@ cdecl Beep() macdrv_Beep @ cdecl CreateDesktopWindow(long) macdrv_CreateDesktopWindow @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyWindow(long) macdrv_DestroyWindow

1 0

Alexandre Julliard : wintab32: Retrieve the graphics driver module from gdi32.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 0e5f84a148a33f60567bc29a8ae371ac572adc81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5f84a148a33f60567bc29a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 13:19:43 2013 +0100 wintab32: Retrieve the graphics driver module from gdi32. --- dlls/wintab32/Makefile.in | 2 +- dlls/wintab32/wintab32.c | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index 7425c7d..ab71e45 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -1,6 +1,6 @@ MODULE = wintab32.dll IMPORTLIB = wintab32 -IMPORTS = user32 +IMPORTS = user32 gdi32 C_SRCS = \ context.c \ diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 50daebd..51cba6a 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -25,8 +25,10 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" +#define NOFIX32 #include "wintab.h" #include "wintab_internal.h" +#include "wine/gdi_driver.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintab32); @@ -72,7 +74,6 @@ static VOID TABLET_Unregister(void) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { static const WCHAR name[] = {'T','a','b','l','e','t',0}; - HMODULE hx11drv; TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) @@ -80,16 +81,19 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) case DLL_PROCESS_ATTACH: TRACE("Initialization\n"); DisableThreadLibraryCalls(hInstDLL); - hx11drv = GetModuleHandleA("winex11.drv"); - if (hx11drv) + TABLET_Register(); + hwndDefault = CreateWindowW(WC_TABLETCLASSNAME, name, + WS_POPUPWINDOW,0,0,0,0,0,0,hInstDLL,0); + if (hwndDefault) { - pLoadTabletInfo = (void *)GetProcAddress(hx11drv, "LoadTabletInfo"); - pAttachEventQueueToTablet = (void *)GetProcAddress(hx11drv, "AttachEventQueueToTablet"); - pGetCurrentPacket = (void *)GetProcAddress(hx11drv, "GetCurrentPacket"); - pWTInfoW = (void *)GetProcAddress(hx11drv, "WTInfoW"); - TABLET_Register(); - hwndDefault = CreateWindowW(WC_TABLETCLASSNAME, name, - WS_POPUPWINDOW,0,0,0,0,0,0,hInstDLL,0); + HDC hdc = GetDC( hwndDefault ); + HMODULE module = __wine_get_driver_module( hdc ); + + pLoadTabletInfo = (void *)GetProcAddress(module, "LoadTabletInfo"); + pAttachEventQueueToTablet = (void *)GetProcAddress(module, "AttachEventQueueToTablet"); + pGetCurrentPacket = (void *)GetProcAddress(module, "GetCurrentPacket"); + pWTInfoW = (void *)GetProcAddress(module, "WTInfoW"); + ReleaseDC( hwndDefault, hdc ); } else return FALSE;

1 0

Alexandre Julliard : gdi32: Return the correct module handle for the initial display driver load.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 0d7108c6299588c047edb93b69ee9ad43f441a93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7108c6299588c047edb93b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 12:21:33 2013 +0100 gdi32: Return the correct module handle for the initial display driver load. --- dlls/gdi32/driver.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 82706c3..70208fb 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -100,11 +100,7 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) HMODULE module = 0; HKEY hkey; - if (display_driver) - { - *module_ret = display_driver->module; - return display_driver->funcs; /* already loaded */ - } + if (display_driver) goto done; strcpy( buffer, "x11" ); /* default value */ /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ @@ -140,6 +136,8 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) FreeLibrary( driver->module ); HeapFree( GetProcessHeap(), 0, driver ); } +done: + *module_ret = display_driver->module; return display_driver->funcs; }

1 0

Hans Leidekker : wbemprox: Trace the qualifier value in IWbemClassObject:: GetNames.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 0fb34587283e39bcb0d7ad7e9f6f102f8e41d7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb34587283e39bcb0d7ad7e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 6 13:54:06 2013 +0100 wbemprox: Trace the qualifier value in IWbemClassObject::GetNames. --- dlls/wbemprox/class.c | 3 ++- dlls/wbemprox/wbemprox_private.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 62cf332..d516efb 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -474,7 +474,8 @@ static HRESULT WINAPI class_object_GetNames( struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszQualifierName), lFlags, pQualifierVal, pNames); + TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, + debugstr_variant(pQualifierVal), pNames); if (wszQualifierName || pQualifierVal) { diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index f1d4119..efdde76 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/debug.h" #include "wine/list.h" #include "wine/unicode.h" @@ -239,6 +240,37 @@ static inline WCHAR *heap_strdupW( const WCHAR *src ) return dst; } +static inline const char *debugstr_variant( const VARIANT *v ) +{ + if (!v) return "(null)"; + switch (V_VT(v)) + { + case VT_EMPTY: + return "{VT_EMPTY}"; + case VT_NULL: + return "{VT_NULL}"; + case VT_I4: + return wine_dbg_sprintf( "{VT_I4: %d}", V_I4(v) ); + case VT_R8: + return wine_dbg_sprintf( "{VT_R8: %lf}", V_R8(v) ); + case VT_BSTR: + return wine_dbg_sprintf( "{VT_BSTR: %s}", debugstr_w(V_BSTR(v)) ); + case VT_DISPATCH: + return wine_dbg_sprintf( "{VT_DISPATCH: %p}", V_DISPATCH(v) ); + case VT_BOOL: + return wine_dbg_sprintf( "{VT_BOOL: %x}", V_BOOL(v) ); + case VT_UNKNOWN: + return wine_dbg_sprintf( "{VT_UNKNOWN: %p}", V_UNKNOWN(v) ); + case VT_UINT: + return wine_dbg_sprintf( "{VT_UINT: %u}", V_UINT(v) ); + case VT_BSTR|VT_BYREF: + return wine_dbg_sprintf( "{VT_BSTR|VT_BYREF: ptr %p, data %s}", + V_BSTRREF(v), V_BSTRREF(v) ? debugstr_w( *V_BSTRREF(v) ) : NULL ); + default: + return wine_dbg_sprintf( "{vt %d}", V_VT(v) ); + } +} + static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR class_serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; static const WCHAR class_stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0};

1 0

Michael Stefaniuc : ieframe: Let C look like C.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 0c183c4e7917c1c560d4b5e5da51a84ec2b7bdd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c183c4e7917c1c560d4b5e5d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 10:59:50 2013 +0100 ieframe: Let C look like C. --- dlls/ieframe/intshcut.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 71373c7..d4b71a7 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -613,7 +613,7 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, STGM_READ|STGM_SHARE_EXCLUSIVE, &pPropStgRead); - if SUCCEEDED(hr) + if (SUCCEEDED(hr)) { hr = IPropertyStorage_ReadMultiple(pPropStgRead, 2, ps, pvread); if (hr == S_FALSE) @@ -622,7 +622,7 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam hr = S_OK; IPropertyStorage_Release(pPropStgRead); } - else if SUCCEEDED(hr) + else if (SUCCEEDED(hr)) { char indexString[50]; len = WideCharToMultiByte(CP_UTF8, 0, pvread[0].u.pwszVal, -1, NULL, 0, 0, 0); @@ -819,7 +819,7 @@ static InternetShortcut *create_shortcut(void) newshortcut->refCount = 1; hr = StgCreateStorageEx(NULL, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, STGFMT_STORAGE, 0, NULL, NULL, &IID_IPropertySetStorage, (void **) &newshortcut->property_set_storage); - if FAILED(hr) + if (FAILED(hr)) { TRACE("Failed to create the storage object needed for the shortcut.\n"); heap_free(newshortcut); @@ -827,7 +827,7 @@ static InternetShortcut *create_shortcut(void) } hr = IPropertySetStorage_Create(newshortcut->property_set_storage, &FMTID_Intshcut, NULL, PROPSETFLAG_DEFAULT, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &dummy); - if FAILED(hr) + if (FAILED(hr)) { TRACE("Failed to create the property object needed for the shortcut.\n"); IPropertySetStorage_Release(newshortcut->property_set_storage);

1 0

Hans Leidekker : windowscodecs: Implement IWICComponentFactory:: CreateDecoderFromFileHandle.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: ba02cb25d363cbe19d435dd95d96f0f40a7612be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba02cb25d363cbe19d435dd95… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 6 13:53:21 2013 +0100 windowscodecs: Implement IWICComponentFactory::CreateDecoderFromFileHandle. --- dlls/windowscodecs/imgfactory.c | 19 +++- dlls/windowscodecs/stream.c | 239 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 2 + 3 files changed, 258 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 223b041..9a6c818 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -238,9 +238,24 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromFileHandle( IWICComponentFactory *iface, ULONG_PTR hFile, const GUID *pguidVendor, WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder) { - FIXME("(%p,%lx,%s,%u,%p): stub\n", iface, hFile, debugstr_guid(pguidVendor), + IWICStream *stream; + HRESULT hr; + + TRACE("(%p,%lx,%s,%u,%p)\n", iface, hFile, debugstr_guid(pguidVendor), metadataOptions, ppIDecoder); - return E_NOTIMPL; + + hr = StreamImpl_Create(&stream); + if (SUCCEEDED(hr)) + { + hr = stream_initialize_from_filehandle(stream, (HANDLE)hFile); + if (SUCCEEDED(hr)) + { + hr = IWICComponentFactory_CreateDecoderFromStream(iface, (IStream*)stream, + pguidVendor, metadataOptions, ppIDecoder); + } + IWICStream_Release(stream); + } + return hr; } static HRESULT WINAPI ComponentFactory_CreateComponentInfo(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index a123b9d..f6bfedf 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -264,6 +264,175 @@ static const IStreamVtbl StreamOnMemory_Vtbl = }; /****************************************** + * StreamOnFileHandle implementation (internal) + * + */ +typedef struct StreamOnFileHandle { + IStream IStream_iface; + LONG ref; + + HANDLE map; + void *mem; + IWICStream *stream; +} StreamOnFileHandle; + +static inline StreamOnFileHandle *StreamOnFileHandle_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, StreamOnFileHandle, IStream_iface); +} + +static HRESULT WINAPI StreamOnFileHandle_QueryInterface(IStream *iface, + REFIID iid, void **ppv) +{ + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IStream, iid) || + IsEqualIID(&IID_ISequentialStream, iid)) + { + *ppv = iface; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } +} + +static ULONG WINAPI StreamOnFileHandle_AddRef(IStream *iface) +{ + StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI StreamOnFileHandle_Release(IStream *iface) +{ + StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) { + IWICStream_Release(This->stream); + UnmapViewOfFile(This->mem); + CloseHandle(This->map); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI StreamOnFileHandle_Read(IStream *iface, + void *pv, ULONG cb, ULONG *pcbRead) +{ + StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); + TRACE("(%p)\n", This); + + return IWICStream_Read(This->stream, pv, cb, pcbRead); +} + +static HRESULT WINAPI StreamOnFileHandle_Write(IStream *iface, + void const *pv, ULONG cb, ULONG *pcbWritten) +{ + ERR("(%p)\n", iface); + return HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED); +} + +static HRESULT WINAPI StreamOnFileHandle_Seek(IStream *iface, + LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +{ + StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); + TRACE("(%p)\n", This); + + return IWICStream_Seek(This->stream, dlibMove, dwOrigin, plibNewPosition); +} + +static HRESULT WINAPI StreamOnFileHandle_SetSize(IStream *iface, + ULARGE_INTEGER libNewSize) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_CopyTo(IStream *iface, + IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_Commit(IStream *iface, + DWORD grfCommitFlags) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_Revert(IStream *iface) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_LockRegion(IStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_UnlockRegion(IStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI StreamOnFileHandle_Stat(IStream *iface, + STATSTG *pstatstg, DWORD grfStatFlag) +{ + StreamOnFileHandle *This = StreamOnFileHandle_from_IStream(iface); + TRACE("(%p)\n", This); + + return IWICStream_Stat(This->stream, pstatstg, grfStatFlag); +} + +static HRESULT WINAPI StreamOnFileHandle_Clone(IStream *iface, + IStream **ppstm) +{ + TRACE("(%p)\n", iface); + return E_NOTIMPL; +} + + +static const IStreamVtbl StreamOnFileHandle_Vtbl = +{ + /*** IUnknown methods ***/ + StreamOnFileHandle_QueryInterface, + StreamOnFileHandle_AddRef, + StreamOnFileHandle_Release, + /*** ISequentialStream methods ***/ + StreamOnFileHandle_Read, + StreamOnFileHandle_Write, + /*** IStream methods ***/ + StreamOnFileHandle_Seek, + StreamOnFileHandle_SetSize, + StreamOnFileHandle_CopyTo, + StreamOnFileHandle_Commit, + StreamOnFileHandle_Revert, + StreamOnFileHandle_LockRegion, + StreamOnFileHandle_UnlockRegion, + StreamOnFileHandle_Stat, + StreamOnFileHandle_Clone, +}; + +/****************************************** * StreamOnStreamRange implementation * * Used by IWICStream_InitializeFromIStreamRegion @@ -825,6 +994,76 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromMemory(IWICStream *iface, return S_OK; } +static HRESULT map_file(HANDLE file, HANDLE *map, void **mem, LARGE_INTEGER *size) +{ + *map = NULL; + if (!GetFileSizeEx(file, size)) return HRESULT_FROM_WIN32(GetLastError()); + if (size->u.HighPart) + { + WARN("file too large\n"); + return E_FAIL; + } + if (!(*map = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, size->u.LowPart, NULL))) + { + return HRESULT_FROM_WIN32(GetLastError()); + } + if (!(*mem = MapViewOfFile(*map, FILE_MAP_READ, 0, 0, size->u.LowPart))) + { + CloseHandle(*map); + return HRESULT_FROM_WIN32(GetLastError()); + } + return S_OK; +} + +HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE file) +{ + IWICStreamImpl *This = impl_from_IWICStream(iface); + StreamOnFileHandle *pObject; + IWICStream *stream = NULL; + HANDLE map; + void *mem; + LARGE_INTEGER size; + HRESULT hr; + TRACE("(%p,%p)\n", iface, file); + + if (This->pStream) return WINCODEC_ERR_WRONGSTATE; + + hr = map_file(file, &map, &mem, &size); + if (FAILED(hr)) return hr; + + hr = StreamImpl_Create(&stream); + if (FAILED(hr)) goto error; + + hr = IWICStreamImpl_InitializeFromMemory(stream, mem, size.u.LowPart); + if (FAILED(hr)) goto error; + + pObject = HeapAlloc(GetProcessHeap(), 0, sizeof(StreamOnFileHandle)); + if (!pObject) + { + hr = E_OUTOFMEMORY; + goto error; + } + pObject->IStream_iface.lpVtbl = &StreamOnFileHandle_Vtbl; + pObject->ref = 1; + pObject->map = map; + pObject->mem = mem; + pObject->stream = stream; + + if (InterlockedCompareExchangePointer((void**)&This->pStream, pObject, NULL)) + { + /* Some other thread set the stream first. */ + IStream_Release(&pObject->IStream_iface); + return WINCODEC_ERR_WRONGSTATE; + } + return S_OK; + +error: + if (stream) IWICStream_Release(stream); + UnmapViewOfFile(mem); + CloseHandle(map); + return hr; +} + static HRESULT WINAPI IWICStreamImpl_InitializeFromIStreamRegion(IWICStream *iface, IStream *pIStream, ULARGE_INTEGER ulOffset, ULARGE_INTEGER ulMaxSize) { diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 8eae4a7..dddb327 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -105,4 +105,6 @@ extern HRESULT GCEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void ** extern HRESULT APEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GifCommentReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE hfile) DECLSPEC_HIDDEN; + #endif /* WINCODECS_PRIVATE_H */

1 0

Hans Leidekker : windowscodecs: Add a stub IWICColorTransform implementation.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: d9bfbd61d811b9e26e368a784575bbcf643b6bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9bfbd61d811b9e26e368a784… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 6 13:52:09 2013 +0100 windowscodecs: Add a stub IWICColorTransform implementation. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/colortransform.c | 166 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 170 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index ffe0925..4035279 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ bmpencode.c \ clsfactory.c \ colorcontext.c \ + colortransform.c \ converter.c \ fliprotate.c \ gifformat.c \ diff --git a/dlls/windowscodecs/colortransform.c b/dlls/windowscodecs/colortransform.c new file mode 100644 index 0000000..dae4f38 --- /dev/null +++ b/dlls/windowscodecs/colortransform.c @@ -0,0 +1,166 @@ +/* + * Copyright 2013 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct ColorTransform { + IWICColorTransform IWICColorTransform_iface; + LONG ref; +} ColorTransform; + +static inline ColorTransform *impl_from_IWICColorTransform(IWICColorTransform *iface) +{ + return CONTAINING_RECORD(iface, ColorTransform, IWICColorTransform_iface); +} + +static HRESULT WINAPI ColorTransform_QueryInterface(IWICColorTransform *iface, REFIID iid, + void **ppv) +{ + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICColorTransform, iid)) + { + *ppv = &This->IWICColorTransform_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ColorTransform_AddRef(IWICColorTransform *iface) +{ + ColorTransform *This = impl_from_IWICColorTransform(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ColorTransform_Release(IWICColorTransform *iface) +{ + ColorTransform *This = impl_from_IWICColorTransform(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 ColorTransform_GetSize(IWICColorTransform *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p)\n", iface, puiWidth, puiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorTransform_GetPixelFormat(IWICColorTransform *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%p)\n", iface, pPixelFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorTransform_GetResolution(IWICColorTransform *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p)\n", iface, pDpiX, pDpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorTransform_CopyPalette(IWICColorTransform *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p)\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorTransform_CopyPixels(IWICColorTransform *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + FIXME("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorTransform_Initialize(IWICColorTransform *iface, + IWICBitmapSource *pIBitmapSource, IWICColorContext *pIContextSource, + IWICColorContext *pIContextDest, REFWICPixelFormatGUID pixelFmtDest) +{ + FIXME("(%p,%p,%p,%p,%s)\n", iface, pIBitmapSource, pIContextSource, + pIContextDest, debugstr_guid(pixelFmtDest)); + return E_NOTIMPL; +} + +static const IWICColorTransformVtbl ColorTransform_Vtbl = { + ColorTransform_QueryInterface, + ColorTransform_AddRef, + ColorTransform_Release, + ColorTransform_GetSize, + ColorTransform_GetPixelFormat, + ColorTransform_GetResolution, + ColorTransform_CopyPalette, + ColorTransform_CopyPixels, + ColorTransform_Initialize +}; + +HRESULT ColorTransform_Create(IWICColorTransform **colortransform) +{ + ColorTransform *This; + + if (!colortransform) return E_INVALIDARG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(ColorTransform)); + if (!This) return E_OUTOFMEMORY; + + This->IWICColorTransform_iface.lpVtbl = &ColorTransform_Vtbl; + This->ref = 1; + + *colortransform = &This->IWICColorTransform_iface; + + return S_OK; +} diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 7965c55..223b041 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -450,8 +450,8 @@ static HRESULT WINAPI ComponentFactory_CreateColorContext(IWICComponentFactory * static HRESULT WINAPI ComponentFactory_CreateColorTransformer(IWICComponentFactory *iface, IWICColorTransform **ppIColorTransform) { - FIXME("(%p,%p): stub\n", iface, ppIColorTransform); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIColorTransform); + return ColorTransform_Create(ppIColorTransform); } static HRESULT WINAPI ComponentFactory_CreateBitmap(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 617db71..8eae4a7 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -53,6 +53,7 @@ extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) DECLSPEC_ extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN; extern HRESULT StreamImpl_Create(IWICStream **stream) DECLSPEC_HIDDEN; extern HRESULT ColorContext_Create(IWICColorContext **context) DECLSPEC_HIDDEN; +extern HRESULT ColorTransform_Create(IWICColorTransform **transform) DECLSPEC_HIDDEN; extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride,

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext:: InitializeFromFilename.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: b64eb8a8d635f519f994b6bceea2a15d8f41dc5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b64eb8a8d635f519f994b6bce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 6 13:51:32 2013 +0100 windowscodecs: Implement IWICColorContext::InitializeFromFilename. --- dlls/windowscodecs/colorcontext.c | 69 ++++++++++++++++++++++++++++++--- dlls/windowscodecs/tests/pngformat.c | 61 ++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 457b4db..ca40184 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -96,27 +96,82 @@ static ULONG WINAPI ColorContext_Release(IWICColorContext *iface) return ref; } +static HRESULT load_profile(const WCHAR *filename, BYTE **profile, UINT *len) +{ + HANDLE handle; + DWORD count; + LARGE_INTEGER size; + BOOL ret; + + *len = 0; + *profile = NULL; + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (handle == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); + + if (!(GetFileSizeEx(handle, &size))) + { + CloseHandle(handle); + return HRESULT_FROM_WIN32(GetLastError()); + } + if (size.u.HighPart) + { + WARN("file too large\n"); + CloseHandle(handle); + return E_FAIL; + } + if (!(*profile = HeapAlloc(GetProcessHeap(), 0, size.u.LowPart))) + { + CloseHandle(handle); + return E_OUTOFMEMORY; + } + ret = ReadFile(handle, *profile, size.u.LowPart, &count, NULL); + CloseHandle(handle); + if (!ret) return HRESULT_FROM_WIN32(GetLastError()); + if (count != size.u.LowPart) return E_FAIL; + *len = count; + return S_OK; +} + static HRESULT WINAPI ColorContext_InitializeFromFilename(IWICColorContext *iface, LPCWSTR wzFilename) { - FIXME("(%p,%s)\n", iface, debugstr_w(wzFilename)); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + BYTE *profile; + UINT len; + HRESULT hr; + TRACE("(%p,%s)\n", iface, debugstr_w(wzFilename)); + + if (This->type != WICColorContextUninitialized && This->type != WICColorContextProfile) + return WINCODEC_ERR_WRONGSTATE; + + if (!wzFilename) return E_INVALIDARG; + + hr = load_profile(wzFilename, &profile, &len); + if (FAILED(hr)) return hr; + + HeapFree(GetProcessHeap(), 0, This->profile); + This->profile = profile; + This->profile_len = len; + This->type = WICColorContextProfile; + + return S_OK; } static HRESULT WINAPI ColorContext_InitializeFromMemory(IWICColorContext *iface, const BYTE *pbBuffer, UINT cbBufferSize) { ColorContext *This = impl_from_IWICColorContext(iface); + BYTE *profile; TRACE("(%p,%p,%u)\n", iface, pbBuffer, cbBufferSize); - if (This->type != WICColorContextUninitialized) + if (This->type != WICColorContextUninitialized && This->type != WICColorContextProfile) return WINCODEC_ERR_WRONGSTATE; - HeapFree(GetProcessHeap(), 0, This->profile); - if (!(This->profile = HeapAlloc(GetProcessHeap(), 0, cbBufferSize))) - return E_OUTOFMEMORY; + if (!(profile = HeapAlloc(GetProcessHeap(), 0, cbBufferSize))) return E_OUTOFMEMORY; + memcpy(profile, pbBuffer, cbBufferSize); - memcpy(This->profile, pbBuffer, cbBufferSize); + HeapFree(GetProcessHeap(), 0, This->profile); + This->profile = profile; This->profile_len = cbBufferSize; This->type = WICColorContextProfile; diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 3f4e855..b21f5f7 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -317,6 +317,27 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size return decoder; } +static WCHAR *save_profile( BYTE *buffer, UINT size ) +{ + static const WCHAR tstW[] = {'t','s','t',0}; + WCHAR path[MAX_PATH], filename[MAX_PATH], *ret; + HANDLE handle; + DWORD count; + + GetTempPathW(MAX_PATH, path); + GetTempFileNameW(path, tstW, 0, filename); + + handle = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if (handle == INVALID_HANDLE_VALUE) return NULL; + + WriteFile(handle, buffer, size, &count, NULL); + CloseHandle( handle ); + + ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); + lstrcpyW(ret, filename); + return ret; +} + static void test_color_contexts(void) { HRESULT hr; @@ -325,7 +346,9 @@ static void test_color_contexts(void) IWICColorContext *context; WICColorContextType type; UINT count, colorspace, size; + WCHAR *tmpfile; BYTE *buffer; + BOOL ret; decoder = create_decoder(png_no_color_profile, sizeof(png_no_color_profile)); ok(decoder != 0, "Failed to load PNG image data\n"); @@ -453,6 +476,8 @@ static void test_color_contexts(void) buffer = HeapAlloc(GetProcessHeap(), 0, size); hr = IWICColorContext_GetProfileBytes(context, size, buffer, &size); ok(hr == S_OK, "GetProfileBytes error %#x\n", hr); + + tmpfile = save_profile( buffer, size ); HeapFree(GetProcessHeap(), 0, buffer); type = 0xdeadbeef; @@ -468,6 +493,42 @@ static void test_color_contexts(void) hr = IWICColorContext_InitializeFromExifColorSpace(context, 1); ok(hr == WINCODEC_ERR_WRONGSTATE, "InitializeFromExifColorSpace error %#x\n", hr); + if (tmpfile) + { + hr = IWICColorContext_InitializeFromFilename(context, NULL); + ok(hr == E_INVALIDARG, "InitializeFromFilename error %#x\n", hr); + + hr = IWICColorContext_InitializeFromFilename(context, tmpfile); + ok(hr == S_OK, "InitializeFromFilename error %#x\n", hr); + + ret = DeleteFileW(tmpfile); + ok(ret, "DeleteFileW failed %u\n", GetLastError()); + + type = 0xdeadbeef; + hr = IWICColorContext_GetType(context, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICColorContextProfile, "unexpected type %u\n", type); + + colorspace = 0xdeadbeef; + hr = IWICColorContext_GetExifColorSpace(context, &colorspace); + ok(hr == S_OK, "GetExifColorSpace error %#x\n", hr); + ok(colorspace == 0xffffffff, "unexpected color space %u\n", colorspace); + + hr = IWICColorContext_InitializeFromExifColorSpace(context, 1); + ok(hr == WINCODEC_ERR_WRONGSTATE, "InitializeFromExifColorSpace error %#x\n", hr); + + size = 0; + hr = IWICColorContext_GetProfileBytes(context, 0, NULL, &size); + ok(hr == S_OK, "GetProfileBytes error %#x\n", hr); + ok(size, "unexpected size %u\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + hr = IWICColorContext_GetProfileBytes(context, size, buffer, &size); + ok(hr == S_OK, "GetProfileBytes error %#x\n", hr); + + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, tmpfile); + } IWICColorContext_Release(context); IWICBitmapFrameDecode_Release(frame); IWICBitmapDecoder_Release(decoder);

1 0

Ken Thomases : winemac: Implement fake support for the active Windows keyboard layout.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 956ec4320174f003d753d2e94213f9c58b23d0e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956ec4320174f003d753d2e94… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 04:37:04 2013 -0600 winemac: Implement fake support for the active Windows keyboard layout. --- dlls/winemac.drv/keyboard.c | 127 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/winemac.drv.spec | 3 + 3 files changed, 131 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index ae8df76..7b773e3 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -847,6 +847,93 @@ void macdrv_keyboard_changed(const macdrv_event *event) /*********************************************************************** + * get_locale_keyboard_layout + */ +static HKL get_locale_keyboard_layout(void) +{ + ULONG_PTR layout; + LANGID langid; + + layout = GetUserDefaultLCID(); + + /* + * Microsoft Office expects this value to be something specific + * for Japanese and Korean Windows with an IME the value is 0xe001 + * We should probably check to see if an IME exists and if so then + * set this word properly. + */ + langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + layout |= 0xe001 << 16; /* IME */ + else + layout |= layout << 16; + + return (HKL)layout; +} + + +/*********************************************************************** + * match_keyboard_layout + */ +static BOOL match_keyboard_layout(HKL hkl) +{ + const DWORD isIME = 0xE0000000; + HKL current_hkl = get_locale_keyboard_layout(); + + /* if the layout is an IME, only match the low word (LCID) */ + if (((ULONG_PTR)hkl & isIME) == isIME) + return (LOWORD(hkl) == LOWORD(current_hkl)); + else + return (hkl == current_hkl); +} + + +/*********************************************************************** + * ActivateKeyboardLayout (MACDRV.@) + */ +HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) +{ + HKL oldHkl = 0; + struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); + + /* FIXME: Use Text Input Services or NSTextInputContext to actually + change the Mac keyboard input source. */ + + FIXME("hkl %p flags %04x: semi-stub!\n", hkl, flags); + if (flags & KLF_SETFORPROCESS) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + FIXME("KLF_SETFORPROCESS not supported\n"); + return 0; + } + + if (flags) + FIXME("flags %x not supported\n",flags); + + if (hkl == (HKL)HKL_NEXT || hkl == (HKL)HKL_PREV) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + FIXME("HKL_NEXT and HKL_PREV not supported\n"); + return 0; + } + + if (!match_keyboard_layout(hkl)) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + FIXME("setting keyboard of different locales not supported\n"); + return 0; + } + + oldHkl = thread_data->active_keyboard_layout; + if (!oldHkl) oldHkl = get_locale_keyboard_layout(); + + thread_data->active_keyboard_layout = hkl; + + return oldHkl; +} + + +/*********************************************************************** * Beep (MACDRV.@) */ void CDECL macdrv_Beep(void) @@ -945,6 +1032,46 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) /*********************************************************************** + * GetKeyboardLayout (MACDRV.@) + */ +HKL CDECL macdrv_GetKeyboardLayout(DWORD thread_id) +{ + if (!thread_id || thread_id == GetCurrentThreadId()) + { + struct macdrv_thread_data *thread_data = macdrv_thread_data(); + if (thread_data && thread_data->active_keyboard_layout) + return thread_data->active_keyboard_layout; + } + else + FIXME("couldn't return keyboard layout for thread %04x\n", thread_id); + + /* FIXME: Use TISGetInputSourceProperty() and kTISPropertyInputSourceLanguages + * to get input source language ID string. Use + * CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier() to convert that + * to a Windows locale ID and from there to a layout handle. + */ + + return get_locale_keyboard_layout(); +} + + +/*********************************************************************** + * GetKeyboardLayoutName (MACDRV.@) + */ +BOOL CDECL macdrv_GetKeyboardLayoutName(LPWSTR name) +{ + static const WCHAR formatW[] = {'%','0','8','x',0}; + DWORD layout; + + layout = HandleToUlong(get_locale_keyboard_layout()); + if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); + sprintfW(name, formatW, layout); + TRACE("returning %s\n", debugstr_w(name)); + return TRUE; +} + + +/*********************************************************************** * MapVirtualKeyEx (MACDRV.@) */ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 4dc1e3e..e24d8ab 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -89,6 +89,7 @@ struct macdrv_thread_data int iso_keyboard; CGEventFlags last_modifiers; UInt32 dead_key_state; + HKL active_keyboard_layout; WORD keyc2vkey[128]; WORD keyc2scan[128]; }; diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 1bb7d8c..30df9d6 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -4,11 +4,14 @@ # USER driver +@ cdecl ActivateKeyboardLayout(long long) macdrv_ActivateKeyboardLayout @ cdecl Beep() macdrv_Beep @ cdecl CreateDesktopWindow(long) macdrv_CreateDesktopWindow @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors +@ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout +@ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo @ cdecl MapVirtualKeyEx(long long long) macdrv_MapVirtualKeyEx

1 0

Ken Thomases : winemac: Implement GetKeyNameText().
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 2b4d95cd477da28ead3caa970a46d3a4fa249e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4d95cd477da28ead3caa970… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 04:37:00 2013 -0600 winemac: Implement GetKeyNameText(). --- dlls/winemac.drv/keyboard.c | 171 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 172 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index ecd89fc..ae8df76 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -312,6 +312,88 @@ static const struct { }; +static const struct { + DWORD vkey; + const char *name; +} vkey_names[] = { + { VK_ADD, "Num +" }, + { VK_BACK, "Backspace" }, + { VK_CAPITAL, "Caps Lock" }, + { VK_CONTROL, "Ctrl" }, + { VK_DECIMAL, "Num Del" }, + { VK_DELETE | 0x100, "Delete" }, + { VK_DIVIDE | 0x100, "Num /" }, + { VK_DOWN | 0x100, "Down" }, + { VK_END | 0x100, "End" }, + { VK_ESCAPE, "Esc" }, + { VK_F1, "F1" }, + { VK_F2, "F2" }, + { VK_F3, "F3" }, + { VK_F4, "F4" }, + { VK_F5, "F5" }, + { VK_F6, "F6" }, + { VK_F7, "F7" }, + { VK_F8, "F8" }, + { VK_F9, "F9" }, + { VK_F10, "F10" }, + { VK_F11, "F11" }, + { VK_F12, "F12" }, + { VK_F13, "F13" }, + { VK_F14, "F14" }, + { VK_F15, "F15" }, + { VK_F16, "F16" }, + { VK_F17, "F17" }, + { VK_F18, "F18" }, + { VK_F19, "F19" }, + { VK_F20, "F20" }, + { VK_F21, "F21" }, + { VK_F22, "F22" }, + { VK_F23, "F23" }, + { VK_F24, "F24" }, + { VK_HELP | 0x100, "Help" }, + { VK_HOME | 0x100, "Home" }, + { VK_INSERT | 0x100, "Insert" }, + { VK_LCONTROL, "Ctrl" }, + { VK_LEFT | 0x100, "Left" }, + { VK_LMENU, "Alt" }, + { VK_LSHIFT, "Shift" }, + { VK_LWIN | 0x100, "Win" }, + { VK_MENU, "Alt" }, + { VK_MULTIPLY, "Num *" }, + { VK_NEXT | 0x100, "Page Down" }, + { VK_NUMLOCK | 0x100, "Num Lock" }, + { VK_NUMPAD0, "Num 0" }, + { VK_NUMPAD1, "Num 1" }, + { VK_NUMPAD2, "Num 2" }, + { VK_NUMPAD3, "Num 3" }, + { VK_NUMPAD4, "Num 4" }, + { VK_NUMPAD5, "Num 5" }, + { VK_NUMPAD6, "Num 6" }, + { VK_NUMPAD7, "Num 7" }, + { VK_NUMPAD8, "Num 8" }, + { VK_NUMPAD9, "Num 9" }, + { VK_OEM_CLEAR, "Num Clear" }, + { VK_OEM_NEC_EQUAL | 0x100, "Num =" }, + { VK_PRIOR | 0x100, "Page Up" }, + { VK_RCONTROL | 0x100, "Right Ctrl" }, + { VK_RETURN, "Return" }, + { VK_RETURN | 0x100, "Num Enter" }, + { VK_RIGHT | 0x100, "Right" }, + { VK_RMENU | 0x100, "Right Alt" }, + { VK_RSHIFT, "Right Shift" }, + { VK_RWIN | 0x100, "Right Win" }, + { VK_SEPARATOR, "Num ," }, + { VK_SHIFT, "Shift" }, + { VK_SPACE, "Space" }, + { VK_SUBTRACT, "Num -" }, + { VK_TAB, "Tab" }, + { VK_UP | 0x100, "Up" }, + { VK_VOLUME_DOWN | 0x100, "Volume Down" }, + { VK_VOLUME_MUTE | 0x100, "Mute" }, + { VK_VOLUME_UP | 0x100, "Volume Up" }, +}; + + static BOOL char_matches_string(WCHAR wchar, UniChar *string, BOOL ignore_diacritics) { BOOL ret; @@ -774,6 +856,95 @@ void CDECL macdrv_Beep(void) /*********************************************************************** + * GetKeyNameText (MACDRV.@) + */ +INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) +{ + struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); + int scan, keyc; + + scan = (lparam >> 16) & 0x1FF; + for (keyc = 0; keyc < sizeof(thread_data->keyc2scan)/sizeof(thread_data->keyc2scan[0]); keyc++) + { + if (thread_data->keyc2scan[keyc] == scan) + { + static const WCHAR dead[] = {' ','d','e','a','d',0}; + const UCKeyboardLayout *uchr; + UInt32 deadKeyState = 0; + UniCharCount len; + OSStatus status; + + uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); + status = UCKeyTranslate(uchr, keyc, kUCKeyActionDisplay, 0, thread_data->keyboard_type, + 0, &deadKeyState, size - 1, &len, (UniChar*)buffer); + if (status != noErr) + len = 0; + if (len && isgraphW(buffer[0])) + buffer[len] = 0; + else + { + DWORD vkey = thread_data->keyc2vkey[keyc]; + int i; + + if (scan & 0x100) vkey |= 0x100; + + if (lparam & (1 << 25)) + { + /* Caller doesn't care about distinctions between left and + right keys. */ + switch (vkey) + { + case VK_LSHIFT: + case VK_RSHIFT: + vkey = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + vkey = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + vkey = VK_MENU; break; + } + } + + len = 0; + for (i = 0; i < sizeof(vkey_names) / sizeof(vkey_names[0]); i++) + { + if (vkey_names[i].vkey == vkey) + { + len = MultiByteToWideChar(CP_UTF8, 0, vkey_names[i].name, -1, buffer, size); + if (len) len--; + break; + } + } + + if (!len) + { + static const WCHAR format[] = {'K','e','y',' ','0','x','%','0','2','x',0}; + snprintfW(buffer, size, format, vkey); + len = strlenW(buffer); + } + } + + if (!len) + break; + + if (status == noErr && deadKeyState) + { + lstrcpynW(buffer + len, dead, size - len); + len = strlenW(buffer); + } + + TRACE("lparam 0x%08x -> %s\n", lparam, debugstr_w(buffer)); + return len; + } + } + + WARN("found no name for lparam 0x%08x\n", lparam); + return 0; +} + + +/*********************************************************************** * MapVirtualKeyEx (MACDRV.@) */ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 754f697..1bb7d8c 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -9,6 +9,7 @@ @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors +@ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo @ cdecl MapVirtualKeyEx(long long long) macdrv_MapVirtualKeyEx @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx

1 0

Ken Thomases : winemac: Implement VkKeyScanEx().
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 80baa3a0e9389c0a79731c70d42645ff885b0b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80baa3a0e9389c0a79731c70d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 04:36:57 2013 -0600 winemac: Implement VkKeyScanEx(). --- dlls/winemac.drv/keyboard.c | 73 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index e969359..ecd89fc 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1087,3 +1087,76 @@ done: TRACE_(key)("returning %d / %s\n", ret, debugstr_wn(bufW, abs(ret))); return ret; } + + +/*********************************************************************** + * VkKeyScanEx (MACDRV.@) + * + * Note: Windows ignores HKL parameter and uses current active layout instead + */ +SHORT CDECL macdrv_VkKeyScanEx(WCHAR wChar, HKL hkl) +{ + struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); + SHORT ret = -1; + int state; + const UCKeyboardLayout *uchr; + + TRACE("%04x, %p\n", wChar, hkl); + + uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); + if (!uchr) + { + TRACE("no keyboard layout UCHR data; returning -1\n"); + return -1; + } + + for (state = 0; state < 8; state++) + { + UInt32 modifierKeyState = 0; + int keyc; + + if (state & 1) + modifierKeyState |= (shiftKey >> 8); + if ((state & 6) == 6) + modifierKeyState |= (optionKey >> 8); + else + { + if (state & 2) + modifierKeyState |= (controlKey >> 8); + if (state & 4) + modifierKeyState |= (cmdKey >> 8); + } + + for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey) / sizeof(thread_data->keyc2vkey[0]); keyc++) + { + UInt32 deadKeyState = 0; + UniChar uchar; + UniCharCount len; + OSStatus status; + + if (!thread_data->keyc2vkey[keyc]) continue; + + status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, modifierKeyState, + thread_data->keyboard_type, 0, &deadKeyState, + 1, &len, &uchar); + if (status == noErr && len == 1 && uchar == wChar) + { + WORD vkey = thread_data->keyc2vkey[keyc]; + + ret = vkey | (state << 8); + if ((VK_NUMPAD0 <= vkey && vkey <= VK_DIVIDE) || + keyc == kVK_ANSI_KeypadClear || keyc == kVK_ANSI_KeypadEnter || + keyc == kVK_ANSI_KeypadEquals) + { + /* Keep searching for a non-numpad match, which is preferred. */ + } + else + goto done; + } + } + } + +done: + TRACE(" -> 0x%04x\n", ret); + return ret; +} diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 0d91bd8..754f697 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -22,6 +22,7 @@ @ cdecl ShowWindow(long long ptr long) macdrv_ShowWindow @ cdecl ToUnicodeEx(long long ptr ptr long long long) macdrv_ToUnicodeEx @ cdecl UpdateLayeredWindow(long ptr ptr) macdrv_UpdateLayeredWindow +@ cdecl VkKeyScanEx(long long) macdrv_VkKeyScanEx @ cdecl WindowMessage(long long long long) macdrv_WindowMessage @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) macdrv_WindowPosChanged @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) macdrv_WindowPosChanging

1 0

Ken Thomases : winemac: Implement MapVirtualKeyEx().
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: a649d845ed52903cac6c3f1e459c5f74befd11b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a649d845ed52903cac6c3f1e4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 04:36:52 2013 -0600 winemac: Implement MapVirtualKeyEx(). --- dlls/winemac.drv/keyboard.c | 125 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index d67a20c..e969359 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -774,6 +774,131 @@ void CDECL macdrv_Beep(void) /*********************************************************************** + * MapVirtualKeyEx (MACDRV.@) + */ +UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) +{ + struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); + UINT ret = 0; + int keyc; + + TRACE("wCode=0x%x, wMapType=%d, hkl %p\n", wCode, wMapType, hkl); + + switch (wMapType) + { + case MAPVK_VK_TO_VSC: /* vkey-code to scan-code */ + case MAPVK_VK_TO_VSC_EX: + switch (wCode) + { + case VK_SHIFT: wCode = VK_LSHIFT; break; + case VK_CONTROL: wCode = VK_LCONTROL; break; + case VK_MENU: wCode = VK_LMENU; break; + } + + /* vkey -> keycode -> scan */ + for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + { + if (thread_data->keyc2vkey[keyc] == wCode) + { + ret = thread_data->keyc2scan[keyc] & 0xFF; + break; + } + } + break; + + case MAPVK_VSC_TO_VK: /* scan-code to vkey-code */ + case MAPVK_VSC_TO_VK_EX: + /* scan -> keycode -> vkey */ + for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + if ((thread_data->keyc2scan[keyc] & 0xFF) == (wCode & 0xFF)) + { + ret = thread_data->keyc2vkey[keyc]; + /* Only stop if it's not a numpad vkey; otherwise keep + looking for a potential better vkey. */ + if (ret && (ret < VK_NUMPAD0 || VK_DIVIDE < ret)) + break; + } + + if (wMapType == MAPVK_VSC_TO_VK) + switch (ret) + { + case VK_LSHIFT: + case VK_RSHIFT: + ret = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + ret = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + ret = VK_MENU; break; + } + + break; + + case MAPVK_VK_TO_CHAR: /* vkey-code to character */ + { + /* vkey -> keycode -> (UCKeyTranslate) wide char */ + struct macdrv_thread_data *thread_data = macdrv_thread_data(); + const UCKeyboardLayout *uchr; + UniChar s[10]; + OSStatus status; + UInt32 deadKeyState; + UniCharCount len; + BOOL deadKey = FALSE; + + if ((VK_PRIOR <= wCode && wCode <= VK_HELP) || + (VK_F1 <= wCode && wCode <= VK_F24)) + break; + + if (!thread_data || !thread_data->keyboard_layout_uchr) + { + WARN("No keyboard layout uchr data\n"); + break; + } + + uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); + + /* Find the Mac keycode corresponding to the vkey */ + for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + if (thread_data->keyc2vkey[keyc] == wCode) break; + + if (keyc >= sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0])) + { + WARN("Unknown virtual key %X\n", wCode); + break; + } + + TRACE("Found keycode %u\n", keyc); + + deadKeyState = 0; + status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, 0, + thread_data->keyboard_type, 0, &deadKeyState, + sizeof(s)/sizeof(s[0]), &len, s); + if (status == noErr && !len && deadKeyState) + { + deadKey = TRUE; + deadKeyState = 0; + status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, 0, + thread_data->keyboard_type, kUCKeyTranslateNoDeadKeysMask, + &deadKeyState, sizeof(s)/sizeof(s[0]), &len, s); + } + + if (status == noErr && len) + ret = toupperW(s[0]) | (deadKey ? 0x80000000 : 0); + + break; + } + default: /* reserved */ + FIXME("Unknown wMapType %d\n", wMapType); + break; + } + + TRACE("returning 0x%04x\n", ret); + return ret; +} + + +/*********************************************************************** * ToUnicodeEx (MACDRV.@) * * The ToUnicode function translates the specified virtual-key code and keyboard diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index f4502ea..0d91bd8 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -10,6 +10,7 @@ @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo +@ cdecl MapVirtualKeyEx(long long long) macdrv_MapVirtualKeyEx @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx @ cdecl ScrollDC(long long long ptr ptr long ptr) macdrv_ScrollDC @ cdecl SetFocus(long) macdrv_SetFocus

1 0

Alexandre Julliard : explorer: Return a simple boolean instead of a window in the wine_create_desktop entry point .
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: a73c5d5c8134ee87a98fc0ea7b7401a3518e08b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73c5d5c8134ee87a98fc0ea7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 12:49:41 2013 +0100 explorer: Return a simple boolean instead of a window in the wine_create_desktop entry point. --- dlls/winex11.drv/desktop.c | 10 ++++++---- programs/explorer/desktop.c | 17 +++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 8d9de20..5fbb860 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -130,7 +130,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) * * Create the X11 desktop window for the desktop mode. */ -Window CDECL X11DRV_create_desktop( UINT width, UINT height ) +BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) { XSetWindowAttributes win_attr; Window win; @@ -152,7 +152,9 @@ Window CDECL X11DRV_create_desktop( UINT width, UINT height ) win = XCreateWindow( display, DefaultRootWindow(display), 0, 0, width, height, 0, default_visual.depth, InputOutput, default_visual.visual, CWEventMask | CWCursor | CWColormap, &win_attr ); - if (win != None && width == screen_width && height == screen_height) + if (!win) return FALSE; + + if (width == screen_width && height == screen_height) { TRACE("setting desktop to fullscreen\n"); XChangeProperty( display, win, x11drv_atom(_NET_WM_STATE), XA_ATOM, 32, @@ -160,8 +162,8 @@ Window CDECL X11DRV_create_desktop( UINT width, UINT height ) 1); } XFlush( display ); - if (win != None) X11DRV_init_desktop( win, width, height ); - return win; + X11DRV_init_desktop( win, width, height ); + return TRUE; } diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index a4f21bf..3e01f9f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -106,13 +106,13 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR } } -/* create the desktop and the associated X11 window, and make it the current desktop */ -static unsigned long create_desktop( const WCHAR *name, unsigned int width, unsigned int height ) +/* create the desktop and the associated driver window, and make it the current desktop */ +static BOOL create_desktop( const WCHAR *name, unsigned int width, unsigned int height ) { static const WCHAR rootW[] = {'r','o','o','t',0}; HDESK desktop; - unsigned long xwin = 0; - unsigned long (CDECL *create_desktop_func)(unsigned int, unsigned int); + BOOL ret = FALSE; + BOOL (CDECL *create_desktop_func)(unsigned int, unsigned int); desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); if (!desktop) @@ -124,10 +124,10 @@ static unsigned long create_desktop( const WCHAR *name, unsigned int width, unsi if (graphics_driver && strcmpiW( name, rootW )) { create_desktop_func = (void *)GetProcAddress( graphics_driver, "wine_create_desktop" ); - if (create_desktop_func) xwin = create_desktop_func( width, height ); + if (create_desktop_func) ret = create_desktop_func( width, height ); } SetThreadDesktop( desktop ); - return xwin; + return ret; } /* parse the desktop size specification */ @@ -266,7 +266,6 @@ void manage_desktop( WCHAR *arg ) MSG msg; HDC hdc; HWND hwnd, msg_hwnd; - unsigned long xwin = 0; unsigned int width, height; WCHAR *cmdline = NULL; WCHAR *p = arg; @@ -299,9 +298,7 @@ void manage_desktop( WCHAR *arg ) hdc = CreateDCW( displayW, NULL, NULL, NULL ); graphics_driver = __wine_get_driver_module( hdc ); - if (name && width && height) xwin = create_desktop( name, width, height ); - - if (!xwin) using_root = TRUE; /* using the root window */ + if (name && width && height) using_root = !create_desktop( name, width, height ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL,

1 0

Alexandre Julliard : explorer: Retrieve the graphics driver module from gdi32.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 3e24a17c030d28c4e57376266b8c170fbb9f7570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e24a17c030d28c4e57376266… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 12:46:14 2013 +0100 explorer: Retrieve the graphics driver module from gdi32. --- programs/explorer/desktop.c | 24 ++++++++++++++++-------- programs/explorer/explorer_private.h | 2 +- programs/explorer/systray.c | 8 +++----- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 12888d8..a4f21bf 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -21,13 +21,14 @@ #include "config.h" #include "wine/port.h" #include <stdio.h> -#include "wine/unicode.h" #define OEMRESOURCE - #include <windows.h> #include <rpc.h> -#include <wine/debug.h> + +#include "wine/gdi_driver.h" +#include "wine/unicode.h" +#include "wine/debug.h" #include "explorer_private.h" WINE_DEFAULT_DEBUG_CHANNEL(explorer); @@ -35,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define DESKTOP_CLASS_ATOM ((LPCWSTR)MAKEINTATOM(32769)) #define DESKTOP_ALL_ACCESS 0x01ff +static HMODULE graphics_driver; static BOOL using_root; /* screen saver handler */ @@ -108,7 +110,6 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR static unsigned long create_desktop( const WCHAR *name, unsigned int width, unsigned int height ) { static const WCHAR rootW[] = {'r','o','o','t',0}; - HMODULE x11drv = GetModuleHandleA( "winex11.drv" ); HDESK desktop; unsigned long xwin = 0; unsigned long (CDECL *create_desktop_func)(unsigned int, unsigned int); @@ -119,10 +120,10 @@ static unsigned long create_desktop( const WCHAR *name, unsigned int width, unsi WINE_ERR( "failed to create desktop %s error %d\n", wine_dbgstr_w(name), GetLastError() ); ExitProcess( 1 ); } - /* magic: desktop "root" means use the X11 root window */ - if (x11drv && strcmpiW( name, rootW )) + /* magic: desktop "root" means use the root window */ + if (graphics_driver && strcmpiW( name, rootW )) { - create_desktop_func = (void *)GetProcAddress( x11drv, "wine_create_desktop" ); + create_desktop_func = (void *)GetProcAddress( graphics_driver, "wine_create_desktop" ); if (create_desktop_func) xwin = create_desktop_func( width, height ); } SetThreadDesktop( desktop ); @@ -260,8 +261,10 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) /* main desktop management function */ void manage_desktop( WCHAR *arg ) { + static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; MSG msg; + HDC hdc; HWND hwnd, msg_hwnd; unsigned long xwin = 0; unsigned int width, height; @@ -293,6 +296,9 @@ void manage_desktop( WCHAR *arg ) if (!get_default_desktop_size( name, &width, &height )) width = height = 0; } + hdc = CreateDCW( displayW, NULL, NULL, NULL ); + graphics_driver = __wine_get_driver_module( hdc ); + if (name && width && height) xwin = create_desktop( name, width, height ); if (!xwin) using_root = TRUE; /* using the root window */ @@ -308,6 +314,8 @@ void manage_desktop( WCHAR *arg ) msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, 0, 0, 0, NULL ); + DeleteDC( hdc ); + if (hwnd == GetDesktopWindow()) { HMODULE shell32; @@ -320,7 +328,7 @@ void manage_desktop( WCHAR *arg ) ClipCursor( NULL ); initialize_display_settings( hwnd ); initialize_appbar(); - initialize_systray( using_root ); + initialize_systray( graphics_driver, using_root ); if ((shell32 = LoadLibraryA( "shell32.dll" )) && (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188))) diff --git a/programs/explorer/explorer_private.h b/programs/explorer/explorer_private.h index 44e0e39..74ca7f0 100644 --- a/programs/explorer/explorer_private.h +++ b/programs/explorer/explorer_private.h @@ -22,7 +22,7 @@ #define __WINE_EXPLORER_PRIVATE_H extern void manage_desktop( WCHAR *arg ); -extern void initialize_systray( BOOL using_root ); +extern void initialize_systray( HMODULE graphics_driver, BOOL using_root ); extern void initialize_appbar(void); #endif /* __WINE_EXPLORER_PRIVATE_H */ diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 716335c..c15fbf0 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -629,14 +629,12 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l } /* this function creates the listener window */ -void initialize_systray( BOOL using_root ) +void initialize_systray( HMODULE graphics_driver, BOOL using_root ) { - HMODULE x11drv; WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - if ((x11drv = GetModuleHandleA( "winex11.drv" ))) - wine_notify_icon = (void *)GetProcAddress( x11drv, "wine_notify_icon" ); + wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER; @@ -651,7 +649,7 @@ void initialize_systray( BOOL using_root ) class.hIcon = LoadIconW(0, (LPCWSTR)IDI_WINLOGO); class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = (HBRUSH) COLOR_WINDOW; - class.lpszClassName = (WCHAR *) &classname; + class.lpszClassName = classname; if (!RegisterClassExW(&class)) {

1 0

Daniel Jelinski : comctl32/listview: Always use large icon size when calculating icon spacing.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: aeefa821858a1db188a59646345197b20a3e38f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeefa821858a1db188a596463… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Feb 4 20:46:30 2013 +0100 comctl32/listview: Always use large icon size when calculating icon spacing. --- dlls/comctl32/listview.c | 35 ++++++++--------------------------- dlls/comctl32/tests/listview.c | 10 ++++++++++ 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cee1154..96863f9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8586,18 +8586,18 @@ static DWORD LISTVIEW_SetHoverTime(LISTVIEW_INFO *infoPtr, DWORD dwHoverTime) */ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) { + INT iconWidth = 0, iconHeight = 0; DWORD oldspacing = MAKELONG(infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy); TRACE("requested=(%d,%d)\n", cx, cy); - - /* this is supported only for LVS_ICON style */ - if (infoPtr->uView != LV_VIEW_ICON) return oldspacing; - + /* set to defaults, if instructed to */ if (cx == -1 && cy == -1) { - cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON) + infoPtr->iconSize.cx; - cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON) + infoPtr->iconSize.cy; + if (infoPtr->himlNormal) + ImageList_GetIconSize(infoPtr->himlNormal, &iconWidth, &iconHeight); + cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON) + iconWidth; + cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON) + iconHeight; } /* if 0 then keep width */ if (cx != 0) @@ -9054,7 +9054,6 @@ static BOOL LISTVIEW_SetUnicodeFormat( LISTVIEW_INFO *infoPtr, BOOL unicode) */ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView) { - SIZE oldIconSize = infoPtr->iconSize; HIMAGELIST himl; if (infoPtr->uView == nView) return 1; @@ -9080,14 +9079,6 @@ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView) switch (nView) { case LV_VIEW_ICON: - if ((infoPtr->iconSize.cx != oldIconSize.cx) || (infoPtr->iconSize.cy != oldIconSize.cy)) - { - TRACE("icon old size=(%d,%d), new size=(%d,%d)\n", - oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, -1, -1); - } - LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); - break; case LV_VIEW_SMALLICON: LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); break; @@ -11016,7 +11007,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, if (uNewView != uOldView) { - SIZE oldIconSize = infoPtr->iconSize; HIMAGELIST himl; SendMessageW(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0); @@ -11027,17 +11017,8 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, himl = (uNewView == LVS_ICON ? infoPtr->himlNormal : infoPtr->himlSmall); set_icon_size(&infoPtr->iconSize, himl, uNewView != LVS_ICON); - - if (uNewView == LVS_ICON) - { - if ((infoPtr->iconSize.cx != oldIconSize.cx) || (infoPtr->iconSize.cy != oldIconSize.cy)) - { - TRACE("icon old size=(%d,%d), new size=(%d,%d)\n", - oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, -1, -1); - } - } - else if (uNewView == LVS_REPORT) + + if (uNewView == LVS_REPORT) { HDLAYOUT hl; WINDOWPOS wp; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2347bfa..c46fe42 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4656,6 +4656,16 @@ static void test_getitemspacing(void) expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); + /* spacing does not depend on selected view type */ + ret = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); + expect(0, ret); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* spacing + icon size returned */ + expect(cx + 40, LOWORD(ret)); + expect(cy + 40, HIWORD(ret)); + + SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); ImageList_Destroy(himl40); DestroyWindow(hwnd); /* LVS_REPORT */

1 0

Daniel Jelinski : comctl32/listview: Correct icon spacing calculation when set to 0 or -1.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: cb77ab1a004be9092590414212fb7bd109d9236a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb77ab1a004be909259041421… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Feb 4 20:42:44 2013 +0100 comctl32/listview: Correct icon spacing calculation when set to 0 or -1. --- dlls/comctl32/listview.c | 40 ++++++++++-------------- dlls/comctl32/tests/listview.c | 65 ++++++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 49 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8031d37..cee1154 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8,6 +8,7 @@ * Copyright 2002 Dimitrie O. Paun * Copyright 2009-2013 Nikolay Sivov * Copyright 2009 Owen Rudge for CodeWeavers + * Copyright 2012-2013 Daniel Jelinski * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -8593,28 +8594,21 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) if (infoPtr->uView != LV_VIEW_ICON) return oldspacing; /* set to defaults, if instructed to */ - if (cx == -1) cx = GetSystemMetrics(SM_CXICONSPACING); - if (cy == -1) cy = GetSystemMetrics(SM_CYICONSPACING); - - /* if 0 then compute width - * FIXME: computed cx and cy is not matching native behaviour */ - if (cx == 0) { - cx = GetSystemMetrics(SM_CXICONSPACING); - if (infoPtr->iconSize.cx + ICON_LR_PADDING > cx) - cx = infoPtr->iconSize.cx + ICON_LR_PADDING; + if (cx == -1 && cy == -1) + { + cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON) + infoPtr->iconSize.cx; + cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON) + infoPtr->iconSize.cy; } + /* if 0 then keep width */ + if (cx != 0) + infoPtr->iconSpacing.cx = cx; - /* if 0 then compute height */ - if (cy == 0) - cy = infoPtr->iconSize.cy + 2 * infoPtr->ntmHeight + - ICON_BOTTOM_PADDING + ICON_TOP_PADDING + LABEL_VERT_PADDING; - - - infoPtr->iconSpacing.cx = cx; - infoPtr->iconSpacing.cy = cy; + /* if 0 then keep height */ + if (cy != 0) + infoPtr->iconSpacing.cy = cy; TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%d,%d), ntmH=%d\n", - LOWORD(oldspacing), HIWORD(oldspacing), cx, cy, + LOWORD(oldspacing), HIWORD(oldspacing), infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy, infoPtr->ntmHeight); @@ -8666,7 +8660,7 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG himlOld = infoPtr->himlNormal; infoPtr->himlNormal = himl; if (infoPtr->uView == LV_VIEW_ICON) set_icon_size(&infoPtr->iconSize, himl, FALSE); - LISTVIEW_SetIconSpacing(infoPtr, 0, 0); + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); break; case LVSIL_SMALL: @@ -9090,7 +9084,7 @@ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView) { TRACE("icon old size=(%d,%d), new size=(%d,%d)\n", oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, 0, 0); + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); } LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); break; @@ -9389,8 +9383,8 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->bRedraw = TRUE; infoPtr->bNoItemMetrics = TRUE; infoPtr->bDoChangeNotify = TRUE; - infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING); - infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING); + infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); + infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); infoPtr->nEditLabelItem = -1; infoPtr->nLButtonDownItem = -1; infoPtr->dwHoverTime = HOVER_DEFAULT; /* default system hover time */ @@ -11040,7 +11034,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, { TRACE("icon old size=(%d,%d), new size=(%d,%d)\n", oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, 0, 0); + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); } } else if (uNewView == LVS_REPORT) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2fb7cb5..2347bfa 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4598,9 +4598,7 @@ static void test_getitemspacing(void) HWND hwnd; DWORD ret; INT cx, cy; - HIMAGELIST himl; - HBITMAP hbmp; - LVITEMA itema; + HIMAGELIST himl40, himl80; cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); @@ -4608,56 +4606,71 @@ static void test_getitemspacing(void) /* LVS_ICON */ hwnd = create_listview_control(LVS_ICON); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + /* now try with icons */ - himl = ImageList_Create(40, 40, 0, 4, 4); - ok(himl != NULL, "failed to create imagelist\n"); - hbmp = CreateBitmap(40, 40, 1, 1, NULL); - ok(hbmp != NULL, "failed to create bitmap\n"); - ret = ImageList_Add(himl, hbmp, 0); - expect(0, ret); - ret = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl); + himl40 = ImageList_Create(40, 40, 0, 4, 4); + ok(himl40 != NULL, "failed to create imagelist\n"); + himl80 = ImageList_Create(80, 80, 0, 4, 4); + ok(himl80 != NULL, "failed to create imagelist\n"); + ret = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); expect(0, ret); - itema.mask = LVIF_IMAGE; - itema.iImage = 0; - itema.iItem = 0; - itema.iSubItem = 0; - ret = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM)&itema); - expect(0, ret); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { /* spacing + icon size returned */ expect(cx + 40, LOWORD(ret)); expect(cy + 40, HIWORD(ret)); -} + /* try changing icon size */ + SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl80); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* spacing + icon size returned */ + expect(cx + 80, LOWORD(ret)); + expect(cy + 80, HIWORD(ret)); + + /* set own icon spacing */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(100, 100)); + expect(cx + 80, LOWORD(ret)); + expect(cy + 80, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* set size returned */ + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + /* now change image list - icon spacing should be unaffected */ + SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* spacing + icon size returned */ + expect(cx + 40, LOWORD(ret)); + expect(cy + 40, HIWORD(ret)); + + SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); + ImageList_Destroy(himl80); DestroyWindow(hwnd); /* LVS_SMALLICON */ hwnd = create_listview_control(LVS_SMALLICON); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + + ImageList_Destroy(himl40); DestroyWindow(hwnd); /* LVS_REPORT */ hwnd = create_listview_control(LVS_REPORT); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + DestroyWindow(hwnd); /* LVS_LIST */ hwnd = create_listview_control(LVS_LIST); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + DestroyWindow(hwnd); }

1 0

Frédéric Delanoy : msi: Fix memory leak (coverity ).
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 72989b5b0335d203aa0afc478982acf9e0466b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72989b5b0335d203aa0afc478… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 2 09:56:53 2013 +0100 msi: Fix memory leak (coverity). --- dlls/msi/msi.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 6a623e7..c1f4fcc 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3178,7 +3178,11 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, msi_free( version ); return GetLastError(); } - if (!verbuf && !verlen && !langbuf && !langlen) return ERROR_SUCCESS; + if (!verbuf && !verlen && !langbuf && !langlen) + { + msi_free( version ); + return ERROR_SUCCESS; + } if (verlen) { if (VerQueryValueW( version, szVersionResource, (LPVOID *)&ffi, &len ) && len > 0)

1 0

Alistair Leslie-Hughes : fusion: Return correct error for null public token .
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 575571c9fcd64a0f5276aff6b6401a659eafef72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=575571c9fcd64a0f5276aff6b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 31 16:08:38 2013 +1100 fusion: Return correct error for null public token. --- dlls/fusion/asmname.c | 4 ++++ dlls/fusion/tests/asmcache.c | 19 +++++++++++++++++++ include/corerror.h | 1 + 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 162a76b..fa84e53 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -561,6 +561,10 @@ static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPCWSTR pubkey) { int i; BYTE val; + static const WCHAR nullstr[] = {'n','u','l','l',0}; + + if(lstrcmpiW(pubkey, nullstr) == 0) + return FUSION_E_PRIVATE_ASM_DISALLOWED; if (lstrlenW(pubkey) < CHARS_PER_PUBKEY) return FUSION_E_INVALID_NAME; diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index e97cfbe..320a938 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1016,6 +1016,13 @@ static void test_QueryAssemblyInfo(void) 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=', '2','d','0','3','6','1','7','b','1','c','3','1','e','2','f','5',',', 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; + static const WCHAR nullpublickey[] = { + 'm','s','c','o','r','l','i','b','.','d','l','l',',','v','e','r','s','i','o','n','=','0','.','0','.', + '0','.','0',',','c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',',', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','n','u','l','l',0}; + static const WCHAR nullpublickey1[] = { + 'm','s','c','o','r','l','i','b','.','d','l','l',',', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','n','u','L','l',0}; size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, asmpath, &size); @@ -1386,6 +1393,18 @@ static void test_QueryAssemblyInfo(void) "Assembly path was changed\n"); ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); + /* display name is "mscorlib.dll,version=0.0.0.0,culture=neutral,publicKeyToken=null" */ + INIT_ASM_INFO(); + lstrcpyW(name, nullpublickey); + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); + ok(hr == FUSION_E_PRIVATE_ASM_DISALLOWED, "got %08x\n", hr); + + /* display name is "mscorlib.dll,publicKeyToken=nuLl" */ + INIT_ASM_INFO(); + lstrcpyW(name, nullpublickey1); + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); + ok(hr == FUSION_E_PRIVATE_ASM_DISALLOWED, "got %08x\n", hr); + /* display name is "wine, Culture=neutral" */ INIT_ASM_INFO(); lstrcpyW(name, wine); diff --git a/include/corerror.h b/include/corerror.h index 1537f93..3ddfe47 100644 --- a/include/corerror.h +++ b/include/corerror.h @@ -119,6 +119,7 @@ #define COR_E_HOSTPROTECTION EMAKEHR(0x1640) #define COR_E_ILLEGAL_REENTRANCY EMAKEHR(0x1641) +#define FUSION_E_PRIVATE_ASM_DISALLOWED EMAKEHR(0x1044) #define FUSION_E_INVALID_NAME EMAKEHR(0x1047) #define CLDB_E_FILE_OLDVER EMAKEHR(0x1107)

1 0

Michael Stefaniuc : wined3d: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 50a9fb579c592b56ec3ec0ff0a00d671cde46bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a9fb579c592b56ec3ec0ff0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 5 15:49:14 2013 +0100 wined3d: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/wined3d/ati_fragment_shader.c | 4 +--- dlls/wined3d/buffer.c | 5 ----- dlls/wined3d/context.c | 3 --- dlls/wined3d/device.c | 4 +--- dlls/wined3d/directx.c | 3 --- dlls/wined3d/glsl_shader.c | 3 --- dlls/wined3d/palette.c | 3 --- dlls/wined3d/query.c | 3 --- dlls/wined3d/sampler.c | 3 --- dlls/wined3d/shader.c | 12 ------------ dlls/wined3d/shader_sm1.c | 3 --- dlls/wined3d/stateblock.c | 3 --- dlls/wined3d/surface.c | 3 --- dlls/wined3d/swapchain.c | 3 --- dlls/wined3d/texture.c | 3 --- dlls/wined3d/vertexdeclaration.c | 3 --- dlls/wined3d/view.c | 3 --- dlls/wined3d/volume.c | 1 - 18 files changed, 2 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50a9fb579c592b56ec3ec…

1 0

Marcus Meissner : comdlg32: Free files on errorpath (Coverity).
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: fd9becb9073026107346e042908dfc4a906a8739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9becb9073026107346e0429… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jan 31 18:26:47 2013 +0100 comdlg32: Free files on errorpath (Coverity). --- dlls/comdlg32/itemdlg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 96ee5dc..33398b5 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -407,7 +407,7 @@ static HRESULT on_default_action(FileDialogImpl *This) IShellFolder *psf_parent, *psf_desktop; LPITEMIDLIST *pidla; LPITEMIDLIST current_folder; - LPWSTR fn_iter, files, tmp_files; + LPWSTR fn_iter, files = NULL, tmp_files; UINT file_count = 0, len, i; int open_action; HRESULT hr, ret = E_FAIL; @@ -425,6 +425,7 @@ static HRESULT on_default_action(FileDialogImpl *This) if(FAILED(hr)) { ERR("Failed to get pidl for current directory.\n"); + HeapFree(GetProcessHeap(), 0, files); return hr; }

1 0

Ludger Sprenker : windowscodecs: Add enum type WICTiffCompressionOption.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 5c1e82ce54f9c0dbce47a11d9b3dd066cc95ac91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1e82ce54f9c0dbce47a11d9… Author: Ludger Sprenker <ludger(a)sprenker.net> Date: Mon Feb 4 20:39:23 2013 +0100 windowscodecs: Add enum type WICTiffCompressionOption. --- include/wincodec.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 9a2d377..4e1d039 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -156,6 +156,18 @@ typedef enum WICPixelFormatNumericRepresentation { WICPIXELFORMATNUMERICREPRESENTATION_FORCE_DWORD = CODEC_FORCE_DWORD } WICPixelFormatNumericRepresentation; +typedef enum WICTiffCompressionOption { + WICTiffCompressionDontCare = 0x00000000, + WICTiffCompressionNone = 0x00000001, + WICTiffCompressionCCITT3 = 0x00000002, + WICTiffCompressionCCITT4 = 0x00000003, + WICTiffCompressionLZW = 0x00000004, + WICTiffCompressionRLE = 0x00000005, + WICTiffCompressionZIP = 0x00000006, + WICTiffCompressionLZWHDifferencing = 0x00000007, + WICTIFFCOMPRESSIONOPTION_FORCE_DWORD = CODEC_FORCE_DWORD +} WICTiffCompressionOption; + typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID;

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.23
by Jeremy Newman Feb. 5, 2013

Feb. 5, 2013

Module: website Branch: master Commit: eb6ed2010e13fec23f8a7e265ca1e69d2d03abc5 URL: http://source.winehq.org/git/website.git/?a=commit;h=eb6ed2010e13fec23f8a7e… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Wed Feb 6 03:58:21 2013 +0800 Simplified Chinese translation for release 1.5.23 --- news/zh-cn/2013020101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013020101.xml b/news/zh-cn/2013020101.xml new file mode 100644 index 0000000..b8965e3 --- /dev/null +++ b/news/zh-cn/2013020101.xml @@ -0,0 +1,16 @@ +<news> +<date>二月 1, 2013</date> +<title>Wine 1.5.23 发布</title> +<body> + Wine 开发版 1.5.23 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.23">更新</a>： +<ul> + <li>解除 HTTPS 支持对 OpenSSL 的依赖。</li> + <li>对 Mac 后端驱动事件处理的支持。</li> + <li>一个功能性的 Netstat 内置应用。</li> + <li>一些 C++ 运行时的数学函数。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.23.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.22
by Jeremy Newman Feb. 5, 2013

Feb. 5, 2013

Module: website Branch: master Commit: 2cc67ff1bbdcd858e1fdff0e493d363693aea366 URL: http://source.winehq.org/git/website.git/?a=commit;h=2cc67ff1bbdcd858e1fdff… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Wed Feb 6 04:21:30 2013 +0800 Simplified Chinese translation for release 1.5.22 --- news/zh-cn/2013011801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013011801.xml b/news/zh-cn/2013011801.xml new file mode 100644 index 0000000..d06d956 --- /dev/null +++ b/news/zh-cn/2013011801.xml @@ -0,0 +1,16 @@ +<news> +<date>一月 18, 2013</date> +<title>Wine 1.5.22 发布</title> +<body> + Wine 开发版 1.5.22 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.22">更新</a>： +<ul> + <li>新的 Gecko 引擎。</li> + <li>开始 Mac 图像后端驱动的开发。</li> + <li>对 ARM64 平台的支持。</li> + <li>改进 Uniscribe 对 RTL（从右往左）文本的支持。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.22.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Aric Stewart : usp10: Update diacritical script handling for non OpenType Itemization.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: ef4b7c5948e43d4ceeed98ba4ddbf6c222259d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4b7c5948e43d4ceeed98ba4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 5 08:57:44 2013 -0600 usp10: Update diacritical script handling for non OpenType Itemization. --- dlls/usp10/usp10.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index da0752d..41a7f32 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1329,8 +1329,36 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, forceLevels = TRUE; /* Diacritical marks merge with other scripts */ - if (scripts[i] == Script_Diacritical && i > 0) - scripts[i] = scripts[i-1]; + if (scripts[i] == Script_Diacritical) + { + if (i > 0) + { + if (pScriptTags) + scripts[i] = scripts[i-1]; + else + { + int j; + BOOL asian = FALSE; + WORD first_script = scripts[i-1]; + for (j = i-1; j >= 0 && scripts[j] == first_script && pwcInChars[j] != Numeric_space; j--) + { + WORD original = scripts[j]; + if (original == Script_Ideograph || original == Script_Kana || original == Script_Yi || original == Script_CJK_Han || original == Script_Bopomofo) + { + asian = TRUE; + break; + } + if (original != Script_MathAlpha && scriptInformation[scripts[j]].props.fComplex) + break; + scripts[j] = scripts[i]; + if (original == Script_Punctuation2) + break; + } + if (scriptInformation[scripts[j]].props.fComplex || asian) + scripts[i] = scripts[j]; + } + } + } } for (i = 0; i < cInChars; i++)

1 0

Aric Stewart : usp10: Split the core Itemize function out to be able to support differences between the normal and OpenType versions .
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: e70b9b1c1e0b239e9c3f76696650c7187b57570f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70b9b1c1e0b239e9c3f76696… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 5 08:57:38 2013 -0600 usp10: Split the core Itemize function out to be able to support differences between the normal and OpenType versions. --- dlls/usp10/usp10.c | 69 +++++++++++++++++++++++++++------------------------- 1 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index fb09808..da0752d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1270,28 +1270,11 @@ static inline WORD base_indic(WORD script) }; } -/*********************************************************************** - * ScriptItemizeOpenType (USP10.@) - * - * Split a Unicode string into shapeable parts. - * - * PARAMS - * pwcInChars [I] String to split. - * cInChars [I] Number of characters in pwcInChars. - * cMaxItems [I] Maximum number of items to return. - * psControl [I] Pointer to a SCRIPT_CONTROL structure. - * psState [I] Pointer to a SCRIPT_STATE structure. - * pItems [O] Buffer to receive SCRIPT_ITEM structures. - * pScriptTags [O] Buffer to receive OPENTYPE_TAGs. - * pcItems [O] Number of script items returned. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int cMaxItems, - const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, - SCRIPT_ITEM *pItems, OPENTYPE_TAG *pScriptTags, int *pcItems) + +static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, + int cMaxItems, const SCRIPT_CONTROL *psControl, + const SCRIPT_STATE *psState, SCRIPT_ITEM *pItems, + OPENTYPE_TAG *pScriptTags, int *pcItems) { #define Numeric_space 0x0020 @@ -1496,7 +1479,8 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int pItems[index].iCharPos = 0; pItems[index].a = scriptInformation[scripts[cnt]].a; - pScriptTags[index] = scriptInformation[scripts[cnt]].scriptTag; + if (pScriptTags) + pScriptTags[index] = scriptInformation[scripts[cnt]].scriptTag; if (strength && strength[cnt] == BIDI_STRONG) str = strength[cnt]; @@ -1590,7 +1574,8 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); pItems[index].a = scriptInformation[New_Script].a; - pScriptTags[index] = scriptInformation[New_Script].scriptTag; + if (pScriptTags) + pScriptTags[index] = scriptInformation[New_Script].scriptTag; if (levels) { if (levels[cnt] == 0) @@ -1633,6 +1618,32 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } /*********************************************************************** + * ScriptItemizeOpenType (USP10.@) + * + * Split a Unicode string into shapeable parts. + * + * PARAMS + * pwcInChars [I] String to split. + * cInChars [I] Number of characters in pwcInChars. + * cMaxItems [I] Maximum number of items to return. + * psControl [I] Pointer to a SCRIPT_CONTROL structure. + * psState [I] Pointer to a SCRIPT_STATE structure. + * pItems [O] Buffer to receive SCRIPT_ITEM structures. + * pScriptTags [O] Buffer to receive OPENTYPE_TAGs. + * pcItems [O] Number of script items returned. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. + */ +HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int cMaxItems, + const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, + SCRIPT_ITEM *pItems, OPENTYPE_TAG *pScriptTags, int *pcItems) +{ + return _ItemizeInternal(pwcInChars, cInChars, cMaxItems, psControl, psState, pItems, pScriptTags, pcItems); +} + +/*********************************************************************** * ScriptItemize (USP10.@) * * Split a Unicode string into shapeable parts. @@ -1654,15 +1665,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, SCRIPT_ITEM *pItems, int *pcItems) { - OPENTYPE_TAG *discarded_tags; - HRESULT res; - - discarded_tags = heap_alloc(cMaxItems * sizeof(OPENTYPE_TAG)); - if (!discarded_tags) - return E_OUTOFMEMORY; - res = ScriptItemizeOpenType(pwcInChars, cInChars, cMaxItems, psControl, psState, pItems, discarded_tags, pcItems); - heap_free(discarded_tags); - return res; + return _ItemizeInternal(pwcInChars, cInChars, cMaxItems, psControl, psState, pItems, NULL, pcItems); } static inline int getGivenTabWidth(ScriptCache *psc, SCRIPT_TABDEF *pTabdef, int charPos, int current_x)

1 0