ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
March 2012
----- 2024 -----
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
22 participants
351 discussions
Start a n
N
ew thread
[jimtabor] 56164: [IMM32_WINETEST] - Sync to Wine 1.4 or Head.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Thu Mar 15 21:45:07 2012 New Revision: 56164 URL:
http://svn.reactos.org/svn/reactos?rev=56164&view=rev
Log: [IMM32_WINETEST] - Sync to Wine 1.4 or Head. Modified: trunk/rostests/winetests/imm32/imm32.c Modified: trunk/rostests/winetests/imm32/imm32.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/imm32.c?r…
============================================================================== --- trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] Thu Mar 15 21:45:07 2012 @@ -573,6 +573,51 @@ ok(ImmReleaseContext(hwnd, himc), "ImmReleaseContext failed\n"); } +static void test_ImmGetDescription(void) +{ + HKL hkl; + WCHAR japime[] = { 'E', '0', '0', '1', '0', '4', '1', '1', 0 }; + WCHAR descW[100]; + CHAR descA[100]; + UINT ret, lret; + + /* FIXME: invalid keyboard layouts should not pass */ + ret = ImmGetDescriptionW(NULL, NULL, 0); + todo_wine ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + + /* load a language with valid IMM descriptions */ + hkl = LoadKeyboardLayoutW(japime, KLF_ACTIVATE); + todo_wine ok(hkl != 0, "LoadKeyboardLayoutW failed, expected != 0.\n"); + + ret = ImmGetDescriptionW(hkl, NULL, 0); + if(!ret) + { + win_skip("ImmGetDescriptionW is not working for current loaded keyboard.\n"); + return; + } + + ret = ImmGetDescriptionW(hkl, descW, 0); + ok(ret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); + + lret = ImmGetDescriptionW(hkl, descW, ret + 1); + ok(lret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); + ok(lret == ret, "ImmGetDescriptionW failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + + lret = ImmGetDescriptionA(hkl, descA, ret + 1); + ok(lret, "ImmGetDescriptionA failed, expected != 0 received 0.\n"); + todo_wine ok(lret == ret, "ImmGetDescriptionA failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + + ret /= 2; /* try to copy partially */ + lret = ImmGetDescriptionW(hkl, descW, ret + 1); + ok(lret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); + ok(lret == ret, "ImmGetDescriptionW failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); + + ret = ImmGetDescriptionW(hkl, descW, 1); + ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); + + UnloadKeyboardLayout(hkl); +} + START_TEST(imm32) { if (init()) { @@ -584,6 +629,7 @@ test_ImmThreads(); test_ImmIsUIMessage(); test_ImmGetContext(); + test_ImmGetDescription(); } cleanup(); }
12 years, 6 months
1
0
0
0
[jimtabor] 56163: [IMM32] - Sync to Wine 1.3.37
by jimtabor@svn.reactos.org
Author: jimtabor Date: Thu Mar 15 21:42:01 2012 New Revision: 56163 URL:
http://svn.reactos.org/svn/reactos?rev=56163&view=rev
Log: [IMM32] - Sync to Wine 1.3.37 Modified: trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/dll/win32/imm32/imm32.spec Modified: trunk/reactos/dll/win32/imm32/imm.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=…
============================================================================== --- trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] Thu Mar 15 21:42:01 2012 @@ -2845,3 +2845,13 @@ FIXME("Stub\n"); return FALSE; } + +/*********************************************************************** + * ImmGetHotKey(IMM32.@) + */ + +BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) +{ + FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); + return FALSE; +} Modified: trunk/reactos/dll/win32/imm32/imm32.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.spec…
============================================================================== --- trunk/reactos/dll/win32/imm32/imm32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm32.spec [iso-8859-1] Thu Mar 15 21:42:01 2012 @@ -39,7 +39,7 @@ @ stdcall ImmGetDescriptionW(long ptr long) @ stdcall ImmGetGuideLineA(long long ptr long) @ stdcall ImmGetGuideLineW(long long ptr long) -@ stub ImmGetHotKey +@ stdcall ImmGetHotKey(long ptr ptr ptr) @ stdcall ImmGetIMCCLockCount(long) @ stdcall ImmGetIMCCSize(long) @ stdcall ImmGetIMCLockCount(long)
12 years, 6 months
1
0
0
0
[rharabien] 56162: [AVIFIL32] - Sync to Wine 1.3.37
by rharabien@svn.reactos.org
Author: rharabien Date: Thu Mar 15 21:32:52 2012 New Revision: 56162 URL:
http://svn.reactos.org/svn/reactos?rev=56162&view=rev
Log: [AVIFIL32] - Sync to Wine 1.3.37 Added: trunk/reactos/dll/win32/avifil32/avifile.rgs Removed: trunk/reactos/dll/win32/avifil32/regsvr.c Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt trunk/reactos/dll/win32/avifil32/acmstream.c trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/avifile_Bg.rc trunk/reactos/dll/win32/avifil32/avifile_Cs.rc trunk/reactos/dll/win32/avifil32/avifile_Da.rc trunk/reactos/dll/win32/avifil32/avifile_De.rc trunk/reactos/dll/win32/avifil32/avifile_En.rc trunk/reactos/dll/win32/avifil32/avifile_Es.rc trunk/reactos/dll/win32/avifil32/avifile_Fr.rc trunk/reactos/dll/win32/avifil32/avifile_Hu.rc trunk/reactos/dll/win32/avifil32/avifile_It.rc trunk/reactos/dll/win32/avifil32/avifile_Ja.rc trunk/reactos/dll/win32/avifil32/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/avifile_Lt.rc trunk/reactos/dll/win32/avifil32/avifile_Nl.rc trunk/reactos/dll/win32/avifil32/avifile_No.rc trunk/reactos/dll/win32/avifil32/avifile_Pl.rc trunk/reactos/dll/win32/avifil32/avifile_Pt.rc trunk/reactos/dll/win32/avifil32/avifile_Ro.rc trunk/reactos/dll/win32/avifil32/avifile_Ru.rc trunk/reactos/dll/win32/avifil32/avifile_Si.rc trunk/reactos/dll/win32/avifil32/avifile_Sv.rc trunk/reactos/dll/win32/avifil32/avifile_Tr.rc trunk/reactos/dll/win32/avifil32/avifile_Uk.rc trunk/reactos/dll/win32/avifil32/avifile_Zh.rc trunk/reactos/dll/win32/avifil32/avifile_private.h trunk/reactos/dll/win32/avifil32/editstream.c trunk/reactos/dll/win32/avifil32/extrachunk.h trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/dll/win32/avifil32/icmstream.c trunk/reactos/dll/win32/avifil32/rsrc.rc trunk/reactos/dll/win32/avifil32/tmpfile.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLi…
Modified: trunk/reactos/dll/win32/avifil32/acmstream.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstre…
Modified: trunk/reactos/dll/win32/avifil32/api.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r…
Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Added: trunk/reactos/dll/win32/avifil32/avifile.rgs URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Bg.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Cs.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Da.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_De.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_En.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Es.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Fr.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Hu.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_It.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Ja.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Ko.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Lt.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Nl.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_No.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Pl.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Pt.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Ro.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Ru.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Si.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Sv.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Tr.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Uk.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_Zh.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr…
Modified: trunk/reactos/dll/win32/avifil32/extrachunk.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach…
Modified: trunk/reactos/dll/win32/avifil32/factory.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory…
Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getfram…
Modified: trunk/reactos/dll/win32/avifil32/icmstream.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstre…
Removed: trunk/reactos/dll/win32/avifil32/regsvr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/regsvr.…
Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc…
Modified: trunk/reactos/dll/win32/avifil32/tmpfile.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/tmpfile…
Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
12 years, 6 months
1
0
0
0
[rharabien] 56161: [AVIFIL32_WINETEST] - Sync to Wine 1.3.37
by rharabien@svn.reactos.org
Author: rharabien Date: Thu Mar 15 21:28:56 2012 New Revision: 56161 URL:
http://svn.reactos.org/svn/reactos?rev=56161&view=rev
Log: [AVIFIL32_WINETEST] - Sync to Wine 1.3.37 Modified: trunk/rostests/winetests/avifil32/api.c Modified: trunk/rostests/winetests/avifil32/api.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/api.c?…
============================================================================== --- trunk/rostests/winetests/avifil32/api.c [iso-8859-1] (original) +++ trunk/rostests/winetests/avifil32/api.c [iso-8859-1] Thu Mar 15 21:28:56 2012 @@ -194,11 +194,11 @@ SetLastError(0xdeadbeef); hres = EditStreamSetNameA(streams[0], winetest0); - todo_wine ok(hres == AVIERR_OK, "0: got 0x%x (expected AVIERR_OK)\n", hres); + ok(hres == AVIERR_OK, "0: got 0x%x (expected AVIERR_OK)\n", hres); SetLastError(0xdeadbeef); hres = EditStreamSetNameA(streams[1], winetest1); - todo_wine ok(hres == AVIERR_OK, "1: got 0x%x (expected AVIERR_OK)\n", hres); + ok(hres == AVIERR_OK, "1: got 0x%x (expected AVIERR_OK)\n", hres); if (winetest_interactive) { SetLastError(0xdeadbeef); @@ -222,6 +222,102 @@ } /* ########################### */ + +static void test_EditStreamSetInfo(void) +{ + PAVISTREAM stream = NULL; + HRESULT hres; + AVISTREAMINFO info, info2; + + hres = CreateEditableStream(&stream, NULL); + ok(hres == AVIERR_OK, "got 0x%08X, expected AVIERR_OK\n", hres); + + /* Size parameter is somehow checked (notice the crash with size=-1 below) */ + hres = EditStreamSetInfo(stream, NULL, 0); + ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); + + hres = EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO)-1 ); + ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); + + if(0) + { + /* Crashing - first parameter not checked */ + EditStreamSetInfo(NULL, &info, sizeof(AVISTREAMINFO) ); + + /* Crashing - second parameter not checked */ + EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO) ); + + EditStreamSetInfo(stream, NULL, -1); + } + + hres = AVIStreamInfo(stream, &info, sizeof(AVISTREAMINFO) ); + ok( hres == 0, "got 0x%08X, expected 0\n", hres); + + /* Does the function check what's it's updating ? */ + +#define IS_INFO_UPDATED(m) do { \ + hres = EditStreamSetInfo(stream, &info, sizeof(AVISTREAMINFO) ); \ + ok( hres == 0, "got 0x%08X, expected 0\n", hres); \ + hres = AVIStreamInfo(stream, &info2, sizeof(AVISTREAMINFO) ); \ + ok( hres == 0, "got 0x%08X, expected 0\n", hres); \ + ok( info2.m == info.m, "EditStreamSetInfo did not update "#m" parameter\n" ); \ + } while(0) + + info.dwStart++; + IS_INFO_UPDATED(dwStart); + info.dwStart = 0; + IS_INFO_UPDATED(dwStart); + + info.wPriority++; + IS_INFO_UPDATED(wPriority); + info.wPriority = 0; + IS_INFO_UPDATED(wPriority); + + info.wLanguage++; + IS_INFO_UPDATED(wLanguage); + info.wLanguage = 0; + IS_INFO_UPDATED(wLanguage); + + info.dwScale++; + IS_INFO_UPDATED(dwScale); + info.dwScale = 0; + IS_INFO_UPDATED(dwScale); + + info.dwRate++; + IS_INFO_UPDATED(dwRate); + info.dwRate = 0; + IS_INFO_UPDATED(dwRate); + + info.dwQuality++; + IS_INFO_UPDATED(dwQuality); + info.dwQuality = 0; + IS_INFO_UPDATED(dwQuality); + info.dwQuality = -2; + IS_INFO_UPDATED(dwQuality); + info.dwQuality = ICQUALITY_HIGH+1; + IS_INFO_UPDATED(dwQuality); + + info.rcFrame.left = 0; + IS_INFO_UPDATED(rcFrame.left); + info.rcFrame.top = 0; + IS_INFO_UPDATED(rcFrame.top); + info.rcFrame.right = 0; + IS_INFO_UPDATED(rcFrame.right); + info.rcFrame.bottom = 0; + IS_INFO_UPDATED(rcFrame.bottom); + + info.rcFrame.left = -1; + IS_INFO_UPDATED(rcFrame.left); + info.rcFrame.top = -1; + IS_INFO_UPDATED(rcFrame.top); + info.rcFrame.right = -1; + IS_INFO_UPDATED(rcFrame.right); + info.rcFrame.bottom = -1; + IS_INFO_UPDATED(rcFrame.bottom); + AVIStreamRelease(stream); +#undef IS_INFO_UPDATED +} + static void init_test_struct(COMMON_AVI_HEADERS *cah) { @@ -451,6 +547,7 @@ { AVIFileInit(); + test_EditStreamSetInfo(); test_AVISaveOptions(); test_default_data(); test_amh_corruption();
12 years, 6 months
1
0
0
0
[pschweitzer] 56160: [KBSWITCH] Properly use the single instance mutex
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Thu Mar 15 20:56:26 2012 New Revision: 56160 URL:
http://svn.reactos.org/svn/reactos?rev=56160&view=rev
Log: [KBSWITCH] Properly use the single instance mutex Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Thu Mar 15 20:56:26 2012 @@ -519,8 +519,14 @@ HANDLE hMutex; hMutex = CreateMutex(NULL, FALSE, szKbSwitcherName); - if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) + if (!hMutex) return 1; + + if (GetLastError() == ERROR_ALREADY_EXISTS) + { + CloseHandle(hMutex); + return 1; + } hInst = hInstance; hProcessHeap = GetProcessHeap(); @@ -537,7 +543,10 @@ WndClass.lpszClassName = szKbSwitcherName; if (!RegisterClass(&WndClass)) + { + CloseHandle(hMutex); return 1; + } CreateWindow(szKbSwitcherName, NULL, 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL); @@ -547,7 +556,7 @@ DispatchMessage(&msg); } - if (hMutex) CloseHandle(hMutex); + CloseHandle(hMutex); return 0; }
12 years, 6 months
1
0
0
0
[rharabien] 56159: [ATL] - Sync to Wine 1.3.37
by rharabien@svn.reactos.org
Author: rharabien Date: Thu Mar 15 20:17:15 2012 New Revision: 56159 URL:
http://svn.reactos.org/svn/reactos?rev=56159&view=rev
Log: [ATL] - Sync to Wine 1.3.37 Modified: trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/dll/win32/atl/atl_main.c trunk/reactos/dll/win32/atl/atl_ros.diff trunk/reactos/dll/win32/atl/registrar.c Modified: trunk/reactos/dll/win32/atl/atl_ax.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev…
============================================================================== --- trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] Thu Mar 15 20:17:15 2012 @@ -41,11 +41,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); typedef struct IOCS { - const IOleClientSiteVtbl *lpOleClientSiteVtbl; - const IOleContainerVtbl *lpOleContainerVtbl; - const IOleInPlaceSiteWindowlessVtbl *lpOleInPlaceSiteWindowlessVtbl; - const IOleInPlaceFrameVtbl *lpOleInPlaceFrameVtbl; - const IOleControlSiteVtbl *lpOleControlSiteVtbl; + IOleClientSite IOleClientSite_iface; + IOleContainer IOleContainer_iface; + IOleInPlaceSiteWindowless IOleInPlaceSiteWindowless_iface; + IOleInPlaceFrame IOleInPlaceFrame_iface; + IOleControlSite IOleControlSite_iface; LONG ref; HWND hWnd; @@ -126,12 +126,6 @@ return ref; } -#define THIS2IOLECLIENTSITE(This) ((IOleClientSite*)&(This)->lpOleClientSiteVtbl) -#define THIS2IOLECONTAINER(This) (&(This)->lpOleContainerVtbl) -#define THIS2IOLEINPLACESITEWINDOWLESS(This) (&(This)->lpOleInPlaceSiteWindowlessVtbl) -#define THIS2IOLEINPLACEFRAME(This) (&(This)->lpOleInPlaceFrameVtbl) -#define THIS2IOLECONTROLSITE(This) (&(This)->lpOleControlSiteVtbl) - static HRESULT IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -139,19 +133,19 @@ if ( IsEqualIID( &IID_IUnknown, riid ) || IsEqualIID( &IID_IOleClientSite, riid ) ) { - *ppv = THIS2IOLECLIENTSITE(This); + *ppv = &This->IOleClientSite_iface; } else if ( IsEqualIID( &IID_IOleContainer, riid ) ) { - *ppv = THIS2IOLECONTAINER(This); + *ppv = &This->IOleContainer_iface; } else if ( IsEqualIID( &IID_IOleInPlaceSite, riid ) || IsEqualIID( &IID_IOleInPlaceSiteEx, riid ) || IsEqualIID( &IID_IOleInPlaceSiteWindowless, riid ) ) { - *ppv = THIS2IOLEINPLACESITEWINDOWLESS(This); + *ppv = &This->IOleInPlaceSiteWindowless_iface; } else if ( IsEqualIID( &IID_IOleInPlaceFrame, riid ) ) { - *ppv = THIS2IOLEINPLACEFRAME(This); + *ppv = &This->IOleInPlaceFrame_iface; } else if ( IsEqualIID( &IID_IOleControlSite, riid ) ) { - *ppv = THIS2IOLECONTROLSITE(This); + *ppv = &This->IOleControlSite_iface; } if (*ppv) @@ -181,154 +175,181 @@ return ref; } -#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) - /****** IOleClientSite *****/ -#undef IFACE2THIS -#define IFACE2THIS(iface) DEFINE_THIS(IOCS,OleClientSite, iface) +static inline IOCS *impl_from_IOleClientSite(IOleClientSite *iface) +{ + return CONTAINING_RECORD(iface, IOCS, IOleClientSite_iface); +} + static HRESULT WINAPI OleClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **ppv) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleClientSite(iface); return IOCS_QueryInterface(This, riid, ppv); } + static ULONG WINAPI OleClientSite_AddRef(IOleClientSite *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleClientSite(iface); return IOCS_AddRef(This); } + static ULONG WINAPI OleClientSite_Release(IOleClientSite *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleClientSite(iface); return IOCS_Release(This); } + static HRESULT WINAPI OleClientSite_SaveObject(IOleClientSite *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleClientSite(iface); FIXME( "(%p) - stub\n", This ); return E_NOTIMPL; } + static HRESULT WINAPI OleClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleClientSite(iface); FIXME( "(%p, 0x%x, 0x%x, %p)\n", This, dwAssign, dwWhichMoniker, ppmk ); return E_NOTIMPL; } + static HRESULT WINAPI OleClientSite_GetContainer(IOleClientSite *iface, IOleContainer **ppContainer) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleClientSite(iface); TRACE( "(%p, %p)\n", This, ppContainer ); return OleClientSite_QueryInterface( iface, &IID_IOleContainer, (void**)ppContainer ); } + static HRESULT WINAPI OleClientSite_ShowObject(IOleClientSite *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleClientSite(iface); FIXME( "(%p) - stub\n", This ); return S_OK; } + static HRESULT WINAPI OleClientSite_OnShowWindow(IOleClientSite *iface, BOOL fShow) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleClientSite(iface); FIXME( "(%p, %s) - stub\n", This, fShow ? "TRUE" : "FALSE" ); return E_NOTIMPL; } + static HRESULT WINAPI OleClientSite_RequestNewObjectLayout(IOleClientSite *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleClientSite(iface); FIXME( "(%p) - stub\n", This ); return E_NOTIMPL; } -#undef IFACE2THIS /****** IOleContainer *****/ -#define IFACE2THIS(iface) DEFINE_THIS(IOCS, OleContainer, iface) +static inline IOCS *impl_from_IOleContainer(IOleContainer *iface) +{ + return CONTAINING_RECORD(iface, IOCS, IOleContainer_iface); +} + static HRESULT WINAPI OleContainer_QueryInterface( IOleContainer* iface, REFIID riid, void** ppv) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleContainer(iface); return IOCS_QueryInterface( This, riid, ppv ); } + static ULONG WINAPI OleContainer_AddRef(IOleContainer* iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleContainer(iface); return IOCS_AddRef(This); } + static ULONG WINAPI OleContainer_Release(IOleContainer* iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleContainer(iface); return IOCS_Release(This); } + static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer* iface, IBindCtx* pbc, LPOLESTR pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleContainer(iface); FIXME( "(%p,%p,%s,%p,%p) - stub\n", This, pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut ); return E_NOTIMPL; } + static HRESULT WINAPI OleContainer_EnumObjects(IOleContainer* iface, DWORD grfFlags, IEnumUnknown** ppenum) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleContainer(iface); FIXME( "(%p, %u, %p) - stub\n", This, grfFlags, ppenum ); return E_NOTIMPL; } + static HRESULT WINAPI OleContainer_LockContainer(IOleContainer* iface, BOOL fLock) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleContainer(iface); FIXME( "(%p, %s) - stub\n", This, fLock?"TRUE":"FALSE" ); return E_NOTIMPL; } -#undef IFACE2THIS /****** IOleInPlaceSiteWindowless *******/ -#define IFACE2THIS(iface) DEFINE_THIS(IOCS, OleInPlaceSiteWindowless, iface) +static inline IOCS *impl_from_IOleInPlaceSiteWindowless(IOleInPlaceSiteWindowless *iface) +{ + return CONTAINING_RECORD(iface, IOCS, IOleInPlaceSiteWindowless_iface); +} + static HRESULT WINAPI OleInPlaceSiteWindowless_QueryInterface(IOleInPlaceSiteWindowless *iface, REFIID riid, void **ppv) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); return IOCS_QueryInterface(This, riid, ppv); } + static ULONG WINAPI OleInPlaceSiteWindowless_AddRef(IOleInPlaceSiteWindowless *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); return IOCS_AddRef(This); } + static ULONG WINAPI OleInPlaceSiteWindowless_Release(IOleInPlaceSiteWindowless *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); return IOCS_Release(This); } + static HRESULT WINAPI OleInPlaceSiteWindowless_GetWindow(IOleInPlaceSiteWindowless* iface, HWND* phwnd) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); TRACE("(%p,%p)\n", This, phwnd); *phwnd = This->hWnd; return S_OK; } + static HRESULT WINAPI OleInPlaceSiteWindowless_ContextSensitiveHelp(IOleInPlaceSiteWindowless* iface, BOOL fEnterMode) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); FIXME("(%p,%d) - stub\n", This, fEnterMode); return E_NOTIMPL; } + static HRESULT WINAPI OleInPlaceSiteWindowless_CanInPlaceActivate(IOleInPlaceSiteWindowless *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); TRACE("(%p)\n", This); return S_OK; } + static HRESULT WINAPI OleInPlaceSiteWindowless_OnInPlaceActivate(IOleInPlaceSiteWindowless *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); TRACE("(%p)\n", This); This->fInPlace = TRUE; return S_OK; } + static HRESULT WINAPI OleInPlaceSiteWindowless_OnUIActivate(IOleInPlaceSiteWindowless *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); TRACE("(%p)\n", This); @@ -338,7 +359,7 @@ IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, LPRECT lprcClipRect, LPOLEINPLACEFRAMEINFO lpFrameInfo) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); TRACE("(%p,%p,%p,%p,%p,%p)\n", This, ppFrame, ppDoc, lprcPosRect, lprcClipRect, lpFrameInfo); @@ -365,48 +386,55 @@ return S_OK; } + static HRESULT WINAPI OleInPlaceSiteWindowless_Scroll(IOleInPlaceSiteWindowless *iface, SIZE scrollExtent) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); FIXME("(%p) - stub\n", This); return E_NOTIMPL; } + static HRESULT WINAPI OleInPlaceSiteWindowless_OnUIDeactivate(IOleInPlaceSiteWindowless *iface, BOOL fUndoable) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); FIXME("(%p,%d) - stub\n", This, fUndoable); return E_NOTIMPL; } + static HRESULT WINAPI OleInPlaceSiteWindowless_OnInPlaceDeactivate(IOleInPlaceSiteWindowless *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); TRACE("(%p)\n", This); This->fInPlace = This->fWindowless = FALSE; return S_OK; } + static HRESULT WINAPI OleInPlaceSiteWindowless_DiscardUndoState(IOleInPlaceSiteWindowless *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); FIXME("(%p) - stub\n", This); return E_NOTIMPL; } + static HRESULT WINAPI OleInPlaceSiteWindowless_DeactivateAndUndo(IOleInPlaceSiteWindowless *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); FIXME("(%p) - stub\n", This); return E_NOTIMPL; } + static HRESULT WINAPI OleInPlaceSiteWindowless_OnPosRectChange(IOleInPlaceSiteWindowless *iface, LPCRECT lprcPosRect) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); FIXME("(%p,%p) - stub\n", This, lprcPosRect); return E_NOTIMPL; } + static HRESULT WINAPI OleInPlaceSiteWindowless_OnInPlaceActivateEx( IOleInPlaceSiteWindowless *iface, BOOL* pfNoRedraw, DWORD dwFlags) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); TRACE("\n"); @@ -415,9 +443,10 @@ This->fWindowless = TRUE; return S_OK; } + static HRESULT WINAPI OleInPlaceSiteWindowless_OnInPlaceDeactivateEx( IOleInPlaceSiteWindowless *iface, BOOL fNoRedraw) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceSiteWindowless(iface); TRACE("\n"); @@ -489,29 +518,35 @@ FIXME("\n"); return E_NOTIMPL; } -#undef IFACE2THIS /****** IOleInPlaceFrame *******/ -#define IFACE2THIS(iface) DEFINE_THIS(IOCS, OleInPlaceFrame, iface) +static inline IOCS *impl_from_IOleInPlaceFrame(IOleInPlaceFrame *iface) +{ + return CONTAINING_RECORD(iface, IOCS, IOleInPlaceFrame_iface); +} + static HRESULT WINAPI OleInPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); return IOCS_QueryInterface(This, riid, ppv); } + static ULONG WINAPI OleInPlaceFrame_AddRef(IOleInPlaceFrame *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); return IOCS_AddRef(This); } + static ULONG WINAPI OleInPlaceFrame_Release(IOleInPlaceFrame *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); return IOCS_Release(This); } + static HRESULT WINAPI OleInPlaceFrame_GetWindow(IOleInPlaceFrame *iface, HWND *phWnd) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); TRACE( "(%p,%p)\n", This, phWnd ); @@ -521,7 +556,7 @@ static HRESULT WINAPI OleInPlaceFrame_ContextSensitiveHelp(IOleInPlaceFrame *iface, BOOL fEnterMode) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); FIXME( "(%p,%d) - stub\n", This, fEnterMode ); return E_NOTIMPL; @@ -529,7 +564,7 @@ static HRESULT WINAPI OleInPlaceFrame_GetBorder(IOleInPlaceFrame *iface, LPRECT lprectBorder) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); FIXME( "(%p,%p) - stub\n", This, lprectBorder ); return E_NOTIMPL; @@ -537,7 +572,7 @@ static HRESULT WINAPI OleInPlaceFrame_RequestBorderSpace(IOleInPlaceFrame *iface, LPCBORDERWIDTHS pborderwidths) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); FIXME( "(%p,%p) - stub\n", This, pborderwidths ); return E_NOTIMPL; @@ -545,7 +580,7 @@ static HRESULT WINAPI OleInPlaceFrame_SetBorderSpace(IOleInPlaceFrame *iface, LPCBORDERWIDTHS pborderwidths) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); FIXME( "(%p,%p) - stub\n", This, pborderwidths ); return E_NOTIMPL; @@ -553,7 +588,7 @@ static HRESULT WINAPI OleInPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); FIXME( "(%p,%p,%s) - stub\n", This, pActiveObject, debugstr_w(pszObjName) ); return S_OK; @@ -561,7 +596,7 @@ static HRESULT WINAPI OleInPlaceFrame_InsertMenus(IOleInPlaceFrame *iface, HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); FIXME( "(%p,%p,%p) - stub\n", This, hmenuShared, lpMenuWidths ); return E_NOTIMPL; @@ -569,14 +604,15 @@ static HRESULT WINAPI OleInPlaceFrame_SetMenu(IOleInPlaceFrame *iface, HMENU hmenuShared, HOLEMENU holemenu, HWND hwndActiveObject) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); FIXME( "(%p,%p,%p,%p) - stub\n", This, hmenuShared, holemenu, hwndActiveObject ); return E_NOTIMPL; } + static HRESULT WINAPI OleInPlaceFrame_RemoveMenus(IOleInPlaceFrame *iface, HMENU hmenuShared) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); FIXME( "(%p, %p) - stub\n", This, hmenuShared ); return E_NOTIMPL; @@ -584,7 +620,7 @@ static HRESULT WINAPI OleInPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLESTR pszStatusText) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); FIXME( "(%p, %s) - stub\n", This, debugstr_w( pszStatusText ) ); return E_NOTIMPL; @@ -592,7 +628,7 @@ static HRESULT WINAPI OleInPlaceFrame_EnableModeless(IOleInPlaceFrame *iface, BOOL fEnable) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); FIXME( "(%p, %d) - stub\n", This, fEnable ); return E_NOTIMPL; @@ -600,31 +636,37 @@ static HRESULT WINAPI OleInPlaceFrame_TranslateAccelerator(IOleInPlaceFrame *iface, LPMSG lpmsg, WORD wID) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleInPlaceFrame(iface); FIXME( "(%p, %p, %x) - stub\n", This, lpmsg, wID ); return E_NOTIMPL; } -#undef IFACE2THIS /****** IOleControlSite *******/ -#define IFACE2THIS(iface) DEFINE_THIS(IOCS, OleControlSite, iface) +static inline IOCS *impl_from_IOleControlSite(IOleControlSite *iface) +{ + return CONTAINING_RECORD(iface, IOCS, IOleControlSite_iface); +} + static HRESULT WINAPI OleControlSite_QueryInterface(IOleControlSite *iface, REFIID riid, void **ppv) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleControlSite(iface); return IOCS_QueryInterface(This, riid, ppv); } + static ULONG WINAPI OleControlSite_AddRef(IOleControlSite *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleControlSite(iface); return IOCS_AddRef(This); } + static ULONG WINAPI OleControlSite_Release(IOleControlSite *iface) { - IOCS *This = IFACE2THIS(iface); + IOCS *This = impl_from_IOleControlSite(iface); return IOCS_Release(This); } + static HRESULT WINAPI OleControlSite_OnControlInfoChanged( IOleControlSite* This) { FIXME( "\n" ); @@ -660,8 +702,6 @@ FIXME( "\n" ); return E_NOTIMPL; } -#undef IFACE2THIS - static const IOleClientSiteVtbl OleClientSite_vtbl = { @@ -860,7 +900,7 @@ { This->hWnd = hWnd; IUnknown_QueryInterface( pUnkControl, &IID_IOleObject, (void**)&This->control ); - IOleObject_SetClientSite( This->control, THIS2IOLECLIENTSITE( This ) ); + IOleObject_SetClientSite( This->control, &This->IOleClientSite_iface ); SetWindowLongPtrW( hWnd, GWLP_USERDATA, (ULONG_PTR) This ); This->OrigWndProc = (WNDPROC)SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (ULONG_PTR) AtlHost_wndproc ); @@ -876,7 +916,8 @@ GetClientRect( This->hWnd, &rect ); IOCS_OnSize( This, &rect ); - IOleObject_DoVerb( This->control, OLEIVERB_INPLACEACTIVATE, NULL, THIS2IOLECLIENTSITE( This ), 0, This->hWnd, &rect ); + IOleObject_DoVerb( This->control, OLEIVERB_INPLACEACTIVATE, NULL, &This->IOleClientSite_iface, + 0, This->hWnd, &rect ); return S_OK; } @@ -895,11 +936,11 @@ if (!This) return E_OUTOFMEMORY; - This->lpOleClientSiteVtbl = &OleClientSite_vtbl; - This->lpOleContainerVtbl = &OleContainer_vtbl; - This->lpOleInPlaceSiteWindowlessVtbl = &OleInPlaceSiteWindowless_vtbl; - This->lpOleInPlaceFrameVtbl = &OleInPlaceFrame_vtbl; - This->lpOleControlSiteVtbl = &OleControlSite_vtbl; + This->IOleClientSite_iface.lpVtbl = &OleClientSite_vtbl; + This->IOleContainer_iface.lpVtbl = &OleContainer_vtbl; + This->IOleInPlaceSiteWindowless_iface.lpVtbl = &OleInPlaceSiteWindowless_vtbl; + This->IOleInPlaceFrame_iface.lpVtbl = &OleInPlaceFrame_vtbl; + This->IOleControlSite_iface.lpVtbl = &OleControlSite_vtbl; This->ref = 1; This->OrigWndProc = NULL; @@ -1170,7 +1211,7 @@ src += strlenW(src) + 1; /* title */ if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */ { - static const WCHAR AtlAxWin[9]={'A','t','l','A','x','W','i','n',0}; + static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n', 0}; PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WCHAR)); PUT_BLOCK(tmp, strlenW(tmp)+1); } else Modified: trunk/reactos/dll/win32/atl/atl_main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_main.c?r…
============================================================================== --- trunk/reactos/dll/win32/atl/atl_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_main.c [iso-8859-1] Thu Mar 15 20:17:15 2012 @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); -HINSTANCE hInst; +DECLSPEC_HIDDEN HINSTANCE hInst; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -464,21 +464,29 @@ TRACE("wci->m_wc.lpszClassName = %s\n", wci->m_wc.lpszClassName); + if (wci->m_lpszOrigName) + FIXME( "subclassing %s not implemented\n", debugstr_a(wci->m_lpszOrigName)); + if (!wci->m_wc.lpszClassName) { - sprintf(wci->m_szAutoName, "ATL%08lx", (UINT_PTR)wci); + snprintf(wci->m_szAutoName, sizeof(wci->m_szAutoName), "ATL%08lx", (UINT_PTR)wci); TRACE("auto-generated class name %s\n", wci->m_szAutoName); wci->m_wc.lpszClassName = wci->m_szAutoName; } atom = GetClassInfoExA(pm->m_hInst, wci->m_wc.lpszClassName, &wc); if (!atom) + { + wci->m_wc.hInstance = pm->m_hInst; + wci->m_wc.hCursor = LoadCursorA( wci->m_bSystemCursor ? NULL : pm->m_hInst, + wci->m_lpszCursorID ); atom = RegisterClassExA(&wci->m_wc); - + } wci->pWndProc = wci->m_wc.lpfnWndProc; wci->m_atom = atom; } - *pProc = wci->pWndProc; + + if (wci->m_lpszOrigName) *pProc = wci->pWndProc; TRACE("returning 0x%04x\n", atom); return atom; @@ -515,22 +523,30 @@ TRACE("wci->m_wc.lpszClassName = %s\n", debugstr_w(wci->m_wc.lpszClassName)); + if (wci->m_lpszOrigName) + FIXME( "subclassing %s not implemented\n", debugstr_w(wci->m_lpszOrigName)); + if (!wci->m_wc.lpszClassName) { static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; - sprintfW(wci->m_szAutoName, szFormat, (UINT_PTR)wci); + snprintfW(wci->m_szAutoName, sizeof(wci->m_szAutoName)/sizeof(WCHAR), szFormat, (UINT_PTR)wci); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; } atom = GetClassInfoExW(pm->m_hInst, wci->m_wc.lpszClassName, &wc); if (!atom) + { + wci->m_wc.hInstance = pm->m_hInst; + wci->m_wc.hCursor = LoadCursorW( wci->m_bSystemCursor ? NULL : pm->m_hInst, + wci->m_lpszCursorID ); atom = RegisterClassExW(&wci->m_wc); - + } wci->pWndProc = wci->m_wc.lpfnWndProc; wci->m_atom = atom; } - *pProc = wci->pWndProc; + + if (wci->m_lpszOrigName) *pProc = wci->pWndProc; TRACE("returning 0x%04x\n", atom); return atom; Modified: trunk/reactos/dll/win32/atl/atl_ros.diff URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ros.diff…
============================================================================== --- trunk/reactos/dll/win32/atl/atl_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_ros.diff [iso-8859-1] Thu Mar 15 20:17:15 2012 @@ -11,3 +11,46 @@ size = pM->cbSize; switch (size) +Index: registrar.c +=================================================================== +--- registrar.c (revision 48273) ++++ registrar.c (revision 48273) +@@ -819,6 +819,19 @@ + return hres; + } + ++static HRESULT do_register_server(BOOL do_register) ++{ ++ static const WCHAR CLSID_RegistrarW[] = ++ {'C','L','S','I','D','_','R','e','g','i','s','t','r','a','r',0}; ++ static const WCHAR atl_dllW[] = {'a','t','l','.','d','l','l',0}; ++ ++ WCHAR clsid_str[40]; ++ const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_RegistrarW, clsid_str}, {NULL,NULL}}; ++ ++ StringFromGUID2(&CLSID_Registrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR)); ++ return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); ++} ++ + /*********************************************************************** + * AtlModuleUpdateRegistryFromResourceD [ATL.@] + * +@@ -849,7 +862,8 @@ + */ + HRESULT WINAPI DllRegisterServer(void) + { +- return __wine_register_resources( hInst ); ++ /* Note: we can't use __wine_register_server here because it uses CLSID_Registrar which isn't registred yet */ ++ return do_register_server(TRUE); + } + + /*********************************************************************** +@@ -857,7 +871,7 @@ + */ + HRESULT WINAPI DllUnregisterServer(void) + { +- return __wine_unregister_resources( hInst ); ++ return do_register_server(FALSE); + } + + /*********************************************************************** Modified: trunk/reactos/dll/win32/atl/registrar.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?…
============================================================================== --- trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] Thu Mar 15 20:17:15 2012 @@ -27,8 +27,7 @@ #include "winreg.h" #include "objbase.h" #include "oaidl.h" - -#define ATL_INITGUID +#include "rpcproxy.h" #include "atliface.h" #include "atlbase.h" @@ -78,7 +77,7 @@ } rep_list; typedef struct { - const IRegistrarVtbl *lpVtbl; + IRegistrar IRegistrar_iface; LONG ref; rep_list *rep; } Registrar; @@ -88,6 +87,11 @@ DWORD alloc; DWORD len; } strbuf; + +static inline Registrar *impl_from_IRegistrar(IRegistrar *iface) +{ + return CONTAINING_RECORD(iface, Registrar, IRegistrar_iface); +} static void strbuf_init(strbuf *buf) { @@ -285,15 +289,11 @@ } break; case 'd': { - WCHAR *end; DWORD dw; - if(*iter == '0' && iter[1] == 'x') { - iter += 2; - dw = strtolW(iter, &end, 16); - }else { - dw = strtolW(iter, &end, 10); - } - iter = end; + hres = get_word(&iter, buf); + if(FAILED(hres)) + break; + dw = atoiW(buf->str); lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_DWORD, (PBYTE)&dw, sizeof(dw)); if(lres != ERROR_SUCCESS) { @@ -301,6 +301,41 @@ hres = HRESULT_FROM_WIN32(lres); break; } + break; + } + case 'b': { + BYTE *bytes; + DWORD count; + DWORD i; + hres = get_word(&iter, buf); + if(FAILED(hres)) + break; + count = (lstrlenW(buf->str) + 1) / 2; + bytes = HeapAlloc(GetProcessHeap(), 0, count); + if(bytes == NULL) { + hres = E_OUTOFMEMORY; + break; + } + for(i = 0; i < count && buf->str[2*i]; i++) { + WCHAR digits[3]; + if(!isxdigitW(buf->str[2*i]) || !isxdigitW(buf->str[2*i + 1])) { + hres = E_FAIL; + break; + } + digits[0] = buf->str[2*i]; + digits[1] = buf->str[2*i + 1]; + digits[2] = 0; + bytes[i] = (BYTE) strtoulW(digits, NULL, 16); + } + if(SUCCEEDED(hres)) { + lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_BINARY, + bytes, count); + if(lres != ERROR_SUCCESS) { + WARN("Could not set value of key: 0x%08x\n", lres); + hres = HRESULT_FROM_WIN32(lres); + } + } + HeapFree(GetProcessHeap(), 0, bytes); break; } default: @@ -518,7 +553,7 @@ static ULONG WINAPI Registrar_AddRef(IRegistrar *iface) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ->%d\n", This, ref); return ref; @@ -526,7 +561,7 @@ static ULONG WINAPI Registrar_Release(IRegistrar *iface) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ->%d\n", This, ref); @@ -540,7 +575,7 @@ static HRESULT WINAPI Registrar_AddReplacement(IRegistrar *iface, LPCOLESTR Key, LPCOLESTR item) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); int len; rep_list *new_rep; @@ -564,7 +599,7 @@ static HRESULT WINAPI Registrar_ClearReplacements(IRegistrar *iface) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); rep_list *iter, *iter2; TRACE("(%p)\n", This); @@ -588,7 +623,7 @@ static HRESULT WINAPI Registrar_ResourceRegisterSz(IRegistrar* iface, LPCOLESTR resFileName, LPCOLESTR szID, LPCOLESTR szType) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(resFileName), debugstr_w(szID), debugstr_w(szType)); return resource_register(This, resFileName, szID, szType, TRUE); } @@ -596,35 +631,35 @@ static HRESULT WINAPI Registrar_ResourceUnregisterSz(IRegistrar* iface, LPCOLESTR resFileName, LPCOLESTR szID, LPCOLESTR szType) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(resFileName), debugstr_w(szID), debugstr_w(szType)); return resource_register(This, resFileName, szID, szType, FALSE); } static HRESULT WINAPI Registrar_FileRegister(IRegistrar* iface, LPCOLESTR fileName) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(fileName)); return file_register(This, fileName, TRUE); } static HRESULT WINAPI Registrar_FileUnregister(IRegistrar* iface, LPCOLESTR fileName) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(fileName)); return file_register(This, fileName, FALSE); } static HRESULT WINAPI Registrar_StringRegister(IRegistrar* iface, LPCOLESTR data) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(data)); return string_register(This, data, TRUE); } static HRESULT WINAPI Registrar_StringUnregister(IRegistrar* iface, LPCOLESTR data) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(data)); return string_register(This, data, FALSE); } @@ -632,7 +667,7 @@ static HRESULT WINAPI Registrar_ResourceRegister(IRegistrar* iface, LPCOLESTR resFileName, UINT nID, LPCOLESTR szType) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s %d %s)\n", iface, debugstr_w(resFileName), nID, debugstr_w(szType)); return resource_register(This, resFileName, MAKEINTRESOURCEW(nID), szType, TRUE); } @@ -640,7 +675,7 @@ static HRESULT WINAPI Registrar_ResourceUnregister(IRegistrar* iface, LPCOLESTR resFileName, UINT nID, LPCOLESTR szType) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s %d %s)\n", This, debugstr_w(resFileName), nID, debugstr_w(szType)); return resource_register(This, resFileName, MAKEINTRESOURCEW(nID), szType, FALSE); } @@ -669,7 +704,7 @@ return E_NOINTERFACE; ret = HeapAlloc(GetProcessHeap(), 0, sizeof(Registrar)); - ret->lpVtbl = &RegistrarVtbl; + ret->IRegistrar_iface.lpVtbl = &RegistrarVtbl; ret->ref = 1; ret->rep = NULL; *ppvObject = ret; @@ -827,16 +862,15 @@ */ HRESULT WINAPI DllRegisterServer(void) { - TRACE("\n"); + /* Note: we can't use __wine_register_server here because it uses CLSID_Registrar which isn't registred yet */ return do_register_server(TRUE); } /*********************************************************************** - * DllRegisterServer (ATL.@) + * DllUnRegisterServer (ATL.@) */ HRESULT WINAPI DllUnregisterServer(void) { - TRACE("\n"); return do_register_server(FALSE); }
12 years, 6 months
1
0
0
0
[rharabien] 56158: [ATL_WINETEST] - Sync to Wine 1.3.37
by rharabien@svn.reactos.org
Author: rharabien Date: Thu Mar 15 20:15:43 2012 New Revision: 56158 URL:
http://svn.reactos.org/svn/reactos?rev=56158&view=rev
Log: [ATL_WINETEST] - Sync to Wine 1.3.37 Added: trunk/rostests/winetests/atl/registrar.c (with props) Modified: trunk/rostests/winetests/atl/CMakeLists.txt trunk/rostests/winetests/atl/atl_ax.c trunk/rostests/winetests/atl/module.c trunk/rostests/winetests/atl/testlist.c Modified: trunk/rostests/winetests/atl/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/CMakeLists.…
============================================================================== --- trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] Thu Mar 15 20:15:43 2012 @@ -4,6 +4,7 @@ list(APPEND SOURCE atl_ax.c module.c + registrar.c testlist.c) add_executable(atl_winetest ${SOURCE}) @@ -11,5 +12,5 @@ target_link_libraries(atl_winetest wine uuid) set_module_type(atl_winetest win32cui) -add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll) +add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll advapi32) add_cd_file(TARGET atl_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/atl/atl_ax.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/atl_ax.c?re…
============================================================================== --- trunk/rostests/winetests/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/atl_ax.c [iso-8859-1] Thu Mar 15 20:15:43 2012 @@ -36,7 +36,14 @@ #include <ocidl.h> #include <exdisp.h> -HRESULT WINAPI AtlAxAttachControl(IUnknown *, HWND, IUnknown **); +static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **); + +static void init_function_pointers(void) +{ + HMODULE hatl = GetModuleHandleA("atl.dll"); + + pAtlAxAttachControl = (void *)GetProcAddress(hatl, "AtlAxAttachControl"); +} static ATOM register_class(void) { @@ -64,16 +71,16 @@ HRESULT hr; IUnknown *pObj, *pContainer; - hr = AtlAxAttachControl(NULL, NULL, NULL); + hr = pAtlAxAttachControl(NULL, NULL, NULL); ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); pContainer = (IUnknown *)0xdeadbeef; - hr = AtlAxAttachControl(NULL, NULL, &pContainer); + hr = pAtlAxAttachControl(NULL, NULL, &pContainer); ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); ok(pContainer == (IUnknown *)0xdeadbeef, "Expected the output container pointer to be untouched, got %p\n", pContainer); - hr = AtlAxAttachControl(NULL, hwnd, NULL); + hr = pAtlAxAttachControl(NULL, hwnd, NULL); ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); hr = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, @@ -86,13 +93,11 @@ return; } - hr = AtlAxAttachControl(pObj, NULL, NULL); - todo_wine + hr = pAtlAxAttachControl(pObj, NULL, NULL); ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); pContainer = (IUnknown *)0xdeadbeef; - hr = AtlAxAttachControl(pObj, NULL, &pContainer); - todo_wine + hr = pAtlAxAttachControl(pObj, NULL, &pContainer); ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); ok(pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL, @@ -101,7 +106,7 @@ if (pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL) IUnknown_Release(pContainer); - hr = AtlAxAttachControl(pObj, hwnd, NULL); + hr = pAtlAxAttachControl(pObj, hwnd, NULL); ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); IUnknown_Release(pObj); @@ -111,12 +116,17 @@ START_TEST(atl_ax) { + init_function_pointers(); + if (!register_class()) return; CoInitialize(NULL); - test_AtlAxAttachControl(); + if (pAtlAxAttachControl) + test_AtlAxAttachControl(); + else + win_skip("AtlAxAttachControl is not available\n"); CoUninitialize(); } Modified: trunk/rostests/winetests/atl/module.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/module.c?re…
============================================================================== --- trunk/rostests/winetests/atl/module.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/module.c [iso-8859-1] Thu Mar 15 20:15:43 2012 @@ -32,7 +32,6 @@ #include <winnls.h> #include <winerror.h> #include <winnt.h> -#include <initguid.h> #include <wtypes.h> #include <olectl.h> #include <ocidl.h> @@ -92,10 +91,14 @@ ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); break; default: - ok (FAILED(hres), "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); + ok (FAILED(hres) || + broken((i > FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer )) && (hres == S_OK)), /* Win95 */ + "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); break; } } + + HeapFree (GetProcessHeap(), 0, tst); } START_TEST(module) Added: trunk/rostests/winetests/atl/registrar.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/registrar.c…
============================================================================== --- trunk/rostests/winetests/atl/registrar.c (added) +++ trunk/rostests/winetests/atl/registrar.c [iso-8859-1] Thu Mar 15 20:15:43 2012 @@ -1,0 +1,145 @@ +/* + * ATL test program + * + * Copyright 2010 Damjan Jovanovic + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include <wine/test.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wingdi.h> +#include <winnls.h> +#include <winerror.h> +#include <winnt.h> +#include <wtypes.h> +#include <olectl.h> +#include <ocidl.h> +#include <initguid.h> +#include <atliface.h> + +static const char textA[] = +"HKCR \n" +"{ \n" +" ForceRemove eebf73c4-50fd-478f-bbcf-db212221227a \n" +" { \n" +" val 'string' = s 'string' \n" +" val 'dword_quoted_dec' = d '1' \n" +" val 'dword_unquoted_dec' = d 1 \n" +" val 'dword_quoted_hex' = d '0xA' \n" +" val 'dword_unquoted_hex' = d 0xA \n" +" val 'binary_quoted' = b 'deadbeef' \n" +" val 'binary_unquoted' = b deadbeef \n" +" } \n" +"}"; + +static void test_registrar(void) +{ + IRegistrar *registrar = NULL; + HRESULT hr; + INT count; + WCHAR *textW = NULL; + + if (!GetProcAddress(GetModuleHandleA("atl.dll"), "AtlAxAttachControl")) + { + win_skip("Old versions of atl.dll don't support binary values\n"); + return; + } + + hr = CoCreateInstance(&CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, &IID_IRegistrar, (void**)®istrar); + if (FAILED(hr)) + { + skip("creating IRegistrar failed, hr = 0x%08X\n", hr); + return; + } + + count = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); + textW = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR)); + if (textW) + { + DWORD dword; + DWORD size; + LONG lret; + HKEY key; + BYTE bytes[4]; + + MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, count); + hr = IRegistrar_StringRegister(registrar, textW); + ok(SUCCEEDED(hr), "IRegistrar_StringRegister failed, hr = 0x%08X\n", hr); + + lret = RegOpenKeyA(HKEY_CLASSES_ROOT, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); + ok(lret == ERROR_SUCCESS, "error %d opening registry key\n", lret); + + size = sizeof(dword); + lret = RegQueryValueExA(key, "dword_unquoted_hex", NULL, NULL, (BYTE*)&dword, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %d\n", lret); + ok(dword != 0xA, "unquoted hex is not supposed to be preserved\n"); + + size = sizeof(dword); + lret = RegQueryValueExA(key, "dword_quoted_hex", NULL, NULL, (BYTE*)&dword, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %d\n", lret); + ok(dword != 0xA, "quoted hex is not supposed to be preserved\n"); + + size = sizeof(dword); + lret = RegQueryValueExA(key, "dword_unquoted_dec", NULL, NULL, (BYTE*)&dword, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %d\n", lret); + ok(dword == 1, "unquoted dec is not supposed to be %d\n", dword); + + size = sizeof(dword); + lret = RegQueryValueExA(key, "dword_quoted_dec", NULL, NULL, (BYTE*)&dword, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %d\n", lret); + ok(dword == 1, "quoted dec is not supposed to be %d\n", dword); + + size = 4; + lret = RegQueryValueExA(key, "binary_quoted", NULL, NULL, bytes, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueA, failed, error %d\n", lret); + ok(bytes[0] == 0xde && bytes[1] == 0xad && bytes[2] == 0xbe && bytes[3] == 0xef, + "binary quoted value was not preserved (it's 0x%02X%02X%02X%02X)\n", + 0xff & bytes[0], 0xff & bytes[1], 0xff & bytes[2], 0xff & bytes[3]); + + size = 4; + lret = RegQueryValueExA(key, "binary_unquoted", NULL, NULL, bytes, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueA, failed, error %d\n", lret); + ok(bytes[0] == 0xde && bytes[1] == 0xad && bytes[2] == 0xbe && bytes[3] == 0xef, + "binary unquoted value was not preserved (it's 0x%02X%02X%02X%02X)\n", + 0xff & bytes[0], 0xff & bytes[1], 0xff & bytes[2], 0xff & bytes[3]); + + hr = IRegistrar_StringUnregister(registrar, textW); + ok(SUCCEEDED(hr), "IRegistrar_StringUnregister failed, hr = 0x%08X\n", hr); + RegCloseKey(key); + + HeapFree(GetProcessHeap(), 0, textW); + } + else + skip("allocating memory failed\n"); + + IRegistrar_Release(registrar); +} + +START_TEST(registrar) +{ + CoInitialize(NULL); + + test_registrar(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/atl/registrar.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/atl/testlist.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/testlist.c?…
============================================================================== --- trunk/rostests/winetests/atl/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/testlist.c [iso-8859-1] Thu Mar 15 20:15:43 2012 @@ -6,10 +6,14 @@ #define STANDALONE #include "wine/test.h" +extern void func_atl_ax(void); extern void func_module(void); +extern void func_registrar(void); const struct test winetest_testlist[] = { + { "atl_ax", func_atl_ax }, { "module", func_module }, + { "registrar", func_registrar }, { 0, 0 } };
12 years, 6 months
1
0
0
0
[tkreuzer] 56157: [WIN32K] Add new dibcode, currently as a static library. Not used, not built.
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Thu Mar 15 19:11:12 2012 New Revision: 56157 URL:
http://svn.reactos.org/svn/reactos?rev=56157&view=rev
Log: [WIN32K] Add new dibcode, currently as a static library. Not used, not built. Added: trunk/reactos/subsystems/win32/win32k/diblib/ (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_DSTINVERT.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_MERGECOPY.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_MERGEPAINT.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_NOTPATCOPY.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_NOTSRCCOPY.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_NOTSRCERASE.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_PATCOPY.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_PATINVERT.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_PATPAINT.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCAND.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCERASE.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCINVERT.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCPAINT.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_other.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/CMakeLists.txt (with props) trunk/reactos/subsystems/win32/win32k/diblib/DibLib.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h (with props) trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllDstBPP.h (with props) trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h (with props) trunk/reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h (with props) trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h (with props) trunk/reactos/subsystems/win32/win32k/diblib/MaskBlt.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/MaskCopy.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/MaskPaint.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/MaskPatBlt.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/MaskPatPaint.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/MaskSrcBlt.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/MaskSrcPaint.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/MaskSrcPatBlt.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/PatPaint.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.h (with props) trunk/reactos/subsystems/win32/win32k/diblib/SrcPaint.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/SrcPatBlt.c (with props) trunk/reactos/subsystems/win32/win32k/diblib/engbitblt.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_DSTINVERT.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_MERGECOPY.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_MERGEPAINT.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_NOTPATCOPY.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_NOTSRCCOPY.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_NOTSRCERASE.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_PATCOPY.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_PATINVERT.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_PATPAINT.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCAND.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCERASE.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCINVERT.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCPAINT.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_other.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/DibLib.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllDstBPP.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/MaskBlt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/MaskCopy.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/MaskPaint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/MaskPatBlt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/MaskPatPaint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/MaskSrcBlt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/MaskSrcPaint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/MaskSrcPatBlt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/PatPaint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/RopFunctions.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/SrcPaint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/SrcPatBlt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
Added: trunk/reactos/subsystems/win32/win32k/diblib/engbitblt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di…
12 years, 6 months
1
0
0
0
[rharabien] 56156: [MLANG] - Fix entrypoint and add startup code to fix registration of mlang classes. Fixes crashes and failures in inetcomm:mimeintl winetest and adds back many tests in mlang win...
by rharabien@svn.reactos.org
Author: rharabien Date: Thu Mar 15 12:57:45 2012 New Revision: 56156 URL:
http://svn.reactos.org/svn/reactos?rev=56156&view=rev
Log: [MLANG] - Fix entrypoint and add startup code to fix registration of mlang classes. Fixes crashes and failures in inetcomm:mimeintl winetest and adds back many tests in mlang winetest Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/CMakeLists…
============================================================================== --- trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Thu Mar 15 12:57:45 2012 @@ -8,7 +8,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() spec2def(mlang.dll mlang.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -18,7 +17,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/mlang.def) add_library(mlang SHARED ${SOURCE}) -set_module_type(mlang win32dll ENTRYPOINT 0) +set_module_type(mlang win32dll UNICODE) target_link_libraries(mlang uuid wine) add_delay_importlibs(mlang oleaut32) @@ -27,6 +26,7 @@ user32 gdi32 advapi32 + msvcrt kernel32 ntdll)
12 years, 6 months
1
0
0
0
[tfaber] 56155: [KMTESTS/EX] - Fix GCC build
by tfaber@svn.reactos.org
Author: tfaber Date: Thu Mar 15 11:49:09 2012 New Revision: 56155 URL:
http://svn.reactos.org/svn/reactos?rev=56155&view=rev
Log: [KMTESTS/EX] - Fix GCC build Modified: trunk/rostests/kmtests/ntos_ex/ExPools.c Modified: trunk/rostests/kmtests/ntos_ex/ExPools.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExPools.c…
============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] Thu Mar 15 11:49:09 2012 @@ -99,9 +99,8 @@ static VOID PoolsCorruption(VOID) { - PULONG Ptr, TestPtr; + PULONG Ptr; ULONG AllocSize; - NTSTATUS Status = STATUS_SUCCESS; // start with non-paged pool AllocSize = 4096 + 0x10;
12 years, 6 months
1
0
0
0
← Newer
1
...
11
12
13
14
15
16
17
...
36
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
Results per page:
10
25
50
100
200