wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Damjan Jovanovic : sti: Add aggregation tests for the IStillImageW interface.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 6d2a5e190c38599e06f9d4e1c3e8b7dd34ded8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2a5e190c38599e06f9d4e1c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Oct 5 21:07:47 2009 +0200 sti: Add aggregation tests for the IStillImageW interface. --- dlls/sti/tests/sti.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index 524ff9c..9a1aeee 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -36,6 +36,31 @@ static HRESULT (WINAPI *pStiCreateInstance)(HINSTANCE,DWORD,PSTIW*,LPUNKNOWN); static HRESULT (WINAPI *pStiCreateInstanceA)(HINSTANCE,DWORD,PSTIA*,LPUNKNOWN); static HRESULT (WINAPI *pStiCreateInstanceW)(HINSTANCE,DWORD,PSTIW*,LPUNKNOWN); +static BOOL aggregator_addref_called; + +static HRESULT WINAPI aggregator_QueryInterface(IUnknown *iface, REFIID riid, void **ppvObject) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI aggregator_AddRef(IUnknown *iface) +{ + aggregator_addref_called = TRUE; + return 2; +} + +static ULONG WINAPI aggregator_Release(IUnknown *iface) +{ + return 1; +} + +static struct IUnknownVtbl aggregator_vtbl = +{ + aggregator_QueryInterface, + aggregator_AddRef, + aggregator_Release +}; + static BOOL init_function_pointers(void) { sti_dll = LoadLibrary("sti.dll"); @@ -52,7 +77,7 @@ static BOOL init_function_pointers(void) return FALSE; } -void test_version_flag_versus_aw(void) +static void test_version_flag_versus_aw(void) { HRESULT hr; @@ -74,7 +99,7 @@ void test_version_flag_versus_aw(void) IUnknown_Release((IUnknown*)pStiW); } else - todo_wine ok(0, "could not create StillImageA, hr = 0x%X\n", hr); + ok(0, "could not create StillImageA, hr = 0x%X\n", hr); hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); if (SUCCEEDED(hr)) { @@ -88,7 +113,7 @@ void test_version_flag_versus_aw(void) IUnknown_Release((IUnknown*)pStiW); } else - todo_wine ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + ok(0, "could not create StillImageW, hr = 0x%X\n", hr); } else skip("No StiCreateInstance function\n"); @@ -130,7 +155,72 @@ void test_version_flag_versus_aw(void) IUnknown_Release((IUnknown*)pStiW); } else - todo_wine ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + } + else + skip("No StiCreateInstanceW function\n"); +} + +static void test_stillimage_aggregation(void) +{ + if (pStiCreateInstanceW) + { + IUnknown aggregator = { &aggregator_vtbl }; + IStillImageW *pStiW; + IUnknown *pUnknown; + HRESULT hr; + + /* When aggregating, the outer object must get the non-delegating IUnknown to be + able to control the inner object's reference count and query its interfaces. + But StiCreateInstance* only take PSTI. So how does the non-delegating IUnknown + come back to the outer object calling this function? */ + + hr = pStiCreateInstanceW(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, &aggregator); + if (SUCCEEDED(hr)) + { + IStillImageW *pStiW2 = NULL; + + /* Does this interface delegate? */ + aggregator_addref_called = FALSE; + IStillImage_AddRef(pStiW); + ok(!aggregator_addref_called, "the aggregated IStillImageW shouldn't delegate\n"); + IStillImage_Release(pStiW); + + /* Tests show calling IStillImageW_WriteToErrorLog on the interface segfaults on Windows, so I guess it's an IUnknown. + But querying for an IUnknown returns a different interface, which also delegates. + So much for COM being reflexive... + Anyway I doubt apps depend on any of this. */ + + /* And what about the IStillImageW interface? */ + hr = IStillImage_QueryInterface(pStiW, &IID_IStillImageW, (void**)&pStiW2); + if (SUCCEEDED(hr)) + { + ok(pStiW != pStiW2, "the aggregated IStillImageW and its queried IStillImageW unexpectedly match\n"); + /* Does it delegate? */ + aggregator_addref_called = FALSE; + IStillImage_AddRef(pStiW2); + ok(aggregator_addref_called, "the created IStillImageW's IStillImageW should delegate\n"); + IStillImage_Release(pStiW2); + IStillImage_Release(pStiW2); + } + else + ok(0, "could not query for IID_IStillImageW, hr = 0x%x\n", hr); + + IStillImage_Release(pStiW); + } + else + ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + + /* Now do the above tests prove that STI.DLL isn't picky about querying for IUnknown + in CoCreateInterface when aggregating? */ + hr = CoCreateInstance(&CLSID_Sti, &aggregator, CLSCTX_ALL, &IID_IStillImageW, (void**)&pStiW); + ok(FAILED(hr), "CoCreateInstance unexpectedly succeeded when querying for IStillImageW during aggregation\n"); + if (SUCCEEDED(hr)) + IStillImage_Release(pStiW); + hr = CoCreateInstance(&CLSID_Sti, &aggregator, CLSCTX_ALL, &IID_IUnknown, (void**)&pUnknown); + ok(FAILED(hr), "CoCreateInstance unexpectedly succeeded when querying for IUnknown during aggregation\n"); + if (SUCCEEDED(hr)) + IUnknown_Release(pUnknown); } else skip("No StiCreateInstanceW function\n"); @@ -143,6 +233,7 @@ START_TEST(sti) if (init_function_pointers()) { test_version_flag_versus_aw(); + test_stillimage_aggregation(); FreeLibrary(sti_dll); } else

1 0

Damjan Jovanovic : sti: Add stubs for the IStillImageW interface.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 433163b1730f6c4db85687fd739be726e9099d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=433163b1730f6c4db85687fd7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Oct 5 21:06:06 2009 +0200 sti: Add stubs for the IStillImageW interface. --- dlls/sti/Makefile.in | 1 + dlls/sti/sti.c | 298 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/sti/sti_main.c | 16 --- dlls/sti/sti_private.h | 32 +++++ 4 files changed, 331 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=433163b1730f6c4db8568…

1 0

Owen Rudge : comctl32: Ensure coordinates are valid during listview marquee selection.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 2a869d039ad38bb2c2f103fd1840f4abd8404dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a869d039ad38bb2c2f103fd1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Oct 5 18:07:45 2009 +0100 comctl32: Ensure coordinates are valid during listview marquee selection. --- dlls/comctl32/listview.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e1e51e7..2f30e9a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3607,6 +3607,19 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); + /* Ensure coordinates are within client bounds */ + if (x < 0) + x = 0; + + if (y < 0) + y = 0; + + if (x > infoPtr->rcList.right) + x = infoPtr->rcList.right; + + if (y > infoPtr->rcList.bottom) + y = infoPtr->rcList.bottom; + tmp.x = x; tmp.y = y;

1 0

Jörg Höhle : dsound: Get rid of redundant NULL check.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 6aac7cfafac114cc5aec84a27860802198dc90a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aac7cfafac114cc5aec84a27… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 4 14:30:50 2009 +0200 dsound: Get rid of redundant NULL check. --- dlls/dsound/capture.c | 32 +++++++++++++------------------- 1 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 312c90f..0e75dd7 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1351,7 +1351,7 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( if ( ((lpcDSCBufferDesc->dwSize != sizeof(DSCBUFFERDESC)) && (lpcDSCBufferDesc->dwSize != sizeof(DSCBUFFERDESC1))) || (lpcDSCBufferDesc->dwBufferBytes == 0) || - (lpcDSCBufferDesc->lpwfxFormat == NULL) ) { + (lpcDSCBufferDesc->lpwfxFormat == NULL) ) { /* FIXME: DSERR_BADFORMAT ? */ WARN("invalid lpcDSCBufferDesc\n"); *ppobj = NULL; return DSERR_INVALIDPARAM; @@ -1359,25 +1359,19 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( wfex = lpcDSCBufferDesc->lpwfxFormat; - if (wfex) { - TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," - "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", - wfex->wFormatTag, wfex->nChannels, wfex->nSamplesPerSec, - wfex->nAvgBytesPerSec, wfex->nBlockAlign, - wfex->wBitsPerSample, wfex->cbSize); - - if (wfex->wFormatTag == WAVE_FORMAT_PCM) { - device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)); - *device->pwfx = *wfex; - device->pwfx->cbSize = 0; - } else { - device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)+wfex->cbSize); - CopyMemory(device->pwfx, wfex, sizeof(WAVEFORMATEX)+wfex->cbSize); - } + TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," + "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", + wfex->wFormatTag, wfex->nChannels, wfex->nSamplesPerSec, + wfex->nAvgBytesPerSec, wfex->nBlockAlign, + wfex->wBitsPerSample, wfex->cbSize); + + if (wfex->wFormatTag == WAVE_FORMAT_PCM) { + device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)); + CopyMemory(device->pwfx, wfex, sizeof(PCMWAVEFORMAT)); + device->pwfx->cbSize = 0; } else { - WARN("lpcDSCBufferDesc->lpwfxFormat == 0\n"); - *ppobj = NULL; - return DSERR_INVALIDPARAM; /* FIXME: DSERR_BADFORMAT ? */ + device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)+wfex->cbSize); + CopyMemory(device->pwfx, wfex, sizeof(WAVEFORMATEX)+wfex->cbSize); } *ppobj = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,

1 0

Andrew Nguyen : cmd: Fix copy option handling in batch mode.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 203c538aaa2ca940822791e4af42822bfdb59f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203c538aaa2ca940822791e4a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Oct 3 17:00:59 2009 -0500 cmd: Fix copy option handling in batch mode. --- programs/cmd/builtins.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f5dfbf0..bccba85 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -171,7 +171,7 @@ void WCMD_copy (void) { WIN32_FIND_DATA fd; HANDLE hff; BOOL force, status; - WCHAR outpath[MAX_PATH], srcpath[MAX_PATH], copycmd[3]; + WCHAR outpath[MAX_PATH], srcpath[MAX_PATH], copycmd[4]; DWORD len; static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; BOOL copyToDir = FALSE; @@ -238,8 +238,20 @@ void WCMD_copy (void) { else if (strstrW (quals, parmY)) force = TRUE; else { + /* By default, we will force the overwrite in batch mode and ask for + * confirmation in interactive mode. */ + force = !!context; + + /* If COPYCMD is set, then we force the overwrite with /Y and ask for + * confirmation with /-Y. If COPYCMD is neither of those, then we use the + * default behavior. */ len = GetEnvironmentVariable (copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); - force = (len && len < (sizeof(copycmd)/sizeof(WCHAR)) && ! lstrcmpiW (copycmd, parmY)); + if (len && len < (sizeof(copycmd)/sizeof(WCHAR))) { + if (!lstrcmpiW (copycmd, parmY)) + force = TRUE; + else if (!lstrcmpiW (copycmd, parmNoY)) + force = FALSE; + } } /* Loop through all source files */

1 0

Andrey Turkin : kernel32: Catch invalid memory accesses in resource enumeration handlers.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 95eb435a33826ee46f87cc687c1ea16c6fc10c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=95eb435a33826ee46f87cc687… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Oct 5 16:17:56 2009 +0400 kernel32: Catch invalid memory accesses in resource enumeration handlers. --- dlls/kernel32/resource.c | 119 ++++++++++++++++++++++++++++++---------------- 1 files changed, 78 insertions(+), 41 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 9feb672..d405b95 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -378,32 +378,42 @@ BOOL WINAPI EnumResourceNamesA( HMODULE hmod, LPCSTR type, ENUMRESNAMEPROCA lpfu goto done; et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); - for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) + __TRY { - if (et[i].u1.s1.NameIsString) + for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); - newlen = WideCharToMultiByte(CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL); - if (newlen + 1 > len) + if (et[i].u1.s1.NameIsString) { - len = newlen + 1; - HeapFree( GetProcessHeap(), 0, name ); - if (!(name = HeapAlloc(GetProcessHeap(), 0, len + 1 ))) + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); + newlen = WideCharToMultiByte(CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL); + if (newlen + 1 > len) { - ret = FALSE; - break; + len = newlen + 1; + HeapFree( GetProcessHeap(), 0, name ); + if (!(name = HeapAlloc(GetProcessHeap(), 0, len + 1 ))) + { + ret = FALSE; + break; + } } + WideCharToMultiByte( CP_ACP, 0, str->NameString, str->Length, name, len, NULL, NULL ); + name[newlen] = 0; + ret = lpfun(hmod,type,name,lparam); } - WideCharToMultiByte( CP_ACP, 0, str->NameString, str->Length, name, len, NULL, NULL ); - name[newlen] = 0; - ret = lpfun(hmod,type,name,lparam); - } - else - { - ret = lpfun( hmod, type, UIntToPtr(et[i].u1.s2.Id), lparam ); + else + { + ret = lpfun( hmod, type, UIntToPtr(et[i].u1.s2.Id), lparam ); + } + if (!ret) break; } - if (!ret) break; } + __EXCEPT_PAGE_FAULT + { + ret = FALSE; + status = STATUS_ACCESS_VIOLATION; + } + __ENDTRY + done: HeapFree( GetProcessHeap(), 0, name ); if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); @@ -440,31 +450,40 @@ BOOL WINAPI EnumResourceNamesW( HMODULE hmod, LPCWSTR type, ENUMRESNAMEPROCW lpf goto done; et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); - for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) + __TRY { - if (et[i].u1.s1.NameIsString) + for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); - if (str->Length + 1 > len) + if (et[i].u1.s1.NameIsString) { - len = str->Length + 1; - HeapFree( GetProcessHeap(), 0, name ); - if (!(name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); + if (str->Length + 1 > len) { - ret = FALSE; - break; + len = str->Length + 1; + HeapFree( GetProcessHeap(), 0, name ); + if (!(name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + ret = FALSE; + break; + } } + memcpy(name, str->NameString, str->Length * sizeof (WCHAR)); + name[str->Length] = 0; + ret = lpfun(hmod,type,name,lparam); } - memcpy(name, str->NameString, str->Length * sizeof (WCHAR)); - name[str->Length] = 0; - ret = lpfun(hmod,type,name,lparam); - } - else - { - ret = lpfun( hmod, type, UIntToPtr(et[i].u1.s2.Id), lparam ); + else + { + ret = lpfun( hmod, type, UIntToPtr(et[i].u1.s2.Id), lparam ); + } + if (!ret) break; } - if (!ret) break; } + __EXCEPT_PAGE_FAULT + { + ret = FALSE; + status = STATUS_ACCESS_VIOLATION; + } + __ENDTRY done: HeapFree( GetProcessHeap(), 0, name ); if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); @@ -503,11 +522,20 @@ BOOL WINAPI EnumResourceLanguagesA( HMODULE hmod, LPCSTR type, LPCSTR name, goto done; et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); - for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) + __TRY { - ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam ); - if (!ret) break; + for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) + { + ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam ); + if (!ret) break; + } } + __EXCEPT_PAGE_FAULT + { + ret = FALSE; + status = STATUS_ACCESS_VIOLATION; + } + __ENDTRY done: if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); if (HIWORD(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); @@ -546,11 +574,20 @@ BOOL WINAPI EnumResourceLanguagesW( HMODULE hmod, LPCWSTR type, LPCWSTR name, goto done; et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); - for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) + __TRY { - ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam ); - if (!ret) break; + for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) + { + ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam ); + if (!ret) break; + } + } + __EXCEPT_PAGE_FAULT + { + ret = FALSE; + status = STATUS_ACCESS_VIOLATION; } + __ENDTRY done: if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); if (HIWORD(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer );

1 0

Damjan Jovanovic : wine.inf: Add the still image class key.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: a186fd7767516f0844c2bf5a9dee316727f501d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a186fd7767516f0844c2bf5a9… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Oct 4 11:21:39 2009 +0200 wine.inf: Add the still image class key. --- tools/wine.inf.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 633d807..6b6acf9 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -386,6 +386,8 @@ HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"Locale",0x1 [ControlClass] HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" +HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" +HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" [CurrentVersion] HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%"

1 0

Wim Lewis : winex11: Fix font metric cache filename generation.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: a1c66499bf6b93bc2c027b5786fe73615b1f8fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c66499bf6b93bc2c027b578… Author: Wim Lewis <wiml(a)hhhh.org> Date: Fri Oct 2 15:23:34 2009 -0700 winex11: Fix font metric cache filename generation. Recognize Mac OS X's launchd pathnames as being local. Avoid generating an invalid pathname if $DISPLAY contains slashes. Don't include the screen number in the cache filename. --- dlls/winex11.drv/xfont.c | 54 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index f761e9b..5e160cc 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -1830,18 +1830,10 @@ static char* XFONT_UserMetricsCache( char* buffer, int* buf_size ) const char *confdir = wine_get_config_dir(); const char *display_name = XDisplayName(NULL); int len = strlen(confdir) + strlen(INIFontMetrics) + strlen(display_name) + 8; - int display = 0; - int screen = 0; + unsigned int display = 0; + unsigned int screen = 0; char *p, *ext; - /* - ** Normalize the display name, since on Red Hat systems, DISPLAY - ** is commonly set to one of either 'unix:0.0' or ':0' or ':0.0'. - ** after this code, all of the above will resolve to ':0.0'. - */ - if (!strncmp( display_name, "unix:", 5 )) display_name += 4; - p = strchr(display_name, ':'); - if (p) sscanf(p + 1, "%d.%d", &display, &screen); if ((len > *buf_size) && !(buffer = HeapReAlloc( GetProcessHeap(), 0, buffer, *buf_size = len ))) @@ -1854,8 +1846,46 @@ static char* XFONT_UserMetricsCache( char* buffer, int* buf_size ) ext = buffer + strlen(buffer); strcpy( ext, display_name ); - if (!(p = strchr( ext, ':' ))) p = ext + strlen(ext); - sprintf( p, ":%d.%d", display, screen ); + /* + ** Normalize the display name. The format of DISPLAY is + ** [protocol/] [hostname] :[:] num [.num] + ** + ** - on Red Hat systems, DISPLAY is commonly set to one of + ** either 'unix:0.0' or ':0' or ':0.0'. + ** - on MacOS X systems, DISPLAY is commonly set to + ** /tmp/foo/:0 + ** + ** after this code, all of the above will resolve to ':0.0'. + */ + p = strrchr(ext, ':'); + if (p) + { + sscanf(p + 1, "%u.%u", &display, &screen); + *p = 0; + if (display > 9999) + { + WARN("unlikely X11 display number\n"); + *buffer = 0; + return buffer; + } + } + if (!strcmp( ext, "unix" ) || + !strcmp( ext, "localhost" )) + *ext = 0; + if (!strncmp( ext, "/tmp/", 5 )) + *ext = 0; /* assume pathnames are local */ + + /* Deal with the possibility of slashes in the display name */ + for( p = ext; *p; p++ ) + if ( *p == '/' ) + *p = '_'; + + /* X11 fonts are per-display, not per-screen, so don't + ** include the screen number in the font cache filename */ + sprintf( ext + strlen(ext), ":%u", display ); + + TRACE("display '%s' -> cachefile '%s'\n", display_name, buffer); + return buffer; }

1 0

Wim Lewis : winex11: Font metric cache file cleanups.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: d535419daa6409b3320e9f1c04ab939061492956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d535419daa6409b3320e9f1c0… Author: Wim Lewis <wiml(a)hhhh.org> Date: Fri Oct 2 14:04:52 2009 -0700 winex11: Font metric cache file cleanups. --- dlls/winex11.drv/xfont.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index d3d3e8c..f761e9b 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -34,7 +34,9 @@ #endif #include <sys/types.h> #include <fcntl.h> +#include <errno.h> #include <math.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -2156,8 +2158,10 @@ static int XFONT_BuildMetrics(char** x_pattern, int res, unsigned x_checksum, in * * INIT ONLY */ -static BOOL XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x_count ) +static BOOL XFONT_ReadCachedMetrics( const char *path, int res, unsigned x_checksum, int x_count ) { + int fd = open( path, O_RDONLY ); + if( fd >= 0 ) { unsigned u; @@ -2270,6 +2274,8 @@ fail: HeapFree( GetProcessHeap(), 0, fontList ); fontList = NULL; close( fd ); + } else { + TRACE("fontcache '%s': %s\n", path, strerror(errno)); } return FALSE; } @@ -2855,7 +2861,7 @@ static void X11DRV_FONT_InitX11Metrics( void ) { char** x_pattern; unsigned x_checksum; - int i, x_count, fd, buf_size; + int i, x_count, buf_size; char *buffer; HKEY hkey; @@ -2879,7 +2885,7 @@ static void X11DRV_FONT_InitX11Metrics( void ) if( j ) x_checksum ^= __genericCheckSum( x_pattern[i], j ); } x_checksum |= X_PFONT_MAGIC; - buf_size = 128; + buf_size = PATH_MAX; buffer = HeapAlloc( GetProcessHeap(), 0, buf_size ); /* deal with systemwide font metrics cache */ @@ -2895,8 +2901,8 @@ static void X11DRV_FONT_InitX11Metrics( void ) if( buffer[0] ) { - fd = open( buffer, O_RDONLY ); - XFONT_ReadCachedMetrics(fd, DefResolution, x_checksum, x_count); + TRACE("system fontcache is '%s'\n", buffer); + XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); } if (fontList == NULL) { @@ -2904,8 +2910,8 @@ static void X11DRV_FONT_InitX11Metrics( void ) buffer = XFONT_UserMetricsCache( buffer, &buf_size ); if( buffer[0] ) { - fd = open( buffer, O_RDONLY ); - XFONT_ReadCachedMetrics(fd, DefResolution, x_checksum, x_count); + TRACE("user fontcache is '%s'\n", buffer); + XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); } } @@ -2914,11 +2920,15 @@ static void X11DRV_FONT_InitX11Metrics( void ) int n_ff = XFONT_BuildMetrics(x_pattern, DefResolution, x_checksum, x_count); if( buffer[0] ) /* update cached metrics */ { - fd = open( buffer, O_CREAT | O_TRUNC | O_RDWR, 0644 ); /* -rw-r--r-- */ - if( XFONT_WriteCachedMetrics( fd, x_checksum, x_count, n_ff ) == FALSE ) + int fd = open( buffer, O_CREAT | O_TRUNC | O_RDWR, 0666 ); + if ( fd < 0 ) + { + WARN("Unable to create fontcache '%s': %s\n", buffer, strerror(errno)); + } + else if( XFONT_WriteCachedMetrics( fd, x_checksum, x_count, n_ff ) == FALSE ) { WARN("Unable to write to fontcache '%s'\n", buffer); - if( fd >= 0) remove( buffer ); /* couldn't write entire file */ + remove( buffer ); /* couldn't write entire file */ } } }

1 0

Eric Pouech : winmm: Correctly fill the yield-data parameter in mciGetYieldProc.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: dd6b7b7f367782a4f8b8753601bdffff772ff080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd6b7b7f367782a4f8b875360… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Oct 4 14:31:04 2009 +0200 winmm: Correctly fill the yield-data parameter in mciGetYieldProc. --- dlls/winmm/mci.c | 1 + dlls/winmm/mmsystem.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 6fca013..216fb2a 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -2393,6 +2393,7 @@ YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID uDeviceID, DWORD* lpdwYieldData) WARN("Proc is 32 bit\n"); return NULL; } + if (lpdwYieldData) *lpdwYieldData = wmd->dwYieldData; return wmd->lpfnYieldProc; } diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 4f320f7..fd065d0 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -647,6 +647,7 @@ YIELDPROC16 WINAPI mciGetYieldProc16(UINT16 uDeviceID, DWORD* lpdwYieldData) WARN("Proc is 32 bit\n"); return NULL; } + if (lpdwYieldData) *lpdwYieldData = wmd->dwYieldData; return (YIELDPROC16)wmd->lpfnYieldProc; }

1 0

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 October 2009