winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2017
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
492 discussions
Start a n
N
ew thread
Henri Verbeet : wined3d: Use winediag for the backbuffer offscreen rendering message.
by Alexandre Julliard
11 Jan '17
11 Jan '17
Module: wine Branch: master Commit: 459afa4791f03452058fb5839454892f5d90c514 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=459afa4791f03452058fb5839…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 10 22:35:52 2017 +0100 wined3d: Use winediag for the backbuffer offscreen rendering message. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 3e6bb7a..eb566bc 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -227,7 +227,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { if (!strcmp(buffer,"backbuffer")) { - TRACE("Using the backbuffer for offscreen rendering\n"); + ERR_(winediag)("Using the backbuffer for offscreen rendering.\n"); wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; } else if (!strcmp(buffer,"fbo"))
1
0
0
0
Henri Verbeet : ddraw/tests: Try to avoid killing the Intel (kernel) driver.
by Alexandre Julliard
11 Jan '17
11 Jan '17
Module: wine Branch: master Commit: 544fd16c15943fecec9ad03d201d24f5775c1224 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=544fd16c15943fecec9ad03d2…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 10 22:35:51 2017 +0100 ddraw/tests: Try to avoid killing the Intel (kernel) driver. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 97 ++++++++++++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw2.c | 97 ++++++++++++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw4.c | 77 ++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw7.c | 77 ++++++++++++++++++++++++------------- 4 files changed, 228 insertions(+), 120 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=544fd16c15943fecec9ad…
1
0
0
0
Louis Lenders : advapi32: Spelling fix in comment.
by Alexandre Julliard
10 Jan '17
10 Jan '17
Module: wine Branch: master Commit: 05f9b023d2996984dda3b8143e80a2b5037968b3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=05f9b023d2996984dda3b8143…
Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jan 10 16:17:55 2017 +0100 advapi32: Spelling fix in comment. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 28331df..7e41c0a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2688,7 +2688,7 @@ BOOL WINAPI AddAuditAccessAce( } /****************************************************************************** - * AddAuditAccessAce [ADVAPI32.@] + * AddAuditAccessAceEx [ADVAPI32.@] */ BOOL WINAPI AddAuditAccessAceEx( IN OUT PACL pAcl,
1
0
0
0
Alexandre Julliard : winex11: Periodically check for selection changes using a timer.
by Alexandre Julliard
10 Jan '17
10 Jan '17
Module: wine Branch: master Commit: d4f8366fa61b0f7a20b2b71272a40ef09e617140 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d4f8366fa61b0f7a20b2b7127…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:23:37 2017 +0100 winex11: Periodically check for selection changes using a timer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 8afe2c2..1d7dbad 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1852,6 +1852,7 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_size = size; last_clipboard_update = GetTickCount64(); CloseClipboard(); + SetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL ); return TRUE; } @@ -1888,9 +1889,14 @@ static LRESULT CALLBACK clipboard_wndproc( HWND hwnd, UINT msg, WPARAM wp, LPARA case WM_RENDERFORMAT: if (render_format( wp )) rendered_formats++; break; + case WM_TIMER: + if (!is_clipboard_owner) break; + request_selection_contents( thread_display(), FALSE ); + break; case WM_DESTROYCLIPBOARD: TRACE( "WM_DESTROYCLIPBOARD: lost ownership\n" ); is_clipboard_owner = FALSE; + KillTimer( hwnd, 1 ); break; } return DefWindowProcW( hwnd, msg, wp, lp );
1
0
0
0
Alexandre Julliard : winex11: Don' t update the clipboard if the X11 selection hasn't changed.
by Alexandre Julliard
10 Jan '17
10 Jan '17
Module: wine Branch: master Commit: 1137e3502dc7e27e9db64c18436bfbc27a763820 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1137e3502dc7e27e9db64c184…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:23:20 2017 +0100 winex11: Don't update the clipboard if the X11 selection hasn't changed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 84 +++++++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 25 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 3ff8453..8afe2c2 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -191,6 +191,7 @@ static BOOL is_clipboard_owner; static Window selection_window; static Window import_window; static Atom current_selection; +static UINT rendered_formats; static ULONG64 last_clipboard_update; static struct clipboard_format **current_x11_formats; static unsigned int nb_current_x11_formats; @@ -1025,13 +1026,13 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select /************************************************************************** * render_format */ -static void render_format( UINT id ) +static HANDLE render_format( UINT id ) { Display *display = thread_display(); unsigned int i; HANDLE handle = 0; - if (!current_selection) return; + if (!current_selection) return 0; for (i = 0; i < nb_current_x11_formats; i++) { @@ -1040,6 +1041,7 @@ static void render_format( UINT id ) if (handle) SetClipboardData( id, handle ); break; } + return handle; } @@ -1778,45 +1780,77 @@ static void release_selection( Display *display, Time time ) * * Retrieve the contents of the X11 selection when it's owned by an X11 app. */ -static void request_selection_contents( Display *display ) +static BOOL request_selection_contents( Display *display, BOOL changed ) { struct clipboard_format *targets = find_x11_format( x11drv_atom(TARGETS) ); struct clipboard_format *string = find_x11_format( XA_STRING ); + struct clipboard_format *format = NULL; + Window owner = 0; + unsigned char *data = NULL; + unsigned long size = 0; + Atom type = 0; + + static Atom last_selection; + static Window last_owner; + static struct clipboard_format *last_format; + static Atom last_type; + static unsigned char *last_data; + static unsigned long last_size; assert( targets ); assert( string ); current_selection = 0; - if (use_primary_selection && XGetSelectionOwner( display, XA_PRIMARY )) + if (use_primary_selection) { - if (import_selection( display, import_window, XA_PRIMARY, targets )) + if ((owner = XGetSelectionOwner( display, XA_PRIMARY ))) current_selection = XA_PRIMARY; - else - import_selection( display, import_window, XA_PRIMARY, string ); } - else if (XGetSelectionOwner( display, x11drv_atom(CLIPBOARD) )) + if (!current_selection) { - if (import_selection( display, import_window, x11drv_atom(CLIPBOARD), targets )) + if ((owner = XGetSelectionOwner( display, x11drv_atom(CLIPBOARD) ))) current_selection = x11drv_atom(CLIPBOARD); - else - import_selection( display, import_window, x11drv_atom(CLIPBOARD), string ); } -} + if (current_selection) + { + if (convert_selection( display, import_window, current_selection, targets, &type, &data, &size )) + format = targets; + else if (convert_selection( display, import_window, current_selection, string, &type, &data, &size )) + format = string; + } + + changed = (changed || + rendered_formats || + last_selection != current_selection || + last_owner != owner || + last_format != format || + last_type != type || + last_size != size || + memcmp( last_data, data, size )); + + if (!changed) + { + HeapFree( GetProcessHeap(), 0, data ); + return FALSE; + } -/************************************************************************** - * grab_win32_clipboard - * - * Grab the Win32 clipboard when an X11 app has grabbed the X11 selection, - * and fill it with the selection contents. - */ -static BOOL grab_win32_clipboard( Display *display ) -{ if (!OpenClipboard( clipboard_hwnd )) return FALSE; + TRACE( "selection changed, importing\n" ); EmptyClipboard(); is_clipboard_owner = TRUE; + rendered_formats = 0; + + if (format) format->import( type, data, size ); + + HeapFree( GetProcessHeap(), 0, last_data ); + last_selection = current_selection; + last_owner = owner; + last_format = format; + last_type = type; + last_data = data; + last_size = size; last_clipboard_update = GetTickCount64(); - request_selection_contents( display ); CloseClipboard(); return TRUE; } @@ -1832,7 +1866,7 @@ BOOL update_clipboard( HWND hwnd ) if (hwnd != clipboard_hwnd) return TRUE; if (!is_clipboard_owner) return TRUE; if (GetTickCount64() - last_clipboard_update <= SELECTION_UPDATE_DELAY) return TRUE; - return grab_win32_clipboard( thread_display() ); + return request_selection_contents( thread_display(), FALSE ); } @@ -1852,7 +1886,7 @@ static LRESULT CALLBACK clipboard_wndproc( HWND hwnd, UINT msg, WPARAM wp, LPARA acquire_selection( thread_init_display() ); break; case WM_RENDERFORMAT: - render_format( wp ); + if (render_format( wp )) rendered_formats++; break; case WM_DESTROYCLIPBOARD: TRACE( "WM_DESTROYCLIPBOARD: lost ownership\n" ); @@ -1935,7 +1969,7 @@ static DWORD WINAPI clipboard_thread( void *arg ) clipboard_thread_id = GetCurrentThreadId(); AddClipboardFormatListener( clipboard_hwnd ); register_builtin_formats(); - grab_win32_clipboard( clipboard_display ); + request_selection_contents( clipboard_display, TRUE ); TRACE( "clipboard thread %04x running\n", GetCurrentThreadId() ); while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg ); @@ -2014,7 +2048,7 @@ BOOL X11DRV_SelectionClear( HWND hwnd, XEvent *xev ) if (event->selection != x11drv_atom(CLIPBOARD)) return FALSE; release_selection( event->display, event->time ); - grab_win32_clipboard( event->display ); + request_selection_contents( event->display, TRUE ); return FALSE; }
1
0
0
0
Alexandre Julliard : winex11: Merge reading the selection data into the conversion function.
by Alexandre Julliard
10 Jan '17
10 Jan '17
Module: wine Branch: master Commit: e4cc5bf1b9db23aa8d3adc7bca6abf079c6a1b2b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e4cc5bf1b9db23aa8d3adc7bc…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:21:46 2017 +0100 winex11: Merge reading the selection data into the conversion function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f56fd4f..3ff8453 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -133,8 +133,8 @@ static BOOL export_targets( Display *display, Window win, Atom prop, Atom target static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL X11DRV_CLIPBOARD_ReadProperty( Display *display, Window w, Atom prop, - Atom *type, unsigned char **data, unsigned long *datasize ); +static BOOL read_property( Display *display, Window w, Atom prop, + Atom *type, unsigned char **data, unsigned long *datasize ); /* Clipboard formats */ @@ -435,22 +435,28 @@ static void put_property( Display *display, Window win, Atom prop, Atom type, in /************************************************************************** * convert_selection */ -static Atom convert_selection( Display *display, Window win, Atom selection, Atom target ) +static BOOL convert_selection( Display *display, Window win, Atom selection, + struct clipboard_format *format, Atom *type, + unsigned char **data, unsigned long *size ) { int i; XEvent event; - XConvertSelection( display, selection, target, x11drv_atom(SELECTION_DATA), win, CurrentTime ); + TRACE( "import %s from %s win %lx to format %s\n", + debugstr_xatom( format->atom ), debugstr_xatom( selection ), + win, debugstr_format( format->id ) ); + + XConvertSelection( display, selection, format->atom, x11drv_atom(SELECTION_DATA), win, CurrentTime ); for (i = 0; i < SELECTION_RETRIES; i++) { Bool res = XCheckTypedWindowEvent( display, win, SelectionNotify, &event ); - if (res && event.xselection.selection == selection && event.xselection.target == target) - return event.xselection.property; + if (res && event.xselection.selection == selection && event.xselection.target == format->atom) + return read_property( display, win, event.xselection.property, type, data, size ); usleep( SELECTION_WAIT ); } ERR( "Timed out waiting for SelectionNotify event\n" ); - return None; + return FALSE; } @@ -975,25 +981,16 @@ static HANDLE import_selection( Display *display, Window win, Atom selection, { unsigned char *data; unsigned long size; - Atom prop, type; + Atom type; HANDLE ret; if (!format->import) return 0; - TRACE( "import %s from %s win %lx to format %s\n", - debugstr_xatom( format->atom ), debugstr_xatom( selection ), - win, debugstr_format( format->id ) ); - - if ((prop = convert_selection( display, win, selection, format->atom )) == None) + if (!convert_selection( display, win, selection, format, &type, &data, &size )) { TRACE( "failed to convert selection\n" ); return 0; } - if (!X11DRV_CLIPBOARD_ReadProperty( display, win, prop, &type, &data, &size )) - { - TRACE( "failed to read property\n" ); - return 0; - } ret = format->import( type, data, size ); HeapFree( GetProcessHeap(), 0, data ); return ret; @@ -1627,11 +1624,12 @@ struct clipboard_data_packet { }; /************************************************************************** - * X11DRV_CLIPBOARD_ReadProperty + * read_property + * * Reads the contents of the X selection property. */ -static BOOL X11DRV_CLIPBOARD_ReadProperty( Display *display, Window w, Atom prop, - Atom *type, unsigned char** data, unsigned long* datasize ) +static BOOL read_property( Display *display, Window w, Atom prop, + Atom *type, unsigned char **data, unsigned long *datasize ) { XEvent xe;
1
0
0
0
Nikolay Sivov : shell32/tests: Test valid special folder IDs with NameSpace() method.
by Alexandre Julliard
10 Jan '17
10 Jan '17
Module: wine Branch: master Commit: dba1a78a2013d845e5cf6f9abefefe450005cde0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dba1a78a2013d845e5cf6f9ab…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 16:49:51 2017 +0300 shell32/tests: Test valid special folder IDs with NameSpace() method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 61 +++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 3f2d902..0c71125 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -58,6 +58,48 @@ static void init_function_pointers(void) static void test_namespace(void) { + static const ShellSpecialFolderConstants special_folders[] = + { + ssfDESKTOP, + ssfPROGRAMS, + ssfCONTROLS, + ssfPRINTERS, + ssfPERSONAL, + ssfFAVORITES, + ssfSTARTUP, + ssfRECENT, + ssfSENDTO, + ssfBITBUCKET, + ssfSTARTMENU, + ssfDESKTOPDIRECTORY, + ssfDRIVES, + ssfNETWORK, + ssfNETHOOD, + ssfFONTS, + ssfTEMPLATES, + ssfCOMMONSTARTMENU, + ssfCOMMONPROGRAMS, + ssfCOMMONSTARTUP, + ssfCOMMONDESKTOPDIR, + ssfAPPDATA, + ssfPRINTHOOD, + ssfLOCALAPPDATA, + ssfALTSTARTUP, + ssfCOMMONALTSTARTUP, + ssfCOMMONFAVORITES, + ssfINTERNETCACHE, + ssfCOOKIES, + ssfHISTORY, + ssfCOMMONAPPDATA, + ssfWINDOWS, + ssfSYSTEM, + ssfPROGRAMFILES, + ssfMYPICTURES, + ssfPROFILE, + ssfSYSTEMx86, + ssfPROGRAMFILESx86, + }; + static const WCHAR backslashW[] = {'\\',0}; static const WCHAR clsidW[] = { ':',':','{','6','4','5','F','F','0','4','0','-','5','0','8','1','-', @@ -73,7 +115,7 @@ static void test_namespace(void) FolderItem *item; VARIANT var; BSTR title, item_path; - int len; + int len, i; r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, &IID_IShellDispatch, (LPVOID*)&sd); @@ -92,6 +134,21 @@ static void test_namespace(void) ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(folder == NULL, "expected NULL, got %p\n", folder); + /* test valid folder ids */ + for (i = 0; i < sizeof(special_folders)/sizeof(special_folders[0]); i++) + { + V_VT(&var) = VT_I4; + V_I4(&var) = special_folders[i]; + folder = (void*)0xdeadbeef; + r = IShellDispatch_NameSpace(sd, var, &folder); + if (special_folders[i] == ssfALTSTARTUP || special_folders[i] == ssfCOMMONALTSTARTUP) + ok(r == S_OK || broken(r == S_FALSE) /* winxp */, "Failed to get folder for index %#x, got %08x\n", special_folders[i], r); + else + ok(r == S_OK, "Failed to get folder for index %#x, got %08x\n", special_folders[i], r); + if (folder) + Folder_Release(folder); + } + V_VT(&var) = VT_I4; V_I4(&var) = -1; folder = (void*)0xdeadbeef; @@ -99,6 +156,8 @@ static void test_namespace(void) todo_wine { ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(folder == NULL, "got %p\n", folder); + if (r == S_OK) + Folder_Release(folder); } V_VT(&var) = VT_I4; V_I4(&var) = ssfPROGRAMFILES;
1
0
0
0
Francois Gouget : msacm32/tests: Make acm_driver_func() static.
by Alexandre Julliard
10 Jan '17
10 Jan '17
Module: wine Branch: master Commit: 199af34f08ffadcb5197c99b0c02ddf78cb17ad6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=199af34f08ffadcb5197c99b0…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:40:23 2017 +0100 msacm32/tests: Make acm_driver_func() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 0816cb0..6e79f46 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -848,7 +848,7 @@ static struct int other; } driver_calls; -LRESULT CALLBACK acm_driver_func(DWORD_PTR id, HDRVR handle, UINT msg, LPARAM param1, LPARAM param2) +static LRESULT CALLBACK acm_driver_func(DWORD_PTR id, HDRVR handle, UINT msg, LPARAM param1, LPARAM param2) { switch (msg) {
1
0
0
0
Francois Gouget : imm32/tests: A spelling fix in an ok() message.
by Alexandre Julliard
10 Jan '17
10 Jan '17
Module: wine Branch: master Commit: a0a22397fdc7dc6872c42a4f7c9d57bfd08a3924 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a0a22397fdc7dc6872c42a4f7…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:44:43 2017 +0100 imm32/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index a2072e9..b02f85d 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1050,7 +1050,7 @@ static DWORD WINAPI test_default_ime_with_message_only_window_cb(void *arg) CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, hwnd1, NULL, GetModuleHandleW(NULL), NULL); default_ime_wnd = ImmGetDefaultIMEWnd(hwnd2); - ok(IsWindow(default_ime_wnd), "Expected IME window existance\n"); + ok(IsWindow(default_ime_wnd), "Expected IME window existence\n"); DestroyWindow(hwnd2); DestroyWindow(hwnd1);
1
0
0
0
Francois Gouget : usp10: A spelling fix in a comment.
by Alexandre Julliard
10 Jan '17
10 Jan '17
Module: wine Branch: master Commit: c705eca8cb10a47e713c69153f18f15e4889d08e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c705eca8cb10a47e713c69153…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:43:43 2017 +0100 usp10: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3ee412a..1c8d064 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2155,7 +2155,7 @@ static inline int unicode_lex(WCHAR c) switch( type ) { case 0x0d07: /* Unknown */ - case 0x0e07: /* Unknwon */ + case 0x0e07: /* Unknown */ default: return lex_Generic; case 0x0001: case 0x0002:
1
0
0
0
← Newer
1
...
38
39
40
41
42
43
44
...
50
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
Results per page:
10
25
50
100
200