June 2019 - Wine-commits - list.winehq.org

Zebediah Figura : kernel32: Use RtlCreateUserStack().
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 9b7e2f54b236ee8944a6e1c90408dd92c6783a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b7e2f54b236ee8944a6e1c9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 14 10:32:44 2019 -0500 kernel32: Use RtlCreateUserStack(). Planet Coaster allocates 128kB of stack (both reserve and commit) but expects to be able to use at least one page more than that. Native Windows always reserves at least 1MB of stack. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/fiber.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index 151a676..27abd78 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -89,6 +89,8 @@ LPVOID WINAPI CreateFiberEx( SIZE_T stack_commit, SIZE_T stack_reserve, DWORD fl LPFIBER_START_ROUTINE start, LPVOID param ) { struct fiber_data *fiber; + INITIAL_TEB stack; + NTSTATUS status; if (!(fiber = HeapAlloc( GetProcessHeap(), 0, sizeof(*fiber) ))) { @@ -96,15 +98,15 @@ LPVOID WINAPI CreateFiberEx( SIZE_T stack_commit, SIZE_T stack_reserve, DWORD fl return NULL; } - /* FIXME: should use the thread stack allocation routines here */ - if (!stack_reserve) stack_reserve = 1024*1024; - if(!(fiber->stack_allocation = VirtualAlloc( 0, stack_reserve, MEM_COMMIT, PAGE_READWRITE ))) + if ((status = RtlCreateUserStack( stack_commit, stack_reserve, 0, 1, 1, &stack ))) { - HeapFree( GetProcessHeap(), 0, fiber ); + SetLastError( RtlNtStatusToDosError(status) ); return NULL; } - fiber->stack_base = (char *)fiber->stack_allocation + stack_reserve; - fiber->stack_limit = fiber->stack_allocation; + + fiber->stack_allocation = stack.DeallocationStack; + fiber->stack_base = stack.StackBase; + fiber->stack_limit = stack.StackLimit; fiber->param = param; fiber->except = (void *)-1; fiber->start = start; @@ -127,7 +129,7 @@ void WINAPI DeleteFiber( LPVOID fiber_ptr ) HeapFree( GetProcessHeap(), 0, fiber ); ExitThread(1); } - VirtualFree( fiber->stack_allocation, 0, MEM_RELEASE ); + RtlFreeUserStack( fiber->stack_allocation ); HeapFree( GetProcessHeap(), 0, fiber->fls_slots ); HeapFree( GetProcessHeap(), 0, fiber ); }

1 0

Zebediah Figura : ntdll/tests: Add tests for RtlCreateUserStack().
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 16eb17bb0aaed8d33c1a99d78642cc0da849c797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16eb17bb0aaed8d33c1a99d7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 14 10:32:45 2019 -0500 ntdll/tests: Add tests for RtlCreateUserStack(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 79 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index ff10508..183a097 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -26,6 +26,10 @@ #include "winternl.h" #include "wine/test.h" +static unsigned int page_size; + +static NTSTATUS (WINAPI *pRtlCreateUserStack)(SIZE_T, SIZE_T, ULONG, SIZE_T, SIZE_T, INITIAL_TEB *); +static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static void test_AllocateVirtualMemory(void) @@ -167,16 +171,85 @@ static void test_AllocateVirtualMemory(void) ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed\n"); } +static void test_RtlCreateUserStack(void) +{ + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + SIZE_T default_commit = nt->OptionalHeader.SizeOfStackCommit; + SIZE_T default_reserve = nt->OptionalHeader.SizeOfStackReserve; + INITIAL_TEB stack = {0}; + unsigned int i; + NTSTATUS ret; + + struct + { + SIZE_T commit, reserve, commit_align, reserve_align, expect_commit, expect_reserve; + } + tests[] = + { + { 0, 0, 1, 1, default_commit, default_reserve}, + { 0x2000, 0, 1, 1, 0x2000, default_reserve}, + { 0x4000, 0, 1, 1, 0x4000, default_reserve}, + { 0, 0x200000, 1, 1, default_commit, 0x200000}, + { 0x4000, 0x200000, 1, 1, 0x4000, 0x200000}, + {0x100000, 0x100000, 1, 1, 0x100000, 0x100000}, + { 0x20000, 0x20000, 1, 1, 0x20000, 0x100000}, + + { 0, 0x110000, 1, 1, default_commit, 0x110000}, + { 0, 0x110000, 1, 0x40000, default_commit, 0x140000}, + { 0, 0x140000, 1, 0x40000, default_commit, 0x140000}, + { 0x11000, 0x140000, 1, 0x40000, 0x11000, 0x140000}, + { 0x11000, 0x140000, 0x4000, 0x40000, 0x14000, 0x140000}, + { 0, 0, 0x4000, 0x400000, + (default_commit + 0x3fff) & ~0x3fff, + (default_reserve + 0x3fffff) & ~0x3fffff}, + }; + + if (!pRtlCreateUserStack) + { + win_skip("RtlCreateUserStack() is missing\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memset(&stack, 0xcc, sizeof(stack)); + ret = pRtlCreateUserStack(tests[i].commit, tests[i].reserve, 0, + tests[i].commit_align, tests[i].reserve_align, &stack); + ok(!ret, "%u: got status %#x\n", i, ret); + ok(!stack.OldStackBase, "%u: got OldStackBase %p\n", i, stack.OldStackBase); + ok(!stack.OldStackLimit, "%u: got OldStackLimit %p\n", i, stack.OldStackLimit); + ok(!((ULONG_PTR)stack.DeallocationStack & (page_size - 1)), + "%u: got unaligned memory %p\n", i, stack.DeallocationStack); + ok((ULONG_PTR)stack.StackBase - (ULONG_PTR)stack.DeallocationStack == tests[i].expect_reserve, + "%u: got reserve %#lx\n", i, (ULONG_PTR)stack.StackBase - (ULONG_PTR)stack.DeallocationStack); + todo_wine ok((ULONG_PTR)stack.StackBase - (ULONG_PTR)stack.StackLimit == tests[i].expect_commit, + "%u: got commit %#lx\n", i, (ULONG_PTR)stack.StackBase - (ULONG_PTR)stack.StackLimit); + pRtlFreeUserStack(stack.DeallocationStack); + } + + ret = pRtlCreateUserStack(0x11000, 0x110000, 0, 1, 0, &stack); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + ret = pRtlCreateUserStack(0x11000, 0x110000, 0, 0, 1, &stack); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); +} + START_TEST(virtual) { SYSTEM_BASIC_INFORMATION sbi; - HMODULE hkernel32; + HMODULE mod; + + mod = GetModuleHandleA("kernel32.dll"); + pIsWow64Process = (void *)GetProcAddress(mod, "IsWow64Process"); - hkernel32 = GetModuleHandleA("kernel32.dll"); - pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); + mod = GetModuleHandleA("ntdll.dll"); + pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); + pRtlFreeUserStack = (void *)GetProcAddress(mod, "RtlFreeUserStack"); NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); trace("system page size %#x\n", sbi.PageSize); + page_size = sbi.PageSize; test_AllocateVirtualMemory(); + test_RtlCreateUserStack(); }

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 5a3f66867fb16781eb977af3cb3bb3a5e6a02391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a3f66867fb16781eb977af3… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Mon Jun 17 09:30:03 2019 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index f8974b0..384164d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10162,11 +10162,11 @@ msgstr "Horário de verão da Mauritânia" #: tzres.rc:214 msgid "Vladivostok Standard Time" -msgstr "Hora padrão de Vladivostok" +msgstr "Hora padrão de Vladivostoque" #: tzres.rc:215 msgid "Vladivostok Daylight Time" -msgstr "Horário de verão de Vladivostok" +msgstr "Horário de verão de Vladivostoque" #: tzres.rc:186 msgid "Singapore Standard Time" @@ -10178,11 +10178,11 @@ msgstr "Horário de verão de Singapura" #: tzres.rc:126 msgid "Korea Standard Time" -msgstr "Hora padrão da Coréia" +msgstr "Hora padrão da Coreia" #: tzres.rc:127 msgid "Korea Daylight Time" -msgstr "Horário de verão da Coréia" +msgstr "Horário de verão da Coreia" #: tzres.rc:86 msgid "E. Africa Standard Time" @@ -11973,9 +11973,9 @@ msgstr "" "abertura estão definidos atualmente.\n" "Se usado apenas com um tipo de arquivo, exibe o comando de abertura\n" "associado, se houver.\n" -"Se não for especificado nenhum comando de abertura após o sinal de\n" -"igualdade, remove o comando de abertura associado ao tipo de arquivo\n" -"especificado.\n" +"Se não for especificado nenhum comando de abertura após o sinal de " +"igualdade,\n" +"remove o comando de abertura associado ao tipo de arquivo especificado.\n" #: cmd.rc:303 msgid "MORE displays output of files or piped input in pages.\n" @@ -15485,7 +15485,7 @@ msgstr "Configuração dos alto-falantes" #: winecfg.rc:280 msgid "Speakers:" -msgstr "Auto-falantes:" +msgstr "Alto-falantes:" #: winecfg.rc:288 msgid "Appearance" @@ -16299,7 +16299,7 @@ msgstr "Gerenciador de Arquivos do Wine" #: winefile.rc:98 msgid "root fs" -msgstr "root fs" +msgstr "Sistema de arquivos Raiz" #: winefile.rc:100 msgid "Shell" @@ -17045,7 +17045,7 @@ msgstr "" "[/A] Copiar apenas arquivos com atributo de arquivo.\n" "[/M] Copiar apenas arquivos com atributo de arquivo, removendo\n" "\to atributo de arquivo.\n" -"[/K] Copia os atributos do arquivo; sem isto, os attributos nao são " +"[/K] Copia os atributos do arquivo; sem isto, os atributos nao são " "preservados.\n" "[/D | /D:m-d-y] Copiar novos arquivos ou os alterados após a data " "fornecida.\n"

1 0

Ethan Lee : xaudio2: Fix some TRACE calls erroneously marked as stubs.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 07d3780d6888e795e9fe6da0391991f85b5f0947 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07d3780d6888e795e9fe6da0… Author: Ethan Lee <elee(a)codeweavers.com> Date: Fri Jun 14 10:06:30 2019 -0400 xaudio2: Fix some TRACE calls erroneously marked as stubs. Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index f135642..da0b0aa 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1811,7 +1811,7 @@ static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - TRACE("(%p)->(%p): stub!\n", This, pPerfData); + TRACE("(%p)->(%p)\n", This, pPerfData); FAudio_GetPerformanceData(This->faudio, (FAudioPerformanceData *)pPerfData); } @@ -1822,7 +1822,7 @@ static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - TRACE("(%p)->(%p, %p): stub!\n", This, pDebugConfiguration, pReserved); + TRACE("(%p)->(%p, %p)\n", This, pDebugConfiguration, pReserved); FAudio_SetDebugConfiguration(This->faudio, (FAudioDebugConfiguration *)pDebugConfiguration, pReserved); }

1 0

Alistair Leslie-Hughes : dpnet: Remove dead code (Coverity).
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: c2a8f3d8a052a0f5f97529e5cdc7257610587c59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a8f3d8a052a0f5f97529e5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 16 06:49:59 2019 +0000 dpnet: Remove dead code (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/server.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 698082d..ec7b766 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -326,8 +326,6 @@ HRESULT set_firewall( enum firewall_op op ) hr = INetFwAuthorizedApplications_Add( apps, app ); else if (op == APP_REMOVE) hr = INetFwAuthorizedApplications_Remove( apps, image ); - else - hr = E_INVALIDARG; done: if (app) INetFwAuthorizedApplication_Release( app );

1 0

Alistair Leslie-Hughes : dinput: Ensure buffer doesn't overflow (Coverity) .
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 55edfc8837a26ced87964014c6e62e1be7dcc5e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55edfc8837a26ced87964014… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 16 06:50:02 2019 +0000 dinput: Ensure buffer doesn't overflow (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 2 +- dlls/dinput/joystick_linuxinput.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 433348c..a5308b6 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -700,7 +700,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; snprintf(pdidi->tszInstanceName, MAX_PATH, "Joystick %d", index); - strcpy(pdidi->tszProductName, This->name); + lstrcpynA(pdidi->tszProductName, This->name, MAX_PATH); if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3A)) { pdidi->guidFFDriver = GUID_NULL; pdidi->wUsagePage = 0; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e3371b9..1e8c542 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -411,8 +411,8 @@ static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver lpddi->guidInstance = lpddiW.guidInstance; lpddi->guidProduct = lpddiW.guidProduct; lpddi->dwDevType = lpddiW.dwDevType; - strcpy(lpddi->tszInstanceName, joydevs[id].name); - strcpy(lpddi->tszProductName, joydevs[id].name); + lstrcpynA(lpddi->tszInstanceName, joydevs[id].name, MAX_PATH); + lstrcpynA(lpddi->tszProductName, joydevs[id].name, MAX_PATH); lpddi->guidFFDriver = lpddiW.guidFFDriver; lpddi->wUsagePage = lpddiW.wUsagePage; lpddi->wUsage = lpddiW.wUsage;

1 0

Alistair Leslie-Hughes : wininet: Remove unsued flag HTTP_ADDHDR_FLAG_COALESCE.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: bf5b8ae8af0986852436e780c37d225f4dcfe687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf5b8ae8af0986852436e780… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 17 06:20:52 2019 +0000 wininet: Remove unsued flag HTTP_ADDHDR_FLAG_COALESCE. This flag has the same value as HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA which is used in multiple places. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 54bb569..cbc95fb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -137,7 +137,6 @@ static const WCHAR emptyW[] = {0}; #define HTTP_ADDHDR_FLAG_ADD 0x20000000 #define HTTP_ADDHDR_FLAG_ADD_IF_NEW 0x10000000 -#define HTTP_ADDHDR_FLAG_COALESCE 0x40000000 #define HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA 0x40000000 #define HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON 0x01000000 #define HTTP_ADDHDR_FLAG_REPLACE 0x80000000 @@ -6047,7 +6046,7 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer) * */ -#define COALESCEFLAGS (HTTP_ADDHDR_FLAG_COALESCE|HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) +#define COALESCEFLAGS (HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR value, DWORD dwModifier) {

1 0

Alistair Leslie-Hughes : advapi32: Don' t read a value that might be uninitialized (Coverity).
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 1b714ca0886aed265f85f6a661e3058f9f7c56a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b714ca0886aed265f85f6a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 17 06:28:43 2019 +0000 advapi32: Don't read a value that might be uninitialized (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9269898..2d2c1be 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2118,7 +2118,7 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret; @@ -2214,7 +2214,7 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret;

1 0

Alistair Leslie-Hughes : mshtml: Remove redundant assignments.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: f6bdee2a62881c8c1a6c0d93564ca1d35e133095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6bdee2a62881c8c1a6c0d93… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 14 05:53:30 2019 +0000 mshtml: Remove redundant assignments. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/oleobj.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 274db8c..1d8d626 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -922,7 +922,6 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS if(V_VT(&res) == VT_BOOL) { if(V_BOOL(&res)) { FIXME("silent mode is not supported\n"); - hres = E_FAIL; } }else { FIXME("silent=%s\n", debugstr_variant(&res)); @@ -935,7 +934,6 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS return S_OK; FIXME("not supported AMBIENT_USERAGENT\n"); - hres = E_FAIL; return S_OK; case DISPID_AMBIENT_PALETTE: TRACE("(%p)->(DISPID_AMBIENT_PALETTE)\n", This); @@ -944,7 +942,6 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS return S_OK; FIXME("not supported AMBIENT_PALETTE\n"); - hres = E_FAIL; return S_OK; }

1 0

Dmitry Timoshkov : mshtml: Fix a typo.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 0716fd58a8d96782454c9cc49351cc0f453e82bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0716fd58a8d96782454c9cc4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 14 18:46:31 2019 +0800 mshtml: Fix a typo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelemcol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 15b5844..62c7254 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -523,7 +523,7 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, nsAString_Finish(&tag_str); elem_vector_normalize(&buf); - TRACE("fount %d tags\n", buf.len); + TRACE("found %d tags\n", buf.len); *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len, dispex_compat_mode(&This->dispex));

1 0