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
March 2013
----- 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
531 discussions
Start a n
N
ew thread
Ken Thomases : winemac: Fail gracefully and early when run from a non-GUI session.
by Alexandre Julliard
05 Mar '13
05 Mar '13
Module: wine Branch: master Commit: c76f0beeab7e463841830843297af3734792f8ab URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c76f0beeab7e4638418308432…
Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 4 14:46:46 2013 -0600 winemac: Fail gracefully and early when run from a non-GUI session. --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/macdrv_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 5b9def0..fcd41b4 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,6 +1,6 @@ MODULE = winemac.drv IMPORTS = user32 gdi32 advapi32 -EXTRALIBS = -framework AppKit -framework Carbon +EXTRALIBS = -framework AppKit -framework Carbon -framework Security C_SRCS = \ display.c \ diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index abd5522..cd1cc0c 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -21,6 +21,8 @@ */ #include "config.h" +#include <Security/AuthSession.h> + #include "macdrv.h" #include "wine/server.h" @@ -69,8 +71,15 @@ const char* debugstr_cf(CFTypeRef t) */ static BOOL process_attach(void) { + SessionAttributeBits attributes; + OSStatus status; + assert(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); + status = SessionGetInfo(callerSecuritySession, NULL, &attributes); + if (status != noErr || !(attributes & sessionHasGraphicAccess)) + return FALSE; + if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; macdrv_err_on = ERR_ON(macdrv);
1
0
0
0
Jörg Höhle : mmsystem: MIDIHDR. dwOffset exists since Win 32 only, not in 16 bit code.
by Alexandre Julliard
05 Mar '13
05 Mar '13
Module: wine Branch: master Commit: 7b21da56ec08efc5d637c55d8a19e7074abc0d7d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7b21da56ec08efc5d637c55d8…
Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 27 18:32:17 2013 +0100 mmsystem: MIDIHDR.dwOffset exists since Win 32 only, not in 16 bit code. --- dlls/mmsystem.dll16/message16.c | 38 ++++++++++++++------------------------ 1 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index 24ae6ef..012d3dc 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -119,13 +119,11 @@ static void MMSYSTDRV_MidiIn_MapCB(UINT uMsg, DWORD_PTR* dwUser, DW { LPMIDIHDR mh32 = (LPMIDIHDR)(*dwParam1); SEGPTR segmh16 = *(SEGPTR*)((LPSTR)mh32 - sizeof(LPMIDIHDR)); - LPMIDIHDR mh16 = MapSL(segmh16); + LPMIDIHDR16 mh16 = MapSL(segmh16); *dwParam1 = (DWORD)segmh16; mh16->dwFlags = mh32->dwFlags; mh16->dwBytesRecorded = mh32->dwBytesRecorded; - if (mh16->reserved >= sizeof(MIDIHDR)) - mh16->dwOffset = mh32->dwOffset; } break; default: @@ -178,7 +176,7 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (UINT wMsg, DWORD_PTR* lpP case MODM_PREPARE: { LPMIDIHDR mh32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPMIDIHDR) + sizeof(MIDIHDR)); - LPMIDIHDR mh16 = MapSL(*lpParam1); + LPMIDIHDR16 mh16 = MapSL(*lpParam1); if (mh32) { *(LPMIDIHDR*)mh32 = (LPMIDIHDR)*lpParam1; @@ -188,12 +186,9 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (UINT wMsg, DWORD_PTR* lpP mh32->dwBytesRecorded = mh16->dwBytesRecorded; mh32->dwUser = mh16->dwUser; mh32->dwFlags = mh16->dwFlags; - mh32->dwOffset = (*lpParam2 >= sizeof(MIDIHDR)) ? mh16->dwOffset : 0; - mh16->lpNext = mh32; /* for reuse in unprepare and write */ - /* store size of passed MIDIHDR?? structure to know if dwOffset is available or not */ - mh16->reserved = *lpParam2; + mh16->lpNext = (MIDIHDR16*)mh32; /* for reuse in unprepare and write */ *lpParam1 = (DWORD)mh32; - *lpParam2 = sizeof(MIDIHDR); + *lpParam2 = offsetof(MIDIHDR,dwOffset); /* old size, without dwOffset */ ret = MMSYSTEM_MAP_OKMEM; } else { @@ -204,11 +199,11 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (UINT wMsg, DWORD_PTR* lpP case MODM_UNPREPARE: case MODM_LONGDATA: { - LPMIDIHDR mh16 = MapSL(*lpParam1); - LPMIDIHDR mh32 = mh16->lpNext; + LPMIDIHDR16 mh16 = MapSL(*lpParam1); + LPMIDIHDR mh32 = (MIDIHDR*)mh16->lpNext; *lpParam1 = (DWORD)mh32; - *lpParam2 = sizeof(MIDIHDR); + *lpParam2 = offsetof(MIDIHDR,dwOffset); /* dwBufferLength can be reduced between prepare & write */ if (wMsg == MODM_LONGDATA && mh32->dwBufferLength < mh16->dwBufferLength) { ERR("Size of buffer has been increased from %d to %d, keeping initial value\n", @@ -273,12 +268,10 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lp case MODM_LONGDATA: { LPMIDIHDR mh32 = (LPMIDIHDR)(*lpParam1); - LPMIDIHDR mh16 = MapSL(*(SEGPTR*)((LPSTR)mh32 - sizeof(LPMIDIHDR))); + LPMIDIHDR16 mh16 = MapSL(*(SEGPTR*)((LPSTR)mh32 - sizeof(LPMIDIHDR))); - assert(mh16->lpNext == mh32); + assert((MIDIHDR*)mh16->lpNext == mh32); mh16->dwFlags = mh32->dwFlags; - if (mh16->reserved >= sizeof(MIDIHDR)) - mh16->dwOffset = mh32->dwOffset; if (wMsg == MODM_UNPREPARE && fn_ret == MMSYSERR_NOERROR) { HeapFree(GetProcessHeap(), 0, (LPSTR)mh32 - sizeof(LPMIDIHDR)); @@ -307,24 +300,21 @@ static void MMSYSTDRV_MidiOut_MapCB(UINT uMsg, DWORD_PTR* dwUser, DWORD_PTR* dw case MOM_CLOSE: /* dwParam1 & dwParam2 are supposed to be 0, nothing to do */ break; + case MOM_POSITIONCB: + /* MIDIHDR.dwOffset exists since Win 32 only */ + FIXME("MOM_POSITIONCB/MEVT_F_CALLBACK wants MIDIHDR.dwOffset in 16 bit code\n"); + /* fall through */ case MOM_DONE: { /* initial map is: 16 => 32 */ LPMIDIHDR mh32 = (LPMIDIHDR)(*dwParam1); SEGPTR segmh16 = *(SEGPTR*)((LPSTR)mh32 - sizeof(LPMIDIHDR)); - LPMIDIHDR mh16 = MapSL(segmh16); + LPMIDIHDR16 mh16 = MapSL(segmh16); *dwParam1 = (DWORD)segmh16; mh16->dwFlags = mh32->dwFlags; - if (mh16->reserved >= sizeof(MIDIHDR)) - mh16->dwOffset = mh32->dwOffset; } break; - case MOM_POSITIONCB: - FIXME("NIY\n"); - /* FIXME: would require to recreate a 16bit MIDIHDR here */ - *dwParam1 = *dwParam2 = 0; - break; default: ERR("Unknown msg %u\n", uMsg); }
1
0
0
0
Jörg Höhle : winmm: Don' t log the uninitialised MCI output buffer in case of error.
by Alexandre Julliard
05 Mar '13
05 Mar '13
Module: wine Branch: master Commit: fe7a057a32177e22a201ac56f9b9eacc55ecd07d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fe7a057a32177e22a201ac56f…
Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Feb 28 18:10:03 2013 +0100 winmm: Don't log the uninitialised MCI output buffer in case of error. --- dlls/winmm/mci.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 8f26c1e..5c91045 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1579,11 +1579,12 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, } else { dwRet = MCI_SendCommand(wmd ? wmd->wDeviceID : uDevID, wMsg, dwFlags, (DWORD_PTR)&data); } - TRACE("=> 1/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); if (!LOWORD(dwRet)) { + TRACE("=> 1/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); dwRet = MCI_HandleReturnValues(dwRet, wmd, retType, &data.generic, lpstrRet, uRetLen); TRACE("=> 2/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); - } + } else + TRACE("=> %x\n", dwRet); errCleanUp: if (auto_open) {
1
0
0
0
Tijl Coosemans : winebuild: Don' t register cleanup function when --save-temps is passed after --output.
by Alexandre Julliard
05 Mar '13
05 Mar '13
Module: wine Branch: master Commit: afd7dc5947abe6d8387d2e4a38f397366c81a8ac URL:
http://source.winehq.org/git/wine.git/?a=commit;h=afd7dc5947abe6d8387d2e4a3…
Author: Tijl Coosemans <tijl(a)coosemans.org> Date: Mon Mar 4 17:21:16 2013 +0100 winebuild: Don't register cleanup function when --save-temps is passed after --output. --- tools/winebuild/build.h | 2 +- tools/winebuild/main.c | 4 +++- tools/winebuild/utils.c | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 3fbf89d..359428f 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -250,6 +250,7 @@ extern char *find_tool( const char *name, const char * const *names ); extern struct strarray *get_as_command(void); extern struct strarray *get_ld_command(void); extern const char *get_nm_command(void); +extern void cleanup_tmp_files(void); extern char *get_temp_file_name( const char *prefix, const char *suffix ); extern void output_standard_file_header(void); extern FILE *open_input_file( const char *srcdir, const char *name ); @@ -347,7 +348,6 @@ extern int nb_errors; extern int display_warnings; extern int kill_at; extern int verbose; -extern int save_temps; extern int link_ext_symbols; extern int force_pointer_size; extern int unwind_tables; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 594b31b..39dbe62 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -44,7 +44,6 @@ int nb_errors = 0; int display_warnings = 0; int kill_at = 0; int verbose = 0; -int save_temps = 0; int link_ext_symbols = 0; int force_pointer_size = 0; int unwind_tables = 0; @@ -358,6 +357,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) { char *p; int optc; + int save_temps = 0; while ((optc = getopt_long( argc, argv, short_options, long_options, NULL )) != -1) { @@ -515,6 +515,8 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) } } + if (!save_temps) atexit( cleanup_tmp_files ); + if (spec->file_name && !strchr( spec->file_name, '.' )) strcat( spec->file_name, exec_mode == MODE_EXE ? ".exe" : ".dll" ); init_dll_name( spec ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 262ff3a..bab2b85 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -64,7 +64,7 @@ static const struct }; /* atexit handler to clean tmp files */ -static void cleanup_tmp_files(void) +void cleanup_tmp_files(void) { unsigned int i; for (i = 0; i < nb_tmp_files; i++) if (tmp_files[i]) unlink( tmp_files[i] ); @@ -461,8 +461,6 @@ char *get_temp_file_name( const char *prefix, const char *suffix ) const char *ext, *basename; int fd; - if (!nb_tmp_files && !save_temps) atexit( cleanup_tmp_files ); - if (!prefix || !prefix[0]) prefix = "winebuild"; if (!suffix) suffix = ""; if ((basename = strrchr( prefix, '/' ))) basename++;
1
0
0
0
Andrew Eikum : winmm/tests: Add another valid return code.
by Alexandre Julliard
04 Mar '13
04 Mar '13
Module: wine Branch: master Commit: db92670f97e653a213484dab997f4941afc562ea URL:
http://source.winehq.org/git/wine.git/?a=commit;h=db92670f97e653a213484dab9…
Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 4 11:43:31 2013 -0600 winmm/tests: Add another valid return code. --- dlls/winmm/tests/capture.c | 2 +- dlls/winmm/tests/wave.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 32deb28..329130a 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -648,7 +648,7 @@ static void wave_in_tests(void) rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); - ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || rc == MMSYSERR_NOERROR, "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 992cca7..eb619cd 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1419,7 +1419,7 @@ static void wave_out_tests(void) rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); - ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || rc == MMSYSERR_NOERROR, "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) ||
1
0
0
0
Jacek Caban : wininet: Use secure variable instead of ssl_s handle in a few more places.
by Alexandre Julliard
04 Mar '13
04 Mar '13
Module: wine Branch: master Commit: 125583c4d9e7a0b2610df2e4374729631f57db53 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=125583c4d9e7a0b2610df2e43…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 17:48:59 2013 +0100 wininet: Use secure variable instead of ssl_s handle in a few more places. --- dlls/wininet/netconnection.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e423830..0d74adf 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -702,12 +702,12 @@ void free_netconn(netconn_t *netconn) { server_release(netconn->server); + if (netconn->secure) { #ifdef SONAME_LIBSSL - if (netconn->ssl_s) { pSSL_shutdown(netconn->ssl_s); pSSL_free(netconn->ssl_s); - } #endif + } closesocket(netconn->socket); heap_free(netconn); @@ -936,7 +936,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, else { #ifdef SONAME_LIBSSL - if(!connection->ssl_s) { + if(!connection->secure) { FIXME("not connected\n"); return ERROR_NOT_SUPPORTED; } @@ -972,7 +972,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int * else { #ifdef SONAME_LIBSSL - if(!connection->ssl_s) { + if(!connection->secure) { FIXME("not connected\n"); return ERROR_NOT_SUPPORTED; } @@ -1015,7 +1015,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) else { #ifdef SONAME_LIBSSL - *available = connection->ssl_s ? pSSL_pending(connection->ssl_s) : 0; + *available = pSSL_pending(connection->ssl_s); #else FIXME("not supported on this platform\n"); return FALSE; @@ -1060,7 +1060,7 @@ LPCVOID NETCON_GetCert(netconn_t *connection) X509* cert; LPCVOID r = NULL; - if (!connection->ssl_s) + if (!connection->secure) return NULL; cert = pSSL_get_peer_certificate(connection->ssl_s); @@ -1082,7 +1082,7 @@ int NETCON_GetCipherStrength(netconn_t *connection) #endif int bits = 0; - if (!connection->ssl_s) + if (!connection->secure) return 0; cipher = pSSL_get_current_cipher(connection->ssl_s); if (!cipher)
1
0
0
0
Francois Gouget : mshtml/tests: Make test_insert_adjacent_elems() static.
by Alexandre Julliard
04 Mar '13
04 Mar '13
Module: wine Branch: master Commit: b039192d3b679b9ff15ef4dff0f5b7abc59be426 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b039192d3b679b9ff15ef4dff…
Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 4 14:36:29 2013 +0100 mshtml/tests: Make test_insert_adjacent_elems() static. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 913411c..2fde048 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4195,7 +4195,7 @@ static void _insert_adjacent_elem(unsigned line, IHTMLElement *parent, const cha IHTMLElement_Release(ret_elem); } -void test_insert_adjacent_elems(IHTMLDocument2 *doc, IHTMLElement *parent) +static void test_insert_adjacent_elems(IHTMLDocument2 *doc, IHTMLElement *parent) { IHTMLElement *elem, *elem2;
1
0
0
0
Francois Gouget : gdiplus/tests: Skip the tests if unable to load the TIFF image.
by Alexandre Julliard
04 Mar '13
04 Mar '13
Module: wine Branch: master Commit: 06489c6501f8b59489da3de1b307ee44401dd1f1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=06489c6501f8b59489da3de1b…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 4 14:35:43 2013 +0100 gdiplus/tests: Skip the tests if unable to load the TIFF image. On Windows XP most versions of gdiplus (i.e. older than 5.2) do not support TIFF. --- dlls/gdiplus/tests/image.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index feab70b..6b4a34c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3105,8 +3105,11 @@ static void test_tiff_properties(void) PropertyItem *prop_item; image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data)); - ok(image != 0, "Failed to load TIFF image data\n"); - if (!image) return; + if (!image) + { + win_skip("Failed to load TIFF image data. Might not be supported. Skipping.\n"); + return; + } status = GdipImageGetFrameDimensionsCount(image, &dim_count); expect(Ok, status); @@ -3360,8 +3363,11 @@ static void test_tiff_palette(void) /* 1bpp TIFF without palette */ image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data)); - ok(image != 0, "Failed to load TIFF image data\n"); - if (!image) return; + if (!image) + { + win_skip("Failed to load TIFF image data. Might not be supported. Skipping.\n"); + return; + } status = GdipGetImagePixelFormat(image, &format); expect(Ok, status);
1
0
0
0
Alexandre Julliard : winex11: Wait for the client window to be created on the server side.
by Alexandre Julliard
04 Mar '13
04 Mar '13
Module: wine Branch: master Commit: 4391deb930fa2aaccae9c420c3ca38e313500d0b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4391deb930fa2aaccae9c420c…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 13:34:28 2013 +0100 winex11: Wait for the client window to be created on the server side. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d19a5fd..05cd75f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1394,7 +1394,7 @@ Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *vi XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd ); XMapWindow( data->display, data->client_window ); - XFlush( data->display ); + XSync( data->display, False ); return data->client_window; }
1
0
0
0
Alexandre Julliard : winex11: Explicitly set the border pixel when creating the client window.
by Alexandre Julliard
04 Mar '13
04 Mar '13
Module: wine Branch: master Commit: f15a5ff70f43b98e0d2af4fd3a3c028c11871688 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f15a5ff70f43b98e0d2af4fd3…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 13:34:06 2013 +0100 winex11: Explicitly set the border pixel when creating the client window. --- dlls/winex11.drv/window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ec15afc..d19a5fd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1384,11 +1384,12 @@ Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *vi attr.win_gravity = NorthWestGravity; attr.backing_store = NotUseful; attr.event_mask = ExposureMask; + attr.border_pixel = 0; data->client_window = XCreateWindow( data->display, data->whole_window, x, y, cx, cy, 0, default_visual.depth, InputOutput, visual->visual, CWBitGravity | CWWinGravity | CWBackingStore | - CWColormap | CWEventMask, &attr ); + CWColormap | CWEventMask | CWBorderPixel, &attr ); if (!data->client_window) return 0; XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd );
1
0
0
0
← Newer
1
...
44
45
46
47
48
49
50
...
54
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
51
52
53
54
Results per page:
10
25
50
100
200