August 2015 - Wine-commits - list.winehq.org

Józef Kucia : includes: Add D3D11CreateDeviceAndSwapChain declaration to d3d11.idl.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 02254e04ca04eea070af6237ee2f423a6b75c767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02254e04ca04eea070af6237e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 18 00:53:22 2015 +0200 includes: Add D3D11CreateDeviceAndSwapChain declaration to d3d11.idl. --- include/d3d11.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 3726d32..86fe42a 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -2157,3 +2157,8 @@ cpp_quote(" UINT,UINT,ID3D11Device**,D3D_FEATURE_LEVEL*,ID3D11DeviceContext** cpp_quote("typedef HRESULT (WINAPI *PFN_D3D11_CREATE_DEVICE_AND_SWAP_CHAIN)(IDXGIAdapter*,D3D_DRIVER_TYPE,HMODULE,UINT,") cpp_quote(" const D3D_FEATURE_LEVEL*,UINT,UINT,const DXGI_SWAP_CHAIN_DESC*,IDXGISwapChain**,ID3D11Device**,") cpp_quote(" D3D_FEATURE_LEVEL*,ID3D11DeviceContext**);") + +[local] HRESULT __stdcall D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, + HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, + const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D11Device **device, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context);

1 0

Józef Kucia : d3d10core: Do not use '\n' in the middle of TRACEs.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 1cb7878beb3070bc1428b234e19a92e0f0f9515d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb7878beb3070bc1428b234e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 18 00:53:23 2015 +0200 d3d10core: Do not use '\n' in the middle of TRACEs. --- dlls/d3d10core/device.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 05e8de5..7996710 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -316,8 +316,8 @@ static void STDMETHODCALLTYPE d3d10_device_DrawIndexedInstanced(ID3D10Device1 *i { struct d3d10_device *device = impl_from_ID3D10Device(iface); - TRACE("iface %p, instance_index_count %u, instance_count %u, start_index_location %u,\n" - "\tbase_vertex_location %d, start_instance_location %u.\n", + TRACE("iface %p, instance_index_count %u, instance_count %u, start_index_location %u, " + "base_vertex_location %d, start_instance_location %u.\n", iface, instance_index_count, instance_count, start_index_location, base_vertex_location, start_instance_location); @@ -795,8 +795,8 @@ static void STDMETHODCALLTYPE d3d10_device_ResolveSubresource(ID3D10Device1 *ifa ID3D10Resource *dst_resource, UINT dst_subresource_idx, ID3D10Resource *src_resource, UINT src_subresource_idx, DXGI_FORMAT format) { - FIXME("iface %p, dst_resource %p, dst_subresource_idx %u,\n" - "\tsrc_resource %p, src_subresource_idx %u, format %s stub!\n", + FIXME("iface %p, dst_resource %p, dst_subresource_idx %u, " + "src_resource %p, src_subresource_idx %u, format %s stub!\n", iface, dst_resource, dst_subresource_idx, src_resource, src_subresource_idx, debug_dxgi_format(format)); } @@ -1731,8 +1731,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device1 *i struct d3d10_input_layout *object; HRESULT hr; - TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p," - "\tshader_byte_code_length %lu, input_layout %p\n", + TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p, " + "shader_byte_code_length %lu, input_layout %p\n", iface, element_descs, element_count, shader_byte_code, shader_byte_code_length, input_layout); @@ -1815,8 +1815,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp const void *byte_code, SIZE_T byte_code_length, const D3D10_SO_DECLARATION_ENTRY *output_stream_decls, UINT output_stream_decl_count, UINT output_stream_stride, ID3D10GeometryShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_length %lu, output_stream_decls %p,\n" - "\toutput_stream_decl_count %u, output_stream_stride %u, shader %p stub!\n", + FIXME("iface %p, byte_code %p, byte_code_length %lu, output_stream_decls %p, " + "output_stream_decl_count %u, output_stream_stride %u, shader %p stub!\n", iface, byte_code, byte_code_length, output_stream_decls, output_stream_decl_count, output_stream_stride, shader); @@ -2134,8 +2134,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CheckCounter(ID3D10Device1 *iface, const D3D10_COUNTER_DESC *desc, D3D10_COUNTER_TYPE *type, UINT *active_counters, char *name, UINT *name_length, char *units, UINT *units_length, char *description, UINT *description_length) { - FIXME("iface %p, desc %p, type %p, active_counters %p, name %p, name_length %p,\n" - "\tunits %p, units_length %p, description %p, description_length %p stub!\n", + FIXME("iface %p, desc %p, type %p, active_counters %p, name %p, name_length %p, " + "units %p, units_length %p, description %p, description_length %p stub!\n", iface, desc, type, active_counters, name, name_length, units, units_length, description, description_length);

1 0

Józef Kucia : d3d10: Do not use '\n' in the middle of TRACE.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: f04dfcd21451b3d560625c03fa1566adbc304649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f04dfcd21451b3d560625c03f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 18 00:53:24 2015 +0200 d3d10: Do not use '\n' in the middle of TRACE. --- dlls/d3d10/d3d10_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 12c97ce..4600a70 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -139,8 +139,8 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER IDXGIFactory *factory; HRESULT hr; - TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %d,\n" - "\tswapchain_desc %p, swapchain %p, device %p\n", + TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %d, " + "swapchain_desc %p, swapchain %p, device %p\n", adapter, debug_d3d10_driver_type(driver_type), swrast, flags, sdk_version, swapchain_desc, swapchain, device);

1 0

Józef Kucia : dxgi: Remove 'stub!' from TRACE message in dxgi_swapchain_ResizeBuffers().
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 9e8b58ee181a98996ebd9a94312a8e363677ecf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8b58ee181a98996ebd9a943… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 18 00:53:25 2015 +0200 dxgi: Remove 'stub!' from TRACE message in dxgi_swapchain_ResizeBuffers(). --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index cffd3bc..ce09450 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -225,7 +225,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeBuffers(IDXGISwapChain *if unsigned int i; HRESULT hr; - TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x stub!\n", + TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", iface, buffer_count, width, height, debug_dxgi_format(format), flags); if (flags)

1 0

Dmitry Timoshkov : ntdll: Separate image relocation from NtMapViewOfSection.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: e67a00b46694625e3c40386008affac42e7e3847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67a00b46694625e3c4038600… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 18 15:25:40 2015 +0800 ntdll: Separate image relocation from NtMapViewOfSection. --- dlls/kernel32/tests/loader.c | 10 ----- dlls/ntdll/loader.c | 87 +++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/virtual.c | 44 +--------------------- 3 files changed, 87 insertions(+), 54 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 89feeb9..25b7b08 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -799,15 +799,6 @@ static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL size = 0; status = pNtMapViewOfSection(hmap, GetCurrentProcess(), &addr2, 0, 0, &offset, &size, 1 /* ViewShare */, 0, PAGE_READONLY); - /* FIXME: remove once Wine is fixed */ - if (status != STATUS_IMAGE_NOT_AT_BASE) - { - todo_wine { - ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); - ok(addr2 != 0, "mapped address should be valid\n"); - } - goto wine_is_broken; - } ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); ok(addr2 != 0, "mapped address should be valid\n"); ok(addr2 != addr1, "mapped addresses should be different\n"); @@ -861,7 +852,6 @@ static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL ok(ret, "FreeLibrary error %d\n", GetLastError()); } -wine_is_broken: status = pNtUnmapViewOfSection(GetCurrentProcess(), addr1); ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d15b140..4404938 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1656,6 +1656,81 @@ static void set_security_cookie( void *module, SIZE_T len ) } } +static NTSTATUS perform_relocations( void *module, SIZE_T len ) +{ + IMAGE_NT_HEADERS *nt; + char *base; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + INT_PTR delta; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + base = (char *)nt->OptionalHeader.ImageBase; + + assert( module != base ); + + /* no relocations are performed on non page-aligned binaries */ + if (nt->OptionalHeader.SectionAlignment < page_size) + return STATUS_SUCCESS; + + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) && NtCurrentTeb()->Peb->ImageBaseAddress) + return STATUS_SUCCESS; + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + + if ((nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) || + !relocs->VirtualAddress || !relocs->Size) + { + WARN( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + if (nt->FileHeader.NumberOfSections > sizeof(protect_old)/sizeof(protect_old[0])) + return STATUS_INVALID_IMAGE_FORMAT; + + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + + TRACE( "relocating from %p-%p to %p-%p\n", + base, base + len, module, (char *)module + len ); + + rel = get_rva( module, relocs->VirtualAddress ); + end = get_rva( module, relocs->VirtualAddress + relocs->Size ); + delta = (char *)module - base; + + while (rel < end - 1 && rel->SizeOfBlock) + { + if (rel->VirtualAddress >= len) + { + WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); + return STATUS_ACCESS_VIOLATION; + } + rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) return STATUS_INVALID_IMAGE_FORMAT; + } + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } + + return STATUS_SUCCESS; +} /****************************************************************************** * load_native_dll (internal) @@ -1681,7 +1756,17 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, module = NULL; status = NtMapViewOfSection( mapping, NtCurrentProcess(), &module, 0, 0, &size, &len, ViewShare, 0, PAGE_EXECUTE_READ ); - if (status < 0) goto done; + + /* perform base relocation, if necessary */ + + if (status == STATUS_IMAGE_NOT_AT_BASE) + status = perform_relocations( module, len ); + + if (status != STATUS_SUCCESS) + { + if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); + goto done; + } /* create the MODREF */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index fe17518..4d4bc3b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1073,7 +1073,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz struct stat st; struct file_view *view = NULL; char *ptr, *header_end, *header_start; - INT_PTR delta = 0; /* zero-map the whole range */ @@ -1236,47 +1235,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } } - - /* perform base relocation, if necessary */ - - if (ptr != base && - ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || - !NtCurrentTeb()->Peb->ImageBaseAddress) ) - { - IMAGE_BASE_RELOCATION *rel, *end; - const IMAGE_DATA_DIRECTORY *relocs; - - if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) - { - WARN_(module)( "Need to relocate module from %p to %p, but there are no relocation records\n", - base, ptr ); - status = STATUS_CONFLICTING_ADDRESSES; - goto error; - } - - TRACE_(module)( "relocating from %p-%p to %p-%p\n", - base, base + total_size, ptr, ptr + total_size ); - - relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; - rel = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress); - end = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress + relocs->Size); - delta = ptr - base; - - while (rel < end - 1 && rel->SizeOfBlock) - { - if (rel->VirtualAddress >= total_size) - { - WARN_(module)( "invalid address %p in relocation %p\n", ptr + rel->VirtualAddress, rel ); - status = STATUS_ACCESS_VIOLATION; - goto error; - } - rel = LdrProcessRelocationBlock( ptr + rel->VirtualAddress, - (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), - (USHORT *)(rel + 1), delta ); - if (!rel) goto error; - } - } - /* set the image protections */ VIRTUAL_SetProt( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ ); @@ -1313,7 +1271,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz *addr_ptr = ptr; #ifdef VALGRIND_LOAD_PDB_DEBUGINFO - VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, delta); + VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, ptr - base); #endif if (ptr != base) return STATUS_IMAGE_NOT_AT_BASE; return STATUS_SUCCESS;

1 0

Dmitry Timoshkov : msi: Avoid using dialog record after free.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 2ad9312f02b86591073532737f8afac20aed8a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad9312f02b86591073532737… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 18 17:40:05 2015 +0800 msi: Avoid using dialog record after free. --- dlls/msi/dialog.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5d3527f..a79ce1f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3664,8 +3664,11 @@ static LRESULT msi_dialog_oncreate( HWND hwnd, LPCREATESTRUCTW cs ) if (!dialog->default_font) { dialog->default_font = strdupW(dfv); - msiobj_release( &rec->hdr ); - if (!dialog->default_font) return -1; + if (!dialog->default_font) + { + msiobj_release( &rec->hdr ); + return -1; + } } title = msi_get_deformatted_field( dialog->package, rec, 7 );

1 0

Adam Stachowicz : po: Update Polish translation.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: bc051b9f33ba7d3007c5232c3ea699b1ddb5aa52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc051b9f33ba7d3007c5232c3… Author: Adam Stachowicz <saibamenppl(a)gmail.com> Date: Mon Aug 17 13:36:13 2015 +0200 po: Update Polish translation. --- po/pl.po | 87 +++++++++++++++++++--------------------------------------------- 1 file changed, 25 insertions(+), 62 deletions(-) diff --git a/po/pl.po b/po/pl.po index 89b18af..dc7d51c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,21 +1,21 @@ # Polish translations for Wine # # Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014. +# Adam "Saibamen" Stachowicz <saibamenppl(a)gmail.com>, 2015. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-11-29 07:31+0100\n" -"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" +"PO-Revision-Date: 2015-08-16 21:14+0200\n" +"Last-Translator: Adam Stachowicz <saibamenppl(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.8.4\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -2738,11 +2738,6 @@ msgstr "" "Czy jesteś pewien, że chcesz usunąć ten certyfikat?" #: cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -3155,10 +3150,8 @@ msgid "&View Source" msgstr "&Pokaż źródło" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Właściwości" +msgstr "&Właściwości" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104 @@ -7472,10 +7465,8 @@ msgid "Add Control" msgstr "Dodaj kontrolkę" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Czcionka..." +msgstr "&Konwertuj..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8602,10 +8593,8 @@ msgid "Duplex:" msgstr "Dupleks:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "U&stawienia" +msgstr "Ustawienia" #: wininet.rc:42 wininet.rc:62 msgid "Realm" @@ -8928,10 +8917,6 @@ msgstr "" "lub czy połączenie sieciowe jest wciąż aktywne." #: winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." @@ -9250,24 +9235,20 @@ msgstr "" "czy połączenie sieciowe jest aktywne." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Instalator Wine Mono" +msgstr "Mapper dźwięku Wine" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "kolumna" +msgstr "Głośność" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Główna głośność" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Wycisz" #: winspool.rc:37 msgid "Print to File" @@ -11585,10 +11566,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Błąd: Niewłaściwe parametry wiersza poleceń\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Błąd: Nie można dodać kluczy do zdalnej maszyny\n" +msgstr "Błąd: Błąd dostępu do zdalnej maszyny\n" #: reg.rc:38 msgid "" @@ -11596,10 +11575,8 @@ msgid "" msgstr "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Niewspierany typ.\n" +msgstr "Błąd: Niewspierany typ\n" #: regedit.rc:34 msgid "&Registry" @@ -13198,14 +13175,12 @@ msgid "&Test Sound" msgstr "Próba dźwięku" #: winecfg.rc:277 winecfg.rc:90 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Ustawienia Wine" +msgstr "Konfiguracja głośników" #: winecfg.rc:280 msgid "Speakers:" -msgstr "" +msgstr "Głośniki:" #: winecfg.rc:288 msgid "Appearance" @@ -13313,21 +13288,19 @@ msgstr "(Domyślne systemowe)" #: winecfg.rc:91 msgid "5.1 Surround" -msgstr "" +msgstr "Dźwięk przestrzenny w układzie 5.1" #: winecfg.rc:92 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "grafika" +msgstr "Kwadrofonia" #: winecfg.rc:93 msgid "Stereo" -msgstr "" +msgstr "Stereo" #: winecfg.rc:94 msgid "Mono" -msgstr "" +msgstr "Mono" #: winecfg.rc:54 msgid "" @@ -13588,16 +13561,12 @@ msgid "Command history" msgstr "Historia poleceń" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Strefa bufora" +msgstr "Rozmiar &bufora:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "&Usuń powtórzenia" +msgstr "&Usuń duplikaty" #: wineconsole.rc:74 msgid "Popup menu" @@ -13612,22 +13581,16 @@ msgid "S&hift" msgstr "S&hift" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Zamknij konsolę" +msgstr "Konsola" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Szybka edycja" +msgstr "Tryb szybkiej edycji" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "Tryb &eksperta" +msgstr "Tryb wstaw&iania" #: wineconsole.rc:88 msgid "&Font"

1 0

Jacek Caban : ieframe: Don't add about: URLs to travellog.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 16bfe07639a179f686e389221564df981d5c09e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16bfe07639a179f686e389221… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:00:47 2015 +0200 ieframe: Don't add about: URLs to travellog. --- dlls/ieframe/dochost.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 3c7afb6..3de1d21 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -395,6 +395,13 @@ static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; + static const WCHAR about_schemeW[] = {'a','b','o','u','t',':'}; + + if(This->url && !strncmpiW(This->url, about_schemeW, sizeof(about_schemeW)/sizeof(*about_schemeW))) { + TRACE("Skipping about URL\n"); + return; + } + if(!This->travellog.log) { This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); if(!This->travellog.log)

1 0

Jacek Caban : ieframe: Update back/ forward command state in FireNavigateComplete2.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 670459b7bc1d98e263d3875c91849a340982f5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=670459b7bc1d98e263d3875c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:01:01 2015 +0200 ieframe: Update back/forward command state in FireNavigateComplete2. --- dlls/ieframe/dochost.c | 29 +++++++++++++++++++++++++++++ dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 21 --------------------- dlls/ieframe/shellbrowser.c | 2 ++ 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 3de1d21..a6582b1 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -80,6 +80,35 @@ void abort_dochost_tasks(DocHost *This, task_proc_t proc) } } +void on_commandstate_change(DocHost *doc_host, LONG command, VARIANT_BOOL enable) +{ + DISPPARAMS dispparams; + VARIANTARG params[2]; + + TRACE("command=%d enable=%d\n", command, enable); + + dispparams.cArgs = 2; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = params; + + V_VT(params) = VT_BOOL; + V_BOOL(params) = enable; + + V_VT(params+1) = VT_I4; + V_I4(params+1) = command; + + call_sink(doc_host->cps.wbe2, DISPID_COMMANDSTATECHANGE, &dispparams); +} + +void update_navigation_commands(DocHost *dochost) +{ + unsigned pos = dochost->travellog.loading_pos == -1 ? dochost->travellog.position : dochost->travellog.loading_pos; + + on_commandstate_change(dochost, CSC_NAVIGATEBACK, pos > 0 ? VARIANT_TRUE : VARIANT_FALSE); + on_commandstate_change(dochost, CSC_NAVIGATEFORWARD, pos < dochost->travellog.length ? VARIANT_TRUE : VARIANT_FALSE); +} + static void notif_complete(DocHost *This, DISPID dispid) { DISPPARAMS dispparams; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 057c2f6..5806107 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -278,6 +278,7 @@ void deactivate_document(DocHost*) DECLSPEC_HIDDEN; void create_doc_view_hwnd(DocHost*) DECLSPEC_HIDDEN; void on_commandstate_change(DocHost*,LONG,VARIANT_BOOL) DECLSPEC_HIDDEN; void notify_download_state(DocHost*,BOOL) DECLSPEC_HIDDEN; +void update_navigation_commands(DocHost *dochost) DECLSPEC_HIDDEN; #define WM_DOCHOSTTASK (WM_USER+0x300) void push_dochost_task(DocHost*,task_header_t*,task_proc_t,task_destr_t,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 74d1bc5..36915e4 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -781,27 +781,6 @@ static void doc_navigate_task_destr(task_header_t *t) heap_free(task); } -void on_commandstate_change(DocHost *doc_host, LONG command, VARIANT_BOOL enable) -{ - DISPPARAMS dispparams; - VARIANTARG params[2]; - - TRACE("command=%d enable=%d\n", command, enable); - - dispparams.cArgs = 2; - dispparams.cNamedArgs = 0; - dispparams.rgdispidNamedArgs = NULL; - dispparams.rgvarg = params; - - V_VT(params) = VT_BOOL; - V_BOOL(params) = enable; - - V_VT(params+1) = VT_I4; - V_I4(params+1) = command; - - call_sink(doc_host->cps.wbe2, DISPID_COMMANDSTATECHANGE, &dispparams); -} - static void doc_navigate_proc(DocHost *This, task_header_t *t) { task_doc_navigate_t *task = (task_doc_navigate_t*)t; diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 8145536..f75689e 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -748,6 +748,8 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( TRACE("%p %p %x\n", This, pHTMLWindow2, dwFlags); + update_navigation_commands(This->doc_host); + if(doc_host->travellog.loading_pos != -1) { WARN("histupdate not notified\n"); doc_host->travellog.position = doc_host->travellog.loading_pos;

1 0

Jacek Caban : ieframe: Update back/ forward navigation state in CMDID_EXPLORER_UPDATEHISTORY handler.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 5a2aa4a8a8d407b56f8836e94b7dfec1e237dbd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2aa4a8a8d407b56f8836e94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:01:08 2015 +0200 ieframe: Update back/forward navigation state in CMDID_EXPLORER_UPDATEHISTORY handler. --- dlls/ieframe/dochost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index a6582b1..0823797 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -749,6 +749,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, switch(nCmdID) { case CMDID_EXPLORER_UPDATEHISTORY: update_travellog(This); + update_navigation_commands(This); return S_OK; default:

1 0