January 2014 - Wine-commits

Dmitry Timoshkov : advapi32/tests: Add a test for opening a mutex with access 0.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: bce1a2b3d5c90eb31052a13306b0b2e48f081be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce1a2b3d5c90eb31052a1330… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:25:58 2014 +0900 advapi32/tests: Add a test for opening a mutex with access 0. --- dlls/advapi32/tests/security.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 57ad4ce..32aa395 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4563,6 +4563,13 @@ todo_wine ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); CloseHandle(dup); + + SetLastError(0xdeadbeef); + dup = OpenMutexA(0, FALSE, "WineTestMutex"); +todo_wine + ok(!dup, "OpenMutex should fail\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); } test_default_handle_security(token, mutex, &mapping);

1 0

Dmitry Timoshkov : advapi32/tests: Add a test for opening an event with access 0.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: b5c9bdaddba27c607c13d0d70e0777ecef4a46ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c9bdaddba27c607c13d0d70… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:02 2014 +0900 advapi32/tests: Add a test for opening an event with access 0. --- dlls/advapi32/tests/security.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 32aa395..df02d85 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4624,6 +4624,13 @@ todo_wine ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); CloseHandle(dup); + + SetLastError(0xdeadbeef); + dup = OpenEventA(0, FALSE, "WineTestEvent"); +todo_wine + ok(!dup, "OpenEvent should fail\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); } test_default_handle_security(token, event, &mapping);

1 0

Frédéric Delanoy : kernel32/tests: Unconstify a character string.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 7215eb249794928b156856405b553db228bbb370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7215eb249794928b156856405… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 10 02:37:02 2014 +0100 kernel32/tests: Unconstify a character string. --- dlls/kernel32/tests/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index c6e0b61..ca3a07e 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -92,7 +92,7 @@ static void test_profile_int(void) static void test_profile_string(void) { - static const WCHAR emptyW[] = { 0 }; + static WCHAR emptyW[] = { 0 }; /* if "const", GetPrivateProfileStringW(emptyW, ...) crashes on win2k */ static const WCHAR keyW[] = { 'k','e','y',0 }; static const WCHAR sW[] = { 's',0 }; static const WCHAR TESTFILE2W[] = {'.','\\','t','e','s','t','w','i','n','e','2','.','i','n','i',0};

1 0

Nikolay Sivov : oleaut32: Add missing methods to test IRecordInfo implementation.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 92ed7c50a910ab80e03792de3e2ef5a5310225c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ed7c50a910ab80e03792de3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 10 12:17:42 2014 +0400 oleaut32: Add missing methods to test IRecordInfo implementation. --- dlls/oleaut32/tests/safearray.c | 173 ++++++++++++++++++++++++++++++--------- 1 file changed, 134 insertions(+), 39 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 064b038..3e311e3 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -83,32 +83,33 @@ typedef struct IRecordInfoImpl DWORD clearCalled; } IRecordInfoImpl; -static const IRecordInfoVtbl IRecordInfoImpl_VTable; - static inline IRecordInfoImpl *impl_from_IRecordInfo(IRecordInfo *iface) { return CONTAINING_RECORD(iface, IRecordInfoImpl, IRecordInfo_iface); } -static IRecordInfoImpl *IRecordInfoImpl_Construct(void) +static HRESULT WINAPI RecordInfo_QueryInterface(IRecordInfo *iface, REFIID riid, void **obj) { - IRecordInfoImpl *rec; + *obj = NULL; - rec = HeapAlloc(GetProcessHeap(), 0, sizeof(IRecordInfoImpl)); - rec->IRecordInfo_iface.lpVtbl = &IRecordInfoImpl_VTable; - rec->ref = START_REF_COUNT; - rec->clearCalled = 0; - rec->sizeCalled = 0; - return rec; + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IRecordInfo)) + { + *obj = iface; + IRecordInfo_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; } -static ULONG CALLBACK IRecordInfoImpl_AddRef(IRecordInfo *iface) +static ULONG WINAPI RecordInfo_AddRef(IRecordInfo *iface) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); return InterlockedIncrement(&This->ref); } -static ULONG CALLBACK IRecordInfoImpl_Release(IRecordInfo *iface) +static ULONG WINAPI RecordInfo_Release(IRecordInfo *iface) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -119,16 +120,40 @@ static ULONG CALLBACK IRecordInfoImpl_Release(IRecordInfo *iface) return ref; } +static HRESULT WINAPI RecordInfo_RecordInit(IRecordInfo *iface, PVOID pvNew) +{ + ok(0, "enexpected call\n"); + return E_NOTIMPL; +} + static BOOL fail_GetSize; /* Whether to fail the GetSize call */ -static HRESULT CALLBACK IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvExisting) +static HRESULT WINAPI RecordInfo_RecordClear(IRecordInfo *iface, PVOID pvExisting) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->clearCalled++; return S_OK; } -static HRESULT CALLBACK IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG* size) +static HRESULT WINAPI RecordInfo_RecordCopy(IRecordInfo *iface, PVOID pvExisting, PVOID pvNew) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetGuid(IRecordInfo *iface, GUID *pguid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetName(IRecordInfo *iface, BSTR *pbstrName) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetSize(IRecordInfo *iface, ULONG* size) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->sizeCalled++; @@ -141,37 +166,107 @@ static HRESULT CALLBACK IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG* size) return S_OK; } -static HRESULT CALLBACK IRecordInfoImpl_Dummy(IRecordInfo *iface) +static HRESULT WINAPI RecordInfo_GetTypeInfo(IRecordInfo *iface, ITypeInfo **ppTypeInfo) { - trace("Called an unexpected IRecordInfo method - please report!\n"); - /* Quit because we'll just crash anyway */ - fflush(NULL); - exit(255); + ok(0, "unexpected call\n"); + return E_NOTIMPL; } -static const IRecordInfoVtbl IRecordInfoImpl_VTable = +static HRESULT WINAPI RecordInfo_GetField(IRecordInfo *iface, PVOID pvData, + LPCOLESTR szFieldName, VARIANT *pvarField) { - (PVOID)IRecordInfoImpl_Dummy, - IRecordInfoImpl_AddRef, - IRecordInfoImpl_Release, - (PVOID)IRecordInfoImpl_Dummy, - IRecordInfoImpl_RecordClear, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - IRecordInfoImpl_GetSize, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy, - (PVOID)IRecordInfoImpl_Dummy + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetFieldNoCopy(IRecordInfo *iface, PVOID pvData, + LPCOLESTR szFieldName, VARIANT *pvarField, PVOID *ppvDataCArray) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_PutField(IRecordInfo *iface, ULONG wFlags, PVOID pvData, + LPCOLESTR szFieldName, VARIANT *pvarField) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_PutFieldNoCopy(IRecordInfo *iface, ULONG wFlags, + PVOID pvData, LPCOLESTR szFieldName, VARIANT *pvarField) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetFieldNames(IRecordInfo *iface, ULONG *pcNames, + BSTR *rgBstrNames) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static BOOL WINAPI RecordInfo_IsMatchingType(IRecordInfo *iface, IRecordInfo *info2) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static PVOID WINAPI RecordInfo_RecordCreate(IRecordInfo *iface) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static HRESULT WINAPI RecordInfo_RecordCreateCopy(IRecordInfo *iface, PVOID pvSource, + PVOID *ppvDest) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_RecordDestroy(IRecordInfo *iface, PVOID pvRecord) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IRecordInfoVtbl RecordInfoVtbl = +{ + RecordInfo_QueryInterface, + RecordInfo_AddRef, + RecordInfo_Release, + RecordInfo_RecordInit, + RecordInfo_RecordClear, + RecordInfo_RecordCopy, + RecordInfo_GetGuid, + RecordInfo_GetName, + RecordInfo_GetSize, + RecordInfo_GetTypeInfo, + RecordInfo_GetField, + RecordInfo_GetFieldNoCopy, + RecordInfo_PutField, + RecordInfo_PutFieldNoCopy, + RecordInfo_GetFieldNames, + RecordInfo_IsMatchingType, + RecordInfo_RecordCreate, + RecordInfo_RecordCreateCopy, + RecordInfo_RecordDestroy }; +static IRecordInfoImpl *IRecordInfoImpl_Construct(void) +{ + IRecordInfoImpl *rec; + + rec = HeapAlloc(GetProcessHeap(), 0, sizeof(IRecordInfoImpl)); + rec->IRecordInfo_iface.lpVtbl = &RecordInfoVtbl; + rec->ref = START_REF_COUNT; + rec->clearCalled = 0; + rec->sizeCalled = 0; + return rec; +} + static DWORD SAFEARRAY_GetVTSize(VARTYPE vt) { switch (vt)

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.Name.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: a1d8886f6ad760caa338e388f0d233bcefa2381e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d8886f6ad760caa338e388f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 10 09:38:19 2014 +0100 wbemprox: Implement Win32_OperatingSystem.Name. --- dlls/wbemprox/builtin.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2db27c0..58054de 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -364,6 +364,7 @@ static const struct column col_os[] = { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_nameW, CIM_STRING }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, @@ -520,6 +521,11 @@ static const WCHAR os_32bitW[] = {'3','2','-','b','i','t',0}; static const WCHAR os_64bitW[] = {'6','4','-','b','i','t',0}; +static const WCHAR os_nameW[] = + {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' ','X','P',' ', + 'P','r','o','f','e','s','s','i','o','n','a','l','|','C',':','\\','W','I','N','D','O','W','S', + '|','\\','D','e','v','i','c','e','\\','H','a','r','d','d','i','s','k','0', + '\\','P','a','r','t','i','t','i','o','n','1',0}; static const WCHAR os_versionW[] = {'5','.','1','.','2','6','0','0',0}; static const WCHAR sounddevice_productnameW[] = @@ -633,6 +639,7 @@ struct record_operatingsystem const WCHAR *lastbootuptime; const WCHAR *localdatetime; const WCHAR *locale; + const WCHAR *name; const WCHAR *osarchitecture; UINT32 oslanguage; UINT32 osproductsuite; @@ -1943,6 +1950,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->lastbootuptime = get_lastbootuptime(); rec->localdatetime = get_localdatetime(); rec->locale = get_locale(); + rec->name = os_nameW; rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */

1 0

Ken Thomases : winemac: Don' t record original display modes when not the active app.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: fe1c0ab952d1b17c6079fef9ca418fafa812a878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1c0ab952d1b17c6079fef9c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 10 03:11:19 2014 -0600 winemac: Don't record original display modes when not the active app. originalDisplayModes should be used when active, empty when inactive. latentDisplayModes is used when inactive, empty when active. The count of entries in originalDisplayModes is used to test whether the process has the displays captured so adding entries when inactive would give incorrect results. This could have led us to mistakenly change the display mode when we don't have the displays captured. --- dlls/winemac.drv/cocoa_app.m | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index fea30e3..3521e06 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -770,21 +770,23 @@ int macdrv_err_on; !active || CGCaptureAllDisplays() == CGDisplayNoErr) { if (active) + { ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); + if (ret) + [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey]; + else if (![originalDisplayModes count]) + { + CGRestorePermanentDisplayConfiguration(); + [latentDisplayModes removeAllObjects]; + if (!displaysCapturedForFullscreen) + CGReleaseAllDisplays(); + } + } else { [latentDisplayModes setObject:(id)mode forKey:displayIDKey]; ret = TRUE; } - if (ret) - [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey]; - else if (![originalDisplayModes count]) - { - CGRestorePermanentDisplayConfiguration(); - [latentDisplayModes removeAllObjects]; - if (!displaysCapturedForFullscreen) - CGReleaseAllDisplays(); - } } }

1 0

Ken Thomases : winemac: Don' t assume the current display mode is the original if we don' t have the displays captured.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 9c65d672a21c7ece30014f3165844ea420326d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c65d672a21c7ece30014f316… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 10 03:11:25 2014 -0600 winemac: Don't assume the current display mode is the original if we don't have the displays captured. Another process may have changed the display mode before we queried the current mode, so we may be seeing a non-original mode. --- dlls/winemac.drv/cocoa_app.m | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3521e06..1b6e72e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -726,18 +726,16 @@ int macdrv_err_on; return TRUE; } + CGDisplayModeRelease(currentMode); + currentMode = NULL; + mode = [self modeMatchingMode:mode forDisplay:displayID]; if (!mode) - { - CGDisplayModeRelease(currentMode); return FALSE; - } originalMode = (CGDisplayModeRef)[originalDisplayModes objectForKey:displayIDKey]; - if (!originalMode) - originalMode = currentMode; - if ([self mode:mode matchesMode:originalMode]) + if (originalMode && [self mode:mode matchesMode:originalMode]) { if ([originalDisplayModes count] == 1) // If this is the last changed display, do a blanket reset { @@ -771,8 +769,17 @@ int macdrv_err_on; { if (active) { - ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); - if (ret) + // If we get here, we have the displays captured. If we don't + // know the original mode of the display, the current mode must + // be the original. We should re-query the current mode since + // another process could have changed it between when we last + // checked and when we captured the displays. + if (!originalMode) + originalMode = currentMode = CGDisplayCopyDisplayMode(displayID); + + if (originalMode) + ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); + if (ret && !(currentMode && [self mode:mode matchesMode:currentMode])) [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey]; else if (![originalDisplayModes count]) { @@ -781,6 +788,9 @@ int macdrv_err_on; if (!displaysCapturedForFullscreen) CGReleaseAllDisplays(); } + + if (currentMode) + CGDisplayModeRelease(currentMode); } else { @@ -790,8 +800,6 @@ int macdrv_err_on; } } - CGDisplayModeRelease(currentMode); - if (ret) [self adjustWindowLevels];

1 0

Ken Thomases : winemac: Restore display mode to original in more cases.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 42a7d7209b5e96cc35681e6524254899e3087e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a7d7209b5e96cc35681e652… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 10 03:11:28 2014 -0600 winemac: Restore display mode to original in more cases. We only care if we have changed the mode and we're changing it back to its original. Even if the current mode matches the target mode, we may still need to release the displays and clear the entry from originalDisplayModes. --- dlls/winemac.drv/cocoa_app.m | 50 +++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 1b6e72e..3e622b7 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -711,27 +711,7 @@ int macdrv_err_on; BOOL ret = FALSE; BOOL active = [NSApp isActive]; NSNumber* displayIDKey = [NSNumber numberWithUnsignedInt:displayID]; - CGDisplayModeRef currentMode = NULL, originalMode; - - if (!active) - currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]); - if (!currentMode) - currentMode = CGDisplayCopyDisplayMode(displayID); - if (!currentMode) // Invalid display ID - return FALSE; - - if ([self mode:mode matchesMode:currentMode]) // Already there! - { - CGDisplayModeRelease(currentMode); - return TRUE; - } - - CGDisplayModeRelease(currentMode); - currentMode = NULL; - - mode = [self modeMatchingMode:mode forDisplay:displayID]; - if (!mode) - return FALSE; + CGDisplayModeRef originalMode; originalMode = (CGDisplayModeRef)[originalDisplayModes objectForKey:displayIDKey]; @@ -752,7 +732,11 @@ int macdrv_err_on; else // ... otherwise, try to restore just the one display { if (active) - ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); + { + mode = [self modeMatchingMode:mode forDisplay:displayID]; + if (mode) + ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); + } else { [latentDisplayModes removeObjectForKey:displayIDKey]; @@ -764,6 +748,28 @@ int macdrv_err_on; } else { + CGDisplayModeRef currentMode = NULL; + + if (!active) + currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]); + if (!currentMode) + currentMode = CGDisplayCopyDisplayMode(displayID); + if (!currentMode) // Invalid display ID + return FALSE; + + if ([self mode:mode matchesMode:currentMode]) // Already there! + { + CGDisplayModeRelease(currentMode); + return TRUE; + } + + CGDisplayModeRelease(currentMode); + currentMode = NULL; + + mode = [self modeMatchingMode:mode forDisplay:displayID]; + if (!mode) + return FALSE; + if ([originalDisplayModes count] || displaysCapturedForFullscreen || !active || CGCaptureAllDisplays() == CGDisplayNoErr) {

1 0

Jeremy Newman : remove ending block of links
by Jeremy Newman 10 Jan '14

10 Jan '14

Module: appdb Branch: master Commit: 49eb69955d469209285633369a292948012c87dc URL: http://source.winehq.org/git/appdb.git/?a=commit;h=49eb69955d46920928563336… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Jan 10 11:21:24 2014 -0600 remove ending block of links Wine-reviews is down, the Firefox logo is broken, and we don't need to advertise the tech we use. --- index.php | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/index.php b/index.php index c027841..b1560ea 100644 --- a/index.php +++ b/index.php @@ -145,34 +145,8 @@ if(!$_SESSION['current']->isLoggedIn()) </div> </div> -<br><br> - -<h2>Other Wine Application Compatibility Sites</h2> -<p> -<a href="http://www.wine-reviews.net/"><b>Wine-Reviews</b></a>: Is a Wine application and game -Blog, with tips and how-to's on getting listed applications and games to run. -</p> -</div> - <?php -// promotional buttons -echo "<center>\n"; -echo "<table>\n"; -echo "<tr>\n"; -echo "<td style='padding:10px;'>\n"; -echo '<a href="http://getfirefox.com/" - title="Get Firefox - Web browsing redefined."><img - src="//www.mozilla.org/products/firefox/buttons/getfirefox_large2.png" - width="178" height="60" border="0" alt="Get Firefox"></a>'."\n"; -echo "</td>\n"; -echo "<td style='padding:10px;'>\n"; -echo '<a href="http://xinha.python-hosting.com/" title="Xinha textarea replacement"> - <img src="images/xinha-red-95.png" width="95" height="100" alt="Xinha"></a>'."\n"; -echo "</td>\n"; -echo "</tr>\n"; -echo "</table>\n"; -echo "</center>\n"; - apidb_footer(); + ?>

1 0

刘涛 : website: Simplified Chinese translation for 1.7.9 release
by Jeremy Newman 10 Jan '14

10 Jan '14

Module: website Branch: master Commit: 094e5426a3760a6789ac560be2ce9fe112064bd3 URL: http://source.winehq.org/git/website.git/?a=commit;h=094e5426a3760a6789ac56… Author: 刘涛 <wendaotao(a)163.com> Date: Fri Jan 10 16:39:50 2014 +0800 website: Simplified Chinese translation for 1.7.9 release --- news/zh-cn/2013122001.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/zh-cn/2013122001.xml b/news/zh-cn/2013122001.xml new file mode 100644 index 0000000..53c61b4 --- /dev/null +++ b/news/zh-cn/2013122001.xml @@ -0,0 +1,15 @@ +<news> +<date>十二月 20, 2013</date> +<title>Wine 1.7.9 发布</title> +<body> +<p> Wine 开发版 1.7.9 现在可以使用了。</p> +<p> 本次<a href="{$root}/announce/1.7.9">更新</a> : +<ul> + <li>改善了 Mac 后端驱动中窗口的移动/调整大小。</li> + <li>修复了一些 DirectDraw 的调色板。</li> + <li>减少了不同版本的 C++ 运行时库间的重复代码。</li> + <li>各种 bug 的修复。</li> +</ul> +<p>源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.7.9.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</p></body></news>

1 0