December 2014 - Wine-commits

Stefan Dösinger : d3d8/tests: Test WM_SYSCOMMAND handling.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: c37549ef5df769036150c0fc09442636b0af047e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37549ef5df769036150c0fc0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 4 21:51:46 2014 +0100 d3d8/tests: Test WM_SYSCOMMAND handling. --- dlls/d3d8/tests/device.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b6875d0..0084272 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2360,6 +2360,32 @@ static void test_wndproc(void) {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, {0, 0, FALSE, 0}, }; + static const struct message sc_restore_messages[] = + { + {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FOCUS_WINDOW, FALSE, 0}, + {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_RESTORED}, + {WM_SYSCOMMAND, FOCUS_WINDOW, TRUE, SC_RESTORE}, + {0, 0, FALSE, 0}, + }; + static const struct message sc_minimize_messages[] = + { + {WM_SYSCOMMAND, FOCUS_WINDOW, TRUE, SC_MINIMIZE}, + {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FOCUS_WINDOW, FALSE, 0}, + {WM_MOVE, FOCUS_WINDOW, FALSE, 0}, + {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MINIMIZED}, + {0, 0, FALSE, 0}, + }; + static const struct message sc_maximize_messages[] = + { + {WM_SYSCOMMAND, FOCUS_WINDOW, TRUE, SC_MAXIMIZE}, + {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FOCUS_WINDOW, FALSE, 0}, + {WM_MOVE, FOCUS_WINDOW, FALSE, 0}, + {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MAXIMIZED}, + {0, 0, FALSE, 0}, + }; d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -2581,12 +2607,42 @@ static void test_wndproc(void) expect_messages->message, expect_messages->window); ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); expect_messages = NULL; + flush_events(); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); + /* SW_SHOWMINNOACTIVE is needed to make FVWM happy. SW_SHOWNOACTIVATE is needed to make windows + * send SIZE_RESTORED after ShowWindow(SW_SHOWMINNOACTIVE). */ + ShowWindow(focus_window, SW_SHOWNOACTIVATE); + ShowWindow(focus_window, SW_SHOWMINNOACTIVE); + flush_events(); + + expect_messages = sc_restore_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); + todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + flush_events(); + + expect_messages = sc_minimize_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_MINIMIZE, 0); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + flush_events(); + + expect_messages = sc_maximize_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_MAXIMIZE, 0); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + flush_events(); + + SetForegroundWindow(GetDesktopWindow()); + ShowWindow(device_window, SW_MINIMIZE); ShowWindow(focus_window, SW_MINIMIZE); ShowWindow(focus_window, SW_RESTORE); SetForegroundWindow(focus_window); @@ -2613,6 +2669,9 @@ static void test_wndproc(void) * device will show it again. */ filter_messages = NULL; ShowWindow(device_window, SW_HIDE); + /* Remove the maximized state from the SYSCOMMAND test while we're not + * interfering with a device. */ + ShowWindow(focus_window, SW_SHOWNORMAL); filter_messages = focus_window; device_desc.device_window = focus_window; @@ -2638,6 +2697,35 @@ static void test_wndproc(void) hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + expect_messages = sc_restore_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); + todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + flush_events(); + + /* For FVWM. */ + ShowWindow(focus_window, SW_RESTORE); + flush_events(); + + expect_messages = sc_minimize_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_MINIMIZE, 0); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + /* Needed to make the next test reliably send WM_SIZE(SIZE_MAXIMIZED). Without + * this call it sends WM_SIZE(SIZE_RESTORED). */ + ShowWindow(focus_window, SW_RESTORE); + flush_events(); + + expect_messages = sc_maximize_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_MAXIMIZE, 0); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + SetForegroundWindow(GetDesktopWindow()); + flush_events(); + /* ShowWindow(SW_RESTORE); SetForegroundWindow(desktop); SetForegroundWindow(focus); * results in the second SetForegroundWindow call failing and the device not being * restored on native. Directly useing ShowWindow(SW_RESTORE) works, but it means

1 0

Łukasz Wojniłowicz : Update Polish news.template
by Jeremy Newman 08 Dec '14

08 Dec '14

Module: website Branch: master Commit: 600a3e1dbd0e2123537a72f84d099e493f711382 URL: http://source.winehq.org/git/website.git/?a=commit;h=600a3e1dbd0e2123537a72… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 6 12:49:19 2014 +0100 Update Polish news.template --- templates/pl/news.template | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/templates/pl/news.template b/templates/pl/news.template index ce5c53d..5bad815 100644 --- a/templates/pl/news.template +++ b/templates/pl/news.template @@ -1,11 +1,16 @@ - - + + -<h1 class="title">Aktualności</h1> +<h1 class="title">Wieści</h1>  +<hr> + +<div class="link-container"> + <p><a href="{$root}/wwn/">Archiwum Wieści ze Świata Wine</a></p> +</div> <ul class="rss"> - <li><a href="{$root}/news/rss/">WineHQ News RSS Feed</a></li> + <li><a href="{$root}/news/rss/">Kanał RSS Wieści WineHQ</a></li> </ul>

1 0

Łukasz Wojniłowicz : Update Polish home.template
by Jeremy Newman 08 Dec '14

08 Dec '14

Module: website Branch: master Commit: 94ab85eefbb1a4a8ebcebc861314feaad7feaedd URL: http://source.winehq.org/git/website.git/?a=commit;h=94ab85eefbb1a4a8ebcebc… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 6 12:49:18 2014 +0100 Update Polish home.template --- templates/pl/home.template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/pl/home.template b/templates/pl/home.template index 770e713..bbfc82f 100644 --- a/templates/pl/home.template +++ b/templates/pl/home.template @@ -1,8 +1,8 @@  - - + +  - +  <div id="main_left"> @@ -14,7 +14,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/about/">Informacje</a></div> - <div class="subtitle">Przegląd funkcji Wine.</div> + <div class="subtitle">Dowiedz się więcej o Wine.</div> </div> </div> @@ -22,15 +22,15 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/download/">Pobieralnia</a></div> - <div class="subtitle">Ściągnij Wine teraz!</div> + <div class="subtitle">Wgraj sobie najnowsze Wine.</div> </div> </div> <div class="help" onClick="document.location='{$root}/help/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="{$root}/help/">Pomoc!</a></div> - <div class="subtitle">Dokumentacja, Wsparcie, i Wiki.</div> + <div class="title"><a href="{$root}/help/">Pomoc</a></div> + <div class="subtitle">Uzyskaj pomoc w używaniu Wine.</div> </div> </div> @@ -38,7 +38,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/devel/">Rozwój</a></div> - <div class="subtitle">Źródła Wine, Szukanie Robaków, itp.</div> + <div class="subtitle">Zacznij programować dla Wine.</div> </div> </div> @@ -46,7 +46,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/donate/">Darowizny</a></div> - <div class="subtitle">Ofiary dla Wine.</div> + <div class="subtitle">Wspomagaj rozwój Wine pieniężnie.</div> </div> </div> @@ -79,11 +79,11 @@ <div class="content cornerround" style="margin-top: 15px; padding: 10px 0px 10px 10px;"> <div style="height: 340px; overflow: auto; padding-right: 10px;"> - <h3 class="title"><a href="{$root}/news/">Aktualności</a></h3> + <h3 class="title"><a href="{$root}/news/">Wieści</a></h3>  - <p><a href="{$root}/news/">więcej aktualności...</a></p> + <p><a href="{$root}/news/">więcej wieści...</a></p> </div> </div>

1 0

Łukasz Wojniłowicz : Update Polish ubuntu.template
by Jeremy Newman 08 Dec '14

08 Dec '14

Module: website Branch: master Commit: 6210e2c9c141552dc0a9e8830f57056d8396e4ba URL: http://source.winehq.org/git/website.git/?a=commit;h=6210e2c9c141552dc0a9e8… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 6 12:49:17 2014 +0100 Update Polish ubuntu.template --- templates/pl/download/ubuntu.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/pl/download/ubuntu.template b/templates/pl/download/ubuntu.template index 3ea93d4..15ff028 100644 --- a/templates/pl/download/ubuntu.template +++ b/templates/pl/download/ubuntu.template @@ -16,8 +16,8 @@ Aby z nich skorzystać wykonaj poniższe instrukcje. <h2>Dodawanie repozytorium WineHQ PPA:</h2> <p>Otwórz źródła oprogramowania z menu <b>Aplikacje->Centrum Oprogramowania -Ubuntu</b>, następnie zaznacz <b>Edycja->Źródła oprogramowania</b>. Przejdź na zakładkę <b>Oprogramowanie -osób trzecich</b> i kliknij <b>Dodaj...</b>.</p> +Ubuntu</b>, następnie wybierz <b>Edycja->Źródła oprogramowania</b>. Przejdź na zakładkę <b>Oprogramowanie +osób trzecich</b> i naciśnij <b>Dodaj...</b>.</p> <img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="Software Center->Edit->Software Sources->Other Software" border="0"> @@ -29,7 +29,7 @@ osób trzecich</b> i kliknij <b>Dodaj...</b>.</p> <p><i>Paczki 1.7 są paczkami beta. Oznacza to, że będą okresowo cierpieć z powodu -<a href="http://wiki.winehq.org/RegressionTesting">regresji</a>, a aktualizacja do nich +<a href="http://wiki.winehq.org/RegressionTesting">regresji</a>, a uaktualnianie do nich może popsuć funkcjonalność Wine. Jeżeli wersja stabilna Wine {$config_stable_release} działa bez problemu to wgrywanie tych paczek może nie być konieczne.</i></p> @@ -49,7 +49,7 @@ Ubuntu 13.10 na 14.04, to będziesz musiał/a wrócić do tej strony i dodać repozytorium do nowej wersji systemu. Wbudowany program do zarządzania uaktualnieniami sam nie zmieni repozytorium Wine. </p> -<h2>Alternatywne polecenia wiersza poleceń do wgrana Wine:</h2> +<h2>Alternatywne polecenia wiersza poleceń do wgrania Wine:</h2> <p>Istnieje możliwość dodania repozytoriów Wine i wgrywanie z wiersza poleceń. Jest to użyteczne w przypadku Kubuntu, Xubuntu, i innych pochodnych Ubuntu.</p>

1 0

Łukasz Wojniłowicz : Update Polish announce.template
by Jeremy Newman 08 Dec '14

08 Dec '14

Module: website Branch: master Commit: 6dcf15d79f6c154d4d8ba011d395671cf53069d2 URL: http://source.winehq.org/git/website.git/?a=commit;h=6dcf15d79f6c154d4d8ba0… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 6 12:49:16 2014 +0100 Update Polish announce.template --- templates/pl/announce.template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/pl/announce.template b/templates/pl/announce.template index e8e15c0..a0c5ebb 100644 --- a/templates/pl/announce.template +++ b/templates/pl/announce.template @@ -1,7 +1,8 @@ - - + + + -<h1 class="title">Ogłoszenie nowego Wine</h1> +<h1 class="title">Ukazało się nowe Wine</h1>

1 0

André Hentschel : Add WWN 381
by Jeremy Newman 05 Dec '14

05 Dec '14

Module: website Branch: master Commit: 3f617b1d5028be485a31ee72585cbbf16c45a9d8 URL: http://source.winehq.org/git/website.git/?a=commit;h=3f617b1d5028be485a31ee… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 5 18:00:16 2014 +0100 Add WWN 381 --- news/de/2014120501.xml | 10 + news/en/2014120501.xml | 10 + wwn/en/wn20141205_381.xml | 476 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 496 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=3f617b1d5028be485a…

1 0

André Hentschel : usp10: Remove unused function ( Clang).
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: bc94ee099a8a8583eda1a6c365457a6671371c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc94ee099a8a8583eda1a6c36… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 5 18:16:27 2014 +0100 usp10: Remove unused function (Clang). --- dlls/usp10/bidi.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 5b227d8..28252b6 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -505,12 +505,6 @@ static inline int iso_previousValidChar(IsolatedRun *iso_run, int index) return index; } -static inline int iso_previousChar(IsolatedRun *iso_run, int index) -{ - if (index <= 0) return -1; - return index --; -} - static inline void iso_dump_types(const char* header, IsolatedRun *iso_run) { int i, len = 0;

1 0

André Hentschel : sxs/tests: Remove unused string ( Clang).
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 3011f5ee350ba53c297a9be9256e7437e458a9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3011f5ee350ba53c297a9be92… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 5 18:28:45 2014 +0100 sxs/tests: Remove unused string (Clang). --- dlls/sxs/tests/name.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/sxs/tests/name.c b/dlls/sxs/tests/name.c index 123f431..99c6373 100644 --- a/dlls/sxs/tests/name.c +++ b/dlls/sxs/tests/name.c @@ -29,28 +29,22 @@ static const WCHAR wine1W[] = {'w','i','n','e',0}; static const WCHAR wine2W[] = - {'w','i','n','e',',','v','e','r','s','i','o','n','=','\"','0','1','.','2','.','3','.','4','\"',',', - 't','y','p','e','=','\"','w','i','n','3','2','\"',',', - 'p','r','o','c','e','s','s','o','r','A','r','c','h','i','t','e','c','t','u','r','e','=', - '\"','x','8','6','\"',',','p','u','b','l','i','c','K','e','y','T','o','k','e','n','=', - '\"','1','2','3','4','5','6','7','8','9','0','A','B','C','D','E','F','\"',0}; -static const WCHAR wine3W[] = {'w','i','n','e',',','v','e','r','s','i','o','n','=','\"','1','.','2','.','3','.','4','\"',0}; -static const WCHAR wine4W[] = +static const WCHAR wine3W[] = {'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','2','.','3','.','4',0}; -static const WCHAR wine5W[] = +static const WCHAR wine4W[] = {'w','i','n','e',',',' ','v','e','r','s','i','o','n','=','\"','1','.','2','.','3','.','4','\"',0}; -static const WCHAR wine6W[] = +static const WCHAR wine5W[] = {'w','i','n','e',',','v','e','r','s','i','o','n',' ','=','\"','1','.','2','.','3','.','4','\"',0}; -static const WCHAR wine7W[] = +static const WCHAR wine6W[] = {'w','i','n','e',',','v','e','r','s','i','o','n','=',' ','\"','1','.','2','.','3','.','4','\"',0}; -static const WCHAR wine8W[] = +static const WCHAR wine7W[] = {'w','i','n','e',' ',',','v','e','r','s','i','o','n','=','\"','1','.','2','.','3','.','4','\"',0}; -static const WCHAR wine9W[] = +static const WCHAR wine8W[] = {'w','i','n','e',',','v','e','r','s','i','o','n',0}; -static const WCHAR wine10W[] = +static const WCHAR wine9W[] = {'w','i','n','e',',','t','y','p','e','=','\"','\"',0}; -static const WCHAR wine11W[] = +static const WCHAR wine10W[] = {'w','i','n','e',',','t','y','p','e','=','\"','w','i','n','3','2',0}; static void test_CreateAssemblyNameObject( void ) @@ -172,52 +166,52 @@ static void test_CreateAssemblyNameObject( void ) ok( !name, "expected NULL got %p\n", name ); name = NULL; - hr = CreateAssemblyNameObject( &name, wine3W, CANOF_PARSE_DISPLAY_NAME, NULL ); + hr = CreateAssemblyNameObject( &name, wine2W, CANOF_PARSE_DISPLAY_NAME, NULL ); ok( hr == S_OK, "expected S_OK got %08x\n", hr ); ok( name != NULL, "expected non-NULL name\n" ); IAssemblyName_Release( name ); name = (IAssemblyName *)0xdeadbeef; - hr = CreateAssemblyNameObject( &name, wine4W, CANOF_PARSE_DISPLAY_NAME, NULL ); + hr = CreateAssemblyNameObject( &name, wine3W, CANOF_PARSE_DISPLAY_NAME, NULL ); ok( hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr ); ok( !name, "expected NULL got %p\n", name ); name = (IAssemblyName *)0xdeadbeef; - hr = CreateAssemblyNameObject( &name, wine5W, CANOF_PARSE_DISPLAY_NAME, NULL ); + hr = CreateAssemblyNameObject( &name, wine4W, CANOF_PARSE_DISPLAY_NAME, NULL ); ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME ), "expected ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME got %08x\n", hr ); ok( !name, "expected NULL got %p\n", name ); name = (IAssemblyName *)0xdeadbeef; - hr = CreateAssemblyNameObject( &name, wine6W, CANOF_PARSE_DISPLAY_NAME, NULL ); + hr = CreateAssemblyNameObject( &name, wine5W, CANOF_PARSE_DISPLAY_NAME, NULL ); ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME ), "expected ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME got %08x\n", hr ); ok( !name, "expected NULL got %p\n", name ); name = (IAssemblyName *)0xdeadbeef; - hr = CreateAssemblyNameObject( &name, wine7W, CANOF_PARSE_DISPLAY_NAME, NULL ); + hr = CreateAssemblyNameObject( &name, wine6W, CANOF_PARSE_DISPLAY_NAME, NULL ); ok( hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr ); ok( !name, "expected NULL got %p\n", name ); name = NULL; - hr = CreateAssemblyNameObject( &name, wine8W, CANOF_PARSE_DISPLAY_NAME, NULL ); + hr = CreateAssemblyNameObject( &name, wine7W, CANOF_PARSE_DISPLAY_NAME, NULL ); ok( hr == S_OK, "expected S_OK got %08x\n", hr ); ok( name != NULL, "expected non-NULL name\n" ); IAssemblyName_Release( name ); name = (IAssemblyName *)0xdeadbeef; - hr = CreateAssemblyNameObject( &name, wine9W, CANOF_PARSE_DISPLAY_NAME, NULL ); + hr = CreateAssemblyNameObject( &name, wine8W, CANOF_PARSE_DISPLAY_NAME, NULL ); ok( hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr ); ok( !name, "expected NULL got %p\n", name ); name = NULL; - hr = CreateAssemblyNameObject( &name, wine10W, CANOF_PARSE_DISPLAY_NAME, NULL ); + hr = CreateAssemblyNameObject( &name, wine9W, CANOF_PARSE_DISPLAY_NAME, NULL ); ok( hr == S_OK, "expected S_OK got %08x\n", hr ); ok( name != NULL, "expected non-NULL name\n" ); IAssemblyName_Release( name ); name = (IAssemblyName *)0xdeadbeef; - hr = CreateAssemblyNameObject( &name, wine11W, CANOF_PARSE_DISPLAY_NAME, NULL ); + hr = CreateAssemblyNameObject( &name, wine10W, CANOF_PARSE_DISPLAY_NAME, NULL ); ok( hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr ); ok( !name, "expected NULL got %p\n", name ); }

1 0

André Hentschel : winhttp/tests: Remove unused string (Clang).
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 20cec9391976caf15a08d83b01255b313d67e129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20cec9391976caf15a08d83b0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 5 18:28:47 2014 +0100 winhttp/tests: Remove unused string (Clang). --- dlls/winhttp/tests/url.c | 81 +++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20cec9391976caf15a08d…

1 0

André Hentschel : fusion/tests: Add tests for CreateAssemblyCacheItem.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 3006cea8e0926febe35a29e0755fa1160f400e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3006cea8e0926febe35a29e07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 5 18:47:34 2014 +0100 fusion/tests: Add tests for CreateAssemblyCacheItem. --- dlls/fusion/tests/asmcache.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 59b288a..081023d 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -881,6 +881,43 @@ static void test_CreateAssemblyCache(void) IAssemblyCache_Release(cache); } +static void test_CreateAssemblyCacheItem(void) +{ + IAssemblyCache *cache; + IAssemblyCacheItem *item; + HRESULT hr; + + static const WCHAR wine[] = {'w','i','n','e',0}; + + hr = pCreateAssemblyCache(&cache, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, NULL, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, NULL, &item, wine); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 1, (void *)0xdeadbeef, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 1, NULL, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, (void *)0xdeadbeef, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + IAssemblyCache_Release(cache); +} + static void test_InstallAssembly(void) { IAssemblyCache *cache; @@ -1550,6 +1587,7 @@ START_TEST(asmcache) return; test_CreateAssemblyCache(); + test_CreateAssemblyCacheItem(); test_InstallAssembly(); test_QueryAssemblyInfo(); }

1 0