January 2014 - Wine-commits

Marcus Meissner : msvcp90: Return on error (Coverity).
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: eddc91f6e7b2e5f417603100d781acba48f0a713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddc91f6e7b2e5f417603100d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 4 18:48:42 2014 +0100 msvcp90: Return on error (Coverity). --- dlls/msvcp90/locale.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b37ead4..5a5e39c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9704,6 +9704,7 @@ size_t __cdecl mbsrtowcs(wchar_t *dst, const char **pstr, size_t n, mbstate_t *s { *_errno() = EINVAL; _invalid_parameter( NULL, NULL, NULL, 0, 0 ); + return -1; } src = *pstr; if (!state) state = &local_state; @@ -9747,6 +9748,7 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s { *_errno() = EINVAL; _invalid_parameter( NULL, NULL, NULL, 0, 0 ); + return -1; } src = *pstr;

1 0

Marcus Meissner : ws2_32: handle error return from get_sock_fd (Coverity).
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 54dc91547d79f0b76a11672f41648e81f331efcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=54dc91547d79f0b76a11672f4… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 4 17:49:40 2014 +0100 ws2_32: handle error return from get_sock_fd (Coverity). --- dlls/ws2_32/socket.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b027d7a..a855285 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1178,6 +1178,8 @@ static int set_ipx_packettype(int sock, int ptype) int fd = get_sock_fd( sock, 0, NULL ), ret = 0; TRACE("trying to set IPX_PTYPE: %d (fd: %d)\n", ptype, fd); + if (fd == -1) return SOCKET_ERROR; + /* We try to set the ipx type on ipx socket level. */ #ifdef SOL_IPX if(setsockopt(fd, SOL_IPX, IPX_TYPE, &ptype, sizeof(ptype)) == -1)

1 0

Jacek Caban : strmbase: Store BasePinFuncTable inside Base*PinFuncTable structs.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 289bdc4f4538ce9608344ae894a0f099db971846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=289bdc4f4538ce9608344ae89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 6 17:54:13 2014 +0100 strmbase: Store BasePinFuncTable inside Base*PinFuncTable structs. --- dlls/amstream/mediastreamfilter.c | 15 +++++++-------- dlls/qcap/avico.c | 32 ++++++++++++++------------------ dlls/qcap/avimux.c | 32 ++++++++++++++------------------ dlls/qcap/vfwcapture.c | 15 +++++++-------- dlls/quartz/filesource.c | 15 +++++++-------- dlls/quartz/parser.c | 15 +++++++-------- dlls/strmbase/pin.c | 24 ++++++++++++------------ dlls/strmbase/renderer.c | 17 ++++++++--------- dlls/strmbase/transform.c | 30 ++++++++++++++---------------- dlls/winegstreamer/gstdemux.c | 15 +++++++-------- dlls/wineqtdecoder/qtsplitter.c | 15 +++++++-------- include/wine/strmbase.h | 7 +++++-- 12 files changed, 109 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=289bdc4f4538ce9608344…

1 0

Michael Stefaniuc : dmusic: Don' t hardcode the guidClass in IDirectMusicObject::ParseDescriptor.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 84df351b1e246b8bc214f147ba6bc4ba4a15ab14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84df351b1e246b8bc214f147b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 6 00:01:53 2014 +0100 dmusic: Don't hardcode the guidClass in IDirectMusicObject::ParseDescriptor. --- dlls/dmusic/collection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 4c6a034..20380fe 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -269,7 +269,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip /* FIXME: should this be determined from stream? */ desc->dwValidData |= DMUS_OBJ_CLASS; - desc->guidClass = CLSID_DirectMusicCollection; + desc->guidClass = This->pDesc->guidClass; hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD)); if (FAILED(hr))

1 0

André Hentschel : libwine: Added LDT support for GNU/ Hurd.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 02e6f7d146a35b5a86655c1c1e562f458bfbb74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e6f7d146a35b5a86655c1c1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 6 02:31:08 2014 +0100 libwine: Added LDT support for GNU/Hurd. Based on a patch by Andrew Nguyen. --- libs/wine/ldt.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 5175e9c..0946407 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -92,6 +92,11 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #include <machine/sysarch.h> #endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */ +#ifdef __GNU__ +#include <mach/i386/mach_i386.h> +#include <mach/mach_traps.h> +#endif + #ifdef __APPLE__ #include <i386/user_ldt.h> #endif @@ -203,6 +208,9 @@ static int internal_set_entry( unsigned short sel, const LDT_ENTRY *entry ) #elif defined(__APPLE__) if ((ret = i386_set_ldt(index, (union ldt_entry *)entry, 1)) < 0) perror("i386_set_ldt"); +#elif defined(__GNU__) + if ((ret = i386_set_ldt(mach_thread_self(), sel, (descriptor_list_t)entry, 1)) != KERN_SUCCESS) + perror("i386_set_ldt"); #else fprintf( stderr, "No LDT support on this platform\n" ); exit(1);

1 0

André Hentschel : ntdll: Add signal definitions for GNU/Hurd.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 5865fe78de685e2a5c7e05fa22449382884758dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5865fe78de685e2a5c7e05fa2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 6 02:32:43 2014 +0100 ntdll: Add signal definitions for GNU/Hurd. Partially based on a patch by Andrew Nguyen. --- dlls/ntdll/signal_i386.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index fe6d517..63bf088 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -434,6 +434,33 @@ typedef ucontext_t SIGCONTEXT; #define T_MCHK T_MCA #define T_XMMFLT T_XMM +#elif defined(__GNU__) +typedef ucontext_t SIGCONTEXT; + +#define EAX_sig(context) ((context)->uc_mcontext.gregs[REG_EAX]) +#define EBX_sig(context) ((context)->uc_mcontext.gregs[REG_EBX]) +#define ECX_sig(context) ((context)->uc_mcontext.gregs[REG_ECX]) +#define EDX_sig(context) ((context)->uc_mcontext.gregs[REG_EDX]) +#define ESI_sig(context) ((context)->uc_mcontext.gregs[REG_ESI]) +#define EDI_sig(context) ((context)->uc_mcontext.gregs[REG_EDI]) +#define EBP_sig(context) ((context)->uc_mcontext.gregs[REG_EBP]) +#define ESP_sig(context) ((context)->uc_mcontext.gregs[REG_ESP]) + +#define CS_sig(context) ((context)->uc_mcontext.gregs[REG_CS]) +#define DS_sig(context) ((context)->uc_mcontext.gregs[REG_DS]) +#define ES_sig(context) ((context)->uc_mcontext.gregs[REG_ES]) +#define SS_sig(context) ((context)->uc_mcontext.gregs[REG_SS]) +#define FS_sig(context) ((context)->uc_mcontext.gregs[REG_FS]) +#define GS_sig(context) ((context)->uc_mcontext.gregs[REG_GS]) + +#define EFL_sig(context) ((context)->uc_mcontext.gregs[REG_EFL]) +#define EIP_sig(context) ((context)->uc_mcontext.gregs[REG_EIP]) +#define TRAP_sig(context) ((context)->uc_mcontext.gregs[REG_TRAPNO]) +#define ERROR_sig(context) ((context)->uc_mcontext.gregs[REG_ERR]) + +#define FPU_sig(context) ((FLOATING_SAVE_AREA *)&(context)->uc_mcontext.fpregs.fp_reg_set.fpchip_state) +#define FPUX_sig(context) NULL + #else #error You must define the signal context functions for your platform #endif /* linux */

1 0

Frédéric Delanoy : gdi32: Use BOOL type where appropriate.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: e7594272feedd3125e8331631d53e72c20d8a6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7594272feedd3125e8331631… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 4 15:48:21 2014 +0100 gdi32: Use BOOL type where appropriate. --- dlls/gdi32/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 062272d..2632de5 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2523,7 +2523,7 @@ static void REGION_loadAET( struct list *AET, struct list *ETEs ) static void REGION_computeWAET( struct list *AET, struct list *WETE ) { struct edge_table_entry *active; - int inside = 1; + BOOL inside = TRUE; int isInside = 0; list_init( WETE );

1 0

Frédéric Delanoy : msxml3/tests: Use BOOL type where appropriate.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 949f1a0161e5453ddc1d119a56b97b9db173be2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=949f1a0161e5453ddc1d119a5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 4 15:48:23 2014 +0100 msxml3/tests: Use BOOL type where appropriate. --- dlls/msxml3/tests/saxreader.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e1bcf5e..8778bb6 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2671,14 +2671,14 @@ struct enc_test_entry_t { const char *clsid; const char *data; HRESULT hr; - int todo; + BOOL todo; }; static const struct enc_test_entry_t encoding_test_data[] = { - { &CLSID_SAXXMLReader, "CLSID_SAXXMLReader", UTF8BOMTest, 0xc00ce56f, 1 }, - { &CLSID_SAXXMLReader30, "CLSID_SAXXMLReader30", UTF8BOMTest, 0xc00ce56f, 1 }, - { &CLSID_SAXXMLReader40, "CLSID_SAXXMLReader40", UTF8BOMTest, S_OK, 0 }, - { &CLSID_SAXXMLReader60, "CLSID_SAXXMLReader60", UTF8BOMTest, S_OK, 0 }, + { &CLSID_SAXXMLReader, "CLSID_SAXXMLReader", UTF8BOMTest, 0xc00ce56f, TRUE }, + { &CLSID_SAXXMLReader30, "CLSID_SAXXMLReader30", UTF8BOMTest, 0xc00ce56f, TRUE }, + { &CLSID_SAXXMLReader40, "CLSID_SAXXMLReader40", UTF8BOMTest, S_OK, FALSE }, + { &CLSID_SAXXMLReader60, "CLSID_SAXXMLReader60", UTF8BOMTest, S_OK, FALSE }, { 0 } };

1 0

Frédéric Delanoy : msi/tests: Use BOOL type where appropriate.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: a06363669f6322b535590f23d8e2393425e4c5b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06363669f6322b535590f23d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 4 15:48:22 2014 +0100 msi/tests: Use BOOL type where appropriate. --- dlls/msi/tests/package.c | 472 +++++++++++++++++++++++----------------------- 1 files changed, 236 insertions(+), 236 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a06363669f6322b535590…

1 0

Frédéric Delanoy : setupapi/tests: Use BOOL type where appropriate.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 4ec00cb2c2ba4a8847cdef73fc49aecbbf903c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec00cb2c2ba4a8847cdef73f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 4 15:48:24 2014 +0100 setupapi/tests: Use BOOL type where appropriate. --- dlls/setupapi/tests/diskspace.c | 8 +++--- dlls/setupapi/tests/parser.c | 54 +++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c index 573eb73..4e87ea9 100644 --- a/dlls/setupapi/tests/diskspace.c +++ b/dlls/setupapi/tests/diskspace.c @@ -29,6 +29,8 @@ #include "wine/test.h" +static BOOL is_win9x; + static void test_SetupCreateDiskSpaceListA(void) { HDSKSPC ret; @@ -149,8 +151,6 @@ static void test_SetupCreateDiskSpaceListW(void) static void test_SetupDuplicateDiskSpaceListA(void) { HDSKSPC handle, duplicate; - int is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && - GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; if (is_win9x) win_skip("SetupDuplicateDiskSpaceListA crashes with NULL disk space handle on Win9x\n"); @@ -305,8 +305,6 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) BOOL ret; HDSKSPC handle; LONGLONG space; - int is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && - GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; if (is_win9x) win_skip("SetupQuerySpaceRequiredOnDriveA crashes with NULL disk space handle on Win9x\n"); @@ -476,6 +474,8 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) START_TEST(diskspace) { + is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; test_SetupCreateDiskSpaceListA(); test_SetupCreateDiskSpaceListW(); test_SetupDuplicateDiskSpaceListA(); diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index bd3132c..c2d554a 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -103,36 +103,36 @@ static const struct const char *data; DWORD error; UINT err_line; - int todo; + BOOL todo; } invalid_files[] = { /* file contents expected error (or 0) errline todo */ - { "\r\n", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "abcd\r\n", ERROR_WRONG_INF_STYLE, 0, 1 }, - { "[Version]\r\n", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "[Version]\nSignature=", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "[Version]\nSignature=foo", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "[version]\nsignature=$chicago$", 0, 0, 0 }, - { "[VERSION]\nSIGNATURE=$CHICAGO$", 0, 0, 0 }, - { "[Version]\nSignature=$chicago$,abcd", 0, 0, 0 }, - { "[Version]\nabc=def\nSignature=$chicago$", 0, 0, 0 }, - { "[Version]\nabc=def\n[Version]\nSignature=$chicago$", 0, 0, 0 }, - { STD_HEADER, 0, 0, 0 }, - { STD_HEADER "[]\r\n", 0, 0, 0 }, - { STD_HEADER "]\r\n", 0, 0, 0 }, - { STD_HEADER "[" A255 "]\r\n", 0, 0, 0 }, - { STD_HEADER "[ab\r\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER "\n\n[ab\x1a]\n", ERROR_BAD_SECTION_NAME_LINE, 5, 0 }, - { STD_HEADER "[" A256 "]\r\n", ERROR_SECTION_NAME_TOO_LONG, 3, 0 }, - { "[abc]\n" STD_HEADER, 0, 0, 0 }, - { "abc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, 0 }, - { ";\n;\nabc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, 0 }, - { ";\n;\nab\nab\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, 0 }, - { ";aa\n;bb\n" STD_HEADER, 0, 0, 0 }, - { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, + { "\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "abcd\r\n", ERROR_WRONG_INF_STYLE, 0, TRUE }, + { "[Version]\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "[Version]\nSignature=", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "[Version]\nSignature=foo", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "[version]\nsignature=$chicago$", 0, 0, FALSE }, + { "[VERSION]\nSIGNATURE=$CHICAGO$", 0, 0, FALSE }, + { "[Version]\nSignature=$chicago$,abcd", 0, 0, FALSE }, + { "[Version]\nabc=def\nSignature=$chicago$", 0, 0, FALSE }, + { "[Version]\nabc=def\n[Version]\nSignature=$chicago$", 0, 0, FALSE }, + { STD_HEADER, 0, 0, FALSE }, + { STD_HEADER "[]\r\n", 0, 0, FALSE }, + { STD_HEADER "]\r\n", 0, 0, FALSE }, + { STD_HEADER "[" A255 "]\r\n", 0, 0, FALSE }, + { STD_HEADER "[ab\r\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER "\n\n[ab\x1a]\n", ERROR_BAD_SECTION_NAME_LINE, 5, FALSE }, + { STD_HEADER "[" A256 "]\r\n", ERROR_SECTION_NAME_TOO_LONG, 3, FALSE }, + { "[abc]\n" STD_HEADER, 0, 0, FALSE }, + { "abc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { ";\n;\nabc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, + { ";\n;\nab\nab\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, + { ";aa\n;bb\n" STD_HEADER, 0, 0, FALSE }, + { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, }; static void test_invalid_files(void)

1 0