February 2012 - Wine-devel - list.winehq.org

Testbot and changes to multiple tests
by Stefan Dösinger 27 Feb '12

27 Feb '12

Hi, When I manually submit a patch to the Wine testbot, it refuses to test it if the patch changes multiple tests. As a workaround I usually test a precompiled .exe and submit it once for each modified test[1]. In the case of the ddraw patch I sent today this missed test failures in 64 bit ddraw[2]. Apparently patches changing multiple tests work just fine when submitted via wine-patches. Why are they refused when I submit them via the testbot web interface? Cheers, Stefan 1: https://testbot.winehq.org/JobDetails.pl?Key=17113 2: https://testbot.winehq.org/JobDetails.pl?Key=17115

1 0

Re: [PATCH 2/2] ddraw/tests: Add pitch alignment tests (try 2)
by Stefan Dösinger 27 Feb '12

27 Feb '12

Please ignore this patch for now, it looks like 64 bit ddraw.dll behaves differently. It probably doesn't matter for real games, since they're all 32 bit, but I'll have to investigate this closer. Am Montag, 27. Februar 2012, 12:11:16 schrieb Stefan Dösinger: > This patch is a side product of my attempts to debug bug 21238. It > confirms that the 8 byte aligned pitches are correct for all pools. > > try 2: Don't fail and crash if video memory surfaces are not available > --- > dlls/ddraw/tests/ddraw1.c | 77 ++++++++++++++++++++++++++++++++++++++++++ > dlls/ddraw/tests/ddraw2.c | 81 > ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | > 82 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c > | 82 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 322 > insertions(+), 0 deletions(-) > > diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c > index 5d0d6da..8fa813b 100644 > --- a/dlls/ddraw/tests/ddraw1.c > +++ b/dlls/ddraw/tests/ddraw1.c > @@ -1121,6 +1121,82 @@ static void test_zenable(void) > DestroyWindow(window); > } > > +static void test_pitch_alignment(void) > +{ > + IDirectDraw *ddraw; > + IDirectDrawSurface *surface; > + HRESULT hr; > + static const struct > + { > + DWORD caps; > + UINT align; > + LONG pitch; > + const char *name; > + } > + pools[] = > + { > + { > + DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY, > + 8, 0, "D3DPOOL_DEFAULT" > + }, > + { > + DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, > + 8, 16, "D3DPOOL_SYSTEMMEM" > + }, > + }; > + unsigned int i; > + DDSURFACEDESC ddsd; > + > + if (!(ddraw = create_ddraw())) > + { > + skip("Failed to create a ddraw object, skipping test.\n"); > + return; > + } > + > + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); > + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); > + > + for (i = 0; i < (sizeof(pools) / sizeof(*pools)); i++) > + { > + memset(&ddsd, 0, sizeof(ddsd)); > + ddsd.dwSize = sizeof(ddsd); > + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | > DDSD_PIXELFORMAT; + ddsd.dwWidth = 5; > + ddsd.dwHeight = 5; > + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); > + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; > + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 16; > + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xF800; > + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x07E0; > + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x001F; > + ddsd.ddsCaps.dwCaps = pools[i].caps; > + > + hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); > + ok(SUCCEEDED(hr) || hr == DDERR_UNSUPPORTEDFORMAT || hr == > DDERR_NODIRECTDRAWHW, + "%s: Failed to create surface, hr > %#x.\n", pools[i].name, hr); + if (!surface) > + { > + skip("%s: Failed to create surface, skipping pitch alignment > test\n", pools[i].name); + continue; > + } > + > + memset(&ddsd, 0, sizeof(ddsd)); > + ddsd.dwSize = sizeof(ddsd); > + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &ddsd); > + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); > + > + ok(!(ddsd.lPitch & (pools[i].align - 1)), "%s: Pitch %d is not %u > byte aligned.\n", + pools[i].name, ddsd.lPitch, > pools[i].align); > + if (pools[i].pitch) > + ok(ddsd.lPitch == pools[i].pitch, "%s: Expected pitch %d, got > %d.\n", + pools[i].name, pools[i].pitch, ddsd.lPitch); > + > + IDirectDrawSurface_Release(surface); > + } > + > + IDirectDraw_Release(ddraw); > +} > + > START_TEST(ddraw1) > { > test_coop_level_create_device_window(); > @@ -1130,4 +1206,5 @@ START_TEST(ddraw1) > test_coop_level_threaded(); > test_viewport_interfaces(); > test_zenable(); > + test_pitch_alignment(); > } > diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c > index ba8d3b6..348cbfc 100644 > --- a/dlls/ddraw/tests/ddraw2.c > +++ b/dlls/ddraw/tests/ddraw2.c > @@ -1383,6 +1383,86 @@ static void test_zenable(void) > DestroyWindow(window); > } > > +static void test_pitch_alignment(void) > +{ > + IDirectDraw2 *ddraw; > + IDirectDrawSurface *surface1; > + IDirectDrawSurface2 *surface; > + HRESULT hr; > + static const struct > + { > + DWORD caps; > + UINT align; > + LONG pitch; > + const char *name; > + } > + pools[] = > + { > + { > + DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY, > + 8, 0, "D3DPOOL_DEFAULT" > + }, > + { > + DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, > + 8, 16, "D3DPOOL_SYSTEMMEM" > + }, > + }; > + unsigned int i; > + DDSURFACEDESC ddsd; > + > + if (!(ddraw = create_ddraw())) > + { > + skip("Failed to create a ddraw object, skipping test.\n"); > + return; > + } > + > + hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); > + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); > + > + for (i = 0; i < (sizeof(pools) / sizeof(*pools)); i++) > + { > + memset(&ddsd, 0, sizeof(ddsd)); > + ddsd.dwSize = sizeof(ddsd); > + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | > DDSD_PIXELFORMAT; + ddsd.dwWidth = 5; > + ddsd.dwHeight = 5; > + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); > + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; > + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 16; > + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xF800; > + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x07E0; > + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x001F; > + ddsd.ddsCaps.dwCaps = pools[i].caps; > + > + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface1, NULL); > + ok(SUCCEEDED(hr) || hr == DDERR_UNSUPPORTEDFORMAT || hr == > DDERR_NODIRECTDRAWHW, + "%s: Failed to create surface, hr > %#x.\n", pools[i].name, hr); + if (!surface1) > + { > + skip("%s: Failed to create surface, skipping pitch alignment > test\n", pools[i].name); + continue; > + } > + hr = IDirectDrawSurface_QueryInterface(surface1, > &IID_IDirectDrawSurface2, (void **) &surface); + ok(SUCCEEDED(hr), > "%s: Failed to get DirectDrawSurace2 interface, hr %#x.\n", pools[i].name, > hr); + IDirectDrawSurface_Release(surface1); > + > + memset(&ddsd, 0, sizeof(ddsd)); > + ddsd.dwSize = sizeof(ddsd); > + hr = IDirectDrawSurface2_GetSurfaceDesc(surface, &ddsd); > + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); > + > + ok(!(ddsd.lPitch & (pools[i].align - 1)), "%s: Pitch %d is not %u > byte aligned.\n", + pools[i].name, ddsd.lPitch, > pools[i].align); > + if (pools[i].pitch) > + ok(ddsd.lPitch == pools[i].pitch, "%s: Expected pitch %d, got > %d.\n", + pools[i].name, pools[i].pitch, ddsd.lPitch); > + > + IDirectDrawSurface2_Release(surface); > + } > + > + IDirectDraw2_Release(ddraw); > +} > + > START_TEST(ddraw2) > { > test_coop_level_create_device_window(); > @@ -1394,4 +1474,5 @@ START_TEST(ddraw2) > test_texture_load_ckey(); > test_viewport_interfaces(); > test_zenable(); > + test_pitch_alignment(); > } > diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c > index d9ed90d..c19ba3a 100644 > --- a/dlls/ddraw/tests/ddraw4.c > +++ b/dlls/ddraw/tests/ddraw4.c > @@ -1490,6 +1490,87 @@ static void test_zenable(void) > DestroyWindow(window); > } > > +static void test_pitch_alignment(void) > +{ > + IDirectDraw4 *ddraw; > + IDirectDrawSurface4 *surface; > + HRESULT hr; > + static const struct > + { > + DWORD caps, caps2; > + UINT align; > + LONG pitch; > + const char *name; > + } > + pools[] = > + { > + { > + DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY, 0, > + 8, 0, "D3DPOOL_DEFAULT" > + }, > + { > + DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, 0, > + 8, 16, "D3DPOOL_SYSTEMMEM" > + }, > + { > + DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, > + 8, 16, "D3DPOOL_MANAGED" > + } > + }; > + unsigned int i; > + DDSURFACEDESC2 ddsd; > + > + if (!(ddraw = create_ddraw())) > + { > + skip("Failed to create a ddraw object, skipping test.\n"); > + return; > + } > + > + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); > + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); > + > + for (i = 0; i < (sizeof(pools) / sizeof(*pools)); i++) > + { > + memset(&ddsd, 0, sizeof(ddsd)); > + ddsd.dwSize = sizeof(ddsd); > + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | > DDSD_PIXELFORMAT; + ddsd.dwWidth = 5; > + ddsd.dwHeight = 5; > + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); > + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; > + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; > + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; > + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07E0; > + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; > + ddsd.ddsCaps.dwCaps = pools[i].caps; > + ddsd.ddsCaps.dwCaps2 = pools[i].caps2; > + > + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); > + ok(SUCCEEDED(hr) || hr == DDERR_UNSUPPORTEDFORMAT || hr == > DDERR_NODIRECTDRAWHW, + "%s: Failed to create surface, hr > %#x.\n", pools[i].name, hr); + if (!surface) > + { > + skip("%s: Failed to create surface, skipping pitch alignment > test\n", pools[i].name); + continue; > + } > + > + memset(&ddsd, 0, sizeof(ddsd)); > + ddsd.dwSize = sizeof(ddsd); > + hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); > + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); > + > + ok(!(ddsd.lPitch & (pools[i].align - 1)), "%s: Pitch %d is not %u > byte aligned.\n", + pools[i].name, ddsd.lPitch, > pools[i].align); > + if (pools[i].pitch) > + ok(ddsd.lPitch == pools[i].pitch, "%s: Expected pitch %d, got > %d.\n", + pools[i].name, pools[i].pitch, ddsd.lPitch); > + > + IDirectDrawSurface4_Release(surface); > + } > + > + IDirectDraw4_Release(ddraw); > +} > + > START_TEST(ddraw4) > { > test_process_vertices(); > @@ -1502,4 +1583,5 @@ START_TEST(ddraw4) > test_texture_load_ckey(); > test_viewport_interfaces(); > test_zenable(); > + test_pitch_alignment(); > } > diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c > index 2ea77fe..4425ad4 100644 > --- a/dlls/ddraw/tests/ddraw7.c > +++ b/dlls/ddraw/tests/ddraw7.c > @@ -1277,6 +1277,87 @@ static void test_zenable(void) > DestroyWindow(window); > } > > +static void test_pitch_alignment(void) > +{ > + IDirectDraw7 *ddraw; > + IDirectDrawSurface7 *surface; > + HRESULT hr; > + static const struct > + { > + DWORD caps, caps2; > + UINT align; > + LONG pitch; > + const char *name; > + } > + pools[] = > + { > + { > + DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY, 0, > + 8, 0, "D3DPOOL_DEFAULT" > + }, > + { > + DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, 0, > + 8, 16, "D3DPOOL_SYSTEMMEM" > + }, > + { > + DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, > + 8, 16, "D3DPOOL_MANAGED" > + } > + }; > + unsigned int i; > + DDSURFACEDESC2 ddsd; > + > + if (!(ddraw = create_ddraw())) > + { > + skip("Failed to create a ddraw object, skipping test.\n"); > + return; > + } > + > + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); > + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); > + > + for (i = 0; i < (sizeof(pools) / sizeof(*pools)); i++) > + { > + memset(&ddsd, 0, sizeof(ddsd)); > + ddsd.dwSize = sizeof(ddsd); > + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | > DDSD_PIXELFORMAT; + ddsd.dwWidth = 5; > + ddsd.dwHeight = 5; > + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); > + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; > + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; > + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; > + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07E0; > + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; > + ddsd.ddsCaps.dwCaps = pools[i].caps; > + ddsd.ddsCaps.dwCaps2 = pools[i].caps2; > + > + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); > + ok(SUCCEEDED(hr) || hr == DDERR_UNSUPPORTEDFORMAT || hr == > DDERR_NODIRECTDRAWHW, + "%s: Failed to create surface, hr > %#x.\n", pools[i].name, hr); + if (!surface) > + { > + skip("%s: Failed to create surface, skipping pitch alignment > test\n", pools[i].name); + continue; > + } > + > + memset(&ddsd, 0, sizeof(ddsd)); > + ddsd.dwSize = sizeof(ddsd); > + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); > + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); > + > + ok(!(ddsd.lPitch & (pools[i].align - 1)), "%s: Pitch %d is not %u > byte aligned.\n", + pools[i].name, ddsd.lPitch, > pools[i].align); > + if (pools[i].pitch) > + ok(ddsd.lPitch == pools[i].pitch, "%s: Expected pitch %d, got > %d.\n", + pools[i].name, pools[i].pitch, ddsd.lPitch); > + > + IDirectDrawSurface7_Release(surface); > + } > + > + IDirectDraw7_Release(ddraw); > +} > + > START_TEST(ddraw7) > { > HMODULE module = GetModuleHandleA("ddraw.dll"); > @@ -1296,4 +1377,5 @@ START_TEST(ddraw7) > test_depth_blit(); > test_texture_load_ckey(); > test_zenable(); > + test_pitch_alignment(); > }

1 0

Re: [PATCH 2/2] ddraw/tests: Add pitch alignment tests (try 2)
by Marvin 27 Feb '12

27 Feb '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17115 Your paranoid android. === W7PROX64 (64 bit ddraw2) === ddraw2.c:1454: Test failed: D3DPOOL_SYSTEMMEM: Pitch 12 is not 8 byte aligned. ddraw2.c:1457: Test failed: D3DPOOL_SYSTEMMEM: Expected pitch 16, got 12. === TEST64_W7SP1 (64 bit ddraw2) === ddraw2.c:1454: Test failed: D3DPOOL_SYSTEMMEM: Pitch 12 is not 8 byte aligned. ddraw2.c:1457: Test failed: D3DPOOL_SYSTEMMEM: Expected pitch 16, got 12. === W7PROX64 (64 bit ddraw1) === ddraw1.c:1188: Test failed: D3DPOOL_SYSTEMMEM: Pitch 12 is not 8 byte aligned. ddraw1.c:1191: Test failed: D3DPOOL_SYSTEMMEM: Expected pitch 16, got 12. === TEST64_W7SP1 (64 bit ddraw1) === ddraw1.c:1188: Test failed: D3DPOOL_SYSTEMMEM: Pitch 12 is not 8 byte aligned. ddraw1.c:1191: Test failed: D3DPOOL_SYSTEMMEM: Expected pitch 16, got 12. === W7PROX64 (64 bit ddraw7) === ddraw7.c:1349: Test failed: D3DPOOL_SYSTEMMEM: Pitch 12 is not 8 byte aligned. ddraw7.c:1352: Test failed: D3DPOOL_SYSTEMMEM: Expected pitch 16, got 12. ddraw7.c:1336: Test failed: D3DPOOL_MANAGED: Failed to create surface, hr 0x80004002. ddraw7.c:1349: Test failed: D3DPOOL_MANAGED: Pitch 12 is not 8 byte aligned. ddraw7.c:1352: Test failed: D3DPOOL_MANAGED: Expected pitch 16, got 12. === TEST64_W7SP1 (64 bit ddraw7) === ddraw7.c:1349: Test failed: D3DPOOL_SYSTEMMEM: Pitch 12 is not 8 byte aligned. ddraw7.c:1352: Test failed: D3DPOOL_SYSTEMMEM: Expected pitch 16, got 12. ddraw7.c:1336: Test failed: D3DPOOL_MANAGED: Failed to create surface, hr 0x80004002. ddraw7.c:1349: Test failed: D3DPOOL_MANAGED: Pitch 12 is not 8 byte aligned. ddraw7.c:1352: Test failed: D3DPOOL_MANAGED: Expected pitch 16, got 12. === W7PROX64 (64 bit ddraw4) === ddraw4.c:1562: Test failed: D3DPOOL_SYSTEMMEM: Pitch 12 is not 8 byte aligned. ddraw4.c:1565: Test failed: D3DPOOL_SYSTEMMEM: Expected pitch 16, got 12. ddraw4.c:1562: Test failed: D3DPOOL_MANAGED: Pitch 12 is not 8 byte aligned. ddraw4.c:1565: Test failed: D3DPOOL_MANAGED: Expected pitch 16, got 12. === TEST64_W7SP1 (64 bit ddraw4) === ddraw4.c:1562: Test failed: D3DPOOL_SYSTEMMEM: Pitch 12 is not 8 byte aligned. ddraw4.c:1565: Test failed: D3DPOOL_SYSTEMMEM: Expected pitch 16, got 12. ddraw4.c:1562: Test failed: D3DPOOL_MANAGED: Pitch 12 is not 8 byte aligned. ddraw4.c:1565: Test failed: D3DPOOL_MANAGED: Expected pitch 16, got 12.

1 0

Re: [PATCH] po: Update Swedish translation. (try 2)
by Lauri Kenttä 27 Feb '12

27 Feb '12

Please ignore this one, I missed a few bugs. -- Lauri Kenttä

1 0

Fw: Re: po: zh_TW translation updates
by Hin-Tak Leung 27 Feb '12

27 Feb '12

Strange bounces... --- On Mon, 27/2/12, Hin-Tak Leung <hintak_leung(a)yahoo.co.uk> wrote: > --- On Mon, 27/2/12, Francois Gouget > <fgouget(a)free.fr> > wrote: > > > Patches are posted to wine-patches(a)winehq.org: > > http://www.winehq.org/pipermail/wine-patches/2012-February/111804.html > > A quick look at it (it is a few hundred k) - says a few of > the problems I saw and suspected: > > - some of the changes are not improvements/corrections but > just opinionated changes > > - some changes are wrong (i.e. the older version is more > correct/natural and the change makes it worse, not better). > > - some of the changes are over-eager: i.e. it "improves" on > windows and tried to be more user-friendly, but not exactly > how windows does it. > > I think there should be a notes on the translation FAQ: one > is not looking to be "better than" windows, but > bug-for-bug-compatible. Therefore translation is preferably > what regional/localized windows (whatever version) does. > > 20% of the world's population is Chinese, I am sure it is > easy enough to do a few screenshots of localized windows (be > in traditional or simplied) and show how those behave. > > There is a definitive answer (or "definition answers") to > most of these translation strings: what localized windows > (some version) does. It is not up to individual or group > opinions, really. I mean, public libraries, etc have windows > in the far east, there is no excuse to be wrong, or on the > opposite extreme, "try to improve on windows", even if one > does not want to get one's hand dirty and own a windows > box. > > > > >

1 0

Re: po: fixed remaining Slovenian true positives in the winepo error report
by Jaka Kranjc 26 Feb '12

26 Feb '12

On Wednesday 22 of February 2012 18:16:20 Francois Gouget wrote: > On Wed, 22 Feb 2012, Jaka Kranjc wrote: > [...] > > > > You mean that all the 'not translated' strings are actually translated > > > and just happen to be the same as in English, right? I can add them. > > > > Exactly. > > Done. Great. I also swapped wine-patches with wine-devel to keep the noise down. > So in English you'd end up with something like this: > > Error; Paper jam; > or > Initialising; Default Printer; I/O Active; > > > So what you're saying is that: > * There is no systematic conversion of semicolons to commas in > Slovenian. > * In Slovenian the strings above should definitely use a comma > because it's used as a list separator. > * The English string should maybe use a comma too? This may require > some supporting arguments... So if I understand correctly, parts of this composite get choped and concatenated and then printed as a sequence. Lacking full sentences, semicolons *are* a good choice for Slovenian in this case too. Commas would be fitting for proper "etc" lists. This brings up another can of worms though; capitalisation. We don't use title case at all, so these translation have the wrong case. Well, except for the first one being printed, but that is runtime knowledge, so we can't really fix it well. Gettext has no provisions for this (or gender or ...), so all that comes to mind is autocapitalisation depending on the locale, but that is probably ugly and I doubt it would work with more exotic scripts (but not sure if any would need it). > > So no, in general we do not substitute semicolons, but it depends on the > > original msgid context. Most translators are serious grammar nazis, so > > they/we tend to ignore mistakes in the original string. > > Don't! > > At least for Wine any issue in the English string should be fixed or > reported so it can be fixed as early as possible (preferably before it > has been translated into 20 other languages). Of course I'm saying that > but being in string freeze we would not be able to fix strings right > now. But if I saw such reports on wine-devel I'd make sure they are > acted upon after the release. Oh, I know, didn't mean to suggest inaction. But in a lot of cases, it comes down to preference, style or language perception. Plus the fact that inspecting the original's validity almost always requires the ability to read code, which most translators lack and which is hard to access if they work via online translation tools. Re usage strings: is there no 80 column limit imposed? I saw even some original strings were longer. LP -- To err is humor

2 3

Re: [PATCH] po: Update Swedish translation.
by Jan-Peter Nilsson 26 Feb '12

26 Feb '12

Hi I have a few questions/comments/suggestions on/for the change in the Swedish translation. On -28163-01--10 20:59, Lauri Kenttä wrote: > #: comdlg32.rc:292 > -#, fuzzy > msgctxt "Luminance" > msgid "&Lum:" > -msgstr "&Lum:" > +msgstr "&Val:" Can you explain 'Val' here? I don't understand it. I would assume 'Luminance' to be translated to 'Luminans', so Lum as abbreviation makes sense to me. > #: ieframe.rc:78 > -#, fuzzy > msgid "Searching for %s" > -msgstr "Egenskaper för %s" > +msgstr "Söker för %s" "Söker efter" would probably be better. > #: shell32.rc:215 > -#, fuzzy > msgid "Common Files" > -msgstr "Kopierar filer..." > +msgstr "" Perhaps 'Delade Filer'? > #: cmd.rc:331 > -#, fuzzy > msgid "Verify is %1\n" > -msgstr "Verifiera blev %s\n" > +msgstr "Verifiera blev %1\n" I would use 'är', 'blev' is more 'became' than 'is'. > #: cmd.rc:335 > -#, fuzzy > msgid "Volume label (11 characters, <Enter> for none)?" > -msgstr "Diskvolymens namn (11 karaktärer, tryck enter för inget)?" > +msgstr "Diskvolymens namn (11 karaktärer, tryck <Enter> för inget)?" 'Karaktärer' is the other kind of characters, the word here is 'tecken'. > #: explorer.rc:29 > #, fuzzy > @@ -10042,9 +9949,8 @@ msgid "Usage: hostname\n" > msgstr "" > > #: hostname.rc:28 > -#, fuzzy > msgid "Error: Invalid option '%c'.\n" > -msgstr "Fel: ogiltigt nyckelnamn\n" > +msgstr "Fel: Ogiltigt val '%c'.\n" I'm not sure about 'val' here. To me 'val' reads more like 'selection' than 'option'. > #: net.rc:41 > msgid "There are no entries in the list.\n" > @@ -10215,14 +10110,12 @@ msgstr "" > "---------------------------------------------------------------\n" > > #: net.rc:43 > -#, fuzzy > msgid "%1 %2 %3 Open resources: %4!u!\n" > -msgstr "%s %s %s Öppna resurser: %lu\n" > +msgstr "%1 %1 %1 Öppna resurser: %4!u!\n" I suppose that should be %1 %2 %3. > #: regedit.rc:88 > -#, fuzzy > msgid "Modify Binary Data..." > -msgstr "Ändra binärt data" > +msgstr "Ändra binärt data..." 'binärdata' is one word. > #: taskkill.rc:31 > -#, fuzzy > msgid "Error: Option %1 expects a command line parameter.\n" > -msgstr "Fel: Valet %s kräver en kommandoradsparameter.\n" > +msgstr "Fel: Valet %1 kräver en kommandoradsparameter.\n" > > #: taskkill.rc:32 > msgid "Error: Options /im and /pid are mutually exclusive.\n" > msgstr "Fel: Valen /im och /pid kan inte användas tillsammans.\n" > Val again. I don't really have any better suggestion, but it sounds strange to me. > #: winecfg.rc:146 > -#, fuzzy > msgid "" > "Wine can mimic different Windows versions for each application. This tab is " > "linked to the Libraries and Graphics tabs to allow you to change systemwide " > "or per-application settings in those tabs as well." > msgstr "" > -"Wine kan imitera olika Windows-versioner för varje program. Den här fliken " > +"Wine kan imitera olika Windows-versioner för varje program. Den här fliken " > "är länkad till flikarna Bibliotek och Grafik för att låta dig ändra " > "inställningar i de flikarna också, antingen systembreda eller per program." > I believe 'systemövergripande' would be better than 'systembreda'. > > #: winecfg.rc:83 > -#, fuzzy > msgid "Audio test failed!" > -msgstr "Återställning av hårddisk misslyckades\n" > +msgstr "" Maybe "Ljudtest misslyckades!" ? > > #: winecfg.rc:85 > -#, fuzzy > msgid "(System default)" > -msgstr "Systemsökväg" > +msgstr "" Maybe "(Systemstandard)" ? > #: winefile.rc:197 > msgctxt "accelerator Fullscreen" > @@ -13528,9 +13355,8 @@ msgid "Error while selecting new font." > msgstr "Ett fel uppstod när ett nytt teckensnitt valdes." > > #: winefile.rc:95 > -#, fuzzy > msgid "Wine File Manager" > -msgstr "Winefile" > +msgstr "Wine Filhanteraren" "Wine Filhanterare", unless we want definite form "The Wine File Manager". > #: wordpad.rc:188 > -#, fuzzy > msgid "OLE storage documents are not supported." > -msgstr "Utökade attribut ej stödda\n" > +msgstr "" Maybe "OLE lagringsdokument stöds ej." ? //Jan-Peter

4 4

Wrong charcter encoding in winmm-tests
by Julian Rüger 26 Feb '12

26 Feb '12

Hello everyone, I ran the winmm-tests in wine today, with a german locale, and noticed that the umlauts are displayed incorrectly. My terminal is in UTF-8 and wine outputs ISO 8859-1. I looked into the code and found out that ie. in wave.c, wave_out_error() declares the strings as static char, and thus uses waveOutGetErrorTextA() if I am not mistaken. Should this be fixed or doesn't it matter in the tests? Best regards, Julian

2 5

Re: [PATCH 2/2] ddraw/tests: Add pitch alignment tests
by Marvin 26 Feb '12

26 Feb '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17108 Your paranoid android. === WNT4WSSP6 (32 bit ddraw2) === ddraw2.c:1438: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 00420FAD === W2KPROSP4 (32 bit ddraw2) === ddraw2.c:1438: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw2: unhandled exception c0000005 at 00420FAD === WXPPROSP3 (32 bit ddraw2) === ddraw2.c:1438: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw2: unhandled exception c0000005 at 00420FAD === W2K3R2SESP2 (32 bit ddraw2) === ddraw2.c:1438: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw2: unhandled exception c0000005 at 00420FAD === WVISTAADM (32 bit ddraw2) === ddraw2.c:1438: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw2: unhandled exception c0000005 at 00420FAD === W2K8SE (32 bit ddraw2) === ddraw2.c:1438: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw2: unhandled exception c0000005 at 00420FAD === W7PRO (32 bit ddraw2) === ddraw2.c:1438: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 00420FAD === W7PROX64 (32 bit ddraw2) === ddraw2.c:1438: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 00420FAD === TEST64_W7SP1 (32 bit ddraw2) === ddraw2.c:1438: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw2: unhandled exception c0000005 at 00420FAD === W7PROX64 (64 bit ddraw2) === ddraw2.c:1438: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. Timeout === TEST64_W7SP1 (64 bit ddraw2) === ddraw2.c:1438: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. Timeout === WNT4WSSP6 (32 bit ddraw1) === ddraw1.c:1175: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 0041A3A5 === W2KPROSP4 (32 bit ddraw1) === ddraw1.c:1175: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw1: unhandled exception c0000005 at 0041A3A5 === WXPPROSP3 (32 bit ddraw1) === ddraw1.c:1175: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw1: unhandled exception c0000005 at 0041A3A5 === W2K3R2SESP2 (32 bit ddraw1) === ddraw1.c:1175: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw1: unhandled exception c0000005 at 0041A3A5 === WVISTAADM (32 bit ddraw1) === ddraw1.c:1175: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw1: unhandled exception c0000005 at 0041A3A5 === W2K8SE (32 bit ddraw1) === ddraw1.c:1175: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw1: unhandled exception c0000005 at 0041A3A5 === W7PRO (32 bit ddraw1) === ddraw1.c:1175: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 0041A3A5 === W7PROX64 (32 bit ddraw1) === ddraw1.c:1175: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 0041A3A5 === TEST64_W7SP1 (32 bit ddraw1) === ddraw1.c:1175: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw1: unhandled exception c0000005 at 0041A3A5 === W7PROX64 (64 bit ddraw1) === ddraw1.c:1175: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. Timeout === TEST64_W7SP1 (64 bit ddraw1) === ddraw1.c:1175: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. Timeout === W2KPROSP4 (32 bit ddraw7) === ddraw7.c:1336: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw7: unhandled exception c0000005 at 0042E3E1 === WXPPROSP3 (32 bit ddraw7) === ddraw7.c:1336: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw7: unhandled exception c0000005 at 0042E3E1 === W2K3R2SESP2 (32 bit ddraw7) === ddraw7.c:1336: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw7: unhandled exception c0000005 at 0042E3E1 === WVISTAADM (32 bit ddraw7) === ddraw7.c:1336: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw7: unhandled exception c0000005 at 0042E3E1 === W2K8SE (32 bit ddraw7) === ddraw7.c:1336: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw7: unhandled exception c0000005 at 0042E3E1 === W7PRO (32 bit ddraw7) === ddraw7.c:1336: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 0042E3E1 === W7PROX64 (32 bit ddraw7) === ddraw7.c:1336: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 0042E3E1 === TEST64_W7SP1 (32 bit ddraw7) === ddraw7.c:1336: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw7: unhandled exception c0000005 at 0042E3E1 === W7PROX64 (64 bit ddraw7) === ddraw7.c:1336: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. Timeout === TEST64_W7SP1 (64 bit ddraw7) === ddraw7.c:1336: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. Timeout === W2KPROSP4 (32 bit ddraw4) === ddraw4.c:1549: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw4: unhandled exception c0000005 at 00427CC1 === WXPPROSP3 (32 bit ddraw4) === ddraw4.c:1549: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw4: unhandled exception c0000005 at 00427CC1 === W2K3R2SESP2 (32 bit ddraw4) === ddraw4.c:1549: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw4: unhandled exception c0000005 at 00427CC1 === WVISTAADM (32 bit ddraw4) === ddraw4.c:1549: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw4: unhandled exception c0000005 at 00427CC1 === W2K8SE (32 bit ddraw4) === ddraw4.c:1549: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x887601fe. ddraw4: unhandled exception c0000005 at 00427CC1 === W7PRO (32 bit ddraw4) === ddraw4.c:1549: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 00427CC1 === W7PROX64 (32 bit ddraw4) === ddraw4.c:1549: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 00427CC1 === TEST64_W7SP1 (32 bit ddraw4) === ddraw4.c:1549: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. ddraw4: unhandled exception c0000005 at 00427CC1 === W7PROX64 (64 bit ddraw4) === ddraw4.c:1549: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. Timeout === TEST64_W7SP1 (64 bit ddraw4) === ddraw4.c:1549: Test failed: D3DPOOL_DEFAULT: Failed to create surface, hr 0x88760233. Timeout

1 0

Re: shlwapi: Implemented StrToInt64ExA/W
by Jacek Caban 26 Feb '12

26 Feb '12

Hi Carlo, On 2/26/12 12:56 PM, carlo.bramix(a)libero.it wrote: > I improved the patch according to the suggestions that I received: > 1) Removed the C++ style comment > 2) Removed the WARN message > 3) Added the tests for the new functions. The test has been run successfully > on Ubuntu 11.10. > > Sincerely Thanks for fixing those. This version looks better, but still could use some improvements (mostly for failing tests on win2k). BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) { + LARGE_INTEGER li; + BOOL bRes; + + TRACE("(%s,%08X,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); + + if (!lpiRet) + return FALSE; In previous patch you mentioned that Windows crashes in this situation. Thus there is no point in having this check on Wine. int str_to_int; int str_to_int_ex; int str_to_int_hex; + LONGLONG str_to_int64_ex; + LONGLONG str_to_int64_hex; AFAICS int str_to_int* always matches str_to_int64* values except for overflows. It means that you could simply change str_to_int_* to be LONGLONG and simply cast it to int before using it in existing tests. + { "0x44ff", 0, 0, 0x44ff, 0, 0x44ff }, + { "0x2bdc546291f4b1", 0, 0, 0x6291f4b1, 0, 0x2bdc546291f4b1 }, 64-bit literals are not portable. Something like ((ULONGLONG)0x2bdc54<<32) | (ULONGLONG)0x6291f4b1 would do the trick. + while (result->string) + { + return_val = -1; + bRet = StrToInt64ExA(result->string,0,&return_val); This function is not available on win2k (http://testbot.winehq.org/JobDetails.pl?Key=17105&scrshot_202=1#k202) so it needs to be loaded dynamically via GetProcAddress. See how other functions are handled. Cheers, Jacek

1 0