July 2007 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Add stub encoded signed message.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 223bad2312bc22dff601bbe9240ea33afbb36d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223bad2312bc22dff601bbe92… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 20 17:31:11 2007 -0700 crypt32: Add stub encoded signed message. --- dlls/crypt32/msg.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 19 +++----- 2 files changed, 123 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 67a4024..08b3ce8 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -535,6 +535,119 @@ static HCRYPTMSG CHashEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, return (HCRYPTMSG)msg; } +typedef struct _CMSG_SIGNER_ENCODE_INFO_WITH_CMS +{ + DWORD cbSize; + PCERT_INFO pCertInfo; + HCRYPTPROV hCryptProv; + DWORD dwKeySpec; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void *pvHashAuxInfo; + DWORD cAuthAttr; + PCRYPT_ATTRIBUTE rgAuthAttr; + DWORD cUnauthAttr; + PCRYPT_ATTRIBUTE rgUnauthAttr; + CERT_ID SignerId; + CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm; + void *pvHashEncryptionAuxInfo; +} CMSG_SIGNER_ENCODE_INFO_WITH_CMS, *PCMSG_SIGNER_ENCODE_INFO_WITH_CMS; + +typedef struct _CMSG_SIGNED_ENCODE_INFO_WITH_CMS +{ + DWORD cbSize; + DWORD cSigners; + PCMSG_SIGNER_ENCODE_INFO_WITH_CMS rgSigners; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; + DWORD cCrlEncoded; + PCRL_BLOB rgCrlEncoded; + DWORD cAttrCertEncoded; + PCERT_BLOB rgAttrCertEncoded; +} CMSG_SIGNED_ENCODE_INFO_WITH_CMS, *PCMSG_SIGNED_ENCODE_INFO_WITH_CMS; + +static BOOL CRYPT_IsValidSigner(CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer) +{ + if (!signer->pCertInfo->SerialNumber.cbData) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (!signer->pCertInfo->Issuer.cbData) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (!signer->hCryptProv) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (!CertOIDToAlgId(signer->HashAlgorithm.pszObjId)) + { + SetLastError(CRYPT_E_UNKNOWN_ALGO); + return FALSE; + } + return TRUE; +} + +typedef struct _CSignedEncodeMsg +{ + CryptMsgBase base; +} CSignedEncodeMsg; + +static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) +{ + FIXME("(%p)\n", hCryptMsg); +} + +static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData) +{ + FIXME("(%p, %d, %d, %p, %p)\n", hCryptMsg, dwParamType, dwIndex, pvData, + pcbData); + return FALSE; +} + +static BOOL CSignedEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, + DWORD cbData, BOOL fFinal) +{ + FIXME("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); + return FALSE; +} + +static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, + const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, + PCMSG_STREAM_INFO pStreamInfo) +{ + const CMSG_SIGNED_ENCODE_INFO_WITH_CMS *info = + (const CMSG_SIGNED_ENCODE_INFO_WITH_CMS *)pvMsgEncodeInfo; + DWORD i; + CSignedEncodeMsg *msg; + + if (info->cbSize != sizeof(CMSG_SIGNED_ENCODE_INFO) && + info->cbSize != sizeof(CMSG_SIGNED_ENCODE_INFO_WITH_CMS)) + { + SetLastError(E_INVALIDARG); + return NULL; + } + if (info->cbSize == sizeof(CMSG_SIGNED_ENCODE_INFO_WITH_CMS)) + { + FIXME("CMSG_SIGNED_ENCODE_INFO with CMS fields unsupported\n"); + return NULL; + } + for (i = 0; i < info->cSigners; i++) + if (!CRYPT_IsValidSigner(&info->rgSigners[i])) + return NULL; + msg = CryptMemAlloc(sizeof(CSignedEncodeMsg)); + if (msg) + { + CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, + CSignedEncodeMsg_Close, CSignedEncodeMsg_GetParam, + CSignedEncodeMsg_Update); + } + return msg; +} + static inline const char *MSG_TYPE_STR(DWORD type) { switch (type) @@ -577,6 +690,9 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, pszInnerContentObjID, pStreamInfo); break; case CMSG_SIGNED: + msg = CSignedEncodeMsg_Open(dwFlags, pvMsgEncodeInfo, + pszInnerContentObjID, pStreamInfo); + break; case CMSG_ENVELOPED: FIXME("unimplemented for type %s\n", MSG_TYPE_STR(dwMsgType)); break; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 893f49d..d2d9488 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -989,13 +989,11 @@ static void test_signed_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); signInfo.cbSize = sizeof(signInfo); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); CryptMsgClose(msg); @@ -1009,7 +1007,6 @@ static void test_signed_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); certInfo.SerialNumber.cbData = sizeof(serialNum); @@ -1017,7 +1014,6 @@ static void test_signed_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); certInfo.Issuer.cbData = sizeof(encodedCommonName); @@ -1025,7 +1021,6 @@ static void test_signed_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); @@ -1037,17 +1032,18 @@ static void test_signed_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(!msg && GetLastError() == CRYPT_E_UNKNOWN_ALGO, "Expected CRYPT_E_UNKNOWN_ALGO, got %x\n", GetLastError()); /* The signer's hash algorithm must also be set. */ signer.HashAlgorithm.pszObjId = oid_rsa_md5; SetLastError(0xdeadbeef); - msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, - NULL, NULL); - todo_wine - ok(!msg && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); + /* Crashes in advapi32 in wine, don't do it */ + if (0) { + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, + &signInfo, NULL, NULL); + ok(!msg && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); + } /* The signer's hCryptProv must also be valid. */ ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); @@ -1057,7 +1053,6 @@ static void test_signed_msg_open(void) ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError()); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); CryptMsgClose(msg);

1 0

H. Verbeet : wined3d: Don't modify the blending parameters in state_blend() .
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: be8226593c10da6a4627a9d8c3352b3d452fc069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8226593c10da6a4627a9d8c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jul 23 21:35:15 2007 +0200 wined3d: Don't modify the blending parameters in state_blend(). --- dlls/wined3d/state.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fbd0cd3..3d6101d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -306,12 +306,10 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D glEnable(GL_LINE_SMOOTH); checkGLcall("glEnable(GL_LINE_SMOOTH)"); if(srcBlend != GL_SRC_ALPHA) { - FIXME("WINED3DRS_EDGEANTIALIAS enabled, but incompatible src blending param - what to do?\n"); - srcBlend = GL_SRC_ALPHA; + WARN("WINED3DRS_EDGEANTIALIAS enabled, but unexpected src blending param\n"); } - if(dstBlend != GL_ONE_MINUS_SRC_ALPHA) { - FIXME("WINED3DRS_EDGEANTIALIAS enabled, but incompatible dst blending param - what to do?\n"); - dstBlend = GL_ONE_MINUS_SRC_ALPHA; + if(dstBlend != GL_ONE_MINUS_SRC_ALPHA && dstBlend != GL_ONE) { + WARN("WINED3DRS_EDGEANTIALIAS enabled, but unexpected dst blending param\n"); } } else { glDisable(GL_LINE_SMOOTH);

1 0

H. Verbeet : wined3d: Trace the declaration element type in primitiveDeclarationConvertToStridedData ().
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: fc4c73902ac8dc22ef5f010ae69e846d840965d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4c73902ac8dc22ef5f010ae… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jul 23 21:35:22 2007 +0200 wined3d: Trace the declaration element type in primitiveDeclarationConvertToStridedData(). --- dlls/wined3d/drawprim.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c1484d1..721d913 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -221,10 +221,10 @@ void primitiveDeclarationConvertToStridedData( if (stride_used) { TRACE("Loaded %s array %u [usage=%s, usage_idx=%u, " - "stream=%u, offset=%u, stride=%u, VBO=%u]\n", + "stream=%u, offset=%u, stride=%u, type=%s, VBO=%u]\n", useVertexShaderFunction? "shader": "fixed function", idx, debug_d3ddeclusage(element->Usage), element->UsageIndex, - element->Stream, element->Offset, stride, streamVBO); + element->Stream, element->Offset, stride, debug_d3ddecltype(element->Type), streamVBO); strided->u.input[idx].lpData = data; strided->u.input[idx].dwType = element->Type;

1 0

Paul Vriens : advapi32/service: Handle is checked before servicename.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 83d8cbcc48745b0e5bc8f3e6b3c8d5a27f60f374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d8cbcc48745b0e5bc8f3e6b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jul 23 21:07:55 2007 +0200 advapi32/service: Handle is checked before servicename. --- dlls/advapi32/service.c | 20 ++++++++++---------- dlls/advapi32/tests/service.c | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index eb1c30f..1ecaf70 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2273,16 +2273,16 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName, TRACE("%p %s %p %p\n", hSCManager, debugstr_a(lpServiceName), lpDisplayName, lpcchBuffer); - if (!lpServiceName) + hscm = sc_handle_get_handle_data(hSCManager, SC_HTYPE_MANAGER); + if (!hscm) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - hscm = sc_handle_get_handle_data(hSCManager, SC_HTYPE_MANAGER); - if (!hscm) + if (!lpServiceName) { - SetLastError(ERROR_INVALID_HANDLE); + SetLastError(ERROR_INVALID_ADDRESS); return FALSE; } @@ -2320,16 +2320,16 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, TRACE("%p %s %p %p\n", hSCManager, debugstr_w(lpServiceName), lpDisplayName, lpcchBuffer); - if (!lpServiceName) + hscm = sc_handle_get_handle_data(hSCManager, SC_HTYPE_MANAGER); + if (!hscm) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - hscm = sc_handle_get_handle_data(hSCManager, SC_HTYPE_MANAGER); - if (!hscm) + if (!lpServiceName) { - SetLastError(ERROR_INVALID_HANDLE); + SetLastError(ERROR_INVALID_ADDRESS); return FALSE; } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 61d18dd..adbfe2b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -392,7 +392,6 @@ static void test_get_displayname(void) SetLastError(0xdeadbeef); ret = GetServiceDisplayNameA(NULL, NULL, NULL, &displaysize); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());

1 0

Michael Stefaniuc : winefile: Replace malloc with HeapAlloc.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 11bb71d3d6a34d301291b2d15c849a1381bd7789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bb71d3d6a34d301291b2d15… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 23 22:25:20 2007 +0200 winefile: Replace malloc with HeapAlloc. --- programs/winefile/winefile.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 860ecd2..59d1717 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -319,7 +319,7 @@ static LPCWSTR my_wcsrchr(LPCWSTR str, WCHAR c) /* allocate and initialise a directory entry */ static Entry* alloc_entry(void) { - Entry* entry = (Entry*) malloc(sizeof(Entry)); + Entry* entry = HeapAlloc(GetProcessHeap(), 0, sizeof(Entry)); #ifdef _SHELL_FOLDERS entry->pidl = NULL; @@ -344,7 +344,7 @@ static void free_entry(Entry* entry) IMalloc_Free(Globals.iMalloc, entry->pidl); #endif - free(entry); + HeapFree(GetProcessHeap(), 0, entry); } /* recursively free all child entries */ @@ -1437,7 +1437,7 @@ static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) TCHAR b1[BUFFER_LEN]; static const TCHAR sAsterics[] = {'*', '\0'}; - ChildWnd* child = (ChildWnd*) malloc(sizeof(ChildWnd)); + ChildWnd* child = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd)); Root* root = &child->root; Entry* entry; @@ -1504,7 +1504,7 @@ static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) static void free_child_window(ChildWnd* child) { free_entries(&child->root.entry); - free(child); + HeapFree(GetProcessHeap(), 0, child); } @@ -1927,7 +1927,7 @@ static void CheckForFileInfo(struct PropertiesDialog* dlg, HWND hwnd, LPCTSTR st DWORD dwVersionDataLen = GetFileVersionInfoSize(strFilename, NULL); if (dwVersionDataLen) { - dlg->pVersionData = malloc(dwVersionDataLen); + dlg->pVersionData = HeapAlloc(GetProcessHeap(), 0, dwVersionDataLen); if (GetFileVersionInfo(strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { LPVOID pVal; @@ -2045,7 +2045,7 @@ static INT_PTR CALLBACK PropertiesDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wpa return 1;} case WM_NCDESTROY: - free(dlg->pVersionData); + HeapFree(GetProcessHeap(), 0, dlg->pVersionData); dlg->pVersionData = NULL; break; } @@ -2291,7 +2291,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM child = alloc_child_window(path, NULL, hwnd); if (!create_child_window(child)) - free(child); + HeapFree(GetProcessHeap(), 0, child); } else switch(cmd) { case ID_FILE_EXIT: SendMessage(hwnd, WM_CLOSE, 0, 0); @@ -2305,7 +2305,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM child = alloc_child_window(path, NULL, hwnd); if (!create_child_window(child)) - free(child); + HeapFree(GetProcessHeap(), 0, child); break;} case ID_REFRESH: @@ -2472,7 +2472,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM child = alloc_child_window(path, NULL, hwnd); if (!create_child_window(child)) - free(child); + HeapFree(GetProcessHeap(), 0, child); break;} #endif #ifdef _SHELL_FOLDERS @@ -2487,7 +2487,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM child = alloc_child_window(path, get_path_pidl(path,hwnd), hwnd); if (!create_child_window(child)) - free(child); + HeapFree(GetProcessHeap(), 0, child); break;} #endif #endif @@ -4434,7 +4434,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM ChildWnd* new_child = alloc_child_window(child->path, NULL, hwnd); if (!create_child_window(new_child)) - free(new_child); + HeapFree(GetProcessHeap(), 0, new_child); break;} @@ -4860,7 +4860,7 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) child->pos.rcNormalPosition.bottom = 280; if (!create_child_window(child)) - free(child); + HeapFree(GetProcessHeap(), 0, child); SetWindowPlacement(child->hwnd, &child->pos);

1 0

Michael Stefaniuc : wldap32: Don' t produce unreachable code during conditional compilation. Found bySmatch.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: ca2a6673c994f6040602d0936eecb27d5fbe74f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2a6673c994f6040602d0936… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 23 22:25:50 2007 +0200 wldap32: Don't produce unreachable code during conditional compilation. Found bySmatch. --- dlls/wldap32/init.c | 24 ++++++++++++++++-------- dlls/wldap32/misc.c | 12 ++++++++---- dlls/wldap32/page.c | 5 ++--- dlls/wldap32/value.c | 6 ++++-- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index a1cf79b..08cab81 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -236,8 +236,9 @@ exit: strfreeW( hostnameW ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -288,8 +289,9 @@ exit: strfreeU( url ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -342,8 +344,9 @@ exit: strfreeW( hostnameW ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -395,8 +398,9 @@ exit: strfreeU( url ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -423,8 +427,9 @@ exit: strfreeW( hostnameW ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -475,8 +480,9 @@ exit: strfreeU( url ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -502,8 +508,9 @@ WLDAP32_LDAP * CDECL ldap_sslinitA( PCHAR hostname, ULONG portnumber, int secure strfreeW( hostnameW ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -559,8 +566,9 @@ exit: strfreeU( url ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index 9007faf..9d938c8 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -375,8 +375,9 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_entry( WLDAP32_LDAP *ld, WLDAP32_ if (!ld || !res) return NULL; return ldap_first_entry( ld, res ); -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -401,8 +402,9 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_reference( WLDAP32_LDAP *ld, WLDA if (!ld) return NULL; return ldap_first_reference( ld, res ); -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -536,8 +538,9 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_entry( WLDAP32_LDAP *ld, WLDAP32_L if (!ld || !entry) return NULL; return ldap_next_entry( ld, entry ); -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -565,8 +568,9 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_reference( WLDAP32_LDAP *ld, WLDAP if (!ld || !entry) return NULL; return ldap_next_reference( ld, entry ); -#endif +#else return NULL; +#endif } /*********************************************************************** diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index cc1d0af..a3ed112 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -152,9 +152,7 @@ static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie, ULONG CDECL ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize, struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlW *control ) { - ULONG ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP - TRACE( "(%p, 0x%08x, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); @@ -163,8 +161,9 @@ ULONG CDECL ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize, return create_page_control( pagesize, cookie, critical, control ); +#else + return LDAP_NOT_SUPPORTED; #endif - return ret; } ULONG CDECL ldap_get_next_page( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG pagesize, diff --git a/dlls/wldap32/value.c b/dlls/wldap32/value.c index 1d1155b..61bcfc3 100644 --- a/dlls/wldap32/value.c +++ b/dlls/wldap32/value.c @@ -272,8 +272,9 @@ struct WLDAP32_berval ** CDECL ldap_get_values_lenA( WLDAP32_LDAP *ld, strfreeW( attrW ); return ret; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -314,8 +315,9 @@ struct WLDAP32_berval ** CDECL ldap_get_values_lenW( WLDAP32_LDAP *ld, strfreeU( attrU ); return (struct WLDAP32_berval **)ret; -#endif +#else return NULL; +#endif } /***********************************************************************

1 0

Michael Stefaniuc : winefile: Move some self contained functions to use explicit W functions.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: cee98d2969099851a74c5436250a85c458e3204d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee98d2969099851a74c54362… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 23 22:38:18 2007 +0200 winefile: Move some self contained functions to use explicit W functions. --- programs/winefile/winefile.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 59d1717..85a169f 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -245,28 +245,28 @@ static void display_network_error(HWND hwnd) static VOID WineLicense(HWND Wnd) { - TCHAR cap[20], text[1024]; - LoadString(Globals.hInstance, IDS_LICENSE, text, 1024); - LoadString(Globals.hInstance, IDS_LICENSE_CAPTION, cap, 20); - MessageBox(Wnd, text, cap, MB_ICONINFORMATION | MB_OK); + WCHAR cap[20], text[1024]; + LoadStringW(Globals.hInstance, IDS_LICENSE, text, 1024); + LoadStringW(Globals.hInstance, IDS_LICENSE_CAPTION, cap, 20); + MessageBoxW(Wnd, text, cap, MB_ICONINFORMATION | MB_OK); } static VOID WineWarranty(HWND Wnd) { - TCHAR cap[20], text[1024]; - LoadString(Globals.hInstance, IDS_WARRANTY, text, 1024); - LoadString(Globals.hInstance, IDS_WARRANTY_CAPTION, cap, 20); - MessageBox(Wnd, text, cap, MB_ICONEXCLAMATION | MB_OK); + WCHAR cap[20], text[1024]; + LoadStringW(Globals.hInstance, IDS_WARRANTY, text, 1024); + LoadStringW(Globals.hInstance, IDS_WARRANTY_CAPTION, cap, 20); + MessageBoxW(Wnd, text, cap, MB_ICONEXCLAMATION | MB_OK); } static inline BOOL get_check(HWND hwnd, INT id) { - return BST_CHECKED&SendMessage(GetDlgItem(hwnd, id), BM_GETSTATE, 0, 0); + return BST_CHECKED&SendMessageW(GetDlgItem(hwnd, id), BM_GETSTATE, 0, 0); } static inline INT set_check(HWND hwnd, INT id, BOOL on) { - return SendMessage(GetDlgItem(hwnd, id), BM_SETCHECK, on?BST_CHECKED:BST_UNCHECKED, 0); + return SendMessageW(GetDlgItem(hwnd, id), BM_SETCHECK, on?BST_CHECKED:BST_UNCHECKED, 0); } #ifdef __WINE__

1 0

Jason Edmeades : user32: Correct trace to log calculated values rather than uninitialized ones.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 1c07a97ffd80bb6ada10cd204b14a6f0be310404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c07a97ffd80bb6ada10cd204… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Mon Jul 23 22:59:45 2007 +0100 user32: Correct trace to log calculated values rather than uninitialized ones. --- dlls/user32/mdi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 51dd405..a269292 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -726,10 +726,11 @@ static LONG MDICascade( HWND client, MDICLIENTINFO *ci ) /* walk the list (backwards) and move windows */ for (i = total - 1; i >= 0; i--) { + + MDI_CalcDefaultChildPos(client, n++, pos, delta, NULL); TRACE("move %p to (%d,%d) size [%d,%d]\n", win_array[i], pos[0].x, pos[0].y, pos[1].x, pos[1].y); - MDI_CalcDefaultChildPos(client, n++, pos, delta, NULL); SetWindowPos( win_array[i], 0, pos[0].x, pos[0].y, pos[1].x, pos[1].y, SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); }

1 0

Andrew Talbot : msi: Cast-qual warning fix.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 0e14c29d6616febb30683b830b8a06bd404b2792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e14c29d6616febb30683b830… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jul 23 18:53:19 2007 +0100 msi: Cast-qual warning fix. --- dlls/msi/action.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 953ecb5..953c65b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -630,22 +630,26 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, if (szPackagePath) { LPWSTR p, check, dir; + LPCWSTR file; dir = strdupW(szPackagePath); p = strrchrW(dir, '\\'); if (p) + { *(++p) = 0; + file = szPackagePath + (p - dir); + } else { msi_free(dir); dir = msi_alloc(MAX_PATH*sizeof(WCHAR)); GetCurrentDirectoryW(MAX_PATH, dir); lstrcatW(dir, cszbs); - p = (LPWSTR)szPackagePath; + file = szPackagePath; } msi_free( package->PackagePath ); - package->PackagePath = msi_alloc((lstrlenW(dir) + lstrlenW(p) + 2) * sizeof(WCHAR)); + package->PackagePath = msi_alloc((lstrlenW(dir) + lstrlenW(file) + 1) * sizeof(WCHAR)); if (!package->PackagePath) { msi_free(dir); @@ -653,8 +657,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, } lstrcpyW(package->PackagePath, dir); - lstrcatW(package->PackagePath, cszbs); - lstrcatW(package->PackagePath, p); + lstrcatW(package->PackagePath, file); check = msi_dup_property( package, cszSourceDir ); if (!check)

1 0

appdb/include version.php
by WineHQ 24 Jul '07

24 Jul '07

ChangeSet ID: 31273 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 20:50:19 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix version list to display missing tested release field Patch: http://cvs.winehq.org/patch.py?id=31273 Old revision New revision Changes Path 1.139 1.140 +4 -0 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.139 appdb/include/version.php:1.140 --- appdb/include/version.php:1.139 24 Jul 2007 1:50:19 -0000 +++ appdb/include/version.php 24 Jul 2007 1:50:19 -0000 @@ -1145,6 +1145,10 @@ class version { $oTableCell->SetAlign("center"); $oTableRow->AddCell($oTableCell); + $oTableCell = new TableCell($oVersion->sTestedRelease); + $oTableCell->SetAlign("center"); + $oTableRow->AddCell($oTableCell); + $oTableCell = new TableCell(testData::get_testdata_count_for_versionid($oVersion->iVersionId)); $oTableCell->SetAlign("center"); $oTableRow->AddCell($oTableCell);

1 0