October 2007 - Wine-commits

Juan Lang : cryptnet: Add URL_OID_GET_OBJECT_URL_FUNC definition.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: 72688bd239641c1bbfbb4ade3b1c5f51bc06313f URL: http://source.winehq.org/git/wine.git/?a=commit;h=72688bd239641c1bbfbb4ade3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 10:28:59 2007 -0700 cryptnet: Add URL_OID_GET_OBJECT_URL_FUNC definition. --- include/wincrypt.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 7563051..e45a38b 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1216,6 +1216,8 @@ typedef struct _CRYPT_URL_INFO { #define URL_OID_CRL_FRESHEST_CRL ((LPCSTR)7) #define URL_OID_CROSS_CERT_DIST_POINT ((LPCSTR)8) +#define URL_OID_GET_OBJECT_URL_FUNC "UrlDllGetObjectUrl" + typedef HANDLE HCRYPTASYNC, *PHCRYPTASYNC; typedef void (WINAPI *PFN_CRYPT_ASYNC_PARAM_FREE_FUNC)(LPSTR pszParamOid,

1 0

Juan Lang : cryptnet: Partially implement CryptGetObjectUrl.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: 43bdf4e52d929d65aee05c9c23f6ea896902d07a URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bdf4e52d929d65aee05c9c2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 10:29:34 2007 -0700 cryptnet: Partially implement CryptGetObjectUrl. --- dlls/cryptnet/cryptnet_main.c | 204 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 202 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 67a1ebb..206ba24 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -18,10 +18,13 @@ */ #include "config.h" +#include "wine/port.h" +#include <stdio.h> #include "windef.h" #include "wine/debug.h" #include "winbase.h" #include "winnt.h" +#define NONAMELESSUNION #include "wincrypt.h" WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); @@ -78,6 +81,169 @@ HRESULT WINAPI DllUnregisterServer(void) return S_OK; } +static const char *url_oid_to_str(LPCSTR oid) +{ + if (HIWORD(oid)) + return oid; + else + { + static char buf[10]; + + switch (LOWORD(oid)) + { +#define _x(oid) case LOWORD(oid): return #oid + _x(URL_OID_CERTIFICATE_ISSUER); + _x(URL_OID_CERTIFICATE_CRL_DIST_POINT); + _x(URL_OID_CTL_ISSUER); + _x(URL_OID_CTL_NEXT_UPDATE); + _x(URL_OID_CRL_ISSUER); + _x(URL_OID_CERTIFICATE_FRESHEST_CRL); + _x(URL_OID_CRL_FRESHEST_CRL); + _x(URL_OID_CROSS_CERT_DIST_POINT); +#undef _x + default: + snprintf(buf, sizeof(buf), "%d", LOWORD(oid)); + return buf; + } + } +} + +typedef BOOL (WINAPI *UrlDllGetObjectUrlFunc)(LPCSTR, LPVOID, DWORD, + PCRYPT_URL_ARRAY, DWORD *, PCRYPT_URL_INFO, DWORD *, LPVOID); + +static BOOL WINAPI CRYPT_GetUrlFromCertificateIssuer(LPCSTR pszUrlOid, + LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, + PCRYPT_URL_INFO pUrlInfo, DWORD *pcbUrlInfo, LPVOID pvReserved) +{ + /* FIXME: This depends on the AIA (authority info access) extension being + * supported in crypt32. + */ + FIXME("\n"); + SetLastError(CRYPT_E_NOT_FOUND); + return FALSE; +} + +static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid, + LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, + PCRYPT_URL_INFO pUrlInfo, DWORD *pcbUrlInfo, LPVOID pvReserved) +{ + PCCERT_CONTEXT cert = (PCCERT_CONTEXT)pvPara; + PCERT_EXTENSION ext; + BOOL ret = FALSE; + + /* The only applicable flag is CRYPT_GET_URL_FROM_EXTENSION */ + if (dwFlags && !(dwFlags & CRYPT_GET_URL_FROM_EXTENSION)) + { + SetLastError(CRYPT_E_NOT_FOUND); + return FALSE; + } + if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + { + CRL_DIST_POINTS_INFO *info; + DWORD size; + + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CRL_DIST_POINTS, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, + &info, &size); + if (ret) + { + DWORD i, cUrl, bytesNeeded = sizeof(CRYPT_URL_ARRAY); + + for (i = 0, cUrl = 0; i < info->cDistPoint; i++) + if (info->rgDistPoint[i].DistPointName.dwDistPointNameChoice + == CRL_DIST_POINT_FULL_NAME) + { + DWORD j; + CERT_ALT_NAME_INFO *name = + &info->rgDistPoint[i].DistPointName.FullName; + + for (j = 0; j < name->cAltEntry; j++) + if (name->rgAltEntry[j].dwAltNameChoice == + CERT_ALT_NAME_URL) + { + if (name->rgAltEntry[j].pwszURL) + { + cUrl++; + bytesNeeded += sizeof(LPWSTR) + + (lstrlenW(name->rgAltEntry[j].pwszURL) + 1) + * sizeof(WCHAR); + } + } + } + if (!pcbUrlArray) + SetLastError(E_INVALIDARG); + else if (!pUrlArray) + *pcbUrlArray = bytesNeeded; + else if (*pcbUrlArray < bytesNeeded) + { + SetLastError(ERROR_MORE_DATA); + *pcbUrlArray = bytesNeeded; + ret = FALSE; + } + else + { + LPWSTR nextUrl; + + *pcbUrlArray = bytesNeeded; + pUrlArray->cUrl = 0; + pUrlArray->rgwszUrl = + (LPWSTR *)((BYTE *)pUrlArray + sizeof(CRYPT_URL_ARRAY)); + nextUrl = (LPWSTR)((BYTE *)pUrlArray + sizeof(CRYPT_URL_ARRAY) + + cUrl * sizeof(LPWSTR)); + for (i = 0; i < info->cDistPoint; i++) + if (info->rgDistPoint[i].DistPointName.dwDistPointNameChoice + == CRL_DIST_POINT_FULL_NAME) + { + DWORD j; + CERT_ALT_NAME_INFO *name = + &info->rgDistPoint[i].DistPointName.FullName; + + for (j = 0; j < name->cAltEntry; j++) + if (name->rgAltEntry[j].dwAltNameChoice == + CERT_ALT_NAME_URL) + { + if (name->rgAltEntry[j].pwszURL) + { + lstrcpyW(nextUrl, + name->rgAltEntry[j].pwszURL); + pUrlArray->rgwszUrl[pUrlArray->cUrl++] = + nextUrl; + nextUrl += + (lstrlenW(name->rgAltEntry[j].pwszURL) + 1) + * sizeof(WCHAR); + } + } + } + } + if (ret) + { + if (pcbUrlInfo) + { + FIXME("url info: stub\n"); + if (!pUrlInfo) + *pcbUrlInfo = sizeof(CRYPT_URL_INFO); + else if (*pcbUrlInfo < sizeof(CRYPT_URL_INFO)) + { + *pcbUrlInfo = sizeof(CRYPT_URL_INFO); + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbUrlInfo = sizeof(CRYPT_URL_INFO); + memset(pUrlInfo, 0, sizeof(CRYPT_URL_INFO)); + } + } + } + LocalFree(info); + } + } + else + SetLastError(CRYPT_E_NOT_FOUND); + return ret; +} + /*********************************************************************** * CryptGetObjectUrl (CRYPTNET.@) */ @@ -85,9 +251,43 @@ BOOL WINAPI CryptGetObjectUrl(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, PCRYPT_URL_INFO pUrlInfo, DWORD *pcbUrlInfo, LPVOID pvReserved) { - FIXME("(%s, %p, %08x, %p, %p, %p, %p, %p): stub\n", debugstr_a(pszUrlOid), + UrlDllGetObjectUrlFunc func = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; + BOOL ret = FALSE; + + TRACE("(%s, %p, %08x, %p, %p, %p, %p, %p)\n", debugstr_a(pszUrlOid), pvPara, dwFlags, pUrlArray, pcbUrlArray, pUrlInfo, pcbUrlInfo, pvReserved); - return FALSE; + + if (!HIWORD(pszUrlOid)) + { + switch (LOWORD(pszUrlOid)) + { + case LOWORD(URL_OID_CERTIFICATE_ISSUER): + func = CRYPT_GetUrlFromCertificateIssuer; + break; + case LOWORD(URL_OID_CERTIFICATE_CRL_DIST_POINT): + func = CRYPT_GetUrlFromCertificateCRLDistPoint; + break; + default: + FIXME("unimplemented for %s\n", url_oid_to_str(pszUrlOid)); + SetLastError(ERROR_FILE_NOT_FOUND); + } + } + else + { + static HCRYPTOIDFUNCSET set = NULL; + + if (!set) + set = CryptInitOIDFunctionSet(URL_OID_GET_OBJECT_URL_FUNC, 0); + CryptGetOIDFunctionAddress(set, X509_ASN_ENCODING, pszUrlOid, 0, + (void **)&func, &hFunc); + } + if (func) + ret = func(pszUrlOid, pvPara, dwFlags, pUrlArray, pcbUrlArray, + pUrlInfo, pcbUrlInfo, pvReserved); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); + return ret; } /***********************************************************************

1 0

Juan Lang : crypt32: Add stubs for I_CryptFindLruEntry and I_CryptCreateLruEntry.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: 7b8cb034b223be10bf72e155fd40910679816b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8cb034b223be10bf72e155f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 10:36:28 2007 -0700 crypt32: Add stubs for I_CryptFindLruEntry and I_CryptCreateLruEntry. --- dlls/crypt32/crypt32.spec | 3 ++- dlls/crypt32/main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index cbadf22..8542721 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -192,8 +192,9 @@ @ stub CryptVerifySignatureU @ stdcall I_CryptAllocTls() @ stdcall I_CryptCreateLruCache(ptr ptr) -@ stub I_CryptCreateLruEntry +@ stdcall I_CryptCreateLruEntry(ptr long long) @ stdcall I_CryptDetachTls(long) +@ stdcall I_CryptFindLruEntry(long long) @ stdcall I_CryptFindLruEntryData(long long long) @ stdcall I_CryptFlushLruCache(ptr long long) @ stdcall I_CryptFreeLruCache(ptr long long) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index f10a9c9..12f2885 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -75,12 +75,24 @@ BOOL WINAPI I_CryptCreateLruCache(void *unknown, HLRUCACHE *out) return TRUE; } +BOOL WINAPI I_CryptFindLruEntry(DWORD unk0, DWORD unk1) +{ + FIXME("(%08x, %08x): stub!\n", unk0, unk1); + return FALSE; +} + BOOL WINAPI I_CryptFindLruEntryData(DWORD unk0, DWORD unk1, DWORD unk2) { FIXME("(%08x, %08x, %08x): stub!\n", unk0, unk1, unk2); return FALSE; } +BOOL WINAPI I_CryptCreateLruEntry(HLRUCACHE h, DWORD unk0, DWORD unk1) +{ + FIXME("(%p, %08x, %08x): stub!\n", h, unk0, unk1); + return FALSE; +} + DWORD WINAPI I_CryptFlushLruCache(HLRUCACHE h, DWORD unk0, DWORD unk1) { FIXME("(%p, %08x, %08x): stub!\n", h, unk0, unk1);

1 0

Juan Lang : crypt32: Add I_CertUpdateStore stub.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: b4eb9bf251b76df40626c030cb0373bba8952641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4eb9bf251b76df40626c030c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 11:09:22 2007 -0700 crypt32: Add I_CertUpdateStore stub. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 8542721..874d26d 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -190,6 +190,7 @@ @ stdcall CryptVerifyMessageSignature(ptr long ptr long ptr ptr ptr) @ stub CryptVerifyMessageSignatureWithKey @ stub CryptVerifySignatureU +@ stdcall I_CertUpdateStore(ptr ptr long long) @ stdcall I_CryptAllocTls() @ stdcall I_CryptCreateLruCache(ptr ptr) @ stdcall I_CryptCreateLruEntry(ptr long long) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 12f2885..fa8b782 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -60,6 +60,16 @@ HCRYPTPROV CRYPT_GetDefaultProvider(void) return hDefProv; } +/* Appears to be called to update the contents of store1 with those in store2. + * The second two parameters are unknown. + */ +BOOL WINAPI I_CertUpdateStore(HCERTSTORE store1, HCERTSTORE store2, DWORD unk0, + DWORD unk1) +{ + FIXME("(%p, %p, %08x, %08x)\n", store1, store2, unk0, unk1); + return FALSE; +} + typedef void * HLRUCACHE; /* this function is called by Internet Explorer when it is about to verify a

1 0

Allan Tong : wined3d: Fix resource cleanup if CreateCubeTexture fails.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: ac6f2009f20871dafde900a624424fcb5bd58a75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6f2009f20871dafde900a62… Author: Allan Tong <actong88(a)gmail.com> Date: Thu Oct 18 23:39:22 2007 -0400 wined3d: Fix resource cleanup if CreateCubeTexture fails. --- dlls/wined3d/device.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a7a586d..5038350 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1107,10 +1107,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { if(!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { WARN("No mipmap generation support, returning D3DERR_INVALIDCALL\n"); + HeapFree(GetProcessHeap(), 0, object); + *ppCubeTexture = NULL; + return WINED3DERR_INVALIDCALL; } if(Levels > 1) { WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL\n"); + HeapFree(GetProcessHeap(), 0, object); + *ppCubeTexture = NULL; + return WINED3DERR_INVALIDCALL; } Levels = 1; @@ -1139,11 +1145,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface int k; int l; for (l = 0; l < j; l++) { - IWineD3DSurface_Release(object->surfaces[j][i]); + IWineD3DSurface_Release(object->surfaces[l][i]); } for (k = 0; k < i; k++) { for (l = 0; l < 6; l++) { - IWineD3DSurface_Release(object->surfaces[l][j]); + IWineD3DSurface_Release(object->surfaces[l][k]); } }

1 0

Allan Tong : wined3d: Fix comment typos in SetMultithreaded.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: c18fa4df6820c668229268b6b1483e0e1905629a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c18fa4df6820c668229268b6b… Author: Allan Tong <actong88(a)gmail.com> Date: Thu Oct 18 23:40:40 2007 -0400 wined3d: Fix comment typos in SetMultithreaded. --- dlls/wined3d/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5038350..056186c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2229,11 +2229,11 @@ static void WINAPI IWineD3DDeviceImpl_SetFullscreen(IWineD3DDevice *iface, BOOL This->ddraw_fullscreen = fullscreen; } -/* Enables thead safety in the wined3d device and its resources. Called by DirectDraw - * from SetCooperativeLeven if DDSCL_MULTITHREADED is specified, and by d3d8/9 from +/* Enables thread safety in the wined3d device and its resources. Called by DirectDraw + * from SetCooperativeLevel if DDSCL_MULTITHREADED is specified, and by d3d8/9 from * CreateDevice if D3DCREATE_MULTITHREADED is passed. * - * There is no way to deactivate thread safety once it is enabled + * There is no way to deactivate thread safety once it is enabled. */ static void WINAPI IWineD3DDeviceImpl_SetMultithreaded(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;

1 0

Juan Lang : cryptnet: Implement DllRegisterServer/DllUnregisterServer.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: 4009ed30bc02c507075dffb9b66746ef17ae4f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4009ed30bc02c507075dffb9b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 18 10:18:31 2007 -0700 cryptnet: Implement DllRegisterServer/DllUnregisterServer. --- dlls/cryptnet/Makefile.in | 2 +- dlls/cryptnet/cryptnet_main.c | 23 +++++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in index ed737e1..6f02301 100644 --- a/dlls/cryptnet/Makefile.in +++ b/dlls/cryptnet/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cryptnet.dll -IMPORTS = kernel32 +IMPORTS = crypt32 kernel32 C_SRCS = \ cryptnet_main.c diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index b43a492..17b62f0 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -22,6 +22,7 @@ #include "wine/debug.h" #include "winbase.h" #include "winnt.h" +#include "wincrypt.h" WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); @@ -43,13 +44,23 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +static const WCHAR cryptNet[] = { 'c','r','y','p','t','n','e','t','.', + 'd','l','l',0 }; +static const WCHAR ldapProvOpenStore[] = { 'L','d','a','p','P','r','o','v', + 'O','p','e','S','t','o','r','e',0 }; + /*********************************************************************** * DllRegisterServer (CRYPTNET.@) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("stub\n"); - + TRACE("\n"); + CryptRegisterDefaultOIDFunction(X509_ASN_ENCODING, + CRYPT_OID_VERIFY_REVOCATION_FUNC, 0, cryptNet); + CryptRegisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, "Ldap", + cryptNet, "LdapProvOpenStore"); + CryptRegisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, + CERT_STORE_PROV_LDAP_W, cryptNet, "LdapProvOpenStore"); return S_OK; } @@ -58,7 +69,11 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("stub\n"); - + TRACE("\n"); + CryptUnregisterDefaultOIDFunction(X509_ASN_ENCODING, + CRYPT_OID_VERIFY_REVOCATION_FUNC, cryptNet); + CryptUnregisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, "Ldap"); + CryptUnregisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, + CERT_STORE_PROV_LDAP_W); return S_OK; }

1 0

Alex Villacís Lasso : riched20: Single-line control must refuse to insert carriage returns (with tests).
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: f54aa40746d230feb4068936e2ceb7511695b0dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54aa40746d230feb4068936e… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Oct 18 11:02:09 2007 -0500 riched20: Single-line control must refuse to insert carriage returns (with tests). --- dlls/riched20/editor.c | 4 ++- dlls/riched20/tests/editor.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 81fe9b2..eabaa8d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2431,7 +2431,9 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, SendMessageW(editor->hWnd, EM_UNDO, 0, 0); return 0; } - if (((unsigned)wstr)>=' ' || wstr=='\r' || wstr=='\t') { + if (((unsigned)wstr)>=' ' + || (wstr=='\r' && (GetWindowLongW(hWnd, GWL_STYLE) & ES_MULTILINE)) + || wstr=='\t') { /* FIXME maybe it would make sense to call EM_REPLACESEL instead ? */ /* WM_CHAR is restricted to nTextLimit */ int from, to; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5375d30..90899e0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2058,6 +2058,56 @@ static void test_unicode_conversions(void) DestroyWindow(hwnd); } +static void test_WM_CHAR(void) +{ + HWND hwnd; + int ret; + const char * char_list = "abc\rabc\r"; + const char * expected_content_single = "abcabc"; + const char * expected_content_multi = "abc\r\nabc\r\n"; + char buffer[64] = {0}; + const char * p; + + /* single-line control must IGNORE carriage returns */ + hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP, + 0, 0, 200, 60, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + + p = char_list; + while (*p != '\0') { + SendMessageA(hwnd, WM_KEYDOWN, *p, 1); + ret = SendMessageA(hwnd, WM_CHAR, *p, 1); + ok(ret == 0, "WM_CHAR('%c') ret=%d\n", *p, ret); + SendMessageA(hwnd, WM_KEYUP, *p, 1); + p++; + } + + SendMessage(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + ret = strcmp(buffer, expected_content_single); + ok(ret == 0, "WM_GETTEXT recovered incorrect string!\n"); + + DestroyWindow(hwnd); + + /* multi-line control inserts CR normally */ + hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP|ES_MULTILINE, + 0, 0, 200, 60, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + + p = char_list; + while (*p != '\0') { + SendMessageA(hwnd, WM_KEYDOWN, *p, 1); + ret = SendMessageA(hwnd, WM_CHAR, *p, 1); + ok(ret == 0, "WM_CHAR('%c') ret=%d\n", *p, ret); + SendMessageA(hwnd, WM_KEYUP, *p, 1); + p++; + } + + SendMessage(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + ret = strcmp(buffer, expected_content_multi); + ok(ret == 0, "WM_GETTEXT recovered incorrect string!\n"); + + DestroyWindow(hwnd); +} static void test_EM_GETTEXTLENGTHEX(void) { @@ -2205,6 +2255,7 @@ START_TEST( editor ) hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + test_WM_CHAR(); test_EM_FINDTEXT(); test_EM_GETLINE(); test_EM_SCROLLCARET();

1 0

Maarten Lankhorst : winealsa: Don't use default: XX to open up a hardware control.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: 1ae9a9d659c0fd0f4c393b9b8f93eb27fd01cdbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae9a9d659c0fd0f4c393b9b8… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Tue Oct 16 18:32:29 2007 +0200 winealsa: Don't use default:XX to open up a hardware control. --- dlls/winealsa.drv/waveinit.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index dae6ab4..86143b6 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -697,15 +697,10 @@ static int ALSA_ScanDevices(int directhw, ** Try to open a ctl handle; Wine doesn't absolutely require one, ** but it does allow for volume control and for device scanning **------------------------------------------------------------------*/ - sprintf(ctlname, "default:%d", fixedctlcard == -1 ? card : fixedctlcard); + sprintf(ctlname, "hw:%d", fixedctlcard == -1 ? card : fixedctlcard); rc = snd_ctl_open(&ctl, ctlname, SND_CTL_NONBLOCK); if (rc < 0) { - sprintf(ctlname, "hw:%d", fixedctlcard == -1 ? card : fixedctlcard); - rc = snd_ctl_open(&ctl, ctlname, SND_CTL_NONBLOCK); - } - if (rc < 0) - { ctl = NULL; WARN("Unable to open an alsa ctl for [%s] (pcm card %d): %s; not scanning devices\n", ctlname, card, snd_strerror(rc));

1 0

Mikolaj Zalewski : kernel32: FindExSearchLimitToDirectories has no effect on FindFirstFileEx.
by Alexandre Julliard 19 Oct '07

19 Oct '07

Module: wine Branch: master Commit: 25e15ddb51d43c52ac65f2e1899e940ea9b29d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e15ddb51d43c52ac65f2e18… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Oct 18 18:19:24 2007 -0700 kernel32: FindExSearchLimitToDirectories has no effect on FindFirstFileEx. --- dlls/kernel32/file.c | 6 +++--- dlls/kernel32/tests/file.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index f36196b..ed97c51 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1544,6 +1544,9 @@ BOOL WINAPI ReplaceFileA(LPCSTR lpReplacedFileName,LPCSTR lpReplacementFileName, /************************************************************************* * FindFirstFileExW (KERNEL32.@) + * + * NOTE: The FindExSearchLimitToDirectories is ignored - it gives the same + * results as FindExSearchNameMatch */ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, LPVOID data, FINDEX_SEARCH_OPS search_op, @@ -1781,9 +1784,6 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) { if (!check_dir_symlink( info, dir_info )) continue; } - if (info->search_op == FindExSearchLimitToDirectories && - (dir_info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) - continue; data->dwFileAttributes = dir_info->FileAttributes; data->ftCreationTime = *(FILETIME *)&dir_info->CreationTime; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index e9f97f5..d115a57 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1377,6 +1377,43 @@ static void test_FindNextFileA(void) ok ( err == ERROR_NO_MORE_FILES, "GetLastError should return ERROR_NO_MORE_FILES\n"); } +static void test_FindFirstFileExA(void) +{ + WIN32_FIND_DATAA search_results; + HANDLE handle; + + CreateDirectoryA("test-dir", NULL); + _lclose(_lcreat("test-dir\\file1", 0)); + _lclose(_lcreat("test-dir\\file2", 0)); + CreateDirectoryA("test-dir\\dir1", NULL); + /* FindExLimitToDirectories is ignored */ + handle = FindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, FindExSearchLimitToDirectories, NULL, 0); + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); + ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); + +#define CHECK_NAME(fn) (strcmp((fn), "file1") == 0 || strcmp((fn), "file2") == 0 || strcmp((fn), "dir1") == 0) + + ok(FindNextFile(handle, &search_results), "Fetching second file failed\n"); + ok(strcmp(search_results.cFileName, "..") == 0, "Second entry should be '..' is %s\n", search_results.cFileName); + + ok(FindNextFile(handle, &search_results), "Fetching third file failed\n"); + ok(CHECK_NAME(search_results.cFileName), "Invalid thrid entry - %s\n", search_results.cFileName); + + ok(FindNextFile(handle, &search_results), "Fetching fourth file failed\n"); + ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName); + + ok(FindNextFile(handle, &search_results), "Fetching fifth file failed\n"); + ok(CHECK_NAME(search_results.cFileName), "Invalid fifth entry - %s\n", search_results.cFileName); + +#undef CHECK_NAME + + ok(FindNextFile(handle, &search_results) == FALSE, "Fetching sixth file should failed\n"); + DeleteFileA("test-dir\\file1"); + DeleteFileA("test-dir\\file2"); + RemoveDirectoryA("test-dir\\dir1"); + RemoveDirectoryA("test-dir"); +} + static int test_Mapfile_createtemp(HANDLE *handle) { SetFileAttributesA(filename,FILE_ATTRIBUTE_NORMAL); @@ -1839,6 +1876,7 @@ START_TEST(file) test_MoveFileW(); test_FindFirstFileA(); test_FindNextFileA(); + test_FindFirstFileExA(); test_LockFile(); test_file_sharing(); test_offset_in_overlapped_structure();

1 0