May 2018 - Wine-commits - list.winehq.org

Zebediah Figura : msi/tests: Test deferral of InstallServices.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: b8f982fa4b190398edce45290cd49159d586a26b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f982fa4b190398edce4529… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 22:26:11 2018 -0500 msi/tests: Test deferral of InstallServices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 31 ++++++++++++++++++++++++++++++- dlls/msi/tests/custom.c | 23 +++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index b005529..4abf867 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -301,6 +301,34 @@ static const char sds_custom_action_dat[] = "sds_immediate\t1\tcustom.dll\tsds_present\n" "sds_deferred\t1025\tcustom.dll\tsds_absent\n"; +static const char sis_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "StopServices\t\t5000\n" + "DeleteServices\t\t5050\n" + "InstallFiles\t\t5200\n" + "InstallServices\t\t5400\n" + "sis_immediate\tNOT REMOVE\t5401\n" + "sis_deferred\tNOT REMOVE\t5402\n" + "StartServices\t\t5450\n" + "RegisterProduct\t\t5500\n" + "PublishFeatures\t\t5600\n" + "PublishProduct\t\t5700\n" + "InstallFinalize\t\t6000\n"; + +static const char sis_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "sis_immediate\t1\tcustom.dll\tsis_absent\n" + "sis_deferred\t1025\tcustom.dll\tsis_present\n"; + static const char rof_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" @@ -1846,7 +1874,8 @@ static const msi_table sis_tables[] = ADD_TABLE(feature), ADD_TABLE(feature_comp), ADD_TABLE(file), - ADD_TABLE(sds_install_exec_seq), + ADD_TABLE(sis_install_exec_seq), + ADD_TABLE(sis_custom_action), ADD_TABLE(service_install2), ADD_TABLE(media), ADD_TABLE(property) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 4497f3c..4336504 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1216,3 +1216,26 @@ UINT WINAPI sds_absent(MSIHANDLE hinst) CloseServiceHandle(manager); return ERROR_SUCCESS; } + +UINT WINAPI sis_present(MSIHANDLE hinst) +{ + SC_HANDLE manager, service; + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenServiceA(manager, "TestService", GENERIC_ALL); + ok(hinst, !!service, "service absent: %u\n", GetLastError()); + CloseServiceHandle(service); + CloseServiceHandle(manager); + return ERROR_SUCCESS; +} + +UINT WINAPI sis_absent(MSIHANDLE hinst) +{ + SC_HANDLE manager, service; + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenServiceA(manager, "TestService", GENERIC_ALL); +todo_wine + ok(hinst, !service, "service present\n"); + if (service) CloseServiceHandle(service); + CloseServiceHandle(manager); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 1485546..471f956 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -9,3 +9,5 @@ @ stdcall crs_absent(long) @ stdcall sds_present(long) @ stdcall sds_absent(long) +@ stdcall sis_present(long) +@ stdcall sis_absent(long)

1 0

Zebediah Figura : msi/tests: Test deferral of StartServices and StopServices.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 7f0c8b3c6130bf1181e83bcdd9ab6b71583208f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0c8b3c6130bf1181e83bcd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 22:26:12 2018 -0500 msi/tests: Test deferral of StartServices and StopServices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 12 ++++++++++++ dlls/msi/tests/custom.c | 35 +++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 49 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 4abf867..70baaa3 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -259,16 +259,27 @@ static const char sss_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" "StopServices\t\t4000\n" + "stop_immediate\tNOT REMOVE\t4001\n" + "stop_deferred\tNOT REMOVE\t4002\n" "DeleteServices\t\t5000\n" "MoveFiles\t\t5100\n" "InstallFiles\t\t5200\n" "DuplicateFiles\t\t5300\n" "StartServices\t\t5400\n" + "start_deferred\tNOT REMOVE\t5401\n" "RegisterProduct\t\t5500\n" "PublishFeatures\t\t5600\n" "PublishProduct\t\t5700\n" "InstallFinalize\t\t6000\n"; +static const char sss_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "stop_immediate\t1\tcustom.dll\tsss_started\n" + "stop_deferred\t1025\tcustom.dll\tsss_stopped\n" + "start_deferred\t1025\tcustom.dll\tsss_started\n"; + static const char sds_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -1848,6 +1859,7 @@ static const msi_table sss_tables[] = ADD_TABLE(file), ADD_TABLE(sss_install_exec_seq), ADD_TABLE(sss_service_control), + ADD_TABLE(sss_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 4336504..9c9966c 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1239,3 +1239,38 @@ todo_wine CloseServiceHandle(manager); return ERROR_SUCCESS; } + +UINT WINAPI sss_started(MSIHANDLE hinst) +{ + SC_HANDLE manager, service; + SERVICE_STATUS status; + BOOL ret; + + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenServiceA(manager, "Spooler", SC_MANAGER_ALL_ACCESS); + ret = QueryServiceStatus(service, &status); + ok(hinst, ret, "QueryServiceStatus failed: %u\n", GetLastError()); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, status.dwCurrentState == SERVICE_RUNNING, "got %u\n", status.dwCurrentState); + + CloseServiceHandle(service); + CloseServiceHandle(manager); + return ERROR_SUCCESS; +} + +UINT WINAPI sss_stopped(MSIHANDLE hinst) +{ + SC_HANDLE manager, service; + SERVICE_STATUS status; + BOOL ret; + + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenServiceA(manager, "Spooler", SC_MANAGER_ALL_ACCESS); + ret = QueryServiceStatus(service, &status); + ok(hinst, ret, "QueryServiceStatus failed: %u\n", GetLastError()); + ok(hinst, status.dwCurrentState == SERVICE_STOPPED, "got %u\n", status.dwCurrentState); + + CloseServiceHandle(service); + CloseServiceHandle(manager); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 471f956..01b95e9 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -11,3 +11,5 @@ @ stdcall sds_absent(long) @ stdcall sis_present(long) @ stdcall sis_absent(long) +@ stdcall sss_started(long) +@ stdcall sss_stopped(long)

1 0

Dmitry Timoshkov : kerberos: Silence a FIXME for the GSS_S_FAILURE case.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 1f6e34aa4018ee1a66377eebef3948855015af3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f6e34aa4018ee1a66377eeb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 18 15:30:44 2018 +0800 kerberos: Silence a FIXME for the GSS_S_FAILURE case. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index d40ec04..0ff6ae2 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -710,6 +710,7 @@ static NTSTATUS status_gss_to_sspi( OM_uint32 status ) case GSS_S_OLD_TOKEN: return SEC_E_INVALID_TOKEN; case GSS_S_UNSEQ_TOKEN: return SEC_E_OUT_OF_SEQUENCE; case GSS_S_GAP_TOKEN: return SEC_E_OUT_OF_SEQUENCE; + case GSS_S_FAILURE: return SEC_E_INTERNAL_ERROR; default: FIXME( "couldn't convert status 0x%08x to NTSTATUS\n", status );

1 0

Michael Müller : ntdll: Return success for TokenSessionId in NtSetInformationToken.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: de8d20436905a7394fd6fbbe1f312ffac7c2db2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8d20436905a7394fd6fbbe… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 18 04:51:00 2018 +0000 ntdll: Return success for TokenSessionId in NtSetInformationToken. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c3f5df3..4ff9880 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -624,6 +624,20 @@ NTSTATUS WINAPI NtSetInformationToken( } SERVER_END_REQ; break; + case TokenSessionId: + if (TokenInformationLength < sizeof(DWORD)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + if (!TokenInformation) + { + ret = STATUS_ACCESS_VIOLATION; + break; + } + FIXME("TokenSessionId stub!\n"); + ret = STATUS_SUCCESS; + break; default: FIXME("unimplemented class %u\n", TokenInformationClass); break;

1 0

Andrew Wesie : ntdll: Return success for TokenIntegrityLevel in NtSetInformationToken.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 407fd270a3114ea6a8f39d893292086a84e3d481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=407fd270a3114ea6a8f39d89… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri May 18 04:51:01 2018 +0000 ntdll: Return success for TokenIntegrityLevel in NtSetInformationToken. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 4ff9880..dc0ce04 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -638,6 +638,10 @@ NTSTATUS WINAPI NtSetInformationToken( FIXME("TokenSessionId stub!\n"); ret = STATUS_SUCCESS; break; + case TokenIntegrityLevel: + FIXME("TokenIntegrityLevel stub!\n"); + ret = STATUS_SUCCESS; + break; default: FIXME("unimplemented class %u\n", TokenInformationClass); break;

1 0

Zhiyi Zhang : comctl32/taskdialog: Move TASKDIALOGCONFIG pointer in struct taskdialog_info.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 1c6e1ff807b721c5e06c1ba73eb314e51f58a56e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c6e1ff807b721c5e06c1ba7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 18 17:21:54 2018 +0800 comctl32/taskdialog: Move TASKDIALOGCONFIG pointer in struct taskdialog_info. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ef90efc..6471eac 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -84,8 +84,7 @@ struct taskdialog_template_desc struct taskdialog_info { HWND hwnd; - PFTASKDIALOGCALLBACK callback; - LONG_PTR callback_data; + const TASKDIALOGCONFIG *taskconfig; }; static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) @@ -520,8 +519,10 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam) { - return dialog_info->callback ? dialog_info->callback(dialog_info->hwnd, notification, wparam, lparam, - dialog_info->callback_data) : S_OK; + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + return taskconfig->pfCallback + ? taskconfig->pfCallback(dialog_info->hwnd, notification, wparam, lparam, taskconfig->lpCallbackData) + : S_OK; } static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD command_id) @@ -590,8 +591,7 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *butto if (!taskconfig || taskconfig->cbSize != sizeof(TASKDIALOGCONFIG)) return E_INVALIDARG; - dialog_info.callback = taskconfig->pfCallback; - dialog_info.callback_data = taskconfig->lpCallbackData; + dialog_info.taskconfig = taskconfig; template = create_taskdialog_template(taskconfig); ret = (short)DialogBoxIndirectParamW(taskconfig->hInstance, template, taskconfig->hwndParent,

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for TDF_NO_SET_FOREGROUND.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 8455d4b94778cef0c21757935133d6b320550193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8455d4b94778cef0c2175793… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 18 17:22:31 2018 +0800 comctl32/taskdialog: Add support for TDF_NO_SET_FOREGROUND. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 6471eac..73ec234 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -488,6 +488,7 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi template->style = DS_MODALFRAME | DS_SETFONT | WS_CAPTION | WS_VISIBLE | WS_SYSMENU; if (taskconfig->dwFlags & TDF_CAN_BE_MINIMIZED) template->style |= WS_MINIMIZEBOX; + if (!(taskconfig->dwFlags & TDF_NO_SET_FOREGROUND)) template->style |= DS_SETFOREGROUND; template->cdit = desc.control_count; template->x = (ref_rect.left + ref_rect.right + desc.dialog_width) / 2; template->y = (ref_rect.top + ref_rect.bottom + desc.dialog_height) / 2;

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for TDF_RTL_LAYOUT.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 35652ebfcd9cd9c9653980303a8ad4c3c6bf1e0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=35652ebfcd9cd9c965398030… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 18 17:23:26 2018 +0800 comctl32/taskdialog: Add support for TDF_RTL_LAYOUT. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 73ec234..ba19ed5 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -489,6 +489,7 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi template->style = DS_MODALFRAME | DS_SETFONT | WS_CAPTION | WS_VISIBLE | WS_SYSMENU; if (taskconfig->dwFlags & TDF_CAN_BE_MINIMIZED) template->style |= WS_MINIMIZEBOX; if (!(taskconfig->dwFlags & TDF_NO_SET_FOREGROUND)) template->style |= DS_SETFOREGROUND; + if (taskconfig->dwFlags & TDF_RTL_LAYOUT) template->dwExtendedStyle = WS_EX_LAYOUTRTL | WS_EX_RIGHT | WS_EX_RTLREADING; template->cdit = desc.control_count; template->x = (ref_rect.left + ref_rect.right + desc.dialog_width) / 2; template->y = (ref_rect.top + ref_rect.bottom + desc.dialog_height) / 2;

1 0

Józef Kucia : winevulkan: Trace unsupported instance extensions.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: fa786955f11cdc255d73d10e4a74d6a31e0e8d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa786955f11cdc255d73d10e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 18 12:49:18 2018 +0200 winevulkan: Trace unsupported instance extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index ef9f095..53d7a11 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -730,9 +730,10 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na { if (wine_vk_instance_extension_supported(host_properties[i].extensionName)) num_properties++; + else + TRACE("Instance extension '%s' is not supported.\n", host_properties[i].extensionName); } - /* We only have to count. */ if (!properties) { TRACE("Returning %u extensions\n", num_properties);

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 4df43166f786cef4cc9fe26621694bcc2e29cc09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df43166f786cef4cc9fe266… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri May 18 11:52:59 2018 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 64 +++++++++++++++++-------------------------------------------- 1 file changed, 18 insertions(+), 46 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b0912a7..ada37a6 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-03-01 23:15+0100\n" +"PO-Revision-Date: 2018-05-18 13:47+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 2.0.6\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -8514,10 +8514,8 @@ msgid "&Browse..." msgstr "&Bla..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Filtype" +msgstr "Filtype:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8528,16 +8526,12 @@ msgid "Size:" msgstr "Størrelse:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Dato opprettet" +msgstr "Dato opprettet:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Attributter:" +msgstr "Attributter:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8548,28 +8542,20 @@ msgid "&Archive" msgstr "&Arkiv" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Åpne:" +msgstr "Åpne med:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "Endre &ikon..." +msgstr "&Endre..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Endret" +msgstr "Sist endret:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Sist endret:" +msgstr "Siste tilgang:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -9181,38 +9167,28 @@ msgstr "" "Det er minst ett uspesifisert sikkerhetsproblem med dette sertifikatet." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Tidsavbrudd for tjenesteforespørsel.\n" +msgstr "Forespørselen ble tidsavbrutt.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "En skriverfeil har oppstått." +msgstr "En intern feil har oppstått.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Stien er ugyldig.\n" +msgstr "URL'en er ugyldig.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL-skjemaet ble ikke gjenkjent eller er ikke støttet.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Brukernavnet finnes ikke.\n" +msgstr "Tjenernavnet kunne ikke slåes opp.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Brukerprofilen er ugyldig.\n" +msgstr "Den forespurte operasjonen er ugyldig.\n" #: winineterror.mc:56 msgid "" @@ -9221,20 +9197,16 @@ msgid "" msgstr "" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Klarte ikke legge til profilen.\n" +msgstr "Det forespurte elementet kunne ikke lokaliseres.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Kan ikke koble til LDAP-tjeneren" +msgstr "Tilkoblingsforsøk til tjeneren mislyktes.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Tilkoblingen til tjeneren har blitt terminert.\n" #: winineterror.mc:76 msgid ""

1 0