wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Frédéric Delanoy : winhlp32: Use BOOL type where appropriate.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: a72c23ed0c5b8ccc8e7e71dbe8eaaa886eb5665b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72c23ed0c5b8ccc8e7e71dbe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 2 14:34:14 2013 +0100 winhlp32: Use BOOL type where appropriate. --- programs/winhlp32/hlpfile.c | 28 ++++++++++++++-------------- programs/winhlp32/hlpfile.h | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 3c49c33..adfee2f 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -763,7 +763,7 @@ static BOOL HLPFILE_RtfAddHexBytes(struct RtfData* rd, const void* _ptr, unsigne static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, const char* str, unsigned len, LONG hash, - unsigned clrChange, unsigned bHotSpot, unsigned wnd); + BOOL clrChange, BOOL bHotSpot, unsigned wnd); /****************************************************************** * HLPFILE_AddHotSpotLinks @@ -805,7 +805,7 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, { case 0xC8: hslink = (HLPFILE_HOTSPOTLINK*) - HLPFILE_AllocLink(rd, hlp_link_macro, str, -1, 0, 0, 1, -1); + HLPFILE_AllocLink(rd, hlp_link_macro, str, -1, 0, FALSE, TRUE, -1); break; case 0xE6: @@ -813,7 +813,7 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, hslink = (HLPFILE_HOTSPOTLINK*) HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup, file->lpszPath, -1, HLPFILE_Hash(str), - 0, 1, -1); + FALSE, TRUE, -1); break; case 0xEE: @@ -839,7 +839,7 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, } hslink = (HLPFILE_HOTSPOTLINK*) HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup, - file->lpszPath, -1, HLPFILE_Hash(tgt ? tgt : str), 0, 1, wnd); + file->lpszPath, -1, HLPFILE_Hash(tgt ? tgt : str), FALSE, TRUE, wnd); HeapFree(GetProcessHeap(), 0, tgt); break; } @@ -1162,7 +1162,7 @@ static BOOL HLPFILE_RtfAddGfxByIndex(struct RtfData* rd, HLPFILE *hlpfile, */ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, const char* str, unsigned len, LONG hash, - unsigned clrChange, unsigned bHotSpot, unsigned wnd) + BOOL clrChange, BOOL bHotSpot, unsigned wnd) { HLPFILE_LINK* link; char* link_str; @@ -1180,7 +1180,7 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, memcpy(link_str, str, len); link_str[len] = '\0'; link->hash = hash; - link->bClrChange = clrChange ? 1 : 0; + link->bClrChange = clrChange; link->bHotSpot = bHotSpot; link->window = wnd; link->next = rd->first_link; @@ -1599,7 +1599,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0xCC: WINE_TRACE("macro => %s\n", format + 3); HLPFILE_AllocLink(rd, hlp_link_macro, (const char*)format + 3, - GET_USHORT(format, 1), 0, !(*format & 4), 0, -1); + GET_USHORT(format, 1), 0, !(*format & 4), FALSE, -1); format += 3 + GET_USHORT(format, 1); break; @@ -1607,7 +1607,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0xE1: WINE_WARN("jump topic 1 => %u\n", GET_UINT(format, 1)); HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, - page->file->lpszPath, -1, GET_UINT(format, 1), 1, 0, -1); + page->file->lpszPath, -1, GET_UINT(format, 1), TRUE, FALSE, -1); format += 5; @@ -1619,7 +1619,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0xE7: HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, page->file->lpszPath, -1, GET_UINT(format, 1), - !(*format & 4), 0, -1); + !(*format & 4), FALSE, -1); format += 5; break; @@ -1656,7 +1656,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, break; } HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, - ptr, -1, GET_UINT(format, 4), !(*format & 4), 0, wnd); + ptr, -1, GET_UINT(format, 4), !(*format & 4), FALSE, wnd); } format += 3 + GET_USHORT(format, 1); break; @@ -1980,22 +1980,22 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) if (minor <= 16) { hlpfile->tbsize = 0x800; - hlpfile->compressed = 0; + hlpfile->compressed = FALSE; } else if (flags == 0) { hlpfile->tbsize = 0x1000; - hlpfile->compressed = 0; + hlpfile->compressed = FALSE; } else if (flags == 4) { hlpfile->tbsize = 0x1000; - hlpfile->compressed = 1; + hlpfile->compressed = TRUE; } else { hlpfile->tbsize = 0x800; - hlpfile->compressed = 1; + hlpfile->compressed = TRUE; } if (hlpfile->compressed) diff --git a/programs/winhlp32/hlpfile.h b/programs/winhlp32/hlpfile.h index 6b2e28a..c3fa4b0 100644 --- a/programs/winhlp32/hlpfile.h +++ b/programs/winhlp32/hlpfile.h @@ -124,9 +124,9 @@ typedef struct tagHlpFileFile unsigned short charset; unsigned short tbsize; /* topic block size */ unsigned short dsize; /* decompress size */ - unsigned short compressed; - unsigned hasPhrases; /* file has |Phrases */ - unsigned hasPhrases40; /* file has |PhrIndex/|PhrImage */ + BOOL compressed; + BOOL hasPhrases; /* file has |Phrases */ + BOOL hasPhrases40; /* file has |PhrIndex/|PhrImage */ UINT num_phrases; unsigned* phrases_offsets; char* phrases_buffer;

1 0

Frédéric Delanoy : wordpad: Use BOOL type where appropriate.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 4ef76cd75c53682638390fd634467a4804a69355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef76cd75c53682638390fd63… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 2 14:34:15 2013 +0100 wordpad: Use BOOL type where appropriate. --- programs/wordpad/wordpad.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8468148..9eb0700 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1154,7 +1154,7 @@ static void dialog_viewproperties(void) static void HandleCommandLine(LPWSTR cmdline) { WCHAR delimiter; - int opt_print = 0; + BOOL opt_print = FALSE; /* skip white space */ while (*cmdline == ' ') cmdline++; @@ -1178,7 +1178,7 @@ static void HandleCommandLine(LPWSTR cmdline) { case 'P': case 'p': - opt_print = 1; + opt_print = TRUE; cmdline += 2; continue; }

1 0

Frédéric Delanoy : ntdll: Use BOOL type where appropriate.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 416930d498b2a9bbec23a94f9a1545c4833cc705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=416930d498b2a9bbec23a94f9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 2 14:34:13 2013 +0100 ntdll: Use BOOL type where appropriate. --- dlls/ntdll/loader.c | 6 +++--- dlls/ntdll/nt.c | 10 +++++----- dlls/ntdll/server.c | 18 +++++++++--------- dlls/ntdll/signal_x86_64.c | 4 ++-- dlls/ntdll/virtual.c | 10 +++++----- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3a28b41..0455df4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -57,7 +57,7 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); -static int process_detaching = 0; /* set on process detach to avoid deadlocks with thread detach */ +static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ static const char * const reason_names[] = @@ -127,7 +127,7 @@ static inline void *get_rva( HMODULE module, DWORD va ) } /* check whether the file name contains a path */ -static inline int contains_path( LPCWSTR name ) +static inline BOOL contains_path( LPCWSTR name ) { return ((*name && (name[1] == ':')) || strchrW(name, '/') || strchrW(name, '\\')); } @@ -2391,7 +2391,7 @@ BOOLEAN WINAPI RtlDllShutdownInProgress(void) void WINAPI LdrShutdownProcess(void) { TRACE("()\n"); - process_detaching = 1; + process_detaching = TRUE; process_detach(); } diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8a53d03..c9499d6 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -850,7 +850,7 @@ static inline void do_cpuid(unsigned int ax, unsigned int *p) } /* From xf86info havecpuid.c 1.11 */ -static inline int have_cpuid(void) +static inline BOOL have_cpuid(void) { #ifdef __i386__ unsigned int f1, f2; @@ -868,16 +868,16 @@ static inline int have_cpuid(void) : "ir" (0x00200000)); return ((f1^f2) & 0x00200000) != 0; #elif defined(__x86_64__) - return 1; + return TRUE; #else - return 0; + return FALSE; #endif } /* Detect if a SSE2 processor is capable of Denormals Are Zero (DAZ) mode. * * This function assumes you have already checked for SSE2/FXSAVE support. */ -static inline int have_sse_daz_mode(void) +static inline BOOL have_sse_daz_mode(void) { #ifdef __i386__ typedef struct DECLSPEC_ALIGN(16) _M128A { @@ -913,7 +913,7 @@ static inline int have_sse_daz_mode(void) return (state->MxCsr_Mask & (1 << 6)) >> 6; #else /* all x86_64 processors include SSE2 with DAZ mode */ - return 1; + return TRUE; #endif } diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 9b3aeef..f396dd5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -814,7 +814,7 @@ static inline unsigned int handle_to_index( HANDLE handle, unsigned int *entry ) * * Caller must hold fd_cache_section. */ -static int add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, +static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, unsigned int access, unsigned int options ) { unsigned int entry, idx = handle_to_index( handle, &entry ); @@ -823,7 +823,7 @@ static int add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, if (entry >= FD_CACHE_ENTRIES) { FIXME( "too many allocated handles, not caching %p\n", handle ); - return 0; + return FALSE; } if (!fd_cache[entry]) /* do we need to allocate a new block of entries? */ @@ -833,7 +833,7 @@ static int add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, { void *ptr = wine_anon_mmap( NULL, FD_CACHE_BLOCK_SIZE * sizeof(struct fd_cache_entry), PROT_READ | PROT_WRITE, 0 ); - if (ptr == MAP_FAILED) return 0; + if (ptr == MAP_FAILED) return FALSE; fd_cache[entry] = ptr; } } @@ -843,7 +843,7 @@ static int add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, fd_cache[entry][idx].access = access; fd_cache[entry][idx].options = options; if (prev_fd != -1) close( prev_fd ); - return 1; + return TRUE; } @@ -1025,12 +1025,12 @@ int server_pipe( int fd[2] ) { int ret; #ifdef HAVE_PIPE2 - static int have_pipe2 = 1; + static BOOL have_pipe2 = TRUE; if (have_pipe2) { if (!(ret = pipe2( fd, O_CLOEXEC ))) return ret; - if (errno == ENOSYS || errno == EINVAL) have_pipe2 = 0; /* don't try again */ + if (errno == ENOSYS || errno == EINVAL) have_pipe2 = FALSE; /* don't try again */ } #endif if (!(ret = pipe( fd ))) @@ -1049,7 +1049,7 @@ int server_pipe( int fd[2] ) */ static void start_server(void) { - static int started; /* we only try once */ + static BOOL started; /* we only try once */ char *argv[3]; static char wineserver[] = "server/wineserver"; static char debug[] = "-d"; @@ -1071,7 +1071,7 @@ static void start_server(void) status = WIFEXITED(status) ? WEXITSTATUS(status) : 1; if (status == 2) return; /* server lock held by someone else, will retry later */ if (status) exit(status); /* server failed */ - started = 1; + started = TRUE; } } @@ -1428,7 +1428,7 @@ NTSTATUS server_init_process_done(void) */ size_t server_init_thread( void *entry_point ) { - static const int is_win64 = (sizeof(void *) > sizeof(int)); + static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); const char *arch = getenv( "WINEARCH" ); int ret; int reply_pipe[2]; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 8bcf71b..b28cb99 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -814,7 +814,7 @@ static const char *dwarf_reg_names[NB_FRAME_REGS] = /* 33-40 */ "%st0", "%st1", "%st2", "%st3", "%st4", "%st5", "%st6", "%st7" }; -static int valid_reg( ULONG_PTR reg ) +static BOOL valid_reg( ULONG_PTR reg ) { if (reg >= NB_FRAME_REGS) FIXME( "unsupported reg %lx\n", reg ); return (reg < NB_FRAME_REGS); @@ -1383,7 +1383,7 @@ static inline void *get_signal_stack(void) * * Check if pointer is inside the signal stack. */ -static inline int is_inside_signal_stack( void *ptr ) +static inline BOOL is_inside_signal_stack( void *ptr ) { return ((char *)ptr >= (char *)get_signal_stack() && (char *)ptr < (char *)get_signal_stack() + signal_stack_size); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e8a8b50..e438eaa 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -135,7 +135,7 @@ static void *user_space_limit; static void *working_set_limit; static void *address_space_start = (void *)0x10000; #endif /* __i386__ */ -static const int is_win64 = (sizeof(void *) > sizeof(int)); +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); #define ROUND_ADDR(addr,mask) \ ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) @@ -151,8 +151,8 @@ static const int is_win64 = (sizeof(void *) > sizeof(int)); static HANDLE virtual_heap; static void *preload_reserve_start; static void *preload_reserve_end; -static int use_locks; -static int force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */ +static BOOL use_locks; +static BOOL force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */ /*********************************************************************** @@ -410,7 +410,7 @@ static void remove_reserved_area( void *addr, size_t size ) * * Check if an address range goes beyond a given limit. */ -static inline int is_beyond_limit( const void *addr, size_t size, const void *limit ) +static inline BOOL is_beyond_limit( const void *addr, size_t size, const void *limit ) { return (addr >= limit || (const char *)addr + size > (const char *)limit); } @@ -1452,7 +1452,7 @@ void virtual_init(void) */ void virtual_init_threading(void) { - use_locks = 1; + use_locks = TRUE; }

1 0

Nikolay Sivov : vbscript/tests: Use a defined name for error code.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: d234bcdb25d74926438ab65fa1fd4caf2b1f405f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d234bcdb25d74926438ab65fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 2 12:00:23 2013 +0400 vbscript/tests: Use a defined name for error code. --- dlls/vbscript/tests/createobj.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index fd59827..3fffb5f 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -1000,7 +1000,7 @@ static void test_GetObject(void) SET_EXPECT(SetSite); SET_EXPECT(reportSuccess); hres = parse_script_ae(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); - if(hres == 0x8007007e) { /* Workaround for broken win2k */ + if(hres == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) { /* Workaround for broken win2k */ win_skip("got unexpected error %08x\n", hres); CLEAR_CALLED(QI_IObjectWithSite); CLEAR_CALLED(SetSite); @@ -1008,6 +1008,7 @@ static void test_GetObject(void) IActiveScriptParse_Release(parser); return; } + ok(hres == S_OK, "hres = %08x\n", hres); CHECK_CALLED(QI_IObjectWithSite); CHECK_CALLED(SetSite); CHECK_CALLED(reportSuccess);

1 0

Andrew Eikum : mmdevapi/tests: Update some error values for Windows 8.1.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 37389cfc8003b13d54475311b81bb156c6948b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37389cfc8003b13d54475311b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 1 10:53:06 2013 -0500 mmdevapi/tests: Update some error values for Windows 8.1. --- dlls/mmdevapi/tests/render.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 5d50379..2755dbf 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -256,7 +256,8 @@ static void test_audioclient(void) ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Initialize with invalid sharemode returns %08x\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); - ok(hr == E_INVALIDARG, "Initialize with invalid flags returns %08x\n", hr); + ok(hr == E_INVALIDARG || + hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08x\n", hr); /* A period != 0 is ignored and the call succeeds. * Since we can only initialize successfully once, skip those tests. @@ -456,9 +457,10 @@ static void test_formats(AUDCLNT_SHAREMODE mode) * Some cards Initialize 44100|48000x16x1 yet claim no support; * F. Gouget's w7 bots do that for 12000|96000x8|16x1|2 */ ok(hrs == S_OK ? hr == S_OK || broken(hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED) - : hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED || broken(hr == S_OK && - ((fmt.nChannels == 1 && fmt.wBitsPerSample == 16) || - (fmt.nSamplesPerSec == 12000 || fmt.nSamplesPerSec == 96000))), + : hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED || hr == AUDCLNT_E_UNSUPPORTED_FORMAT || + broken(hr == S_OK && + ((fmt.nChannels == 1 && fmt.wBitsPerSample == 16) || + (fmt.nSamplesPerSec == 12000 || fmt.nSamplesPerSec == 96000))), "Initialize(exclus., %ux%2ux%u) returns %08x\n", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr);

1 0

Andrew Eikum : dinput: Fix copy-paste typo.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 3486a35ad8c166dce000416f312d31f18e4897d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3486a35ad8c166dce000416f3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 1 10:53:00 2013 -0500 dinput: Fix copy-paste typo. --- dlls/dinput/joystick_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index d973a84..669db42 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -180,7 +180,7 @@ static INT find_joystick_devices(void) if (ioctl(fd, JSIOCGAXMAP, axes_map) < 0) { - WARN("ioctl(%s,JSIOCGNAME) failed: %s\n", joydev.device, strerror(errno)); + WARN("ioctl(%s,JSIOCGAXMAP) failed: %s\n", joydev.device, strerror(errno)); joydev.dev_axes_map = NULL; } else

1 0

Nikolay Sivov : ole32: Use real object CLSID when creating instance from context info.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: cd6e41dd9a7e3ef9527ec5b6f6ce4a75fae61b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd6e41dd9a7e3ef9527ec5b6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 1 16:12:47 2013 +0400 ole32: Use real object CLSID when creating instance from context info. --- dlls/ole32/compobj.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8f3f303..fd7cc48 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2873,12 +2873,14 @@ HRESULT WINAPI CoGetClassObject( ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, rclsid, &data)) { + struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData; + clsreg.u.actctx.hactctx = data.hActCtx; clsreg.u.actctx.data = data.lpData; clsreg.u.actctx.section = data.lpSectionBase; clsreg.hkey = FALSE; - hres = get_inproc_class_object(apt, &clsreg, rclsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); + hres = get_inproc_class_object(apt, &clsreg, &comclass->clsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); ReleaseActCtx(data.hActCtx); if (release_apt) apartment_release(apt); return hres;

1 0

Piotr Caban : msvcrt: Don' t call invalid parameter handler on invalid mode flag.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 647817b018fc5eb5223e5938581a8eb2eb3fcc8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=647817b018fc5eb5223e59385… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 12:12:06 2013 +0100 msvcrt: Don't call invalid parameter handler on invalid mode flag. --- dlls/msvcrt/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 89ac94c..26dcae1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1384,8 +1384,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st FIXME("ignoring cache optimization flag: %c\n", mode[-1]); break; default: - MSVCRT_INVALID_PMT(0, MSVCRT_EINVAL); - return -1; + ERR("incorrect mode flag: %c\n", mode[-1]); + break; } if(*mode == ',')

1 0

Huw Davies : winspool: Add any default printer options that aren' t set by the driver.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 1990e19424dc6570659f8e3faa67235d964e6a3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1990e19424dc6570659f8e3fa… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 1 10:43:16 2013 +0000 winspool: Add any default printer options that aren't set by the driver. --- dlls/winspool.drv/info.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index aebdef9..8ddebb4 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -786,6 +786,7 @@ static void unlink_ppd( const WCHAR *ppd ) static void *cupshandle; #define CUPS_FUNCS \ + DO_FUNC(cupsAddOption); \ DO_FUNC(cupsFreeDests); \ DO_FUNC(cupsFreeOptions); \ DO_FUNC(cupsGetDests); \ @@ -794,12 +795,14 @@ static void *cupshandle; DO_FUNC(cupsParseOptions); \ DO_FUNC(cupsPrintFile) #define CUPS_OPT_FUNCS \ + DO_FUNC(cupsGetNamedDest); \ DO_FUNC(cupsGetPPD3) #define DO_FUNC(f) static typeof(f) *p##f CUPS_FUNCS; #undef DO_FUNC -static http_status_t (*pcupsGetPPD3)(http_t *,const char *, time_t *, char *, size_t); +static cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); +static http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, time_t *modtime, char *buffer, @@ -8165,6 +8168,27 @@ end: fclose( fp ); return num_options; } + +static int get_cups_default_options( const char *printer, int num_options, cups_option_t **options ) +{ + cups_dest_t *dest; + int i; + + if (!pcupsGetNamedDest) return num_options; + + dest = pcupsGetNamedDest( NULL, printer, NULL ); + if (!dest) return num_options; + + for (i = 0; i < dest->num_options; i++) + { + if (!pcupsGetOption( dest->options[i].name, num_options, *options )) + num_options = pcupsAddOption( dest->options[i].name, dest->options[i].value, + num_options, options ); + } + + pcupsFreeDests( 1, dest ); + return num_options; +} #endif /***************************************************************************** @@ -8193,6 +8217,7 @@ static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR docume WideCharToMultiByte(CP_UNIXCP, 0, document_title, -1, unix_doc_title, len, NULL, NULL); num_options = get_cups_job_ticket_options( unixname, num_options, &options ); + num_options = get_cups_default_options( queue, num_options, &options ); TRACE( "printing via cups with options:\n" ); for (i = 0; i < num_options; i++)

1 0

Jacek Caban : winhttp: Use netconn_query_data_available in get_available_data when possible.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 92426b5136355200bfbc9561fcd9601ac130c66a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92426b5136355200bfbc9561f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 10:59:50 2013 +0100 winhttp: Use netconn_query_data_available in get_available_data when possible. --- dlls/winhttp/net.c | 27 +++++++++++++-------------- dlls/winhttp/request.c | 2 +- dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 6d9b82a..7466d36 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -712,24 +712,23 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd return TRUE; } -BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) +ULONG netconn_query_data_available( netconn_t *conn ) { -#ifdef FIONREAD - int ret; - ULONG unread; -#endif - *available = 0; - if (!netconn_connected( conn )) return FALSE; + if(!netconn_connected(conn)) + return 0; - if (conn->secure) - { - *available = conn->peek_len; - return TRUE; - } + if(conn->secure) { + return conn->peek_len; + }else { #ifdef FIONREAD - if (!(ret = ioctlsocket( conn->socket, FIONREAD, &unread ))) *available = unread; + ULONG unread; + + if(!ioctlsocket(conn->socket, FIONREAD, &unread)) + return unread; #endif - return TRUE; + } + + return 0; } DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 930eb28..db69082 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1955,7 +1955,7 @@ static BOOL start_next_chunk( request_t *request, BOOL notify ) static DWORD get_available_data( request_t *request ) { if (request->read_chunked) return min( request->read_chunked_size, request->read_size ); - return request->read_size; + return request->read_size + netconn_query_data_available( &request->netconn ); } /* check if we have reached the end of the data to read */ diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 12255ed..a149160 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -266,7 +266,7 @@ BOOL netconn_connected( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN; BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; -BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN; +ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ) DECLSPEC_HIDDEN; BOOL netconn_secure_connect( netconn_t *, WCHAR * ) DECLSPEC_HIDDEN;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2013