November 2015 - Wine-commits

Stefan Dösinger : d3d9/tests: Multisampled render targets are zeroed on creation.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 04b41ade76427a117a6baebd312f964452c0f518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b41ade76427a117a6baebd3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 22 01:01:00 2015 +0100 d3d9/tests: Multisampled render targets are zeroed on creation. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b328b94..7ab751c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20391,6 +20391,75 @@ static void test_uninitialized_varyings(void) DestroyWindow(window); } +static void test_multisample_init(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + IDirect3DSurface9 *back, *multi; + ULONG refcount; + HWND window; + HRESULT hr; + D3DCOLOR color; + unsigned int x, y; + struct surface_readback rb; + BOOL all_zero = TRUE; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisample init test.\n"); + goto done; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &back); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_2_SAMPLES, 0, FALSE, &multi, NULL); + ok(SUCCEEDED(hr), "Failed to create multisampled render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, multi, NULL, back, NULL, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + + get_rt_readback(back, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; x++) + { + color = get_readback_color(&rb, x, y); + if (!color_match(color, 0x00000000, 0)) + { + all_zero = FALSE; + break; + } + } + if (!all_zero) + break; + } + release_surface_readback(&rb); + ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + + IDirect3DSurface9_Release(multi); + IDirect3DSurface9_Release(back); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -20511,4 +20580,5 @@ START_TEST(visual) test_depthbias(); test_flip(); test_uninitialized_varyings(); + test_multisample_init(); }

1 0

Stefan Dösinger : d3d8/tests: Multisampled render targets are zeroed on creation.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 876f7546ab5d513804a163bd1805c9b64932eaf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=876f7546ab5d513804a163bd1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 23 13:21:35 2015 +0100 d3d8/tests: Multisampled render targets are zeroed on creation. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 7029551..e3f6d2d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8503,6 +8503,75 @@ static void test_shademode(void) DestroyWindow(window); } +static void test_multisample_init(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + IDirect3DSurface8 *back, *multi; + ULONG refcount; + HWND window; + HRESULT hr; + D3DCOLOR color; + unsigned int x, y; + struct surface_readback rb; + BOOL all_zero = TRUE; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisample init test.\n"); + goto done; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &back); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_2_SAMPLES, FALSE, &multi); + ok(SUCCEEDED(hr), "Failed to create multisampled render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, multi, NULL, 0, back, NULL); + ok(SUCCEEDED(hr), "CopyRects failed, hr %#x.\n", hr); + + get_rt_readback(back, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; ++x) + { + color = get_readback_color(&rb, x, y); + if (!color_match(color, 0x00000000, 0)) + { + all_zero = FALSE; + break; + } + } + if (!all_zero) + break; + } + release_surface_readback(&rb); + ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + + IDirect3DSurface8_Release(multi); + IDirect3DSurface8_Release(back); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -8567,4 +8636,5 @@ START_TEST(visual) test_flip(); test_uninitialized_varyings(); test_shademode(); + test_multisample_init(); }

1 0

Bruno Jesus : msacm32: Remove dead code from acmFormatDetailsW.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: cff5c73e68e7a13a56b536f87bdd412e8061e20d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cff5c73e68e7a13a56b536f87… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 23 19:49:52 2015 +0800 msacm32: Remove dead code from acmFormatDetailsW. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 1ab05ae..de07cba 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -400,13 +400,9 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD MMRESULT mmr; static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; - ACMFORMATTAGDETAILSA aftd; TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); - memset(&aftd, 0, sizeof(aftd)); - aftd.cbStruct = sizeof(aftd); - if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; switch (fdwDetails) {

1 0

Vincent Povirk : advapi32/tests: Skip test when registry virtualization can't delete values.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: f742b05d771e2ebe5adf099095570df7c4a1ba82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f742b05d771e2ebe5adf09909… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Nov 20 11:17:18 2015 -0600 advapi32/tests: Skip test when registry virtualization can't delete values. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/crypt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index ebae143..84a54a1 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -961,7 +961,13 @@ static void test_machine_guid(void) { restoreGuid = TRUE; r = RegDeleteValueA(key, "MachineGuid"); - ok(!r, "RegDeleteValueA failed: %d\n", r); + ok(!r || broken(r == ERROR_ACCESS_DENIED) /*win8*/, "RegDeleteValueA failed: %d\n", r); + if (r == ERROR_ACCESS_DENIED) + { + skip("broken virtualization on HKLM\\Software\\Microsoft\\Cryptography\n"); + RegCloseKey(key); + return; + } } else ok(r == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n",

1 0

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: f4581918c670d4f53aeb05b5e04cd952a0621d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4581918c670d4f53aeb05b5e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Nov 21 22:58:42 2015 +0800 po: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 48 ++++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 51660b3..56c0cd3 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8477,58 +8477,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "隐藏" +msgstr "隐藏 %@" #: winemac.rc:35 -#, fuzzy -#| msgid "I/O Other" msgid "Hide Others" -msgstr "I/O 其他" +msgstr "隐藏其他" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "显示" +msgstr "显示全部" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "退出 %@" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "退出" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "窗口(&W)" +msgstr "窗口" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "最小化(&M)" +msgstr "最小化" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "放大" +msgstr "缩放" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "全屏" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "移到最前面(&B)" +msgstr "前置全部窗口" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -12662,10 +12648,8 @@ msgid "Select Drive Letter" msgstr "选择驱动器盘符" #: winecfg.rc:232 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Wine 设置" +msgstr "驱动器设置" #: winecfg.rc:233 msgid "" @@ -12738,14 +12722,12 @@ msgid "&Test Sound" msgstr "测试音频(&T)" #: winecfg.rc:277 winecfg.rc:90 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Wine 设置" +msgstr "扬声器设置" #: winecfg.rc:280 msgid "Speakers:" -msgstr "" +msgstr "扬声器：" #: winecfg.rc:288 msgid "Appearance" @@ -12969,10 +12951,8 @@ msgid "Letter" msgstr "盘符" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "新文件夹" +msgstr "目标文件夹" #: winecfg.rc:79 msgid ""

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: dcbd4a003111fc2db5abb6e358a8942f1c20790f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcbd4a003111fc2db5abb6e35… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Nov 22 20:27:21 2015 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 70 ++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/po/ja.po b/po/ja.po index 298ef76..d8b5cb0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-07-22 00:22+0900\n" +"PO-Revision-Date: 2015-11-22 13:05+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -3180,7 +3180,7 @@ msgstr "表示" #: hhctrl.rc:43 winemac.rc:34 msgid "Hide" -msgstr "非表示" +msgstr "隠す" #: hhctrl.rc:44 ieframe.rc:68 shdoclc.rc:167 shdoclc.rc:191 msgid "Stop" @@ -7445,16 +7445,12 @@ msgid "&Convert..." msgstr "変換(&C)..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "オブジェクト(&O)" +msgstr "%1 %2 オブジェクト(&O)" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "オブジェクト(&O)" +msgstr "%1 オブジェクト(&O)" #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8567,58 +8563,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "非表示" +msgstr "%@ を隠す" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "その他" +msgstr "ほかを隠す" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "表示" +msgstr "すべてを表示" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "%@ を終了" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "終了" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "ウィンドウ(&W)" +msgstr "ウィンドウ" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "最小化(&M)" +msgstr "しまう" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "拡大" +msgstr "拡大／縮小" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "フルスクリーンにする" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "手前に表示(&B)" +msgstr "すべてを手前に移動" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -9664,7 +9646,7 @@ msgstr "DEL <ファイル名> はファイルやファイル群を削除しま #: cmd.rc:65 msgid "DIR lists the contents of a directory.\n" -msgstr "DIR はディレクトリの内容を一覧表示します。\n" +msgstr "DIR はディレクトリ内容の一覧を表示します。\n" #: cmd.rc:75 msgid "" @@ -12904,18 +12886,17 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller: GUID '%1' のアプリケーションは見つかりませんでした\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"uninstaller: --remove オプションはアプリケーション GUID の指定が必要です\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "エラー: 無効なオプション '%c'。\n" +msgstr "uninstaller: 無効なオプション [%1]\n" #: uninstaller.rc:35 msgid "" @@ -12924,6 +12905,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Wine アプリケーションアンインストーラ\n" +"\n" +"アプリケーションを現在の Wine プレフィックスからアンインストールします。\n" +"\n" #: uninstaller.rc:43 msgid "" @@ -12938,6 +12923,17 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"使い方:\n" +" uninstaller [オプション群]\n" +"\n" +"オプション:\n" +" --help\t この情報を表示する。\n" +" --list\t この Wine プレフィックスにインストールされた全アプリ\n" +"\t\t ケーションの一覧を表示する。\n" +" --remove\t 指定のアプリケーションをアンインストールする。\n" +"\t\t アプリケーション GUID を割り出すため --list をつかう。\n" +" [オプションなし] このプログラムのグラフィカル版を起動する。\n" +"\n" #: view.rc:36 msgid "&Pan"

1 0

Nikolay Sivov : user32/tests: Some tests for SetScrollInfo().
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 119d97e8d7220fda9046d29c9305ea150686101a URL: http://source.winehq.org/git/wine.git/?a=commit;h=119d97e8d7220fda9046d29c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 22 00:21:03 2015 +0300 user32/tests: Some tests for SetScrollInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 22a5cb2..691855b 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -525,6 +525,49 @@ static void scrollbar_test_init(void) UnregisterClassA(cls_name, wc.hInstance); } +static void test_SetScrollInfo(void) +{ + SCROLLINFO si; + HWND mainwnd; + BOOL ret; + + mainwnd = create_main_test_wnd(); + + ret = IsWindowEnabled(hScroll); + ok(ret, "scroll bar disabled\n"); + + EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); + + ret = IsWindowEnabled(hScroll); + ok(!ret, "scroll bar disabled\n"); + + memset(&si, 0, sizeof(si)); + si.cbSize = sizeof(si); + si.fMask = 0xf; + ret = GetScrollInfo(hScroll, SB_CTL, &si); + ok(ret, "got %d\n", ret); + + /* SetScrollInfo */ + memset(&si, 0, sizeof(si)); + si.cbSize = sizeof(si); + ret = IsWindowEnabled(hScroll); + ok(!ret, "scroll bar disabled\n"); + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 100; + si.nPos = 0; + si.nPage = 100; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); + ok(!ret, "scroll bar enabled\n"); + + si.fMask = 0xf; + ret = GetScrollInfo(hScroll, SB_CTL, &si); + ok(ret, "got %d\n", ret); + + DestroyWindow(hScroll); + DestroyWindow(mainwnd); +} + START_TEST ( scroll ) { WNDCLASSA wc; @@ -548,6 +591,7 @@ START_TEST ( scroll ) test_ShowScrollBar(); test_GetScrollBarInfo(); scrollbar_test_track(); + test_SetScrollInfo(); /* Some test results vary depending of theming being active or not */ hUxtheme = LoadLibraryA("uxtheme.dll");

1 0

Vijay Kiran Kamuju : wine.inf: Install wordpad in Program FilesWindows NT\Accessories.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 616495b6a47b1a77b5294ff9ebf2d22442e10daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=616495b6a47b1a77b5294ff9e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Nov 22 01:50:00 2015 +0000 wine.inf: Install wordpad in Program FilesWindows NT\Accessories. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c8de5f9..7773377 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2529,6 +2529,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,shdocvw.dll 16422,Internet Explorer,iexplore.exe 16422,Windows Media Player,wmplayer.exe +16422,Windows NT\Accessories,wordpad.exe 11,,* [FakeDlls] @@ -2578,6 +2579,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16412,Microsoft, 16422,Internet Explorer,iexplore.exe 16422,Windows Media Player,wmplayer.exe +16422,Windows NT\Accessories,wordpad.exe 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 11,,*

1 0

Vincent Povirk : atl100/tests: Check Administrators group if UAC is disabled.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 1efa69c6185b0a32dd384e9bbffca8a509bf0bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1efa69c6185b0a32dd384e9bb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Nov 21 19:47:40 2015 -0600 atl100/tests: Check Administrators group if UAC is disabled. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl100/tests/atl.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index d07a523..c6e5cda 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -63,10 +63,58 @@ static const WCHAR fileW[] = {'f','i','l','e',':','/','/','/','\0'}; static const WCHAR html_fileW[] = {'t','e','s','t','.','h','t','m','l','\0'}; static const char html_str[] = "<html><body>test</body><html>"; +static BOOL is_token_admin(HANDLE token) +{ + PSID administrators = NULL; + SID_IDENTIFIER_AUTHORITY nt_authority = { SECURITY_NT_AUTHORITY }; + DWORD groups_size; + PTOKEN_GROUPS groups; + DWORD group_index; + + /* Create a well-known SID for the Administrators group. */ + if (! AllocateAndInitializeSid(&nt_authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &administrators)) + return FALSE; + + /* Get the group info from the token */ + groups_size = 0; + GetTokenInformation(token, TokenGroups, NULL, 0, &groups_size); + groups = HeapAlloc(GetProcessHeap(), 0, groups_size); + if (groups == NULL) + { + FreeSid(administrators); + return FALSE; + } + if (! GetTokenInformation(token, TokenGroups, groups, groups_size, &groups_size)) + { + HeapFree(GetProcessHeap(), 0, groups); + FreeSid(administrators); + return FALSE; + } + + /* Now check if the token groups include the Administrators group */ + for (group_index = 0; group_index < groups->GroupCount; group_index++) + { + if (EqualSid(groups->Groups[group_index].Sid, administrators)) + { + HeapFree(GetProcessHeap(), 0, groups); + FreeSid(administrators); + return TRUE; + } + } + + /* If we end up here we didn't find the Administrators group */ + HeapFree(GetProcessHeap(), 0, groups); + FreeSid(administrators); + return FALSE; +} + static BOOL is_process_limited(void) { static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; HANDLE token; + BOOL result=FALSE; if (!pOpenProcessToken) { @@ -83,10 +131,19 @@ static BOOL is_process_limited(void) DWORD size; ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + if (ret) + { + if (type == TokenElevationTypeDefault) + /* UAC is disabled, check for administrators group */ + result = !is_token_admin(token); + else if (type == TokenElevationTypeFull) + result = FALSE; + else if (type == TokenElevationTypeLimited) + result = TRUE; + } CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); } - return FALSE; + return result; } static void test_winmodule(void)

1 0

Thomas Faber : dinput: Implement MSVC version of enum_callback_wrapper.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 805473dec7c154798c0035495f08040c62f1a7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805473dec7c154798c0035495… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Nov 22 17:51:24 2015 +0100 dinput: Implement MSVC version of enum_callback_wrapper. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 24e7951..2ff6fd9 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -339,7 +339,21 @@ static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) return priorityFlags; } -#ifdef __i386__ +#if defined __i386__ && defined _MSC_VER +__declspec(naked) BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref) +{ + __asm + { + push ebp + mov ebp, esp + push [ebp+16] + push [ebp+12] + call [ebp+8] + leave + ret + } +} +#elif defined __i386__ && defined __GNUC__ extern BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref); __ASM_GLOBAL_FUNC( enum_callback_wrapper, "pushl %ebp\n\t"

1 0