March 2006 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Add device caps to wined3d_types.h.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 2f0c7819885aaae1810a3202ac6c98f240c6d492 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f0c7819885aaae1810a320… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Mar 6 23:05:02 2006 +0100 wined3d: Add device caps to wined3d_types.h. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 14 +++++++------- dlls/wined3d/surface.c | 2 +- include/wine/wined3d_types.h | 25 +++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6b8a17f..7134891 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4661,7 +4661,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetTex if(pTexture != NULL) { /* SetTexture isn't allowed on textures in D3DPOOL_SCRATCH; The same is - * the case for D3DPOOL_SYSTEMMEM textures unless D3DDEVCAPS_TEXTURESYSTEMMORY is set. + * the case for D3DPOOL_SYSTEMMEM textures unless WINED3DDEVCAPS_TEXTURESYSTEMMORY is set. * We don't check the caps as GetDeviceCaps is inefficient and we don't set the cap anyway. */ if(((IWineD3DTextureImpl*)pTexture)->resource.pool == D3DPOOL_SCRATCH || ((IWineD3DTextureImpl*)pTexture)->resource.pool == D3DPOOL_SYSTEMMEM) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1749635..5a3739d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1462,18 +1462,18 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCap *pCaps->Caps = 0; *pCaps->Caps2 = D3DCAPS2_CANRENDERWINDOWED; - *pCaps->Caps3 = D3DDEVCAPS_HWTRANSFORMANDLIGHT; + *pCaps->Caps3 = WINED3DDEVCAPS_HWTRANSFORMANDLIGHT; *pCaps->PresentationIntervals = D3DPRESENT_INTERVAL_IMMEDIATE; *pCaps->CursorCaps = 0; - *pCaps->DevCaps = D3DDEVCAPS_DRAWPRIMTLVERTEX | - D3DDEVCAPS_HWTRANSFORMANDLIGHT | - D3DDEVCAPS_EXECUTEVIDEOMEMORY | - D3DDEVCAPS_PUREDEVICE | - D3DDEVCAPS_HWRASTERIZATION | - D3DDEVCAPS_TEXTUREVIDEOMEMORY; + *pCaps->DevCaps = WINED3DDEVCAPS_DRAWPRIMTLVERTEX | + WINED3DDEVCAPS_HWTRANSFORMANDLIGHT | + WINED3DDEVCAPS_EXECUTEVIDEOMEMORY | + WINED3DDEVCAPS_PUREDEVICE | + WINED3DDEVCAPS_HWRASTERIZATION | + WINED3DDEVCAPS_TEXTUREVIDEOMEMORY; *pCaps->PrimitiveMiscCaps = D3DPMISCCAPS_CULLCCW | diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c03587e..362f5b9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -949,7 +949,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadT * these resources cannot be accessed by the Direct3D device nor set as textures or render targets. * However, these resources can always be created, locked, and copied. * In general never store scratch or system mem textures in the video ram. However it is allowed - * for system memory textures when D3DDEVCAPS_TEXTURESYSTEMMEMORY is set but it isn't right now. + * for system memory textures when WINED3DDEVCAPS_TEXTURESYSTEMMEMORY is set but it isn't right now. */ if (This->resource.pool == D3DPOOL_SCRATCH || This->resource.pool == D3DPOOL_SYSTEMMEM) { diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 418a52e..ffc00f9 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -869,4 +869,29 @@ typedef enum _WINED3DDECLUSAGE { #define WINED3DVTXPCAPS_TEXGEN_SPHEREMAP 0x00000100L #define WINED3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER 0x00000200L +#define WINED3DDEVCAPS_FLOATTLVERTEX 0x000000001 +#define WINED3DDEVCAPS_SORTINCREASINGZ 0x000000002 +#define WINED3DDEVCAPS_SORTDECREASINGZ 0X000000004 +#define WINED3DDEVCAPS_SORTEXACT 0x000000008 +#define WINED3DDEVCAPS_EXECUTESYSTEMMEMORY 0x000000010 +#define WINED3DDEVCAPS_EXECUTEVIDEOMEMORY 0x000000020 +#define WINED3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x000000040 +#define WINED3DDEVCAPS_TLVERTEXVIDEOMEMORY 0x000000080 +#define WINED3DDEVCAPS_TEXTURESYSTEMMEMORY 0x000000100 +#define WINED3DDEVCAPS_TEXTUREVIDEOMEMORY 0x000000200 +#define WINED3DDEVCAPS_DRAWPRIMTLVERTEX 0x000000400 +#define WINED3DDEVCAPS_CANRENDERAFTERFLIP 0x000000800 +#define WINED3DDEVCAPS_TEXTURENONLOCALVIDMEM 0x000001000 +#define WINED3DDEVCAPS_DRAWPRIMITIVES2 0x000002000 +#define WINED3DDEVCAPS_SEPARATETEXTUREMEMORIES 0x000004000 +#define WINED3DDEVCAPS_DRAWPRIMITIVES2EX 0x000008000 +#define WINED3DDEVCAPS_HWTRANSFORMANDLIGHT 0x000010000 +#define WINED3DDEVCAPS_CANBLTSYSTONONLOCAL 0x000020000 +#define WINED3DDEVCAPS_HWRASTERIZATION 0x000080000 +#define WINED3DDEVCAPS_PUREDEVICE 0x000100000 +#define WINED3DDEVCAPS_QUINTICRTPATCHES 0x000200000 +#define WINED3DDEVCAPS_RTPATCHES 0x000400000 +#define WINED3DDEVCAPS_RTPATCHHANDLEZERO 0x000800000 +#define WINED3DDEVCAPS_NPATCHES 0x001000000 + #endif

1 0

Jacek Caban : mshtml: Added IHTMLInputElement implementation.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 8b3eab6e35cf038330880426d0dd2e324db6721f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b3eab6e35cf03833088042… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 6 22:35:56 2006 +0100 mshtml: Added IHTMLInputElement implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlelem.c | 19 + dlls/mshtml/htmlinput.c | 690 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/nsiface.idl | 48 +++ 5 files changed, 758 insertions(+), 1 deletions(-) create mode 100644 dlls/mshtml/htmlinput.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8b3eab6e35cf0383308…

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement implementation.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 54cce2e7ceccbea268718ea51aea98bac7997627 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54cce2e7ceccbea268718ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 6 22:37:10 2006 +0100 mshtml: Added IHTMLSelectElement implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlelem.c | 3 dlls/mshtml/htmlselect.c | 363 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/nsiface.idl | 32 ++++ 5 files changed, 400 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/htmlselect.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=54cce2e7ceccbea2687…

1 0

Jacek Caban : mshtml: Added IHTMLTextAreaElement implementation.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 8f897239c46dabeeeb06827f53463e651ee70648 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f897239c46dabeeeb06827… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 6 22:38:02 2006 +0100 mshtml: Added IHTMLTextAreaElement implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlelem.c | 3 dlls/mshtml/htmltextarea.c | 379 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/nsiface.idl | 31 +++ 5 files changed, 415 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/htmltextarea.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8f897239c46dabeeeb0…

1 0

Juan Lang : crypt32: Simplify stores.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 78872852fd988fc56474dc95870160905895fc85 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78872852fd988fc56474dc9… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Mar 6 12:46:38 2006 -0800 crypt32: Simplify stores. Ref count cert context references, and eliminate the DupCert function from stores. --- dlls/crypt32/store.c | 115 ++++++++++---------------------------------------- 1 files changed, 22 insertions(+), 93 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 2ac2e10..fe37a56 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -144,8 +144,6 @@ typedef BOOL (*AddCertFunc)(struct WINE_ */ typedef void (*FreeCertFunc)(struct _WINE_CERT_CONTEXT_REF *ref); -typedef PCCERT_CONTEXT (*DupCertFunc)(PCCERT_CONTEXT context); - typedef enum _CertStoreType { StoreTypeMem, StoreTypeCollection, @@ -170,7 +168,6 @@ typedef struct WINE_CRYPTCERTSTORE AddCertFunc addCert; EnumCertFunc enumCert; PFN_CERT_STORE_PROV_DELETE_CERT deleteCert; - DupCertFunc dupCert; FreeCertFunc freeCert; /* optional */ PFN_CERT_STORE_PROV_CONTROL control; /* optional */ } WINECRYPT_CERTSTORE, *PWINECRYPT_CERTSTORE; @@ -193,7 +190,8 @@ typedef struct _WINE_CERT_CONTEXT typedef struct _WINE_CERT_CONTEXT_REF { - CERT_CONTEXT cert; + CERT_CONTEXT cert; + LONG ref; WINE_CERT_CONTEXT *context; } WINE_CERT_CONTEXT_REF, *PWINE_CERT_CONTEXT_REF; @@ -326,6 +324,7 @@ static void CRYPT_InitCertRef(PWINE_CERT { TRACE("(%p, %p)\n", ref, context); memcpy(&ref->cert, context, sizeof(ref->cert)); + ref->ref = 1; ref->context = context; InterlockedIncrement(&context->ref); TRACE("%p's ref count is %ld\n", context, context->ref); @@ -532,21 +531,6 @@ static void WINAPI CRYPT_MemCloseStore(H CryptMemFree(store); } -static PCCERT_CONTEXT CRYPT_MemDupCert(PCCERT_CONTEXT pCertContext) -{ - const WINE_CERT_LIST_ENTRY *context = - (const WINE_CERT_LIST_ENTRY *)pCertContext; - PWINE_CERT_LIST_ENTRY ret; - - ret = CryptMemAlloc(sizeof(WINE_CERT_LIST_ENTRY)); - if (ret) - { - memcpy(ret, context, sizeof(WINE_CERT_LIST_ENTRY)); - InterlockedIncrement(&ret->cert.context->ref); - } - return (PCCERT_CONTEXT)ret; -} - static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { @@ -571,7 +555,6 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpe store->hdr.enumCert = CRYPT_MemEnumCert; store->hdr.deleteCert = CRYPT_MemDeleteCert; store->hdr.freeCert = NULL; - store->hdr.dupCert = CRYPT_MemDupCert; store->hdr.control = NULL; InitializeCriticalSection(&store->cs); list_init(&store->certs); @@ -749,21 +732,6 @@ static BOOL WINAPI CRYPT_CollectionDelet return ret; } -static PCCERT_CONTEXT CRYPT_CollectionDupCert(PCCERT_CONTEXT pCertContext) -{ - const WINE_COLLECTION_CERT_CONTEXT *context = - (const WINE_COLLECTION_CERT_CONTEXT *)pCertContext; - PWINE_COLLECTION_CERT_CONTEXT ret; - - ret = CryptMemAlloc(sizeof(WINE_COLLECTION_CERT_CONTEXT)); - if (ret) - { - memcpy(ret, context, sizeof(WINE_COLLECTION_CERT_CONTEXT)); - InterlockedIncrement(&ret->cert.context->ref); - } - return (PCCERT_CONTEXT)ret; -} - static void CRYPT_CollectionFreeCert(PWINE_CERT_CONTEXT_REF ref) { PWINE_COLLECTION_CERT_CONTEXT context = (PWINE_COLLECTION_CERT_CONTEXT)ref; @@ -796,7 +764,6 @@ static WINECRYPT_CERTSTORE *CRYPT_Collec store->hdr.addCert = CRYPT_CollectionAddCert; store->hdr.enumCert = CRYPT_CollectionEnumCert; store->hdr.deleteCert = CRYPT_CollectionDeleteCert; - store->hdr.dupCert = CRYPT_CollectionDupCert; store->hdr.freeCert = CRYPT_CollectionFreeCert; InitializeCriticalSection(&store->cs); list_init(&store->stores); @@ -887,21 +854,6 @@ static PWINE_CERT_CONTEXT_REF CRYPT_Prov return (PWINE_CERT_CONTEXT_REF)ret; } -static PCCERT_CONTEXT CRYPT_ProvDupCert(PCCERT_CONTEXT pCertContext) -{ - const WINE_PROV_CERT_CONTEXT *context = - (const WINE_PROV_CERT_CONTEXT *)pCertContext; - PWINE_PROV_CERT_CONTEXT ret; - - ret = CryptMemAlloc(sizeof(WINE_PROV_CERT_CONTEXT)); - if (ret) - { - memcpy(ret, context, sizeof(WINE_PROV_CERT_CONTEXT)); - InterlockedIncrement(&ret->cert.context->ref); - } - return (PCCERT_CONTEXT)ret; -} - static BOOL WINAPI CRYPT_ProvDeleteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT cert, DWORD dwFlags) { @@ -965,7 +917,6 @@ static PWINECRYPT_CERTSTORE CRYPT_ProvCr ret->hdr.addCert = CRYPT_ProvAddCert; ret->hdr.enumCert = CRYPT_ProvEnumCert; ret->hdr.deleteCert = CRYPT_ProvDeleteCert; - ret->hdr.dupCert = CRYPT_ProvDupCert; ret->hdr.freeCert = CRYPT_ProvFreeCert; ret->hdr.control = CRYPT_ProvControl; if (pProvInfo->cStoreProvFunc > CERT_STORE_PROV_CLOSE_FUNC) @@ -2337,33 +2288,11 @@ BOOL WINAPI CertSetCertificateContextPro PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext( PCCERT_CONTEXT pCertContext) { - PCCERT_CONTEXT ret; + PWINE_CERT_CONTEXT_REF context = (PWINE_CERT_CONTEXT_REF)pCertContext; TRACE("(%p)\n", pCertContext); - if (pCertContext->hCertStore) - { - PWINECRYPT_CERTSTORE store = - (PWINECRYPT_CERTSTORE)pCertContext->hCertStore; - - ret = store->dupCert(pCertContext); - } - else - { - PWINE_CERT_CONTEXT_REF context = (PWINE_CERT_CONTEXT_REF)pCertContext, - ref; - - ref = CryptMemAlloc(sizeof(WINE_CERT_CONTEXT_REF)); - if (ref) - { - memcpy(ref, context, sizeof(*ret)); - ref->cert.hCertStore = 0; - InterlockedIncrement(&ref->context->ref); - ret = (PCCERT_CONTEXT)ref; - } - else - ret = NULL; - } - return (PCCERT_CONTEXT)ret; + InterlockedIncrement(&context->ref); + return pCertContext; } BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, @@ -2694,31 +2623,31 @@ BOOL WINAPI CertSetCTLContextProperty(PC static void CRYPT_UnrefCertificateContext(PWINE_CERT_CONTEXT_REF ref) { - if (InterlockedDecrement(&ref->context->ref) == 0) - { - TRACE("%p's ref count is 0, freeing\n", ref->context); - CRYPT_FreeCert(ref->context); - } - else - TRACE("%p's ref count is %ld\n", ref->context, ref->context->ref); -} - -BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext) -{ - TRACE("(%p)\n", pCertContext); - - if (pCertContext) + if (InterlockedDecrement(&ref->ref) == 0) { - PWINE_CERT_CONTEXT_REF ref = (PWINE_CERT_CONTEXT_REF)pCertContext; PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)ref->cert.hCertStore; - CRYPT_UnrefCertificateContext(ref); + if (InterlockedDecrement(&ref->context->ref) == 0) + { + TRACE("%p's ref count is 0, freeing\n", ref->context); + CRYPT_FreeCert(ref->context); + } + else + TRACE("%p's ref count is %ld\n", ref->context, ref->context->ref); if (store && store->dwMagic == WINE_CRYPTCERTSTORE_MAGIC && store->freeCert) store->freeCert(ref); TRACE("freeing %p\n", ref); CryptMemFree(ref); } +} + +BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext) +{ + TRACE("(%p)\n", pCertContext); + + if (pCertContext) + CRYPT_UnrefCertificateContext((PWINE_CERT_CONTEXT_REF)pCertContext); return TRUE; }

1 0

Jacek Caban : mshtml: Added IHTMLElementCollection::tags implementation.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 3d6859935599321270d6c18a12e3767044963e54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d6859935599321270d6c18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 6 22:34:49 2006 +0100 mshtml: Added IHTMLElementCollection::tags implementation. --- dlls/mshtml/htmlelem.c | 48 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/nsembed.c | 26 +++++++++++++++++------ dlls/mshtml/nsiface.idl | 8 ++++++- 4 files changed, 76 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 818a3a3..12765af 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1096,8 +1096,52 @@ static HRESULT WINAPI HTMLElementCollect VARIANT tagName, IDispatch **pdisp) { HTMLElementCollection *This = ELEMCOL_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(V_BSTR(&tagName)), pdisp); - return E_NOTIMPL; + DWORD size = 8, len = 0, i; + HTMLElement **elem_list; + nsAString tag_str; + const PRUnichar *tag; + + if(V_VT(&tagName) != VT_BSTR) { + WARN("Invalid arg\n"); + return E_INVALIDARG; + } + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(V_BSTR(&tagName)), pdisp); + + elem_list = HeapAlloc(GetProcessHeap(), 0, size*sizeof(HTMLElement*)); + + nsAString_Init(&tag_str, NULL); + + for(i=0; i<This->len; i++) { + if(!This->elems[i]->nselem) + continue; + + nsIDOMElement_GetTagName(This->elems[i]->nselem, &tag_str); + nsAString_GetData(&tag_str, &tag, NULL); + + if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, tag, -1, + V_BSTR(&tagName), -1) == CSTR_EQUAL) { + if(len == size) { + size <<= 2; + elem_list = HeapReAlloc(GetProcessHeap(), 0, elem_list, size); + } + + elem_list[len++] = This->elems[i]; + } + } + + nsAString_Finish(&tag_str); + + TRACE("fount %ld tags\n", len); + + if(!len) { + HeapFree(GetProcessHeap(), 0, elem_list); + elem_list = NULL; + }else if(size > len) { + HeapReAlloc(GetProcessHeap(), 0, elem_list, len); + } + + return HTMLElementCollection_Create(This->ref_unk, elem_list, len, pdisp); } #undef ELEMCOL_THIS diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 246205d..57aece0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -203,6 +203,10 @@ PRUint32 nsACString_GetData(const nsACSt void nsACString_SetData(nsACString*,const char*); void nsACString_Destroy(nsACString*); +void nsAString_Init(nsAString*,const PRUnichar*); +PRUint32 nsAString_GetData(const nsAString*,const PRUnichar**,PRBool*); +void nsAString_Finish(nsAString*); + nsIInputStream *create_nsstream(const char*,PRInt32); IHlink *Hlink_Create(void); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 029fa1c..03c1fed 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -44,13 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define PR_UINT32_MAX 0xffffffff -struct nsStringContainer { - void *v; - void *d1; - PRUint32 d2; - void *d3; -}; - struct nsCStringContainer { void *v; void *d1; @@ -68,6 +61,7 @@ static nsresult (*NS_CStringContainerFin static nsresult (*NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32); static nsresult (*NS_CStringSetData)(nsACString*,const char*,PRUint32); static nsresult (*NS_NewLocalFile)(const nsAString*,PRBool,nsIFile**); +static PRUint32 (*NS_StringGetData)(const nsAString*,const PRUnichar **,PRBool*); static PRUint32 (*NS_CStringGetData)(const nsACString*,const char**,PRBool*); static HINSTANCE hXPCOM = NULL; @@ -304,6 +298,7 @@ static BOOL load_gecko(void) NS_DLSYM(NS_StringSetData); NS_DLSYM(NS_CStringSetData); NS_DLSYM(NS_NewLocalFile); + NS_DLSYM(NS_StringGetData); NS_DLSYM(NS_CStringGetData); #undef NS_DLSYM @@ -390,6 +385,23 @@ void nsACString_Destroy(nsACString *str) HeapFree(GetProcessHeap(), 0, str); } +void nsAString_Init(nsAString *str, const PRUnichar *data) +{ + NS_StringContainerInit(str); + if(data) + NS_StringSetData(str, data, PR_UINT32_MAX); +} + +PRUint32 nsAString_GetData(const nsAString *str, const PRUnichar **data, PRBool *termited) +{ + return NS_StringGetData(str, data, termited); +} + +void nsAString_Finish(nsAString *str) +{ + NS_StringContainerFinish(str); +} + nsIInputStream *create_nsstream(const char *data, PRInt32 data_len) { nsIStringInputStream *ret; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 7aa4acd..bc7cca0 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -47,8 +47,14 @@ typedef ULARGE_INTEGER PRUint64; typedef PRUint64 DOMTimeStamp; typedef PRUint32 nsLoadFlags; +typedef struct { + void *v; + void *d1; + PRUint32 d2; + void *d3; +} nsStringContainer; + typedef struct nsCStringContainer nsCStringContainer; -typedef struct nsStringContainer nsStringContainer; typedef nsCStringContainer nsACString; typedef nsStringContainer nsAString;

1 0

Alexandre Julliard : kernel: Better support for detached processes.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: a401f3c4bb5819e6fcfefa9587eca60796531c4a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a401f3c4bb5819e6fcfefa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 22:22:30 2006 +0100 kernel: Better support for detached processes. Call setsid() in the new process to create a new Unix process group when CREATE_NEW_PROCESS_GROUP, CREATE_NEW_CONSOLE, or DETACHED_PROCESS are specified. --- dlls/kernel/process.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 62b6669..d1ff341 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -1116,7 +1116,7 @@ static char **build_envp( const WCHAR *e * Fork and exec a new Unix binary, checking for errors. */ static int fork_and_exec( const char *filename, const WCHAR *cmdline, - const WCHAR *env, const char *newdir ) + const WCHAR *env, const char *newdir, DWORD flags ) { int fd[2]; int pid, err; @@ -1135,6 +1135,8 @@ static int fork_and_exec( const char *fi char **envp = build_envp( env ); close( fd[0] ); + if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) setsid(); + /* Reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL ); signal( SIGCHLD, SIG_DFL ); @@ -1302,6 +1304,8 @@ static BOOL create_process( HANDLE hFile if (read( startfd[0], &dummy, 1 ) != 1) _exit(1); close( startfd[0] ); + if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) setsid(); + /* Reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL ); signal( SIGCHLD, SIG_DFL ); @@ -1743,7 +1747,7 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_ if ((unix_name = wine_get_unix_file_name( name ))) { - retv = (fork_and_exec( unix_name, tidy_cmdline, envW, unixdir ) != -1); + retv = (fork_and_exec( unix_name, tidy_cmdline, envW, unixdir, flags ) != -1); HeapFree( GetProcessHeap(), 0, unix_name ); } }

1 0

Alexandre Julliard : x11drv: Make sure to never manipulate the root window, even if we own
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 6d5f5447eaae4837d8da9210d21fd3265a0073d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d5f5447eaae4837d8da921… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 21:02:59 2006 +0100 x11drv: Make sure to never manipulate the root window, even if we own the desktop window. --- dlls/x11drv/window.c | 6 ++++-- dlls/x11drv/winpos.c | 9 ++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index 8eca46e..5cac2ed 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -145,7 +145,8 @@ void X11DRV_sync_window_style( Display * int mask = get_window_attributes( data, &attr ); wine_tsx11_lock(); - XChangeWindowAttributes( display, data->whole_window, mask, &attr ); + if (data->whole_window != DefaultRootWindow(display)) + XChangeWindowAttributes( display, data->whole_window, mask, &attr ); wine_tsx11_unlock(); } @@ -715,7 +716,8 @@ static void destroy_whole_window( Displa wine_tsx11_lock(); XSync( gdi_display, False ); /* flush any reference to this drawable in GDI queue */ XDeleteContext( display, data->whole_window, winContext ); - XDestroyWindow( display, data->whole_window ); /* this destroys client too */ + if (data->whole_window != DefaultRootWindow(display)) + XDestroyWindow( display, data->whole_window ); data->whole_window = 0; if (data->xic) { diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c index c49b8c9..e912531 100644 --- a/dlls/x11drv/winpos.c +++ b/dlls/x11drv/winpos.c @@ -586,9 +586,16 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H } SERVER_END_REQ; - if (win == WND_DESKTOP) + if (win == WND_DESKTOP || data->whole_window == DefaultRootWindow(gdi_display)) { data->whole_rect = data->client_rect = data->window_rect = *rectWindow; + if (win != WND_DESKTOP) + { + win->rectWindow = *rectWindow; + win->rectClient = *rectClient; + win->dwStyle = new_style; + WIN_ReleasePtr( win ); + } return ret; }

1 0

Alexandre Julliard : server: Support for closing the desktop window.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: f978f615d8d89f5e3dc7056cfff7b34e1f174295 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f978f615d8d89f5e3dc7056… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 21:02:24 2006 +0100 server: Support for closing the desktop window. If a thread is owning the desktop window, when all other users of the desktop have exited, signal the owner to close the desktop (with a 1 second delay). --- server/process.c | 1 + server/user.h | 17 +++++++++++------ server/window.c | 15 +++++++++++++++ server/winstation.c | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 6 deletions(-) diff --git a/server/process.c b/server/process.c index cc88c5f..824f9b3 100644 --- a/server/process.c +++ b/server/process.c @@ -570,6 +570,7 @@ static void process_killed( struct proce assert( list_empty( &process->thread_list )); gettimeofday( &process->end_time, NULL ); + close_process_desktop( process ); handles = process->handles; process->handles = NULL; if (handles) release_object( handles ); diff --git a/server/user.h b/server/user.h index 7a64a4d..a70c6fc 100644 --- a/server/user.h +++ b/server/user.h @@ -52,12 +52,14 @@ struct winstation struct desktop { - struct object obj; /* object header */ - unsigned int flags; /* desktop flags */ - struct winstation *winstation; /* winstation this desktop belongs to */ - struct list entry; /* entry in winstation list of desktops */ - struct window *top_window; /* desktop window for this desktop */ - struct hook_table *global_hooks; /* table of global hooks on this desktop */ + struct object obj; /* object header */ + unsigned int flags; /* desktop flags */ + struct winstation *winstation; /* winstation this desktop belongs to */ + struct list entry; /* entry in winstation list of desktops */ + struct window *top_window; /* desktop window for this desktop */ + struct hook_table *global_hooks; /* table of global hooks on this desktop */ + struct timeout_user *close_timeout; /* timeout before closing the desktop */ + unsigned int users; /* processes and threads using this desktop */ }; /* user handles functions */ @@ -123,6 +125,8 @@ extern int rect_in_region( struct region /* window functions */ +extern struct process *get_top_window_owner( struct desktop *desktop ); +extern void close_desktop_window( struct desktop *desktop ); extern void destroy_window( struct window *win ); extern void destroy_thread_windows( struct thread *thread ); extern int is_child_window( user_handle_t parent, user_handle_t child ); @@ -150,6 +154,7 @@ extern struct winstation *get_process_wi extern struct desktop *get_thread_desktop( struct thread *thread, unsigned int access ); extern void connect_process_winstation( struct process *process, const struct unicode_str *name ); extern void connect_process_desktop( struct process *process, const struct unicode_str *name ); +extern void close_process_desktop( struct process *process ); extern void close_thread_desktop( struct thread *thread ); #endif /* __WINE_SERVER_USER_H */ diff --git a/server/window.c b/server/window.c index 812ecee..8b7af20 100644 --- a/server/window.c +++ b/server/window.c @@ -351,6 +351,21 @@ void destroy_window( struct window *win free( win ); } +/* get the process owning the top window of a given desktop */ +struct process *get_top_window_owner( struct desktop *desktop ) +{ + struct window *win = desktop->top_window; + if (!win || !win->thread) return NULL; + return win->thread->process; +} + +/* attempt to close the desktop window when the last process using it is gone */ +void close_desktop_window( struct desktop *desktop ) +{ + struct window *win = desktop->top_window; + if (win && win->thread) post_message( win->handle, WM_SYSCOMMAND, SC_CLOSE, 0 ); +} + /* create a new window structure (note: the window is not linked in the window tree) */ static struct window *create_window( struct window *parent, struct window *owner, atom_t atom, void *instance ) diff --git a/server/winstation.c b/server/winstation.c index da24be4..1239298 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -36,6 +36,7 @@ #include "request.h" #include "process.h" #include "user.h" +#include "file.h" #include "wine/unicode.h" @@ -199,6 +200,8 @@ static struct desktop *create_desktop( c desktop->winstation = (struct winstation *)grab_object( winstation ); desktop->top_window = NULL; desktop->global_hooks = NULL; + desktop->close_timeout = NULL; + desktop->users = 0; list_add_tail( &winstation->desktops, &desktop->entry ); } } @@ -233,6 +236,7 @@ static void desktop_destroy( struct obje if (desktop->top_window) destroy_window( desktop->top_window ); if (desktop->global_hooks) release_object( desktop->global_hooks ); + if (desktop->close_timeout) remove_timeout_user( desktop->close_timeout ); list_remove( &desktop->entry ); release_object( desktop->winstation ); } @@ -293,6 +297,12 @@ void connect_process_desktop( struct pro if ((desktop = create_desktop( name, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, 0, winstation ))) { process->desktop = alloc_handle( process, desktop, DESKTOP_ALL_ACCESS, 0 ); + desktop->users++; + if (desktop->close_timeout) + { + remove_timeout_user( desktop->close_timeout ); + desktop->close_timeout = NULL; + } release_object( desktop ); } release_object( winstation ); @@ -300,6 +310,37 @@ void connect_process_desktop( struct pro clear_error(); /* ignore errors */ } +static void close_desktop_timeout( void *private ) +{ + struct desktop *desktop = private; + + desktop->close_timeout = NULL; + unlink_named_object( &desktop->obj ); /* make sure no other process can open it */ + close_desktop_window( desktop ); /* and signal the owner to quit */ +} + +/* close the desktop of a given process */ +void close_process_desktop( struct process *process ) +{ + struct desktop *desktop; + + if (process->desktop && (desktop = get_desktop_obj( process, process->desktop, 0 ))) + { + assert( desktop->users > 0 ); + desktop->users--; + /* if we have one remaining user, it has to be the manager of the desktop window */ + if (desktop->users == 1 && get_top_window_owner( desktop )) + { + struct timeval when; + gettimeofday( &when, NULL ); + add_timeout( &when, 1000 ); + desktop->close_timeout = add_timeout_user( &when, close_desktop_timeout, desktop ); + } + release_object( desktop ); + } + clear_error(); /* ignore errors */ +} + /* close the desktop of a given thread */ void close_thread_desktop( struct thread *thread ) {

1 0

Alexandre Julliard : server: Added unlink_named_object function.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 8cea993033944e927e6bcbceda647322d00916e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cea993033944e927e6bcbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 21:00:09 2006 +0100 server: Added unlink_named_object function. Allows to remove the name of an object while keeping around the object itself. --- server/object.c | 7 +++++++ server/object.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/server/object.c b/server/object.c index e881a69..fbef1a1 100644 --- a/server/object.c +++ b/server/object.c @@ -217,6 +217,13 @@ void dump_object_name( struct object *ob } } +/* unlink a named object from its namespace, without freeing the object itself */ +void unlink_named_object( struct object *obj ) +{ + if (obj->name) free_name( obj ); + obj->name = NULL; +} + /* grab an object (i.e. increment its refcount) and return the object */ struct object *grab_object( void *ptr ) { diff --git a/server/object.h b/server/object.h index 4a137fd..319bbba 100644 --- a/server/object.h +++ b/server/object.h @@ -109,6 +109,7 @@ extern void *create_object( struct names const struct unicode_str *name, struct object *parent ); extern void *create_named_object( struct namespace *namespace, const struct object_ops *ops, const struct unicode_str *name, unsigned int attributes ); +extern void unlink_named_object( struct object *obj ); extern struct namespace *create_namespace( unsigned int hash_size ); /* grab/release_object can take any pointer, but you better make sure */ /* that the thing pointed to starts with a struct object... */

1 0