February 2009 - Wine-Commits

Aric Stewart : msctf: Add sink framework and implement ITfTextEditSink in Context.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 17666004c839a40f1dbc5c98468557091bf3e13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=17666004c839a40f1dbc5c984… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 4 14:48:36 2009 -0600 msctf: Add sink framework and implement ITfTextEditSink in Context. --- dlls/msctf/context.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++-- include/msctf.idl | 14 +++++++ 2 files changed, 117 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index aa8647c..593f0ad 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -32,14 +32,29 @@ #include "shlwapi.h" #include "winerror.h" #include "objbase.h" +#include "olectl.h" #include "wine/unicode.h" +#include "wine/list.h" #include "msctf.h" #include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); +typedef struct tagContextSink { + struct list entry; + union { + /* Context Sinks */ + IUnknown *pIUnknown; + /* ITfContextKeyEventSink *pITfContextKeyEventSink; */ + /* ITfEditTransactionSink *pITfEditTransactionSink; */ + /* ITfStatusSink *pITfStatusSink; */ + ITfTextEditSink *pITfTextEditSink; + /* ITfTextLayoutSink *pITfTextLayoutSink; */ + } interfaces; +} ContextSink; + typedef struct tagContext { const ITfContextVtbl *ContextVtbl; const ITfSourceVtbl *SourceVtbl; @@ -47,6 +62,14 @@ typedef struct tagContext { TfClientId tidOwner; IUnknown *punk; /* possible ITextStoreACP or ITfContextOwnerCompositionSink */ + + /* kept as seperate lists to reduce unnesseccary iterations */ + struct list pContextKeyEventSink; + struct list pEditTransactionSink; + struct list pStatusSink; + struct list pTextEditSink; + struct list pTextLayoutSink; + } Context; static inline Context *impl_from_ITfSourceVtbl(ITfSource *iface) @@ -54,9 +77,48 @@ static inline Context *impl_from_ITfSourceVtbl(ITfSource *iface) return (Context *)((char *)iface - FIELD_OFFSET(Context,SourceVtbl)); } +static void free_sink(ContextSink *sink) +{ + IUnknown_Release(sink->interfaces.pIUnknown); + HeapFree(GetProcessHeap(),0,sink); +} + static void Context_Destructor(Context *This) { + struct list *cursor, *cursor2; TRACE("destroying %p\n", This); + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pContextKeyEventSink) + { + ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pEditTransactionSink) + { + ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pStatusSink) + { + ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pTextEditSink) + { + ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pTextLayoutSink) + { + ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); + list_remove(cursor); + free_sink(sink); + } + HeapFree(GetProcessHeap(),0,This); } @@ -275,16 +337,46 @@ static ULONG WINAPI Source_Release(ITfSource *iface) static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { + ContextSink *es; Context *This = impl_from_ITfSourceVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); + + if (!riid || !punk || !pdwCookie) + return E_INVALIDARG; + + if (IsEqualIID(riid, &IID_ITfTextEditSink)) + { + es = HeapAlloc(GetProcessHeap(),0,sizeof(ContextSink)); + if (!es) + return E_OUTOFMEMORY; + if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&es->interfaces.pITfTextEditSink))) + { + HeapFree(GetProcessHeap(),0,es); + return CONNECT_E_CANNOTCONNECT; + } + list_add_head(&This->pTextEditSink ,&es->entry); + *pdwCookie = (DWORD)es; + } + else + { + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; + } + + TRACE("cookie %x\n",*pdwCookie); + return S_OK; } static WINAPI HRESULT ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { + ContextSink *sink = (ContextSink*)pdwCookie; Context *This = impl_from_ITfSourceVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %x\n",This,pdwCookie); + + list_remove(&sink->entry); + free_sink(sink); + + return S_OK; } static const ITfSourceVtbl Context_SourceVtbl = @@ -315,5 +407,12 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp *ppOut = (ITfContext*)This; /* FIXME */ *pecTextStore = 0xdeaddead; + + list_init(&This->pContextKeyEventSink); + list_init(&This->pEditTransactionSink); + list_init(&This->pStatusSink); + list_init(&This->pTextEditSink); + list_init(&This->pTextLayoutSink); + return S_OK; } diff --git a/include/msctf.idl b/include/msctf.idl index 2b5d2dd..47bec71 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -48,6 +48,7 @@ interface ITfReadOnlyProperty; interface IEnumTfProperties; interface ITfRangeBackup; interface IEnumTfLanguageProfiles; +interface ITfEditRecord; [ object, @@ -401,3 +402,16 @@ interface ITfCategoryMgr : IUnknown [in] REFGUID rguid, [out] BOOL *pfEqual); }; + +[ + object, + uuid(8127d409-ccd3-4683-967a-b43d5b482bf7), + pointer_default(unique) +] +interface ITfTextEditSink : IUnknown +{ + HRESULT OnEndEdit( + [in] ITfContext *pic, + [in] TfEditCookie ecReadOnly, + [in] ITfEditRecord *pEditRecord); +};

1 0

Marcus Meissner : mshtml: Call install_cab_file() with name directly on non-Wine.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 6af99937b61ff66422d2d8cdeb84eac951bf1f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af99937b61ff66422d2d8cde… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 4 19:11:10 2009 +0100 mshtml: Call install_cab_file() with name directly on non-Wine. --- dlls/mshtml/install.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 9bff0e6..df8c8be 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -193,18 +193,21 @@ static BOOL install_from_unix_file(const char *file_name) close(fd); - if(!wine_get_dos_file_name) { + if(!wine_get_dos_file_name) wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32W), "wine_get_dos_file_name"); - if(!wine_get_dos_file_name) { - ERR("Could not get wine_get_dos_file_name function.\n"); - return FALSE; - } - } - dos_file_name = wine_get_dos_file_name(file_name); - if(!dos_file_name) { - ERR("Could not get dos file name of %s\n", debugstr_a(file_name)); - return FALSE; + if(wine_get_dos_file_name) { /* Wine UNIX mode */ + dos_file_name = wine_get_dos_file_name(file_name); + if(!dos_file_name) { + ERR("Could not get dos file name of %s\n", debugstr_a(file_name)); + return FALSE; + } + } else { /* Windows mode */ + UINT res; + WARN("Could not get wine_get_dos_file_name function, calling install_cab directly.\n"); + res = MultiByteToWideChar( CP_ACP, 0, file_name, -1, 0, 0); + dos_file_name = heap_alloc (res*sizeof(WCHAR)); + MultiByteToWideChar( CP_ACP, 0, file_name, -1, dos_file_name, res); } ret = install_cab(dos_file_name);

1 0

Gerald Pfeifer : wnaspi32: Invoke ASPI_SendASPICommand() on non-Linux platforms, too.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 1420ef9c4b0f32ce5ea158594cabad847d360b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1420ef9c4b0f32ce5ea158594… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Feb 4 11:47:09 2009 +0100 wnaspi32: Invoke ASPI_SendASPICommand() on non-Linux platforms, too. --- dlls/wnaspi32/winaspi16.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wnaspi32/winaspi16.c b/dlls/wnaspi32/winaspi16.c index 094b923..7429780 100644 --- a/dlls/wnaspi32/winaspi16.c +++ b/dlls/wnaspi32/winaspi16.c @@ -440,11 +440,7 @@ adapter name */ */ WORD WINAPI SendASPICommand16(SEGPTR segptr_srb) { -#ifdef linux return ASPI_SendASPICommand(segptr_srb, ASPI_WIN16); -#else - return 0; -#endif }

1 0

Juan Lang : mapi32: Fix failing tests on some Win9x versions.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: dd52e52df8344a6858de7f7120c21e128d938b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd52e52df8344a6858de7f712… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 4 14:39:20 2009 -0800 mapi32: Fix failing tests on some Win9x versions. --- dlls/mapi32/tests/prop.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 92198a9..8bee893 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -627,7 +627,8 @@ static void test_LPropCompareProp(void) } iRet = pLPropCompareProp(&pvLeft, &pvRight); - ok(iRet == iExp, "pt %d (%d,%d): expected %d, got %d\n", ptTypes[i], + ok(iRet == iExp || broken(iRet == 0) /* Win9x */, + "pt %d (%d,%d): expected %d, got %d\n", ptTypes[i], LPCProp_Results[j].lVal, LPCProp_Results[j].rVal, iExp, iRet); } }

1 0

Juan Lang : advapi32: Support the computer name as an account name in LookupAccountNameW.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: fc5ea773e5f78049a7fa6f989d9f79a0d5933c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5ea773e5f78049a7fa6f989… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 4 13:20:39 2009 -0800 advapi32: Support the computer name as an account name in LookupAccountNameW. --- dlls/advapi32/security.c | 179 ++++++++++++++++++++++++++-------------- dlls/advapi32/tests/security.c | 1 - 2 files changed, 118 insertions(+), 62 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ee06270..d62bb23 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2531,17 +2531,119 @@ LookupAccountNameA( } /****************************************************************************** + * lookup_user_account_name + */ +static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDomainName, + LPDWORD cchReferencedDomainName, PSID_NAME_USE peUse ) +{ + /* Default implementation: Always return a default SID */ + SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; + BOOL ret; + PSID pSid; + static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + DWORD nameLen; + LPCWSTR domainName; + + ret = AllocateAndInitializeSid(&identifierAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &pSid); + + if (!ret) + return FALSE; + + if (!RtlValidSid(pSid)) + { + FreeSid(pSid); + return FALSE; + } + + if (Sid != NULL && (*cbSid >= GetLengthSid(pSid))) + CopySid(*cbSid, Sid, pSid); + if (*cbSid < GetLengthSid(pSid)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + *cbSid = GetLengthSid(pSid); + + domainName = dm; + nameLen = strlenW(domainName); + + if (*cchReferencedDomainName <= nameLen || !ret) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + nameLen += 1; + ret = FALSE; + } + else if (ReferencedDomainName) + strcpyW(ReferencedDomainName, domainName); + + *cchReferencedDomainName = nameLen; + + if (ret) + *peUse = SidTypeUser; + + FreeSid(pSid); + + return ret; +} + +/****************************************************************************** + * lookup_computer_account_name + */ +static BOOL lookup_computer_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDomainName, + LPDWORD cchReferencedDomainName, PSID_NAME_USE peUse ) +{ + MAX_SID local; + BOOL ret; + static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + DWORD nameLen; + LPCWSTR domainName; + + if ((ret = ADVAPI_GetComputerSid(&local))) + { + if (Sid != NULL && (*cbSid >= GetLengthSid(&local))) + CopySid(*cbSid, Sid, &local); + if (*cbSid < GetLengthSid(&local)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + *cbSid = GetLengthSid(&local); + } + + domainName = dm; + nameLen = strlenW(domainName); + + if (*cchReferencedDomainName <= nameLen || !ret) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + nameLen += 1; + ret = FALSE; + } + else if (ReferencedDomainName) + strcpyW(ReferencedDomainName, domainName); + + *cchReferencedDomainName = nameLen; + + if (ret) + *peUse = SidTypeDomain; + + return ret; +} + +/****************************************************************************** * LookupAccountNameW [ADVAPI32.@] */ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSID Sid, LPDWORD cbSid, LPWSTR ReferencedDomainName, LPDWORD cchReferencedDomainName, PSID_NAME_USE peUse ) { - /* Default implementation: Always return a default SID */ - SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; BOOL ret; PSID pSid; - static const WCHAR dm[] = {'D','O','M','A','I','N',0}; unsigned int i; DWORD nameLen; LPWSTR userName = NULL; @@ -2621,69 +2723,24 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI userName = HeapAlloc(GetProcessHeap(), 0, nameLen); - ret = GetUserNameW(userName, &nameLen); - - if (ret && strcmpW(lpAccountName, userName) != 0) + if (GetUserNameW(userName, &nameLen) && !strcmpW(lpAccountName, userName)) + ret = lookup_user_account_name(Sid, cbSid, ReferencedDomainName, + cchReferencedDomainName, peUse); + else { - SetLastError(ERROR_NONE_MAPPED); - ret = FALSE; + nameLen = UNLEN + 1; + if (GetComputerNameW(userName, &nameLen) && !strcmpW(lpAccountName, userName)) + ret = lookup_computer_account_name(Sid, cbSid, ReferencedDomainName, + cchReferencedDomainName, peUse); + else + { + SetLastError(ERROR_NONE_MAPPED); + ret = FALSE; + } } HeapFree(GetProcessHeap(), 0, userName); - if (!ret) - { - return ret; - } - - ret = AllocateAndInitializeSid(&identifierAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, - &pSid); - - if (!ret) - return FALSE; - - if (!RtlValidSid(pSid)) - { - FreeSid(pSid); - return FALSE; - } - - if (Sid != NULL && (*cbSid >= GetLengthSid(pSid))) - CopySid(*cbSid, Sid, pSid); - if (*cbSid < GetLengthSid(pSid)) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - ret = FALSE; - } - *cbSid = GetLengthSid(pSid); - - domainName = dm; - nameLen = strlenW(domainName); - - if (*cchReferencedDomainName <= nameLen || !ret) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - nameLen += 1; - ret = FALSE; - } - else if (ReferencedDomainName) - { - strcpyW(ReferencedDomainName, domainName); - } - - *cchReferencedDomainName = nameLen; - - if (ret) - { - *peUse = SidTypeUser; - } - - FreeSid(pSid); - return ret; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8ca4d54..a681cb1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1883,7 +1883,6 @@ static void test_LookupAccountName(void) sid_size = 0; domain_size = 0; ret = LookupAccountNameA(NULL, computer_name, NULL, &sid_size, NULL, &domain_size, &sid_use); - todo_wine ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || broken(GetLastError() == ERROR_TRUSTED_DOMAIN_FAILURE) || broken(GetLastError() == ERROR_TRUSTED_RELATIONSHIP_FAILURE)),

1 0

Juan Lang : advapi32: Test LookupAccountName with the computer name as the account name.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 0b32bdc4b46d0652c8043205458f5dec936f1bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b32bdc4b46d0652c80432054… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 4 13:19:51 2009 -0800 advapi32: Test LookupAccountName with the computer name as the account name. --- dlls/advapi32/tests/security.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 260ebf5..8ca4d54 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1705,6 +1705,7 @@ static void test_LookupAccountName(void) DWORD sid_size, domain_size, user_size; DWORD sid_save, domain_save; CHAR user_name[UNLEN + 1]; + CHAR computer_name[UNLEN + 1]; SID_NAME_USE sid_use; LPSTR domain, account, sid_dom; PSID psid; @@ -1875,6 +1876,28 @@ static void test_LookupAccountName(void) "Expected RPC_S_SERVER_UNAVAILABLE or RPC_S_INVALID_NET_ADDR, got %d\n", GetLastError()); ok(sid_size == 0, "Expected 0, got %d\n", sid_size); ok(domain_size == 0, "Expected 0, got %d\n", domain_size); + + /* try with the computer name as the account name */ + domain_size = sizeof(computer_name); + GetComputerNameA(computer_name, &domain_size); + sid_size = 0; + domain_size = 0; + ret = LookupAccountNameA(NULL, computer_name, NULL, &sid_size, NULL, &domain_size, &sid_use); + todo_wine + ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || + broken(GetLastError() == ERROR_TRUSTED_DOMAIN_FAILURE) || + broken(GetLastError() == ERROR_TRUSTED_RELATIONSHIP_FAILURE)), + "LookupAccountNameA failed: %d\n", GetLastError()); + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + psid = HeapAlloc(GetProcessHeap(), 0, sid_size); + domain = HeapAlloc(GetProcessHeap(), 0, domain_size); + ret = LookupAccountNameA(NULL, computer_name, psid, &sid_size, domain, &domain_size, &sid_use); + ok(ret, "LookupAccountNameA failed: %d\n", GetLastError()); + ok(sid_use == SidTypeDomain, "expected SidTypeDomain, got %d\n", sid_use); + HeapFree(GetProcessHeap(), 0, domain); + HeapFree(GetProcessHeap(), 0, psid); + } } static void test_security_descriptor(void)

1 0

Paul Vriens : fusion/tests: Do the conversion before testing.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: c07b5fc5d9797db2581cd64ec076cd5f47523835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07b5fc5d9797db2581cd64ec… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Feb 5 10:05:11 2009 +0100 fusion/tests: Do the conversion before testing. --- dlls/fusion/tests/fusion.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/fusion/tests/fusion.c b/dlls/fusion/tests/fusion.c index 878a18e..b285ba0 100644 --- a/dlls/fusion/tests/fusion.c +++ b/dlls/fusion/tests/fusion.c @@ -34,12 +34,9 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH]; #define ok_w2(format, szString1, szString2) \ \ - if (lstrcmpW(szString1, szString2) != 0) \ - { \ - WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ - WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ - ok(0, format, string1, string2); \ - } + WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ + WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ + ok(!lstrcmpA(string1, string2), format, string1, string2) static BOOL init_functionpointers(void) {

1 0

Michael Stefaniuc : winhttp: Remove superfluous pointer casts.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 7dbba8c335c026e5f84233d97e25f3524152376d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dbba8c335c026e5f84233d97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 5 09:53:49 2009 +0100 winhttp: Remove superfluous pointer casts. --- dlls/winhttp/net.c | 2 +- dlls/winhttp/request.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2e37b1c..201a1cb 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -607,7 +607,7 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in * return FALSE; } memset( sa, 0, sizeof(struct sockaddr_in) ); - memcpy( (char *)&sa->sin_addr, he->h_addr, he->h_length ); + memcpy( &sa->sin_addr, he->h_addr, he->h_length ); sa->sin_family = he->h_addrtype; sa->sin_port = htons( port ); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 29969ba..ddfac13 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -566,7 +566,7 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID } else if (buffer) { - for (p = headers, q = (WCHAR *)buffer; *p; p++, q++) + for (p = headers, q = buffer; *p; p++, q++) { if (*p != '\r') *q = *p; else @@ -576,7 +576,7 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID } } *q = 0; - TRACE("returning data: %s\n", debugstr_wn((WCHAR *)buffer, len)); + TRACE("returning data: %s\n", debugstr_wn(buffer, len)); ret = TRUE; } *buflen = len * sizeof(WCHAR);

1 0

Michael Stefaniuc : user32/tests: Remove superfluous pointer casts.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: e89386a59ea4c2a39e2ca9a9b185712883542893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89386a59ea4c2a39e2ca9a9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 5 09:53:39 2009 +0100 user32/tests: Remove superfluous pointer casts. The (MENUITEMINFO)->dwTypeData is really a string ... the joys of the Hungarian notation. --- dlls/user32/tests/class.c | 14 ++++------ dlls/user32/tests/dde.c | 2 +- dlls/user32/tests/listbox.c | 8 +++--- dlls/user32/tests/menu.c | 16 ++++++------ dlls/user32/tests/msg.c | 56 ++++++++++++++++++++----------------------- dlls/user32/tests/win.c | 30 +++++++++++----------- 6 files changed, 60 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e89386a59ea4c2a39e2ca…

1 0

Michael Stefaniuc : include: Change some DWORD to DWORD_PTR in msacmdrv.h.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 15229de500687dc9596d81f8fd189ce842a390f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15229de500687dc9596d81f8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 5 09:53:04 2009 +0100 include: Change some DWORD to DWORD_PTR in msacmdrv.h. The changes are for Win64 compatibility and match the DDK. --- include/msacmdrv.h | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/msacmdrv.h b/include/msacmdrv.h index 46e8ba5..6436404 100644 --- a/include/msacmdrv.h +++ b/include/msacmdrv.h @@ -100,40 +100,40 @@ typedef struct _ACMDRVSTREAMINSTANCE PWAVEFORMATEX pwfxSrc; PWAVEFORMATEX pwfxDst; PWAVEFILTER pwfltr; - DWORD dwCallback; - DWORD dwInstance; + DWORD_PTR dwCallback; + DWORD_PTR dwInstance; DWORD fdwOpen; DWORD fdwDriver; - DWORD dwDriver; + DWORD_PTR dwDriver; HACMSTREAM has; } ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE; typedef struct _ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER; typedef struct _ACMDRVSTREAMHEADER { - DWORD cbStruct; - DWORD fdwStatus; - DWORD dwUser; - LPBYTE pbSrc; - DWORD cbSrcLength; - DWORD cbSrcLengthUsed; - DWORD dwSrcUser; - LPBYTE pbDst; - DWORD cbDstLength; - DWORD cbDstLengthUsed; - DWORD dwDstUser; - - DWORD fdwConvert; + DWORD cbStruct; + DWORD fdwStatus; + DWORD_PTR dwUser; + LPBYTE pbSrc; + DWORD cbSrcLength; + DWORD cbSrcLengthUsed; + DWORD_PTR dwSrcUser; + LPBYTE pbDst; + DWORD cbDstLength; + DWORD cbDstLengthUsed; + DWORD_PTR dwDstUser; + + DWORD fdwConvert; PACMDRVSTREAMHEADER *padshNext; - DWORD fdwDriver; - DWORD dwDriver; + DWORD fdwDriver; + DWORD_PTR dwDriver; /* Internal fields for ACM */ - DWORD fdwPrepared; - DWORD dwPrepared; - LPBYTE pbPreparedSrc; - DWORD cbPreparedSrcLength; - LPBYTE pbPreparedDst; - DWORD cbPreparedDstLength; + DWORD fdwPrepared; + DWORD_PTR dwPrepared; + LPBYTE pbPreparedSrc; + DWORD cbPreparedSrcLength; + LPBYTE pbPreparedDst; + DWORD cbPreparedDstLength; } ACMDRVSTREAMHEADER; typedef struct _ACMDRVSTREAMSIZE

1 0