wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Alexandre Julliard : gdi32: Get rid of the offset in the gdi_image_bits structure now that we are passing the full rectangles .
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 7dc8f48ef87b2f8124b6a0fe1badb9c8a33e5da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc8f48ef87b2f8124b6a0fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 21 12:03:30 2011 +0200 gdi32: Get rid of the offset in the gdi_image_bits structure now that we are passing the full rectangles. --- dlls/gdi32/bitblt.c | 1 - dlls/winex11.drv/bitblt.c | 5 +---- include/wine/gdi_driver.h | 11 +++++------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 48a70bd..a1dcc7a 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -253,7 +253,6 @@ try_get_image: if (bits.free) bits.free( &bits ); bits.ptr = ptr; bits.is_copy = TRUE; - bits.offset = 0; bits.free = free_heap_bits; if (!err) { diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 5699911..62a10cc 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1761,7 +1761,6 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, info->bmiHeader.biSizeImage = height * width_bytes; if (!(dst_bits->ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) return ERROR_OUTOFMEMORY; - dst_bits->offset = src_bits->offset; dst_bits->is_copy = TRUE; dst_bits->free = free_heap_bits; } @@ -1769,7 +1768,6 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, { /* swap bits in place */ dst_bits->ptr = src; - dst_bits->offset = src_bits->offset; dst_bits->is_copy = src_bits->is_copy; dst_bits->free = NULL; if (!need_byteswap && zeropad_mask == ~0u && !mapping) return ERROR_SUCCESS; /* nothing to do */ @@ -2029,8 +2027,7 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, FIXME( "depth %u bpp %u not supported yet\n", depth, format->bits_per_pixel ); return ERROR_BAD_FORMAT; } - src_bits.offset = src->visrect.left & (align - 1); - x = src->visrect.left - src_bits.offset; + x = src->visrect.left & ~(align - 1); y = src->visrect.top; width = src->visrect.right - x; height = src->visrect.bottom - src->visrect.top; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index b4166bf..c02ce9b 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -46,11 +46,10 @@ struct bitblt_coords struct gdi_image_bits { - void *ptr; /* pointer to the bits */ - unsigned int offset; /* x offset of first requested pixel */ - BOOL is_copy; /* whether this is a copy of the bits that can be modified */ - void (*free)(struct gdi_image_bits *); /* callback for freeing the bits */ - void *param; /* extra parameter for callback private use */ + void *ptr; /* pointer to the bits */ + BOOL is_copy; /* whether this is a copy of the bits that can be modified */ + void (*free)(struct gdi_image_bits *); /* callback for freeing the bits */ + void *param; /* extra parameter for callback private use */ }; struct gdi_dc_funcs @@ -192,7 +191,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 5 +#define WINE_GDI_DRIVER_VERSION 6 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : gdi32: Allow the PutImage entry point to optionally support stretching.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 97c30bdd6c335b51ac0a72a0ceaf2348afe9151e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c30bdd6c335b51ac0a72a0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 17:28:19 2011 +0200 gdi32: Allow the PutImage entry point to optionally support stretching. --- dlls/gdi32/bitblt.c | 48 ++++++++++++++++++++++++-------------------- dlls/winex11.drv/bitblt.c | 1 + 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 2d81ad5..48a70bd 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -167,10 +167,10 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; DWORD err; - struct gdi_image_bits src_bits, dst_bits; + struct gdi_image_bits bits; BITMAP bm; HBITMAP hbm; - LPVOID bits; + LPVOID ptr; INT lines; /* make sure we have a real implementation for StretchDIBits */ @@ -191,36 +191,31 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, src_info->bmiHeader.biClrUsed = 0; src_info->bmiHeader.biClrImportant = 0; - if (!(bits = HeapAlloc(GetProcessHeap(), 0, bm.bmHeight * bm.bmWidth * 4))) + if (!(ptr = HeapAlloc(GetProcessHeap(), 0, bm.bmHeight * bm.bmWidth * 4))) return FALSE; /* Select out the src bitmap before calling GetDIBits */ hbm = SelectObject( src_dev->hdc, GetStockObject(DEFAULT_BITMAP) ); - lines = GetDIBits( src_dev->hdc, hbm, 0, bm.bmHeight, bits, src_info, DIB_RGB_COLORS ); + lines = GetDIBits( src_dev->hdc, hbm, 0, bm.bmHeight, ptr, src_info, DIB_RGB_COLORS ); SelectObject( src_dev->hdc, hbm ); if (lines) lines = StretchDIBits( dst_dev->hdc, dst->log_x, dst->log_y, dst->log_width, dst->log_height, src->x, bm.bmHeight - src->height - src->y, src->width, src->height, - bits, src_info, DIB_RGB_COLORS, rop ); - HeapFree( GetProcessHeap(), 0, bits ); + ptr, src_info, DIB_RGB_COLORS, rop ); + HeapFree( GetProcessHeap(), 0, ptr ); return (lines == src->height); try_get_image: if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); - err = src_dev->funcs->pGetImage( src_dev, 0, src_info, &src_bits, src ); + err = src_dev->funcs->pGetImage( src_dev, 0, src_info, &bits, src ); release_dc_ptr( dc_src ); if (err) return FALSE; dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage ); - - if ((src->width != dst->width) || (src->height != dst->height)) - FIXME( "should stretch %dx%d -> %dx%d\n", - src->width, src->height, dst->width, dst->height ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); - err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &src_bits, src, dst, rop ); + err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &bits, src, dst, rop ); if (err == ERROR_BAD_FORMAT) { /* 1-bpp source without a color table uses the destination DC colors */ @@ -252,23 +247,32 @@ try_get_image: } dst_info->bmiHeader.biWidth = src->visrect.right - src->visrect.left; - dst_bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); - if (dst_bits.ptr) + if ((ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) { - dst_bits.is_copy = TRUE; - dst_bits.offset = 0; - dst_bits.free = free_heap_bits; - if (!(err = convert_bitmapinfo( src_info, src_bits.ptr, &src->visrect, dst_info, dst_bits.ptr ))) + err = convert_bitmapinfo( src_info, bits.ptr, &src->visrect, dst_info, ptr ); + if (bits.free) bits.free( &bits ); + bits.ptr = ptr; + bits.is_copy = TRUE; + bits.offset = 0; + bits.free = free_heap_bits; + if (!err) { /* get rid of the fake 1-bpp table */ if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; - err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &dst_bits, src, dst, rop ); + err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &bits, src, dst, rop ); } - if (dst_bits.free) dst_bits.free( &dst_bits ); } else err = ERROR_OUTOFMEMORY; } - if (src_bits.free) src_bits.free( &src_bits ); + + if (err == ERROR_TRANSFORM_NOT_SUPPORTED && + ((src->width != dst->width) || (src->height != dst->height))) + { + FIXME( "should stretch %dx%d -> %dx%d\n", + src->width, src->height, dst->width, dst->height ); + } + + if (bits.free) bits.free( &bits ); return !err; } diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 015a3e0..5699911 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1898,6 +1898,7 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str /* FIXME: could try to handle 1-bpp using XCopyPlane */ if (!matching_color_info( dev, color_shifts, info )) goto update_format; if (!bits) return ERROR_SUCCESS; /* just querying the format */ + if ((src->width != dst->width) || (src->height != dst->height)) return ERROR_TRANSFORM_NOT_SUPPORTED; wine_tsx11_lock(); image = XCreateImage( gdi_display, visual, depth, ZPixmap, 0, NULL,

1 0

Alexandre Julliard : gdi32: Pass the full bitblt_coords structure to the Get/PutImage entry points.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 73dc9833b700fe07f9dee1adfe4a18c7771054f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73dc9833b700fe07f9dee1adf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 21 11:17:13 2011 +0200 gdi32: Pass the full bitblt_coords structure to the Get/PutImage entry points. --- dlls/gdi32/bitblt.c | 13 ++++------ dlls/gdi32/dib.c | 20 +++++++++------- dlls/gdi32/driver.c | 5 ++- dlls/winex11.drv/bitblt.c | 55 ++++++++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 4 +- include/wine/gdi_driver.h | 6 ++-- 6 files changed, 56 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73dc9833b700fe07f9dee…

1 0

Alexandre Julliard : comdlg32/tests: Print the id of the GetSaveFileName test on failure.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: c1dafc514aa2432625289d4d19630549435a2ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1dafc514aa2432625289d4d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 21 11:11:20 2011 +0200 comdlg32/tests: Print the id of the GetSaveFileName test on failure. --- dlls/comdlg32/tests/filedlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0704ce6..2a91dc5 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1059,7 +1059,7 @@ static void test_extension(void) char curdir[MAX_PATH]; char *filename_ptr; const char *test_file_name = "deadbeef"; - const char **cur_filter; + unsigned int i; DWORD ret; BOOL boolret; @@ -1077,13 +1077,13 @@ static void test_extension(void) ofn.lpfnHook = test_extension_wndproc; ofn.nFileExtension = 0; - for (cur_filter = defext_filters; cur_filter < defext_filters + ARRAY_SIZE(defext_filters); cur_filter++) { - ofn.lpstrFilter = *cur_filter; + for (i = 0; i < ARRAY_SIZE(defext_filters); i++) { + ofn.lpstrFilter = defext_filters[i]; strcpy(filename, test_file_name); boolret = GetSaveFileNameA(&ofn); - ok(boolret, "expected true\n"); + ok(boolret, "%u: expected true\n", i); ret = CommDlgExtendedError(); - ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + ok(!ret, "%u: CommDlgExtendedError returned %#x\n", i, ret); filename_ptr = ofn.lpstrFile + strlen( ofn.lpstrFile ) - strlen( test_file_name ); ok( strlen(ofn.lpstrFile) >= strlen(test_file_name), "Filename %s is too short\n", ofn.lpstrFile ); ok( strcmp(filename_ptr, test_file_name) == 0,

1 0

Frédéric Delanoy : kernel32: Fix function description of CompareStringA and lstrcmpA.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 6471e862f63952eef559e041fa6d753c44e41bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6471e862f63952eef559e041f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 20 17:20:58 2011 +0200 kernel32: Fix function description of CompareStringA and lstrcmpA. --- dlls/kernel32/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a54ae37..56fd478 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2843,7 +2843,7 @@ INT WINAPI CompareStringW(LCID lcid, DWORD style, * * RETURNS * Success: CSTR_LESS_THAN, CSTR_EQUAL or CSTR_GREATER_THAN depending on whether - * str2 is less than, equal to or greater than str1 respectively. + * str1 is less than, equal to or greater than str2 respectively. * Failure: FALSE. Use GetLastError() to determine the cause. */ INT WINAPI CompareStringA(LCID lcid, DWORD style, @@ -2914,7 +2914,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD style, * * RETURNS * Success: A number less than, equal to or greater than 0 depending on whether - * str2 is less than, equal to or greater than str1 respectively. + * str1 is less than, equal to or greater than str2 respectively. * Failure: FALSE. Use GetLastError() to determine the cause. */ int WINAPI lstrcmpA(LPCSTR str1, LPCSTR str2)

1 0

Alexander Morozov : cryptui/tests: Always use a function pointer for CryptUIWizImport.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 3d3d5595f15dc596b049d6f72316c15e0fc19598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3d5595f15dc596b049d6f72… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Jul 20 20:30:55 2011 +0400 cryptui/tests: Always use a function pointer for CryptUIWizImport. --- dlls/cryptui/tests/cryptui.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 09b246c..bb1db92 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -528,17 +528,17 @@ static void test_crypt_ui_wiz_import(void) store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE | CRYPTUI_WIZ_IMPORT_ALLOW_CERT | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); @@ -576,7 +576,7 @@ static void test_crypt_ui_wiz_import(void) store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, store); ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) @@ -599,7 +599,7 @@ static void test_crypt_ui_wiz_import(void) ok(count == 0, "expected 0 CRLs, got %d\n", count); } SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -616,7 +616,7 @@ static void test_crypt_ui_wiz_import(void) store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) @@ -639,7 +639,7 @@ static void test_crypt_ui_wiz_import(void) ok(count == 1, "expected 1 CRL, got %d\n", count); } SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError());

1 0

Francois Gouget : po: Remove English strings from the Czech translation.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: f23f2dc3ac9bee8340be5b29109aae1d506578d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f23f2dc3ac9bee8340be5b291… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 20 16:14:32 2011 +0200 po: Remove English strings from the Czech translation. --- po/cs.po | 147 ++++++++++++++++++++++++++----------------------------------- 1 files changed, 63 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f23f2dc3ac9bee8340be5…

1 0

Francois Gouget : po: Remove English strings from the Bulgarian translation .
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 23647c3347bca771051d1960ca65fc8ca1f72ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23647c3347bca771051d1960c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 20 16:14:25 2011 +0200 po: Remove English strings from the Bulgarian translation. --- po/bg.po | 186 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 78 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23647c3347bca771051d1…

1 0

Francois Gouget : po: Remove English strings from the Polish translation.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 7d82cdaf966fdb0b2dfd2dfdbd18936602c61664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d82cdaf966fdb0b2dfd2dfdb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 20 16:14:16 2011 +0200 po: Remove English strings from the Polish translation. --- po/pl.po | 88 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 44 insertions(+), 44 deletions(-) diff --git a/po/pl.po b/po/pl.po index f8e9bf3..cd5795a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -992,15 +992,15 @@ msgstr "ID transakcji" #: crypt32.rc:127 msgid "Sender Nonce" -msgstr "Sender Nonce" +msgstr "" #: crypt32.rc:128 msgid "Recipient Nonce" -msgstr "Recipient Nonce" +msgstr "" #: crypt32.rc:129 msgid "Reg Info" -msgstr "Reg Info" +msgstr "" #: crypt32.rc:130 msgid "Get Certificate" @@ -1016,7 +1016,7 @@ msgstr "Cofnij żądanie" #: crypt32.rc:133 msgid "Query Pending" -msgstr "Query Pending" +msgstr "" #: crypt32.rc:134 cryptui.rc:92 msgid "Certificate Trust List" @@ -2456,7 +2456,7 @@ msgstr "Naruszenie współdzielenia\n" #: winerror.mc:191 msgid "Lock violation\n" -msgstr "Lock violation\n" +msgstr "" #: winerror.mc:196 msgid "Wrong disk\n" @@ -2628,7 +2628,7 @@ msgstr "Właściciel semafory umarł\n" #: winerror.mc:406 msgid "Semaphore user limit\n" -msgstr "Semaphore user limit\n" +msgstr "" #: winerror.mc:411 msgid "Insert disk for drive %1\n" @@ -2676,7 +2676,7 @@ msgstr "Wywołanie niezaimplementowane\n" #: winerror.mc:471 msgid "Semaphore timeout\n" -msgstr "Semaphore timeout\n" +msgstr "" #: winerror.mc:476 msgid "Insufficient buffer\n" @@ -2820,7 +2820,7 @@ msgstr "Segment skasowany\n" #: winerror.mc:656 msgid "Segment not locked\n" -msgstr "Segment not locked\n" +msgstr "" #: winerror.mc:661 msgid "Bad thread ID address\n" @@ -2844,7 +2844,7 @@ msgstr "Max syste-mwide thread count reached\n" #: winerror.mc:686 msgid "Lock failed\n" -msgstr "Lock failed\n" +msgstr "" #: winerror.mc:691 msgid "Resource in use\n" @@ -2856,7 +2856,7 @@ msgstr "Anuluj naruszenie\n" #: winerror.mc:701 msgid "Atomic locks not supported\n" -msgstr "Atomic locks not supported\n" +msgstr "" #: winerror.mc:706 msgid "Invalid segment number\n" @@ -2968,7 +2968,7 @@ msgstr "Błąd w ustawieniu procedury obsługi sygnału\n" #: winerror.mc:841 msgid "Segment locked\n" -msgstr "Segment locked\n" +msgstr "" #: winerror.mc:846 msgid "Too many modules\n" @@ -3052,7 +3052,7 @@ msgstr "Mutex nie posiadany przez procedurę wywołującą\n" #: winerror.mc:946 msgid "Too many posts to semaphore\n" -msgstr "Too many posts to semaphore\n" +msgstr "" #: winerror.mc:951 msgid "Read/WriteProcessMemory partially completed\n" @@ -3196,7 +3196,7 @@ msgstr "Podklucz musi być typu volatile\n" #: winerror.mc:1126 msgid "Notify change request in progress\n" -msgstr "Notify change request in progress\n" +msgstr "" #: winerror.mc:1131 msgid "Dependent services are running\n" @@ -3216,7 +3216,7 @@ msgstr "Nie można stworzyć wątku usługi\n" #: winerror.mc:1151 msgid "Service database locked\n" -msgstr "Service database locked\n" +msgstr "" #: winerror.mc:1156 msgid "Service already running\n" @@ -3232,7 +3232,7 @@ msgstr "Usługa jest wyłączona\n" #: winerror.mc:1171 msgid "Circular dependency\n" -msgstr "Circular dependency\n" +msgstr "" #: winerror.mc:1176 msgid "Service does not exist\n" @@ -3280,7 +3280,7 @@ msgstr "Start-zawiszenie się usługi\n" #: winerror.mc:1231 msgid "Invalid service lock\n" -msgstr "Invalid service lock\n" +msgstr "" #: winerror.mc:1236 msgid "Service marked for delete\n" @@ -3672,7 +3672,7 @@ msgstr "Niepoprawne przeznaczenie wiadomości\n" #: winerror.mc:1726 msgid "Session credential conflict\n" -msgstr "Session credential conflict\n" +msgstr "" #: winerror.mc:1731 msgid "Remote session limit exceeded\n" @@ -3692,7 +3692,7 @@ msgstr "Operacja anulowana przez użytkownika\n" #: winerror.mc:1751 msgid "File has a user-mapped section\n" -msgstr "File has a user-mapped section\n" +msgstr "" #: winerror.mc:1756 winerror.mc:3741 msgid "Connection refused\n" @@ -3704,11 +3704,11 @@ msgstr "Połączenie zgrabnie zamknięte\n" #: winerror.mc:1766 msgid "Address already associated with transport endpoint\n" -msgstr "Address already associated with transport endpoint\n" +msgstr "" #: winerror.mc:1771 msgid "Address not associated with transport endpoint\n" -msgstr "Address not associated with transport endpoint\n" +msgstr "" #: winerror.mc:1776 msgid "Connection invalid\n" @@ -3852,7 +3852,7 @@ msgstr "Niepoprawna grupa nadrzędna\n" #: winerror.mc:1951 msgid "No impersonation token\n" -msgstr "No impersonation token\n" +msgstr "" #: winerror.mc:1956 msgid "Can't disable mandatory group\n" @@ -3996,7 +3996,7 @@ msgstr "Niepoprawne atrybuty grupy\n" #: winerror.mc:2131 msgid "Bad impersonation level\n" -msgstr "Bad impersonation level\n" +msgstr "" #: winerror.mc:2136 msgid "Can't open anonymous security token\n" @@ -4004,7 +4004,7 @@ msgstr "Nie można otworzyć anonimowego tokena bezpieczeństwa\n" #: winerror.mc:2141 msgid "Bad validation class\n" -msgstr "Bad validation class\n" +msgstr "" #: winerror.mc:2146 msgid "Bad token type\n" @@ -4052,7 +4052,7 @@ msgstr "Błąd wewnętrzny\n" #: winerror.mc:2201 msgid "Generic access types not mapped\n" -msgstr "Generic access types not mapped\n" +msgstr "" #: winerror.mc:2206 msgid "Bad descriptor format\n" @@ -4084,7 +4084,7 @@ msgstr "Niepoprawny typ zalogowania\n" #: winerror.mc:2241 msgid "Cannot impersonate\n" -msgstr "Cannot impersonate\n" +msgstr "" #: winerror.mc:2246 msgid "Invalid transaction state\n" @@ -4092,7 +4092,7 @@ msgstr "Niepoprawny stan transakcji\n" #: winerror.mc:2251 msgid "Security DB commit failure\n" -msgstr "Security DB commit failure\n" +msgstr "" #: winerror.mc:2256 msgid "Account is built-in\n" @@ -4144,7 +4144,7 @@ msgstr "Secret zbyt długi\n" #: winerror.mc:2316 msgid "Internal security DB error\n" -msgstr "Internal security DB error\n" +msgstr "" #: winerror.mc:2321 msgid "Too many context IDs\n" @@ -4216,7 +4216,7 @@ msgstr "Niepoprawny uchwyt kursora\n" #: winerror.mc:2411 msgid "Invalid accelerator table handle\n" -msgstr "Invalid accelerator table handle\n" +msgstr "" #: winerror.mc:2416 msgid "Invalid hook handle\n" @@ -4300,7 +4300,7 @@ msgstr "To nie jest okno combobox\n" #: winerror.mc:2516 msgid "Invalid edit height\n" -msgstr "Invalid edit height\n" +msgstr "" #: winerror.mc:2521 msgid "DC not found\n" @@ -4364,7 +4364,7 @@ msgstr "Niepoprawny parametr SPI\n" #: winerror.mc:2596 msgid "Screen already locked\n" -msgstr "Screen already locked\n" +msgstr "" #: winerror.mc:2601 msgid "Window handles have different parents\n" @@ -4416,7 +4416,7 @@ msgstr "Brak stronicowanych zasobów systemowych\n" #: winerror.mc:2661 msgid "No working set quota\n" -msgstr "No working set quota\n" +msgstr "" #: winerror.mc:2666 msgid "No page file quota\n" @@ -4424,7 +4424,7 @@ msgstr "Brak przydziału pliku stronicowania\n" #: winerror.mc:2671 msgid "Exceeded commitment limit\n" -msgstr "Exceeded commitment limit\n" +msgstr "" #: winerror.mc:2676 msgid "Menu item not found\n" @@ -4632,7 +4632,7 @@ msgstr "Ponowne uruchomienie rozpoczęte po udanej instalacji\n" #: winerror.mc:2931 msgid "Invalid string binding\n" -msgstr "Invalid string binding\n" +msgstr "" #: winerror.mc:2936 msgid "Wrong kind of binding\n" @@ -4944,7 +4944,7 @@ msgstr "Liczba bajtów zbyt mała\n" #: winerror.mc:3326 msgid "Bad stub data\n" -msgstr "Bad stub data\n" +msgstr "" #: winerror.mc:3331 msgid "Invalid user buffer\n" @@ -4956,7 +4956,7 @@ msgstr "Nierozpoznany nośnik\n" #: winerror.mc:3341 msgid "No trust secret\n" -msgstr "No trust secret\n" +msgstr "" #: winerror.mc:3346 msgid "No trust SAM account\n" @@ -5052,7 +5052,7 @@ msgstr "Nie można zalogować z kontem zaufanym serwera\n" #: winerror.mc:3461 msgid "Domain trust information inconsistent\n" -msgstr "Domain trust information inconsistent\n" +msgstr "" #: winerror.mc:3466 msgid "Server has open handles\n" @@ -5124,7 +5124,7 @@ msgstr "Niepoprawna operacja na uchwycie\n" #: winerror.mc:3551 msgid "Wrong serialising package version\n" -msgstr "Wrong serialising package version\n" +msgstr "" #: winerror.mc:3556 msgid "Wrong stub version\n" @@ -5148,7 +5148,7 @@ msgstr "Nie znaleziono członka grupy\n" #: winerror.mc:3581 msgid "Can't create endpoint mapper DB\n" -msgstr "Can't create endpoint mapper DB\n" +msgstr "" #: winerror.mc:3586 msgid "Invalid object\n" @@ -5536,7 +5536,7 @@ msgstr "grupowanie" #: oleacc.rc:48 msgid "separator" -msgstr "separator" +msgstr "" #: oleacc.rc:49 msgid "tool bar" @@ -5664,7 +5664,7 @@ msgstr "pole pokrętła" #: oleacc.rc:80 msgid "diagram" -msgstr "diagram" +msgstr "" #: oleacc.rc:81 msgid "animation" @@ -5823,7 +5823,7 @@ msgstr "program, który go stworzył" #: sane.rc:31 msgctxt "unit: pixels" msgid "px" -msgstr "px" +msgstr "" #: sane.rc:32 msgctxt "unit: bits" @@ -6212,7 +6212,7 @@ msgstr "Przewiń w prawo" #: shdoclc.rc:25 msgid "Wine Internet Explorer" -msgstr "Wine Internet Explorer" +msgstr "" #: shdoclc.rc:30 msgid "&w&bPage &p" @@ -6497,7 +6497,7 @@ msgstr "Historia" #: shell32.rc:203 msgid "SendTo" -msgstr "SendTo" +msgstr "" #: shell32.rc:204 msgid "Start Menu" @@ -10372,7 +10372,7 @@ msgstr "Wybierz plik motywu" #: winecfg.rc:54 msgid "Folder" -msgstr "Folder" +msgstr "" #: winecfg.rc:55 msgid "Links to"

1 0

Francois Gouget : po: Remove English strings from the German translation.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: f8ed30b068b496711bc534bebfbbdcb6b7666fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ed30b068b496711bc534beb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 20 16:14:08 2011 +0200 po: Remove English strings from the German translation. --- po/de.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/po/de.po b/po/de.po index 87f1760..03532e0 100644 --- a/po/de.po +++ b/po/de.po @@ -1048,7 +1048,7 @@ msgstr "Private Schlüsselbenutzungsdauer" #: crypt32.rc:137 msgid "Client Information" -msgstr "Client Information" +msgstr "" #: crypt32.rc:138 msgid "Server Authentication" @@ -6211,7 +6211,7 @@ msgstr "Aus&schneiden" #: shdoclc.rc:139 msgid "Context Unknown" -msgstr "Context Unknown" +msgstr "" #: shdoclc.rc:144 msgid "DYNSRC Image" @@ -6239,15 +6239,15 @@ msgstr "Debug" #: shdoclc.rc:196 msgid "Trace Tags" -msgstr "Trace Tags" +msgstr "" #: shdoclc.rc:197 msgid "Resource Failures" -msgstr "Resource Failures" +msgstr "" #: shdoclc.rc:198 msgid "Dump Tracking Info" -msgstr "Dump Tracking Info" +msgstr "" #: shdoclc.rc:199 msgid "Debug Break" @@ -6279,23 +6279,23 @@ msgstr "Dump LayoutRects" #: shdoclc.rc:206 msgid "Memory Monitor" -msgstr "Memory Monitor" +msgstr "" #: shdoclc.rc:207 msgid "Performance Meters" -msgstr "Performance Meters" +msgstr "" #: shdoclc.rc:208 msgid "Save HTML" -msgstr "Save HTML" +msgstr "" #: shdoclc.rc:210 msgid "&Browse View" -msgstr "&Browse View" +msgstr "" #: shdoclc.rc:211 msgid "&Edit View" -msgstr "&Edit View" +msgstr "" #: shdoclc.rc:214 msgid "Vertical Scrollbar" @@ -10928,7 +10928,7 @@ msgstr "Inaktiver Titelleistentext" #: winecfg.rc:133 msgid "Message Box Text" -msgstr "Message Box Text" +msgstr "" #: winecfg.rc:134 msgid "Application Workspace" @@ -11333,19 +11333,19 @@ msgstr "&Definieren..." #: winhlp32.rc:45 msgid "History" -msgstr "History" +msgstr "" #: winhlp32.rc:48 winhlp32.rc:69 msgid "Small" -msgstr "Small" +msgstr "" #: winhlp32.rc:49 winhlp32.rc:70 msgid "Normal" -msgstr "Normal" +msgstr "" #: winhlp32.rc:50 winhlp32.rc:71 msgid "Large" -msgstr "Large" +msgstr "" #: winhlp32.rc:54 #, fuzzy

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2011