October 2010 - Wine-commits

Alexandre Julliard : rpcrt4/tests: Fix a test failure on XP SP3.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 7bfa513bc9892e163060d2af808adadaba948f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bfa513bc9892e163060d2af8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 11:12:11 2010 +0200 rpcrt4/tests: Fix a test failure on XP SP3. --- dlls/rpcrt4/tests/ndr_marshall.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 569bd20..549d09e 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1543,6 +1543,9 @@ static void test_conformant_string(void) my_alloc_called = 0; StubMsg.Buffer = StubMsg.BufferStart; mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc)); + /* Windows apparently checks string length on the output buffer to determine its size... */ + memset( mem, 'x', sizeof(memsrc) - 1 ); + mem[sizeof(memsrc) - 1] = 0; NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); ok(mem == mem_orig, "mem not alloced\n"); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called);

1 0

Austin English : dbghelp: Fix compile on Hurd.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 95740b30b9a76ee3de5353983159ad4cd71df2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95740b30b9a76ee3de5353983… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 8 00:33:52 2010 -0700 dbghelp: Fix compile on Hurd. --- configure | 1 + configure.ac | 1 + dlls/dbghelp/macho_module.c | 6 +++--- include/config.h.in | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a735091..24deb97 100755 --- a/configure +++ b/configure @@ -5798,6 +5798,7 @@ for ac_header in \ linux/types.h \ linux/ucdrom.h \ mach-o/nlist.h \ + mach-o/loader.h \ mach/mach.h \ mach/machine.h \ machine/cpu.h \ diff --git a/configure.ac b/configure.ac index 1a502db..1c0ed46 100644 --- a/configure.ac +++ b/configure.ac @@ -418,6 +418,7 @@ AC_CHECK_HEADERS(\ linux/types.h \ linux/ucdrom.h \ mach-o/nlist.h \ + mach-o/loader.h \ mach/mach.h \ mach/machine.h \ machine/cpu.h \ diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 44fa4f2..9aac3e7 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -26,7 +26,7 @@ #include "dbghelp_private.h" -#ifdef __MACH__ +#ifdef HAVE_MACH_O_LOADER_H #include <assert.h> #include <stdarg.h> @@ -1409,7 +1409,7 @@ struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsign return ml.macho_info.module; } -#else /* !__MACH__ */ +#else /* HAVE_MACH_O_LOADER_H */ BOOL macho_synchronize_module_list(struct process* pcs) { @@ -1441,4 +1441,4 @@ BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) { return FALSE; } -#endif /* __MACH__ */ +#endif /* HAVE_MACH_O_LOADER_H */ diff --git a/include/config.h.in b/include/config.h.in index 98a951f..0bb6be2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -466,6 +466,9 @@ /* Define to 1 if you have the <mach-o/dyld_images.h> header file. */ #undef HAVE_MACH_O_DYLD_IMAGES_H +/* Define to 1 if you have the <mach-o/loader.h> header file. */ +#undef HAVE_MACH_O_LOADER_H + /* Define to 1 if you have the <mach-o/nlist.h> header file. */ #undef HAVE_MACH_O_NLIST_H

1 0

Alexandre Julliard : ntdll: Use the more portable cfsetospeed() function to set serial baud rate.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 4d7ad03c3c3eba7788bae287819eb3c2ba9d080a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7ad03c3c3eba7788bae2878… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 11:21:22 2010 +0200 ntdll: Use the more portable cfsetospeed() function to set serial baud rate. --- dlls/ntdll/serial.c | 105 ++++++++++++--------------------------------------- 1 files changed, 24 insertions(+), 81 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index b52ff22..1ca2cfa 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -143,12 +143,7 @@ static NTSTATUS get_baud_rate(int fd, SERIAL_BAUD_RATE* sbr) ERR("tcgetattr error '%s'\n", strerror(errno)); return FILE_GetNtStatus(); } -#ifndef __EMX__ -#ifdef CBAUD - speed = port.c_cflag & CBAUD; -#else speed = cfgetospeed(&port); -#endif switch (speed) { case B0: sbr->BaudRate = 0; break; @@ -183,9 +178,6 @@ static NTSTATUS get_baud_rate(int fd, SERIAL_BAUD_RATE* sbr) ERR("unknown speed %x\n", speed); return STATUS_INVALID_PARAMETER; } -#else - return STATUS_INVALID_PARAMETER; -#endif return STATUS_SUCCESS; } @@ -429,46 +421,44 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) return FILE_GetNtStatus(); } -#ifdef CBAUD - port.c_cflag &= ~CBAUD; switch (sbr->BaudRate) { - case 0: port.c_cflag |= B0; break; - case 50: port.c_cflag |= B50; break; - case 75: port.c_cflag |= B75; break; - case 110: - case CBR_110: port.c_cflag |= B110; break; - case 134: port.c_cflag |= B134; break; - case 150: port.c_cflag |= B150; break; - case 200: port.c_cflag |= B200; break; - case 300: - case CBR_300: port.c_cflag |= B300; break; + case 0: cfsetospeed( &port, B0 ); break; + case 50: cfsetospeed( &port, B50 ); break; + case 75: cfsetospeed( &port, B75 ); break; + case 110: + case CBR_110: cfsetospeed( &port, B110 ); break; + case 134: cfsetospeed( &port, B134 ); break; + case 150: cfsetospeed( &port, B150 ); break; + case 200: cfsetospeed( &port, B200 ); break; + case 300: + case CBR_300: cfsetospeed( &port, B300 ); break; case 600: - case CBR_600: port.c_cflag |= B600; break; + case CBR_600: cfsetospeed( &port, B600 ); break; case 1200: - case CBR_1200: port.c_cflag |= B1200; break; - case 1800: port.c_cflag |= B1800; break; + case CBR_1200: cfsetospeed( &port, B1200 ); break; + case 1800: cfsetospeed( &port, B1800 ); break; case 2400: - case CBR_2400: port.c_cflag |= B2400; break; + case CBR_2400: cfsetospeed( &port, B2400 ); break; case 4800: - case CBR_4800: port.c_cflag |= B4800; break; + case CBR_4800: cfsetospeed( &port, B4800 ); break; case 9600: - case CBR_9600: port.c_cflag |= B9600; break; + case CBR_9600: cfsetospeed( &port, B9600 ); break; case 19200: - case CBR_19200: port.c_cflag |= B19200; break; + case CBR_19200: cfsetospeed( &port, B19200 ); break; case 38400: - case CBR_38400: port.c_cflag |= B38400; break; + case CBR_38400: cfsetospeed( &port, B38400 ); break; #ifdef B57600 - case 57600: port.c_cflag |= B57600; break; + case 57600: cfsetospeed( &port, B57600 ); break; #endif #ifdef B115200 - case 115200: port.c_cflag |= B115200;break; + case 115200: cfsetospeed( &port, B115200 ); break; #endif #ifdef B230400 - case 230400: port.c_cflag |= B230400;break; + case 230400: cfsetospeed( &port, B230400 ); break; #endif #ifdef B460800 - case 460800: port.c_cflag |= B460800;break; + case 460800: cfsetospeed( &port, B460800 ); break; #endif default: #if defined (HAVE_LINUX_SERIAL_H) && defined (TIOCSSERIAL) @@ -490,7 +480,7 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) "(see man setserial). If you have incapacitated a Hayes type modem,\n" "reset it and it will probably recover.\n", sbr->BaudRate, arby); ioctl(fd, TIOCSSERIAL, &nuts); - port.c_cflag |= B38400; + cfsetospeed( &port, B38400 ); } break; #else /* Don't have linux/serial.h or lack TIOCSSERIAL */ @@ -498,54 +488,7 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) return STATUS_NOT_SUPPORTED; #endif /* Don't have linux/serial.h or lack TIOCSSERIAL */ } -#elif !defined(__EMX__) - switch (sbr->BaudRate) - { - case 0: port.c_ospeed = B0; break; - case 50: port.c_ospeed = B50; break; - case 75: port.c_ospeed = B75; break; - case 110: - case CBR_110: port.c_ospeed = B110; break; - case 134: port.c_ospeed = B134; break; - case 150: port.c_ospeed = B150; break; - case 200: port.c_ospeed = B200; break; - case 300: - case CBR_300: port.c_ospeed = B300; break; - case 600: - case CBR_600: port.c_ospeed = B600; break; - case 1200: - case CBR_1200: port.c_ospeed = B1200; break; - case 1800: port.c_ospeed = B1800; break; - case 2400: - case CBR_2400: port.c_ospeed = B2400; break; - case 4800: - case CBR_4800: port.c_ospeed = B4800; break; - case 9600: - case CBR_9600: port.c_ospeed = B9600; break; - case 19200: - case CBR_19200: port.c_ospeed = B19200; break; - case 38400: - case CBR_38400: port.c_ospeed = B38400; break; -#ifdef B57600 - case 57600: - case CBR_57600: port.c_ospeed = B57600; break; -#endif -#ifdef B115200 - case 115200: - case CBR_115200: port.c_ospeed = B115200;break; -#endif -#ifdef B230400 - case 230400: port.c_ospeed = B230400;break; -#endif -#ifdef B460800 - case 460800: port.c_ospeed = B460800;break; -#endif - default: - ERR("baudrate %d\n", sbr->BaudRate); - return STATUS_NOT_SUPPORTED; - } - port.c_ispeed = port.c_ospeed; -#endif + cfsetispeed( &port, cfgetospeed(&port) ); if (tcsetattr(fd, TCSANOW, &port) == -1) { ERR("tcsetattr error '%s'\n", strerror(errno));

1 0

Alexandre Julliard : user32: Make sure the driver CreateCursorIcon() entry point is always called.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: beba1f1586520f7bf2faec8460e1d47cc8d66cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beba1f1586520f7bf2faec846… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 11:23:08 2010 +0200 user32: Make sure the driver CreateCursorIcon() entry point is always called. --- dlls/user32/cursoricon.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 42bba6d..ce25a9d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -940,7 +940,6 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, info->frames[0].mask = mask; info->frames[0].alpha = alpha; release_icon_ptr( hObj, info ); - USER_Driver->pCreateCursorIcon( hObj ); } else { @@ -1184,6 +1183,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, { POINT hotspot; BITMAPINFO *bmi; + HICON icon; TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", bits, cbSize, dwVersion, width, height, @@ -1205,8 +1205,10 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, bmi = (BITMAPINFO *)(pt + 2); } - return CURSORICON_CreateIconFromBMI( bmi, hotspot, bIcon, dwVersion, + icon = CURSORICON_CreateIconFromBMI( bmi, hotspot, bIcon, dwVersion, width, height, cFlag ); + if (icon) USER_Driver->pCreateCursorIcon( icon ); + return icon; } @@ -1274,6 +1276,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, end: TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon ); UnmapViewOfFile( bits ); + if (hIcon) USER_Driver->pCreateCursorIcon( hIcon ); return hIcon; }

1 0

Austin English : psapi/tests: Get rid of an ugly test macro.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: db27d9afa95a19cd263698e889e85ee7477e8467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db27d9afa95a19cd263698e88… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 7 02:53:04 2010 -0700 psapi/tests: Get rid of an ugly test macro. --- dlls/psapi/tests/psapi_main.c | 117 ++++++++++++++++++++++++----------------- 1 files changed, 68 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db27d9afa95a19cd26369…

1 0

Aric Stewart : strmbase: Implement BaseFilter in strmbase.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 1d42659c406abd521341153a3489e0168ff73b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d42659c406abd521341153a3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 7 14:47:33 2010 -0500 strmbase: Implement BaseFilter in strmbase. --- dlls/qcap/vfwcapture.c | 141 ++++--------------------- dlls/quartz/acmwrapper.c | 20 ++-- dlls/quartz/avidec.c | 12 +- dlls/quartz/avisplit.c | 6 +- dlls/quartz/dsoundrender.c | 233 +++++++++++-------------------------------- dlls/quartz/filesource.c | 138 ++++---------------------- dlls/quartz/mpegsplit.c | 4 +- dlls/quartz/nullrenderer.c | 184 ++++++---------------------------- dlls/quartz/parser.c | 145 +++++++------------------- dlls/quartz/parser.h | 9 +-- dlls/quartz/transform.c | 196 ++++++------------------------------ dlls/quartz/transform.h | 10 +-- dlls/quartz/videorenderer.c | 236 ++++++++++++------------------------------- dlls/quartz/waveparser.c | 4 +- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/filter.c | 198 ++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 26 +++++ 17 files changed, 516 insertions(+), 1047 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d42659c406abd5213411…

1 0

Aric Stewart : strmbase: Add an implementation of BaseFilterImpl_EnumPins.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 791087089c5e3e61e9d5e01aa6f2d146270f4ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791087089c5e3e61e9d5e01aa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 7 14:48:01 2010 -0500 strmbase: Add an implementation of BaseFilterImpl_EnumPins. --- dlls/qcap/vfwcapture.c | 49 +++++++++++-------------------- dlls/quartz/dsoundrender.c | 53 ++++++++++++--------------------- dlls/quartz/filesource.c | 68 +++++++++++++++--------------------------- dlls/quartz/nullrenderer.c | 51 +++++++++++--------------------- dlls/quartz/parser.c | 63 ++++++++++++++++------------------------ dlls/quartz/parser.h | 1 - dlls/quartz/transform.c | 55 ++++++++++++---------------------- dlls/quartz/videorenderer.c | 51 +++++++++++--------------------- dlls/strmbase/filter.c | 30 ++++++++++++++++++- include/wine/strmbase.h | 10 ++++++- 10 files changed, 179 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=791087089c5e3e61e9d5e…

1 0

Aric Stewart : strmbase: Move TransformFilter implementation to strmbase.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 34f3f7cae3828e1b719c6389d7f9edd97b4ca41d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f3f7cae3828e1b719c6389d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 7 14:48:19 2010 -0500 strmbase: Move TransformFilter implementation to strmbase. --- dlls/quartz/Makefile.in | 1 - dlls/quartz/acmwrapper.c | 138 +++++++++++++++------ dlls/quartz/avidec.c | 147 +++++++++++++++-------- dlls/quartz/transform.h | 50 -------- dlls/strmbase/Makefile.in | 3 +- dlls/{quartz => strmbase}/transform.c | 218 +++++++++++++++++++-------------- include/wine/strmbase.h | 48 +++++++ 7 files changed, 375 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34f3f7cae3828e1b719c6…

1 0

Andrew Eikum : shlwapi/tests: Don't run tests on old shlwapi versions.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 1a7c76c7b0995f860182d4389034c04282c7d575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7c76c7b0995f860182d4389… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 7 14:59:51 2010 -0500 shlwapi/tests: Don't run tests on old shlwapi versions. --- dlls/shlwapi/tests/url.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index d1da88b..cf74177 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1408,8 +1408,17 @@ static void test_HashData(void) START_TEST(url) { + char *pFunc; hShlwapi = GetModuleHandleA("shlwapi.dll"); + + /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ + pFunc = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx"); + if(!pFunc){ + win_skip("Too old shlwapi version\n"); + return; + } + pUrlUnescapeA = (void *) GetProcAddress(hShlwapi, "UrlUnescapeA"); pUrlUnescapeW = (void *) GetProcAddress(hShlwapi, "UrlUnescapeW"); pUrlIsA = (void *) GetProcAddress(hShlwapi, "UrlIsA");

1 0

Andrew Nguyen : crypt32: Avoid relying on PATH_MAX in import_certs_from_dir helper.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 6f2513d39a2247af5acb0144094c387323cfb38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2513d39a2247af5acb01440… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Thu Oct 7 20:56:40 2010 -0500 crypt32: Avoid relying on PATH_MAX in import_certs_from_dir helper. PATH_MAX is not guaranteed to be available on all platforms, and it is inadequate as a hardcoded buffer size anyway. --- dlls/crypt32/rootstore.c | 50 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 70b5ef8..506497a 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -326,6 +326,32 @@ static BOOL import_certs_from_file(int fd, HCERTSTORE store) static BOOL import_certs_from_path(LPCSTR path, HCERTSTORE store, BOOL allow_dir); +static BOOL check_buffer_resize(char **ptr_buf, size_t *buf_size, size_t check_size) +{ + if (check_size > *buf_size) + { + *buf_size = check_size; + + if (*ptr_buf) + { + char *realloc_buf = CryptMemRealloc(*ptr_buf, *buf_size); + + if (!realloc_buf) + return FALSE; + + *ptr_buf = realloc_buf; + } + else + { + *ptr_buf = CryptMemAlloc(*buf_size); + if (!*ptr_buf) + return FALSE; + } + } + + return TRUE; +} + /* Opens path, which must be a directory, and imports certificates from every * file in the directory into store. * Returns TRUE if any certificates were successfully imported. @@ -341,23 +367,27 @@ static BOOL import_certs_from_dir(LPCSTR path, HCERTSTORE store) dir = opendir(path); if (dir) { - size_t bufsize = strlen(path) + 1 + PATH_MAX + 1; - char *filebuf = CryptMemAlloc(bufsize); + size_t path_len = strlen(path), bufsize = 0; + char *filebuf = NULL; - if (filebuf) + struct dirent *entry; + while ((entry = readdir(dir))) { - struct dirent *entry; - while ((entry = readdir(dir))) + if (strcmp(entry->d_name, ".") && strcmp(entry->d_name, "..")) { - if (strcmp(entry->d_name, ".") && strcmp(entry->d_name, "..")) + size_t name_len = strlen(entry->d_name); + + if (!check_buffer_resize(&filebuf, &bufsize, path_len + 1 + name_len + 1)) { - snprintf(filebuf, bufsize, "%s/%s", path, entry->d_name); - if (import_certs_from_path(filebuf, store, FALSE) && !ret) - ret = TRUE; + ERR("Path buffer (re)allocation failed with out of memory condition\n"); + break; } + snprintf(filebuf, bufsize, "%s/%s", path, entry->d_name); + if (import_certs_from_path(filebuf, store, FALSE) && !ret) + ret = TRUE; } - CryptMemFree(filebuf); } + CryptMemFree(filebuf); closedir(dir); } return ret;

1 0