July 2018 - Wine-Devel - list.winehq.org

[PATCH] msacm32: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc July 7, 2018

July 7, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/pcmconverter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index d52662ac76..a2dd9da278 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -71,7 +71,6 @@ static DWORD PCM_drvClose(DWORD dwDevID) return 1; } -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) #define NUM_OF(a,b) ((a)/(b)) /* flags for fdwDriver */ @@ -114,7 +113,7 @@ static DWORD PCM_GetFormatIndex(LPWAVEFORMATEX wfx) unsigned int i; TRACE("(%p)\n", wfx); - for (i = 0; i < NUM_PCM_FORMATS; i++) { + for (i = 0; i < ARRAY_SIZE(PCM_Formats); i++) { if (wfx->nChannels == PCM_Formats[i].nChannels && wfx->nSamplesPerSec == PCM_Formats[i].rate && wfx->wBitsPerSample == PCM_Formats[i].nBits) @@ -1035,7 +1034,7 @@ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER; - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); aftd->szFormatTag[0] = 0; return MMSYSERR_NOERROR; @@ -1057,7 +1056,7 @@ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) } break; case ACM_FORMATDETAILSF_INDEX: - assert(afd->dwFormatIndex < NUM_PCM_FORMATS); + assert(afd->dwFormatIndex < ARRAY_SIZE(PCM_Formats)); afd->pwfx->wFormatTag = WAVE_FORMAT_PCM; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; -- 2.14.4

1 0

[PATCH] l3codeca.acm: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc July 7, 2018

July 7, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index 0e419bd66d..c8929651b6 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -89,9 +89,6 @@ static const Format MPEG3_Formats[] = {1, 0, 48000}, {2, 0, 48000} }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_MPEG3_FORMATS (sizeof(MPEG3_Formats) / sizeof(MPEG3_Formats[0])) - /*********************************************************************** * MPEG3_GetFormatIndex */ @@ -103,12 +100,12 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) switch (wfx->wFormatTag) { case WAVE_FORMAT_PCM: - hi = NUM_PCM_FORMATS; + hi = ARRAY_SIZE(PCM_Formats); fmts = PCM_Formats; break; case WAVE_FORMAT_MPEG: case WAVE_FORMAT_MPEGLAYER3: - hi = NUM_MPEG3_FORMATS; + hi = ARRAY_SIZE(MPEG3_Formats); fmts = MPEG3_Formats; break; default: @@ -733,7 +730,7 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: @@ -768,7 +765,7 @@ static LRESULT MPEG3_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits; -- 2.14.4

1 0

[PATCH] winex11.drv: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc July 7, 2018

July 7, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 10 +++++----- dlls/winex11.drv/desktop.c | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index c55a2661fb..296c00c3a5 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -187,7 +187,6 @@ static const struct static struct list format_list = LIST_INIT( format_list ); -#define NB_BUILTIN_FORMATS (sizeof(builtin_formats) / sizeof(builtin_formats[0])) #define GET_ATOM(prop) (((prop) < FIRST_XATOM) ? (Atom)(prop) : X11DRV_Atoms[(prop) - FIRST_XATOM]) static DWORD clipboard_thread_id; @@ -295,9 +294,9 @@ static void register_builtin_formats(void) struct clipboard_format *formats; unsigned int i; - if (!(formats = HeapAlloc( GetProcessHeap(), 0, NB_BUILTIN_FORMATS * sizeof(*formats)))) return; + if (!(formats = HeapAlloc( GetProcessHeap(), 0, ARRAY_SIZE(builtin_formats) * sizeof(*formats)))) return; - for (i = 0; i < NB_BUILTIN_FORMATS; i++) + for (i = 0; i < ARRAY_SIZE(builtin_formats); i++) { if (builtin_formats[i].name) formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); @@ -983,7 +982,7 @@ static HANDLE import_targets( Atom type, const void *data, size_t size ) register_x11_formats( properties, count ); /* the builtin formats contain duplicates, so allocate some extra space */ - if (!(formats = HeapAlloc( GetProcessHeap(), 0, (count + NB_BUILTIN_FORMATS) * sizeof(*formats )))) + if (!(formats = HeapAlloc( GetProcessHeap(), 0, (count + ARRAY_SIZE(builtin_formats)) * sizeof(*formats )))) return 0; pos = 0; @@ -1454,7 +1453,8 @@ static BOOL export_targets( Display *display, Window win, Atom prop, Atom target if (!(formats = get_clipboard_formats( &count ))) return FALSE; /* the builtin formats contain duplicates, so allocate some extra space */ - if (!(targets = HeapAlloc( GetProcessHeap(), 0, (count + NB_BUILTIN_FORMATS) * sizeof(*targets) ))) + if (!(targets = HeapAlloc( GetProcessHeap(), 0, + (count + ARRAY_SIZE(builtin_formats)) * sizeof(*targets) ))) { HeapFree( GetProcessHeap(), 0, formats ); return FALSE; diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 4df8784a97..559efe2beb 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -73,7 +73,6 @@ static struct screen_size { {1920, 1200}, {2560, 1600} }; -#define NUM_DESKTOP_MODES (sizeof(screen_sizes) / sizeof(struct screen_size)) #define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_ADD 1 @@ -88,7 +87,7 @@ static void make_modes(void) /* original specified desktop size */ X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); - for (i=0; i<NUM_DESKTOP_MODES; i++) + for (i=0; i<ARRAY_SIZE(screen_sizes); i++) { if ( (screen_sizes[i].width <= max_width) && (screen_sizes[i].height <= max_height) ) { @@ -160,7 +159,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode, X11DRV_desktop_SetCurrentMode, - NUM_DESKTOP_MODES+2, 1); + ARRAY_SIZE(screen_sizes)+2, 1); make_modes(); X11DRV_Settings_AddDepthModes(); dd_mode_count = X11DRV_Settings_GetModeCount(); -- 2.14.4

1 0

[PATCH] shell32: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc July 7, 2018

July 7, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shfldr_mycomp.c | 8 +++----- dlls/shell32/shfldr_printers.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index b5b9ff22ae..60f32f1f23 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -87,8 +87,6 @@ static const shvheader mycomputer_header[] = { NULL, 0, IDS_SHV_COLUMN7, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10 }, }; -#define MYCOMPUTERSHELLVIEWCOLUMNS sizeof(mycomputer_header)/sizeof(shvheader) - /************************************************************************** * ISF_MyComputer_Constructor */ @@ -799,7 +797,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumnState ( TRACE ("(%p)->(%d %p)\n", This, iColumn, pcsFlags); - if (!pcsFlags || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!pcsFlags || iColumn >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; *pcsFlags = mycomputer_header[iColumn].pcsFlags; @@ -826,7 +824,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDetailsOf (IShellFolder2 *iface, TRACE ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); - if (!psd || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!psd || iColumn >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; if (!pidl) @@ -871,7 +869,7 @@ static HRESULT WINAPI ISF_MyComputer_fnMapColumnToSCID (IShellFolder2 *iface, UI TRACE("(%p)->(%u %p)\n", This, column, scid); - if (column >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (column >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; return shellfolder_map_column_to_scid(mycomputer_header, column, scid); diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 66260ac816..8e25e58857 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -63,8 +63,6 @@ static const shvheader printers_header[] = { { NULL, 0, IDS_SHV_COL_MODEL, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20 } }; -#define PRINTERS_FOLDER_COL_NUM sizeof(printers_header)/sizeof(shvheader) - static HRESULT WINAPI IShellFolder_Printers_fnQueryInterface(IShellFolder2 *iface, REFIID riid, LPVOID *ppvObj) { @@ -283,7 +281,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultColumnState ( TRACE("(%p)->(%d %p)\n", This, iColumn, pcsFlags); - if (iColumn >= PRINTERS_FOLDER_COL_NUM) + if (iColumn >= ARRAY_SIZE(printers_header)) return E_INVALIDARG; *pcsFlags = printers_header[iColumn].pcsFlags; @@ -306,7 +304,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDetailsOf (IShellFolder2 *iface TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); - if (iColumn >= PRINTERS_FOLDER_COL_NUM) + if (iColumn >= ARRAY_SIZE(printers_header)) return E_NOTIMPL; if (!pidl) @@ -323,7 +321,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnMapColumnToSCID (IShellFolder2 *if TRACE("(%p)->(%u %p)\n", This, column, scid); - if (column >= PRINTERS_FOLDER_COL_NUM) + if (column >= ARRAY_SIZE(printers_header)) return E_INVALIDARG; return shellfolder_map_column_to_scid(printers_header, column, scid); -- 2.14.4

1 0

[PATCH] msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc
by Alex Henrie July 7, 2018

July 7, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/heap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 7ea80a3a50..b4f11d8ef4 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -21,6 +21,7 @@ * handler and non atomic heap operations */ +#include "config.h" #include "msvcrt.h" #include "mtdll.h" #include "wine/debug.h" @@ -127,7 +128,7 @@ static MSVCRT_size_t msvcrt_heap_size(void *ptr) /********************************************************************* * ??2(a)YAPAXI@Z (MSVCRT.@) */ -void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(MSVCRT_size_t size) { void *retval; int freed; @@ -169,7 +170,7 @@ void* CDECL MSVCRT_operator_new_dbg(MSVCRT_size_t size, int type, const char *fi /********************************************************************* * ??3(a)YAXPAX@Z (MSVCRT.@) */ -void CDECL MSVCRT_operator_delete(void *mem) +void CDECL DECLSPEC_HOTPATCH MSVCRT_operator_delete(void *mem) { TRACE("(%p)\n", mem); msvcrt_heap_free(mem); @@ -394,7 +395,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs /********************************************************************* * calloc (MSVCRT.@) */ -void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) { MSVCRT_size_t bytes = count*size; @@ -420,7 +421,7 @@ void* CDECL _calloc_base(MSVCRT_size_t count, MSVCRT_size_t size) /********************************************************************* * free (MSVCRT.@) */ -void CDECL MSVCRT_free(void* ptr) +void CDECL DECLSPEC_HOTPATCH MSVCRT_free(void* ptr) { msvcrt_heap_free(ptr); } @@ -459,7 +460,7 @@ void* CDECL _malloc_base(MSVCRT_size_t size) /********************************************************************* * realloc (MSVCRT.@) */ -void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_realloc(void* ptr, MSVCRT_size_t size) { if (!ptr) return MSVCRT_malloc(size); if (size) return msvcrt_heap_realloc(0, ptr, size); -- 2.18.0

2 3

[PATCH] ole32: Return IUnknown interface from GITCF_CreateInstance if requested
by Alex Henrie July 6, 2018

July 6, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Without this patch, ArcMap.exe (part of ArcGIS Desktop 10.6) crashes shortly after starting. --- dlls/ole32/git.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index f7a0460154..10a15e43d5 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -314,7 +314,8 @@ static HRESULT WINAPI GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { - if (IsEqualIID(riid,&IID_IGlobalInterfaceTable)) { + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IGlobalInterfaceTable)) { IGlobalInterfaceTable *git = get_std_git(); return IGlobalInterfaceTable_QueryInterface(git, riid, ppv); } -- 2.18.0

2 1

[PATCH] oleaut32: Add DECLSPEC_HOTPATCH to functions patched by MS Word 2010
by Alex Henrie July 6, 2018

July 6, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/variant.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index d03893a938..608446d737 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -272,7 +272,7 @@ static inline IMalloc *get_malloc(void) * See BSTR. * str may be NULL, in which case this function does nothing. */ -void WINAPI SysFreeString(BSTR str) +void WINAPI DECLSPEC_HOTPATCH SysFreeString(BSTR str) { bstr_cache_entry_t *cache_entry; bstr_t *bstr; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b9cf4b0a00..9c97ab3ce6 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -648,7 +648,7 @@ HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) * Success: S_OK. Any previous value in pVarg is freed and its type is set to VT_EMPTY. * Failure: DISP_E_BADVARTYPE, if the variant is not a valid variant type. */ -HRESULT WINAPI VariantClear(VARIANTARG* pVarg) +HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg) { HRESULT hres; @@ -962,8 +962,8 @@ VariantCopyInd_Return: * The LCID used for the conversion is LOCALE_USER_DEFAULT. * See VariantChangeTypeEx. */ -HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, - USHORT wFlags, VARTYPE vt) +HRESULT WINAPI DECLSPEC_HOTPATCH VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, + USHORT wFlags, VARTYPE vt) { return VariantChangeTypeEx( pvargDest, pvargSrc, LOCALE_USER_DEFAULT, wFlags, vt ); } -- 2.18.0

1 0

[PATCH] kernel32: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc
by Alex Henrie July 6, 2018

July 6, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index c7a15cdcbb..3362868ba0 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -314,7 +314,7 @@ SIZE_T WINAPI VirtualQueryEx( HANDLE process, LPCVOID addr, * Success: Starting address of mapped view. * Failure: NULL. */ -LPVOID WINAPI DECLSPEC_HOTPATCH MapViewOfFile( HANDLE mapping, DWORD access, +void * WINAPI DECLSPEC_HOTPATCH MapViewOfFile( HANDLE mapping, DWORD access, DWORD offset_high, DWORD offset_low, SIZE_T count ) { return MapViewOfFileEx( mapping, access, offset_high, @@ -384,7 +384,7 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, * Failure: FALSE. * */ -BOOL WINAPI UnmapViewOfFile( LPCVOID addr ) +BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFile( const void *addr ) { NTSTATUS status; -- 2.18.0

1 0

[PATCH] ntdll: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc
by Alex Henrie July 6, 2018

July 6, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ca08f9d854..4494b92414 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1662,7 +1662,7 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) * NOTES * This call does not SetLastError(). */ -PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) +void * WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) { ARENA_FREE *pArena; ARENA_INUSE *pInUse; @@ -1747,7 +1747,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) * Success: TRUE, if ptr is NULL or was freed successfully. * Failure: FALSE. */ -BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr ) +BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE heap, ULONG flags, void *ptr ) { ARENA_INUSE *pInUse; SUBHEAP *subheap; -- 2.18.0

1 0

[PATCH] po: Update Norwegian translation.
by Kim Malmo July 6, 2018

July 6, 2018

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 74 ++++++++++++----------------------------------------- 1 file changed, 17 insertions(+), 57 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b5d496d896..40775b064e 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-06-09 23:18+0200\n" +"PO-Revision-Date: 2018-07-06 19:05+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" @@ -3436,32 +3436,24 @@ msgid "Publishers..." msgstr "Utgivere..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Lokal nettverksforbindelse" +msgstr "Nettverksforbindelser" #: inetcpl.rc:125 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Lokal tjener" +msgstr "Mellomtjener" #: inetcpl.rc:126 msgid "Use a proxy server" -msgstr "" +msgstr "Bruk en mellomtjener" #: inetcpl.rc:127 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adresse" +msgstr "Adresse:" #: inetcpl.rc:129 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Ingen porter" +msgstr "Port:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -4451,7 +4443,7 @@ msgstr "Katalognavnet er ugyldig.\n" #: winerror.mc:918 msgid "Extended attributes didn't fit.\n" -msgstr "De utvidede atributtene fikk ikke plass.\n" +msgstr "De utvidede egenskapene fikk ikke plass.\n" #: winerror.mc:923 msgid "Extended attribute file corrupt.\n" @@ -4467,7 +4459,7 @@ msgstr "Ugyldig referanse for utvidet atributt.\n" #: winerror.mc:938 msgid "Extended attributes not supported.\n" -msgstr "Utvidede atributter støttes ikke.\n" +msgstr "Utvidede egenskaper støttes ikke.\n" #: winerror.mc:943 msgid "Mutex not owned by caller.\n" @@ -6799,7 +6791,7 @@ msgstr "&Format:" #: msacm32.rc:47 msgid "&Attributes:" -msgstr "&Attributter:" +msgstr "&Egenskaper:" #: mshtml.rc:39 msgid "Hyperlink" @@ -8559,7 +8551,7 @@ msgstr "Dato opprettet:" #: shell32.rc:369 shell32.rc:406 msgid "Attributes:" -msgstr "Attributter:" +msgstr "Egenskaper:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8599,7 +8591,7 @@ msgstr "Endret" #: shell32.rc:141 winefile.rc:172 winefile.rc:114 msgid "Attributes" -msgstr "Attributter" +msgstr "Egenskaper" #: shell32.rc:143 msgid "Size available" @@ -9241,10 +9233,12 @@ msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"SSL-sertifikatdato som ble mottatt fra tjeneren er feil. Sertifikatet er " +"utgått.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL-sertifikatets vertsnavn-felt er feil.\n" #: winmm.rc:32 msgid "The specified command was carried out." @@ -12020,7 +12014,7 @@ msgstr "Kopier program:" #: progman.rc:152 msgid "Program Group Attributes" -msgstr "Programgruppeattributter" +msgstr "Programgruppe-egenskaper" #: progman.rc:156 msgid "&Group file:" @@ -12028,7 +12022,7 @@ msgstr "&Gruppefil:" #: progman.rc:168 msgid "Program Attributes" -msgstr "Programattributter" +msgstr "Programegenskaper" #: progman.rc:172 progman.rc:212 msgid "&Command line:" @@ -15664,41 +15658,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15762,6 +15721,7 @@ msgstr "" "[/A] Bare kopier filer som er markert som arkiv.\n" "[/M] Bare kopier filer som er markert som arkiv; fjern denne\n" "\tmerkingen etterpå.\n" +"[/K] Kopier filegenskaper, uten denne blir ikke egenskapene preservert.\n" "[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n" "\t\tden oppgitte datoen. Hvis ingen dato oppgis kopieres det bare hvis\n" "\t\tmålet er eldre enn kilden.\n" -- 2.17.1

1 0