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

Juan Lang : crypt32: Implement CertGetValidUsages.
by Alexandre Julliard March 8, 2006

March 8, 2006

Module: wine Branch: refs/heads/master Commit: 89b3191c7c5173f09898ba80ba760507a1eda03e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89b3191c7c5173f09898ba8… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Mar 7 18:29:18 2006 -0800 crypt32: Implement CertGetValidUsages. --- dlls/crypt32/cert.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 1 2 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 1b38c40..52b8ce1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -572,3 +572,144 @@ BOOL WINAPI CertRemoveEnhancedKeyUsageId } return ret; } + +BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, + int *cNumOIDSs, LPSTR *rghOIDs, DWORD *pcbOIDs) +{ + BOOL ret = TRUE; + DWORD i, cbOIDs = 0; + BOOL allUsagesValid = TRUE; + CERT_ENHKEY_USAGE validUsages = { 0, NULL }; + + TRACE("(%ld, %p, %p, %p, %ld)\n", cCerts, *rghCerts, cNumOIDSs, + rghOIDs, *pcbOIDs); + + for (i = 0; ret && i < cCerts; i++) + { + CERT_ENHKEY_USAGE usage; + DWORD size = sizeof(usage); + + ret = CertGetEnhancedKeyUsage(rghCerts[i], 0, &usage, &size); + /* Success is deliberately ignored: it implies all usages are valid */ + if (!ret && GetLastError() == ERROR_MORE_DATA) + { + PCERT_ENHKEY_USAGE pUsage = CryptMemAlloc(size); + + allUsagesValid = FALSE; + if (pUsage) + { + ret = CertGetEnhancedKeyUsage(rghCerts[i], 0, pUsage, &size); + if (ret) + { + if (!validUsages.cUsageIdentifier) + { + DWORD j; + + cbOIDs = pUsage->cUsageIdentifier * sizeof(LPSTR); + validUsages.cUsageIdentifier = pUsage->cUsageIdentifier; + for (j = 0; j < validUsages.cUsageIdentifier; j++) + cbOIDs += lstrlenA(pUsage->rgpszUsageIdentifier[j]) + + 1; + validUsages.rgpszUsageIdentifier = + CryptMemAlloc(cbOIDs); + if (validUsages.rgpszUsageIdentifier) + { + LPSTR nextOID = (LPSTR) + ((LPBYTE)validUsages.rgpszUsageIdentifier + + validUsages.cUsageIdentifier * sizeof(LPSTR)); + + for (j = 0; j < validUsages.cUsageIdentifier; j++) + { + validUsages.rgpszUsageIdentifier[j] = nextOID; + lstrcpyA(validUsages.rgpszUsageIdentifier[j], + pUsage->rgpszUsageIdentifier[j]); + nextOID += lstrlenA(nextOID) + 1; + } + } + else + ret = FALSE; + } + else + { + DWORD j, k, validIndexes = 0, numRemoved = 0; + + /* Merge: build a bitmap of all the indexes of + * validUsages.rgpszUsageIdentifier that are in pUsage. + */ + for (j = 0; j < pUsage->cUsageIdentifier; j++) + { + for (k = 0; k < validUsages.cUsageIdentifier; k++) + { + if (!strcmp(pUsage->rgpszUsageIdentifier[j], + validUsages.rgpszUsageIdentifier[k])) + { + validIndexes |= (1 << k); + break; + } + } + } + /* Merge by removing from validUsages those that are + * not in the bitmap. + */ + for (j = 0; j < validUsages.cUsageIdentifier; j++) + { + if (!(validIndexes & (1 << j))) + { + if (j < validUsages.cUsageIdentifier - 1) + { + memcpy(&validUsages.rgpszUsageIdentifier[j], + &validUsages.rgpszUsageIdentifier[j + + numRemoved + 1], + (validUsages.cUsageIdentifier - numRemoved + - j - 1) * sizeof(LPSTR)); + cbOIDs -= lstrlenA( + validUsages.rgpszUsageIdentifier[j]) + 1 + + sizeof(LPSTR); + numRemoved++; + } + else + validUsages.cUsageIdentifier--; + } + } + } + } + CryptMemFree(pUsage); + } + else + ret = FALSE; + } + } + if (ret) + { + if (allUsagesValid) + { + *cNumOIDSs = -1; + *pcbOIDs = 0; + } + else + { + if (!rghOIDs || *pcbOIDs < cbOIDs) + { + *pcbOIDs = cbOIDs; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPSTR nextOID = (LPSTR)((LPBYTE)rghOIDs + + validUsages.cUsageIdentifier * sizeof(LPSTR)); + + *pcbOIDs = cbOIDs; + *cNumOIDSs = validUsages.cUsageIdentifier; + for (i = 0; i < validUsages.cUsageIdentifier; i++) + { + rghOIDs[i] = nextOID; + lstrcpyA(nextOID, validUsages.rgpszUsageIdentifier[i]); + nextOID += lstrlenA(nextOID) + 1; + } + } + } + } + CryptMemFree(validUsages.rgpszUsageIdentifier); + return ret; +} diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 7d40394..4fc11b3 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -56,6 +56,7 @@ @ stdcall CertGetNameStringW(ptr long long ptr ptr long) @ stub CertGetPublicKeyLength @ stub CertGetSubjectCertificateFromStore +@ stdcall CertGetValidUsages(long ptr ptr ptr ptr) @ stub CertIsRDNAttrsInCertificateName @ stdcall CertNameToStrA(long ptr long ptr long) @ stdcall CertNameToStrW(long ptr long ptr long)

1 0

Stefan Dösinger : wined3d: Add D3DLOCK_* types to wined3d_types.h.
by Alexandre Julliard March 8, 2006

March 8, 2006

Module: wine Branch: refs/heads/master Commit: 851bdfb5e0ba3bf3b06122688fba82ad0729407a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=851bdfb5e0ba3bf3b061226… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Mar 8 00:11:28 2006 +0100 wined3d: Add D3DLOCK_* types to wined3d_types.h. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/volume.c | 2 +- include/wine/wined3d_types.h | 7 +++++++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 409d5cb..b621ffd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5719,7 +5719,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Copy if (srcWidth == destWidth && srcHeight == destHeight) { D3DLOCKED_RECT lrSrc; D3DLOCKED_RECT lrDst; - IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, NULL, D3DLOCK_READONLY); + IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, NULL, WINED3DLOCK_READONLY); IWineD3DSurface_LockRect(pDestinationSurface, &lrDst, NULL, 0L); TRACE("Locked src and dst, Direct copy as surfaces are equal, w=%d, h=%d\n", srcWidth, srcHeight); @@ -5759,7 +5759,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Copy copyperline = ((r->right - r->left) * bytesPerPixel); } - IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, r, D3DLOCK_READONLY); + IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, r, WINED3DLOCK_READONLY); dest_rect.left = p->x; dest_rect.top = p->y; dest_rect.right = p->x + (r->right - r->left); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index bf5bc54..37d7453 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -2150,7 +2150,7 @@ void drawPrimitive(IWineD3DDevice *iface if (primCounter >= 0) { D3DLOCKED_RECT r; char buffer[80]; - IWineD3DSurface_LockRect(This->renderTarget, &r, NULL, D3DLOCK_READONLY); + IWineD3DSurface_LockRect(This->renderTarget, &r, NULL, WINED3DLOCK_READONLY); sprintf(buffer, "/tmp/backbuffer_%ld.tga", primCounter); TRACE("Saving screenshot %s\n", buffer); IWineD3DSurface_SaveSnapshot(This->renderTarget, buffer); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cb1ab99..02d8a7e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -469,7 +469,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockR } } - } else if (WINED3DUSAGE_RENDERTARGET & This->resource.usage && !(Flags&D3DLOCK_DISCARD)) { /* render surfaces */ + } else if (WINED3DUSAGE_RENDERTARGET & This->resource.usage && !(Flags&WINED3DLOCK_DISCARD)) { /* render surfaces */ GLint prev_store; GLint prev_read; @@ -631,7 +631,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockR FIXME("unsupported locking to surface surf@%p usage(%lu)\n", This, This->resource.usage); } - if (Flags & (D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_READONLY)) { + if (Flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY)) { /* Don't dirtify */ } else { IWineD3DBaseTexture *pBaseTexture; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 151ade3..d253e3c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -191,7 +191,7 @@ HRESULT WINAPI IWineD3DVolumeImpl_LockBo This->lockedBox.Back = pBox->Back; } - if (Flags & (D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_READONLY)) { + if (Flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY)) { /* Don't dirtify */ } else { /** diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 75a9ee1..fc5ba17 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -906,4 +906,11 @@ typedef enum _WINED3DDECLUSAGE { #define WINED3DDEVCAPS_RTPATCHHANDLEZERO 0x000800000 #define WINED3DDEVCAPS_NPATCHES 0x001000000 +#define WINED3DLOCK_READONLY 0x0010 +#define WINED3DLOCK_NOSYSLOCK 0x0800 +#define WINED3DLOCK_NOOVERWRITE 0x1000 +#define WINED3DLOCK_DISCARD 0x2000 +#define WINED3DLOCK_DONOTWAIT 0x4000 +#define WINED3DLOCK_NO_DIRTY_UPDATE 0x8000 + #endif

1 0

Jacek Caban : mshtml: Added get_name and get_value implementation of IHTMLTextAreaElement interface .
by Alexandre Julliard March 8, 2006

March 8, 2006

Module: wine Branch: refs/heads/master Commit: 6fafc22930e6ecc8978ca249ccbff9335fdcfdce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6fafc22930e6ecc8978ca24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 7 23:11:09 2006 +0100 mshtml: Added get_name and get_value implementation of IHTMLTextAreaElement interface. --- dlls/mshtml/htmltextarea.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 257194a..2c86c88 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -149,8 +149,26 @@ static HRESULT WINAPI HTMLTextAreaElemen static HRESULT WINAPI HTMLTextAreaElement_get_value(IHTMLTextAreaElement *iface, BSTR *p) { HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString value_str; + const PRUnichar *value; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&value_str, NULL); + + nsres = nsIDOMHTMLTextAreaElement_GetValue(This->nstextarea, &value_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&value_str, &value, NULL); + *p = SysAllocString(value); + }else { + ERR("GetValue failed: %08lx\n", nsres); + } + + nsAString_Finish(&value_str); + + TRACE("%s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLTextAreaElement_put_name(IHTMLTextAreaElement *iface, BSTR v) @@ -163,8 +181,26 @@ static HRESULT WINAPI HTMLTextAreaElemen static HRESULT WINAPI HTMLTextAreaElement_get_name(IHTMLTextAreaElement *iface, BSTR *p) { HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str; + const PRUnichar *name; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&name_str, NULL); + + nsres = nsIDOMHTMLTextAreaElement_GetName(This->nstextarea, &name_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&name_str, &name, NULL); + *p = SysAllocString(name); + }else { + ERR("GetName failed: %08lx\n", nsres); + } + + nsAString_Finish(&name_str); + + TRACE("%s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLTextAreaElement_put_status(IHTMLTextAreaElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added get_name and get_value implementation of IHTMLSelectElement interface .
by Alexandre Julliard March 8, 2006

March 8, 2006

Module: wine Branch: refs/heads/master Commit: 4ac4246fd5435b02b042588bc1cbed4ef796bb9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ac4246fd5435b02b042588… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 7 23:11:41 2006 +0100 mshtml: Added get_name and get_value implementation of IHTMLSelectElement interface. --- dlls/mshtml/htmlselect.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index c5550a0..0efd769 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -170,8 +170,26 @@ static HRESULT WINAPI HTMLSelectElement_ static HRESULT WINAPI HTMLSelectElement_get_name(IHTMLSelectElement *iface, BSTR *p) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str; + const PRUnichar *name; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&name_str, NULL); + + nsres = nsIDOMHTMLSelectElement_GetName(This->nsselect, &name_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&name_str, &name, NULL); + *p = SysAllocString(name); + }else { + ERR("GetName failed: %08lx\n", nsres); + } + + nsAString_Finish(&name_str); + + TRACE("name=%s\n", debugstr_w(name)); + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_options(IHTMLSelectElement *iface, IDispatch **p) @@ -226,8 +244,26 @@ static HRESULT WINAPI HTMLSelectElement_ static HRESULT WINAPI HTMLSelectElement_get_value(IHTMLSelectElement *iface, BSTR *p) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString value_str; + const PRUnichar *value; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&value_str, NULL); + + nsres = nsIDOMHTMLSelectElement_GetValue(This->nsselect, &value_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&value_str, &value, NULL); + *p = SysAllocString(value); + }else { + ERR("GetValue failed: %08lx\n", nsres); + } + + nsAString_Finish(&value_str); + + TRACE("value=%s\n", debugstr_w(value)); + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_disabled(IHTMLSelectElement *iface, VARIANT_BOOL v)

1 0

Jacek Caban : mshtml: Added get_type, get_value, get_name and get_checked
by Alexandre Julliard March 8, 2006

March 8, 2006

Module: wine Branch: refs/heads/master Commit: 92ff0e5019bbf6d052c496fb34b64e2e6976c7dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92ff0e5019bbf6d052c496f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 7 23:10:45 2006 +0100 mshtml: Added get_type, get_value, get_name and get_checked implementation of IHTMLInputElement interface. --- dlls/mshtml/htmlinput.c | 83 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 75 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 56b6ba9..85be481 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -142,8 +142,26 @@ static HRESULT WINAPI HTMLInputElement_p static HRESULT WINAPI HTMLInputElement_get_type(IHTMLInputElement *iface, BSTR *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString type_str; + const PRUnichar *type; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&type_str, NULL); + nsres = nsIDOMHTMLInputElement_GetType(This->nsinput, &type_str); + + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&type_str, &type, NULL); + *p = SysAllocString(type); + }else { + ERR("GetType failed: %08lx\n", nsres); + } + + nsAString_Finish(&type_str); + + TRACE("type=%s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLInputElement_put_value(IHTMLInputElement *iface, BSTR v) @@ -156,8 +174,26 @@ static HRESULT WINAPI HTMLInputElement_p static HRESULT WINAPI HTMLInputElement_get_value(IHTMLInputElement *iface, BSTR *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString value_str; + const PRUnichar *value; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&value_str, NULL); + + nsres = nsIDOMHTMLInputElement_GetValue(This->nsinput, &value_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&value_str, &value, NULL); + *p = SysAllocString(value); + }else { + ERR("GetValue failed: %08lx\n", nsres); + } + + nsAString_Finish(&value_str); + + TRACE("value=%s\n", debugstr_w(value)); + return S_OK; } static HRESULT WINAPI HTMLInputElement_put_name(IHTMLInputElement *iface, BSTR v) @@ -170,8 +206,27 @@ static HRESULT WINAPI HTMLInputElement_p static HRESULT WINAPI HTMLInputElement_get_name(IHTMLInputElement *iface, BSTR *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str; + const PRUnichar *name; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&name_str, NULL); + + nsres = nsIDOMHTMLInputElement_GetName(This->nsinput, &name_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&name_str, &name, NULL); + *p = SysAllocString(name); + }else { + ERR("GetName failed: %08lx\n", nsres); + return E_FAIL; + } + + nsAString_Finish(&name_str); + + TRACE("name=%s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLInputElement_put_status(IHTMLInputElement *iface, VARIANT_BOOL v) @@ -345,8 +400,20 @@ static HRESULT WINAPI HTMLInputElement_p static HRESULT WINAPI HTMLInputElement_get_checked(IHTMLInputElement *iface, VARIANT_BOOL *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool checked; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLInputElement_GetChecked(This->nsinput, &checked); + if(NS_FAILED(nsres)) { + ERR("GetChecked failed: %08lx\n", nsres); + return E_FAIL; + } + + *p = checked ? VARIANT_TRUE : VARIANT_FALSE; + TRACE("checked=%x\n", *p); + return S_OK; } static HRESULT WINAPI HTMLInputElement_put_border(IHTMLInputElement *iface, VARIANT v)

1 0

Peter Åstrand : comctl32: LISTVIEW_InsertItemT should accept iItem < 0, when using sorted lists.
by Alexandre Julliard March 8, 2006

March 8, 2006

Module: wine Branch: refs/heads/master Commit: c5552a694b07e2dea0b788717bb696b8b765f9bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c5552a694b07e2dea0b7887… Author: Peter Åstrand <astrand(a)cendio.se> Date: Tue Mar 7 14:07:49 2006 +0100 comctl32: LISTVIEW_InsertItemT should accept iItem < 0, when using sorted lists. --- dlls/comctl32/listview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9210e8d..cab119a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6211,7 +6211,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW if (infoPtr->dwStyle & LVS_OWNERDATA) return infoPtr->nItemCount++; /* make sure it's an item, and not a subitem; cannot insert a subitem */ - if (!lpLVItem || lpLVItem->iItem < 0 || lpLVItem->iSubItem) return -1; + if (!lpLVItem || lpLVItem->iSubItem) return -1; if (!is_assignable_item(lpLVItem, infoPtr->dwStyle)) return -1; @@ -6224,6 +6224,8 @@ static INT LISTVIEW_InsertItemT(LISTVIEW is_sorted = (infoPtr->dwStyle & (LVS_SORTASCENDING | LVS_SORTDESCENDING)) && !(infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (LPSTR_TEXTCALLBACKW != lpLVItem->pszText); + if (lpLVItem->iItem < 0 && !is_sorted) return -1; + nItem = is_sorted ? infoPtr->nItemCount : min(lpLVItem->iItem, infoPtr->nItemCount); TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems );

1 0

Hans Leidekker : mscms: Add tests for EnumColorProfiles{A,W}.
by Alexandre Julliard March 8, 2006

March 8, 2006

Module: wine Branch: refs/heads/master Commit: 1d491aedba0b28f984f921568a84667745b0745e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d491aedba0b28f984f9215… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Mar 7 16:52:35 2006 +0100 mscms: Add tests for EnumColorProfiles{A,W}. --- dlls/mscms/tests/profile.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 8c7d0aa..0e30f1e 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -1,7 +1,7 @@ /* * Tests for color profile functions * - * Copyright 2004, 2005 Hans Leidekker + * Copyright 2004, 2005, 2006 Hans Leidekker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -42,6 +42,8 @@ static BOOL (WINAPI *pGetColorProfil static BOOL (WINAPI *pGetCountColorProfileElements)(HPROFILE,PDWORD); static BOOL (WINAPI *pGetStandardColorSpaceProfileA)(PCSTR,DWORD,PSTR,PDWORD); static BOOL (WINAPI *pGetStandardColorSpaceProfileW)(PCWSTR,DWORD,PWSTR,PDWORD); +static BOOL (WINAPI *pEnumColorProfilesA)(PCSTR,PENUMTYPEA,PBYTE,PDWORD,PDWORD); +static BOOL (WINAPI *pEnumColorProfilesW)(PCWSTR,PENUMTYPEW,PBYTE,PDWORD,PDWORD); static BOOL (WINAPI *pInstallColorProfileA)(PCSTR,PCSTR); static BOOL (WINAPI *pInstallColorProfileW)(PCWSTR,PCWSTR); static BOOL (WINAPI *pIsColorProfileTagPresent)(HPROFILE,TAGTYPE,PBOOL); @@ -69,6 +71,8 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( GetCountColorProfileElements ) GETFUNCPTR( GetStandardColorSpaceProfileA ) GETFUNCPTR( GetStandardColorSpaceProfileW ) + GETFUNCPTR( EnumColorProfilesA ) + GETFUNCPTR( EnumColorProfilesW ) GETFUNCPTR( InstallColorProfileA ) GETFUNCPTR( InstallColorProfileW ) GETFUNCPTR( IsColorProfileTagPresent ) @@ -701,6 +705,102 @@ static void test_GetStandardColorSpacePr } } +static void test_EnumColorProfilesA(void) +{ + BOOL ret; + DWORD size, number; + ENUMTYPEA record; + BYTE buffer[MAX_PATH]; + + /* Parameter checks */ + + size = sizeof(buffer); + memset( &record, 0, sizeof(ENUMTYPEA) ); + + record.dwSize = sizeof(ENUMTYPEA); + record.dwVersion = ENUM_TYPE_VERSION; + record.dwFields |= ET_DATACOLORSPACE; + record.dwDataColorSpace = SPACE_RGB; + + ret = pEnumColorProfilesA( machine, &record, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesA() succeeded (%ld)\n", GetLastError() ); + + ret = pEnumColorProfilesA( NULL, NULL, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesA() succeeded (%ld)\n", GetLastError() ); + + ret = pEnumColorProfilesA( NULL, &record, buffer, NULL, &number ); + ok( !ret, "EnumColorProfilesA() succeeded (%ld)\n", GetLastError() ); + + if (standardprofile) + { + ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); + ok( ret, "EnumColorProfilesA() failed (%ld)\n", GetLastError() ); + } + + size = 0; + + ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesA() succeeded (%ld)\n", GetLastError() ); + + /* Functional checks */ + + if (standardprofile) + { + size = sizeof(buffer); + + ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); + ok( ret, "EnumColorProfilesA() failed (%ld)\n", GetLastError() ); + } +} + +static void test_EnumColorProfilesW(void) +{ + BOOL ret; + DWORD size, number; + ENUMTYPEW record; + BYTE buffer[MAX_PATH * sizeof(WCHAR)]; + + /* Parameter checks */ + + size = sizeof(buffer); + memset( &record, 0, sizeof(ENUMTYPEW) ); + + record.dwSize = sizeof(ENUMTYPEW); + record.dwVersion = ENUM_TYPE_VERSION; + record.dwFields |= ET_DATACOLORSPACE; + record.dwDataColorSpace = SPACE_RGB; + + ret = pEnumColorProfilesW( machineW, &record, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesW() succeeded (%ld)\n", GetLastError() ); + + ret = pEnumColorProfilesW( NULL, NULL, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesW() succeeded (%ld)\n", GetLastError() ); + + ret = pEnumColorProfilesW( NULL, &record, buffer, NULL, &number ); + ok( !ret, "EnumColorProfilesW() succeeded (%ld)\n", GetLastError() ); + + if (standardprofileW) + { + ret = pEnumColorProfilesW( NULL, &record, buffer, &size, NULL ); + ok( ret, "EnumColorProfilesW() failed (%ld)\n", GetLastError() ); + } + + size = 0; + + ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesW() succeeded (%ld)\n", GetLastError() ); + + /* Functional checks */ + + if (standardprofileW) + { + size = sizeof(buffer); + + ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); + ok( ret, "EnumColorProfilesW() failed (%ld)\n", GetLastError() ); + } +} + static void test_InstallColorProfileA(void) { BOOL ret; @@ -1250,6 +1350,9 @@ START_TEST(profile) test_GetStandardColorSpaceProfileA(); test_GetStandardColorSpaceProfileW(); + test_EnumColorProfilesA(); + test_EnumColorProfilesW(); + test_InstallColorProfileA(); test_InstallColorProfileW();

1 0

Hans Leidekker : mscms: Implement EnumColorProfiles{A,W}.
by Alexandre Julliard March 8, 2006

March 8, 2006

Module: wine Branch: refs/heads/master Commit: 05b073da0d10111fac00548946de3104b5be7823 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=05b073da0d10111fac00548… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Mar 7 16:50:17 2006 +0100 mscms: Implement EnumColorProfiles{A,W}. --- dlls/mscms/profile.c | 411 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mscms/stub.c | 16 -- include/icm.h | 20 ++ 3 files changed, 430 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=05b073da0d10111fac0…

1 0

Dmitry Timoshkov : fonts: Install fonts in $(datadir)/wine/fonts.
by Alexandre Julliard March 8, 2006

March 8, 2006

Module: wine Branch: refs/heads/master Commit: f1a08352673985a965eb205abd0d8632aedc4bca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1a08352673985a965eb205… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 7 22:17:49 2006 +0800 fonts: Install fonts in $(datadir)/wine/fonts. --- fonts/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 59aa6e9..e1b71f9 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none -fontdir = $(datadir)/fonts/wine +fontdir = $(datadir)/wine/fonts BITMAP_FONTS = \ coue1255.fon \

1 0

Alexandre Julliard : dlls: Added a default install-lib rule for dlls that don't have one.
by Alexandre Julliard March 8, 2006

March 8, 2006

Module: wine Branch: refs/heads/master Commit: cc3d4d3df34ed7da0aade5a4b6e3ad926ac93b3c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc3d4d3df34ed7da0aade5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 11:31:50 2006 +0100 dlls: Added a default install-lib rule for dlls that don't have one. --- dlls/Makeimplib.rules.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 4c11ab0..4d93ee7 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -27,6 +27,8 @@ install install-dev:: $(MODULE) $(MKINSTALLDIRS) $(DESTDIR)$(dlldir) $(INSTALL_DATA) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) +install-lib:: + uninstall:: $(RM) $(DESTDIR)$(dlldir)/$(MODULE)

1 0