April 2016 - Wine-commits - list.winehq.org

Stefan Dösinger : d3d10core/tests: Remove dead code.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 3272e49984ef58435b670143ad94ac2432b7cd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3272e49984ef58435b670143a… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Apr 5 18:24:25 2016 +0200 d3d10core/tests: Remove dead code. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 45b0fd2..3783da5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5679,7 +5679,6 @@ static void test_swapchain_flip(void) DWORD color; HWND window; HRESULT hr; - UINT count; static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = { @@ -5919,8 +5918,6 @@ static void test_swapchain_flip(void) ID3D10Texture2D_Release(backbuffer_2); IDXGISwapChain_Release(swapchain); - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); - ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window);

1 0

Stefan Dösinger : d3d11/tests: Port swapchain_flip() to d3d11.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: d028e1978fe4db7b7635990aea2588cd4404d93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d028e1978fe4db7b7635990ae… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Apr 5 18:24:26 2016 +0200 d3d11/tests: Port swapchain_flip() to d3d11. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 330 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 310 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d028e1978fe4db7b76359…

1 0

Nikolay Sivov : usp10: Trace RECT arguments in text output functions.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 9aa8b1847f129f3d3bd6773420be7ca1cb7aad09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa8b1847f129f3d3bd677342… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 5 12:39:22 2016 +0300 usp10: Trace RECT arguments in text output functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c746c57..baccc2a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2292,8 +2292,8 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, int item; HRESULT hr; - TRACE("(%p,%d,%d,0x%1x,%p,%d,%d,%d)\n", - ssa, iX, iY, uOptions, prc, iMinSel, iMaxSel, fDisabled); + TRACE("(%p,%d,%d,0x%08x,%s,%d,%d,%d)\n", + ssa, iX, iY, uOptions, wine_dbgstr_rect(prc), iMinSel, iMaxSel, fDisabled); if (!(analysis = ssa)) return E_INVALIDARG; if (!(analysis->dwFlags & SSA_GLYPHS)) return E_INVALIDARG; @@ -3483,8 +3483,8 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN INT *lpDx; WORD *reordered_glyphs = (WORD *)pwGlyphs; - TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", - hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, + TRACE("(%p, %p, %d, %d, %08x, %s, %p, %p, %d, %p, %d, %p, %p, %p)\n", + hdc, psc, x, y, fuOptions, wine_dbgstr_rect(lprc), psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, piAdvance, piJustify, pGoffset); if (!hdc || !psc) return E_INVALIDARG;

1 0

Nikolay Sivov : usp10: Some spelling fixes.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 9da5adce66d5f6ee895eab96bd861fdd4050cef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da5adce66d5f6ee895eab96b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 5 12:39:23 2016 +0300 usp10: Some spelling fixes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 8 ++++---- dlls/usp10/usp10.c | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 5b39663..613fb05 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1188,7 +1188,7 @@ static void GPOS_convert_design_units_to_device(LPOUTLINETEXTMETRICW lpotm, LPLO *devX = (desX * emHeight) / (double)lpotm->otmEMSquare; *devY = (desY * emHeight) / (double)lpotm->otmEMSquare; if (lplogfont->lfWidth) - FIXME("Font with lfWidth set no handled properly\n"); + FIXME("Font with lfWidth set not handled properly\n"); } static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_ValueRecord *record) @@ -1491,7 +1491,7 @@ static int GPOS_apply_MarkToBase(ScriptCache *psc, const OT_LookupTable *look, c ma = (const GPOS_MarkArray*)((const BYTE*)mbpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return -1; } mr = &ma->MarkRecord[mark_index]; @@ -1561,7 +1561,7 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A ma = (const GPOS_MarkArray*)((const BYTE*)mlpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return; } mr = &ma->MarkRecord[mark_index]; @@ -1571,7 +1571,7 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A la = (const GPOS_LigatureArray*)((const BYTE*)mlpf1 + offset); if (ligature_index > GET_BE_WORD(la->LigatureCount)) { - ERR("Ligature index exeeded ligature count\n"); + ERR("Ligature index exceeded ligature count\n"); return; } offset = GET_BE_WORD(la->LigatureAttach[ligature_index]); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index baccc2a..622a061 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -300,7 +300,7 @@ static const scriptRange scriptRanges[] = { { SCRIPT_UNDEFINED, 0, 0, 0} }; -/* the must be in order so that the index matches the Script value */ +/* this must be in order so that the index matches the Script value */ const scriptData scriptInformation[] = { {{SCRIPT_UNDEFINED, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_NEUTRAL, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -741,7 +741,7 @@ static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) static const WCHAR chars[4] = {0x0020, 0x200B, 0xF71B, 0x0640}; /* U+0020: numeric space U+200B: zero width space - U+F71B: unknow char found by black box testing + U+F71B: unknown char found by black box testing U+0640: kashida */ WORD gi[4]; @@ -908,7 +908,7 @@ static WORD get_char_script( LPCWSTR str, INT index, INT end, INT *consumed) if (str[index] == 0x2212 || str[index] == 0x2044) return Script_Punctuation; - /* Currency Symboles by Unicode point */ + /* Currency Symbols by Unicode point */ switch (str[index]) { case 0x09f2: @@ -2765,8 +2765,8 @@ static inline int get_cluster_advance(const int* piAdvance, * use piAdvance to find the cluster we are looking at * Find the character that is the first character of the cluster * That is our base piCP - * If the script snaps to cluster boundries (Hebrew, Indic, Thai) then we - * are good Otherwise if the cluster is larger than 1 glyph we need to + * If the script snaps to cluster boundaries (Hebrew, Indic, Thai) then we + * are good. Otherwise if the cluster is larger than 1 glyph we need to * determine how far through the cluster to advance the cursor. */ HRESULT WINAPI ScriptXtoCP(int iX, @@ -2955,7 +2955,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, * * PARAMS * chars [I] Array of characters. - * sa [I] String analysis. + * sa [I] Script analysis. * la [I] Array of logical attribute structures. * * RETURNS @@ -3259,7 +3259,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, * PARAMS * hdc [I] Device context. * psc [I/O] Opaque pointer to a script cache. - * psa [I/O] String analysis. + * psa [I/O] Script analysis. * tagScript [I] The OpenType tag for the Script * tagLangSys [I] The OpenType tag for the Language * rcRangeChars[I] Array of Character counts in each range

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.6.2.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 115ad2da7a545434c81222d291d147fa63324dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=115ad2da7a545434c81222d29… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 10:58:39 2016 -0500 mscoree: Update Wine Mono to 4.6.2. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index a39d0fb..8cbc221 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.6.0" -#define MONO_SHA "3a494b5b74fd17adf675a620d46b2dc1d2482424" +#define MONO_VERSION "4.6.2" +#define MONO_SHA "0a5090a3b81b6250a5d7104fc585bd871a9e467d" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7181b4b..033a121 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.6.0"; + static const char* mono_version = "4.6.2"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Józef Kucia : d3d11/tests: Test exact return values returned by D3D11CreateDevice functions.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: d2ca5419e3f6d2b241ccd3e50dbe201f98e1ddaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ca5419e3f6d2b241ccd3e50… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 5 10:22:12 2016 +0200 d3d11/tests: Test exact return values returned by D3D11CreateDevice functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ff2d56d..6355065 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -515,24 +515,24 @@ static void test_create_device(void) ID3D11Device_Release(device); hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, &feature_level, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, default_feature_levels, sizeof(default_feature_levels) / sizeof(default_feature_levels[0]), D3D11_SDK_VERSION, NULL, &feature_level, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, &immediate_context); - ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(!!immediate_context, "Expected immediate device context pointer, got NULL.\n"); refcount = get_refcount((IUnknown *)immediate_context); @@ -575,17 +575,17 @@ static void test_create_device(void) hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, NULL, NULL, &feature_level, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, &swapchain, &device, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); memset(&obtained_desc, 0, sizeof(obtained_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &obtained_desc); @@ -635,27 +635,32 @@ static void test_create_device(void) hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, &device, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID3D11Device_Release(device); hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, NULL, &feature_level, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, + NULL, NULL, NULL, NULL, &immediate_context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D11DeviceContext_Release(immediate_context); + + hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); swapchain_desc.OutputWindow = NULL; hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, NULL, &device, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID3D11Device_Release(device); swapchain = (IDXGISwapChain *)0xdeadbeef;

1 0

Sebastian Lackner : advapi32: Fix return value of RegNotifyChangeKeyValue for pending events.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: df77e490d89a0582fde621d54f834acfd9588ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df77e490d89a0582fde621d54… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 5 16:20:05 2016 +0200 advapi32: Fix return value of RegNotifyChangeKeyValue for pending events. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7992384..4b3d852 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2760,7 +2760,7 @@ LSTATUS WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree, fdwNotifyFilter, fWatchSubTree, NULL, 0, fAsync); - if (status && status != STATUS_TIMEOUT) + if (status && status != STATUS_PENDING) return RtlNtStatusToDosError( status ); return ERROR_SUCCESS; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index f877b36..82f5015 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3452,6 +3452,33 @@ static void test_RegOpenCurrentUser(void) RegCloseKey(key); } +static void test_RegNotifyChangeKeyValue(void) +{ + HKEY key, subkey; + HANDLE event; + DWORD dwret; + LONG ret; + + event = CreateEventW(NULL, FALSE, TRUE, NULL); + ok(event != NULL, "CreateEvent failed, error %u\n", GetLastError()); + ret = RegCreateKeyA(hkey_main, "TestKey", &key); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegNotifyChangeKeyValue(key, TRUE, REG_NOTIFY_CHANGE_NAME, event, TRUE); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", dwret); + + ret = RegCreateKeyA(key, "SubKey", &subkey); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + + RegDeleteKeyA(key, ""); + RegCloseKey(key); + CloseHandle(event); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -3486,6 +3513,7 @@ START_TEST(registry) test_delete_value(); test_delete_key_value(); test_RegOpenCurrentUser(); + test_RegNotifyChangeKeyValue(); /* cleanup */ delete_key( hkey_main );

1 0

Michael Müller : krnl386.exe16: Emulate 'mov Eb, Gb' instruction on x86 processor architecture.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: d8599db40ada552cecf11235cf770112b33fdf6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8599db40ada552cecf11235c… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Apr 5 16:27:55 2016 +0200 krnl386.exe16: Emulate 'mov Eb, Gb' instruction on x86 processor architecture. Similar to the implementation in ntoskrnl.exe. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/instr.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index b44bd55..b0de30f 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -113,7 +113,7 @@ static BOOL INSTR_ReplaceSelector( CONTEXT *context, WORD *sel ) /* store an operand into a register */ -static void store_reg( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op ) +static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op ) { switch((regmodrm >> 3) & 7) { @@ -152,6 +152,22 @@ static void store_reg( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int lo } } +/* store an operand into a byte register */ +static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr ) +{ + switch((regmodrm >> 3) & 7) + { + case 0: context->Eax = (context->Eax & 0xffffff00) | *addr; break; + case 1: context->Ecx = (context->Ecx & 0xffffff00) | *addr; break; + case 2: context->Edx = (context->Edx & 0xffffff00) | *addr; break; + case 3: context->Ebx = (context->Ebx & 0xffffff00) | *addr; break; + case 4: context->Eax = (context->Eax & 0xffff00ff) | (*addr << 8); break; + case 5: context->Ecx = (context->Ecx & 0xffff00ff) | (*addr << 8); break; + case 6: context->Edx = (context->Edx & 0xffff00ff) | (*addr << 8); break; + case 7: context->Ebx = (context->Ebx & 0xffff00ff) | (*addr << 8); break; + } +} + /*********************************************************************** * INSTR_GetOperandAddr * @@ -333,7 +349,7 @@ static BOOL INSTR_EmulateLDS( CONTEXT *context, BYTE *instr, int long_op, /* Now store the offset in the correct register */ - store_reg( context, *regmodrm, addr, long_op ); + store_reg_word( context, *regmodrm, addr, long_op ); /* Store the correct segment in the segment register */ @@ -689,19 +705,26 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) } return ExceptionContinueExecution; + case 0x8a: /* mov Eb, Gb */ case 0x8b: /* mov Ev, Gv */ { - BYTE *addr = INSTR_GetOperandAddr(context, instr + 1, long_addr, + BYTE *data = INSTR_GetOperandAddr(context, instr + 1, long_addr, segprefix, &len); + unsigned int data_size = (*instr == 0x8b) ? (long_op ? 4 : 2) : 1; struct idtr idtr = get_idtr(); - unsigned int offset = addr - idtr.base; + unsigned int offset = data - idtr.base; - if (offset <= idtr.limit + 1 - (long_op ? 4 : 2)) + if (offset <= idtr.limit + 1 - data_size) { idt[1].LimitLow = 0x100; /* FIXME */ idt[2].LimitLow = 0x11E; /* FIXME */ idt[3].LimitLow = 0x500; /* FIXME */ - store_reg( context, instr[1], (BYTE *)idt + offset, long_op ); + + switch (*instr) + { + case 0x8a: store_reg_byte( context, instr[1], (BYTE *)idt + offset ); break; + case 0x8b: store_reg_word( context, instr[1], (BYTE *)idt + offset, long_op ); break; + } context->Eip += prefixlen + len + 1; return ExceptionContinueExecution; }

1 0

Aric Stewart : hidclass.sys: Correct input vs output parameters for IOCTL_HID_SET_FEATURE.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: 1b62b7f3c93dec8e6aba5b6f1f9ffaeafd6c83e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b62b7f3c93dec8e6aba5b6f1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 08:43:43 2016 -0500 hidclass.sys: Correct input vs output parameters for IOCTL_HID_SET_FEATURE. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 886a77a..2900d9e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -479,7 +479,7 @@ static NTSTATUS HID_set_feature(DEVICE_OBJECT *device, IRP *irp) packet.reportBufferLen = irpsp->Parameters.DeviceIoControl.InputBufferLength; TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); - rc = call_minidriver(IOCTL_HID_SET_FEATURE, device, NULL, 0, &packet, sizeof(packet)); + rc = call_minidriver(IOCTL_HID_SET_FEATURE, device, &packet, sizeof(packet), NULL, 0); irp->IoStatus.u.Status = rc; if (irp->IoStatus.u.Status == STATUS_SUCCESS)

1 0

Aric Stewart : hidclass.sys: Improvements for IOCTL_HID_GET_FEATURE handling.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: be91fcd879a1de768a57b4a06be470c10313b08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be91fcd879a1de768a57b4a06… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 08:43:48 2016 -0500 hidclass.sys: Improvements for IOCTL_HID_GET_FEATURE handling. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 2900d9e..aae4e5f 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -437,11 +437,11 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp) HID_XFER_PACKET *packet; DWORD len; NTSTATUS rc = STATUS_SUCCESS; - WCHAR *out_buffer; + BYTE *out_buffer; irp->IoStatus.Information = 0; - out_buffer = (WCHAR*)(((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset); + out_buffer = (((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset); TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; @@ -452,16 +452,21 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp) TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet->reportId, packet->reportBufferLen, packet->reportBuffer); - rc = call_minidriver(IOCTL_HID_GET_FEATURE, device, NULL, 0, packet, len); + rc = call_minidriver(IOCTL_HID_GET_FEATURE, device, NULL, 0, packet, sizeof(*packet)); irp->IoStatus.u.Status = rc; if (irp->IoStatus.u.Status == STATUS_SUCCESS) - irp->IoStatus.Information = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + { + irp->IoStatus.Information = packet->reportBufferLen; + memcpy(out_buffer, packet->reportBuffer, packet->reportBufferLen); + } else irp->IoStatus.Information = 0; TRACE_(hid_report)("Result 0x%x get %li bytes\n", rc, irp->IoStatus.Information); + HeapFree(GetProcessHeap(), 0, packet); + return rc; }

1 0