wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Jacek Caban : atl100: Added AtlUpdateRegistryFromResourceD implementation ( based on AtlModuleUpdateRegistryFromResourceD).
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: a97a667670c6028d9466491b9fbef664d0ebcf29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97a667670c6028d9466491b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 11 13:02:14 2012 +0100 atl100: Added AtlUpdateRegistryFromResourceD implementation (based on AtlModuleUpdateRegistryFromResourceD). --- dlls/atl100/atl100.spec | 2 +- dlls/atl100/registrar.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/atlbase.h | 1 + 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 47e3c56..13e043b 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -7,7 +7,7 @@ 17 stub AtlComModuleRegisterClassObjects 20 stub AtlComModuleRevokeClassObjects 22 stub AtlComModuleUnregisterServer -23 stub AtlUpdateRegistryFromResourceD +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) 24 stub AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) diff --git a/dlls/atl100/registrar.c b/dlls/atl100/registrar.c index f9f5b3c..9cad32a 100644 --- a/dlls/atl100/registrar.c +++ b/dlls/atl100/registrar.c @@ -702,3 +702,48 @@ HRESULT WINAPI AtlCreateRegistrar(IRegistrar **ret) *ret = &registrar->IRegistrar_iface; return S_OK; } + +/*********************************************************************** + * AtlUpdateRegistryFromResourceD [atl100.@] + */ +HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE inst, LPCOLESTR res, + BOOL bRegister, struct _ATL_REGMAP_ENTRY *pMapEntries, IRegistrar *pReg) +{ + const struct _ATL_REGMAP_ENTRY *iter; + WCHAR module_name[MAX_PATH]; + IRegistrar *registrar; + HRESULT hres; + + static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; + static const WCHAR registryW[] = {'R','E','G','I','S','T','R','Y',0}; + + if(!GetModuleFileNameW(inst, module_name, MAX_PATH)) { + FIXME("hinst %p: did not get module name\n", inst); + return E_FAIL; + } + + TRACE("%p (%s), %s, %d, %p, %p\n", inst, debugstr_w(module_name), + debugstr_w(res), bRegister, pMapEntries, pReg); + + if(pReg) { + registrar = pReg; + }else { + hres = AtlCreateRegistrar(&registrar); + if(FAILED(hres)) + return hres; + } + + IRegistrar_AddReplacement(registrar, moduleW, module_name); + + for (iter = pMapEntries; iter && iter->szKey; iter++) + IRegistrar_AddReplacement(registrar, iter->szKey, iter->szData); + + if(bRegister) + hres = IRegistrar_ResourceRegisterSz(registrar, module_name, res, registryW); + else + hres = IRegistrar_ResourceUnregisterSz(registrar, module_name, res, registryW); + + if(registrar != pReg) + IRegistrar_Release(registrar); + return hres; +} diff --git a/include/atlbase.h b/include/atlbase.h index 1e48f58..5dd0d5b 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -210,5 +210,6 @@ HRESULT WINAPI AtlModuleTerm(_ATL_MODULEW* pM); HRESULT WINAPI AtlUnadvise(IUnknown *pUnkCP, const IID * iid, DWORD dw); HRESULT WINAPI AtlUnmarshalPtr(IStream *pStream, const IID *iid, IUnknown **ppUnk); HRESULT WINAPI AtlCreateRegistrar(IRegistrar**); +HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE,LPCOLESTR,BOOL,struct _ATL_REGMAP_ENTRY*,IRegistrar*); #endif /* __WINE_ATLBASE_H__ */

1 0

Amine Khaldi : include: Define LIST_ENTRY using the standard offsetof.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 9b4e92a6f153ed4139c8e8c54b6bb0213a66bfc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4e92a6f153ed4139c8e8c54… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:16:46 2012 +0100 include: Define LIST_ENTRY using the standard offsetof. --- include/wine/list.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index 9712603..b4d681f 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -21,6 +21,8 @@ #ifndef __WINE_SERVER_LIST_H #define __WINE_SERVER_LIST_H +#include <stddef.h> + struct list { struct list *next; @@ -227,6 +229,6 @@ static inline void list_move_head( struct list *dst, struct list *src ) /* get pointer to object containing list element */ #undef LIST_ENTRY #define LIST_ENTRY(elem, type, field) \ - ((type *)((char *)(elem) - (size_t)(&((type *)0)->field))) + ((type *)((char *)(elem) - offsetof(type, field))) #endif /* __WINE_SERVER_LIST_H */

1 0

Amine Khaldi : include: Define WINE_RB_ENTRY_VALUE using the standard offsetof.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: d6617e1ec52a64b556b2ae6e6c732c748b05a23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6617e1ec52a64b556b2ae6e6… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:17:41 2012 +0100 include: Define WINE_RB_ENTRY_VALUE using the standard offsetof. --- include/wine/rbtree.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index de29d10..2276e30 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -23,7 +23,7 @@ #define __WINE_WINE_RBTREE_H #define WINE_RB_ENTRY_VALUE(element, type, field) \ - ((type *)((char *)(element) - FIELD_OFFSET(type, field))) + ((type *)((char *)(element) - offsetof(type, field))) struct wine_rb_entry {

1 0

Amine Khaldi : include: Define CONTAINING_RECORD using the standard offsetof.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 649c982e60d312e0a539f0c20d6ee4f2ea37ba40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=649c982e60d312e0a539f0c20… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:15:36 2012 +0100 include: Define CONTAINING_RECORD using the standard offsetof. --- include/winnt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 5f753bc..467b427 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -749,7 +749,7 @@ typedef struct _MEMORY_BASIC_INFORMATION #define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field)) #define CONTAINING_RECORD(address, type, field) \ - ((type *)((PCHAR)(address) - (PCHAR)(&((type *)0)->field))) + ((type *)((PCHAR)(address) - offsetof(type, field))) /* Types */

1 0

Amine Khaldi : include: Define FIELD_OFFSET to the standard offsetof.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: e3dd01a264328b60bf2aa33fdab4be252315e0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3dd01a264328b60bf2aa33fd… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:14:02 2012 +0100 include: Define FIELD_OFFSET to the standard offsetof. --- include/winnt.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 207adaa..5f753bc 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -746,8 +746,7 @@ typedef struct _MEMORY_BASIC_INFORMATION #define UNICODE_STRING_MAX_CHARS 32767 -#define FIELD_OFFSET(type, field) \ - ((LONG)(INT_PTR)&(((type *)0)->field)) +#define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field)) #define CONTAINING_RECORD(address, type, field) \ ((type *)((PCHAR)(address) - (PCHAR)(&((type *)0)->field)))

1 0

Francois Gouget : wined3d: Remove a stray semi-colon from the spec file.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 130cabbca6dd520d589f2e97614bd8b13289fd94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=130cabbca6dd520d589f2e976… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 11 10:52:12 2012 +0100 wined3d: Remove a stray semi-colon from the spec file. --- dlls/wined3d/wined3d.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1d6e2b3..3b39c41 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -154,7 +154,7 @@ @ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_i(ptr long ptr long) -@ cdecl wined3d_device_set_vs_sampler(ptr long ptr); +@ cdecl wined3d_device_set_vs_sampler(ptr long ptr) @ cdecl wined3d_device_setup_fullscreen_window(ptr ptr long long) @ cdecl wined3d_device_show_cursor(ptr long) @ cdecl wined3d_device_uninit_3d(ptr)

1 0

Hans Leidekker : wininet: Don' t perform revocation checks when verifying a certificate.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 59247cf9db6b73023eb8e0215a2a4b08a2e4144c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59247cf9db6b73023eb8e0215… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 11 09:45:55 2012 +0100 wininet: Don't perform revocation checks when verifying a certificate. --- dlls/wininet/netconnection.c | 34 +++------------------------------- 1 files changed, 3 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a792a92..e7a3274 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -222,25 +222,19 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR PCCERT_CHAIN_CONTEXT chain; char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH; char *server_auth[] = { oid_server_auth }; - DWORD err = ERROR_SUCCESS, chainFlags = 0, errors; + DWORD err = ERROR_SUCCESS, errors; static const DWORD supportedErrors = CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN | - CERT_TRUST_IS_OFFLINE_REVOCATION | - CERT_TRUST_REVOCATION_STATUS_UNKNOWN | - CERT_TRUST_IS_REVOKED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE; TRACE("verifying %s\n", debugstr_w(conn->server->name)); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if (!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - chainFlags |= CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT; - - if (!(ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, chainFlags, NULL, &chain))) { + if (!(ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, 0, NULL, &chain))) { TRACE("failed\n"); return GetLastError(); } @@ -249,7 +243,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR do { /* This seems strange, but that's what tests show */ - if(errors & (CERT_TRUST_IS_PARTIAL_CHAIN|CERT_TRUST_IS_OFFLINE_REVOCATION)) { + if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { WARN("ERROR_INTERNET_SEC_CERT_REV_FAILED\n"); err = ERROR_INTERNET_SEC_CERT_REV_FAILED; if(conn->mask_errors) @@ -300,28 +294,6 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; } - if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { - WARN("CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) { - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_NO_REV; - if(!conn->mask_errors) - break; - conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; - } - errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); - } - - if(errors & CERT_TRUST_IS_REVOKED) { - WARN("CERT_TRUST_IS_REVOKED\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) { - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REVOKED; - if(!conn->mask_errors) - break; - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); - } - errors &= ~CERT_TRUST_IS_REVOKED; - } - if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) {

1 0

Andrew Talbot : comctl32: Indentation fix.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 441780b2f1375f3cded9ba6f90718871b839f22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=441780b2f1375f3cded9ba6f9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 10 22:43:34 2012 +0000 comctl32: Indentation fix. --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3b2f747..57cb70c 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1562,7 +1562,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM item) newFirstVisible = item->prevSibling; else if (item->parent != infoPtr->root) newFirstVisible = item->parent; - TREEVIEW_SetFirstVisible(infoPtr, NULL, TRUE); + TREEVIEW_SetFirstVisible(infoPtr, NULL, TRUE); } else newFirstVisible = infoPtr->firstVisible;

1 0

Andrew Talbot : comdlg32: Indentation fix.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 309654f058cba1d6980f0e0903c124f4d0fe103e URL: http://source.winehq.org/git/wine.git/?a=commit;h=309654f058cba1d6980f0e090… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 10 22:43:40 2012 +0000 comdlg32: Indentation fix. --- dlls/comdlg32/filedlg31.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index b52b23e..7f918ff 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -201,11 +201,11 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) while (filter) { scptr = strchrW(filter, ';'); if (scptr) *scptr = 0; - while (*filter == ' ') filter++; + while (*filter == ' ') filter++; TRACE("Using file spec %s\n", debugstr_w(filter)); SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter); if (scptr) *scptr = ';'; - filter = (scptr) ? (scptr + 1) : 0; + filter = (scptr) ? (scptr + 1) : 0; } }

1 0

André Hentschel : shlwapi/tests: Fix two tests on win8 .
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: b74b8776c02f54e50748e74a9267a6edef2c05e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74b8776c02f54e50748e74a9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 10 23:37:13 2012 +0100 shlwapi/tests: Fix two tests on win8. --- dlls/shlwapi/tests/assoc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index a6f5e2d..389a9f5 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -78,7 +78,8 @@ static void test_getstring_bad(void) hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); ok(hr == E_FAIL || - hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || + hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ "Unexpected result : %08x\n", hr); hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); @@ -133,7 +134,8 @@ static void test_getstring_basic(void) hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, &len); ok(hr == S_FALSE || - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* Win9x/NT4 */ + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* Win9x/NT4 */ || + hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ "Unexpected result : %08x\n", hr); if (hr != S_FALSE) {

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012