March 2013 - Wine-Commits - list.winehq.org

André Hentschel : kernel32/tests: Remove SPARC support .
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 56dbef9b1943b54b238e91591a2a3a8fd7c13105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56dbef9b1943b54b238e91591… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 21:09:57 2013 +0100 kernel32/tests: Remove SPARC support. --- dlls/kernel32/tests/file.c | 2 -- dlls/kernel32/tests/loader.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3216fa5..65ff18c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1783,8 +1783,6 @@ static BOOL create_fake_dll( LPCSTR filename ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; #elif defined __powerpc__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; -#elif defined __sparc__ - nt->FileHeader.Machine = IMAGE_FILE_MACHINE_SPARC; #elif defined __arm__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; #elif defined __aarch64__ diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index a884779..92a2e0b 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -60,8 +60,6 @@ static IMAGE_NT_HEADERS nt_header = IMAGE_FILE_MACHINE_AMD64, /* Machine */ #elif defined __powerpc__ IMAGE_FILE_MACHINE_POWERPC, /* Machine */ -#elif defined __sparc__ - IMAGE_FILE_MACHINE_SPARC, /* Machine */ #elif defined __arm__ IMAGE_FILE_MACHINE_ARMNT, /* Machine */ #elif defined __aarch64__

1 0

Alessandro Pignotti : qedit: Implement IMediaSeeking and IMediaPosition in sample grabber.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: ae771fee02d70469756f8bb08033ee1c93291a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae771fee02d70469756f8bb08… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Tue Feb 26 14:09:42 2013 +0100 qedit: Implement IMediaSeeking and IMediaPosition in sample grabber. --- dlls/qedit/samplegrabber.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index c748c98..d2523a8 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -369,7 +369,9 @@ typedef struct _SG_Impl { IBaseFilter IBaseFilter_iface; ISampleGrabber ISampleGrabber_iface; IMemInputPin IMemInputPin_iface; - /* TODO: IMediaPosition, IMediaSeeking, IQualityControl */ + /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ + IUnknown* seekthru_unk; + /* TODO: IQualityControl */ IUnknown *outer_unk; LONG ref; CRITICAL_SECTION critSect; @@ -433,6 +435,8 @@ static void SampleGrabber_cleanup(SG_Impl *This) CoTaskMemFree(This->mtype.pbFormat); if (This->bufferData) CoTaskMemFree(This->bufferData); + if(This->seekthru_unk) + IUnknown_Release(This->seekthru_unk); This->critSect.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->critSect); } @@ -455,9 +459,9 @@ static HRESULT WINAPI SampleGrabber_QueryInterface(IUnknown *iface, REFIID riid, else if (IsEqualIID(riid, &IID_IMemInputPin)) *ppv = &This->IMemInputPin_iface; else if (IsEqualIID(riid, &IID_IMediaPosition)) - FIXME("IMediaPosition not implemented\n"); + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); else if (IsEqualIID(riid, &IID_IMediaSeeking)) - FIXME("IMediaSeeking not implemented\n"); + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); else if (IsEqualIID(riid, &IID_IQualityControl)) FIXME("IQualityControl not implemented\n"); else @@ -1048,6 +1052,10 @@ SampleGrabber_IPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) *ppv = iface; else if (IsEqualIID(riid, &IID_IMemInputPin)) *ppv = &This->sg->IMemInputPin_iface; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + return IUnknown_QueryInterface(&This->sg->IUnknown_inner, riid, ppv); + else if (IsEqualIID(riid, &IID_IMediaPosition)) + return IUnknown_QueryInterface(&This->sg->IUnknown_inner, riid, ppv); else { WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; @@ -1467,6 +1475,8 @@ static const IPinVtbl IPin_Out_VTable = HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) { SG_Impl* obj = NULL; + ISeekingPassThru *passthru; + HRESULT hr; TRACE("(%p,%p)\n", ppv, pUnkOuter); @@ -1514,6 +1524,13 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) else obj->outer_unk = &obj->IUnknown_inner; + hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)obj, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj->seekthru_unk); + if(hr) + return hr; + IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); + ISeekingPassThru_Init(passthru, FALSE, &obj->pin_in.IPin_iface); + ISeekingPassThru_Release(passthru); + *ppv = &obj->IUnknown_inner; return S_OK; }

1 0

Jacek Caban : jscript: Use jsstr_flush in jsstr_concat.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 721d3ec1b44f550f8ab6abc36543c6e215fe6c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=721d3ec1b44f550f8ab6abc36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:49:33 2013 +0100 jscript: Use jsstr_flush in jsstr_concat. --- dlls/jscript/jsstr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c index d34af0f..59dfe98 100644 --- a/dlls/jscript/jsstr.c +++ b/dlls/jscript/jsstr.c @@ -83,8 +83,8 @@ jsstr_t *jsstr_concat(jsstr_t *str1, jsstr_t *str2) if(!ret) return NULL; - memcpy(ret->str, str1->str, len1*sizeof(WCHAR)); - memcpy(ret->str+len1, str2->str, len2*sizeof(WCHAR)); + jsstr_flush(str1, ret->str); + jsstr_flush(str2, ret->str+len1); return ret; }

1 0

Piotr Caban : msvcrt: Don't set unhandled exception filter, XcptFilter is responsible for handling signals.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 62e00e527fa67e3ddb043a61f6813f471b380116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e00e527fa67e3ddb043a61f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 5 11:05:32 2013 +0100 msvcrt: Don't set unhandled exception filter, XcptFilter is responsible for handling signals. --- dlls/msvcrt/except.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 80004c9..c96623c 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -152,13 +152,11 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) void msvcrt_init_signals(void) { SetConsoleCtrlHandler(msvcrt_console_handler, TRUE); - SetUnhandledExceptionFilter(msvcrt_exception_filter); } void msvcrt_free_signals(void) { SetConsoleCtrlHandler(msvcrt_console_handler, FALSE); - SetUnhandledExceptionFilter(NULL); } /*********************************************************************

1 0

Jacek Caban : jscript: Use jsstr_flush in construct_function.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 3f30c34827a143f8573a619fc8279755410426c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f30c34827a143f8573a619fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:49:21 2013 +0100 jscript: Use jsstr_flush in construct_function. --- dlls/jscript/function.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 056f04a..af79c42 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -751,11 +751,10 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *argv, IDispatch **ret) { WCHAR *str = NULL, *ptr; - DWORD len = 0, l; + unsigned len = 0, i = 0; bytecode_t *code; jsdisp_t *function; jsstr_t **params = NULL; - unsigned int i = 0; int j = 0; HRESULT hres = S_OK; @@ -786,9 +785,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg ptr = str + sizeof(function_anonymousW)/sizeof(WCHAR); if(argc > 1) { while(1) { - l = jsstr_length(params[j]); - memcpy(ptr, params[j]->str, l*sizeof(WCHAR)); - ptr += l; + ptr += jsstr_flush(params[j], ptr); if(++j == argc-1) break; *ptr++ = ','; @@ -797,11 +794,8 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg } memcpy(ptr, function_beginW, sizeof(function_beginW)); ptr += sizeof(function_beginW)/sizeof(WCHAR); - if(argc) { - l = jsstr_length(params[argc-1]); - memcpy(ptr, params[argc-1]->str, l*sizeof(WCHAR)); - ptr += l; - } + if(argc) + ptr += jsstr_flush(params[argc-1], ptr); memcpy(ptr, function_endW, sizeof(function_endW)); TRACE("%s\n", debugstr_w(str));

1 0

Jacek Caban : jscript: Use jsstr_flush in Error_toString.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 55f67035c410abf2d76ed65098a2e1e181e3796c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f67035c410abf2d76ed6509… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:49:06 2013 +0100 jscript: Use jsstr_flush in Error_toString. --- dlls/jscript/error.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 9f5cfe6..3e15144 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -85,10 +85,10 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, if(name_len && msg_len) { ret = jsstr_alloc_buf(name_len + msg_len + 2); if(ret) { - memcpy(ret->str, name->str, name_len*sizeof(WCHAR)); + jsstr_flush(name, ret->str); ret->str[name_len] = ':'; ret->str[name_len+1] = ' '; - memcpy(ret->str+name_len+2, msg->str, msg_len*sizeof(WCHAR)); + jsstr_flush(msg, ret->str+name_len+2); } }else if(name_len) { ret = name;

1 0

André Hentschel : server: Remove SPARC support.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 0effd926b6475842baefc5379b9dd932c08ff14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0effd926b6475842baefc5379… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 21:10:16 2013 +0100 server: Remove SPARC support. --- dlls/ntdll/server.c | 2 -- include/wine/server_protocol.h | 6 ++---- server/protocol.def | 4 +--- server/thread.c | 6 ------ server/trace.c | 14 -------------- 5 files changed, 3 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index dd0d83e..46494e2 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -98,8 +98,6 @@ static const enum cpu_type client_cpu = CPU_x86; static const enum cpu_type client_cpu = CPU_x86_64; #elif defined(__powerpc__) static const enum cpu_type client_cpu = CPU_POWERPC; -#elif defined(__sparc__) -static const enum cpu_type client_cpu = CPU_SPARC; #elif defined(__arm__) static const enum cpu_type client_cpu = CPU_ARM; #elif defined(__aarch64__) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8a8a0ed..6f3a5d6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -129,7 +129,7 @@ typedef union enum cpu_type { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; typedef int cpu_type_t; @@ -146,7 +146,6 @@ typedef struct struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; struct { unsigned int sp, lr, pc, cpsr; } arm_regs; struct { unsigned __int64 sp, pc, pstate; } arm64_regs; - struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; union { @@ -156,7 +155,6 @@ typedef struct struct { unsigned int gpr[32], cr, xer; } powerpc_regs; struct { unsigned int r[13]; } arm_regs; struct { unsigned __int64 x[31]; } arm64_regs; - struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; } integer; union { @@ -5717,6 +5715,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 439 +#define SERVER_PROTOCOL_VERSION 440 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 7bb679a..234c41e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -145,7 +145,7 @@ typedef union /* supported CPU types */ enum cpu_type { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; typedef int cpu_type_t; @@ -162,7 +162,6 @@ typedef struct struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; struct { unsigned int sp, lr, pc, cpsr; } arm_regs; struct { unsigned __int64 sp, pc, pstate; } arm64_regs; - struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; /* selected by SERVER_CTX_CONTROL */ union { @@ -172,7 +171,6 @@ typedef struct struct { unsigned int gpr[32], cr, xer; } powerpc_regs; struct { unsigned int r[13]; } arm_regs; struct { unsigned __int64 x[31]; } arm64_regs; - struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; } integer; /* selected by SERVER_CTX_INTEGER */ union { diff --git a/server/thread.c b/server/thread.c index fdbc144..69d547c 100644 --- a/server/thread.c +++ b/server/thread.c @@ -59,8 +59,6 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_x86); static const unsigned int supported_cpus = CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_x86); #elif defined(__powerpc__) static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC); -#elif defined(__sparc__) -static const unsigned int supported_cpus = CPU_FLAG(CPU_SPARC); #elif defined(__arm__) static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM); #elif defined(__aarch64__) @@ -1026,7 +1024,6 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) case CPU_POWERPC: return 0; case CPU_ARM: return 0; case CPU_ARM64: return 0; - case CPU_SPARC: return 0; } return 0; } @@ -1053,9 +1050,6 @@ void break_thread( struct thread *thread ) case CPU_POWERPC: data.exception.address = thread->context->ctl.powerpc_regs.iar; break; - case CPU_SPARC: - data.exception.address = thread->context->ctl.sparc_regs.pc; - break; case CPU_ARM: data.exception.address = thread->context->ctl.arm_regs.pc; break; diff --git a/server/trace.c b/server/trace.c index c7a13d8..a183fde 100644 --- a/server/trace.c +++ b/server/trace.c @@ -114,7 +114,6 @@ static void dump_cpu_type( const char *prefix, const cpu_type_t *code ) CASE(x86); CASE(x86_64); CASE(POWERPC); - CASE(SPARC); default: fprintf( stderr, "%s%u", prefix, *code ); break; #undef CASE } @@ -599,19 +598,6 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) dump_uint64( ",x30=", &ctx.integer.arm64_regs.x[30] ); } break; - case CPU_SPARC: - if (ctx.flags & SERVER_CTX_CONTROL) - fprintf( stderr, ",psr=%08x,pc=%08x,npc=%08x,y=%08x,wim=%08x,tbr=%08x", - ctx.ctl.sparc_regs.psr, ctx.ctl.sparc_regs.pc, ctx.ctl.sparc_regs.npc, - ctx.ctl.sparc_regs.y, ctx.ctl.sparc_regs.wim, ctx.ctl.sparc_regs.tbr ); - if (ctx.flags & SERVER_CTX_INTEGER) - { - for (i = 0; i < 8; i++) fprintf( stderr, ",g%u=%08x", i, ctx.integer.sparc_regs.g[i] ); - for (i = 0; i < 8; i++) fprintf( stderr, ",o%u=%08x", i, ctx.integer.sparc_regs.o[i] ); - for (i = 0; i < 8; i++) fprintf( stderr, ",l%u=%08x", i, ctx.integer.sparc_regs.l[i] ); - for (i = 0; i < 8; i++) fprintf( stderr, ",i%u=%08x", i, ctx.integer.sparc_regs.i[i] ); - } - break; } fputc( '}', stderr ); remove_data( size );

1 0

Michael Stefaniuc : mpr: Use offsetof for the size of structs with varlen arrays.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 3c3959cfd375667361197a5ab158429418f4eade URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3959cfd375667361197a5ab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 5 09:36:24 2013 +0100 mpr: Use offsetof for the size of structs with varlen arrays. --- dlls/mpr/pwcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c index efd9c23..178d40f 100644 --- a/dlls/mpr/pwcache.c +++ b/dlls/mpr/pwcache.c @@ -298,8 +298,8 @@ UINT WINAPI WNetEnumCachedPasswords( continue; /* read the value data */ - size = sizeof *entry - sizeof entry->abResource[0] + val_sz + data_sz; - entry = HeapAlloc( GetProcessHeap(), 0, sizeof *entry + val_sz + data_sz ); + size = offsetof( PASSWORD_CACHE_ENTRY, abResource[val_sz + data_sz] ); + entry = HeapAlloc( GetProcessHeap(), 0, size ); memcpy( entry->abResource, val, val_sz ); entry->cbEntry = size; entry->cbResource = val_sz;

1 0

Andrew Talbot : wineps.drv: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 97295b3a36dc22edcc8ee02fc4f1f33c7b95e9e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97295b3a36dc22edcc8ee02fc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 4 23:01:20 2013 +0000 wineps.drv: Avoid signed-unsigned integer comparisons. --- dlls/wineps.drv/afm2c.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/afm2c.c b/dlls/wineps.drv/afm2c.c index 3f8b0ce..a0427e5 100644 --- a/dlls/wineps.drv/afm2c.c +++ b/dlls/wineps.drv/afm2c.c @@ -187,7 +187,7 @@ void PSDRV_AFM2C(const AFM *afm) { char buffer[256]; FILE *of; - int i; + unsigned int i; lstrcpynA(buffer, afm->FontName, sizeof(buffer) - 2);

1 0

André Hentschel : dbghelp: Remove SPARC support.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: c174b3f5ecba870950f4f40925b52487ecc3091c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c174b3f5ecba870950f4f4092… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 21:09:53 2013 +0100 dbghelp: Remove SPARC support. --- dlls/dbghelp/Makefile.in | 1 - dlls/dbghelp/cpu_sparc.c | 106 ---------------------------------------------- dlls/dbghelp/dbghelp.c | 6 +-- 3 files changed, 2 insertions(+), 111 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 7cb0544..3fb7b52 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -11,7 +11,6 @@ C_SRCS = \ cpu_arm64.c \ cpu_i386.c \ cpu_ppc.c \ - cpu_sparc.c \ cpu_x86_64.c \ crc32.c \ dbghelp.c \ diff --git a/dlls/dbghelp/cpu_sparc.c b/dlls/dbghelp/cpu_sparc.c deleted file mode 100644 index 7f5bfaa..0000000 --- a/dlls/dbghelp/cpu_sparc.c +++ /dev/null @@ -1,106 +0,0 @@ -/* - * File cpu_sparc.c - * - * Copyright (C) 2009-2009, Eric Pouech - * Copyright (C) 2010, Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <assert.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "dbghelp_private.h" -#include "winternl.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); - -static unsigned sparc_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) -{ - addr->Mode = AddrModeFlat; - addr->Segment = 0; /* don't need segment */ - switch (ca) - { -#ifdef __sparc__ - case cpu_addr_pc: addr->Offset = ctx->pc; return TRUE; - case cpu_addr_stack: addr->Offset = ctx->o6; return TRUE; - case cpu_addr_frame: addr->Offset = ctx->i6; return TRUE; -#endif - default: addr->Mode = -1; - return FALSE; - } -} - -static BOOL sparc_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) -{ - FIXME("not done for Sparc\n"); - return FALSE; -} - -static unsigned sparc_map_dwarf_register(unsigned regno) -{ - if (regno <= 7) - return CV_SPARC_G0 + regno; - else if (regno >= 8 && regno <= 15) - return CV_SPARC_O0 + regno - 8; - else if (regno >= 16 && regno <= 23) - return CV_SPARC_L0 + regno - 16; - else if (regno >= 24 && regno <= 31) - return CV_SPARC_I0 + regno - 24; - - FIXME("Don't know how to map register %d\n", regno); - return CV_SPARC_NOREG; -} - -static void* sparc_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) -{ - FIXME("not done for Sparc\n"); - return NULL; -} - -static const char* sparc_fetch_regname(unsigned regno) -{ - FIXME("Unknown register %x\n", regno); - return NULL; -} - -static BOOL sparc_fetch_minidump_thread(struct dump_context* dc, unsigned index, unsigned flags, const CONTEXT* ctx) -{ - FIXME("NIY\n"); - return FALSE; -} - -static BOOL sparc_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) -{ - FIXME("NIY\n"); - return FALSE; -} - -DECLSPEC_HIDDEN struct cpu cpu_sparc = { - IMAGE_FILE_MACHINE_SPARC, - 4, - CV_REG_NONE, /* FIXME */ - sparc_get_addr, - sparc_stack_walk, - NULL, - sparc_map_dwarf_register, - sparc_fetch_context_reg, - sparc_fetch_regname, - sparc_fetch_minidump_thread, - sparc_fetch_minidump_module, -}; diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 9f3b82f..b61676d 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -151,9 +151,9 @@ const char* wine_dbgstr_addr(const ADDRESS64* addr) } } -extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_sparc, cpu_arm, cpu_arm64; +extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_arm, cpu_arm64; -static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_sparc, &cpu_arm, &cpu_arm64, NULL}; +static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_arm, &cpu_arm64, NULL}; struct cpu* dbghelp_current_cpu = #if defined(__i386__) &cpu_i386 @@ -161,8 +161,6 @@ struct cpu* dbghelp_current_cpu = &cpu_x86_64 #elif defined(__powerpc__) &cpu_ppc -#elif defined(__sparc__) - &cpu_sparc #elif defined(__arm__) &cpu_arm #elif defined(__aarch64__)

1 0

Alessandro Pignotti : strmbase: Remove code duplicated by every user of ISeekingPassThruImpl.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: f53fa4f05b7c62ec3cb98f8ff855da93b34f389b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53fa4f05b7c62ec3cb98f8ff… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Mon Mar 4 12:21:19 2013 +0100 strmbase: Remove code duplicated by every user of ISeekingPassThruImpl. --- dlls/quartz/acmwrapper.c | 26 +------------------------- dlls/quartz/avidec.c | 25 +------------------------ dlls/strmbase/transform.c | 20 ++++++++++++++++++++ dlls/winegstreamer/gsttffilter.c | 25 +------------------------ dlls/wineqtdecoder/qtvdecoder.c | 25 +------------------------ include/wine/strmbase.h | 2 ++ 6 files changed, 26 insertions(+), 97 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index f98362c..cd0b0d8 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct ACMWrapperImpl { TransformFilter tf; - IUnknown *seekthru_unk; HACMSTREAM has; LPWAVEFORMATEX pWfIn; @@ -399,14 +398,6 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - else - { - ISeekingPassThru *passthru; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); - IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, This->tf.ppPins[0]); - ISeekingPassThru_Release(passthru); - } *ppv = This; This->lasttime_real = This->lasttime_sent = -1; @@ -414,24 +405,9 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -static HRESULT WINAPI ACMWrapper_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - HRESULT hr; - ACMWrapperImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); - - if (IsEqualIID(riid, &IID_IMediaSeeking)) - return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); - - hr = TransformFilterImpl_QueryInterface(iface, riid, ppv); - - return hr; -} - - static const IBaseFilterVtbl ACMWrapper_Vtbl = { - ACMWrapper_QueryInterface, + TransformFilterImpl_QueryInterface, BaseFilterImpl_AddRef, TransformFilterImpl_Release, BaseFilterImpl_GetClassID, diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 5537db9..30da6fa 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -43,7 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct AVIDecImpl { TransformFilter tf; - IUnknown *seekthru_unk; HIC hvid; BITMAPINFOHEADER* pBihIn; @@ -417,14 +416,6 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - else - { - ISeekingPassThru *passthru; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); - IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, This->tf.ppPins[0]); - ISeekingPassThru_Release(passthru); - } This->hvid = NULL; This->pBihIn = NULL; @@ -435,23 +426,9 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -static HRESULT WINAPI AVIDec_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - HRESULT hr; - AVIDecImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); - - if (IsEqualIID(riid, &IID_IMediaSeeking)) - return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); - - hr = TransformFilterImpl_QueryInterface(iface, riid, ppv); - - return hr; -} - static const IBaseFilterVtbl AVIDec_Vtbl = { - AVIDec_QueryInterface, + TransformFilterImpl_QueryInterface, BaseFilterImpl_AddRef, TransformFilterImpl_Release, BaseFilterImpl_GetClassID, diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index f970527..0e014b0 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -238,6 +238,20 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p pTransformFilter->qcimpl->IQualityControl_iface.lpVtbl = &TransformFilter_QualityControl_Vtbl; } } + + if (SUCCEEDED(hr)) + { + ISeekingPassThru *passthru; + pTransformFilter->seekthru_unk = NULL; + hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)pTransformFilter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&pTransformFilter->seekthru_unk); + if (SUCCEEDED(hr)) + { + IUnknown_QueryInterface(pTransformFilter->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); + ISeekingPassThru_Init(passthru, FALSE, pTransformFilter->ppPins[0]); + ISeekingPassThru_Release(passthru); + } + } + if (FAILED(hr)) { CoTaskMemFree(pTransformFilter->ppPins); @@ -283,6 +297,11 @@ HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, REFIID ri IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } + else if (IsEqualIID(riid, &IID_IMediaSeeking) || + IsEqualIID(riid, &IID_IMediaPosition)) + { + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); + } hr = BaseFilterImpl_QueryInterface(iface, riid, ppv); if (FAILED(hr) && !IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) && @@ -325,6 +344,7 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) FreeMediaType(&This->pmt); QualityControlImpl_Destroy(This->qcimpl); CoTaskMemFree(This); + IUnknown_Release(This->seekthru_unk); return 0; } diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 4222008..575d6e3 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -115,7 +115,6 @@ static const char *Gstreamer_FindMatch(const char *strcaps) typedef struct GstTfImpl { TransformFilter tf; - IUnknown *seekthru_unk; const char *gstreamer_name; GstElement *filter; GstPad *my_src, *my_sink, *their_src, *their_sink; @@ -450,14 +449,6 @@ static HRESULT Gstreamer_transform_create(IUnknown *punkout, const CLSID *clsid, if (FAILED(TransformFilter_Construct(&GSTTf_Vtbl, sizeof(GstTfImpl), clsid, vtbl, (IBaseFilter**)&This))) return E_OUTOFMEMORY; - else - { - ISeekingPassThru *passthru; - CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); - IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, (IPin*)This->tf.ppPins[0]); - ISeekingPassThru_Release(passthru); - } This->gstreamer_name = name; *obj = This; @@ -830,23 +821,9 @@ IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkout, HRESULT *ph return obj; } -static HRESULT WINAPI GSTTf_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - HRESULT hr; - GstTfImpl *This = (GstTfImpl*)iface; - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); - - if (IsEqualIID(riid, &IID_IMediaSeeking) || IsEqualIID(riid, &IID_IMediaPosition)) - return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); - - hr = TransformFilterImpl_QueryInterface(iface, riid, ppv); - - return hr; -} - static const IBaseFilterVtbl GSTTf_Vtbl = { - GSTTf_QueryInterface, + TransformFilterImpl_QueryInterface, BaseFilterImpl_AddRef, TransformFilterImpl_Release, BaseFilterImpl_GetClassID, diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 3dfece8..6e2ceb1 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -136,7 +136,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qtdecoder); typedef struct QTVDecoderImpl { TransformFilter tf; - IUnknown *seekthru_unk; ImageDescriptionHandle hImageDescription; CFMutableDictionaryRef outputBufferAttributes; @@ -545,36 +544,14 @@ IUnknown * CALLBACK QTVDecoder_create(IUnknown * pUnkOuter, HRESULT* phr) *phr = hr; return NULL; } - else - { - ISeekingPassThru *passthru; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); - IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, This->tf.ppPins[0]); - ISeekingPassThru_Release(passthru); - } *phr = hr; return (IUnknown*)This; } -HRESULT WINAPI QTVDecoder_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - HRESULT hr; - QTVDecoderImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); - - if (IsEqualIID(riid, &IID_IMediaSeeking) || IsEqualIID(riid, &IID_IMediaPosition)) - return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); - - hr = TransformFilterImpl_QueryInterface(iface, riid, ppv); - - return hr; -} - static const IBaseFilterVtbl QTVDecoder_Vtbl = { - QTVDecoder_QueryInterface, + TransformFilterImpl_QueryInterface, BaseFilterImpl_AddRef, TransformFilterImpl_Release, BaseFilterImpl_GetClassID, diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cbb7d23..ecb53c4 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -207,6 +207,8 @@ typedef struct TransformFilter const struct TransformFilterFuncTable * pFuncsTable; struct QualityControlImpl *qcimpl; + /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ + IUnknown *seekthru_unk; } TransformFilter; typedef HRESULT (WINAPI *TransformFilter_DecideBufferSize) (TransformFilter *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest);

1 0

Jörg Höhle : mmsystem: MIDIHDR. dwOffset exists since Win 32 only, not in 16 bit code.
by Alexandre Julliard March 5, 2013

March 5, 2013

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

Jörg Höhle : winmm: Don' t log the uninitialised MCI output buffer in case of error.
by Alexandre Julliard March 5, 2013

March 5, 2013

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

Piotr Caban : msvcrt: Rename msvcrt_alloc_fd_from to msvcrt_set_fd.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 8e5bebe26253f2725141a35f23b6f2e10fc7694d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5bebe26253f2725141a35f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 5 11:02:16 2013 +0100 msvcrt: Rename msvcrt_alloc_fd_from to msvcrt_set_fd. --- dlls/msvcrt/file.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5b3bf5e..4561711 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -287,7 +287,7 @@ static void msvcrt_free_fd(int fd) /* INTERNAL: Allocate an fd slot from a Win32 HANDLE, starting from fd */ /* caller must hold the files lock */ -static int msvcrt_alloc_fd_from(HANDLE hand, int flag, int fd) +static int msvcrt_set_fd(HANDLE hand, int flag, int fd) { ioinfo *fdinfo; @@ -351,7 +351,7 @@ static int msvcrt_alloc_fd(HANDLE hand, int flag) LOCK_FILES(); TRACE(":handle (%p) allocating fd (%d)\n",hand,MSVCRT_fdstart); - ret = msvcrt_alloc_fd_from(hand, flag, MSVCRT_fdstart); + ret = msvcrt_set_fd(hand, flag, MSVCRT_fdstart); UNLOCK_FILES(); return ret; } @@ -474,7 +474,7 @@ void msvcrt_init_io(void) for (i = 0; i < count; i++) { if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(*handle_ptr, *wxflag_ptr, i); + msvcrt_set_fd(*handle_ptr, *wxflag_ptr, i); wxflag_ptr++; handle_ptr++; } @@ -485,15 +485,15 @@ void msvcrt_init_io(void) fdinfo = msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); + msvcrt_set_fd(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); fdinfo = msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); + msvcrt_set_fd(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); fdinfo = msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); + msvcrt_set_fd(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO)->handle, msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO)->handle, @@ -913,7 +913,7 @@ int CDECL MSVCRT__dup2(int od, int nd) if (msvcrt_is_valid_fd(nd)) MSVCRT__close(nd); - ret = msvcrt_alloc_fd_from(handle, wxflag, nd); + ret = msvcrt_set_fd(handle, wxflag, nd); if (ret == -1) { CloseHandle(handle);

1 0

Francois Gouget : gdiplus/tests: Skip the tests if unable to load the TIFF image.
by Alexandre Julliard March 4, 2013

March 4, 2013

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

Alexandre Julliard : winex11: Wait for the client window to be created on the server side.
by Alexandre Julliard March 4, 2013

March 4, 2013

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

Daniel Jelinski : comctl32/listview: Fix custom draw prepaint handling.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 704412b459cfafada2a04fa2f62be149e5597537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704412b459cfafada2a04fa2f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Mar 3 15:22:43 2013 +0100 comctl32/listview: Fix custom draw prepaint handling. --- dlls/comctl32/listview.c | 14 +------------- dlls/comctl32/tests/listview.c | 5 ++++- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9f4305a..4ae974e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5037,7 +5037,7 @@ static void LISTVIEW_RefreshList(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, D */ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcErase) { - COLORREF oldTextColor = 0, oldBkColor = 0, oldClrTextBk, oldClrText; + COLORREF oldTextColor = 0, oldBkColor = 0; NMLVCUSTOMDRAW nmlvcd; HFONT hOldFont = 0; DWORD cdmode; @@ -5094,21 +5094,12 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, SRCCOPY); } - /* FIXME: Shouldn't need to do this */ - oldClrTextBk = infoPtr->clrTextBk; - oldClrText = infoPtr->clrText; - infoPtr->cditemmode = CDRF_DODEFAULT; GetClientRect(infoPtr->hwndSelf, &rcClient); customdraw_fill(&nmlvcd, infoPtr, hdc, &rcClient, 0); cdmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); if (cdmode & CDRF_SKIPDEFAULT) goto enddraw; - prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); - - /* Use these colors to draw the items */ - infoPtr->clrTextBk = nmlvcd.clrTextBk; - infoPtr->clrText = nmlvcd.clrText; /* nothing to draw */ if(infoPtr->nItemCount == 0) goto enddraw; @@ -5157,9 +5148,6 @@ enddraw: if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); - infoPtr->clrTextBk = oldClrTextBk; - infoPtr->clrText = oldClrText; - if(hbmp) { BitBlt(hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, infoPtr->rcList.right - infoPtr->rcList.left, diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index fef3f60..1147c0b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1765,7 +1765,10 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) return CDRF_NOTIFYSUBITEMDRAW; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + if (nmlvcd->iSubItem) + todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + else + ok(clr == c0ffee, "clr=%.8x\n", clr); return CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc);

1 0

Daniel Jelinski : comctl32/listview: Fix font handling in custom draw.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 0ee1df5926110cfd17c7b938fcefcdaace388302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee1df5926110cfd17c7b938f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Mar 2 23:12:00 2013 +0100 comctl32/listview: Fix font handling in custom draw. --- dlls/comctl32/listview.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2dc0a95..9f4305a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4577,7 +4577,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS NMLVCUSTOMDRAW nmlvcd; HIMAGELIST himl; LVITEMW lvItem; - HFONT hOldFont; TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, wine_dbgstr_point(&pos)); @@ -4615,7 +4614,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS /* fill in the custom draw structure */ customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem); - hOldFont = GetCurrentObject(hdc, OBJ_FONT); if (nSubItem > 0) cdmode = infoPtr->cditemmode; if (cdmode & CDRF_SKIPDEFAULT) goto postpaint; if (cdmode & CDRF_NOTIFYITEMDRAW) @@ -4741,8 +4739,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS postpaint: if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); - if (cdsubitemmode & CDRF_NEWFONT) - SelectObject(hdc, hOldFont); return TRUE; } @@ -4869,6 +4865,7 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, /* iterate through the invalidated rows */ while(iterator_next(i)) { + SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); Position.y += Origin.y; @@ -5016,6 +5013,7 @@ static void LISTVIEW_RefreshList(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, D while(iterator_prev(i)) { + SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); Position.x += Origin.x; Position.y += Origin.y; @@ -5342,6 +5340,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP POINT pos; HDC hdc, hdcOrig; HBITMAP hbmp, hOldbmp; + HFONT hOldFont; HIMAGELIST dragList = 0; TRACE("iItem=%d Count=%d\n", iItem, infoPtr->nItemCount); @@ -5362,6 +5361,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP hdc = CreateCompatibleDC(hdcOrig); hbmp = CreateCompatibleBitmap(hdcOrig, size.cx, size.cy); hOldbmp = SelectObject(hdc, hbmp); + hOldFont = SelectObject(hdc, infoPtr->hFont); rcItem.left = rcItem.top = 0; rcItem.right = size.cx; @@ -5378,6 +5378,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP else SelectObject(hdc, hOldbmp); + SelectObject(hdc, hOldFont); DeleteObject(hbmp); DeleteDC(hdc); ReleaseDC(infoPtr->hwndSelf, hdcOrig);

1 0

Daniel Jelinski : comctl32/imagelist: Fixed merging of images without mask.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 634d190478846c0224e799a740045a77c91f76f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=634d190478846c0224e799a74… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Mar 1 19:48:08 2013 +0100 comctl32/imagelist: Fixed merging of images without mask. --- dlls/comctl32/imagelist.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 54d864e..03c359f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2134,8 +2134,13 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, BitBlt (himlDst->hdcImage, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcImage, pt1.x, pt1.y, SRCCOPY); if (i2 >= 0 && i2 < himl2->cCurImage) { - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , pt2.x, pt2.y, SRCAND); - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCPAINT); + if (himl2->flags & ILC_MASK) + { + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , pt2.x, pt2.y, SRCAND); + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCPAINT); + } + else + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCCOPY); } /* copy mask */

1 0

Andrew Eikum : winmm/tests: Add another valid return code.
by Alexandre Julliard March 4, 2013

March 4, 2013

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

Alexandre Julliard : winex11: Explicitly set the border pixel when creating the client window.
by Alexandre Julliard March 4, 2013

March 4, 2013

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

Alexandre Julliard : gdi32: Increment the face refcount when loading the same font file multiple times .
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 591a31ba67ba1fcf8baea702b6460868ab3522e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=591a31ba67ba1fcf8baea702b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 11:35:50 2013 +0100 gdi32: Increment the face refcount when loading the same font file multiple times. --- dlls/gdi32/freetype.c | 7 +++++++ dlls/gdi32/tests/font.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5b10d0d..a452fa0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1304,6 +1304,13 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) debugstr_w(family->FamilyName), debugstr_w(face->StyleName), cursor->font_version, face->font_version); + if (face->file && face->dev == cursor->dev && face->ino == cursor->ino) + { + cursor->refcount++; + TRACE("Font %s already in list, refcount now %d\n", + debugstr_w(face->file), cursor->refcount); + return FALSE; + } if (face->font_version <= cursor->font_version) { TRACE("Original font %s is newer so skipping %s\n", diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b72a423..aa94dea 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4567,6 +4567,7 @@ static void test_CreateScalableFontResource(void) char fot_name[MAX_PATH]; char *file_part; DWORD ret; + int i; if (!pAddFontResourceExA || !pRemoveFontResourceExA) { @@ -4655,6 +4656,22 @@ static void test_CreateScalableFontResource(void) ret = pRemoveFontResourceExA(fot_name, 0, 0); ok(!ret, "RemoveFontResourceEx() should fail\n"); + /* test refcounting */ + for (i = 0; i < 5; i++) + { + SetLastError(0xdeadbeef); + ret = pAddFontResourceExA(fot_name, 0, 0); + ok(ret, "AddFontResourceEx() error %d\n", GetLastError()); + } + for (i = 0; i < 5; i++) + { + SetLastError(0xdeadbeef); + ret = pRemoveFontResourceExA(fot_name, 0, 0); + ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); + } + ret = pRemoveFontResourceExA(fot_name, 0, 0); + ok(!ret, "RemoveFontResourceEx() should fail\n"); + DeleteFile(fot_name); /* test hidden font resource */

1 0

Alexandre Julliard : gdi32: Store the font stat information when loading it .
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 93c1389b7c134c0377b6ba7648cc5c574c9eb585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c1389b7c134c0377b6ba764… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 11:35:28 2013 +0100 gdi32: Store the font stat information when loading it. --- dlls/gdi32/freetype.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d7cc777..5b10d0d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -263,6 +263,8 @@ typedef struct tagFace { WCHAR *StyleName; WCHAR *FullName; WCHAR *file; + dev_t dev; + ino_t ino; void *font_data_ptr; DWORD font_data_size; FT_Long face_index; @@ -1761,6 +1763,7 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, void *font_data_ptr, DWORD font_data_size, DWORD flags ) { + struct stat st; Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; @@ -1779,11 +1782,18 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, if (flags & ADDFONT_VERTICAL_FONT) face->FullName = prepend_at( face->FullName ); + face->dev = 0; + face->ino = 0; if (file) { face->file = towstr( CP_UNIXCP, file ); face->font_data_ptr = NULL; face->font_data_size = 0; + if (!stat( file, &st )) + { + face->dev = st.st_dev; + face->ino = st.st_ino; + } } else { @@ -1986,8 +1996,7 @@ static int remove_font_resource( const char *file, DWORD flags ) { Family *family, *family_next; Face *face, *face_next; - char *filename; - struct stat st, st2; + struct stat st; int count = 0; if (stat( file, &st ) == -1) return 0; @@ -1998,14 +2007,12 @@ static int remove_font_resource( const char *file, DWORD flags ) { if (!face->file) continue; if (LOWORD(face->flags) != LOWORD(flags)) continue; - filename = strWtoA( CP_UNIXCP, face->file ); - if (!stat( filename, &st2 ) && st.st_dev == st2.st_dev && st.st_ino == st2.st_ino) + if (st.st_dev == face->dev && st.st_ino == face->ino) { - TRACE( "removing matching face %s\n", debugstr_w(face->file) ); + TRACE( "removing matching face %s refcount %d\n", debugstr_w(face->file), face->refcount ); release_face( face ); count++; } - HeapFree( GetProcessHeap(), 0, filename ); } release_family( family ); }

1 0

Jacek Caban : wininet: Use secure variable instead of ssl_s handle in a few more places.
by Alexandre Julliard March 4, 2013

March 4, 2013

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

Francois Gouget : mshtml/tests: Make test_insert_adjacent_elems() static.
by Alexandre Julliard March 4, 2013

March 4, 2013

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

Frédéric Delanoy : vbscript: Specify correct variable in memory allocation check (coverity).
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: d0d269ab7fd1fb424dc7e5007f730451553abc6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d269ab7fd1fb424dc7e5007… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Mar 3 23:53:07 2013 +0100 vbscript: Specify correct variable in memory allocation check (coverity). --- dlls/vbscript/vbregexp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 02e63ab..f3fb874 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -314,7 +314,7 @@ static HRESULT create_sub_matches(DWORD pos, match_state_t *result, SubMatches * ret->result = result; if(result) { ret->match = heap_alloc((result->match_len+1) * sizeof(WCHAR)); - if(!ret) { + if(!ret->match) { heap_free(ret); return E_OUTOFMEMORY; }

1 0

Jacek Caban : jscript: Use jsstr_substr in jsregexp.c where possible.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 20e85dd21b05436ee9393f0eac77231b69f13139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e85dd21b05436ee9393f0ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 10:57:24 2013 +0100 jscript: Use jsstr_substr in jsregexp.c where possible. --- dlls/jscript/jsregexp.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index d291580..f9b9992 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -346,10 +346,10 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input, return hres; for(i=0; i < result->paren_count; i++) { - if(result->parens[i].index == -1) - str = jsstr_empty(); + if(result->parens[i].index != -1) + str = jsstr_substr(input, result->parens[i].index, result->parens[i].length); else - str = jsstr_alloc_len(input->str+result->parens[i].index, result->parens[i].length); + str = jsstr_empty(); if(!str) { hres = E_OUTOFMEMORY; break; @@ -866,7 +866,7 @@ static HRESULT RegExpConstr_leftContext(script_ctx_t *ctx, vdisp_t *jsthis, WORD case DISPATCH_PROPERTYGET: { jsstr_t *ret; - ret = jsstr_alloc_len(ctx->last_match->str, ctx->last_match_index); + ret = jsstr_substr(ctx->last_match, 0, ctx->last_match_index); if(!ret) return E_OUTOFMEMORY; @@ -892,7 +892,8 @@ static HRESULT RegExpConstr_rightContext(script_ctx_t *ctx, vdisp_t *jsthis, WOR case DISPATCH_PROPERTYGET: { jsstr_t *ret; - ret = jsstr_alloc(ctx->last_match->str+ctx->last_match_index+ctx->last_match_length); + ret = jsstr_substr(ctx->last_match, ctx->last_match_index+ctx->last_match_length, + jsstr_length(ctx->last_match) - ctx->last_match_index - ctx->last_match_length); if(!ret) return E_OUTOFMEMORY;

1 0

Jacek Caban : jscript: Added jsstr_substr helper and use it in String object implementation.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 6e3895ad76835bede5b49426f3c5e37a73b61bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e3895ad76835bede5b49426f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 10:57:14 2013 +0100 jscript: Added jsstr_substr helper and use it in String object implementation. --- dlls/jscript/jsstr.h | 5 +++++ dlls/jscript/string.c | 27 +++++++++++++-------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 8ac7410..8883dcb 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -59,6 +59,11 @@ static inline BOOL jsstr_eq(jsstr_t *str1, jsstr_t *str2) return len == jsstr_length(str2) && !memcmp(str1->str, str2->str, len*sizeof(WCHAR)); } +static inline jsstr_t *jsstr_substr(jsstr_t *str, unsigned off, unsigned len) +{ + return jsstr_alloc_len(str->str+off, len); +} + int jsstr_cmp(jsstr_t*,jsstr_t*) DECLSPEC_HIDDEN; jsstr_t *jsstr_concat(jsstr_t*,jsstr_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e607754..70be13a 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -276,7 +276,7 @@ static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } if(0 <= pos && pos < jsstr_length(str)) { - ret = jsstr_alloc_len(str->str+pos, 1); + ret = jsstr_substr(str, pos, 1); if(!ret) return E_OUTOFMEMORY; }else { @@ -649,10 +649,10 @@ static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, if(SUCCEEDED(hres)) { for(i=0; i < match->paren_count; i++) { - if(match->parens[i].index == -1) - tmp_str = jsstr_empty(); + if(match->parens[i].index != -1) + tmp_str = jsstr_substr(str, match->parens[i].index, match->parens[i].length); else - tmp_str = jsstr_alloc_len(str->str+match->parens[i].index, match->parens[i].length); + tmp_str = jsstr_empty(); if(!tmp_str) { hres = E_OUTOFMEMORY; break; @@ -1016,7 +1016,7 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi end = start; if(r) { - jsstr_t *retstr = jsstr_alloc_len(str->str+start, end-start); + jsstr_t *retstr = jsstr_substr(str, start, end-start); if(!retstr) { jsstr_release(str); return E_OUTOFMEMORY; @@ -1225,15 +1225,14 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } if(r) { - jsstr_t *ret = jsstr_alloc_len(str->str+start, end-start); - if(!ret) { - jsstr_release(str); - return E_OUTOFMEMORY; - } - *r = jsval_string(ret); + jsstr_t *ret = jsstr_substr(str, start, end-start); + if(ret) + *r = jsval_string(ret); + else + hres = E_OUTOFMEMORY; } jsstr_release(str); - return S_OK; + return hres; } /* ECMA-262 3rd Edition B.2.3 */ @@ -1280,7 +1279,7 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns hres = S_OK; if(r) { - jsstr_t *ret = jsstr_alloc_len(str->str+start, len); + jsstr_t *ret = jsstr_substr(str, start, len); if(ret) *r = jsval_string(ret); else @@ -1426,7 +1425,7 @@ static HRESULT String_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) TRACE("%p[%u] = %s\n", string, idx, debugstr_wn(string->str->str+idx, 1)); - ret = jsstr_alloc_len(string->str->str+idx, 1); + ret = jsstr_substr(string->str, idx, 1); if(!ret) return E_OUTOFMEMORY;

1 0

Dmitry Timoshkov : Revert "gdiplus: Add support for StringFormatFlagsNoClip .".
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 737790603cc1dd6697ec4b8fbd0c24a002904214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737790603cc1dd6697ec4b8fb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 4 17:51:41 2013 +0900 Revert "gdiplus: Add support for StringFormatFlagsNoClip.". This reverts commit bfa35f37a7687cdae338ad9837fc595afb2df2b6. This patch breaks string alignment. --- dlls/gdiplus/graphics.c | 33 +++++---------------------------- 1 files changed, 5 insertions(+), 28 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1150675..806cfa9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4682,16 +4682,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, scaled_rect.X = (layoutRect->X + margin_x) * args.rel_width; scaled_rect.Y = layoutRect->Y * args.rel_height; - if (stringFormat->attr & StringFormatFlagsNoClip) - { - scaled_rect.Width = (REAL)(1 << 23); - scaled_rect.Height = (REAL)(1 << 23); - } - else - { - scaled_rect.Width = layoutRect->Width * args.rel_width; - scaled_rect.Height = layoutRect->Height * args.rel_height; - } + scaled_rect.Width = layoutRect->Width * args.rel_width; + scaled_rect.Height = layoutRect->Height * args.rel_height; if (scaled_rect.Width >= 0.5) { scaled_rect.Width -= margin_x * 2.0 * args.rel_width; @@ -4771,7 +4763,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, GpPointF pt[3]; RectF scaled_rect; REAL margin_x; - INT lines, glyphs, format_flags = format ? format->attr : 0; + INT lines, glyphs; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -4813,12 +4805,6 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, scaled_rect.Y = rect->Y * args.rel_height; scaled_rect.Width = rect->Width * args.rel_width; scaled_rect.Height = rect->Height * args.rel_height; - - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - if (scaled_rect.Width >= 0.5) { scaled_rect.Width -= margin_x * 2.0 * args.rel_width; @@ -4921,7 +4907,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string GpPointF pt[3], rectcpy[4]; POINT corners[4]; REAL rel_width, rel_height, margin_x; - INT save_state, format_flags = 0; + INT save_state; REAL offsety = 0.0; struct draw_string_args args; RectF scaled_rect; @@ -4946,8 +4932,6 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(format){ TRACE("may be ignoring some format flags: attr %x\n", format->attr); - format_flags = format->attr; - /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ if(format->vertalign != StringAlignmentNear){ @@ -4992,12 +4976,6 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string scaled_rect.Y = 0.0; scaled_rect.Width = rel_width * rect->Width; scaled_rect.Height = rel_height * rect->Height; - - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - if (scaled_rect.Width >= 0.5) { scaled_rect.Width -= margin_x * 2.0 * rel_width; @@ -5007,8 +4985,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - if (!(format_flags & StringFormatFlagsNoClip) && - scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) + if (scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE);

1 0

Michael Stefaniuc : inetcomm: Include the object instead of IMimeBody in struct body_t.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: c7d05df81d524a66d35ab0d48cdb6f4603d627a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d05df81d524a66d35ab0d48… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:35:05 2013 +0100 inetcomm: Include the object instead of IMimeBody in struct body_t. Avoids COM interface to COM object transitions. --- dlls/inetcomm/mimeole.c | 63 ++++++++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 22 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 58a4a5f..62d42b9 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1099,17 +1099,14 @@ static HRESULT MimeBody_set_offsets(MimeBody *body, const BODYOFFSETS *offsets) #define FIRST_CUSTOM_PROP_ID 0x100 -HRESULT MimeBody_create(IUnknown *outer, void **obj) +MimeBody *mimebody_create(void) { MimeBody *This; BODYOFFSETS body_offsets; - *obj = NULL; - - if(outer) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) return E_OUTOFMEMORY; + if (!This) + return NULL; This->IMimeBody_iface.lpVtbl = &body_vtbl; This->ref = 1; @@ -1127,10 +1124,30 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) body_offsets.cbBodyStart = body_offsets.cbBodyEnd = 0; MimeBody_set_offsets(This, &body_offsets); - *obj = &This->IMimeBody_iface; - return S_OK; + return This; } +HRESULT MimeBody_create(IUnknown *outer, void **ppv) +{ + MimeBody *mb; + + if(outer) + return CLASS_E_NOAGGREGATION; + + if ((mb = mimebody_create())) + { + *ppv = &mb->IMimeBody_iface; + return S_OK; + } + else + { + *ppv = NULL; + return E_OUTOFMEMORY; + } +} + + + typedef struct { IStreamVtbl *lpVtbl; @@ -1422,7 +1439,7 @@ typedef struct body_t { struct list entry; DWORD index; - IMimeBody *mime_body; + MimeBody *mime_body; struct body_t *parent; struct list children; @@ -1480,7 +1497,7 @@ static void empty_body_list(struct list *list) { empty_body_list(&body->children); list_remove(&body->entry); - IMimeBody_Release(body->mime_body); + IMimeBody_Release(&body->mime_body->IMimeBody_iface); HeapFree(GetProcessHeap(), 0, body); } } @@ -1520,7 +1537,7 @@ static HRESULT WINAPI MimeMessage_IsDirty( return E_NOTIMPL; } -static body_t *new_body_entry(IMimeBody *mime_body, DWORD index, body_t *parent) +static body_t *new_body_entry(MimeBody *mime_body, DWORD index, body_t *parent) { body_t *body = HeapAlloc(GetProcessHeap(), 0, sizeof(*body)); if(body) @@ -1625,28 +1642,29 @@ end: static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *offset, body_t *parent) { - IMimeBody *mime_body; + MimeBody *mime_body; HRESULT hr; body_t *body; ULARGE_INTEGER cur; LARGE_INTEGER zero; - MimeBody_create(NULL, (void**)&mime_body); - IMimeBody_Load(mime_body, pStm); + mime_body = mimebody_create(); + IMimeBody_Load(&mime_body->IMimeBody_iface, pStm); zero.QuadPart = 0; hr = IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &cur); offset->cbBodyStart = cur.u.LowPart + offset->cbHeaderStart; - if(parent) MimeBody_set_offsets(impl_from_IMimeBody(mime_body), offset); - IMimeBody_SetData(mime_body, IET_BINARY, NULL, NULL, &IID_IStream, pStm); + if (parent) MimeBody_set_offsets(mime_body, offset); + IMimeBody_SetData(&mime_body->IMimeBody_iface, IET_BINARY, NULL, NULL, &IID_IStream, pStm); body = new_body_entry(mime_body, msg->next_index++, parent); - if(IMimeBody_IsContentType(mime_body, "multipart", NULL) == S_OK) + if(IMimeBody_IsContentType(&mime_body->IMimeBody_iface, "multipart", NULL) == S_OK) { MIMEPARAMINFO *param_info; ULONG count, i; IMimeAllocator *alloc; - hr = IMimeBody_GetParameters(mime_body, "Content-Type", &count, &param_info); + hr = IMimeBody_GetParameters(&mime_body->IMimeBody_iface, "Content-Type", &count, + &param_info); if(hr != S_OK || count == 0) return body; MimeOleGetAllocator(&alloc); @@ -1708,7 +1726,7 @@ static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) zero.QuadPart = 0; IStream_Seek(pStm, zero, STREAM_SEEK_END, &cur); offsets.cbBodyEnd = cur.u.LowPart; - MimeBody_set_offsets(impl_from_IMimeBody(root_body->mime_body), &offsets); + MimeBody_set_offsets(root_body->mime_body, &offsets); list_add_head(&This->body_tree, &root_body->entry); @@ -1842,8 +1860,8 @@ static HRESULT WINAPI MimeMessage_BindToObject(IMimeMessage *iface, const HBODY if(IsEqualIID(riid, &IID_IMimeBody)) { - IMimeBody_AddRef(body->mime_body); - *ppvObject = body->mime_body; + IMimeBody_AddRef(&body->mime_body->IMimeBody_iface); + *ppvObject = &body->mime_body->IMimeBody_iface; return S_OK; } @@ -2019,7 +2037,8 @@ static HRESULT find_next(MimeMessage *This, body_t *body, FINDBODY *find, HBODY body = LIST_ENTRY( ptr, body_t, entry ); next = UlongToHandle( body->index ); find->dwReserved = body->index; - if (IMimeBody_IsContentType(body->mime_body, find->pszPriType, find->pszSubType) == S_OK) + if (IMimeBody_IsContentType(&body->mime_body->IMimeBody_iface, find->pszPriType, + find->pszSubType) == S_OK) { *out = next; return S_OK;

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeSecurity iface.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: f44d66c6175240ad037021b9f15f39c652449112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44d66c6175240ad037021b9f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:31:56 2013 +0100 inetcomm: COM cleanup for the IMimeSecurity iface. --- dlls/inetcomm/mimeole.c | 55 +++++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index d897d38..2b7a0f3 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2592,54 +2592,53 @@ HRESULT WINAPI MimeOleCreateVirtualStream(IStream **ppStream) typedef struct MimeSecurity { - const IMimeSecurityVtbl *lpVtbl; - - LONG refs; + IMimeSecurity IMimeSecurity_iface; + LONG ref; } MimeSecurity; -static HRESULT WINAPI MimeSecurity_QueryInterface( - IMimeSecurity* iface, - REFIID riid, - void** obj) +static inline MimeSecurity *impl_from_IMimeSecurity(IMimeSecurity *iface) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + return CONTAINING_RECORD(iface, MimeSecurity, IMimeSecurity_iface); +} + +static HRESULT WINAPI MimeSecurity_QueryInterface(IMimeSecurity *iface, REFIID riid, void **ppv) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMimeSecurity)) { - *obj = iface; + *ppv = iface; IMimeSecurity_AddRef(iface); return S_OK; } FIXME("no interface for %s\n", debugstr_guid(riid)); - *obj = NULL; + *ppv = NULL; return E_NOINTERFACE; } -static ULONG WINAPI MimeSecurity_AddRef( - IMimeSecurity* iface) +static ULONG WINAPI MimeSecurity_AddRef(IMimeSecurity *iface) { - MimeSecurity *This = (MimeSecurity *)iface; - TRACE("(%p)->()\n", iface); - return InterlockedIncrement(&This->refs); + MimeSecurity *This = impl_from_IMimeSecurity(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } -static ULONG WINAPI MimeSecurity_Release( - IMimeSecurity* iface) +static ULONG WINAPI MimeSecurity_Release(IMimeSecurity *iface) { - MimeSecurity *This = (MimeSecurity *)iface; - ULONG refs; + MimeSecurity *This = impl_from_IMimeSecurity(iface); + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n", iface); + TRACE("(%p) ref=%d\n", This, ref); - refs = InterlockedDecrement(&This->refs); - if (!refs) - { + if (!ref) HeapFree(GetProcessHeap(), 0, This); - } - return refs; + return ref; } static HRESULT WINAPI MimeSecurity_InitNew( @@ -2764,10 +2763,10 @@ HRESULT MimeSecurity_create(IUnknown *outer, void **obj) This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MimeSecurityVtbl; - This->refs = 1; + This->IMimeSecurity_iface.lpVtbl = &MimeSecurityVtbl; + This->ref = 1; - *obj = &This->lpVtbl; + *obj = &This->IMimeSecurity_iface; return S_OK; }

1 0

Nikolay Sivov : msxml3: CDATA nodes can't have children.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 431e77bec4a022dbed0dc2ead80d20250193fdaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=431e77bec4a022dbed0dc2ead… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 3 21:38:27 2013 +0400 msxml3: CDATA nodes can't have children. --- dlls/msxml3/cdata.c | 20 ++++++++++---------- dlls/msxml3/tests/domdoc.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 6b3c065..7fd4a37 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -290,10 +290,9 @@ static HRESULT WINAPI domcdata_insertBefore( IXMLDOMNode** outOldNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - - FIXME("(%p)->(%p %s %p) needs test\n", This, newNode, debugstr_variant(&refChild), outOldNode); - - return node_insert_before(&This->node, newNode, &refChild, outOldNode); + TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), outOldNode); + if (outOldNode) *outOldNode = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_replaceChild( @@ -303,10 +302,9 @@ static HRESULT WINAPI domcdata_replaceChild( IXMLDOMNode** outOldNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - - FIXME("(%p)->(%p %p %p) needs tests\n", This, newNode, oldNode, outOldNode); - - return node_replace_child(&This->node, newNode, oldNode, outOldNode); + TRACE("(%p)->(%p %p %p)\n", This, newNode, oldNode, outOldNode); + if (outOldNode) *outOldNode = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_removeChild( @@ -315,7 +313,8 @@ static HRESULT WINAPI domcdata_removeChild( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); TRACE("(%p)->(%p %p)\n", This, child, oldChild); - return node_remove_child(&This->node, child, oldChild); + if (oldChild) *oldChild = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_appendChild( @@ -324,7 +323,8 @@ static HRESULT WINAPI domcdata_appendChild( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); TRACE("(%p)->(%p %p)\n", This, child, outChild); - return node_append_child(&This->node, child, outChild); + if (outChild) *outChild = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_hasChildNodes( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 794df03..d69547f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8370,6 +8370,22 @@ static void test_insertBefore(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(cdata != NULL, "got %p\n", cdata); + EXPECT_NO_CHILDREN(cdata); + + /* attribute to cdata */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMNode_insertBefore(cdata, (IXMLDOMNode*)attr, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + + /* document to cdata */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMNode_insertBefore(cdata, (IXMLDOMNode*)doc, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + V_VT(&v) = VT_NULL; node = (void*)0xdeadbeef; hr = IXMLDOMDocument_insertBefore(doc3, cdata, v, &node);

1 0

Nikolay Sivov : msxml3: Filter unsupported child nodes in insertBefore() for elements.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 2d5c9f4f462f50cd82536dee3c5c9e7dfd6ad336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5c9f4f462f50cd82536dee3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 3 21:20:13 2013 +0400 msxml3: Filter unsupported child nodes in insertBefore() for elements. --- dlls/msxml3/element.c | 22 +++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 8 +++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 929830b..70360e5 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -301,13 +301,29 @@ static HRESULT WINAPI domelem_get_attributes( static HRESULT WINAPI domelem_insertBefore( IXMLDOMElement *iface, IXMLDOMNode* newNode, VARIANT refChild, - IXMLDOMNode** outOldNode) + IXMLDOMNode** old_node) { domelem *This = impl_from_IXMLDOMElement( iface ); + DOMNodeType type; + HRESULT hr; - TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), outOldNode); + TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), old_node); + + hr = IXMLDOMNode_get_nodeType(newNode, &type); + if (hr != S_OK) return hr; - return node_insert_before(&This->node, newNode, &refChild, outOldNode); + TRACE("new node type %d\n", type); + switch (type) + { + case NODE_DOCUMENT: + case NODE_DOCUMENT_TYPE: + case NODE_ENTITY: + case NODE_NOTATION: + if (old_node) *old_node = NULL; + return E_FAIL; + default: + return node_insert_before(&This->node, newNode, &refChild, old_node); + } } static HRESULT WINAPI domelem_replaceChild( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c1bfc1a..794df03 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4,7 +4,7 @@ * Copyright 2005 Mike McCormack for CodeWeavers * Copyright 2007-2008 Alistair Leslie-Hughes * Copyright 2010-2011 Adam Martinson for CodeWeavers - * Copyright 2010-2012 Nikolay Sivov for CodeWeavers + * Copyright 2010-2013 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -8484,6 +8484,12 @@ static void test_insertBefore(void) todo_wine EXPECT_REF(elem2, 2); + /* document to element */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)doc, v, NULL); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = NULL; node = NULL;

1 0

Petr Kočandrle : po: Completed WineMine Czech translation.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: ce4291c513ad7bbc010ee9d31614014495a5dd28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4291c513ad7bbc010ee9d31… Author: Petr Kočandrle <petr.kocandrle(a)gmail.com> Date: Fri Mar 1 14:39:18 2013 +0100 po: Completed WineMine Czech translation. --- po/cs.po | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/po/cs.po b/po/cs.po index cc63ae6..4e84598 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13825,7 +13825,7 @@ msgstr "" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "&Hra" #: winemine.rc:35 msgid "&New\tF2" @@ -13833,7 +13833,7 @@ msgstr "&Nová\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "&Otazníky" #: winemine.rc:39 msgid "&Beginner" @@ -13845,28 +13845,25 @@ msgstr "&Pokročilý" #: winemine.rc:41 msgid "&Expert" -msgstr "" +msgstr "E&xpert" #: winemine.rc:42 msgid "&Custom..." -msgstr "&Dle libosti..." +msgstr "&Vlastní..." #: winemine.rc:44 -#, fuzzy msgid "&Fastest Times" -msgstr "Ne&jlepší časy" +msgstr "N&ejlepší časy" #: winemine.rc:49 -#, fuzzy msgid "&About WineMine" -msgstr "&O Wine" +msgstr "&O WineMinách" #: winemine.rc:56 msgid "Fastest Times" msgstr "Nejlepší časy" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" msgstr "Nejlepší časy" @@ -13884,11 +13881,11 @@ msgstr "Expert" #: winemine.rc:74 msgid "Congratulations!" -msgstr "Gratulujeme !" +msgstr "Gratulace!" #: winemine.rc:76 msgid "Please enter your name" -msgstr "Prosím, zadejte své jméno" +msgstr "Zadej prosím své jméno" #: winemine.rc:84 msgid "Custom Game" @@ -13900,7 +13897,7 @@ msgstr "Řádky" #: winemine.rc:87 msgid "Columns" -msgstr "" +msgstr "Sloupce" #: winemine.rc:88 msgid "Mines" @@ -13908,7 +13905,7 @@ msgstr "Miny" #: winemine.rc:27 msgid "WineMine" -msgstr "WineMine" +msgstr "WineMiny" #: winemine.rc:28 msgid "Nobody"

1 0

Jeff Muizelaar : dbghelp: Store the vendor id in the correct order.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 03cae026114b175dfe15a68c5a9ae16b575c9c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cae026114b175dfe15a68c5… Author: Jeff Muizelaar <jmuizelaar(a)mozilla.com> Date: Fri Mar 1 10:12:10 2013 -0500 dbghelp: Store the vendor id in the correct order. --- dlls/dbghelp/minidump.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 7a21e8b..b00f9e2 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -635,8 +635,8 @@ static unsigned dump_system_info(struct dump_context* dc) do_x86cpuid(0, regs0); mdSysInfo.Cpu.X86CpuInfo.VendorId[0] = regs0[1]; - mdSysInfo.Cpu.X86CpuInfo.VendorId[1] = regs0[2]; - mdSysInfo.Cpu.X86CpuInfo.VendorId[2] = regs0[3]; + mdSysInfo.Cpu.X86CpuInfo.VendorId[1] = regs0[3]; + mdSysInfo.Cpu.X86CpuInfo.VendorId[2] = regs0[2]; do_x86cpuid(1, regs1); mdSysInfo.Cpu.X86CpuInfo.VersionInformation = regs1[0]; mdSysInfo.Cpu.X86CpuInfo.FeatureInformation = regs1[3];

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeBody iface.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 4e35ec47773ed9bb84180ec867a2a39b6278e4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e35ec47773ed9bb84180ec86… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:33:16 2013 +0100 inetcomm: COM cleanup for the IMimeBody iface. --- dlls/inetcomm/mimeole.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index c1fed51..58a4a5f 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -94,8 +94,8 @@ typedef struct typedef struct MimeBody { - const IMimeBodyVtbl *lpVtbl; - LONG refs; + IMimeBody IMimeBody_iface; + LONG ref; HBODY handle; @@ -110,9 +110,9 @@ typedef struct MimeBody BODYOFFSETS body_offsets; } MimeBody; -static inline MimeBody *impl_from_IMimeBody( IMimeBody *iface ) +static inline MimeBody *impl_from_IMimeBody(IMimeBody *iface) { - return (MimeBody *)((char*)iface - FIELD_OFFSET(MimeBody, lpVtbl)); + return CONTAINING_RECORD(iface, MimeBody, IMimeBody_iface); } static LPSTR strdupA(LPCSTR str) @@ -523,22 +523,24 @@ static HRESULT WINAPI MimeBody_QueryInterface(IMimeBody* iface, return E_NOINTERFACE; } -static ULONG WINAPI MimeBody_AddRef(IMimeBody* iface) +static ULONG WINAPI MimeBody_AddRef(IMimeBody *iface) { MimeBody *This = impl_from_IMimeBody(iface); - TRACE("(%p)->()\n", iface); - return InterlockedIncrement(&This->refs); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } -static ULONG WINAPI MimeBody_Release(IMimeBody* iface) +static ULONG WINAPI MimeBody_Release(IMimeBody *iface) { MimeBody *This = impl_from_IMimeBody(iface); - ULONG refs; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n", iface); + TRACE("(%p) ref=%d\n", This, ref); - refs = InterlockedDecrement(&This->refs); - if (!refs) + if (!ref) { empty_header_list(&This->headers); empty_new_prop_list(&This->new_props); @@ -551,7 +553,7 @@ static ULONG WINAPI MimeBody_Release(IMimeBody* iface) HeapFree(GetProcessHeap(), 0, This); } - return refs; + return ref; } static HRESULT WINAPI MimeBody_GetClassID( @@ -1109,8 +1111,8 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &body_vtbl; - This->refs = 1; + This->IMimeBody_iface.lpVtbl = &body_vtbl; + This->ref = 1; This->handle = NULL; list_init(&This->headers); list_init(&This->new_props); @@ -1125,7 +1127,7 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) body_offsets.cbBodyStart = body_offsets.cbBodyEnd = 0; MimeBody_set_offsets(This, &body_offsets); - *obj = &This->lpVtbl; + *obj = &This->IMimeBody_iface; return S_OK; }

1 0

Michael Stefaniuc : inetcomm: Use a static interface instance for IMimeAllocator.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 3a9d744f126c8bc0ab2708ef312149faecac8ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9d744f126c8bc0ab2708ef3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:32:40 2013 +0100 inetcomm: Use a static interface instance for IMimeAllocator. --- dlls/inetcomm/mimeole.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 2b7a0f3..c1fed51 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2778,11 +2778,6 @@ HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) return MimeSecurity_create(NULL, (void **)ppSecurity); } -typedef struct -{ - IMimeAllocatorVtbl *lpVtbl; -} MimeAllocator; - static HRESULT WINAPI MimeAlloc_QueryInterface( IMimeAllocator* iface, REFIID riid, @@ -2964,7 +2959,7 @@ static IMimeAllocatorVtbl mime_alloc_vtbl = MimeAlloc_PropVariantClear }; -static MimeAllocator mime_allocator = +static IMimeAllocator mime_allocator = { &mime_alloc_vtbl };

1 0

Michael Stefaniuc : inetcomm: Pass the object instead of an iface to a helper function.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: d50b3b20682822d61a4605398723648b92fb0c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50b3b20682822d61a4605398… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:29:53 2013 +0100 inetcomm: Pass the object instead of an iface to a helper function. --- dlls/inetcomm/mimeole.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 3e23fc0..d897d38 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1996,9 +1996,8 @@ static HRESULT WINAPI MimeMessage_CountBodies(IMimeMessage *iface, HBODY hParent return S_OK; } -static HRESULT find_next(IMimeMessage *msg, body_t *body, LPFINDBODY find, HBODY *out) +static HRESULT find_next(MimeMessage *This, body_t *body, FINDBODY *find, HBODY *out) { - MimeMessage *This = (MimeMessage *)msg; struct list *ptr; HBODY next; @@ -2027,15 +2026,14 @@ static HRESULT find_next(IMimeMessage *msg, body_t *body, LPFINDBODY find, HBODY return MIME_E_NOT_FOUND; } -static HRESULT WINAPI MimeMessage_FindFirst( - IMimeMessage *iface, - LPFINDBODY pFindBody, - LPHBODY phBody) +static HRESULT WINAPI MimeMessage_FindFirst(IMimeMessage *iface, FINDBODY *pFindBody, HBODY *phBody) { + MimeMessage *This = impl_from_IMimeMessage(iface); + TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody); pFindBody->dwReserved = 0; - return find_next( iface, NULL, pFindBody, phBody ); + return find_next(This, NULL, pFindBody, phBody); } static HRESULT WINAPI MimeMessage_FindNext(IMimeMessage *iface, FINDBODY *pFindBody, HBODY *phBody) @@ -2048,7 +2046,7 @@ static HRESULT WINAPI MimeMessage_FindNext(IMimeMessage *iface, FINDBODY *pFindB hr = find_body( &This->body_tree, UlongToHandle( pFindBody->dwReserved ), &body ); if (hr != S_OK) return MIME_E_NOT_FOUND; - return find_next( iface, body, pFindBody, phBody ); + return find_next(This, body, pFindBody, phBody); } static HRESULT WINAPI MimeMessage_ResolveURL(

1 0

Alexandre Julliard : vbscript: Tweak enum macros to avoid confusing winapi_extract.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 1e7d7d098529da37bf64deea86caef08692bce9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7d7d098529da37bf64deea8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 11:19:50 2013 +0100 vbscript: Tweak enum macros to avoid confusing winapi_extract. --- dlls/vbscript/vbregexp.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 0aaa140..02e63ab 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -25,21 +25,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #define REGEXP_TID_LIST \ - XDIID(RegExp2) \ - XDIID(Match2) \ - XDIID(MatchCollection2) \ + XDIID(RegExp2), \ + XDIID(Match2), \ + XDIID(MatchCollection2), \ XDIID(SubMatches) typedef enum { -#define XDIID(iface) iface ## _tid, -REGEXP_TID_LIST +#define XDIID(iface) iface ## _tid + REGEXP_TID_LIST, #undef XDIID REGEXP_LAST_tid } regexp_tid_t; static REFIID tid_ids[] = { -#define XDIID(iface) &IID_I ## iface, -REGEXP_TID_LIST +#define XDIID(iface) &IID_I ## iface + REGEXP_TID_LIST #undef XDIID };

1 0

Dmitry Timoshkov : gdiplus: GdipDrawString should not clip the string if StringFormatFlagsNoClip is specified .
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 9fb88c79994c8d5a1561ca446139bbf99386e68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb88c79994c8d5a1561ca446… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 4 17:52:24 2013 +0900 gdiplus: GdipDrawString should not clip the string if StringFormatFlagsNoClip is specified. --- dlls/gdiplus/graphics.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 806cfa9..a450ded 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4907,7 +4907,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string GpPointF pt[3], rectcpy[4]; POINT corners[4]; REAL rel_width, rel_height, margin_x; - INT save_state; + INT save_state, format_flags = 0; REAL offsety = 0.0; struct draw_string_args args; RectF scaled_rect; @@ -4932,6 +4932,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(format){ TRACE("may be ignoring some format flags: attr %x\n", format->attr); + format_flags = format->attr; + /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ if(format->vertalign != StringAlignmentNear){ @@ -4985,7 +4987,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - if (scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) + if (!(format_flags & StringFormatFlagsNoClip) && + scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE);

1 0

Dmitry Timoshkov : gdiplus: Add some tests for string format alignment.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 464b8b4160862076aa2fad3cb58c7a49f62267e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464b8b4160862076aa2fad3cb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 4 17:52:59 2013 +0900 gdiplus: Add some tests for string format alignment. --- dlls/gdiplus/tests/graphics.c | 142 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index c37d33f..08b2465 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3909,16 +3909,24 @@ static void test_measure_string(void) static const WCHAR string[] = { 'A','0','1',0 }; HDC hdc; GpStringFormat *format; + CharacterRange range = { 0, 3 }; + GpRegion *region; GpGraphics *graphics; GpFontFamily *family; GpFont *font; GpStatus status; RectF bounds, rect; REAL width, height, width_1, width_2; + REAL margin_x, margin_y, width_rgn, height_rgn; int lines, glyphs; status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); expect(Ok, status); + expect(Ok, status); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + status = GdipCreateRegion(&region); + expect(Ok, status); status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); expect(Ok, status); @@ -3929,12 +3937,17 @@ static void test_measure_string(void) status = GdipCreateFont(family, 20, FontStyleRegular, UnitPixel, &font); expect(Ok, status); + margin_x = 20.0 / 6.0; + margin_y = 20.0 / 8.0; + set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); expect(3, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); width = bounds.Width; height = bounds.Height; @@ -3945,16 +3958,35 @@ static void test_measure_string(void) expect(Ok, status); expect(3, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf(width, bounds.Width); todo_wine expectf(height / 2.0, bounds.Height); + status = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap | StringFormatFlagsNoClip); + + set_rect_empty(&rect); + rect.Height = height / 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(width, bounds.Width); +todo_wine + expectf(height, bounds.Height); + set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, 1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); ok(bounds.Width < width / 2.0, "width of 1 glyph is wrong\n"); expectf(height, bounds.Height); width_1 = bounds.Width; @@ -3965,6 +3997,8 @@ todo_wine expect(Ok, status); expect(2, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); ok(bounds.Width < width, "width of 2 glyphs is wrong\n"); ok(bounds.Width > width_1, "width of 2 glyphs is wrong\n"); expectf(height, bounds.Height); @@ -3977,6 +4011,8 @@ todo_wine expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -3988,6 +4024,8 @@ todo_wine expect(Ok, status); expect(2, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_2, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -3999,9 +4037,112 @@ todo_wine expect(Ok, status); expect(1, glyphs); expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + expectf(5.0, bounds.X); + expectf(5.0, bounds.Y); + expectf(width, bounds.Width); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf_(width - margin_x*2.0, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + + width_rgn = bounds.Width; + height_rgn = bounds.Height; + + GdipSetStringFormatAlign(format, StringAlignmentCenter); + GdipSetStringFormatLineAlign(format, StringAlignmentCenter); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 + width/2.0, bounds.X, 0.01); +todo_wine + expectf(5.0 + height/2.0, bounds.Y); + expectf(width, bounds.Width); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn * 2.0; + rect.Height = height_rgn * 2.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + width_rgn/2.0, bounds.X, 1.0); +todo_wine + expectf_(5.0 + height_rgn/2.0, bounds.Y, 1.0); + expectf_(width_rgn, bounds.Width, 1.0); + expectf_(height_rgn, bounds.Height, 1.0); + + GdipSetStringFormatAlign(format, StringAlignmentFar); + GdipSetStringFormatLineAlign(format, StringAlignmentFar); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width * 2.0; + rect.Height = height * 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf(5.0 + width, bounds.X); +todo_wine + expectf(5.0 + height, bounds.Y); + expectf(width, bounds.Width); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn * 2.0; + rect.Height = height_rgn * 2.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + width_rgn, bounds.X, 2.0); +todo_wine + expectf_(5.0 + height_rgn, bounds.Y, 1.0); + expectf_(width_rgn, bounds.Width, 1.0); + expectf_(height_rgn, bounds.Height, 1.0); + status = GdipDeleteFont(font); expect(Ok, status); @@ -4010,6 +4151,7 @@ todo_wine DeleteDC(hdc); GdipDeleteFontFamily(family); + GdipDeleteRegion(region); GdipDeleteStringFormat(format); }

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IStream iface.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 9a436a98f4ca6a24c320c4fcb7a5d81da3919e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a436a98f4ca6a24c320c4fcb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:36:06 2013 +0100 inetcomm: COM cleanup for the IStream iface. --- dlls/inetcomm/mimeole.c | 62 +++++++++++++++++++---------------------------- 1 files changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 62d42b9..4c61f72 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -572,19 +572,14 @@ static HRESULT WINAPI MimeBody_IsDirty( return E_NOTIMPL; } -static HRESULT WINAPI MimeBody_Load( - IMimeBody* iface, - LPSTREAM pStm) +static HRESULT WINAPI MimeBody_Load(IMimeBody *iface, IStream *pStm) { MimeBody *This = impl_from_IMimeBody(iface); TRACE("(%p)->(%p)\n", iface, pStm); return parse_headers(This, pStm); } -static HRESULT WINAPI MimeBody_Save( - IMimeBody* iface, - LPSTREAM pStm, - BOOL fClearDirty) +static HRESULT WINAPI MimeBody_Save(IMimeBody *iface, IStream *pStm, BOOL fClearDirty) { FIXME("stub\n"); return E_NOTIMPL; @@ -1150,62 +1145,58 @@ HRESULT MimeBody_create(IUnknown *outer, void **ppv) typedef struct { - IStreamVtbl *lpVtbl; - LONG refs; - + IStream IStream_iface; + LONG ref; IStream *base; ULARGE_INTEGER pos, start, length; } sub_stream_t; -static inline sub_stream_t *impl_from_IStream( IStream *iface ) +static inline sub_stream_t *impl_from_IStream(IStream *iface) { - return (sub_stream_t *)((char*)iface - FIELD_OFFSET(sub_stream_t, lpVtbl)); + return CONTAINING_RECORD(iface, sub_stream_t, IStream_iface); } -static HRESULT WINAPI sub_stream_QueryInterface( - IStream* iface, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI sub_stream_QueryInterface(IStream *iface, REFIID riid, void **ppv) { sub_stream_t *This = impl_from_IStream(iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); - *ppvObject = NULL; + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ISequentialStream) || IsEqualIID(riid, &IID_IStream)) { IStream_AddRef(iface); - *ppvObject = iface; + *ppv = iface; return S_OK; } return E_NOINTERFACE; } -static ULONG WINAPI sub_stream_AddRef( - IStream* iface) +static ULONG WINAPI sub_stream_AddRef(IStream *iface) { sub_stream_t *This = impl_from_IStream(iface); + LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); - return InterlockedIncrement(&This->refs); + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } -static ULONG WINAPI sub_stream_Release( - IStream* iface) +static ULONG WINAPI sub_stream_Release(IStream *iface) { sub_stream_t *This = impl_from_IStream(iface); - LONG refs; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); - refs = InterlockedDecrement(&This->refs); - if(!refs) + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { IStream_Release(This->base); HeapFree(GetProcessHeap(), 0, This); } - return refs; + return ref; } static HRESULT WINAPI sub_stream_Read( @@ -1422,15 +1413,15 @@ static HRESULT create_sub_stream(IStream *stream, ULARGE_INTEGER start, ULARGE_I This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if(!This) return E_OUTOFMEMORY; - This->lpVtbl = &sub_stream_vtbl; - This->refs = 1; + This->IStream_iface.lpVtbl = &sub_stream_vtbl; + This->ref = 1; This->start = start; This->length = length; This->pos.QuadPart = 0; IStream_AddRef(stream); This->base = stream; - *out = (IStream*)&This->lpVtbl; + *out = &This->IStream_iface; return S_OK; } @@ -1733,10 +1724,7 @@ static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) return S_OK; } -static HRESULT WINAPI MimeMessage_Save( - IMimeMessage *iface, - LPSTREAM pStm, - BOOL fClearDirty) +static HRESULT WINAPI MimeMessage_Save(IMimeMessage *iface, IStream *pStm, BOOL fClearDirty) { FIXME("(%p)->(%p, %s)\n", iface, pStm, fClearDirty ? "TRUE" : "FALSE"); return E_NOTIMPL;

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeMessage iface.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: f18d156352e9b7f9d7675fdd5846c8cbd7846c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18d156352e9b7f9d7675fdd5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:28:47 2013 +0100 inetcomm: COM cleanup for the IMimeMessage iface. --- dlls/inetcomm/mimeole.c | 85 +++++++++++++++++++++-------------------------- 1 files changed, 38 insertions(+), 47 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index ac4142a..3e23fc0 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1428,15 +1428,19 @@ typedef struct body_t typedef struct MimeMessage { - const IMimeMessageVtbl *lpVtbl; - - LONG refs; + IMimeMessage IMimeMessage_iface; + LONG ref; IStream *stream; struct list body_tree; DWORD next_index; } MimeMessage; +static inline MimeMessage *impl_from_IMimeMessage(IMimeMessage *iface) +{ + return CONTAINING_RECORD(iface, MimeMessage, IMimeMessage_iface); +} + static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID riid, void **ppv) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); @@ -1459,9 +1463,12 @@ static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID rii static ULONG WINAPI MimeMessage_AddRef(IMimeMessage *iface) { - MimeMessage *This = (MimeMessage *)iface; - TRACE("(%p)->()\n", iface); - return InterlockedIncrement(&This->refs); + MimeMessage *This = impl_from_IMimeMessage(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static void empty_body_list(struct list *list) @@ -1478,13 +1485,12 @@ static void empty_body_list(struct list *list) static ULONG WINAPI MimeMessage_Release(IMimeMessage *iface) { - MimeMessage *This = (MimeMessage *)iface; - ULONG refs; + MimeMessage *This = impl_from_IMimeMessage(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n", iface); + TRACE("(%p) ref=%d\n", This, ref); - refs = InterlockedDecrement(&This->refs); - if (!refs) + if (!ref) { empty_body_list(&This->body_tree); @@ -1492,7 +1498,7 @@ static ULONG WINAPI MimeMessage_Release(IMimeMessage *iface) HeapFree(GetProcessHeap(), 0, This); } - return refs; + return ref; } /*** IPersist methods ***/ @@ -1674,11 +1680,9 @@ static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *off return body; } -static HRESULT WINAPI MimeMessage_Load( - IMimeMessage *iface, - LPSTREAM pStm) +static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *root_body; BODYOFFSETS offsets; ULARGE_INTEGER cur; @@ -1734,12 +1738,11 @@ static HRESULT WINAPI MimeMessage_InitNew( } /*** IMimeMessageTree methods ***/ -static HRESULT WINAPI MimeMessage_GetMessageSource( - IMimeMessage *iface, - IStream **ppStream, - DWORD dwFlags) +static HRESULT WINAPI MimeMessage_GetMessageSource(IMimeMessage *iface, IStream **ppStream, + DWORD dwFlags) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); + FIXME("(%p)->(%p, 0x%x)\n", iface, ppStream, dwFlags); IStream_AddRef(This->stream); @@ -1822,13 +1825,10 @@ static HRESULT find_body(struct list *list, HBODY hbody, body_t **body) return S_FALSE; } -static HRESULT WINAPI MimeMessage_BindToObject( - IMimeMessage *iface, - const HBODY hBody, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI MimeMessage_BindToObject(IMimeMessage *iface, const HBODY hBody, REFIID riid, + void **ppvObject) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); HRESULT hr; body_t *body; @@ -1933,13 +1933,10 @@ static HRESULT WINAPI MimeMessage_InsertBody( return E_NOTIMPL; } -static HRESULT WINAPI MimeMessage_GetBody( - IMimeMessage *iface, - BODYLOCATION location, - HBODY hPivot, - LPHBODY phBody) +static HRESULT WINAPI MimeMessage_GetBody(IMimeMessage *iface, BODYLOCATION location, HBODY hPivot, + HBODY *phBody) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *body; HRESULT hr; @@ -1981,14 +1978,11 @@ static void count_children(body_t *body, boolean recurse, ULONG *count) } } -static HRESULT WINAPI MimeMessage_CountBodies( - IMimeMessage *iface, - HBODY hParent, - boolean fRecurse, - ULONG *pcBodies) +static HRESULT WINAPI MimeMessage_CountBodies(IMimeMessage *iface, HBODY hParent, boolean fRecurse, + ULONG *pcBodies) { HRESULT hr; - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *body; TRACE("(%p)->(%p, %s, %p)\n", iface, hParent, fRecurse ? "TRUE" : "FALSE", pcBodies); @@ -2044,12 +2038,9 @@ static HRESULT WINAPI MimeMessage_FindFirst( return find_next( iface, NULL, pFindBody, phBody ); } -static HRESULT WINAPI MimeMessage_FindNext( - IMimeMessage *iface, - LPFINDBODY pFindBody, - LPHBODY phBody) +static HRESULT WINAPI MimeMessage_FindNext(IMimeMessage *iface, FINDBODY *pFindBody, HBODY *phBody) { - MimeMessage *This = (MimeMessage *)iface; + MimeMessage *This = impl_from_IMimeMessage(iface); body_t *body; HRESULT hr; @@ -2561,13 +2552,13 @@ HRESULT MimeMessage_create(IUnknown *outer, void **obj) This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MimeMessageVtbl; - This->refs = 1; + This->IMimeMessage_iface.lpVtbl = &MimeMessageVtbl; + This->ref = 1; This->stream = NULL; list_init(&This->body_tree); This->next_index = 1; - *obj = &This->lpVtbl; + *obj = &This->IMimeMessage_iface; return S_OK; }

1 0

Andrew Talbot : winealsa.drv: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 23bf25b0c0c08427e2f65af2c16020afcfc788d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bf25b0c0c08427e2f65af2c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:50 2013 +0000 winealsa.drv: Avoid signed-unsigned integer comparisons. --- dlls/winealsa.drv/mmdevdrv.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8c905e9..2948366 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -3396,7 +3396,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( IAudioStreamVolume *iface, UINT32 count, const float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3422,7 +3422,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( IAudioStreamVolume *iface, UINT32 count, float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3558,7 +3558,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - int i; + unsigned int i; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, wine_dbgstr_guid(context)); @@ -3589,7 +3589,7 @@ static HRESULT WINAPI ChannelAudioVolume_GetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", session, count, levels);

1 0

Vincent Povirk : gdiplus: Store the image type on a Graphics object in case the image is freed.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 7b004c17149af7b9bedc72ff1ee30ea6f6f755c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b004c17149af7b9bedc72ff1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 2 14:28:01 2013 -0600 gdiplus: Store the image type on a Graphics object in case the image is freed. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index cb7330e..87f3b8b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -154,6 +154,7 @@ struct GpGraphics{ BOOL owndc; BOOL alpha_hdc; GpImage *image; + ImageType image_type; SmoothingMode smoothing; CompositingQuality compqual; InterpolationMode interpolation; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 853027c..1150675 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2195,6 +2195,9 @@ GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) (*graphics)->hwnd = NULL; (*graphics)->owndc = FALSE; (*graphics)->image = image; + /* We have to store the image type here because the image may be freed + * before GdipDeleteGraphics is called, and metafiles need special treatment. */ + (*graphics)->image_type = image->type; (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; (*graphics)->interpolation = InterpolationModeBilinear; @@ -2389,7 +2392,7 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if(!graphics) return InvalidParameter; if(graphics->busy) return ObjectBusy; - if (graphics->image && graphics->image->type == ImageTypeMetafile) + if (graphics->image && graphics->image_type == ImageTypeMetafile) { stat = METAFILE_GraphicsDeleted((GpMetafile*)graphics->image); if (stat != Ok)

1 0

Piotr Caban : msvcrt: Added stdin close/open tests.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: cd7b71d3f416fcf34814af7b69bdb869375fca25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7b71d3f416fcf34814af7b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:31 2013 +0100 msvcrt: Added stdin close/open tests. --- dlls/msvcrt/tests/file.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 392b1a0..938161c 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1964,6 +1964,42 @@ static void test_dup2(void) ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); } +static void test_stdin(void) +{ + HANDLE stdinh = GetStdHandle(STD_INPUT_HANDLE); + int stdin_dup, fd; + HANDLE h; + DWORD r; + + stdin_dup = _dup(STDIN_FILENO); + ok(stdin_dup != -1, "_dup(STDIN_FILENO) failed\n"); + + ok(stdinh == (HANDLE)_get_osfhandle(STDIN_FILENO), + "GetStdHandle(STD_INPUT_HANDLE) != _get_osfhandle(STDIN_FILENO)\n"); + + r = SetStdHandle(STD_INPUT_HANDLE, INVALID_HANDLE_VALUE); + ok(r == TRUE, "SetStdHandle returned %x, expected TRUE\n", r); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h == INVALID_HANDLE_VALUE, "h = %p\n", h); + + close(STDIN_FILENO); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h == NULL, "h != NULL\n"); + + fd = open("stdin.tst", O_WRONLY | O_CREAT, _S_IREAD |_S_IWRITE); + ok(fd != -1, "open failed\n"); + ok(fd == STDIN_FILENO, "fd = %d, expected STDIN_FILENO\n", fd); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h != NULL, "h == NULL\n"); + close(fd); + unlink("stdin.tst"); + + r = _dup2(stdin_dup, STDIN_FILENO); + ok(r != -1, "_dup2 failed\n"); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h != NULL, "h == NULL\n"); +} + START_TEST(file) { int arg_c; @@ -2019,6 +2055,7 @@ START_TEST(file) test_get_osfhandle(); test_setmaxstdio(); test_pipes(arg_v[0]); + test_stdin(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Piotr Caban : msvcrt: Reuse standard file descriptors after closing them.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: db92137f83671204f4a9f188a6a432f98ef6648b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db92137f83671204f4a9f188a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:21 2013 +0100 msvcrt: Reuse standard file descriptors after closing them. --- dlls/msvcrt/file.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c730bd7..5b3bf5e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -251,40 +251,37 @@ static HANDLE msvcrt_fdtoh(int fd) /* INTERNAL: free a file entry fd */ static void msvcrt_free_fd(int fd) { - HANDLE old_handle; ioinfo *fdinfo; LOCK_FILES(); fdinfo = msvcrt_get_ioinfo(fd); - old_handle = fdinfo->handle; if(fdinfo != &MSVCRT___badioinfo) { fdinfo->handle = INVALID_HANDLE_VALUE; fdinfo->wxflag = 0; } TRACE(":fd (%d) freed\n",fd); - if (fd < 3) /* don't use 0,1,2 for user files */ + + if (fd < 3) { switch (fd) { case 0: - if (GetStdHandle(STD_INPUT_HANDLE) == old_handle) SetStdHandle(STD_INPUT_HANDLE, 0); + SetStdHandle(STD_INPUT_HANDLE, 0); break; case 1: - if (GetStdHandle(STD_OUTPUT_HANDLE) == old_handle) SetStdHandle(STD_OUTPUT_HANDLE, 0); + SetStdHandle(STD_OUTPUT_HANDLE, 0); break; case 2: - if (GetStdHandle(STD_ERROR_HANDLE) == old_handle) SetStdHandle(STD_ERROR_HANDLE, 0); + SetStdHandle(STD_ERROR_HANDLE, 0); break; } } - else - { - if (fd == MSVCRT_fdend - 1) - MSVCRT_fdend--; - if (fd < MSVCRT_fdstart) - MSVCRT_fdstart = fd; - } + + if (fd == MSVCRT_fdend - 1) + MSVCRT_fdend--; + if (fd < MSVCRT_fdstart) + MSVCRT_fdstart = fd; UNLOCK_FILES(); }

1 0

Andrew Talbot : windowscodecs: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 81afb28818338a1511f5eaf3db80d1365c17f7da URL: http://source.winehq.org/git/wine.git/?a=commit;h=81afb28818338a1511f5eaf3d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:47 2013 +0000 windowscodecs: Avoid signed-unsigned integer comparisons. --- dlls/windowscodecs/icoformat.c | 2 +- dlls/windowscodecs/info.c | 7 ++++--- dlls/windowscodecs/jpegformat.c | 5 +++-- dlls/windowscodecs/main.c | 2 +- dlls/windowscodecs/metadatahandler.c | 4 ++-- dlls/windowscodecs/palette.c | 2 +- dlls/windowscodecs/scaler.c | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index ec09aa6..d245031 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -293,7 +293,7 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) { /* If the alpha channel is fully transparent, we should ignore it. */ int nonzero_alpha = 0; - int i; + UINT i; for (i=0; i<(result->height*result->width); i++) { diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 3da5b20..7c87c5d 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -539,7 +539,8 @@ static HRESULT WINAPI BitmapDecoderInfo_MatchesPattern(IWICBitmapDecoderInfo *if WICBitmapPattern *patterns; UINT pattern_count=0, patterns_size=0; HRESULT hr; - int i, pos; + UINT i; + ULONG pos; BYTE *data=NULL; ULONG datasize=0; ULONG bytesread; @@ -1900,7 +1901,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) { ComponentEnum *This = impl_from_IEnumUnknown(iface); - int num_fetched=0; + ULONG num_fetched=0; ComponentEnumItem *item; HRESULT hr=S_OK; @@ -1929,7 +1930,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, static HRESULT WINAPI ComponentEnum_Skip(IEnumUnknown *iface, ULONG celt) { ComponentEnum *This = impl_from_IEnumUnknown(iface); - int i; + ULONG i; HRESULT hr=S_OK; TRACE("(%p,%u)\n", iface, celt); diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 1aca6d1..6f2653d 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -998,7 +998,8 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); jmp_buf jmpbuf; BYTE *swapped_data = NULL, *current_row; - int line, row_size; + UINT line; + int row_size; TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); EnterCriticalSection(&This->lock); @@ -1061,7 +1062,7 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface { if (This->format->swap_rgb) { - int x; + UINT x; memcpy(swapped_data, pbPixels + (cbStride * line), row_size); diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index b63edf5..967f80b 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -98,7 +98,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, if (row_offset % 8 == 0) { /* everything lines up on a byte boundary */ - UINT row; + INT row; const BYTE *src; BYTE *dst; diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 6b19f84..7615a6d 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -60,7 +60,7 @@ static inline MetadataHandler *impl_from_IWICPersistStream(IWICPersistStream *if static void MetadataHandler_FreeItems(MetadataHandler *This) { - int i; + DWORD i; for (i=0; i<This->item_count; i++) { @@ -555,7 +555,7 @@ static HRESULT WINAPI MetadataHandlerEnum_Next(IWICEnumMetadataItem *iface, MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); ULONG new_index; HRESULT hr=S_FALSE; - int i; + ULONG i; TRACE("(%p,%i)\n", iface, celt); diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 045f795..e21a073 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -592,7 +592,7 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) { PaletteImpl *This = impl_from_IWICPalette(iface); - int i; + UINT i; TRACE("(%p,%p)\n", iface, pfHasAlpha); diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 5470d2b..03410e8 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -178,7 +178,7 @@ static void NearestNeighbor_CopyScanline(BitmapScaler *This, UINT dst_x, UINT dst_y, UINT dst_width, BYTE **src_data, UINT src_data_x, UINT src_data_y, BYTE *pbBuffer) { - int i; + UINT i; UINT bytesperpixel = This->bpp/8; UINT src_x, src_y;

1 0

Andrew Talbot : mscoree: Remove unneeded address-of operator from function name.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: edea85dea684a8440dd758dabc24fe9722ac7cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edea85dea684a8440dd758dab… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:44 2013 +0000 mscoree: Remove unneeded address-of operator from function name. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 6906075..fe529fd 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -318,7 +318,7 @@ void unload_all_runtimes(void) /* If the only references to mscoree are through dll's that were loaded by * Mono, shutting down the Mono runtime will free mscoree, so take a * reference to prevent that from happening. */ - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&unload_all_runtimes, &handle); + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)unload_all_runtimes, &handle); for (i=0; i<NUM_ABI_VERSIONS; i++) {

1 0

Piotr Caban : msvcrt: Don' t duplicate standard handles during initialization.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: f565e4a3157d38b50a25fc3b90014474b59fceba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f565e4a3157d38b50a25fc3b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:07 2013 +0100 msvcrt: Don't duplicate standard handles during initialization. --- dlls/msvcrt/file.c | 50 +++++++++----------------------------------------- 1 files changed, 9 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 612f470..c730bd7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -486,53 +486,21 @@ void msvcrt_init_io(void) if (msvcrt_get_ioinfo(MSVCRT_fdstart)->handle == INVALID_HANDLE_VALUE) break; } - if(!MSVCRT___pioinfo[0]) - msvcrt_alloc_fd_from(INVALID_HANDLE_VALUE, 0, 3); - - fdinfo = msvcrt_get_ioinfo(0); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_INPUT_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); - fdinfo = msvcrt_get_ioinfo(1); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_OUTPUT_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); - fdinfo = msvcrt_get_ioinfo(2); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_ERROR_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); - TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(0)->handle, - msvcrt_get_ioinfo(1)->handle, msvcrt_get_ioinfo(2)->handle); + TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO)->handle, + msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO)->handle, + msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO)->handle); memset(MSVCRT__iob,0,3*sizeof(MSVCRT_FILE)); for (i = 0; i < 3; i++)

1 0