wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Francois Gouget : gdiplus/tests: Make pixels_to_units() static.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 1051a107a47a6a3f0927ad196c7ab914bf6a3d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1051a107a47a6a3f0927ad196… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 16 13:39:30 2012 +0200 gdiplus/tests: Make pixels_to_units() static. --- dlls/gdiplus/tests/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 1c6ef6e..ded80be 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -59,7 +59,7 @@ static REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) } /* converts value in pixels to a given unit */ -REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) +static REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) { switch (unit) {

1 0

Francois Gouget : msvcp90: Make basic_istream_read_str() static.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 0b8fc03379dadc117b8ee39d03784a8a43367425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8fc03379dadc117b8ee39d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 16 13:39:24 2012 +0200 msvcp90: Make basic_istream_read_str() static. --- dlls/msvcp90/ios.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 14e852d..cfef2f7 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -9574,7 +9574,7 @@ basic_istream_wchar* __cdecl basic_istream_short_read_bstr( basic_istream_wchar_get_basic_ios(istream)->strbuf->loc)); } -basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream, wchar_t *str, const ctype_wchar *ctype) +static basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream, wchar_t *str, const ctype_wchar *ctype) { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream); IOSB_iostate state = IOSTATE_failbit;

1 0

Alexandre Julliard : winex11: Get rid of the X11 locking functions.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 9980868b81844528f3c3610d67e0be45b218f23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9980868b81844528f3c3610d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 16:52:31 2012 +0200 winex11: Get rid of the X11 locking functions. --- dlls/winex11.drv/winex11.drv.spec | 4 ---- dlls/winex11.drv/x11drv.h | 3 --- dlls/winex11.drv/x11drv_main.c | 26 -------------------------- 3 files changed, 0 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 038c3e4..5b64dd7 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -61,10 +61,6 @@ @ cdecl LoadTabletInfo(long) X11DRV_LoadTabletInfo @ cdecl WTInfoW(long long ptr) X11DRV_WTInfoW -# X11 locks -@ cdecl -norelay wine_tsx11_lock() -@ cdecl -norelay wine_tsx11_unlock() - # Desktop @ cdecl wine_create_desktop(long long) X11DRV_create_desktop diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3aaedef..8566cd2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -63,9 +63,6 @@ typedef int Status; #define WINE_XDND_VERSION 4 -extern void CDECL wine_tsx11_lock(void); -extern void CDECL wine_tsx11_unlock(void); - /* X physical pen */ typedef struct { diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index f3c9d3f..0f94716 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -56,15 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); WINE_DECLARE_DEBUG_CHANNEL(synchronous); WINE_DECLARE_DEBUG_CHANNEL(winediag); -static CRITICAL_SECTION X11DRV_CritSection; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &X11DRV_CritSection, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": X11DRV_CritSection") } -}; -static CRITICAL_SECTION X11DRV_CritSection = { &critsect_debug, -1, 0, 0, 0, 0 }; - static Screen *screen; Visual *visual; XPixmapFormatValues **pixmap_formats; @@ -300,23 +291,6 @@ static int error_handler( Display *display, XErrorEvent *error_evt ) } /*********************************************************************** - * wine_tsx11_lock (X11DRV.@) - */ -void CDECL wine_tsx11_lock(void) -{ - EnterCriticalSection( &X11DRV_CritSection ); -} - -/*********************************************************************** - * wine_tsx11_unlock (X11DRV.@) - */ -void CDECL wine_tsx11_unlock(void) -{ - LeaveCriticalSection( &X11DRV_CritSection ); -} - - -/*********************************************************************** * init_pixmap_formats */ static void init_pixmap_formats( Display *display )

1 0

Alexandre Julliard : wined3d: Remove references to the (no longer used) X11 lock.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 3bd185c3df38509b1ee71cebf4cf2373cdf792f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd185c3df38509b1ee71cebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 16:52:16 2012 +0200 wined3d: Remove references to the (no longer used) X11 lock. --- dlls/wined3d/wined3d_main.c | 20 -------------------- dlls/wined3d/wined3d_private.h | 13 ------------- 2 files changed, 0 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index fb8493c..2247e9c 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -48,10 +48,6 @@ struct wined3d_wndproc_table static struct wined3d_wndproc_table wndproc_table; -int num_lock = 0; -void (CDECL *wine_tsx11_lock_ptr)(void) = NULL; -void (CDECL *wine_tsx11_unlock_ptr)(void) = NULL; - static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = { @@ -132,14 +128,9 @@ static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DW return ERROR_FILE_NOT_FOUND; } -static void CDECL wined3d_do_nothing(void) -{ -} - static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx; - HMODULE mod; char buffer[MAX_PATH+10]; DWORD size = sizeof(buffer); HKEY hkey = 0; @@ -183,17 +174,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) DisableThreadLibraryCalls(hInstDLL); - mod = GetModuleHandleA( "winex11.drv" ); - if (mod) - { - wine_tsx11_lock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_lock" ); - wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_unlock" ); - } - else /* We are most likely on Windows */ - { - wine_tsx11_lock_ptr = wined3d_do_nothing; - wine_tsx11_unlock_ptr = wined3d_do_nothing; - } /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */ if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey ) ) hkey = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c0b00bf..c23a6fa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -784,21 +784,8 @@ extern const struct wined3d_shader_backend_ops glsl_shader_backend DECLSPEC_HIDD extern const struct wined3d_shader_backend_ops arb_program_shader_backend DECLSPEC_HIDDEN; extern const struct wined3d_shader_backend_ops none_shader_backend DECLSPEC_HIDDEN; -/* X11 locking */ - -extern void (CDECL *wine_tsx11_lock_ptr)(void) DECLSPEC_HIDDEN; -extern void (CDECL *wine_tsx11_unlock_ptr)(void) DECLSPEC_HIDDEN; - -/* As GLX relies on X, this is needed */ -extern int num_lock DECLSPEC_HIDDEN; - -#if 0 -#define ENTER_GL() wine_tsx11_lock_ptr() -#define LEAVE_GL() wine_tsx11_unlock_ptr() -#else #define ENTER_GL() do {} while(0) #define LEAVE_GL() do {} while(0) -#endif /***************************************************************************** * Defines

1 0

Alexandre Julliard : winex11: Remove the remaining X11 locking calls.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: cf1be58706ef617215641e2d43f9bb70d9b68b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1be58706ef617215641e2d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 16:46:37 2012 +0200 winex11: Remove the remaining X11 locking calls. --- dlls/winex11.drv/brush.c | 6 ++-- dlls/winex11.drv/clipboard.c | 51 ++++++--------------------------------- dlls/winex11.drv/desktop.c | 5 ---- dlls/winex11.drv/event.c | 17 +------------ dlls/winex11.drv/mouse.c | 24 ++++--------------- dlls/winex11.drv/systray.c | 2 - dlls/winex11.drv/window.c | 48 ++++++++----------------------------- dlls/winex11.drv/wintab.c | 8 ------ dlls/winex11.drv/x11drv_main.c | 16 ++---------- dlls/winex11.drv/xdnd.c | 6 +--- dlls/winex11.drv/xim.c | 30 ++++------------------- dlls/winex11.drv/xinerama.c | 4 --- dlls/winex11.drv/xrandr.c | 30 +++++------------------ dlls/winex11.drv/xvidmode.c | 2 - 14 files changed, 44 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf1be58706ef617215641…

1 0

Alexandre Julliard : winex11: Add a critical section to protect the keyboard mapping tables.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 26fb3d4a69d3d63d79442bb782db9a946118eba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26fb3d4a69d3d63d79442bb78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 16:43:19 2012 +0200 winex11: Add a critical section to protect the keyboard mapping tables. --- dlls/winex11.drv/keyboard.c | 292 +++++++++++++++++++++---------------------- 1 files changed, 143 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26fb3d4a69d3d63d79442…

1 0

Alexandre Julliard : winex11: Create contexts at initialization time to avoid the need for locks.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: c970621d90372d14f982b41811efa4e4fe9e5ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c970621d90372d14f982b4181… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 15:51:06 2012 +0200 winex11: Create contexts at initialization time to avoid the need for locks. --- dlls/winex11.drv/mouse.c | 12 +++++------- dlls/winex11.drv/window.c | 6 +----- dlls/winex11.drv/x11drv.h | 4 ++++ dlls/winex11.drv/x11drv_main.c | 4 ++++ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e8ba8e3..caa2530 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -121,10 +121,11 @@ static const UINT button_up_data[NB_BUTTONS] = XBUTTON2 }; +XContext cursor_context = 0; + static HWND cursor_window; static HCURSOR last_cursor; static DWORD last_cursor_change; -static XContext cursor_context; static RECT clip_rect; static Cursor create_cursor( HANDLE handle ); @@ -200,16 +201,13 @@ void set_window_cursor( Window window, HCURSOR handle ) { Cursor cursor, prev; - wine_tsx11_lock(); if (!handle) cursor = get_empty_cursor(); - else if (!cursor_context || XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) + else if (XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) { /* try to create it */ - wine_tsx11_unlock(); if (!(cursor = create_cursor( handle ))) return; wine_tsx11_lock(); - if (!cursor_context) cursor_context = XUniqueContext(); if (!XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&prev )) { /* someone else was here first */ @@ -221,12 +219,12 @@ void set_window_cursor( Window window, HCURSOR handle ) XSaveContext( gdi_display, (XID)handle, cursor_context, (char *)cursor ); TRACE( "cursor %p created %lx\n", handle, cursor ); } + wine_tsx11_unlock(); } XDefineCursor( gdi_display, window, cursor ); /* make the change take effect immediately */ XFlush( gdi_display ); - wine_tsx11_unlock(); } /*********************************************************************** @@ -1205,7 +1203,7 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) Cursor cursor; wine_tsx11_lock(); - if (cursor_context && !XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) + if (!XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) { TRACE( "%p xid %lx\n", handle, cursor ); XFreeCursor( gdi_display, cursor ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index c69ef8c..c8e48b2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -75,7 +75,7 @@ int clipping_cursor = 0; XContext winContext = 0; /* X context to associate a struct x11drv_win_data to an hwnd */ -static XContext win_data_context; +XContext win_data_context = 0; /* time of last user event and window where it's stored */ static Time last_user_time; @@ -1914,11 +1914,7 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { data->hwnd = hwnd; - wine_tsx11_lock(); - if (!winContext) winContext = XUniqueContext(); - if (!win_data_context) win_data_context = XUniqueContext(); XSaveContext( display, (XID)hwnd, win_data_context, (char *)data ); - wine_tsx11_unlock(); } return data; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f24ccdc..3aaedef 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -615,6 +615,10 @@ static inline BOOL is_window_rect_fullscreen( const RECT *rect ) /* X context to associate a hwnd to an X window */ extern XContext winContext DECLSPEC_HIDDEN; +/* X context to associate a struct x11drv_win_data to an hwnd */ +extern XContext win_data_context DECLSPEC_HIDDEN; +/* X context to associate an X cursor to a Win32 cursor handle */ +extern XContext cursor_context DECLSPEC_HIDDEN; extern void X11DRV_InitClipboard(void) DECLSPEC_HIDDEN; extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 1499329..5659143 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -570,6 +570,10 @@ static BOOL process_attach(void) XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms ); + winContext = XUniqueContext(); + win_data_context = XUniqueContext(); + cursor_context = XUniqueContext(); + if (TRACE_ON(synchronous)) XSynchronize( display, True ); xinerama_init( WidthOfScreen(screen), HeightOfScreen(screen) );

1 0

Francois Gouget : wined3d: Change some internal function and structure names to the more standard ' converter' spelling.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: b2a7111a3d7d8523fc3bc11c6b270bf70a5dbd9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a7111a3d7d8523fc3bc11c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 16 12:58:54 2012 +0200 wined3d: Change some internal function and structure names to the more standard 'converter' spelling. --- dlls/wined3d/surface.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5e0eb5b..71beb51 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3710,13 +3710,13 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, } } -struct d3dfmt_convertor_desc +struct d3dfmt_converter_desc { enum wined3d_format_id from, to; void (*convert)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h); }; -static const struct d3dfmt_convertor_desc convertors[] = +static const struct d3dfmt_converter_desc converters[] = { {WINED3DFMT_R32_FLOAT, WINED3DFMT_R16_FLOAT, convert_r32_float_r16_float}, {WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_r5g6b5_x8r8g8b8}, @@ -3726,15 +3726,15 @@ static const struct d3dfmt_convertor_desc convertors[] = {WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5}, }; -static inline const struct d3dfmt_convertor_desc *find_convertor(enum wined3d_format_id from, +static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_format_id from, enum wined3d_format_id to) { unsigned int i; - for (i = 0; i < (sizeof(convertors) / sizeof(*convertors)); ++i) + for (i = 0; i < (sizeof(converters) / sizeof(*converters)); ++i) { - if (convertors[i].from == from && convertors[i].to == to) - return &convertors[i]; + if (converters[i].from == from && converters[i].to == to) + return &converters[i]; } return NULL; @@ -3754,11 +3754,11 @@ static inline const struct d3dfmt_convertor_desc *find_convertor(enum wined3d_fo static struct wined3d_surface *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt) { struct wined3d_map_desc src_map, dst_map; - const struct d3dfmt_convertor_desc *conv; + const struct d3dfmt_converter_desc *conv; struct wined3d_surface *ret = NULL; HRESULT hr; - conv = find_convertor(source->resource.format->id, to_fmt); + conv = find_converter(source->resource.format->id, to_fmt); if (!conv) { FIXME("Cannot find a conversion function from format %s to %s.\n",

1 0

Jacek Caban : comdlg32: Use proper helpers for iface calls.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: e5e2673984ec5ba14da8a91f12c3e72f9caa30b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e2673984ec5ba14da8a91f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 13:19:27 2012 +0200 comdlg32: Use proper helpers for iface calls. --- dlls/comdlg32/filedlgbrowser.c | 28 ++++++++++++---------------- dlls/comdlg32/itemdlg.c | 4 ++-- dlls/comdlg32/tests/itemdlg.c | 12 ++++++------ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 776abfc..1dda9a8 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -226,26 +226,22 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown)) /*IUnknown*/ - { *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IOleWindow)) /*IOleWindow*/ - { *ppvObj = This; - } - - else if(IsEqualIID(riid, &IID_IShellBrowser)) /*IShellBrowser*/ - { *ppvObj = This; - } - - else if(IsEqualIID(riid, &IID_ICommDlgBrowser)) /*ICommDlgBrowser*/ + if(IsEqualIID(riid, &IID_IUnknown)) + *ppvObj = &This->IShellBrowser_iface; + else if(IsEqualIID(riid, &IID_IOleWindow)) + *ppvObj = &This->IShellBrowser_iface; + else if(IsEqualIID(riid, &IID_IShellBrowser)) + *ppvObj = &This->IShellBrowser_iface; + else if(IsEqualIID(riid, &IID_ICommDlgBrowser)) *ppvObj = &This->ICommDlgBrowser_iface; - else if(IsEqualIID(riid, &IID_IServiceProvider)) /* IServiceProvider */ + else if(IsEqualIID(riid, &IID_IServiceProvider)) *ppvObj = &This->IServiceProvider_iface; - if(*ppvObj) - { IUnknown_AddRef( (IShellBrowser*) *ppvObj); - return S_OK; + if(*ppvObj) { + IUnknown_AddRef((IUnknown*)*ppvObj); + return S_OK; } + FIXME("Unknown interface requested\n"); return E_NOINTERFACE; } diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 69ef528..a9cc6bf 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -506,7 +506,7 @@ static HRESULT on_default_action(FileDialogImpl *This) pidla[i] = COMDLG32_SHSimpleIDListFromPathAW(canon_filename); if(psf_parent && !(open_action == ONOPEN_BROWSE)) - IShellItem_Release(psf_parent); + IShellFolder_Release(psf_parent); fn_iter += (WCHAR)lstrlenW(fn_iter) + 1; } @@ -528,7 +528,7 @@ static HRESULT on_default_action(FileDialogImpl *This) if(FAILED(hr)) ERR("Failed to browse to directory: %08x\n", hr); - IShellItem_Release(psf_parent); + IShellFolder_Release(psf_parent); break; case ONOPEN_OPEN: diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 208ec8c..ce05ed8 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -369,7 +369,7 @@ static BOOL test_instantiation(void) hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogEvents, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(pfd); + if(SUCCEEDED(hr)) IFileDialog_Release(pfd); hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IExplorerBrowser, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); @@ -379,7 +379,7 @@ static BOOL test_instantiation(void) ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IFileOpenDialog_QueryInterface(pfsd, &IID_ICommDlgBrowser3, (void**)&punk); + hr = IFileSaveDialog_QueryInterface(pfsd, &IID_ICommDlgBrowser3, (void**)&punk); ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); @@ -1378,7 +1378,7 @@ static void test_customize(void) &IID_IFileDialog, (void**)&pfod); ok(hr == S_OK, "got 0x%08x.\n", hr); - hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); + hr = IFileDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); ok(hr == S_OK, "got 0x%08x.\n", hr); if(FAILED(hr)) { @@ -1666,7 +1666,7 @@ static void test_customize(void) IFileDialogEvents_Release(pfde); IFileDialogCustomize_Release(pfdc); - ref = IFileOpenDialog_Release(pfod); + ref = IFileDialog_Release(pfod); ok(!ref, "Refcount not zero (%d).\n", ref); @@ -1674,7 +1674,7 @@ static void test_customize(void) &IID_IFileDialog, (void**)&pfod); ok(hr == S_OK, "got 0x%08x.\n", hr); - hr = IFileDialogCustomize_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); + hr = IFileDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfdc); ok(hr == S_OK, "got 0x%08x.\n", hr); i = 0; @@ -1884,7 +1884,7 @@ static void test_customize(void) } IFileDialogCustomize_Release(pfdc); - ref = IFileOpenDialog_Release(pfod); + ref = IFileDialog_Release(pfod); ok(!ref, "Refcount not zero (%d).\n", ref); }

1 0

Qian Hong : riched20/tests: Fixed typo in test_EM_STREAMIN.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 7839d134e9955b35b8e640a346f7cf408d49cf26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7839d134e9955b35b8e640a34… Author: Qian Hong <fracting(a)gmail.com> Date: Thu Aug 16 19:01:03 2012 +0800 riched20/tests: Fixed typo in test_EM_STREAMIN. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6a20b19..27f4fee 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5146,7 +5146,7 @@ static void test_EM_STREAMIN(void) result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == length5, - "EM_STREAMIN: Test 4 returned %ld, expected %d\n", result, length5); + "EM_STREAMIN: Test 5 returned %ld, expected %d\n", result, length5); ok(es.dwError == 0, "EM_STREAMIN: Test 5 set error %d, expected %d\n", es.dwError, 0); DestroyWindow(hwndRichEdit);

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
55
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 August 2012