December 2008 - Wine-Commits

Francois Gouget : kernel32: Remove unneeded casts of zero.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 7e43f8a4fef930566557371951499087a11b1a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e43f8a4fef93056655737195… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:26:38 2008 +0100 kernel32: Remove unneeded casts of zero. --- dlls/kernel32/instr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index 5e28d95..757f0c5 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -643,10 +643,10 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) if (outp) /* FIXME: Check segment is readable. */ - (void)0; + ; else /* FIXME: Check segment is writable. */ - (void)0; + ; if (repX) {

1 0

Francois Gouget : crypt32: Remove unneeded casts of zero.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 42abd3b03a3dfa33e54883dad13426e04719cfbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=42abd3b03a3dfa33e54883dad… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:26:31 2008 +0100 crypt32: Remove unneeded casts of zero. --- dlls/crypt32/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 38f7560..d93163c 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -179,7 +179,7 @@ HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(DWORD reserved) if (reserved) { SetLastError(E_INVALIDARG); - return (HCRYPTPROV)0; + return 0; } ret = CRYPT_GetDefaultProvider(); CryptContextAddRef(ret, NULL, 0);

1 0

Francois Gouget : avifil32: Remove unneeded casts of zero.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: d57774732ab1f9216183119a8e171bec96bc2cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57774732ab1f9216183119a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:25:44 2008 +0100 avifil32: Remove unneeded casts of zero. --- dlls/avifil32/extrachunk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c index f875814..48ea77e 100644 --- a/dlls/avifil32/extrachunk.c +++ b/dlls/avifil32/extrachunk.c @@ -182,7 +182,7 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck, /* Have we found what we search for? */ if ((lpck->ckid == ckid) && - (fccType == (FOURCC)0 || lpck->fccType == fccType)) + (fccType == 0 || lpck->fccType == fccType)) return AVIERR_OK; /* Skip padding chunks, the others put into the extrachunk-structure */

1 0

Francois Gouget : winealsa: Fix a couple of types and avoid unneeded casts.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: c73631280b248bef1772603b6c350286cc8a87ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c73631280b248bef1772603b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:25:30 2008 +0100 winealsa: Fix a couple of types and avoid unneeded casts. --- dlls/winealsa.drv/midi.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 9c004ae..cabe9e2 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -142,7 +142,7 @@ static void error_handler(const char* file, int line, const char* function, int * return the Windows equivalent to a Unix Device Type * */ -static int MIDI_AlsaToWindowsDeviceType(int type) +static int MIDI_AlsaToWindowsDeviceType(unsigned int type) { /* MOD_MIDIPORT output port * MOD_SYNTH generic internal synth @@ -1113,7 +1113,7 @@ static DWORD modReset(WORD wDevID) * * Helper for ALSA_MidiInit */ -static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, int cap, int type) +static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, unsigned int cap, unsigned int type) { char midiPortName[MAXPNAMELEN]; @@ -1174,12 +1174,12 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* MidiOutDev[MODM_NumDevs].bEnabled = TRUE; TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" - "\tALSA info: midi dev-type=%lx, capa=%lx\n", + "\tALSA info: midi dev-type=%x, capa=0\n", MODM_NumDevs, wine_dbgstr_w(MidiOutDev[MODM_NumDevs].caps.szPname), MidiOutDev[MODM_NumDevs].caps.wTechnology, MidiOutDev[MODM_NumDevs].caps.wVoices, MidiOutDev[MODM_NumDevs].caps.wNotes, MidiOutDev[MODM_NumDevs].caps.wChannelMask, MidiOutDev[MODM_NumDevs].caps.dwSupport, - (long)type, (long)0); + type); MODM_NumDevs++; } @@ -1229,10 +1229,10 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* MidiInDev[MIDM_NumDevs].state = 0; TRACE("MidiIn [%d]\tname='%s' support=%d\n" - "\tALSA info: midi dev-type=%lx, capa=%lx\n", + "\tALSA info: midi dev-type=%x, capa=0\n", MIDM_NumDevs, wine_dbgstr_w(MidiInDev[MIDM_NumDevs].caps.szPname), MidiInDev[MIDM_NumDevs].caps.dwSupport, - (long)type, (long)0); + type); MIDM_NumDevs++; } @@ -1280,8 +1280,8 @@ LONG ALSA_MidiInit(void) snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); snd_seq_port_info_set_port(pinfo, -1); while (snd_seq_query_next_port(midiSeq, pinfo) >= 0) { - int cap = snd_seq_port_info_get_capability(pinfo); - int type = snd_seq_port_info_get_type(pinfo); + unsigned int cap = snd_seq_port_info_get_capability(pinfo); + unsigned int type = snd_seq_port_info_get_type(pinfo); if (!(type & SND_SEQ_PORT_TYPE_PORT)) ALSA_AddMidiPort(cinfo, pinfo, cap, type); } @@ -1293,8 +1293,8 @@ LONG ALSA_MidiInit(void) snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); snd_seq_port_info_set_port(pinfo, -1); while (snd_seq_query_next_port(midiSeq, pinfo) >= 0) { - int cap = snd_seq_port_info_get_capability(pinfo); - int type = snd_seq_port_info_get_type(pinfo); + unsigned int cap = snd_seq_port_info_get_capability(pinfo); + unsigned int type = snd_seq_port_info_get_type(pinfo); if (type & SND_SEQ_PORT_TYPE_PORT) ALSA_AddMidiPort(cinfo, pinfo, cap, type); }

1 0

Francois Gouget : fnt2bdf: Remove unneeded casts of zero.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: a70fbaeec70467f39f64a92f6bb2ee2dfa518ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70fbaeec70467f39f64a92f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:25:18 2008 +0100 fnt2bdf: Remove unneeded casts of zero. --- tools/fnt2bdf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c index f204720..e6a53fa 100644 --- a/tools/fnt2bdf.c +++ b/tools/fnt2bdf.c @@ -209,7 +209,7 @@ static int dump_bdf( fnt_fontS* cpe_font_struct, unsigned char* file_buffer) if( (ic = make_bdf_filename(l_filename, cpe_font_struct, file_buffer)) ) return ic; - if((fp = fopen(l_filename, "w")) == (FILE *) 0) + if((fp = fopen(l_filename, "w")) == NULL) { fprintf(stderr, "Couldn't open \"%s\" for output.\n", l_filename); return ERROR_FILE;

1 0

Francois Gouget : port: Remove unneeded casts of zero.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: df949b4e86453d49ace961ca0cf7a28efec16d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df949b4e86453d49ace961ca0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:25:03 2008 +0100 port: Remove unneeded casts of zero. --- libs/port/getopt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/port/getopt.c b/libs/port/getopt.c index be82779..041bef0 100644 --- a/libs/port/getopt.c +++ b/libs/port/getopt.c @@ -1203,8 +1203,8 @@ getopt (argc, argv, optstring) const char *optstring; { return _getopt_internal (argc, argv, optstring, - (const struct option *) 0, - (int *) 0, + NULL, + NULL, 0); }

1 0

Francois Gouget : winspool.drv: Remove unneeded casts of zero.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: dc46cd042cae63f20d706814b1d3cb51ef65d9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc46cd042cae63f20d706814b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:23:24 2008 +0100 winspool.drv: Remove unneeded casts of zero. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 052ecc1..0343a9b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7764,7 +7764,7 @@ static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) signal(SIGPIPE, SIG_DFL); signal(SIGCHLD, SIG_DFL); - execl("/bin/sh", "/bin/sh", "-c", cmdA, (char*)0); + execl("/bin/sh", "/bin/sh", "-c", cmdA, NULL); _exit(1); }

1 0

Francois Gouget : dsound: Remove unneeded casts of zero.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 34f1e0f0483030c156e802c39859a2a4ef766aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f1e0f0483030c156e802c39… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:23:12 2008 +0100 dsound: Remove unneeded casts of zero. --- dlls/dsound/tests/propset.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 88ea3dc..fba6e06 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -188,7 +188,7 @@ static void propset_private_tests(void) /* try direct sound first */ /* DSOUND: Error: Invalid interface buffer */ - rc = (pDllGetClassObject)(&CLSID_DirectSound, &IID_IClassFactory, (void **)0); + rc = (pDllGetClassObject)(&CLSID_DirectSound, &IID_IClassFactory, NULL); ok(rc==DSERR_INVALIDPARAM,"DllGetClassObject(CLSID_DirectSound, " "IID_IClassFactory) should have returned DSERR_INVALIDPARAM, " "returned: %08x\n",rc); @@ -211,7 +211,7 @@ static void propset_private_tests(void) /* direct sound doesn't have an IKsPropertySet */ /* DSOUND: Error: Invalid interface buffer */ rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, - (void **)0); + NULL); ok(rc==DSERR_INVALIDPARAM, "CreateInstance(IID_IKsPropertySet) should have " "returned DSERR_INVALIDPARAM, returned: %08x\n",rc);

1 0

Francois Gouget : ws2_32: Add the inet_ntop() and inet_pton() prototypes and their relatives.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: b092b90309e936474a19bfea70161bc16c583d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b092b90309e936474a19bfea7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:28:02 2008 +0100 ws2_32: Add the inet_ntop() and inet_pton() prototypes and their relatives. --- include/ws2tcpip.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 885b60e..a38ccda 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -237,6 +237,14 @@ int WINAPI WS(getnameinfo)(const SOCKADDR*,WS(socklen_t),PCHAR,DWORD,PCHAR,DWOR #define GetNameInfoA WS(getnameinfo) INT WINAPI GetNameInfoW(const SOCKADDR*,WS(socklen_t),PWCHAR,DWORD,PWCHAR,DWORD,INT); #define GetNameInfo WINELIB_NAME_AW(GetNameInfo) +PCSTR WINAPI WS(inet_ntop)(INT,PVOID,PSTR,size_t); +#define InetNtopA WS(inet_ntop) +PCWSTR WINAPI InetNtopW(INT,PVOID,PWSTR,size_t); +#define InetNtop WINELIB_NAME_AW(InetNtop) +int WINAPI WS(inet_pton)(INT,PCSTR,PVOID); +#define InetPtonA WS(inet_pton) +int WINAPI InetPtonW(INT,PCWSTR,PVOID); +#define InetPton WINELIB_NAME_AW(InetPton) /* * Ws2tcpip Function Typedefs

1 0

Francois Gouget : ws2_32: Add MSG_WAITALL and MSG_INTERRUPT.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 23063501e51e1e9d70d5feb36abb6bf281d03180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23063501e51e1e9d70d5feb36… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 8 09:20:51 2008 +0100 ws2_32: Add MSG_WAITALL and MSG_INTERRUPT. --- include/winsock.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index dd202ea..4dafb9c 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -791,6 +791,8 @@ typedef struct WS(WSAData) #define MSG_OOB 0x0001 #define MSG_PEEK 0x0002 #define MSG_DONTROUTE 0x0004 +#define MSG_WAITALL 0x0008 +#define MSG_INTERRUPT 0x0010 #define MSG_PARTIAL 0x8000 #define MSG_MAXIOVLEN 16 #else /* USE_WS_PREFIX */ @@ -799,6 +801,8 @@ typedef struct WS(WSAData) #define WS_MSG_OOB 0x0001 #define WS_MSG_PEEK 0x0002 #define WS_MSG_DONTROUTE 0x0004 +#define WS_MSG_WAITALL 0x0008 +#define WS_MSG_INTERRUPT 0x0010 #define WS_MSG_PARTIAL 0x8000 #define WS_MSG_MAXIOVLEN 16 #endif /* USE_WS_PREFIX */

1 0