October 2013 - Wine-Commits

Jacek Caban : crypt32: Moved store context functions to vtbl.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 52b2add3957aeee0576a15c422bf5a4daa6d1aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=52b2add3957aeee0576a15c42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 14 14:46:16 2013 +0200 crypt32: Moved store context functions to vtbl. --- dlls/crypt32/collectionstore.c | 69 +++++++++++++++++++++------------------- dlls/crypt32/crypt32_private.h | 7 ++-- dlls/crypt32/ctl.c | 6 ++-- dlls/crypt32/provstore.c | 66 ++++++++++++++++++++------------------ dlls/crypt32/store.c | 54 +++++++++++++++++-------------- 5 files changed, 106 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52b2add3957aeee0576a1…

1 0

Jacek Caban : crypt32: Moved store release implementation to vtbl.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 2256a728fec06bf1585fbf1e39da49cb6e4710e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2256a728fec06bf1585fbf1e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 14 14:45:43 2013 +0200 crypt32: Moved store release implementation to vtbl. --- dlls/crypt32/collectionstore.c | 19 +++++++++++++------ dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/provstore.c | 21 +++++++++++++++------ dlls/crypt32/store.c | 34 +++++++++++++++++++--------------- 4 files changed, 48 insertions(+), 28 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 2278c4d..b64f089 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -46,23 +46,30 @@ static void Collection_addref(WINECRYPT_CERTSTORE *store) TRACE("ref = %d\n", ref); } -static void Collection_closeStore(WINECRYPT_CERTSTORE *store, DWORD dwFlags) +static DWORD Collection_release(WINECRYPT_CERTSTORE *store, DWORD flags) { WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; WINE_STORE_LIST_ENTRY *entry, *next; + LONG ref; - TRACE("(%p, %08x)\n", store, dwFlags); + if(flags) + FIXME("Unimplemented flags %x\n", flags); - LIST_FOR_EACH_ENTRY_SAFE(entry, next, &cs->stores, WINE_STORE_LIST_ENTRY, - entry) + ref = InterlockedDecrement(&cs->hdr.ref); + TRACE("(%p) ref=%d\n", store, ref); + if(ref) + return ERROR_SUCCESS; + + LIST_FOR_EACH_ENTRY_SAFE(entry, next, &cs->stores, WINE_STORE_LIST_ENTRY, entry) { TRACE("closing %p\n", entry); - CertCloseStore(entry->store, dwFlags); + entry->store->vtbl->release(entry->store, flags); CryptMemFree(entry); } cs->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&cs->cs); CRYPT_FreeStore(store); + return ERROR_SUCCESS; } static void *CRYPT_CollectionCreateContextFromChild(WINE_COLLECTIONSTORE *store, @@ -484,7 +491,7 @@ static BOOL Collection_control(WINECRYPT_CERTSTORE *cert_store, DWORD dwFlags, static const store_vtbl_t CollectionStoreVtbl = { Collection_addref, - Collection_closeStore, + Collection_release, Collection_control }; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index c939c5d..235db90 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -247,7 +247,7 @@ typedef struct _CONTEXT_PROPERTY_LIST CONTEXT_PROPERTY_LIST; typedef struct { void (*addref)(struct WINE_CRYPTCERTSTORE*); - void (*closeStore)(struct WINE_CRYPTCERTSTORE*,DWORD); + DWORD (*release)(struct WINE_CRYPTCERTSTORE*,DWORD); BOOL (*control)(struct WINE_CRYPTCERTSTORE*,DWORD,DWORD,void const*); } store_vtbl_t; diff --git a/dlls/crypt32/provstore.c b/dlls/crypt32/provstore.c index 06cfbc8..52f6a0b 100644 --- a/dlls/crypt32/provstore.c +++ b/dlls/crypt32/provstore.c @@ -47,17 +47,26 @@ static void ProvStore_addref(WINECRYPT_CERTSTORE *store) TRACE("ref = %d\n", ref); } -static void ProvStore_closeStore(WINECRYPT_CERTSTORE *cert_store, DWORD dwFlags) +static DWORD ProvStore_release(WINECRYPT_CERTSTORE *cert_store, DWORD flags) { WINE_PROVIDERSTORE *store = (WINE_PROVIDERSTORE*)cert_store; + LONG ref; - TRACE("(%p, %08x)\n", store, dwFlags); + if(flags) + FIXME("Unimplemented flags %x\n", flags); + + ref = InterlockedDecrement(&store->hdr.ref); + TRACE("(%p) ref=%d\n", store, ref); + + if(ref) + return ERROR_SUCCESS; if (store->provCloseStore) - store->provCloseStore(store->hStoreProv, dwFlags); + store->provCloseStore(store->hStoreProv, flags); if (!(store->dwStoreProvFlags & CERT_STORE_PROV_EXTERNAL_FLAG)) - CertCloseStore(store->memStore, dwFlags); - CRYPT_FreeStore((WINECRYPT_CERTSTORE*)store); + store->memStore->vtbl->release(store->memStore, flags); + CRYPT_FreeStore(&store->hdr); + return ERROR_SUCCESS; } static BOOL CRYPT_ProvAddCert(WINECRYPT_CERTSTORE *store, void *cert, @@ -269,7 +278,7 @@ static BOOL ProvStore_control(WINECRYPT_CERTSTORE *cert_store, DWORD dwFlags, DW static const store_vtbl_t ProvStoreVtbl = { ProvStore_addref, - ProvStore_closeStore, + ProvStore_release, ProvStore_control }; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 9623094..a584ec2 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -108,6 +108,7 @@ void CRYPT_FreeStore(WINECRYPT_CERTSTORE *store) { if (store->properties) ContextPropertyList_Free(store->properties); + store->dwMagic = 0; CryptMemFree(store); } @@ -290,18 +291,24 @@ static void MemStore_addref(WINECRYPT_CERTSTORE *store) TRACE("ref = %d\n", ref); } -static void MemStore_closeStore(WINECRYPT_CERTSTORE *cert_store, DWORD dwFlags) +static DWORD MemStore_release(WINECRYPT_CERTSTORE *cert_store, DWORD flags) { WINE_MEMSTORE *store = (WINE_MEMSTORE*)cert_store; + LONG ref; - TRACE("(%p, %08x)\n", store, dwFlags); - if (dwFlags) - FIXME("Unimplemented flags: %08x\n", dwFlags); + if(flags) + FIXME("Unimplemented flags %x\n", flags); + + ref = InterlockedDecrement(&store->hdr.ref); + TRACE("(%p) ref=%d\n", store, ref); + if(ref) + return ERROR_SUCCESS; ContextList_Free(store->certs); ContextList_Free(store->crls); ContextList_Free(store->ctls); - CRYPT_FreeStore((WINECRYPT_CERTSTORE*)store); + CRYPT_FreeStore(&store->hdr); + return ERROR_SUCCESS; } static BOOL MemStore_control(WINECRYPT_CERTSTORE *store, DWORD dwFlags, @@ -313,7 +320,7 @@ static BOOL MemStore_control(WINECRYPT_CERTSTORE *store, DWORD dwFlags, static const store_vtbl_t MemStoreVtbl = { MemStore_addref, - MemStore_closeStore, + MemStore_release, MemStore_control }; @@ -1227,6 +1234,7 @@ HCERTSTORE WINAPI CertDuplicateStore(HCERTSTORE hCertStore) BOOL WINAPI CertCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { WINECRYPT_CERTSTORE *hcs = hCertStore; + DWORD res; TRACE("(%p, %08x)\n", hCertStore, dwFlags); @@ -1236,16 +1244,12 @@ BOOL WINAPI CertCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) if ( hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC ) return FALSE; - if (hcs->ref <= 0) - ERR("%p's ref count is %d\n", hcs, hcs->ref); - if (InterlockedDecrement(&hcs->ref) == 0) - { - TRACE("%p's ref count is 0, freeing\n", hcs); - hcs->dwMagic = 0; - hcs->vtbl->closeStore(hcs, dwFlags); + res = hcs->vtbl->release(hcs, dwFlags); + if (res != ERROR_SUCCESS) { + SetLastError(res); + return FALSE; } - else - TRACE("%p's ref count is %d\n", hcs, hcs->ref); + return TRUE; }

1 0

Alexandre Julliard : jscript: Use the official Windows constant for MAXLONGLONG.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: a804cc711b773234ce74c27ae4aab5e4614b38ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a804cc711b773234ce74c27ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 15:14:16 2013 +0200 jscript: Use the official Windows constant for MAXLONGLONG. --- dlls/jscript/global.c | 6 ++---- dlls/jscript/lex.c | 6 ++---- include/winnt.h | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 0c0aa29..64546bd 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -#define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff) - static const WCHAR NaNW[] = {'N','a','N',0}; static const WCHAR InfinityW[] = {'I','n','f','i','n','i','t','y',0}; static const WCHAR ArrayW[] = {'A','r','r','a','y',0}; @@ -554,7 +552,7 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag while(isdigitW(*str)) { hlp = d*10 + *(str++) - '0'; - if(d>LONGLONG_MAX/10 || hlp<0) { + if(d>MAXLONGLONG/10 || hlp<0) { exp++; break; } @@ -573,7 +571,7 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag while(isdigitW(*str)) { hlp = d*10 + *(str++) - '0'; - if(d>LONGLONG_MAX/10 || hlp<0) + if(d>MAXLONGLONG/10 || hlp<0) break; d = hlp; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 54c8fcf..8b881f3 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -#define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff) - static const WCHAR breakW[] = {'b','r','e','a','k',0}; static const WCHAR caseW[] = {'c','a','s','e',0}; static const WCHAR catchW[] = {'c','a','t','c','h',0}; @@ -397,7 +395,7 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li d = int_part; while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { hlp = d*10 + *(ctx->ptr++) - '0'; - if(d>LONGLONG_MAX/10 || hlp<0) { + if(d>MAXLONGLONG/10 || hlp<0) { exp++; break; } @@ -414,7 +412,7 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { hlp = d*10 + *(ctx->ptr++) - '0'; - if(d>LONGLONG_MAX/10 || hlp<0) + if(d>MAXLONGLONG/10 || hlp<0) break; d = hlp; diff --git a/include/winnt.h b/include/winnt.h index 293e05d..3e19225 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -742,6 +742,7 @@ typedef struct _MEMORY_BASIC_INFORMATION #define MAXBYTE 0xff #define MAXWORD 0xffff #define MAXDWORD 0xffffffff +#define MAXLONGLONG (((LONGLONG)0x7fffffff << 32) | 0xffffffff) #define UNICODE_STRING_MAX_CHARS 32767

1 0

Hans Leidekker : wldap32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 0994781df6182b21e0b20fad2148de5c7d8d21a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0994781df6182b21e0b20fad2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 14 10:24:59 2013 +0200 wldap32/tests: Compile with -D__WINESRC__. --- dlls/wldap32/tests/Makefile.in | 1 - dlls/wldap32/tests/parse.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/tests/Makefile.in b/dlls/wldap32/tests/Makefile.in index b0b199f..5b1d2f1 100644 --- a/dlls/wldap32/tests/Makefile.in +++ b/dlls/wldap32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = wldap32.dll IMPORTS = wldap32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ parse.c diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 4cf8564..88a7e20 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -51,13 +51,13 @@ static void test_ldap_parse_sort_control( LDAP *ld ) if (ret == LDAP_SERVER_DOWN) { skip("test server can't be reached\n"); - ldap_control_free( sort ); + ldap_control_freeA( sort ); return; } ok( !ret, "ldap_search_ext_sA failed 0x%x\n", ret ); ok( res != NULL, "expected res != NULL\n" ); - if (GetProcAddress(GetModuleHandle("wldap32.dll"), "ber_init")) + if (GetProcAddress(GetModuleHandleA("wldap32.dll"), "ber_init")) { ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed 0x%x\n", ret ); @@ -82,8 +82,8 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ret = ldap_parse_sort_controlA( ld, server_ctrls, &result, NULL ); ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed 0x%x\n", ret ); - ldap_control_free( sort ); - ldap_controls_free( server_ctrls ); + ldap_control_freeA( sort ); + ldap_controls_freeA( server_ctrls ); } static void test_ldap_search_extW( LDAP *ld )

1 0

Jacek Caban : crypt32: Added addref to store vtbl and use it instead of directly accessing ref.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: b3b1135d8433e0fb2c580668fd09197e326adb4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b1135d8433e0fb2c580668f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 14 14:45:28 2013 +0200 crypt32: Added addref to store vtbl and use it instead of directly accessing ref. --- dlls/crypt32/collectionstore.c | 7 +++++++ dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/provstore.c | 7 +++++++ dlls/crypt32/rootstore.c | 2 +- dlls/crypt32/store.c | 9 ++++++++- 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index c60ca20..2278c4d 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -40,6 +40,12 @@ typedef struct _WINE_COLLECTIONSTORE struct list stores; } WINE_COLLECTIONSTORE; +static void Collection_addref(WINECRYPT_CERTSTORE *store) +{ + LONG ref = InterlockedIncrement(&store->ref); + TRACE("ref = %d\n", ref); +} + static void Collection_closeStore(WINECRYPT_CERTSTORE *store, DWORD dwFlags) { WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; @@ -477,6 +483,7 @@ static BOOL Collection_control(WINECRYPT_CERTSTORE *cert_store, DWORD dwFlags, } static const store_vtbl_t CollectionStoreVtbl = { + Collection_addref, Collection_closeStore, Collection_control }; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 3fa5d98..c939c5d 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -246,6 +246,7 @@ typedef struct _CONTEXT_PROPERTY_LIST CONTEXT_PROPERTY_LIST; */ typedef struct { + void (*addref)(struct WINE_CRYPTCERTSTORE*); void (*closeStore)(struct WINE_CRYPTCERTSTORE*,DWORD); BOOL (*control)(struct WINE_CRYPTCERTSTORE*,DWORD,DWORD,void const*); } store_vtbl_t; diff --git a/dlls/crypt32/provstore.c b/dlls/crypt32/provstore.c index 38f0eab..06cfbc8 100644 --- a/dlls/crypt32/provstore.c +++ b/dlls/crypt32/provstore.c @@ -41,6 +41,12 @@ typedef struct _WINE_PROVIDERSTORE PFN_CERT_STORE_PROV_CONTROL provControl; } WINE_PROVIDERSTORE; +static void ProvStore_addref(WINECRYPT_CERTSTORE *store) +{ + LONG ref = InterlockedIncrement(&store->ref); + TRACE("ref = %d\n", ref); +} + static void ProvStore_closeStore(WINECRYPT_CERTSTORE *cert_store, DWORD dwFlags) { WINE_PROVIDERSTORE *store = (WINE_PROVIDERSTORE*)cert_store; @@ -262,6 +268,7 @@ static BOOL ProvStore_control(WINECRYPT_CERTSTORE *cert_store, DWORD dwFlags, DW } static const store_vtbl_t ProvStoreVtbl = { + ProvStore_addref, ProvStore_closeStore, ProvStore_control }; diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index ef0a0f7..efe8340 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -832,7 +832,7 @@ WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) if (CRYPT_rootStore != root) CertCloseStore(root, 0); } - CertDuplicateStore(CRYPT_rootStore); + CRYPT_rootStore->vtbl->addref(CRYPT_rootStore); return CRYPT_rootStore; } diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 0042d92..9623094 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -284,6 +284,12 @@ static BOOL CRYPT_MemDeleteCtl(WINECRYPT_CERTSTORE *store, void *pCtlContext) return ret; } +static void MemStore_addref(WINECRYPT_CERTSTORE *store) +{ + LONG ref = InterlockedIncrement(&store->ref); + TRACE("ref = %d\n", ref); +} + static void MemStore_closeStore(WINECRYPT_CERTSTORE *cert_store, DWORD dwFlags) { WINE_MEMSTORE *store = (WINE_MEMSTORE*)cert_store; @@ -306,6 +312,7 @@ static BOOL MemStore_control(WINECRYPT_CERTSTORE *store, DWORD dwFlags, } static const store_vtbl_t MemStoreVtbl = { + MemStore_addref, MemStore_closeStore, MemStore_control }; @@ -1213,7 +1220,7 @@ HCERTSTORE WINAPI CertDuplicateStore(HCERTSTORE hCertStore) TRACE("(%p)\n", hCertStore); if (hcs && hcs->dwMagic == WINE_CRYPTCERTSTORE_MAGIC) - InterlockedIncrement(&hcs->ref); + hcs->vtbl->addref(hcs); return hCertStore; }

1 0

Hans Leidekker : mscms/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: fcd4527ea998b4b8b6823c6e0a29e5707d555b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd4527ea998b4b8b6823c6e0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 14 10:24:38 2013 +0200 mscms/tests: Compile with -D__WINESRC__. --- dlls/mscms/tests/Makefile.in | 1 - dlls/mscms/tests/profile.c | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/mscms/tests/Makefile.in b/dlls/mscms/tests/Makefile.in index 9387a1a..b73061f 100644 --- a/dlls/mscms/tests/Makefile.in +++ b/dlls/mscms/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = mscms.dll IMPORTS = advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ profile.c diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 337b67a..cfaf2ba 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -59,7 +59,7 @@ static BOOL (WINAPI *pSetStandardColorSpaceProfileW)(PCWSTR,DWORD,PWSTR); static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); -static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICE,DWORD); +static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -1244,17 +1244,16 @@ static void test_AssociateColorProfileWithDeviceA( char *testprofile ) BOOL ret; char profile[MAX_PATH], basename[MAX_PATH]; DWORD error, size = sizeof(profile); - DISPLAY_DEVICE display; + DISPLAY_DEVICEA display, monitor; BOOL res; - DISPLAY_DEVICE monitor; if (testprofile && pEnumDisplayDevicesA) { - display.cb = sizeof( DISPLAY_DEVICE ); + display.cb = sizeof( DISPLAY_DEVICEA ); res = pEnumDisplayDevicesA( NULL, 0, &display, 0 ); ok( res, "Can't get display info\n" ); - monitor.cb = sizeof( DISPLAY_DEVICE ); + monitor.cb = sizeof( DISPLAY_DEVICEA ); res = pEnumDisplayDevicesA( display.DeviceName, 0, &monitor, 0 ); if (res) { @@ -1379,9 +1378,9 @@ START_TEST(profile) } /* If found, create a temporary copy for testing purposes */ - if (standardprofile && GetTempPath( sizeof(path), path )) + if (standardprofile && GetTempPathA( sizeof(path), path )) { - if (GetTempFileName( path, "rgb", 0, file )) + if (GetTempFileNameA( path, "rgb", 0, file )) { if (CopyFileA( standardprofile, file, FALSE )) {

1 0

Alexandre Julliard : winex11: Add a helper function to return the virtual screen rectangle.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 9f1f29cc911178f47ae64f5ba6c859578eea1a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1f29cc911178f47ae64f5ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 14:38:58 2013 +0200 winex11: Add a helper function to return the virtual screen rectangle. --- dlls/winex11.drv/desktop.c | 14 ++++++++------ dlls/winex11.drv/init.c | 14 ++++++++++---- dlls/winex11.drv/mouse.c | 23 ++++++++++++++--------- dlls/winex11.drv/window.c | 19 ++++++++++--------- dlls/winex11.drv/x11drv.h | 31 ++++++++++++++++--------------- dlls/winex11.drv/x11drv_main.c | 1 - dlls/winex11.drv/xinerama.c | 7 +++++++ 7 files changed, 65 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f1f29cc911178f47ae64…

1 0

Alexandre Julliard : winex11: Add helper functions for converting between root and virtual screen coords .
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 0b71e0bf120f85001d35fc884ddbb592372807da URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b71e0bf120f85001d35fc884… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 14:20:08 2013 +0200 winex11: Add helper functions for converting between root and virtual screen coords. --- dlls/winex11.drv/desktop.c | 6 +- dlls/winex11.drv/event.c | 86 ++++++++++++++++++++---------------------- dlls/winex11.drv/mouse.c | 49 +++++++++++++----------- dlls/winex11.drv/window.c | 32 +++++++++------- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/xdnd.c | 5 +-- dlls/winex11.drv/xinerama.c | 16 ++++++++ 7 files changed, 107 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b71e0bf120f85001d35f…

1 0

Alexandre Julliard : makedep: Generate correct dependencies for testlist.c.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: bb45a93d7198ee91174761c4645da1af31341c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb45a93d7198ee91174761c46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 12:12:26 2013 +0200 makedep: Generate correct dependencies for testlist.c. --- Make.rules.in | 5 +-- tools/makedep.c | 86 ++++++++++++++++++++++++++++++++----------------------- 2 files changed, 51 insertions(+), 40 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index d912bcd..30a72fa 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -4,7 +4,6 @@ # C_SRCS : C sources for the module # OBJC_SRCS : Objective-C sources for the module # RC_SRCS : resource source files -# EXTRA_SRCS : extra source files for make depend # EXTRA_OBJS : extra object files # IMPORTS : dlls to import # DELAYIMPORTS : dlls to import in delayed mode @@ -147,7 +146,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) \ $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) \ - $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS) + $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) depend: dummy $(MAKEDEP) $(MAKEDEPFLAGS) -C$(srcdir) -S$(top_srcdir) -T$(top_builddir) $(EXTRAINCL) $(DEPEND_SRCS) @@ -171,8 +170,6 @@ $(WINETEST_RES): $(TESTMODULE_STRIPPED) testlist.c: Makefile.in $(MAKECTESTS) $(MAKECTESTS) -o $@ $(C_SRCS) -testlist.o testlist.cross.o: testlist.c $(top_srcdir)/include/wine/test.h - testclean:: $(RM) *.ok diff --git a/tools/makedep.c b/tools/makedep.c index 8c5dcd0..498a05d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -810,11 +810,6 @@ static void parse_generated_idl( struct incl_file *source ) add_include( source, "wine/exception.h", 1 ); add_include( source, header, 0 ); } - else if (!strcmp( source->name, "dlldata.c" )) - { - add_include( source, "objbase.h", 1 ); - add_include( source, "rpcproxy.h", 1 ); - } free( header ); free( basename ); @@ -823,46 +818,68 @@ static void parse_generated_idl( struct incl_file *source ) /******************************************************************* * parse_file */ -static void parse_file( struct incl_file *pFile, int src ) +static void parse_file( struct incl_file *source, int src ) { FILE *file; /* special case for source files generated from idl */ - if (strendswith( pFile->name, "_c.c" ) || - strendswith( pFile->name, "_i.c" ) || - strendswith( pFile->name, "_p.c" ) || - strendswith( pFile->name, "_s.c" ) || - !strcmp( pFile->name, "dlldata.c" )) + if (strendswith( source->name, "_c.c" ) || + strendswith( source->name, "_i.c" ) || + strendswith( source->name, "_p.c" ) || + strendswith( source->name, "_s.c" )) + { + parse_generated_idl( source ); + return; + } + + if (!strcmp( source->name, "dlldata.o" )) + { + source->filename = xstrdup( "dlldata.c" ); + add_include( source, "objbase.h", 1 ); + add_include( source, "rpcproxy.h", 1 ); + return; + } + + if (!strcmp( source->name, "testlist.o" )) { - parse_generated_idl( pFile ); + source->filename = xstrdup( "testlist.c" ); + add_include( source, "wine/test.h", 1 ); + return; + } + + if (strendswith( source->name, ".o" )) + { + /* default to .c for unknown extra object files */ + source->filename = xstrdup( source->name ); + source->filename[strlen(source->filename) - 1] = 'c'; return; } /* don't try to open certain types of files */ - if (strendswith( pFile->name, ".tlb" ) || - strendswith( pFile->name, ".res" ) || - strendswith( pFile->name, ".x" )) + if (strendswith( source->name, ".tlb" ) || + strendswith( source->name, ".res" ) || + strendswith( source->name, ".x" )) { - pFile->filename = xstrdup( pFile->name ); + source->filename = xstrdup( source->name ); return; } - file = src ? open_src_file( pFile ) : open_include_file( pFile ); + file = src ? open_src_file( source ) : open_include_file( source ); if (!file) return; - input_file_name = pFile->filename; - - if (pFile->sourcename && strendswith( pFile->sourcename, ".idl" )) - parse_idl_file( pFile, file, 1 ); - else if (strendswith( pFile->filename, ".idl" )) - parse_idl_file( pFile, file, 0 ); - else if (strendswith( pFile->filename, ".c" ) || - strendswith( pFile->filename, ".m" ) || - strendswith( pFile->filename, ".h" ) || - strendswith( pFile->filename, ".l" ) || - strendswith( pFile->filename, ".y" )) - parse_c_file( pFile, file ); - else if (strendswith( pFile->filename, ".rc" )) - parse_rc_file( pFile, file ); + input_file_name = source->filename; + + if (source->sourcename && strendswith( source->sourcename, ".idl" )) + parse_idl_file( source, file, 1 ); + else if (strendswith( source->filename, ".idl" )) + parse_idl_file( source, file, 0 ); + else if (strendswith( source->filename, ".c" ) || + strendswith( source->filename, ".m" ) || + strendswith( source->filename, ".h" ) || + strendswith( source->filename, ".l" ) || + strendswith( source->filename, ".y" )) + parse_c_file( source, file ); + else if (strendswith( source->filename, ".rc" )) + parse_rc_file( source, file ); fclose(file); input_file_name = NULL; } @@ -1151,11 +1168,8 @@ int main( int argc, char *argv[] ) free( path ); } - for (i = 1; i < argc; i++) - { - add_src_file( argv[i] ); - if (strendswith( argv[i], "_p.c" )) add_src_file( "dlldata.c" ); - } + for (i = 1; i < argc; i++) add_src_file( argv[i] ); + LIST_FOR_EACH_ENTRY( pFile, &includes, struct incl_file, entry ) parse_file( pFile, 0 ); output_dependencies(); return 0;

1 0

Alexandre Julliard : makedep: Add more helpers for file output and error handling.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: c3aa49529587aac1cc7e7eeb367102db091905db URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3aa49529587aac1cc7e7eeb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 11:11:07 2013 +0200 makedep: Add more helpers for file output and error handling. --- tools/makedep.c | 286 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 161 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3aa49529587aac1cc7e7…

1 0