wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Alexandre Julliard : winex11: Add window data structure locking to the SysCommand entry point.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 803fc6e27c2507a2cefe57d53bdbaab1770f3854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803fc6e27c2507a2cefe57d53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 13:41:20 2012 +0200 winex11: Add window data structure locking to the SysCommand entry point. --- dlls/winex11.drv/window.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4ff3678..66588d1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2397,8 +2397,8 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) int dir; struct x11drv_win_data *data; - if (!(data = X11DRV_get_win_data( hwnd ))) return -1; - if (!data->whole_window || !data->managed || !data->mapped) return -1; + if (!(data = get_win_data( hwnd ))) return -1; + if (!data->whole_window || !data->managed || !data->mapped) goto failed; switch (wparam & 0xfff0) { @@ -2408,7 +2408,7 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) break; case SC_SIZE: /* windows without WS_THICKFRAME are not resizable through the window manager */ - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_THICKFRAME)) return -1; + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_THICKFRAME)) goto failed; switch (hittest) { @@ -2427,24 +2427,30 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) case SC_KEYMENU: /* prevent a simple ALT press+release from activating the system menu, * as that can get confusing on managed windows */ - if ((WCHAR)lparam) return -1; /* got an explicit char */ - if (GetMenu( hwnd )) return -1; /* window has a real menu */ - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_SYSMENU)) return -1; /* no system menu */ + if ((WCHAR)lparam) goto failed; /* got an explicit char */ + if (GetMenu( hwnd )) goto failed; /* window has a real menu */ + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_SYSMENU)) goto failed; /* no system menu */ TRACE( "ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam ); + release_win_data( data ); return 0; default: - return -1; + goto failed; } - if (IsZoomed(hwnd)) return -1; + if (IsZoomed(hwnd)) goto failed; if (!is_netwm_supported( data->display, x11drv_atom(_NET_WM_MOVERESIZE) )) { TRACE( "_NET_WM_MOVERESIZE not supported\n" ); - return -1; + goto failed; } + release_win_data( data ); move_resize_window( hwnd, dir ); return 0; + +failed: + release_win_data( data ); + return -1; }

1 0

Alexandre Julliard : winex11: Add window data structure locking to the ShowWindow entry point.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 6a9f5e18d1e95979ad308c4d67182d46950b207a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9f5e18d1e95979ad308c4d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 13:36:35 2012 +0200 winex11: Add window data structure locking to the ShowWindow entry point. --- dlls/winex11.drv/window.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 931f60e..4ff3678 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2208,20 +2208,20 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) Window root, top; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); struct x11drv_thread_data *thread_data = x11drv_thread_data(); - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + struct x11drv_win_data *data = get_win_data( hwnd ); - if (!data || !data->whole_window || !data->managed || !data->mapped || data->iconic) return swp; - if (style & WS_MINIMIZE) return swp; - if (IsRectEmpty( rect )) return swp; + if (!data || !data->whole_window || !data->managed || !data->mapped || data->iconic) goto done; + if (style & WS_MINIMIZE) goto done; + if (IsRectEmpty( rect )) goto done; /* only fetch the new rectangle if the ShowWindow was a result of a window manager event */ if (!thread_data->current_event || thread_data->current_event->xany.window != data->whole_window) - return swp; + goto done; if (thread_data->current_event->type != ConfigureNotify && thread_data->current_event->type != PropertyNotify) - return swp; + goto done; TRACE( "win %p/%lx cmd %d at %s flags %08x\n", hwnd, data->whole_window, cmd, wine_dbgstr_rect(rect), swp ); @@ -2235,7 +2235,11 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) rect->bottom = y + height; OffsetRect( rect, virtual_screen_rect.left, virtual_screen_rect.top ); X11DRV_X_to_window_rect( data, rect ); - return swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); + swp &= ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); + +done: + release_win_data( data ); + return swp; }

1 0

Dmitry Timoshkov : gdiplus: Make GIF palettes in a custom test image slightly more different.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 5f9be70570c756b27b78a34caf9e30a7f146d38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9be70570c756b27b78a34ca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 16:05:45 2012 +0900 gdiplus: Make GIF palettes in a custom test image slightly more different. --- dlls/gdiplus/tests/image.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 59a5064..b792ebe 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3922,7 +3922,7 @@ static void test_DrawImage_scale(void) static const BYTE animatedgif[] = { 'G','I','F','8','9','a',0x01,0x00,0x01,0x00,0xA1,0x02,0x00, -0x6F,0x6F,0x6F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c, /*0x21,0xFF,0x0B,'A','N','I','M','E','X','T','S','1','.','0',*/ 0x21,0xFF,0x0B,'N','E','T','S','C','A','P','E','2','.','0', 0x03,0x01,0x05,0x00,0x00, @@ -3930,14 +3930,14 @@ static const BYTE animatedgif[] = { 0x21,0x01,0x0D,'a','n','i','m','a','t','i','o','n','.','g','i','f',0x00, 0x21,0xF9,0x04,0xff,0x0A,0x00,0x08,0x00, 0x2C,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, -0xDE,0xDE,0xDE,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x4C,0x01,0x00, +0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac, +0x02,0x02,0x4C,0x01,0x00, 0x21,0xFE,0x08,'i','m','a','g','e',' ','#','1',0x00, 0x21,0x01,0x0C,'p','l','a','i','n','t','e','x','t',' ','#','1',0x00, 0x21,0xF9,0x04,0x00,0x14,0x00,0x01,0x00, 0x2C,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, -0x4D,0x4D,0x4D,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x44,0x01,0x00, +0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xbb,0xbc, +0x02,0x02,0x44,0x01,0x00, 0x21,0xFE,0x08,'i','m','a','g','e',' ','#','2',0x00, 0x21,0x01,0x0C,'p','l','a','i','n','t','e','x','t',' ','#','2',0x00,0x3B }; @@ -3953,7 +3953,7 @@ static void test_gif_properties(void) { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,20,0,0,0 } }, { PropertyTagTypeASCII, PropertyTagExifUserComment, 13, { 'H','e','l','l','o',' ','W','o','r','l','d','!',0 } }, { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 5,0 } }, - { PropertyTagTypeByte, PropertyTagGlobalPalette, 12, { 0x6f,0x6f,0x6f,0,0,0,0,0,0,0,0,0 } }, + { PropertyTagTypeByte, PropertyTagGlobalPalette, 12, { 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c } }, { PropertyTagTypeByte, PropertyTagIndexBackground, 1, { 2 } }, { PropertyTagTypeByte, PropertyTagIndexTransparent, 1, { 8 } } };

1 0

Thomas Faber : rpcrt4: Match MSVC version of call_server_func with GCC.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 25b76525f3f6edfcf630f235ccf15e395d009e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b76525f3f6edfcf630f235c… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Sep 22 12:38:11 2012 +0200 rpcrt4: Match MSVC version of call_server_func with GCC. --- dlls/rpcrt4/ndr_stubless.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index db41a1a..d7a81bd 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -990,11 +990,12 @@ __declspec(naked) LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigne __asm { push ebp + mov ebp, esp push edi ; Save registers push esi - mov ebp, esp mov eax, [ebp+16] ; Get stack size sub esp, eax ; Make room in stack for arguments + and esp, 0xFFFFFFF0 mov edi, esp mov ecx, eax mov esi, [ebp+12]

1 0

Alistair Leslie-Hughes : scrrun: Silence unknown interfaces.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 5912bdeec2ec191a066e7b238e83eb7672f2ffe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5912bdeec2ec191a066e7b238… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 21 13:29:02 2012 +1000 scrrun: Silence unknown interfaces. --- dlls/scrrun/dictionary.c | 2 +- dlls/scrrun/scrrun.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index a02c957..7664af8 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -70,7 +70,7 @@ static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + WARN("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 932d124..cd07027 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -54,7 +54,7 @@ static HRESULT WINAPI scrruncf_QueryInterface(IClassFactory *iface, REFIID riid, return S_OK; } - FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); return E_NOINTERFACE; }

1 0

Alistair Leslie-Hughes : oledb32: Add IDataInitialize interface support.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 0fd6649988b72837d17de7fe28d10ec967cde801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd6649988b72837d17de7fe2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 24 14:20:13 2012 +1000 oledb32: Add IDataInitialize interface support. --- dlls/oledb32/Makefile.in | 1 + dlls/oledb32/datainit.c | 193 ++++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/main.c | 7 ++ dlls/oledb32/oledb_private.h | 1 + 4 files changed, 202 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index 5c66a2c..71e352b 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = uuid oleaut32 ole32 user32 advapi32 C_SRCS = \ convert.c \ + datainit.c \ main.c IDL_I_SRCS = convert.idl diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c new file mode 100644 index 0000000..af596fe --- /dev/null +++ b/dlls/oledb32/datainit.c @@ -0,0 +1,193 @@ +/* + * Copyright (C) 2012 Alistair Leslie-Hughes + * + * 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 <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "ole2.h" +#include "msdasc.h" +#include "oledberr.h" + +#include "oledb_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + + +typedef struct datainit +{ + IDataInitialize IDataInitialize_iface; + + LONG ref; +} datainit; + +static inline datainit *impl_from_IDataInitialize(IDataInitialize *iface) +{ + return CONTAINING_RECORD(iface, datainit, IDataInitialize_iface); +} + +static HRESULT WINAPI datainit_QueryInterface(IDataInitialize *iface, REFIID riid, void **obj) +{ + datainit *This = impl_from_IDataInitialize(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDataInitialize)) + { + *obj = &This->IDataInitialize_iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IDataInitialize_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI datainit_AddRef(IDataInitialize *iface) +{ + datainit *This = impl_from_IDataInitialize(iface); + TRACE("(%p)\n", This); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI datainit_Release(IDataInitialize *iface) +{ + datainit *This = impl_from_IDataInitialize(iface); + LONG ref; + + TRACE("(%p)\n", This); + + ref = InterlockedDecrement(&This->ref); + if(ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +/*** IDataInitialize methods ***/ +static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *pUnkOuter, DWORD dwClsCtx, + LPWSTR pwszInitializationString, REFIID riid, IUnknown **ppDataSource) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%p %d %s %s %p)\n", This, pUnkOuter, dwClsCtx, debugstr_w(pwszInitializationString), + debugstr_guid(riid), ppDataSource); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, IUnknown *pDataSource, + boolean fIncludePassword, LPWSTR *ppwszInitString) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%p %d %p)\n", This, pDataSource, fIncludePassword, ppwszInitString); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_CreateDBInstance(IDataInitialize *iface, REFCLSID clsidProvider, + IUnknown *pUnkOuter, DWORD dwClsCtx, LPWSTR pwszReserved, REFIID riid, + IUnknown **ppDataSource) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->()\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_RemoteCreateDBInstanceEx(IDataInitialize *iface, REFCLSID clsidProvider, + IUnknown *pUnkOuter, DWORD dwClsCtx, LPWSTR pwszReserved, COSERVERINFO *pServerInfo, + DWORD cmq, GUID **rgpIID, IUnknown **rgpItf, HRESULT *rghr) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->()\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_LoadStringFromStorage(IDataInitialize *iface, LPWSTR pwszFileName, + LPWSTR *ppwszInitializationString) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%s %p)\n", This, debugstr_w(pwszFileName), ppwszInitializationString); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_WriteStringToStorage(IDataInitialize *iface, LPWSTR pwszFileName, + LPWSTR pwszInitializationString, DWORD dwCreationDisposition) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%s %s %d)\n", This, debugstr_w(pwszFileName), debugstr_w(pwszInitializationString), dwCreationDisposition); + + return E_NOTIMPL; +} + + +static const struct IDataInitializeVtbl datainit_vtbl = +{ + datainit_QueryInterface, + datainit_AddRef, + datainit_Release, + datainit_GetDataSource, + datainit_GetInitializationString, + datainit_CreateDBInstance, + datainit_RemoteCreateDBInstanceEx, + datainit_LoadStringFromStorage, + datainit_WriteStringToStorage +}; + +HRESULT create_data_init(IUnknown *outer, void **obj) +{ + datainit *This; + + TRACE("(%p)\n", obj); + + if(outer) return CLASS_E_NOAGGREGATION; + + *obj = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if(!This) return E_OUTOFMEMORY; + + This->IDataInitialize_iface.lpVtbl = &datainit_vtbl; + This->ref = 1; + + *obj = &This->IDataInitialize_iface; + + return S_OK; +} diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index af81d77..e8a1d46 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "ole2.h" #include "rpcproxy.h" +#include "msdasc.h" #include "initguid.h" #include "msdaguid.h" @@ -127,6 +128,7 @@ static const IClassFactoryVtbl CF_Vtbl = }; static cf oledb_convert_cf = { { &CF_Vtbl }, create_oledb_convert }; +static cf oledb_datainit_cf = { { &CF_Vtbl }, create_data_init }; /****************************************************************** * DllGetClassObject @@ -140,6 +142,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) *obj = &oledb_convert_cf; return S_OK; } + else if ( IsEqualCLSID (rclsid, &CLSID_MSDAINITIALIZE) ) + { + *obj = &oledb_datainit_cf; + return S_OK; + } return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index a79d251..ad5d67f 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -18,3 +18,4 @@ */ HRESULT create_oledb_convert(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT create_data_init(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : uuid: Add msdasc.h.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: eda7615d699eb01a73e7bf7e30b12b7e804459e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda7615d699eb01a73e7bf7e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 24 13:44:00 2012 +1000 uuid: Add msdasc.h. --- dlls/uuid/uuid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index cae55c7..fd96fe3 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -84,6 +84,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "ocmm.h" #include "commoncontrols.h" #include "tlogstg.h" +#include "msdasc.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

Nikolay Sivov : mlang: Implement get source/ dest codepages for IMLangConvertCharset.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 031f3ca16714b78e7586efdd92890f8f5cc2bf2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=031f3ca16714b78e7586efdd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 24 12:06:28 2012 +0400 mlang: Implement get source/dest codepages for IMLangConvertCharset. --- dlls/mlang/mlang.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 388b99c..caae2c2 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3632,15 +3632,21 @@ static HRESULT WINAPI MLangConvertCharset_Initialize(IMLangConvertCharset *iface static HRESULT WINAPI MLangConvertCharset_GetSourceCodePage(IMLangConvertCharset *iface, UINT *src_cp) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - FIXME("(%p)->(%p): stub\n", This, src_cp); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, src_cp); + + *src_cp = This->src_cp; + return S_OK; } static HRESULT WINAPI MLangConvertCharset_GetDestinationCodePage(IMLangConvertCharset *iface, UINT *dst_cp) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - FIXME("(%p)->(%p): stub\n", This, dst_cp); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, dst_cp); + + *dst_cp = This->dst_cp; + return S_OK; } static HRESULT WINAPI MLangConvertCharset_GetProperty(IMLangConvertCharset *iface, DWORD *prop)

1 0

Nikolay Sivov : mlang: Store source and destination codepage ids in IMLangConvertCharset_Initialize .
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: ed42bf08dbd5077adf0db2ea6468f7f27cd9c418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed42bf08dbd5077adf0db2ea6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 24 01:15:11 2012 +0400 mlang: Store source and destination codepage ids in IMLangConvertCharset_Initialize. --- dlls/mlang/mlang.c | 15 +++++++++++++-- include/mlang.idl | 11 +++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index b5fd0eb..388b99c 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3563,6 +3563,9 @@ static const IMLangLineBreakConsoleVtbl IMLangLineBreakConsole_vtbl = struct convert_charset { IMLangConvertCharset IMLangConvertCharset_iface; LONG ref; + + UINT src_cp; + UINT dst_cp; }; static inline struct convert_charset *impl_from_IMLangConvertCharset(IMLangConvertCharset *iface) @@ -3614,8 +3617,16 @@ static HRESULT WINAPI MLangConvertCharset_Initialize(IMLangConvertCharset *iface UINT src_cp, UINT dst_cp, DWORD prop) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - FIXME("(%p)->(%u %u 0x%08x): stub\n", This, src_cp, dst_cp, prop); - return E_NOTIMPL; + + TRACE("(%p)->(%u %u 0x%08x)\n", This, src_cp, dst_cp, prop); + + if (prop) + FIXME("property 0x%08x not supported\n", prop); + + This->src_cp = src_cp; + This->dst_cp = dst_cp; + + return S_OK; } static HRESULT WINAPI MLangConvertCharset_GetSourceCodePage(IMLangConvertCharset *iface, UINT *src_cp) diff --git a/include/mlang.idl b/include/mlang.idl index 7cdc970..e153565 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -375,6 +375,17 @@ interface IEnumCodePage : IUnknown ] interface IMLangConvertCharset : IUnknown { + typedef enum tagMLCONVCHARF + { + MLCONVCHARF_AUTODETECT = 1, + MLCONVCHARF_ENTITIZE = 2, + MLCONVCHARF_NCR_ENTITIZE = 2, + MLCONVCHARF_NAME_ENTITIZE = 4, + MLCONVCHARF_USEDEFCHAR = 8, + MLCONVCHARF_NOBESTFITCHARS = 16, + MLCONVCHARF_DETECTJPN = 32 + } MLCONVCHAR; + HRESULT Initialize( [in] UINT uiSrcCodePage, [in] UINT uiDstCodePage,

1 0

Nikolay Sivov : mlang: Added IMLangConvertCharset stub.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: f5edf34c6cae2feb4626298182f24e1729b9fb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5edf34c6cae2feb462629818… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 24 00:01:55 2012 +0400 mlang: Added IMLangConvertCharset stub. --- dlls/mlang/mlang.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 159 insertions(+), 12 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index e9f48a0..b5fd0eb 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -47,6 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mlang); #define CP_UNICODE 1200 static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); +static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); static HINSTANCE instance; @@ -1297,6 +1298,7 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { { &CLSID_CMultiLanguage, "CLSID_CMultiLanguage", MultiLanguage_create }, + { &CLSID_CMLangConvertCharset, "CLSID_CMLangConvertCharset", MLangConvertCharset_create } }; static HRESULT WINAPI MLANGCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) @@ -2583,13 +2585,13 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766Info( static HRESULT WINAPI fnIMultiLanguage_CreateConvertCharset( IMultiLanguage* iface, - UINT uiSrcCodePage, - UINT uiDstCodePage, - DWORD dwProperty, - IMLangConvertCharset** ppMLangConvertCharset) + UINT src_cp, + UINT dst_cp, + DWORD prop, + IMLangConvertCharset** convert_charset) { - FIXME("\n"); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_CreateConvertCharset(&This->IMultiLanguage3_iface, src_cp, dst_cp, prop, convert_charset); } static const IMultiLanguageVtbl IMultiLanguage_vtbl = @@ -2955,13 +2957,19 @@ static HRESULT WINAPI fnIMultiLanguage2_GetRfc1766Info( static HRESULT WINAPI fnIMultiLanguage2_CreateConvertCharset( IMultiLanguage3* iface, - UINT uiSrcCodePage, - UINT uiDstCodePage, - DWORD dwProperty, - IMLangConvertCharset** ppMLangConvertCharset) + UINT src_cp, + UINT dst_cp, + DWORD prop, + IMLangConvertCharset** convert_charset) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%u %u 0x%08x %p)\n", src_cp, dst_cp, prop, convert_charset); + + hr = MLangConvertCharset_create(NULL, (void**)convert_charset); + if (FAILED(hr)) return hr; + + return IMLangConvertCharset_Initialize(*convert_charset, src_cp, dst_cp, prop); } static HRESULT WINAPI fnIMultiLanguage2_ConvertStringInIStream( @@ -3552,6 +3560,123 @@ static const IMLangLineBreakConsoleVtbl IMLangLineBreakConsole_vtbl = fnIMLangLineBreakConsole_BreakLineA }; +struct convert_charset { + IMLangConvertCharset IMLangConvertCharset_iface; + LONG ref; +}; + +static inline struct convert_charset *impl_from_IMLangConvertCharset(IMLangConvertCharset *iface) +{ + return CONTAINING_RECORD(iface, struct convert_charset, IMLangConvertCharset_iface); +} + +static HRESULT WINAPI MLangConvertCharset_QueryInterface(IMLangConvertCharset *iface, REFIID riid, void **obj) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMLangConvertCharset)) + { + *obj = &This->IMLangConvertCharset_iface; + IMLangConvertCharset_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI MLangConvertCharset_AddRef(IMLangConvertCharset *iface) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI MLangConvertCharset_Release(IMLangConvertCharset *iface) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + UnlockModule(); + } + + return ref; +} + +static HRESULT WINAPI MLangConvertCharset_Initialize(IMLangConvertCharset *iface, + UINT src_cp, UINT dst_cp, DWORD prop) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%u %u 0x%08x): stub\n", This, src_cp, dst_cp, prop); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_GetSourceCodePage(IMLangConvertCharset *iface, UINT *src_cp) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p): stub\n", This, src_cp); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_GetDestinationCodePage(IMLangConvertCharset *iface, UINT *dst_cp) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p): stub\n", This, dst_cp); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_GetProperty(IMLangConvertCharset *iface, DWORD *prop) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p): stub\n", This, prop); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_DoConversion(IMLangConvertCharset *iface, BYTE *src, + UINT *src_size, BYTE *dest, UINT *dest_size) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p %p %p %p): stub\n", This, src, src_size, dest, dest_size); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_DoConversionToUnicode(IMLangConvertCharset *iface, CHAR *src, + UINT *src_size, WCHAR *dest, UINT *dest_size) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p %p %p %p): stub\n", This, src, src_size, dest, dest_size); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_DoConversionFromUnicode(IMLangConvertCharset *iface, + WCHAR *src, UINT *src_size, CHAR *dest, UINT *dest_size) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p %p %p %p): stub\n", This, src, src_size, dest, dest_size); + return E_NOTIMPL; +} + +static const IMLangConvertCharsetVtbl MLangConvertCharsetVtbl = +{ + MLangConvertCharset_QueryInterface, + MLangConvertCharset_AddRef, + MLangConvertCharset_Release, + MLangConvertCharset_Initialize, + MLangConvertCharset_GetSourceCodePage, + MLangConvertCharset_GetDestinationCodePage, + MLangConvertCharset_GetProperty, + MLangConvertCharset_DoConversion, + MLangConvertCharset_DoConversionToUnicode, + MLangConvertCharset_DoConversionFromUnicode +}; + static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) { MLang_impl *mlang; @@ -3585,6 +3710,28 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) return S_OK; } +static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj) +{ + struct convert_charset *convert; + + if (outer) + return CLASS_E_NOAGGREGATION; + + *obj = NULL; + + convert = HeapAlloc(GetProcessHeap(), 0, sizeof(struct convert_charset)); + if (!convert) return E_OUTOFMEMORY; + + convert->IMLangConvertCharset_iface.lpVtbl = &MLangConvertCharsetVtbl; + convert->ref = 1; + + *obj = &convert->IMLangConvertCharset_iface; + + LockModule(); + + return S_OK; +} + /******************************************************************************/ HRESULT WINAPI DllCanUnloadNow(void)

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012