December 2005 - Wine-Commits

wine/dlls/x11drv dib.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21602 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:15:21 Modified files: dlls/x11drv : dib.c Log message: Oldrich Jedlicka <oldium.pro(a)seznam.cz> Fix for the monochrome DIB with inverted colors. Patch: http://cvs.winehq.org/patch.py?id=21602 Old revision New revision Changes Path 1.46 1.47 +10 -3 wine/dlls/x11drv/dib.c Index: wine/dlls/x11drv/dib.c diff -u -p wine/dlls/x11drv/dib.c:1.46 wine/dlls/x11drv/dib.c:1.47 --- wine/dlls/x11drv/dib.c:1.46 1 Dec 2005 17:15:21 -0000 +++ wine/dlls/x11drv/dib.c 1 Dec 2005 17:15:21 -0000 @@ -896,19 +896,26 @@ static void X11DRV_DIB_GetImageBits_1( i notsupported: { BYTE* dstbyte; + BYTE neg = 0; unsigned long white = (1 << bmpImage->bits_per_pixel) - 1; /* ==== any bmp format -> pal 1 dib ==== */ - WARN("from unknown %d bit bitmap (%lx,%lx,%lx) to 1 bit DIB\n", + if ((unsigned)colors[0].rgbRed+colors[0].rgbGreen+colors[0].rgbBlue >= + (unsigned)colors[1].rgbRed+colors[1].rgbGreen+colors[1].rgbBlue ) + neg = 1; + + WARN("from unknown %d bit bitmap (%lx,%lx,%lx) to 1 bit DIB, " + "%s color mapping\n", bmpImage->bits_per_pixel, bmpImage->red_mask, - bmpImage->green_mask, bmpImage->blue_mask ); + bmpImage->green_mask, bmpImage->blue_mask, + neg?"negative":"direct" ); for (h=lines-1; h>=0; h--) { BYTE dstval; dstbyte=dstbits; dstval=0; for (x=0; x<width; x++) { - dstval|=(XGetPixel( bmpImage, x, h) >= white) << (7 - (x&7)); + dstval|=((XGetPixel( bmpImage, x, h) >= white) ^ neg) << (7 - (x&7)); if ((x&7)==7) { *dstbyte++=dstval; dstval=0;

1 0

CVSROOT/. loginfo
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21601 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/12/01 11:13:15 Modified files: . : loginfo Log message: Disable CIA notifications for wine, they will be sent from the git repository instead. Patch: http://cvs.winehq.org/patch.py?id=21601 Old revision New revision Changes Path 1.49 1.50 +1 -0 CVSROOT/loginfo Index: CVSROOT/loginfo diff -u -p CVSROOT/loginfo:1.49 CVSROOT/loginfo:1.50 --- CVSROOT/loginfo:1.49 1 Dec 2005 17:13:15 -0000 +++ CVSROOT/loginfo 1 Dec 2005 17:13:15 -0000 @@ -29,5 +29,6 @@ ^test /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m testing(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -S -s %p %s # All others go to wine-cvs +^wine /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m wine-cvs(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -L 200 -p -S -s %p %s DEFAULT /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m wine-cvs(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -P winehq -L 200 -p -c -S -s %p %s

1 0

wine/dlls/msvcrt/tests headers.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21600 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:02:40 Modified files: dlls/msvcrt/tests: headers.c Log message: Improved the CHECK_DEF macro to avoid code duplication. Patch: http://cvs.winehq.org/patch.py?id=21600 Old revision New revision Changes Path 1.10 1.11 +163 -163 wine/dlls/msvcrt/tests/headers.c

1 0

wine/dlls/oleaut32 typelib.c typelib.h
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21599 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:02:36 Modified files: dlls/oleaut32 : typelib.c typelib.h Log message: Robert Shearman <rob(a)codeweavers.com> Make dump functions const. Patch: http://cvs.winehq.org/patch.py?id=21599 Old revision New revision Changes Path 1.183 1.184 +13 -13 wine/dlls/oleaut32/typelib.c 1.23 1.24 +1 -1 wine/dlls/oleaut32/typelib.h Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.183 wine/dlls/oleaut32/typelib.c:1.184 --- wine/dlls/oleaut32/typelib.c:1.183 1 Dec 2005 12: 2:36 -0000 +++ wine/dlls/oleaut32/typelib.c 1 Dec 2005 12: 2:36 -0000 @@ -1026,7 +1026,7 @@ static void MSFT_DoRefType(TLBContext *p /* debug */ -static void dump_TypeDesc(TYPEDESC *pTD,char *szVarType) { +static void dump_TypeDesc(const TYPEDESC *pTD,char *szVarType) { if (pTD->vt & VT_RESERVED) szVarType += strlen(strcpy(szVarType, "reserved | ")); if (pTD->vt & VT_BYREF) @@ -1073,7 +1073,7 @@ static void dump_TypeDesc(TYPEDESC *pTD, } } -static void dump_ELEMDESC(ELEMDESC *edesc) { +static void dump_ELEMDESC(const ELEMDESC *edesc) { char buf[200]; USHORT flags = edesc->u.paramdesc.wParamFlags; dump_TypeDesc(&edesc->tdesc,buf); @@ -1089,7 +1089,7 @@ static void dump_ELEMDESC(ELEMDESC *edes if (flags & PARAMFLAG_FHASCUSTDATA) MESSAGE(" PARAMFLAG_FHASCUSTDATA"); MESSAGE("\n\t\tu.paramdesc.lpex %p\n",edesc->u.paramdesc.pparamdescex); } -static void dump_FUNCDESC(FUNCDESC *funcdesc) { +static void dump_FUNCDESC(const FUNCDESC *funcdesc) { int i; MESSAGE("memid is %08lx\n",funcdesc->memid); for (i=0;i<funcdesc->cParams;i++) { @@ -1141,7 +1141,7 @@ static const char * typekind_desc[] = "TKIND_MAX" }; -static void dump_TLBFuncDescOne(TLBFuncDesc * pfd) +static void dump_TLBFuncDescOne(const TLBFuncDesc * pfd) { int i; if (!TRACE_ON(typelib)) @@ -1156,7 +1156,7 @@ static void dump_TLBFuncDescOne(TLBFuncD MESSAGE("\thelpstring: %s\n", debugstr_w(pfd->HelpString)); MESSAGE("\tentry: %s\n", debugstr_w(pfd->Entry)); } -static void dump_TLBFuncDesc(TLBFuncDesc * pfd) +static void dump_TLBFuncDesc(const TLBFuncDesc * pfd) { while (pfd) { @@ -1164,7 +1164,7 @@ static void dump_TLBFuncDesc(TLBFuncDesc pfd = pfd->next; }; } -static void dump_TLBVarDesc(TLBVarDesc * pvd) +static void dump_TLBVarDesc(const TLBVarDesc * pvd) { while (pvd) { @@ -1173,7 +1173,7 @@ static void dump_TLBVarDesc(TLBVarDesc * }; } -static void dump_TLBImpLib(TLBImpLib *import) +static void dump_TLBImpLib(const TLBImpLib *import) { TRACE_(typelib)("%s %s\n", debugstr_guid(&(import->guid)), debugstr_w(import->name)); @@ -1181,7 +1181,7 @@ static void dump_TLBImpLib(TLBImpLib *im import->wVersionMinor, import->lcid, import->offset); } -static void dump_TLBRefType(TLBRefType * prt) +static void dump_TLBRefType(const TLBRefType * prt) { while (prt) { @@ -1200,7 +1200,7 @@ static void dump_TLBRefType(TLBRefType * }; } -static void dump_TLBImplType(TLBImplType * impl) +static void dump_TLBImplType(const TLBImplType * impl) { while (impl) { TRACE_(typelib)( @@ -1210,7 +1210,7 @@ static void dump_TLBImplType(TLBImplType } } -void dump_Variant(VARIANT * pvar) +void dump_Variant(const VARIANT * pvar) { SYSTEMTIME st; @@ -1265,7 +1265,7 @@ void dump_Variant(VARIANT * pvar) TRACE("}\n"); } -static void dump_DispParms(DISPPARAMS * pdp) +static void dump_DispParms(const DISPPARAMS * pdp) { int index = 0; @@ -1278,7 +1278,7 @@ static void dump_DispParms(DISPPARAMS * } } -static void dump_TypeInfo(ITypeInfoImpl * pty) +static void dump_TypeInfo(const ITypeInfoImpl * pty) { TRACE("%p ref=%lu\n", pty, pty->ref); TRACE("attr:%s\n", debugstr_guid(&(pty->TypeAttr.guid))); @@ -1293,7 +1293,7 @@ static void dump_TypeInfo(ITypeInfoImpl dump_TLBImplType(pty->impltypelist); } -static void dump_VARDESC(VARDESC *v) +static void dump_VARDESC(const VARDESC *v) { MESSAGE("memid %ld\n",v->memid); MESSAGE("lpstrSchema %s\n",debugstr_w(v->lpstrSchema)); Index: wine/dlls/oleaut32/typelib.h diff -u -p wine/dlls/oleaut32/typelib.h:1.23 wine/dlls/oleaut32/typelib.h:1.24 --- wine/dlls/oleaut32/typelib.h:1.23 1 Dec 2005 12: 2:36 -0000 +++ wine/dlls/oleaut32/typelib.h 1 Dec 2005 12: 2:36 -0000 @@ -601,7 +601,7 @@ WORD typeofarray #include "poppack.h" extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args); -extern void dump_Variant(VARIANT * pvar); +extern void dump_Variant(const VARIANT * pvar); HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv);

1 0

wine/dlls/shdocvw oleobject.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21598 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:02:16 Modified files: dlls/shdocvw : oleobject.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added implementation of OLEIVERB_SHOW in DoVerb. Patch: http://cvs.winehq.org/patch.py?id=21598 Old revision New revision Changes Path 1.22 1.23 +19 -1 wine/dlls/shdocvw/oleobject.c Index: wine/dlls/shdocvw/oleobject.c diff -u -p wine/dlls/shdocvw/oleobject.c:1.22 wine/dlls/shdocvw/oleobject.c:1.23 --- wine/dlls/shdocvw/oleobject.c:1.22 1 Dec 2005 12: 2:16 -0000 +++ wine/dlls/shdocvw/oleobject.c 1 Dec 2005 12: 2:16 -0000 @@ -192,11 +192,14 @@ static HRESULT WINAPI OleObject_DoVerb(I WebBrowser *This = OLEOBJ_THIS(iface); HRESULT hres; + static const WCHAR wszitem[] = {'i','t','e','m',0}; + TRACE("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); switch (iVerb) { + case OLEIVERB_SHOW: case OLEIVERB_INPLACEACTIVATE: { IOleInPlaceSite *inplace; @@ -229,7 +232,8 @@ static HRESULT WINAPI OleObject_DoVerb(I &This->frameinfo); - IOleInPlaceSite_Release(inplace); + if(iVerb == OLEIVERB_INPLACEACTIVATE) + IOleInPlaceSite_Release(inplace); SetWindowPos(This->shell_embedding_hwnd, NULL, This->pos_rect.left, This->pos_rect.top, @@ -245,6 +249,20 @@ static HRESULT WINAPI OleObject_DoVerb(I if(This->frame) IOleInPlaceFrame_GetWindow(This->frame, &This->frame_hwnd); + if(iVerb == OLEIVERB_INPLACEACTIVATE) + return S_OK; + + TRACE("OLEIVERB_SHOW\n"); + + IOleInPlaceSite_OnUIActivate(inplace); + IOleInPlaceSite_Release(inplace); + + IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem); + + /* TODO: + * IOleInPlaceFrmae_SetMenu + */ + return S_OK; } default:

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21597 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:02:09 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> Remove broken return value handling code and that would reference memory beyond the end of the arguments array. Replace it with code that properly handles referencing the return type and setting the return type to VT_VOID when a dispinterface function doesn't have any return value. Patch: http://cvs.winehq.org/patch.py?id=21597 Old revision New revision Changes Path 1.182 1.183 +27 -32 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.182 wine/dlls/oleaut32/typelib.c:1.183 --- wine/dlls/oleaut32/typelib.c:1.182 1 Dec 2005 12: 2: 9 -0000 +++ wine/dlls/oleaut32/typelib.c 1 Dec 2005 12: 2: 9 -0000 @@ -1861,43 +1861,38 @@ MSFT_DoFuncs(TLBContext* pcx, recoffset + reclength - ((pFuncRec->nrargs - j - 1) * sizeof(MSFT_ParameterInfo))); } + } - /* parameter is the return value! */ - if ( paraminfo.Flags & PARAMFLAG_FRETVAL ) + /* special treatment for dispinterfaces: this makes functions appear + * to return their [retval] value when it is really returning an + * HRESULT */ + if ((pTI->TypeAttr.typekind == TKIND_DISPATCH) && + (*pptfd)->funcdesc.elemdescFunc.tdesc.vt == VT_HRESULT) + { + if (pFuncRec->nrargs && + ((*pptfd)->funcdesc.lprgelemdescParam[pFuncRec->nrargs - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) { - TYPEDESC* lpArgTypeDesc; - - (*pptfd)->funcdesc.elemdescFunc = - (*pptfd)->funcdesc.lprgelemdescParam[j]; - - lpArgTypeDesc = & ((*pptfd)->funcdesc.elemdescFunc.tdesc) ; - - while ( lpArgTypeDesc != NULL ) + ELEMDESC *elemdesc = &(*pptfd)->funcdesc.lprgelemdescParam[pFuncRec->nrargs - 1]; + if (elemdesc->tdesc.vt != VT_PTR) { - switch ( lpArgTypeDesc->vt ) - { - case VT_PTR: - lpArgTypeDesc = lpArgTypeDesc->u.lptdesc; - break; - case VT_CARRAY: - lpArgTypeDesc = - & (lpArgTypeDesc->u.lpadesc->tdescElem); - - break; - - case VT_USERDEFINED: - MSFT_DoRefType(pcx, - pTI, - lpArgTypeDesc->u.hreftype); - - lpArgTypeDesc = NULL; - break; - - default: - lpArgTypeDesc = NULL; - } + ERR_(typelib)("elemdesc should have started with VT_PTR instead of:\n"); + if (ERR_ON(typelib)) + dump_ELEMDESC(elemdesc); + /* FIXME: return error */ + break; } + + (*pptfd)->funcdesc.elemdescFunc = *elemdesc; + + /* dereference parameter */ + (*pptfd)->funcdesc.elemdescFunc.tdesc = *elemdesc->tdesc.u.lptdesc; + + pFuncRec->nrargs--; + (*pptfd)->funcdesc.cParams = pFuncRec->nrargs; } + else + (*pptfd)->funcdesc.elemdescFunc.tdesc.vt = VT_VOID; + } /* scode is not used: archaic win16 stuff FIXME: right? */

1 0

wine/dlls/msvcrt except.c msvcrt.h tests/headers.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21596 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:01:51 Modified files: dlls/msvcrt : except.c msvcrt.h dlls/msvcrt/tests: headers.c Log message: Prefix signal definitions with MSVCRT_ to avoid conflicts with system headers. Patch: http://cvs.winehq.org/patch.py?id=21596 Old revision New revision Changes Path 1.37 1.38 +24 -25 wine/dlls/msvcrt/except.c 1.39 1.40 +16 -0 wine/dlls/msvcrt/msvcrt.h 1.9 1.10 +10 -0 wine/dlls/msvcrt/tests/headers.c Index: wine/dlls/msvcrt/except.c diff -u -p wine/dlls/msvcrt/except.c:1.37 wine/dlls/msvcrt/except.c:1.38 --- wine/dlls/msvcrt/except.c:1.37 1 Dec 2005 12: 1:51 -0000 +++ wine/dlls/msvcrt/except.c 1 Dec 2005 12: 1:51 -0000 @@ -40,7 +40,6 @@ #include "excpt.h" #include "wincon.h" #include "msvcrt/float.h" -#include "msvcrt/signal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -380,7 +379,7 @@ void __stdcall _seh_longjmp_unwind(struc } #endif /* i386 */ -static __sighandler_t sighandlers[NSIG] = { SIG_DFL }; +static MSVCRT___sighandler_t sighandlers[MSVCRT_NSIG] = { MSVCRT_SIG_DFL }; static BOOL WINAPI msvcrt_console_handler(DWORD ctrlType) { @@ -389,10 +388,10 @@ static BOOL WINAPI msvcrt_console_handle switch (ctrlType) { case CTRL_C_EVENT: - if (sighandlers[SIGINT]) + if (sighandlers[MSVCRT_SIGINT]) { - if (sighandlers[SIGINT] != SIG_IGN) - sighandlers[SIGINT](SIGINT); + if (sighandlers[MSVCRT_SIGINT] != MSVCRT_SIG_IGN) + sighandlers[MSVCRT_SIGINT](MSVCRT_SIGINT); ret = TRUE; } break; @@ -427,10 +426,10 @@ static LONG WINAPI msvcrt_exception_filt switch (except->ExceptionRecord->ExceptionCode) { case EXCEPTION_ACCESS_VIOLATION: - if (sighandlers[SIGSEGV]) + if (sighandlers[MSVCRT_SIGSEGV]) { - if (sighandlers[SIGSEGV] != SIG_IGN) - sighandlers[SIGSEGV](SIGSEGV); + if (sighandlers[MSVCRT_SIGSEGV] != MSVCRT_SIG_IGN) + sighandlers[MSVCRT_SIGSEGV](MSVCRT_SIGSEGV); ret = EXCEPTION_CONTINUE_EXECUTION; } break; @@ -446,13 +445,13 @@ static LONG WINAPI msvcrt_exception_filt case EXCEPTION_FLT_OVERFLOW: case EXCEPTION_FLT_STACK_CHECK: case EXCEPTION_FLT_UNDERFLOW: - if (sighandlers[SIGFPE]) + if (sighandlers[MSVCRT_SIGFPE]) { - if (sighandlers[SIGFPE] != SIG_IGN) + if (sighandlers[MSVCRT_SIGFPE] != MSVCRT_SIG_IGN) { int i, float_signal = _FPE_INVALID; - float_handler handler = (float_handler)sighandlers[SIGFPE]; + float_handler handler = (float_handler)sighandlers[MSVCRT_SIGFPE]; for (i = 0; i < sizeof(float_exception_map) / sizeof(float_exception_map[0]); i++) if (float_exception_map[i].status == @@ -461,16 +460,16 @@ static LONG WINAPI msvcrt_exception_filt float_signal = float_exception_map[i].signal; break; } - handler(SIGFPE, float_signal); + handler(MSVCRT_SIGFPE, float_signal); } ret = EXCEPTION_CONTINUE_EXECUTION; } break; case EXCEPTION_ILLEGAL_INSTRUCTION: - if (sighandlers[SIGILL]) + if (sighandlers[MSVCRT_SIGILL]) { - if (sighandlers[SIGILL] != SIG_IGN) - sighandlers[SIGILL](SIGILL); + if (sighandlers[MSVCRT_SIGILL] != MSVCRT_SIG_IGN) + sighandlers[MSVCRT_SIGILL](MSVCRT_SIGILL); ret = EXCEPTION_CONTINUE_EXECUTION; } break; @@ -497,30 +496,30 @@ void msvcrt_free_signals(void) * Some signals may never be generated except through an explicit call to * raise. */ -__sighandler_t MSVCRT_signal(int sig, __sighandler_t func) +MSVCRT___sighandler_t MSVCRT_signal(int sig, MSVCRT___sighandler_t func) { - __sighandler_t ret = SIG_ERR; + MSVCRT___sighandler_t ret = MSVCRT_SIG_ERR; TRACE("(%d, %p)\n", sig, func); - if (func == SIG_ERR) return SIG_ERR; + if (func == MSVCRT_SIG_ERR) return MSVCRT_SIG_ERR; switch (sig) { /* Cases handled internally. Note SIGTERM is never generated by Windows, * so we effectively mask it. */ - case SIGABRT: - case SIGFPE: - case SIGILL: - case SIGSEGV: - case SIGINT: - case SIGTERM: + case MSVCRT_SIGABRT: + case MSVCRT_SIGFPE: + case MSVCRT_SIGILL: + case MSVCRT_SIGSEGV: + case MSVCRT_SIGINT: + case MSVCRT_SIGTERM: ret = sighandlers[sig]; sighandlers[sig] = func; break; default: - ret = SIG_ERR; + ret = MSVCRT_SIG_ERR; } return ret; } Index: wine/dlls/msvcrt/msvcrt.h diff -u -p wine/dlls/msvcrt/msvcrt.h:1.39 wine/dlls/msvcrt/msvcrt.h:1.40 --- wine/dlls/msvcrt/msvcrt.h:1.39 1 Dec 2005 12: 1:51 -0000 +++ wine/dlls/msvcrt/msvcrt.h 1 Dec 2005 12: 1:51 -0000 @@ -555,6 +555,22 @@ struct MSVCRT__stati64 { #define MSVCRT_CLOCKS_PER_SEC 1000 +/* signals */ +#define MSVCRT_SIGINT 2 +#define MSVCRT_SIGILL 4 +#define MSVCRT_SIGFPE 8 +#define MSVCRT_SIGSEGV 11 +#define MSVCRT_SIGTERM 15 +#define MSVCRT_SIGBREAK 21 +#define MSVCRT_SIGABRT 22 +#define MSVCRT_NSIG (MSVCRT_SIGABRT + 1) + +typedef void (*MSVCRT___sighandler_t)(int); + +#define MSVCRT_SIG_DFL ((MSVCRT___sighandler_t)0) +#define MSVCRT_SIG_IGN ((MSVCRT___sighandler_t)1) +#define MSVCRT_SIG_ERR ((MSVCRT___sighandler_t)-1) + void MSVCRT_free(void*); void* MSVCRT_malloc(MSVCRT_size_t); void* MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); Index: wine/dlls/msvcrt/tests/headers.c diff -u -p wine/dlls/msvcrt/tests/headers.c:1.9 wine/dlls/msvcrt/tests/headers.c:1.10 --- wine/dlls/msvcrt/tests/headers.c:1.9 1 Dec 2005 12: 1:51 -0000 +++ wine/dlls/msvcrt/tests/headers.c 1 Dec 2005 12: 1:51 -0000 @@ -48,6 +48,7 @@ #include "conio.h" #include "process.h" #include "string.h" +#include "signal.h" #include "time.h" #include "locale.h" #include "setjmp.h" @@ -96,6 +97,7 @@ static void test_types(void) CHECK_TYPE(_se_translator_function); CHECK_TYPE(_beginthread_start_routine_t); CHECK_TYPE(_onexit_t); + CHECK_TYPE(__sighandler_t); } /************* Checking structs ***************/ @@ -437,6 +439,14 @@ static void test_defines(void) CHECK_DEF("_FPCLASS_PD", _FPCLASS_PD, MSVCRT__FPCLASS_PD); CHECK_DEF("_FPCLASS_PN", _FPCLASS_PN, MSVCRT__FPCLASS_PN); CHECK_DEF("_FPCLASS_PINF", _FPCLASS_PINF, MSVCRT__FPCLASS_PINF); + CHECK_DEF("SIGINT", SIGINT, MSVCRT_SIGINT); + CHECK_DEF("SIGILL", SIGILL, MSVCRT_SIGILL); + CHECK_DEF("SIGFPE", SIGFPE, MSVCRT_SIGFPE); + CHECK_DEF("SIGSEGV", SIGSEGV, MSVCRT_SIGSEGV); + CHECK_DEF("SIGTERM", SIGTERM, MSVCRT_SIGTERM); + CHECK_DEF("SIGBREAK", SIGBREAK, MSVCRT_SIGBREAK); + CHECK_DEF("SIGABRT", SIGABRT, MSVCRT_SIGABRT); + CHECK_DEF("NSIG", NSIG, MSVCRT_NSIG); #ifdef __i386__ CHECK_DEF("_EM_INVALID", _EM_INVALID, MSVCRT__EM_INVALID); CHECK_DEF("_EM_DENORMAL", _EM_DENORMAL, MSVCRT__EM_DENORMAL);

1 0

wine/ dlls/ntdll/cdrom.c dlls/ntdll/file.c inc ...
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21595 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:01:43 Modified files: dlls/ntdll : cdrom.c file.c include : winsock2.h programs/regedit: treeview.c server : registry.c Log message: Fixed some compiler warnings on Darwin. Patch: http://cvs.winehq.org/patch.py?id=21595 Old revision New revision Changes Path 1.74 1.75 +26 -28 wine/dlls/ntdll/cdrom.c 1.106 1.107 +6 -6 wine/dlls/ntdll/file.c 1.28 1.29 +1 -0 wine/include/winsock2.h 1.17 1.18 +14 -18 wine/programs/regedit/treeview.c 1.84 1.85 +1 -1 wine/server/registry.c

1 0

wine/programs/notepad dialog.c main.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21594 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:01:18 Modified files: programs/notepad: dialog.c main.c Log message: Pavel Roskin <proski(a)gnu.org> Improve font support in Notepad. Patch: http://cvs.winehq.org/patch.py?id=21594 Old revision New revision Changes Path 1.31 1.32 +1 -1 wine/programs/notepad/dialog.c 1.36 1.37 +31 -0 wine/programs/notepad/main.c Index: wine/programs/notepad/dialog.c diff -u -p wine/programs/notepad/dialog.c:1.31 wine/programs/notepad/dialog.c:1.32 --- wine/programs/notepad/dialog.c:1.31 1 Dec 2005 12: 1:18 -0000 +++ wine/programs/notepad/dialog.c 1 Dec 2005 12: 1:18 -0000 @@ -620,7 +620,7 @@ VOID DIALOG_SelectFont(VOID) cf.lStructSize=sizeof(cf); cf.hwndOwner=Globals.hMainWnd; cf.lpLogFont=&lf; - cf.Flags=CF_SCREENFONTS; + cf.Flags=CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT; if( ChooseFont(&cf) ) { Index: wine/programs/notepad/main.c diff -u -p wine/programs/notepad/main.c:1.36 wine/programs/notepad/main.c:1.37 --- wine/programs/notepad/main.c:1.36 1 Dec 2005 12: 1:18 -0000 +++ wine/programs/notepad/main.c 1 Dec 2005 12: 1:18 -0000 @@ -49,6 +49,36 @@ VOID SetFileName(LPCWSTR szFileName) /*********************************************************************** * + * NOTEPAD_InitFont + * + * Initialize font for the edit window + */ +static VOID NOTEPAD_InitFont() +{ + LOGFONT *lf = &Globals.lfFont; + static const WCHAR systemW[] = { 'S','y','s','t','e','m',0 }; + + lf->lfHeight = -10; + lf->lfWidth = 0; + lf->lfEscapement = 0; + lf->lfOrientation = 0; + lf->lfWeight = FW_BOLD; + lf->lfItalic = FALSE; + lf->lfUnderline = FALSE; + lf->lfStrikeOut = FALSE; + lf->lfCharSet = DEFAULT_CHARSET; + lf->lfOutPrecision = OUT_DEFAULT_PRECIS; + lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf->lfQuality = DEFAULT_QUALITY; + lf->lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE; + lstrcpy(lf->lfFaceName, systemW); + + Globals.hFont = CreateFontIndirect(lf); + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE); +} + +/*********************************************************************** + * * NOTEPAD_MenuCommand * * All handling of main menu events @@ -153,6 +183,7 @@ static LRESULT WINAPI NOTEPAD_WndProc(HW ES_AUTOVSCROLL | ES_MULTILINE, 0, 0, rc.right, rc.bottom, hWnd, NULL, Globals.hInstance, NULL); + NOTEPAD_InitFont(); break; }

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21593 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:01:12 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> Introduce a variable "elemdesc" to eliminate some long common expressions. Move the contents of the second arguments loop inside the first. Move the MSFT_ReadLEDWords so that it is the last statement in the loop since it is one of the iterators. Patch: http://cvs.winehq.org/patch.py?id=21593 Old revision New revision Changes Path 1.181 1.182 +39 -43 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.181 wine/dlls/oleaut32/typelib.c:1.182 --- wine/dlls/oleaut32/typelib.c:1.181 1 Dec 2005 12: 1:12 -0000 +++ wine/dlls/oleaut32/typelib.c 1 Dec 2005 12: 1:12 -0000 @@ -1780,14 +1780,15 @@ MSFT_DoFuncs(TLBContext* pcx, for ( j = 0 ; j < pFuncRec->nrargs ; j++ ) { - TYPEDESC* lpArgTypeDesc = 0; + TYPEDESC *lpArgTypeDesc; + ELEMDESC *elemdesc = &(*pptfd)->funcdesc.lprgelemdescParam[j]; MSFT_GetTdesc(pcx, paraminfo.DataType, - &(*pptfd)->funcdesc.lprgelemdescParam[j].tdesc, + &elemdesc->tdesc, pTI); - (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc.wParamFlags = paraminfo.Flags; + elemdesc->u.paramdesc.wParamFlags = paraminfo.Flags; /* name */ if (paraminfo.oName == -1) @@ -1800,17 +1801,9 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadName( pcx, paraminfo.oName ); TRACE_(typelib)("param[%d] = %s\n", j, debugstr_w((*pptfd)->pParamDesc[j].Name)); - /* SEEK value = jump to offset, - * from there jump to the end of record, - * go back by (j-1) arguments - */ - MSFT_ReadLEDWords( &paraminfo , - sizeof(MSFT_ParameterInfo), pcx, - recoffset + reclength - ((pFuncRec->nrargs - j - 1) - * sizeof(MSFT_ParameterInfo))); - lpArgTypeDesc = - & ((*pptfd)->funcdesc.lprgelemdescParam[j].tdesc); + lpArgTypeDesc = &elemdesc->tdesc; + /* resolve referenced type if any */ while ( lpArgTypeDesc != NULL ) { switch ( lpArgTypeDesc->vt ) @@ -1834,8 +1827,40 @@ MSFT_DoFuncs(TLBContext* pcx, lpArgTypeDesc = NULL; } } - } + /* default value */ + if ( (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) && + (pFuncRec->FKCCIC & 0x1000) ) + { + INT* pInt = (INT *)((char *)pFuncRec + + reclength - + (pFuncRec->nrargs * 4 + 1) * sizeof(INT) ); + + PARAMDESC* pParamDesc = &elemdesc->u.paramdesc; + + pParamDesc->pparamdescex = TLB_Alloc(sizeof(PARAMDESCEX)); + pParamDesc->pparamdescex->cBytes = sizeof(PARAMDESCEX); + + MSFT_ReadValue(&(pParamDesc->pparamdescex->varDefaultValue), + pInt[j], pcx); + } + /* custom info */ + if ( nrattributes > 7 + j && pFuncRec->FKCCIC & 0x80 ) + { + MSFT_CustData(pcx, + pFuncRec->OptAttr[7+j], + &(*pptfd)->pParamDesc[j].pCustData); + } + + /* SEEK value = jump to offset, + * from there jump to the end of record, + * go back by (j-1) arguments + */ + MSFT_ReadLEDWords( &paraminfo , + sizeof(MSFT_ParameterInfo), pcx, + recoffset + reclength - ((pFuncRec->nrargs - j - 1) + * sizeof(MSFT_ParameterInfo))); + } /* parameter is the return value! */ if ( paraminfo.Flags & PARAMFLAG_FRETVAL ) @@ -1873,35 +1898,6 @@ MSFT_DoFuncs(TLBContext* pcx, } } } - - /* second time around */ - for(j=0;j<pFuncRec->nrargs;j++) - { - /* default value */ - if ( (PARAMFLAG_FHASDEFAULT & - (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc.wParamFlags) && - ((pFuncRec->FKCCIC) & 0x1000) ) - { - INT* pInt = (INT *)((char *)pFuncRec + - reclength - - (pFuncRec->nrargs * 4 + 1) * sizeof(INT) ); - - PARAMDESC* pParamDesc = & (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc; - - pParamDesc->pparamdescex = TLB_Alloc(sizeof(PARAMDESCEX)); - pParamDesc->pparamdescex->cBytes = sizeof(PARAMDESCEX); - - MSFT_ReadValue(&(pParamDesc->pparamdescex->varDefaultValue), - pInt[j], pcx); - } - /* custom info */ - if ( nrattributes > 7 + j && pFuncRec->FKCCIC & 0x80 ) - { - MSFT_CustData(pcx, - pFuncRec->OptAttr[7+j], - &(*pptfd)->pParamDesc[j].pCustData); - } - } } /* scode is not used: archaic win16 stuff FIXME: right? */

1 0