September 2011 - Wine-commits

Andrew Talbot : avifil32: Fix use of wrong variable in expression.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: f2a0f05082cd2004f83c2f0d20d8f219a0417538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2a0f05082cd2004f83c2f0d2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 20 21:36:30 2011 +0100 avifil32: Fix use of wrong variable in expression. --- dlls/avifil32/avifile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index f37395f..885d239 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1339,7 +1339,7 @@ static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, /* ckid,size => 2 * sizeof(DWORD) */ dwPos += 2 * sizeof(DWORD) + size; - if (size >= This->paf->dwMoviChunkPos - 2 * sizeof(DWORD)) + if (dwPos >= This->paf->dwMoviChunkPos - 2 * sizeof(DWORD)) return AVIERR_UNSUPPORTED; /* not enough space left */ }

1 0

Francois Gouget : user32/tests: Skip some tests if not privileged enough to call CreateWindowStation().
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 3baf73aa8e5790f4d554bd530c135b17d0ff04c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3baf73aa8e5790f4d554bd530… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 21 00:39:41 2011 +0200 user32/tests: Skip some tests if not privileged enough to call CreateWindowStation(). --- dlls/user32/tests/winstation.c | 96 ++++++++++++++++++++++----------------- 1 files changed, 54 insertions(+), 42 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 7be74f2..30eeff1 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -108,7 +108,7 @@ static void test_handles(void) HWINSTA w1, w2, w3; HDESK d1, d2, d3; HANDLE hthread; - DWORD id, flags; + DWORD id, flags, le; ATOM atom; char buffer[20]; @@ -137,16 +137,22 @@ static void test_handles(void) ok( CloseHandle(w2), "closing dup win station handle failed\n" ); w2 = CreateWindowStation("WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "CreateWindowStation failed\n" ); - ok( w2 != w1, "CreateWindowStation returned default handle\n" ); - SetLastError( 0xdeadbeef ); - ok( !CloseDesktop( (HDESK)w2 ), "CloseDesktop succeeded on win station\n" ); - ok( GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == 0xdeadbeef), /* wow64 */ - "bad last error %d\n", GetLastError() ); - ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); - - w2 = CreateWindowStation("WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); - ok( CloseHandle( w2 ), "CloseHandle failed\n" ); + le = GetLastError(); + ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", le ); + if (w2 != 0) + { + ok( w2 != w1, "CreateWindowStation returned default handle\n" ); + SetLastError( 0xdeadbeef ); + ok( !CloseDesktop( (HDESK)w2 ), "CloseDesktop succeeded on win station\n" ); + ok( GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == 0xdeadbeef), /* wow64 */ + "bad last error %d\n", GetLastError() ); + ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); + + w2 = CreateWindowStation("WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); + ok( CloseHandle( w2 ), "CloseHandle failed\n" ); + } + else if (le == ERROR_ACCESS_DENIED) + win_skip( "Not enough privileges for CreateWindowStation\n" ); w2 = OpenWindowStation("winsta0", TRUE, WINSTA_ALL_ACCESS ); ok( w2 != 0, "OpenWindowStation failed\n" ); @@ -158,38 +164,43 @@ static void test_handles(void) CreateMutexA( NULL, 0, "foobar" ); w2 = CreateWindowStation("foobar", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "create foobar station failed\n" ); - - w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); - ok( w3 != 0, "open foobar station failed\n" ); - ok( w3 != w2, "open foobar station returned same handle\n" ); - ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); - ok( CloseWindowStation( w3 ), "CloseWindowStation failed\n" ); + le = GetLastError(); + ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "create foobar station failed (%u)\n", le ); - w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); - ok( !w3, "open foobar station succeeded\n" ); - - w2 = CreateWindowStation("foobar1", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "create foobar station failed\n" ); - w3 = CreateWindowStation("foobar2", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w3 != 0, "create foobar station failed\n" ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - ok( GetHandleInformation( w3, &flags ), "GetHandleInformation failed\n" ); - - SetProcessWindowStation( w2 ); - register_class(); - atom = GlobalAddAtomA("foo"); - ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); - ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); - - ok( !CloseWindowStation( w2 ), "CloseWindowStation succeeded\n" ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - - SetProcessWindowStation( w3 ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); - ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); - ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + if (w2 != 0) + { + w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); + ok( w3 != 0, "open foobar station failed\n" ); + ok( w3 != w2, "open foobar station returned same handle\n" ); + ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); + ok( CloseWindowStation( w3 ), "CloseWindowStation failed\n" ); + + w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); + ok( !w3, "open foobar station succeeded\n" ); + + w2 = CreateWindowStation("foobar1", 0, WINSTA_ALL_ACCESS, NULL ); + ok( w2 != 0, "create foobar station failed\n" ); + w3 = CreateWindowStation("foobar2", 0, WINSTA_ALL_ACCESS, NULL ); + ok( w3 != 0, "create foobar station failed\n" ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + ok( GetHandleInformation( w3, &flags ), "GetHandleInformation failed\n" ); + + SetProcessWindowStation( w2 ); + atom = GlobalAddAtomA("foo"); + ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); + ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + + ok( !CloseWindowStation( w2 ), "CloseWindowStation succeeded\n" ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + + SetProcessWindowStation( w3 ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); + ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); + ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + } + else if (le == ERROR_ACCESS_DENIED) + win_skip( "Not enough privileges for CreateWindowStation\n" ); /* desktops */ d1 = GetThreadDesktop(GetCurrentThreadId()); @@ -251,6 +262,7 @@ static void test_handles(void) d2 = GetThreadDesktop(GetCurrentThreadId()); ok( d1 == d2, "got different handles after close\n" ); + register_class(); trace( "thread 1 desktop: %p\n", d1 ); print_object( d1 ); hthread = CreateThread( NULL, 0, thread, (LPVOID)2, 0, &id );

1 0

Francois Gouget : shlwapi/tests: Skip some tests if not allowed to modify the registry.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: fcb351b40fc50f0f0294744154cb78c54689c9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb351b40fc50f0f029474415… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 21 00:40:08 2011 +0200 shlwapi/tests: Skip some tests if not allowed to modify the registry. --- dlls/shlwapi/tests/ordinal.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index cde3378..8316112 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2853,13 +2853,18 @@ static void test_SHGetShellKey(void) hkey = pSHGetShellKey(SHKEY_Root_HKLM, WineTestW, FALSE); ok(hkey == NULL, "hkey != NULL\n"); - hkey = pSHGetShellKey(SHKEY_Root_HKLM, WineTestW, TRUE); - ok(hkey != NULL, "Can't create key\n"); + hkey = pSHGetShellKey(SHKEY_Root_HKLM, NULL, FALSE); + ok(hkey != NULL, "Can't open key\n"); + ok(SUCCEEDED(RegDeleteKeyW(hkey, WineTestW)), "Can't delte key\n"); RegCloseKey(hkey); - hkey = pSHGetShellKey(SHKEY_Root_HKLM, NULL, FALSE); + hkey = pSHGetShellKey(SHKEY_Root_HKLM, WineTestW, TRUE); + if (!hkey && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Not authorized to create keys\n"); + return; + } ok(hkey != NULL, "Can't create key\n"); - ok(SUCCEEDED(RegDeleteKeyW(hkey, WineTestW)), "Can't delte key\n"); RegCloseKey(hkey); if (!pSKGetValueW || !pSKSetValueW || !pSKDeleteValueW || !pSKAllocValueW)

1 0

Francois Gouget : urlmon/tests: Skip some tests if not allowed to modify the zone elevation feature.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 33ed63934523d423c243b0a733b112df8d64d082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ed63934523d423c243b0a73… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 21 00:41:07 2011 +0200 urlmon/tests: Skip some tests if not allowed to modify the zone elevation feature. --- dlls/urlmon/tests/misc.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index cfa04f0..d9aebc7 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1545,7 +1545,7 @@ static void test_internet_features_registry(void) { char *name; HKEY feature_control; HKEY feature; - DWORD value; + DWORD value, skip_zone; BOOL delete_feature_key = TRUE; BOOL delete_feature_control_key = FALSE; @@ -1615,21 +1615,32 @@ static void test_internet_features_registry(void) { value = 1; res = RegSetValueExA(feature, "*", 0, REG_DWORD, (BYTE*)&value, sizeof(DWORD)); - ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res); - - hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS); - ok(hres == S_OK, "CoInternetIsFeatureEnabled returned %08x, expected S_OK\n", hres); + if (res == ERROR_ACCESS_DENIED) + { + skip("Not allowed to modify zone elevation\n"); + skip_zone = 1; + } + else + { + skip_zone = 0; + ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res); + hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS); + ok(hres == S_OK, "CoInternetIsFeatureEnabled returned %08x, expected S_OK\n", hres); + } RegDeleteValueA(feature, "*"); RegCloseKey(feature); RegCloseKey(feature_control); /* Value is still cached from last time. */ - hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS); - ok(hres == S_OK, "CoInternetIsFeatureEnabled returned %08x, expected S_OK\n", hres); + if (!skip_zone) + { + hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS); + ok(hres == S_OK, "CoInternetIsFeatureEnabled returned %08x, expected S_OK\n", hres); - hres = pCoInternetSetFeatureEnabled(FEATURE_ZONE_ELEVATION, SET_FEATURE_ON_PROCESS, FALSE); - ok(hres == S_OK, "CoInternetSetFeatureEnabled failed: %08x\n", hres); + hres = pCoInternetSetFeatureEnabled(FEATURE_ZONE_ELEVATION, SET_FEATURE_ON_PROCESS, FALSE); + ok(hres == S_OK, "CoInternetSetFeatureEnabled failed: %08x\n", hres); + } test_internet_feature_defaults(); }

1 0

Francois Gouget : sti/tests: Skip some tests if not allowed to register our test application.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: b883b5574ec93e7a3fc70e25b0cbc9cbad57e397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b883b5574ec93e7a3fc70e25b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 21 00:41:44 2011 +0200 sti/tests: Skip some tests if not allowed to register our test application. --- dlls/sti/tests/sti.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index 7b9aade..f9839d4 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -244,12 +244,15 @@ static void test_launch_app_registry(void) if (SUCCEEDED(hr)) { hr = IStillImage_RegisterLaunchApplication(pStiW, appName, appName); - ok(SUCCEEDED(hr), "could not register launch application, error 0x%X\n", hr); - if (SUCCEEDED(hr)) + if (hr == E_ACCESSDENIED) + skip("Not authorized to register a launch application\n"); + else if (SUCCEEDED(hr)) { hr = IStillImage_UnregisterLaunchApplication(pStiW, appName); ok(SUCCEEDED(hr), "could not unregister launch application, error 0x%X\n", hr); } + else + ok(0, "could not register launch application, error 0x%X\n", hr); IStillImage_Release(pStiW); } else

1 0

Francois Gouget : ole32/tests: Skip some tests if not allowed to modify the Classes registry key.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 88ba9c32745fc295f8694661d138c7deab69850c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ba9c32745fc295f8694661d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 21 00:42:06 2011 +0200 ole32/tests: Skip some tests if not allowed to modify the Classes registry key. --- dlls/ole32/tests/marshal.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 33e074c..c178912 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2268,7 +2268,7 @@ static void test_freethreadedmarshaler(void) IMarshal_Release(pFTMarshal); } -static void reg_unreg_wine_test_class(BOOL Register) +static HRESULT reg_unreg_wine_test_class(BOOL Register) { HRESULT hr; char buffer[256]; @@ -2286,9 +2286,16 @@ static void reg_unreg_wine_test_class(BOOL Register) if (Register) { error = RegCreateKeyEx(HKEY_CLASSES_ROOT, buffer, 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey, &dwDisposition); + if (error == ERROR_ACCESS_DENIED) + { + skip("Not authorized to modify the Classes key\n"); + return E_FAIL; + } ok(error == ERROR_SUCCESS, "RegCreateKeyEx failed with error %d\n", error); + if (error != ERROR_SUCCESS) hr = E_FAIL; error = RegSetValueEx(hkey, NULL, 0, REG_SZ, (const unsigned char *)"\"ole32.dll\"", strlen("\"ole32.dll\"") + 1); ok(error == ERROR_SUCCESS, "RegSetValueEx failed with error %d\n", error); + if (error != ERROR_SUCCESS) hr = E_FAIL; RegCloseKey(hkey); } else @@ -2297,6 +2304,7 @@ static void reg_unreg_wine_test_class(BOOL Register) *strrchr(buffer, '\\') = '\0'; RegDeleteKey(HKEY_CLASSES_ROOT, buffer); } + return hr; } static void test_inproc_handler(void) @@ -2305,7 +2313,8 @@ static void test_inproc_handler(void) IUnknown *pObject; IUnknown *pObject2; - reg_unreg_wine_test_class(TRUE); + if (FAILED(reg_unreg_wine_test_class(TRUE))) + return; hr = CoCreateInstance(&CLSID_WineTest, NULL, CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void **)&pObject); ok_ole_success(hr, "CoCreateInstance"); @@ -2386,7 +2395,8 @@ static void test_handler_marshaling(void) HANDLE thread; static const LARGE_INTEGER ullZero; - reg_unreg_wine_test_class(TRUE); + if (FAILED(reg_unreg_wine_test_class(TRUE))) + return; cLocks = 0; hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream);

1 0

Rico Schüller : wined3d: Fix spelling.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: ef62e41fca1ce2932ab3c54a98da7c36cd7a3d37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef62e41fca1ce2932ab3c54a9… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 21 08:10:05 2011 +0200 wined3d: Fix spelling. --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6764b23..f9a2812 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -880,7 +880,7 @@ HRESULT CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) wined3d_state_record_lights(&stateblock->state, src_state); - TRACE("Captue done.\n"); + TRACE("Capture done.\n"); return WINED3D_OK; }

1 0

Hans Leidekker : msi: Support reading version information from OpenType/ CFF fonts.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 83ef90789fe3c41a6ed9925aa6facf3015235b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ef90789fe3c41a6ed9925aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 21 09:01:04 2011 +0200 msi: Support reading version information from OpenType/CFF fonts. --- dlls/msi/font.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index df7b4e7..a7778f7 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -111,7 +111,8 @@ static WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) ttOffsetTable.uMajorVersion = SWAPWORD(ttOffsetTable.uMajorVersion); ttOffsetTable.uMinorVersion = SWAPWORD(ttOffsetTable.uMinorVersion); - if (ttOffsetTable.uMajorVersion != 1 || ttOffsetTable.uMinorVersion != 0) + if ((ttOffsetTable.uMajorVersion != 1 || ttOffsetTable.uMinorVersion != 0) && + (ttOffsetTable.uMajorVersion != 0x4f54 || ttOffsetTable.uMinorVersion != 0x544f)) goto end; for (i=0; i< ttOffsetTable.uNumOfTables; i++) @@ -192,8 +193,10 @@ WCHAR *msi_font_version_from_file( const WCHAR *filename ) WCHAR *version, *p, *ret = NULL; int len; - if ((p = version = load_ttf_name_id( filename, NAME_ID_VERSION ))) + if ((version = load_ttf_name_id( filename, NAME_ID_VERSION ))) { + if ((p = strchrW( version, ';' ))) *p = 0; + p = version; while (*p && !isdigitW( *p )) p++; len = strlenW( p ) + strlenW(dotzerodotzeroW) + 1; ret = msi_alloc( len * sizeof(WCHAR) );

1 0

Hans Leidekker : oleacc: Add a version resource.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 91c3aa001f0408d46500ff8a5784647327ec3614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c3aa001f0408d46500ff8a5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 21 09:01:40 2011 +0200 oleacc: Add a version resource. --- dlls/oleacc/main.c | 4 ++-- dlls/oleacc/oleacc.rc | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 34bdb61..c554c8a 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -95,8 +95,8 @@ HRESULT WINAPI DllUnregisterServer(void) void WINAPI GetOleaccVersionInfo(DWORD* pVersion, DWORD* pBuild) { - *pVersion = MAKELONG(2,4); /* Windows XP version of oleacc: 4.2.5406.0 */ - *pBuild = MAKELONG(0,5406); + *pVersion = MAKELONG(0,7); /* Windows 7 version of oleacc: 7.0.0.0 */ + *pBuild = MAKELONG(0,0); } UINT WINAPI GetRoleTextW(DWORD role, LPWSTR lpRole, UINT rolemax) diff --git a/dlls/oleacc/oleacc.rc b/dlls/oleacc/oleacc.rc index e5f231c..bc705e0 100644 --- a/dlls/oleacc/oleacc.rc +++ b/dlls/oleacc/oleacc.rc @@ -90,3 +90,12 @@ STRINGTABLE ROLE_SYSTEM_IPADDRESS "IP address" ROLE_SYSTEM_OUTLINEBUTTON "outline button" } + +#define WINE_FILEDESCRIPTION_STR "Wine OLE Accessibility" +#define WINE_FILENAME_STR "oleacc.dll" +#define WINE_FILEVERSION 7,0,0,0 +#define WINE_FILEVERSION_STR "7.0.0.0" +#define WINE_PRODUCTVERSION 6,1,7600,16385 +#define WINE_PRODUCTVERSION_STR "6.1.6700.16385" + +#include "wine/wine_common_ver.rc"

1 0

Piotr Caban : shell32: Don't call SendMessage inside critical section.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 155fb98306ecf76c2e54348bd0e76ee75b268d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=155fb98306ecf76c2e54348bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 21 09:52:28 2011 +0200 shell32: Don't call SendMessage inside critical section. --- dlls/shell32/changenotify.c | 84 +++++++++++++++++++++--------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 43c81c3..96a20e2 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -253,14 +253,24 @@ static BOOL should_notify( LPCITEMIDLIST changed, LPCITEMIDLIST watched, BOOL su */ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2) { - LPCITEMIDLIST Pidls[2]; + struct notification_recipients { + struct list entry; + HWND hwnd; + DWORD msg; + DWORD flags; + } *cur, *next; + + LPITEMIDLIST Pidls[2]; LPNOTIFICATIONLIST ptr; - UINT typeFlag = uFlags & SHCNF_TYPE; + struct list recipients; Pidls[0] = NULL; Pidls[1] = NULL; - TRACE("(0x%08x,0x%08x,%p,%p):stub.\n", wEventId, uFlags, dwItem1, dwItem2); + TRACE("(0x%08x,0x%08x,%p,%p)\n", wEventId, uFlags, dwItem1, dwItem2); + + if(uFlags & ~(SHCNF_TYPE|SHCNF_FLUSH)) + FIXME("ignoring unsupported flags: %x\n", uFlags); if( ( wEventId & SHCNE_NOITEMEVENTS ) && ( dwItem1 || dwItem2 ) ) { @@ -288,7 +298,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID } /* convert paths in IDLists*/ - switch (typeFlag) + switch (uFlags & SHCNF_TYPE) { case SHCNF_PATHA: if (dwItem1) Pidls[0] = SHSimpleIDListFromPathA(dwItem1); @@ -299,8 +309,8 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID if (dwItem2) Pidls[1] = SHSimpleIDListFromPathW(dwItem2); break; case SHCNF_IDLIST: - Pidls[0] = dwItem1; - Pidls[1] = dwItem2; + Pidls[0] = ILClone(dwItem1); + Pidls[1] = ILClone(dwItem2); break; case SHCNF_PRINTERA: case SHCNF_PRINTERW: @@ -308,32 +318,18 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID return; case SHCNF_DWORD: default: - FIXME("unknown type %08x\n",typeFlag); + FIXME("unknown type %08x\n", uFlags & SHCNF_TYPE); return; } - { - WCHAR path[MAX_PATH]; - - if( Pidls[0] && SHGetPathFromIDListW(Pidls[0], path )) - TRACE("notify %08x on item1 = %s\n", wEventId, debugstr_w(path)); - - if( Pidls[1] && SHGetPathFromIDListW(Pidls[1], path )) - TRACE("notify %08x on item2 = %s\n", wEventId, debugstr_w(path)); - } - + list_init(&recipients); EnterCriticalSection(&SHELL32_ChangenotifyCS); - - /* loop through the list */ LIST_FOR_EACH_ENTRY( ptr, &notifications, NOTIFICATIONLIST, entry ) { - BOOL notify; + struct notification_recipients *item; + BOOL notify = FALSE; DWORD i; - notify = FALSE; - - TRACE("trying %p\n", ptr); - for( i=0; (i<ptr->cidl) && !notify ; i++ ) { LPCITEMIDLIST pidl = ptr->apidl[i].pidl; @@ -355,24 +351,35 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID if( !notify ) continue; - ptr->pidlSignaled = ILClone(Pidls[0]); + item = SHAlloc(sizeof(struct notification_recipients)); + if(!item) { + ERR("out of memory\n"); + continue; + } - TRACE("notifying %s, event %s(%x) before\n", NodeName( ptr ), DumpEvent( - wEventId ),wEventId ); + item->hwnd = ptr->hwnd; + item->msg = ptr->uMsg; + item->flags = ptr->dwFlags; + list_add_tail(&recipients, &item->entry); + } + LeaveCriticalSection(&SHELL32_ChangenotifyCS); + + LIST_FOR_EACH_ENTRY_SAFE(cur, next, &recipients, struct notification_recipients, entry) + { + TRACE("notifying %p, event %s(%x)\n", cur->hwnd, DumpEvent(wEventId), wEventId); ptr->wSignalledEvent |= wEventId; - if (ptr->dwFlags & SHCNRF_NewDelivery) - SendMessageA(ptr->hwnd, ptr->uMsg, (WPARAM) ptr, GetCurrentProcessId()); + if (cur->flags & SHCNRF_NewDelivery) + FIXME("SHCNRF_NewDelivery flag is not supported\n"); else - SendMessageA(ptr->hwnd, ptr->uMsg, (WPARAM)Pidls, wEventId); - - TRACE("notifying %s, event %s(%x) after\n", NodeName( ptr ), DumpEvent( - wEventId ),wEventId ); + SendMessageA(cur->hwnd, cur->msg, (WPARAM)Pidls, wEventId); + list_remove(&cur->entry); + SHFree(cur); } - TRACE("notify Done\n"); - LeaveCriticalSection(&SHELL32_ChangenotifyCS); + SHFree(Pidls[0]); + SHFree(Pidls[1]); if (wEventId & SHCNE_ASSOCCHANGED) { @@ -380,13 +387,6 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID TRACE("refreshing file type associations\n"); run_winemenubuilder( args ); } - - /* if we allocated it, free it. The ANSI flag is also set in its Unicode sibling. */ - if ((typeFlag & SHCNF_PATHA) || (typeFlag & SHCNF_PRINTERA)) - { - SHFree((LPITEMIDLIST)Pidls[0]); - SHFree((LPITEMIDLIST)Pidls[1]); - } } /*************************************************************************

1 0